Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8734e485 authored by Guillaume Nault's avatar Guillaume Nault Committed by David S. Miller
Browse files

ppp: don't set sk_state to PPPOX_ZOMBIE in pppoe_disc_rcv() 



Since 287f3a94 ("pppoe: Use workqueue to die properly when a PADT
is received"), pppoe_disc_rcv() disconnects the socket by scheduling
pppoe_unbind_sock_work(). This is enough to stop socket transmission
and makes the PPPOX_ZOMBIE state uncessary.

Signed-off-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bdc17fad

drivers/net/ppp/pppoe.c

+2 −20
Original line number Diff line number Diff line
@@ -500,27 +500,9 @@ static int pppoe_disc_rcv(struct sk_buff *skb, struct net_device *dev, 


	pn = pppoe_pernet(dev_net(dev));

	po = get_item(pn, ph->sid, eth_hdr(skb)->h_source, dev->ifindex);

	if (po) {

		struct sock *sk = sk_pppox(po);



		bh_lock_sock(sk);



		/* If the user has locked the socket, just ignore

		 * the packet.  With the way two rcv protocols hook into

		 * one socket family type, we cannot (easily) distinguish

		 * what kind of SKB it is during backlog rcv.

		 */

		if (sock_owned_by_user(sk) == 0) {

			/* We're no longer connect at the PPPOE layer,

			 * and must wait for ppp channel to disconnect us.

			 */

			sk->sk_state = PPPOX_ZOMBIE;

		}



		bh_unlock_sock(sk);

	if (po)

		if (!schedule_work(&po->proto.pppoe.padt_work))

			sock_put(sk);

	}

			sock_put(sk_pppox(po));



abort:

	kfree_skb(skb);