shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

wifi: cfg80211: fix locking in sched scan stop work

Browse Source 
[ Upstream commit 3e54ed8247 ]

This should use wiphy_lock() now instead of acquiring the
RTNL, since cfg80211_stop_sched_scan_req() now needs that.

Fixes: a05829a722 ("cfg80211: avoid holding the RTNL when calling the driver")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Johannes Berg
2023-06-06 14:34:47 +02:00
committed by Greg Kroah-Hartman
parent 4a64e92846
commit 0d18f8b90b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/wireless/core.c
View File

@@ -368,12 +368,12 @@ static void cfg80211_sched_scan_stop_wk(struct work_struct *work)
rdev = container_of(work, struct cfg80211_registered_device, rdev = container_of(work, struct cfg80211_registered_device,
sched_scan_stop_wk); sched_scan_stop_wk);
rtnl_lock(); wiphy_lock(&rdev->wiphy);
list_for_each_entry_safe(req, tmp, &rdev->sched_scan_req_list, list) { list_for_each_entry_safe(req, tmp, &rdev->sched_scan_req_list, list) {
if (req->nl_owner_dead) if (req->nl_owner_dead)
cfg80211_stop_sched_scan_req(rdev, req, false); 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) static void cfg80211_propagate_radar_detect_wk(struct work_struct *work)