diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-01-29 11:41:38 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-04 18:57:44 +0100 |
| commit | e54faf29e07b6cc28a44a4f01d7fbc40905a67d3 (patch) | |
| tree | 19bbfcbb6dc5b867c4ee025793761b20a4989519 /net/mac80211/tx.c | |
| parent | cfg80211: move locking into cfg80211_bss_age (diff) | |
| download | linux-dev-e54faf29e07b6cc28a44a4f01d7fbc40905a67d3.tar.xz linux-dev-e54faf29e07b6cc28a44a4f01d7fbc40905a67d3.zip | |
mac80211: allow transmitting deauth with tainted key
When we had a connection for WoWLAN and after resume it
needed to be disconnected, the previous commit enabled
sending a deauth frame to the AP. This frame would not
go through on MFP-enabled networks as the key for it is
marked tainted before the frame is transmitted.
Allow a tainted key to be used for deauth frames. Worst
case, we'll use a wrong key because the PTK was rekeyed
while suspended, but more likely the PTK is still fine
and the taint flag really only applies to the GTK(s).
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index a2cb6a302cc7..7892b0a8873e 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -594,7 +594,8 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx) break; } - if (unlikely(tx->key && tx->key->flags & KEY_FLAG_TAINTED)) + if (unlikely(tx->key && tx->key->flags & KEY_FLAG_TAINTED && + !ieee80211_is_deauth(hdr->frame_control))) return TX_DROP; if (!skip_hw && tx->key && |