diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-01-19 18:34:10 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-01-25 10:54:14 +0100 |
| commit | 166741240afd396c41b284edaa5180b162232741 (patch) | |
| tree | be95d3166bf91178873f5a7ddc2518bf50c15b9d /package/kernel | |
| parent | 21d3643828187df873118c4c2a51a48c54e0f6b1 (diff) | |
| download | upstream-166741240afd396c41b284edaa5180b162232741.tar.gz upstream-166741240afd396c41b284edaa5180b162232741.tar.bz2 upstream-166741240afd396c41b284edaa5180b162232741.zip | |
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 <nbd@nbd.name>
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/mac80211/patches/323-mac80211-mesh-drop-frames-appearing-to-be-from-us.patch | 25 |
1 files changed, 25 insertions, 0 deletions
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 0000000000..839e927880 --- /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 <johannes.berg@intel.com> +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 <gui@altermundi.net> +Signed-off-by: Johannes Berg <johannes.berg@intel.com> +--- + +--- 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); |