* [PATCH] pppoe: Add missing sock_put() in pppoe_rcv() @ 2008-10-30 8:57 Jarek Poplawski 2008-10-31 4:26 ` Herbert Xu 2008-10-31 4:29 ` Herbert Xu 0 siblings, 2 replies; 4+ messages in thread From: Jarek Poplawski @ 2008-10-30 8:57 UTC (permalink / raw) To: David Miller, Jeff Garzik; +Cc: netdev, Herbert Xu 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); ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] pppoe: Add missing sock_put() in pppoe_rcv() 2008-10-30 8:57 [PATCH] pppoe: Add missing sock_put() in pppoe_rcv() Jarek Poplawski @ 2008-10-31 4:26 ` Herbert Xu 2008-10-31 4:29 ` Herbert Xu 1 sibling, 0 replies; 4+ messages in thread From: Herbert Xu @ 2008-10-31 4:26 UTC (permalink / raw) To: Jarek Poplawski; +Cc: David Miller, Jeff Garzik, netdev 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] pppoe: Add missing sock_put() in pppoe_rcv() 2008-10-30 8:57 [PATCH] pppoe: Add missing sock_put() in pppoe_rcv() Jarek Poplawski 2008-10-31 4:26 ` Herbert Xu @ 2008-10-31 4:29 ` Herbert Xu 2008-10-31 6:11 ` David Miller 1 sibling, 1 reply; 4+ messages in thread From: Herbert Xu @ 2008-10-31 4:29 UTC (permalink / raw) To: Jarek Poplawski; +Cc: David Miller, Jeff Garzik, netdev 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] pppoe: Add missing sock_put() in pppoe_rcv() 2008-10-31 4:29 ` Herbert Xu @ 2008-10-31 6:11 ` David Miller 0 siblings, 0 replies; 4+ messages in thread From: David Miller @ 2008-10-31 6:11 UTC (permalink / raw) To: herbert; +Cc: jarkao2, jeff, netdev 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); ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-10-31 6:12 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-10-30 8:57 [PATCH] pppoe: Add missing sock_put() in pppoe_rcv() Jarek Poplawski 2008-10-31 4:26 ` Herbert Xu 2008-10-31 4:29 ` Herbert Xu 2008-10-31 6:11 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox