Skip to content

Commit

Permalink
staging: wlags49_h2: Stop playing with length in GIWESSID handler
Browse files Browse the repository at this point in the history
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: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
David Kilroy authored and Greg Kroah-Hartman committed Sep 27, 2011
1 parent 145a401 commit e7751b6
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/staging/wlags49_h2/wl_wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
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 ) {
pName->name[pName->length] = '\0';
}
Expand All @@ -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 );

/* Copy the information into the user buffer */
data->length = pName->length + 1;
if( pName->length < HCF_MAX_NAME_LEN ) {
pName->name[pName->length] = '\0';
}

data->length = pName->length;
data->flags = 1;
} else {
ret = -EFAULT;
Expand All @@ -1084,8 +1077,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in

#endif // HCF_STA

data->length--;

if (pName->length > IW_ESSID_MAX_SIZE) {
ret = -EFAULT;
goto out_unlock;
Expand Down

0 comments on commit e7751b6

Please sign in to comment.