| From 239c158b16084d8c84d29829a4fdb3467f1468cf Mon Sep 17 00:00:00 2001 |
| From: Markus Theil <markus.theil@tu-ilmenau.de> |
| Date: Wed, 8 Jan 2020 12:55:36 +0100 |
| Subject: [PATCH] cfg80211: fix deadlocks in autodisconnect work |
| |
| commit 5a128a088a2ab0b5190eeb232b5aa0b1017a0317 upstream. |
| |
| Use methods which do not try to acquire the wdev lock themselves. |
| |
| Cc: stable@vger.kernel.org |
| Fixes: 37b1c004685a3 ("cfg80211: Support all iftypes in autodisconnect_wk") |
| Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de> |
| Link: https://lore.kernel.org/r/20200108115536.2262-1-markus.theil@tu-ilmenau.de |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/net/wireless/sme.c b/net/wireless/sme.c |
| index 7d34cb884840..9d96da127e09 100644 |
| --- a/net/wireless/sme.c |
| +++ b/net/wireless/sme.c |
| @@ -1283,14 +1283,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: |
| -- |
| 2.7.4 |
| |
