Attachment 314284 Details for Bug 459062 – Upstream patch for this issue

[patch] Upstream patch for this issue

0001--PPP-pppoe-Fix-skb_unshare_check-call-position.patch (text/plain), 1.05 KB, created by Eugene Teo (Security Response) on 2008-08-14 06:40:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Teo (Security Response)

Created: 2008-08-14 06:40:32 UTC

Size: 1.05 KB

patch

obsolete

>From 31bac44468257986484703cc09da8a9dcae88a36 Mon Sep 17 00:00:00 2001
>From: Herbert Xu <herbert@gondor.apana.org.au>
>Date: Sun, 16 Sep 2007 16:19:20 -0700
>Subject: [PATCH] [PPP] pppoe: Fix skb_unshare_check call position
>
>The skb_unshare_check call needs to be made before pskb_may_pull,
>not after.
>
>Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>Signed-off-by: David S. Miller <davem@davemloft.net>
>---
> drivers/net/pppoe.c |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
>index 68631a5..5ac3eff 100644
>--- a/drivers/net/pppoe.c
>+++ b/drivers/net/pppoe.c
>@@ -385,12 +385,12 @@ static int pppoe_rcv(struct sk_buff *skb,
> 	struct pppoe_hdr *ph;
> 	struct pppox_sock *po;
> 
>-	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
>-		goto drop;
>-
> 	if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
> 		goto out;
> 
>+	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
>+		goto drop;
>+
> 	ph = pppoe_hdr(skb);
> 
> 	po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
>-- 
>1.5.5.1
>

Actions: View | Diff

Attachments on bug 459062: 314284