Commit c8aa22db authored May 24, 2013 by Johannes Berg

mac80211: close AP_VLAN interfaces before unregistering all



Since Eric's commit efe117ab ("Speedup ieee80211_remove_interfaces")
there's a bug in mac80211 when it unregisters with AP_VLAN interfaces
up. If the AP_VLAN interface was registered after the AP it belongs
to (which is the typical case) and then we get into this code path,
unregister_netdevice_many() will crash because it isn't prepared to
deal with interfaces being closed in the middle of it. Exactly this
happens though, because we iterate the list, find the AP master this
AP_VLAN belongs to and dev_close() the dependent VLANs. After this,
unregister_netdevice_many() won't pick up the fact that the AP_VLAN
is already down and will do it again, causing a crash.

Cc: stable@vger.kernel.org [2.6.33+]
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 1351c5d3

net/mac80211/iface.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1703,6 +1703,15 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local)

		ASSERT_RTNL();

		/*
		* Close all AP_VLAN interfaces first, as otherwise they
		* might be closed while the AP interface they belong to
		* is closed, causing unregister_netdevice_many() to crash.
		*/
		list_for_each_entry(sdata, &local->interfaces, list)
		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
		dev_close(sdata->dev);

		mutex_lock(&local->iflist_mtx);
		list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) {
		list_del(&sdata->list);

Admin message