Skip to contentSkip to conversation

mac80211: fix monitor interface suspend crash regression

PATCH Applied Stanislaw Gruszka 2 participants 2 messages Jul 23, 2013 mac80211

lore
Share & tools
lore

Stanislaw Gruszka

author
#0 lore raw

PATCH 1/1 mac80211: fix monitor interface suspend crash regression

My commit:

commit 12e7f517029dad819c45eca9ca01fdb9ba57616b

Author: Stanislaw Gruszka <[email protected]>
Date:   Thu Feb 28 10:55:26 2013 +0100

mac80211: cleanup generic suspend/resume procedures

removed check for deleting MONITOR and AP_VLAN when suspend. That can cause a crash (i.e. in iwlagn_mac_remove_interface()) since we remove interface in the driver that we did not add before.

Reference:
http://marc.info/?l=linux-kernel&m=137391815113860&w=2

Bisected-by Ortwin Glück <[email protected]>
Reported-and-tested-by Ortwin Glück <[email protected]>
Cc [email protected] # 3.10
Signed-off-by Stanislaw Gruszka <[email protected]>
---
 net/mac80211/pm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
net/mac80211/pm.c +5 -2
index 7fc5d0d..3401262 100644
@@ -99,10 +99,13 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
 	}
 	mutex_unlock(&local->sta_mtx);
 
-	/* remove all interfaces */
+	/* remove all interfaces that were created in the driver */
 	list_for_each_entry(sdata, &local->interfaces, list) {
-		if (!ieee80211_sdata_running(sdata))
+		if (!ieee80211_sdata_running(sdata) ||
+		    sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+		    sdata->vif.type == NL80211_IFTYPE_MONITOR)
 			continue;
+
 		drv_remove_interface(local, sdata);
 	}
Signature · 1 line
1.7.11.7
maintainer Applied
#1 lore raw
Quoted 11 lines · Stanislaw Gruszka

My commit:

commit 12e7f517029dad819c45eca9ca01fdb9ba57616b

Author: Stanislaw Gruszka <[email protected]>
Date:   Thu Feb 28 10:55:26 2013 +0100

mac80211: cleanup generic suspend/resume procedures

removed check for deleting MONITOR and AP_VLAN when suspend. That can cause a crash (i.e. in iwlagn_mac_remove_interface()) since we remove interface in the driver that we did not add before.

Applied, thanks.

johannes