Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date:   Tue, 11 Jul 2023 14:21:22 +0200
Message-Id: <CTZC7J3QNXPE.LQ6QWU7ZR0L8@syracuse>
Subject: Re: [PATCH wireless] wifi: cfg80211: fix receving mesh packets
 without RFC1042 header
From:   "Nicolas Escande" <nico.escande@gmail.com>
To:     "Felix Fietkau" <nbd@nbd.name>, <linux-wireless@vger.kernel.org>
Cc:     <johannes@sipsolutions.net>
References: <20230711115052.68430-1-nbd@nbd.name>
In-Reply-To: <20230711115052.68430-1-nbd@nbd.name>
Precedence: bulk

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 +=3D ETH_ALEN + 2;
>  	else if (!pskb_may_pull(skb, hdrlen))
>  		return -EINVAL;
> +	else
> +		payload.eth.h_proto =3D htons(skb->len - hdrlen);
> =20
>  	mesh_addr =3D 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>