Commit bfc960a8 authored Aug 25, 2010 by Eric Dumazet Committed by David S. Miller Aug 26, 2010

l2tp: test for ethernet header in l2tp_eth_dev_recv()

close https://bugzilla.kernel.org/show_bug.cgi?id=16529



Before calling dev_forward_skb(), we should make sure skb head contains
at least an ethernet header, even if length included in upper layer said
so. Use pskb_may_pull() to make sure this ethernet header is present in
skb head.

Reported-by: Thomas Heil <heil@terminal-consulting.de>
Reported-by: Ian Campbell <Ian.Campbell@eu.citrix.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d84ba638

net/l2tp/l2tp_eth.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -132,7 +132,7 @@ static void l2tp_eth_dev_recv(struct l2tp_session session, struct sk_buff skb,
	printk("\n");		printk("\n");
	}		}

	if (data_len < ETH_HLEN)		if (!pskb_may_pull(skb, sizeof(ETH_HLEN)))
	goto error;		goto error;

	secpath_reset(skb);		secpath_reset(skb);