Commit 263e69cb authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent 721d5dfe

drivers/net/pppoe.c

+3 −3
Original line number Diff line number Diff line
@@ -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);