summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2003-01-19 07:08:03 +0000
committersam <sam@FreeBSD.org>2003-01-19 07:08:03 +0000
commitb08ba8785868870209344d02e93852e01dafbe36 (patch)
tree56df37e1c28fc27ee76d247b446dc3f49c9f4a01 /sys
parentbfacd93538115bc4ebee0191bdf7cfb18041842c (diff)
downloadFreeBSD-src-b08ba8785868870209344d02e93852e01dafbe36.zip
FreeBSD-src-b08ba8785868870209344d02e93852e01dafbe36.tar.gz
fix ioctl handling for setting wep keys
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_ieee80211subr.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/net/if_ieee80211subr.c b/sys/net/if_ieee80211subr.c
index cc87455..79cb841 100644
--- a/sys/net/if_ieee80211subr.c
+++ b/sys/net/if_ieee80211subr.c
@@ -723,7 +723,7 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
int error = 0;
u_int kid, len;
struct ieee80211req *ireq;
- u_int8_t tmpkey[IEEE80211_WEP_KEYLEN];
+ u_int8_t tmpkey[IEEE80211_KEYBUF_SIZE];
char tmpssid[IEEE80211_NWID_LEN];
switch (cmd) {
@@ -866,16 +866,18 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
error = EINVAL;
break;
}
- if ((u_int) ireq->i_len > IEEE80211_WEP_KEYLEN) {
+ if (ireq->i_len < IEEE80211_WEP_KEYLEN ||
+ ireq->i_len > sizeof(tmpkey)) {
error = EINVAL;
break;
}
- memset(tmpkey, 0, IEEE80211_WEP_KEYLEN);
+ memset(tmpkey, 0, sizeof(tmpkey));
error = copyin(ireq->i_data, tmpkey, ireq->i_len);
if (error)
break;
memcpy(ic->ic_nw_keys[kid].wk_key, tmpkey,
- IEEE80211_WEP_KEYLEN);
+ sizeof(tmpkey));
+ ic->ic_nw_keys[kid].wk_len = ireq->i_len;
error = ENETRESET;
break;
case IEEE80211_IOC_WEPTXKEY:
OpenPOWER on IntegriCloud