OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

wifi: cfg80211: hold wiphy lock in auto-disconnect 

[ Upstream commit e9da6df749 ]

Most code paths in cfg80211 already hold the wiphy lock,
mostly by virtue of being called from nl80211, so make
the auto-disconnect worker also hold it, aligning the
locking promises between different parts of cfg80211.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Stable-dep-of: 37c20b2eff ("wifi: cfg80211: fix cqm_config access race")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Johannes Berg 2023-06-06 14:49:20 +02:00 committed by Greg Kroah-Hartman
parent 6b3223449c
commit fb195ff418
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/wireless/core.c
View File

@ -1162,10 +1162,6 @@ static void _cfg80211_unregister_wdev(struct wireless_dev *wdev,
kfree_sensitive(wdev->wext.keys); kfree_sensitive(wdev->wext.keys);
wdev->wext.keys = NULL; wdev->wext.keys = NULL;
#endif #endif
/* only initialized if we have a netdev */
if (wdev->netdev)
flush_work(&wdev->disconnect_wk);
cfg80211_cqm_config_free(wdev); cfg80211_cqm_config_free(wdev);
/* /*
@ -1439,6 +1435,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
cfg80211_leave(rdev, wdev); cfg80211_leave(rdev, wdev);
cfg80211_remove_links(wdev); cfg80211_remove_links(wdev);
wiphy_unlock(&rdev->wiphy); wiphy_unlock(&rdev->wiphy);
/* since we just did cfg80211_leave() nothing to do there */
cancel_work_sync(&wdev->disconnect_wk);
break; break;
case NETDEV_DOWN: case NETDEV_DOWN:
wiphy_lock(&rdev->wiphy); wiphy_lock(&rdev->wiphy);

4
net/wireless/sme.c
View File

@ -5,7 +5,7 @@
* (for nl80211's connect() and wext) * (for nl80211's connect() and wext)
* *
* Copyright 2009 Johannes Berg <johannes@sipsolutions.net> * Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
* Copyright (C) 2009, 2020, 2022 Intel Corporation. All rights reserved. * Copyright (C) 2009, 2020, 2022-2023 Intel Corporation. All rights reserved.
* Copyright 2017 Intel Deutschland GmbH * Copyright 2017 Intel Deutschland GmbH
*/ */
@ -1555,6 +1555,7 @@ void cfg80211_autodisconnect_wk(struct work_struct *work)
container_of(work, struct wireless_dev, disconnect_wk); container_of(work, struct wireless_dev, disconnect_wk);
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
wiphy_lock(wdev->wiphy);
wdev_lock(wdev); wdev_lock(wdev);
if (wdev->conn_owner_nlportid) { if (wdev->conn_owner_nlportid) {
@ -1593,4 +1594,5 @@ void cfg80211_autodisconnect_wk(struct work_struct *work)
} }
wdev_unlock(wdev); wdev_unlock(wdev);
wiphy_unlock(wdev->wiphy);
} }