Staging: prevent rtl8192su from crashing dev_ioctl in SIOCGIWNAME

(adapted from the rtl8187se patch)

ieee80211_wx_get_name() ignores sizeof(wrqu->name) which is IFNAMSIZ (16), and
on certain conditions, the concatenated string will be larger than IFNAMSIZ
including the terminating zero.

length ("802.11" ++ "b" ++ "/g" ++ " linked" ++ "\x00") == 17

This fix uses strl{cpy,cat} in addition to the reduction of the total
possible length of the output string by a char.

It can be applied to 2.6.30-stable as well.

Signed-off-by: Dan Aloni <dan@aloni.org>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


authored by Dan Aloni and committed by Greg Kroah-Hartman 91fca6da 02c8baec

+7 -7
+7 -7
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c
··· 548 548 struct iw_request_info *info, 549 549 union iwreq_data *wrqu, char *extra) 550 550 { 551 - strcpy(wrqu->name, "802.11"); 551 + strlcpy(wrqu->name, "802.11", IFNAMSIZ); 552 552 if(ieee->modulation & IEEE80211_CCK_MODULATION){ 553 - strcat(wrqu->name, "b"); 553 + strlcat(wrqu->name, "b", IFNAMSIZ); 554 554 if(ieee->modulation & IEEE80211_OFDM_MODULATION) 555 - strcat(wrqu->name, "/g"); 555 + strlcat(wrqu->name, "/g", IFNAMSIZ); 556 556 }else if(ieee->modulation & IEEE80211_OFDM_MODULATION) 557 - strcat(wrqu->name, "g"); 557 + strlcat(wrqu->name, "g", IFNAMSIZ); 558 558 if (ieee->mode & (IEEE_N_24G | IEEE_N_5G)) 559 - strcat(wrqu->name, "/n"); 559 + strlcat(wrqu->name, "/n", IFNAMSIZ); 560 560 561 561 if((ieee->state == IEEE80211_LINKED) || 562 562 (ieee->state == IEEE80211_LINKED_SCANNING)) 563 - strcat(wrqu->name," linked"); 563 + strlcat(wrqu->name, " link", IFNAMSIZ); 564 564 else if(ieee->state != IEEE80211_NOLINK) 565 - strcat(wrqu->name," link.."); 565 + strlcat(wrqu->name, " .....", IFNAMSIZ); 566 566 567 567 568 568 return 0;