KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iwinfo: null-terminate the ssid on nl80211 scan to avoid printing trailing garbage

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40884
This commit is contained in:
Felix Fietkau 2014-05-30 11:37:35 +00:00
parent 8f8dc0959c
commit 72d6a51e64
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/network/utils/iwinfo/src/iwinfo_nl80211.c
View file

@ -1725,13 +1725,16 @@ static void nl80211_get_scanlist_ie(struct nlattr **bss,
int ielen = nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]); int ielen = nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]);
unsigned char *ie = nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]); unsigned char *ie = nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]);
static unsigned char ms_oui[3] = { 0x00, 0x50, 0xf2 }; static unsigned char ms_oui[3] = { 0x00, 0x50, 0xf2 };
int len;
while (ielen >= 2 && ielen >= ie[1]) while (ielen >= 2 && ielen >= ie[1])
{ {
switch (ie[0]) switch (ie[0])
{ {
case 0: /* SSID */ case 0: /* SSID */
memcpy(e->ssid, ie + 2, min(ie[1], IWINFO_ESSID_MAX_SIZE)); len = min(ie[1], IWINFO_ESSID_MAX_SIZE);
memcpy(e->ssid, ie + 2, len);
e->ssid[len] = 0;
break; break;
case 48: /* RSN */ case 48: /* RSN */