* [PATCH wireless] wifi: cfg80211: fix receving mesh packets without RFC1042 header
@ 2023-07-11 11:50 Felix Fietkau
2023-07-11 12:21 ` Nicolas Escande
2023-07-13 1:03 ` Jakub Kicinski
0 siblings, 2 replies; 3+ messages in thread
From: Felix Fietkau @ 2023-07-11 11:50 UTC (permalink / raw)
To: linux-wireless; +Cc: johannes, Nicolas Escande
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH wireless] wifi: cfg80211: fix receving mesh packets without RFC1042 header
2023-07-11 11:50 [PATCH wireless] wifi: cfg80211: fix receving mesh packets without RFC1042 header Felix Fietkau
@ 2023-07-11 12:21 ` Nicolas Escande
2023-07-13 1:03 ` Jakub Kicinski
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Escande @ 2023-07-11 12:21 UTC (permalink / raw)
To: Felix Fietkau, linux-wireless; +Cc: johannes
On Tue Jul 11, 2023 at 1:50 PM CEST, Felix Fietkau wrote:
> 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>
> ---
> 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) {
I tested this on my side and everything works again, so if you want/need it:
Tested-by: Nicolas Escande <nico.escande@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH wireless] wifi: cfg80211: fix receving mesh packets without RFC1042 header
2023-07-11 11:50 [PATCH wireless] wifi: cfg80211: fix receving mesh packets without RFC1042 header Felix Fietkau
2023-07-11 12:21 ` Nicolas Escande
@ 2023-07-13 1:03 ` Jakub Kicinski
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2023-07-13 1:03 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless, johannes, Nicolas Escande
On Tue, 11 Jul 2023 13:50:52 +0200 Felix Fietkau wrote:
> 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>
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-13 1:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-11 11:50 [PATCH wireless] wifi: cfg80211: fix receving mesh packets without RFC1042 header Felix Fietkau
2023-07-11 12:21 ` Nicolas Escande
2023-07-13 1:03 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).