diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-10-05 08:41:47 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-05 17:37:51 (GMT) |
| commit | 025e6be220e448c02045e8499c7db8ce4bc8eea2 (patch) | |
| tree | 0b28807104e80926d33eec8634dd94c5561e64ab /net/mac80211/cfg.c | |
| parent | 6774889314ba507483e63c014fcb81adfc127202 (diff) | |
| download | linux-fsl-qoriq-025e6be220e448c02045e8499c7db8ce4bc8eea2.tar.xz | |
mac80211: fix deadlock with multiple interfaces
The locking around ieee80211_recalc_smps is
buggy -- it cannot acquire another interface's
mutex while the iflist mutex is held because
another code path could be holding the iface
mutex and trying to acquire the iflist mutex.
But the locking is also unnecessary, we only
check "ifmgd->associated" as a bool, and don't
use the pointer (in check_mgd_smps).
Reported-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index a7a78f2..94bf550 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1394,7 +1394,7 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata, if (!sdata->u.mgd.associated || sdata->vif.bss_conf.channel_type == NL80211_CHAN_NO_HT) { mutex_lock(&sdata->local->iflist_mtx); - ieee80211_recalc_smps(sdata->local, sdata); + ieee80211_recalc_smps(sdata->local); mutex_unlock(&sdata->local->iflist_mtx); return 0; } |