Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 753aacfd authored by Johannes Berg's avatar Johannes Berg
Browse files

nl80211: fix sched scan netlink socket owner destruction 



A single netlink socket might own multiple interfaces *and* a
scheduled scan request (which might belong to another interface),
so when it goes away both may need to be destroyed.

Remove the schedule_scan_stop indirection to fix this - it's only
needed for interface destruction because of the way this works
right now, with a single work taking care of all interfaces.

Cc: stable@vger.kernel.org
Fixes: 93a1e86c ("nl80211: Stop scheduled scan if netlink client disappears")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 35f432a0

net/wireless/nl80211.c

+7 −9
Original line number Diff line number Diff line
@@ -14502,13 +14502,17 @@ static int nl80211_netlink_notify(struct notifier_block * nb, 


	list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {

		bool schedule_destroy_work = false;

		bool schedule_scan_stop = false;

		struct cfg80211_sched_scan_request *sched_scan_req =

			rcu_dereference(rdev->sched_scan_req);



		if (sched_scan_req && notify->portid &&

		    sched_scan_req->owner_nlportid == notify->portid)

			schedule_scan_stop = true;

		    sched_scan_req->owner_nlportid == notify->portid) {

			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) {

			cfg80211_mlme_unregister_socket(wdev, notify->portid);
@@ -14539,12 +14543,6 @@ static int nl80211_netlink_notify(struct notifier_block * nb, 
				spin_unlock(&rdev->destroy_list_lock);

				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);

		}

	}