wifi: cfg80211: fix locking in sched scan stop work

jmberg-intel · jmberg-intel · commit 3e54ed8247c9 · 2023-06-06T14:51:25.000+02:00
This should use wiphy_lock() now instead of acquiring the RTNL, since cfg80211_stop_sched_scan_req() now needs that. Fixes: a05829a ("cfg80211: avoid holding the RTNL when calling the driver") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
diff --git a/net/wireless/core.c b/net/wireless/core.c
@@ -368,12 +368,12 @@ static void cfg80211_sched_scan_stop_wk(struct work_struct *work)
 	rdev = container_of(work, struct cfg80211_registered_device,
 			   sched_scan_stop_wk);
 
-	rtnl_lock();
+	wiphy_lock(&rdev->wiphy);
 	list_for_each_entry_safe(req, tmp, &rdev->sched_scan_req_list, list) {
 		if (req->nl_owner_dead)
 			cfg80211_stop_sched_scan_req(rdev, req, false);
 	}
-	rtnl_unlock();
+	wiphy_unlock(&rdev->wiphy);
 }
 
 static void cfg80211_propagate_radar_detect_wk(struct work_struct *work)

Original file line number	Diff line number	Diff line change
`@@ -368,12 +368,12 @@ static void cfg80211_sched_scan_stop_wk(struct work_struct *work)`
`368`	`368`	`rdev = container_of(work, struct cfg80211_registered_device,`
`369`	`369`	`sched_scan_stop_wk);`
`370`	`370`
`371`		`- rtnl_lock();`
	`371`	`+ wiphy_lock(&rdev->wiphy);`
`372`	`372`	`list_for_each_entry_safe(req, tmp, &rdev->sched_scan_req_list, list) {`
`373`	`373`	`if (req->nl_owner_dead)`
`374`	`374`	`cfg80211_stop_sched_scan_req(rdev, req, false);`
`375`	`375`	`}`
`376`		`- rtnl_unlock();`
	`376`	`+ wiphy_unlock(&rdev->wiphy);`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`static void cfg80211_propagate_radar_detect_wk(struct work_struct *work)`