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

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

vlan: should take into account needed_headroom 



Commit c95b819a (gre: Use needed_headroom)
made gre use needed_headroom instead of hard_header_len

This uncover a bug in vlan code.

We should make sure vlan devices take into account their
real_dev->needed_headroom or we risk a crash in ipgre_header(), because
we dont have enough room to push IP header in skb.

Reported-by: default avatarDiddi Oscarsson <diddi@diddi.se>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a7da39d

net/8021q/vlan_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -720,6 +720,7 @@ static int vlan_dev_init(struct net_device *dev) 
	dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid;

#endif



	dev->needed_headroom = real_dev->needed_headroom;

	if (real_dev->features & NETIF_F_HW_VLAN_TX) {

		dev->header_ops      = real_dev->header_ops;

		dev->hard_header_len = real_dev->hard_header_len;