From e77081b2da7cdaefa076102555f38845e20098a2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 5 Jun 2013 12:42:26 -0700 Subject: [PATCH] 3.0-stable patches added patches: mac80211-close-ap_vlan-interfaces-before-unregistering-all.patch --- ...-interfaces-before-unregistering-all.patch | 46 +++++++++++++++++++ queue-3.0/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 queue-3.0/mac80211-close-ap_vlan-interfaces-before-unregistering-all.patch diff --git a/queue-3.0/mac80211-close-ap_vlan-interfaces-before-unregistering-all.patch b/queue-3.0/mac80211-close-ap_vlan-interfaces-before-unregistering-all.patch new file mode 100644 index 00000000000..a57e259072c --- /dev/null +++ b/queue-3.0/mac80211-close-ap_vlan-interfaces-before-unregistering-all.patch @@ -0,0 +1,46 @@ +From c8aa22db0112f640ac6631347f850879c621840b Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Fri, 24 May 2013 01:06:09 +0200 +Subject: mac80211: close AP_VLAN interfaces before unregistering all + +From: Johannes Berg + +commit c8aa22db0112f640ac6631347f850879c621840b upstream. + +Since Eric's commit efe117ab8 ("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. + +Signed-off-by: Johannes Berg +Cc: Eric Dumazet +Signed-off-by: Greg Kroah-Hartman + +--- + net/mac80211/iface.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1242,6 +1242,15 @@ void ieee80211_remove_interfaces(struct + + 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); diff --git a/queue-3.0/series b/queue-3.0/series index f9054fb8374..824eaea80d4 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -29,3 +29,4 @@ xen-events-handle-virq_timer-before-any-other-hardirq-in-event-loop.patch jfs-fix-a-couple-races.patch alsa-usb-audio-fix-possible-hang-and-overflow-in-parse_uac2_sample_rate_range.patch alsa-usb-audio-avoid-integer-overflow-in-create_fixed_stream_quirk.patch +mac80211-close-ap_vlan-interfaces-before-unregistering-all.patch -- 2.47.3