d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC revs 1.27 and 1.28.

Browse Source 
1.27: don't crash when given an invalid nwkey string
 1.28: parse SSIDs correctly and bail immediatly when invalid

PR:		misc/88159, bin/74509
This commit is contained in:
brooks 2006-01-11 05:56:02 +00:00
parent b129cd52e6
commit e6a4fb6f3c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/ifconfig/ifieee80211.c
View File

@ -110,7 +110,7 @@ set80211ssid(const char *val, int d, int s, const struct afswtch *rafp)
{
int ssid;
int len;
u_int8_t data[33];
u_int8_t data[IEEE80211_NWID_LEN];
ssid = 0;
len = strlen(val);
@ -121,7 +121,8 @@ set80211ssid(const char *val, int d, int s, const struct afswtch *rafp)
bzero(data, sizeof(data));
len = sizeof(data);
get_string(val, NULL, data, &len);
if (get_string(val, NULL, data, &len) == NULL)
exit(1);
set80211(s, IEEE80211_IOC_SSID, ssid, len, data);
}
@ -322,6 +323,8 @@ set80211nwkey(const char *val, int d, int s, const struct afswtch *rafp)
bzero(data, sizeof(data));
len = sizeof(data);
val = get_string(val, ",", data, &len);
if (val == NULL)
exit(1);
set80211(s, IEEE80211_IOC_WEPKEY, i, len, data);
}