---

yaml --- r: 97935 b: refs/heads/master c: bc6cffd h: refs/heads/master i: 97933: 91b1bcf 97931: 690cd0c 97927: 37734ce 97919: cce120f v: v3
git-mirror · Jun 10, 2008 · 023f001 · 023f001
1 parent 320d28b
commit 023f001
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 392fdb0e35055b96faa9c1cd6ab537805337cdce
+refs/heads/master: bc6cffd177f9266af38dba96a2cea06c1e7ff932
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
@@ -432,12 +432,12 @@ static int pppoe_disc_rcv(struct sk_buff *skb,
 	if (dev_net(dev) != &init_net)
 		goto abort;
 
-	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
-		goto abort;
-
 	if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
 		goto out;
 
+	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
+		goto abort;
+
 	ph = pppoe_hdr(skb);
 	if (ph->code != PADT_CODE)
 		goto abort;