diff options
author | Jouni Malinen <jouni.malinen@atheros.com> | 2009-05-15 05:38:32 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-05-20 14:46:25 -0400 |
commit | 9f26a952210e44691f784b77bf1f83a500d63f58 (patch) | |
tree | a11a5ab475cc8cfa61362e57b6b6c4e018d21996 /net/mac80211/key.c | |
parent | cc65965cbb24d2ca2bb70f26cac9d7243349e7e3 (diff) |
nl80211: Validate NL80211_ATTR_KEY_SEQ length
Validate RSC (NL80211_ATTR_KEY_SEQ) length in nl80211/cfg80211 instead
of having to do this in all the drivers.
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/key.c')
-rw-r--r-- | net/mac80211/key.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 827ea8e6ee0a..ce267565e180 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c | |||
@@ -320,7 +320,7 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg, | |||
320 | case ALG_TKIP: | 320 | case ALG_TKIP: |
321 | key->conf.iv_len = TKIP_IV_LEN; | 321 | key->conf.iv_len = TKIP_IV_LEN; |
322 | key->conf.icv_len = TKIP_ICV_LEN; | 322 | key->conf.icv_len = TKIP_ICV_LEN; |
323 | if (seq && seq_len == 6) { | 323 | if (seq) { |
324 | for (i = 0; i < NUM_RX_DATA_QUEUES; i++) { | 324 | for (i = 0; i < NUM_RX_DATA_QUEUES; i++) { |
325 | key->u.tkip.rx[i].iv32 = | 325 | key->u.tkip.rx[i].iv32 = |
326 | get_unaligned_le32(&seq[2]); | 326 | get_unaligned_le32(&seq[2]); |
@@ -332,7 +332,7 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg, | |||
332 | case ALG_CCMP: | 332 | case ALG_CCMP: |
333 | key->conf.iv_len = CCMP_HDR_LEN; | 333 | key->conf.iv_len = CCMP_HDR_LEN; |
334 | key->conf.icv_len = CCMP_MIC_LEN; | 334 | key->conf.icv_len = CCMP_MIC_LEN; |
335 | if (seq && seq_len == CCMP_PN_LEN) { | 335 | if (seq) { |
336 | for (i = 0; i < NUM_RX_DATA_QUEUES; i++) | 336 | for (i = 0; i < NUM_RX_DATA_QUEUES; i++) |
337 | for (j = 0; j < CCMP_PN_LEN; j++) | 337 | for (j = 0; j < CCMP_PN_LEN; j++) |
338 | key->u.ccmp.rx_pn[i][j] = | 338 | key->u.ccmp.rx_pn[i][j] = |
@@ -342,7 +342,7 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg, | |||
342 | case ALG_AES_CMAC: | 342 | case ALG_AES_CMAC: |
343 | key->conf.iv_len = 0; | 343 | key->conf.iv_len = 0; |
344 | key->conf.icv_len = sizeof(struct ieee80211_mmie); | 344 | key->conf.icv_len = sizeof(struct ieee80211_mmie); |
345 | if (seq && seq_len == 6) | 345 | if (seq) |
346 | for (j = 0; j < 6; j++) | 346 | for (j = 0; j < 6; j++) |
347 | key->u.aes_cmac.rx_pn[j] = seq[6 - j - 1]; | 347 | key->u.aes_cmac.rx_pn[j] = seq[6 - j - 1]; |
348 | break; | 348 | break; |