Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d1ccff6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: reset mac header in dev_start_xmit() 



On 64 bit arches :

There is a off-by-one error in qdisc_pkt_len_init() because
mac_header is not set in xmit path.

skb_mac_header() returns an out of bound value that was
harmless because hdr_len is an 'unsigned int'

On 32bit arches, the error is abysmal.

This patch is also a prereq for "macvlan: add multicast filter"

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Ben Greear <greearb@candelatech.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 12b0004d

net/core/dev.c

+2 −0
Original line number Diff line number Diff line
@@ -2835,6 +2835,8 @@ int dev_queue_xmit(struct sk_buff *skb) 
	struct Qdisc *q;

	int rc = -ENOMEM;



	skb_reset_mac_header(skb);



	/* Disable soft irqs for various locks below. Also

	 * stops preemption for RCU.

	 */