Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Thu, 14 Sep 2023 14:26:50 +0200
From:   Lukasz Majewski <lukma@denx.de>
To:     Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc:     Tristram.Ha@microchip.com, Eric Dumazet <edumazet@google.com>,
        davem@davemloft.net, Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Kristian Overskeid <koverskeid@gmail.com>,
        Matthieu Baerts <matthieu.baerts@tessares.net>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Andreas Oetken <ennoerlangen@gmail.com>
Subject: Re: [PATCH] net: hsr : Provide fix for HSRv1 supervisor frames
 decoding
Message-ID: <20230914142650.6ea1a52f@wsk>
In-Reply-To: <20230913163227.ysmJocR0@linutronix.de>
References: <20230825153111.228768-1-lukma@denx.de>
        <20230905080614.ImjTS6iw@linutronix.de>
        <20230905115512.3ac6649c@wsk>
        <20230911165708.0bc32e3c@wsk>
        <20230911150144.cG1ZHTCC@linutronix.de>
        <20230912101828.06cb403d@wsk>
        <20230913163227.ysmJocR0@linutronix.de>
Organization: denx.de
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/UkUwe2guQLDYQdd3_.qhV1S";
 protocol="application/pgp-signature"; micalg=pgp-sha512
Precedence: bulk

--Sig_/UkUwe2guQLDYQdd3_.qhV1S
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Sebastian Andrzej,

> On 2023-09-12 10:18:28 [+0200], Lukasz Majewski wrote:
> > Hi Sebastian, =20
> Hi Lukasz,
>=20
> > Ok. No problem. Thanks for the information. =20
>=20
> So what happens if you try this:
>=20
> diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
> index b77f1189d19d1..6d14d935ee828 100644
> --- a/net/hsr/hsr_framereg.c
> +++ b/net/hsr/hsr_framereg.c
> @@ -288,13 +288,13 @@ void hsr_handle_sup_frame(struct hsr_frame_info
> *frame)=20
>  	/* And leave the HSR tag. */
>  	if (ethhdr->h_proto =3D=3D htons(ETH_P_HSR)) {
> -		pull_size =3D sizeof(struct ethhdr);
> +		pull_size =3D sizeof(struct hsr_tag);
>  		skb_pull(skb, pull_size);
>  		total_pull_size +=3D pull_size;
>  	}
> =20
>  	/* And leave the HSR sup tag. */
> -	pull_size =3D sizeof(struct hsr_tag);
> +	pull_size =3D sizeof(struct hsr_sup_tag);
>  	skb_pull(skb, pull_size);
>  	total_pull_size +=3D pull_size;
> =20
>=20
> Sebastian

Yes, this fixes this issue (caused by: SHA1: eafaa88b3eb7f).
Such solution has also been pointed out earlier by Tristram.

I will prepare v2 of this patch.


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de

--Sig_/UkUwe2guQLDYQdd3_.qhV1S
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAmUC/AoACgkQAR8vZIA0
zr2QaQgA2lvqLjFeE2J9upAK/wAy3K5y9XdsDU00g/c+orFYDISTsCS+0WCk3hq5
JhYFya+FRU2sBzxVtP2R1MhIfbjnr/Efbpu//jpzoGz1iyic8u9DisgH4h1yLTv8
0zMqTlJ4se+peBTDvgI9eg3YiQdOOi8HAKbMCd8Vxlouf3NWh4v50hgji0eXaZGA
uiwPIJzR7qdYsYlAdslEPqyukY/V51OFpNzVOvW+5StM0Y73v+/NALsPPUyJ2MgW
yRMXauS8Pc2Uab7Bgz2c91pjvcfovV9iXPjWedQK6ZFxO4lhZ1FvFNg3voy1Whtm
IatbaoNbwzpA2ywmy1BTX8JJWnXRYQ==
=LUEH
-----END PGP SIGNATURE-----

--Sig_/UkUwe2guQLDYQdd3_.qhV1S--