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

Limit the TX key to a valid range

Browse Source 
PR: 39960, 39961 (patches here pointed out problem, but didn't quite fix it)
This commit is contained in:
imp 2002-09-29 18:40:35 +00:00
parent 1e13fe9497
commit 21d0a42ee9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/wi/if_wi.c
View File

@ -1268,6 +1268,8 @@ wi_write_record(sc, ltv)
ltv = &p2ltv;
break;
case WI_RID_TX_CRYPT_KEY:
if (ltv->wi_val > WI_NLTV_KEYS)
return (EINVAL);
p2ltv.wi_type = WI_RID_P2_TX_CRYPT_KEY;
p2ltv.wi_len = 2;
p2ltv.wi_val = ltv->wi_val;
@ -1328,6 +1330,10 @@ wi_write_record(sc, ltv)
case 11: ltv->wi_val = 5; break; /* 11Mb/s fixed */
default: return EINVAL;
}
case WI_RID_TX_CRYPT_KEY:
if (ltv->wi_val > WI_NLTV_KEYS)
return (EINVAL);
break;
}
}

3
sys/dev/wi/if_wivar.h
View File

@ -85,10 +85,11 @@ struct wi_key {
u_int8_t wi_keydat[14];
};
#define WI_NLTV_KEYS 4
struct wi_ltv_keys {
u_int16_t wi_len;
u_int16_t wi_type;
struct wi_key wi_keys[4];
struct wi_key wi_keys[WI_NLTV_KEYS];
};
struct wi_softc {