redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mac80211: avoid NULL ptr deref when using WEP 

"mac80211: move control.hw_key assignment" changed an if-else into two
separate if statments, but the if-else is needed to prevent
dereferencing a null info->control.hw_key.  This fixes avoids a lock-up
during association on my machine when using WEP.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
hifive-unleashed-5.1
John W. Linville 2010-01-22 12:33:09 -05:00
parent 64147c7297
commit e4fca007b0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/mac80211/wep.c
View File

@ -310,9 +310,8 @@ static int wep_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
tx->key->conf.keylen,
tx->key->conf.keyidx))
return -1;
}
if (info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) {
} else if (info->control.hw_key->flags &
IEEE80211_KEY_FLAG_GENERATE_IV) {
if (!ieee80211_wep_add_iv(tx->local, skb,
tx->key->conf.keylen,
tx->key->conf.keyidx))