diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-30 23:11:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-30 23:35:02 -0700 |
| commit | 263e69cbc9e5a9e7bcf6a24f641ef0717d1ae4df (patch) | |
| tree | b82cb19bc63531782b018b3ad70c5e58dab44569 | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
| download | kernel_samsung_aries-263e69cbc9e5a9e7bcf6a24f641ef0717d1ae4df.zip kernel_samsung_aries-263e69cbc9e5a9e7bcf6a24f641ef0717d1ae4df.tar.gz kernel_samsung_aries-263e69cbc9e5a9e7bcf6a24f641ef0717d1ae4df.tar.bz2 | |
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>
| -rw-r--r-- | 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 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); |