From: Johannes Berg <johannes.berg@xxxxxxxxx> commit ad0e2b5a00dbec303e4682b403bb6703d11dcdb2 Author: Johannes Berg <johannes.berg@xxxxxxxxx> Date: Tue Jun 1 10:19:19 2010 +0200 mac80211: simplify key locking removed the synchronization against RCU and thus opened a race window where we can use a key for TX while it is already freed. Put a synchronisation into the right place to close that window. Reported-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx> Cc: stable@xxxxxxxxxx [2.6.36+] Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- net/mac80211/key.c | 6 ++++++ 1 file changed, 6 insertions(+) --- wireless-testing.orig/net/mac80211/key.c 2011-01-03 19:04:10.000000000 +0100 +++ wireless-testing/net/mac80211/key.c 2011-01-03 19:04:20.000000000 +0100 @@ -379,6 +379,12 @@ static void __ieee80211_key_destroy(stru if (!key) return; + /* + * Synchronize so the TX path can no longer be using + * this key before we free/remove it. + */ + synchronize_rcu(); + if (key->local) ieee80211_key_disable_hw_accel(key); -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html