diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-07-11 14:38:06 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2023-07-11 14:38:20 +0200 |
| commit | 8f7be2a2ba79987bd150f5f4e266daf96fd94e32 (patch) | |
| tree | b617e5449a98bb4761482cf7479d7ecc0d68ae1d /package/kernel/mac80211/patches | |
| parent | 8674b41c0d84f09e14bf8ebe08e1d6dc6ac5fa64 (diff) | |
mac80211: add fix for receiving STP frames on mesh
Fix length in ethernet header
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/339-wifi-cfg80211-fix-receving-mesh-packets-without-RFC1.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/subsys/339-wifi-cfg80211-fix-receving-mesh-packets-without-RFC1.patch b/package/kernel/mac80211/patches/subsys/339-wifi-cfg80211-fix-receving-mesh-packets-without-RFC1.patch new file mode 100644 index 0000000000..e32c6ae1f3 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/339-wifi-cfg80211-fix-receving-mesh-packets-without-RFC1.patch @@ -0,0 +1,25 @@ +From: Felix Fietkau <nbd@nbd.name> +Date: Tue, 11 Jul 2023 13:30:12 +0200 +Subject: [PATCH] wifi: cfg80211: fix receving mesh packets without RFC1042 + header + +Fix ethernet header length field after stripping the mesh header + +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/all/CT5GNZSK28AI.2K6M69OXM9RW5@syracuse/ +Fixes: 986e43b19ae9 ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces") +Reported-by: Nicolas Escande <nico.escande@gmail.com> +Signed-off-by: Felix Fietkau <nbd@nbd.name> +--- + +--- a/net/wireless/util.c ++++ b/net/wireless/util.c +@@ -580,6 +580,8 @@ int ieee80211_strip_8023_mesh_hdr(struct + hdrlen += ETH_ALEN + 2; + else if (!pskb_may_pull(skb, hdrlen)) + return -EINVAL; ++ else ++ payload.eth.h_proto = htons(skb->len - hdrlen); + + mesh_addr = skb->data + sizeof(payload.eth) + ETH_ALEN; + switch (payload.flags & MESH_FLAGS_AE) { |