diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-07-11 13:50:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-29 17:30:55 +0200 |
| commit | 53352f8cb4087b4313d6d0287636361dff99eb5c (patch) | |
| tree | 73076aa470de3e6a7779f20dc950311b4a035d76 | |
| parent | 8ac387eb54f1c0eb014d7483ed9a9682ead0e80c (diff) | |
| download | linux-53352f8cb4087b4313d6d0287636361dff99eb5c.tar.gz linux-53352f8cb4087b4313d6d0287636361dff99eb5c.tar.bz2 linux-53352f8cb4087b4313d6d0287636361dff99eb5c.zip | |
wifi: cfg80211: fix receiving mesh packets without RFC1042 header
commit fec3ebb5ed299ac3a998f011c380f2ded47f4866 upstream.
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-and-tested-by: Nicolas Escande <nico.escande@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20230711115052.68430-1-nbd@nbd.name
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/wireless/util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index d1a4a9fd2bcb..c71b85fd6052 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) { |