Skip to contentSkip to conversation

pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev

PATCH Applied Ulrich Weber 2 participants 2 messages Apr 4, 2011 – Apr 6, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev

otherwise we loop forever if a PPPoE socket was set to PPPOX_ZOMBIE state by a PADT message when the ethernet device is going down afterwards.

---
 drivers/net/pppoe.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/pppoe.c +1 -1
index 78c0e3c..71b1d8f 100644
@@ -317,7 +317,7 @@ static void pppoe_flush_dev(struct net_device *dev)
 			lock_sock(sk);
 
 			if (po->pppoe_dev == dev &&
-			    sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
+			    sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) {
 				pppox_unbind_sock(sk);
 				sk->sk_state = PPPOX_ZOMBIE;
 				sk->sk_state_change(sk);
Signature · 1 line
1.7.1
maintainer Applied
#1 lore raw

From: Ulrich Weber <[email protected]>
Date: Mon, 4 Apr 2011 14:33:24 +0200

Quoted 5 lines

otherwise we loop forever if a PPPoE socket was set to PPPOX_ZOMBIE state by a PADT message when the ethernet device is going down afterwards.

Applied, thanks Ulrich.