* [PATCH] mac80211: add missing key check
@ 2010-01-22 21:07 Johannes Berg
0 siblings, 0 replies; only message in thread
From: Johannes Berg @ 2010-01-22 21:07 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
ieee80211_tx_h_select_key might decide that a frame
need not be encrypted at all, in which case it will
clear tx->key. In that case it may crash if a key
was previously selected, e.g. as the default key.
This is also due to my patch
"mac80211: move control.hw_key assignment".
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/mac80211/tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- wireless-testing.orig/net/mac80211/tx.c 2010-01-22 21:44:40.000000000 +0100
+++ wireless-testing/net/mac80211/tx.c 2010-01-22 21:49:50.000000000 +0100
@@ -557,7 +557,7 @@ ieee80211_tx_h_select_key(struct ieee802
break;
}
- if (!skip_hw &&
+ if (!skip_hw && tx->key &&
tx->key->conf.flags & KEY_FLAG_UPLOADED_TO_HARDWARE)
info->control.hw_key = &tx->key->conf;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-01-22 21:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-22 21:07 [PATCH] mac80211: add missing key check Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox