Patch "net: hsr: Properly parse HSRv1 supervisor frames." has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    net: hsr: Properly parse HSRv1 supervisor frames.

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-hsr-properly-parse-hsrv1-supervisor-frames.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5727e444a85b2c442d169c5fd0dc2e5fca578f39
Author: Lukasz Majewski <lukma@xxxxxxx>
Date:   Fri Sep 15 20:10:02 2023 +0200

    net: hsr: Properly parse HSRv1 supervisor frames.
    
    [ Upstream commit 295de650d3aaf9e50258465c5f1c84b465d836f6 ]
    
    While adding support for parsing the redbox supervision frames, the
    author added `pull_size' and `total_pull_size' to track the amount of
    bytes that were pulled from the skb during while parsing the skb so it
    can be reverted/ pushed back at the end.
    In the process probably copy&paste error occurred and for the HSRv1 case
    the ethhdr was used instead of the hsr_tag. Later the hsr_tag was used
    instead of hsr_sup_tag. The later error didn't matter because both
    structs have the size so HSRv0 was still working. It broke however HSRv1
    parsing because struct ethhdr is larger than struct hsr_tag.
    
    Reinstate the old pulling flow and pull first ethhdr, hsr_tag in v1 case
    followed by hsr_sup_tag.
    
    [bigeasy: commit message]
    
    Fixes: eafaa88b3eb7 ("net: hsr: Add support for redbox supervision frames")'
    Suggested-by: Tristram.Ha@xxxxxxxxxxxxx
    Signed-off-by: Lukasz Majewski <lukma@xxxxxxx>
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
    Reviewed-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index a16f0445023aa..0b01998780952 100644
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -295,13 +295,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;