From: Eric Dumazet <edumazet@google.com>
Date: Tue, 4 Sep 2012 19:54:55 +0000 (-0400)
Subject: l2tp: fix a typo in l2tp_eth_dev_recv()
X-Git-Tag: v3.0.46~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=60e6a188d4cb2ef0fb9865cd7b3d4fca7cf7213e;p=karo-tx-linux.git

l2tp: fix a typo in l2tp_eth_dev_recv()

[ Upstream commit c0cc88a7627c333de50b07b7c60b1d49d9d2e6cc ]

While investigating l2tp bug, I hit a bug in eth_type_trans(),
because not enough bytes were pulled in skb head.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 3c55f633928e..2cef50b5fc67 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 (!pskb_may_pull(skb, sizeof(ETH_HLEN)))
+	if (!pskb_may_pull(skb, ETH_HLEN))
 		goto error;
 
 	secpath_reset(skb);