This is a note to let you know that I've just added the patch titled
mac80211: use just spin_lock() in ieee80211_get_tkip_p2k()
to the 3.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mac80211-use-just-spin_lock-in-ieee80211_get_tkip_p2k.patch
and it can be found in the queue-3.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 655914ab863bcc06c84270e4159fd59002d6b529 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Mon, 6 May 2013 15:54:58 +0200
Subject: mac80211: use just spin_lock() in ieee80211_get_tkip_p2k()
From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit 655914ab863bcc06c84270e4159fd59002d6b529 upstream.
ieee80211_get_tkip_p2k() may be called with interrupts
disabled, so spin_unlock_bh() isn't safe and leads to
warnings. Since it's always called with BHs disabled
already, just use spin_lock().
Reported-by: Milan Kocian <milon@xxxxx>
Acked-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mac80211/tkip.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -208,10 +208,10 @@ void ieee80211_get_tkip_p2k(struct ieee8
u32 iv32 = get_unaligned_le32(&data[4]);
u16 iv16 = data[2] | (data[0] << 8);
- spin_lock_bh(&key->u.tkip.txlock);
+ spin_lock(&key->u.tkip.txlock);
ieee80211_compute_tkip_p1k(key, iv32);
tkip_mixing_phase2(tk, ctx, iv16, p2k);
- spin_unlock_bh(&key->u.tkip.txlock);
+ spin_unlock(&key->u.tkip.txlock);
}
EXPORT_SYMBOL(ieee80211_get_tkip_p2k);
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-3.9/mac80211-use-just-spin_lock-in-ieee80211_get_tkip_p2k.patch
queue-3.9/cfg80211-fix-wiphy_register-error-path.patch
queue-3.9/mac80211-fix-ap-mode-frame-matching.patch
queue-3.9/cfg80211-fix-wowlan-wakeup-tracing.patch
queue-3.9/iwlwifi-mvm-always-use-scan_type_forced.patch
queue-3.9/cfg80211-fix-sending-wowlan-tcp-wakeup-settings.patch
queue-3.9/iwlwifi-mvm-prevent-setting-assoc-flag-in-mac_context_cmd.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html