[PATCH] pppoe: Add missing sock_put() in pppoe_rcv()

[PATCH] pppoe: Add missing sock_put() in pppoe_rcv()

[Jarek Poplawski]

pppoe: Add missing sock_put() in pppoe_rcv()

Add missing sock_put() in pppoe_rcv() (introduced by
commit 392fdb0e35055b96faa9c1cd6ab537805337cdce).

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
---
[needed for stables 2.6.26 and later]

 drivers/net/pppoe.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index fc6f4b8..c074276 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -403,8 +403,10 @@ static int pppoe_rcv(struct sk_buff *skb,
 	if (!po)
 		goto drop;
 
-	if (pskb_trim_rcsum(skb, len))
+	if (pskb_trim_rcsum(skb, len)) {
+		sock_put(sk_pppox(po));
 		goto drop;
+	}
 
 	return sk_receive_skb(sk_pppox(po), skb, 0);
 

Re: [PATCH] pppoe: Add missing sock_put() in pppoe_rcv()

[Herbert Xu]

On Thu, Oct 30, 2008 at 08:57:25AM +0000, Jarek Poplawski wrote:
> pppoe: Add missing sock_put() in pppoe_rcv()
> 
> Add missing sock_put() in pppoe_rcv() (introduced by
> commit 392fdb0e35055b96faa9c1cd6ab537805337cdce).
> 
> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>

Good cath!

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH] pppoe: Add missing sock_put() in pppoe_rcv()

[Herbert Xu]

On Thu, Oct 30, 2008 at 08:57:25AM +0000, Jarek Poplawski wrote:
>
> diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
> index fc6f4b8..c074276 100644
> --- a/drivers/net/pppoe.c
> +++ b/drivers/net/pppoe.c
> @@ -403,8 +403,10 @@ static int pppoe_rcv(struct sk_buff *skb,
>  	if (!po)
>  		goto drop;
>  
> -	if (pskb_trim_rcsum(skb, len))
> +	if (pskb_trim_rcsum(skb, len)) {
> +		sock_put(sk_pppox(po));
>  		goto drop;
> +	}

Actually we might be better off moving the trim before the get_item
call.

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH] pppoe: Add missing sock_put() in pppoe_rcv()

[David Miller]

From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 31 Oct 2008 12:29:20 +0800

> On Thu, Oct 30, 2008 at 08:57:25AM +0000, Jarek Poplawski wrote:
> >
> > diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
> > index fc6f4b8..c074276 100644
> > --- a/drivers/net/pppoe.c
> > +++ b/drivers/net/pppoe.c
> > @@ -403,8 +403,10 @@ static int pppoe_rcv(struct sk_buff *skb,
> >  	if (!po)
> >  		goto drop;
> >  
> > -	if (pskb_trim_rcsum(skb, len))
> > +	if (pskb_trim_rcsum(skb, len)) {
> > +		sock_put(sk_pppox(po));
> >  		goto drop;
> > +	}
> 
> Actually we might be better off moving the trim before the get_item
> call.

That sounds like a good idea, I'll commit the following:

commit fb764c5b742fdab5615f4a1bac9f43df73599ce3
Author: David S. Miller <davem@davemloft.net>
Date:   Thu Oct 30 23:11:44 2008 -0700

    pppoe: Fix socket leak.
    
    Move SKB trim before we lookup the socket so we don't have to
    put it on failure.
    
    Based upon an initial patch by Jarek Poplawski and suggestions
    from Herbert Xu.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index fc6f4b8..b646e92 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -399,11 +399,11 @@ static int pppoe_rcv(struct sk_buff *skb,
 	if (skb->len < len)
 		goto drop;
 
-	po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
-	if (!po)
+	if (pskb_trim_rcsum(skb, len))
 		goto drop;
 
-	if (pskb_trim_rcsum(skb, len))
+	po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
+	if (!po)
 		goto drop;
 
 	return sk_receive_skb(sk_pppox(po), skb, 0);