diff options
| author |  Eric Dumazet <eric.dumazet@gmail.com>
| 2010-08-25 23:44:35 +0000 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2010-08-26 13:29:38 -0700 |
| commit | bfc960a8eec023a170a80697fe65157cd4f44f81 (patch) | |
| tree | e93d7b48b1fa732b99ce07e820ef6b9c220eed61 /net/l2tp | |
| parent | tcp: select(writefds) don't hang up when a peer close connection (diff) | |
| download | linux-bfc960a8eec023a170a80697fe65157cd4f44f81.tar.gz linux-bfc960a8eec023a170a80697fe65157cd4f44f81.tar.bz2 linux-bfc960a8eec023a170a80697fe65157cd4f44f81.zip | |
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>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 58c6c4cda73b..1ae697681bc7 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -132,7 +132,7 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb, printk("\n"); } - if (data_len < ETH_HLEN) + if (!pskb_may_pull(skb, sizeof(ETH_HLEN))) goto error; secpath_reset(skb); |