aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-09-04 15:54:55 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-13 05:28:07 +0900
commit60e6a188d4cb2ef0fb9865cd7b3d4fca7cf7213e (patch)
treeb85b5bb7d36fab86519678ad0ebb4865337b2325 /net/l2tp
parent92da074473066d572bc39761a16e44299e104546 (diff)
downloadkernel_samsung_smdk4412-60e6a188d4cb2ef0fb9865cd7b3d4fca7cf7213e.zip
kernel_samsung_smdk4412-60e6a188d4cb2ef0fb9865cd7b3d4fca7cf7213e.tar.gz
kernel_samsung_smdk4412-60e6a188d4cb2ef0fb9865cd7b3d4fca7cf7213e.tar.bz2
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>
Diffstat (limited to 'net/l2tp')
-rw-r--r--net/l2tp/l2tp_eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 3c55f63..2cef50b 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);