From 70ac77f8696f0684d22199a278aa80585ddcd1bc Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 4 Dec 2015 22:39:37 +0000 Subject: mac80211: update to 2015-12-03 Signed-off-by: Felix Fietkau SVN-Revision: 47771 --- ...x-crash-on-mesh-local-link-ID-generation-.patch | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 package/kernel/mac80211/patches/313-mac80211-fix-crash-on-mesh-local-link-ID-generation-.patch (limited to 'package/kernel/mac80211/patches/313-mac80211-fix-crash-on-mesh-local-link-ID-generation-.patch') diff --git a/package/kernel/mac80211/patches/313-mac80211-fix-crash-on-mesh-local-link-ID-generation-.patch b/package/kernel/mac80211/patches/313-mac80211-fix-crash-on-mesh-local-link-ID-generation-.patch deleted file mode 100644 index 7424ca43e2..0000000000 --- a/package/kernel/mac80211/patches/313-mac80211-fix-crash-on-mesh-local-link-ID-generation-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 24 Oct 2015 21:25:51 +0200 -Subject: [PATCH] mac80211: fix crash on mesh local link ID generation with - VIFs - -llid_in_use needs to be limited to stations of the same VIF, otherwise it -will cause a NULL deref as the sta_info of non-mesh-VIFs don't have -sta->mesh set. - -Steps to reproduce: - - modprobe mac80211_hwsim channels=2 - iw phy phy0 interface add ibss0 type ibss - iw phy phy0 interface add mesh0 type mp - iw phy phy1 interface add ibss1 type ibss - iw phy phy1 interface add mesh1 type mp - ip link set ibss0 up - ip link set mesh0 up - ip link set ibss1 up - ip link set mesh1 up - iw dev ibss0 ibss join foo 2412 - iw dev ibss1 ibss join foo 2412 - # Ensure that ibss0 and ibss1 are actually associated; I often need to - # leave and join the cell on ibss1 a second time. - iw dev mesh0 mesh join bar - iw dev mesh1 mesh join bar # crash - -Signed-off-by: Matthias Schiffer ---- - ---- a/net/mac80211/mesh_plink.c -+++ b/net/mac80211/mesh_plink.c -@@ -686,6 +686,9 @@ static bool llid_in_use(struct ieee80211 - - rcu_read_lock(); - list_for_each_entry_rcu(sta, &local->sta_list, list) { -+ if (sdata != sta->sdata) -+ continue; -+ - if (!memcmp(&sta->mesh->llid, &llid, sizeof(llid))) { - in_use = true; - break; -- cgit v1.2.3