iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: cfg80211: fix locking in regulatory disconnect

Browse Source 
commit f7e60032c6618dfd643c7210d5cba2789e2de2e2 upstream.

This should use wiphy_lock() now instead of requiring the
RTNL, since __cfg80211_leave() via cfg80211_leave() is now
requiring that lock to be held.

Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johannes Berg 2023-06-06 14:34:48 +02:00 committed by Greg Kroah-Hartman
parent 9a9adc42a5
commit b11f953a61
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/wireless/reg.c
View File

@ -2478,11 +2478,11 @@ static void reg_leave_invalid_chans(struct wiphy *wiphy)
struct wireless_dev *wdev; struct wireless_dev *wdev;
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
ASSERT_RTNL(); wiphy_lock(wiphy);
list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list)
if (!reg_wdev_chan_valid(wiphy, wdev)) if (!reg_wdev_chan_valid(wiphy, wdev))
cfg80211_leave(rdev, wdev); cfg80211_leave(rdev, wdev);
wiphy_unlock(wiphy);
} }
static void reg_check_chans_work(struct work_struct *work) static void reg_check_chans_work(struct work_struct *work)