This is a note to let you know that I've just added the patch titled
mac80211: fix nested rtnl locking on ieee80211_reconfig
to the 3.14-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-fix-nested-rtnl-locking-on-ieee80211_reconfig.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e669ba2d06c6195662601956454ac959892f0762 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@xxxxxxxxxx>
Date: Wed, 30 Apr 2014 16:14:24 +0300
Subject: mac80211: fix nested rtnl locking on ieee80211_reconfig
From: Eliad Peller <eliad@xxxxxxxxxx>
commit e669ba2d06c6195662601956454ac959892f0762 upstream.
ieee80211_reconfig already holds rtnl, so calling
cfg80211_sched_scan_stopped results in deadlock.
Use the rtnl-version of this function instead.
Fixes: d43c6b6 ("mac80211: reschedule sched scan after HW restart")
Signed-off-by: Eliad Peller <eliadx.peller@xxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mac80211/util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1754,7 +1754,7 @@ int ieee80211_reconfig(struct ieee80211_
mutex_unlock(&local->mtx);
if (sched_scan_stopped)
- cfg80211_sched_scan_stopped(local->hw.wiphy);
+ cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy);
/*
* If this is for hw restart things are still running.
Patches currently in stable-queue which might be from eliad@xxxxxxxxxx are
queue-3.14/cfg80211-free-sme-on-connection-failures.patch
queue-3.14/mac80211-fix-nested-rtnl-locking-on-ieee80211_reconfig.patch
queue-3.14/cfg80211-add-cfg80211_sched_scan_stopped_rtnl.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