From: Felix Fietkau Date: Fri, 19 Jan 2018 17:34:10 +0000 (+0100) Subject: mac80211: mesh: drop frames appearing to be from us X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=166741240afd396c41b284edaa5180b162232741;p=openwrt%2Fstaging%2Fblogic.git mac80211: mesh: drop frames appearing to be from us Upstream backport to fix issues arising from devices with duplicate MAC addresses Signed-off-by: Felix Fietkau --- diff --git a/package/kernel/mac80211/patches/323-mac80211-mesh-drop-frames-appearing-to-be-from-us.patch b/package/kernel/mac80211/patches/323-mac80211-mesh-drop-frames-appearing-to-be-from-us.patch new file mode 100644 index 000000000000..839e927880b4 --- /dev/null +++ b/package/kernel/mac80211/patches/323-mac80211-mesh-drop-frames-appearing-to-be-from-us.patch @@ -0,0 +1,25 @@ +From: Johannes Berg +Date: Thu, 4 Jan 2018 15:51:53 +0100 +Subject: [PATCH] mac80211: mesh: drop frames appearing to be from us + +If there are multiple mesh stations with the same MAC address, +they will both get confused and start throwing warnings. + +Obviously in this case nothing can actually work anyway, so just +drop frames that look like they're from ourselves early on. + +Reported-by: Gui Iribarren +Signed-off-by: Johannes Berg +--- + +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -3632,6 +3632,8 @@ static bool ieee80211_accept_frame(struc + } + return true; + case NL80211_IFTYPE_MESH_POINT: ++ if (ether_addr_equal(sdata->vif.addr, hdr->addr2)) ++ return false; + if (multicast) + return true; + return ether_addr_equal(sdata->vif.addr, hdr->addr1);