---

yaml --- r: 210140 b: refs/heads/master c: bfc960a h: refs/heads/master v: v3
git-mirror · Aug 26, 2010 · 1b64d8f · 1b64d8f
1 parent 0e7ed40
commit 1b64d8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d84ba638e4ba3c40023ff997aa5e8d3ed002af36
+refs/heads/master: bfc960a8eec023a170a80697fe65157cd4f44f81
diff --git a/trunk/net/l2tp/l2tp_eth.c b/trunk/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);