Skip to content

Commit 9cfb5e7

Browse files
Eric DumazetPaolo Abeni
authored andcommitted
net: hsr: fix hsr_init_sk() vs network/transport headers.
Following sequence in hsr_init_sk() is invalid : skb_reset_mac_header(skb); skb_reset_mac_len(skb); skb_reset_network_header(skb); skb_reset_transport_header(skb); It is invalid because skb_reset_mac_len() needs the correct network header, which should be after the mac header. This patch moves the skb_reset_network_header() and skb_reset_transport_header() before the call to dev_hard_header(). As a result skb->mac_len is no longer set to a value close to 65535. Fixes: 48b491a ("net: hsr: fix mac_len checks") Signed-off-by: Eric Dumazet <[email protected]> Cc: George McCollister <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent 05cff25 commit 9cfb5e7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/hsr/hsr_device.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,15 +268,15 @@ static struct sk_buff *hsr_init_skb(struct hsr_port *master)
268268
skb->dev = master->dev;
269269
skb->priority = TC_PRIO_CONTROL;
270270

271+
skb_reset_network_header(skb);
272+
skb_reset_transport_header(skb);
271273
if (dev_hard_header(skb, skb->dev, ETH_P_PRP,
272274
hsr->sup_multicast_addr,
273275
skb->dev->dev_addr, skb->len) <= 0)
274276
goto out;
275277

276278
skb_reset_mac_header(skb);
277279
skb_reset_mac_len(skb);
278-
skb_reset_network_header(skb);
279-
skb_reset_transport_header(skb);
280280

281281
return skb;
282282
out:

0 commit comments

Comments
 (0)