Commit 219a808f authored by David S. Miller's avatar David S. Miller

Merge tag 'mac80211-for-davem-2017-01-06' of...

Merge tag 'mac80211-for-davem-2017-01-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Another single fix, to correctly handle destruction of a
single netlink socket having ownership of multiple objects
(scheduled scan requests and interfaces.)
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93e246f7 753aacfd
...@@ -14502,13 +14502,17 @@ static int nl80211_netlink_notify(struct notifier_block * nb, ...@@ -14502,13 +14502,17 @@ static int nl80211_netlink_notify(struct notifier_block * nb,
list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) { list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {
bool schedule_destroy_work = false; bool schedule_destroy_work = false;
bool schedule_scan_stop = false;
struct cfg80211_sched_scan_request *sched_scan_req = struct cfg80211_sched_scan_request *sched_scan_req =
rcu_dereference(rdev->sched_scan_req); rcu_dereference(rdev->sched_scan_req);
if (sched_scan_req && notify->portid && if (sched_scan_req && notify->portid &&
sched_scan_req->owner_nlportid == notify->portid) sched_scan_req->owner_nlportid == notify->portid) {
schedule_scan_stop = true; sched_scan_req->owner_nlportid = 0;
if (rdev->ops->sched_scan_stop &&
rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN)
schedule_work(&rdev->sched_scan_stop_wk);
}
list_for_each_entry_rcu(wdev, &rdev->wiphy.wdev_list, list) { list_for_each_entry_rcu(wdev, &rdev->wiphy.wdev_list, list) {
cfg80211_mlme_unregister_socket(wdev, notify->portid); cfg80211_mlme_unregister_socket(wdev, notify->portid);
...@@ -14539,12 +14543,6 @@ static int nl80211_netlink_notify(struct notifier_block * nb, ...@@ -14539,12 +14543,6 @@ static int nl80211_netlink_notify(struct notifier_block * nb,
spin_unlock(&rdev->destroy_list_lock); spin_unlock(&rdev->destroy_list_lock);
schedule_work(&rdev->destroy_work); schedule_work(&rdev->destroy_work);
} }
} else if (schedule_scan_stop) {
sched_scan_req->owner_nlportid = 0;
if (rdev->ops->sched_scan_stop &&
rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN)
schedule_work(&rdev->sched_scan_stop_wk);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment