This is a note to let you know that I've just added the patch titled
wifi: cfg80211: fix receiving mesh packets without RFC1042 header
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
wifi-cfg80211-fix-receiving-mesh-packets-without-rfc1042-header.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fec3ebb5ed299ac3a998f011c380f2ded47f4866 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@xxxxxxxx>
Date: Tue, 11 Jul 2023 13:50:52 +0200
Subject: wifi: cfg80211: fix receiving mesh packets without RFC1042 header
From: Felix Fietkau <nbd@xxxxxxxx>
commit fec3ebb5ed299ac3a998f011c380f2ded47f4866 upstream.
Fix ethernet header length field after stripping the mesh header
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/all/CT5GNZSK28AI.2K6M69OXM9RW5@syracuse/
Fixes: 986e43b19ae9 ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces")
Reported-and-tested-by: Nicolas Escande <nico.escande@xxxxxxxxx>
Signed-off-by: Felix Fietkau <nbd@xxxxxxxx>
Link: https://lore.kernel.org/r/20230711115052.68430-1-nbd@xxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/wireless/util.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 89c9ad6c886e..1783ab9d57a3 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -580,6 +580,8 @@ int ieee80211_strip_8023_mesh_hdr(struct sk_buff *skb)
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) {
--
2.41.0
Patches currently in stable-queue which might be from nbd@xxxxxxxx are
queue-6.4/wifi-ath10k-serialize-wake_tx_queue-ops.patch
queue-6.4/wifi-cfg80211-fix-receiving-mesh-packets-without-rfc1042-header.patch
