Commit e7751b63 authored by David Kilroy's avatar David Kilroy Committed by Greg Kroah-Hartman

staging: wlags49_h2: Stop playing with length in GIWESSID handler

WE21 clarified that ESSID should not be NULL terminated.
The existing code didn't NULL terminate, but did play with length
and then reset it again. Just stop it.
Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 145a401f
...@@ -1042,9 +1042,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in ...@@ -1042,9 +1042,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in
/* Copy the information into the user buffer */ /* Copy the information into the user buffer */
data->length = pName->length; data->length = pName->length;
/* NOTE: Null terminating is necessary for proper display of the SSID in
the wireless tools */
data->length = pName->length + 1;
if( pName->length < HCF_MAX_NAME_LEN ) { if( pName->length < HCF_MAX_NAME_LEN ) {
pName->name[pName->length] = '\0'; pName->name[pName->length] = '\0';
} }
...@@ -1070,11 +1067,7 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in ...@@ -1070,11 +1067,7 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in
pName->length = CNV_LITTLE_TO_INT( pName->length ); pName->length = CNV_LITTLE_TO_INT( pName->length );
/* Copy the information into the user buffer */ /* Copy the information into the user buffer */
data->length = pName->length + 1; data->length = pName->length;
if( pName->length < HCF_MAX_NAME_LEN ) {
pName->name[pName->length] = '\0';
}
data->flags = 1; data->flags = 1;
} else { } else {
ret = -EFAULT; ret = -EFAULT;
...@@ -1084,8 +1077,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in ...@@ -1084,8 +1077,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in
#endif // HCF_STA #endif // HCF_STA
data->length--;
if (pName->length > IW_ESSID_MAX_SIZE) { if (pName->length > IW_ESSID_MAX_SIZE) {
ret = -EFAULT; ret = -EFAULT;
goto out_unlock; goto out_unlock;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment