linux-kernel - Re: [PATCH] net: hsr : Provide fix for HSRv1 supervisor frames decoding

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230914142650.6ea1a52f@wsk>
Date:   Thu, 14 Sep 2023 14:26:50 +0200
From:   Lukasz Majewski <lukma@...x.de>
To:     Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Cc:     Tristram.Ha@...rochip.com, Eric Dumazet <edumazet@...gle.com>,
        davem@...emloft.net, Andrew Lunn <andrew@...n.ch>,
        Florian Fainelli <f.fainelli@...il.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Kristian Overskeid <koverskeid@...il.com>,
        Matthieu Baerts <matthieu.baerts@...sares.net>,
        netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
        Andreas Oetken <ennoerlangen@...il.com>
Subject: Re: [PATCH] net: hsr : Provide fix for HSRv1 supervisor frames
 decoding

Hi Sebastian Andrzej,

> On 2023-09-12 10:18:28 [+0200], Lukasz Majewski wrote:
> > Hi Sebastian,  
> Hi Lukasz,
> 
> > Ok. No problem. Thanks for the information.  
> 
> So what happens if you try this:
> 
> 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) 
>  	/* And leave the HSR tag. */
>  	if (ethhdr->h_proto == htons(ETH_P_HSR)) {
> -		pull_size = sizeof(struct ethhdr);
> +		pull_size = sizeof(struct hsr_tag);
>  		skb_pull(skb, pull_size);
>  		total_pull_size += pull_size;
>  	}
>  
>  	/* And leave the HSR sup tag. */
> -	pull_size = sizeof(struct hsr_tag);
> +	pull_size = sizeof(struct hsr_sup_tag);
>  	skb_pull(skb, pull_size);
>  	total_pull_size += pull_size;
>  
> 
> 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@...x.de

Content of type "application/pgp-signature" skipped