Commit 5a128a08 authored by Markus Theil's avatar Markus Theil Committed by Johannes Berg
Browse files

cfg80211: fix deadlocks in autodisconnect work 



Use methods which do not try to acquire the wdev lock themselves.

Cc: stable@vger.kernel.org
Fixes: 37b1c004 ("cfg80211: Support all iftypes in autodisconnect_wk")
Signed-off-by: default avatarMarkus Theil <markus.theil@tu-ilmenau.de>
Link: https://lore.kernel.org/r/20200108115536.2262-1-markus.theil@tu-ilmenau.de


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e1611965

net/wireless/sme.c

+3 −3
Original line number Diff line number Diff line
@@ -1307,14 +1307,14 @@ void cfg80211_autodisconnect_wk(struct work_struct *work) 
	if (wdev->conn_owner_nlportid) {

		switch (wdev->iftype) {

		case NL80211_IFTYPE_ADHOC:

			cfg80211_leave_ibss(rdev, wdev->netdev, false);

			__cfg80211_leave_ibss(rdev, wdev->netdev, false);

			break;

		case NL80211_IFTYPE_AP:

		case NL80211_IFTYPE_P2P_GO:

			cfg80211_stop_ap(rdev, wdev->netdev, false);

			__cfg80211_stop_ap(rdev, wdev->netdev, false);

			break;

		case NL80211_IFTYPE_MESH_POINT:

			cfg80211_leave_mesh(rdev, wdev->netdev);

			__cfg80211_leave_mesh(rdev, wdev->netdev);

			break;

		case NL80211_IFTYPE_STATION:

		case NL80211_IFTYPE_P2P_CLIENT:

CRA Git | Maintained and supported by SUSTech CRA and CCSE