diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2019-02-06 09:03:10 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-02-06 12:38:00 +0300 |
| commit | 73350424bec9c76cf42d4d502ff156c7d5daf191 (patch) | |
| tree | 0b9cf425f5f048eb41607af2573d7fd58d5bcfa7 /net/wireless/core.c | |
| parent | 0acd99282bef617fdbc4dff29359fe8160f00846 (diff) | |
| download | linux-73350424bec9c76cf42d4d502ff156c7d5daf191.tar.xz | |
cfg80211: pmsr: fix abort locking
When we destroy the interface we already hold the wdev->mtx
while calling cfg80211_pmsr_wdev_down(), which assumes this
isn't true and flushes the worker that takes the lock, thus
leading to a deadlock.
Fix this by refactoring the worker and calling its code in
cfg80211_pmsr_wdev_down() directly.
We still need to flush the work later to make sure it's not
still running and will crash, but it will not do anything.
Fixes: 9bb7e0f24e7e ("cfg80211: add peer measurement with FTM initiator API")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 623dfe5e211c..b36ad8efb5e5 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -1068,6 +1068,8 @@ static void __cfg80211_unregister_wdev(struct wireless_dev *wdev, bool sync) ASSERT_RTNL(); + flush_work(&wdev->pmsr_free_wk); + nl80211_notify_iface(rdev, wdev, NL80211_CMD_DEL_INTERFACE); list_del_rcu(&wdev->list); |