Commit cd34f647 authored Jul 23, 2013 by Stanislaw Gruszka Committed by Johannes Berg Jul 23, 2013

mac80211: fix monitor interface suspend crash regression

My commit:

commit 12e7f517
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <odi@odi.ch>
Reported-and-tested-by: Ortwin Glück <odi@odi.ch>
Cc: stable@vger.kernel.org # 3.10
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 40d18ff9

net/mac80211/pm.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message