summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaodong Xu <stid.smth@gmail.com>2012-09-22 00:09:32 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-22 15:49:31 -0400
commit2b018d57ff18e5405823e5cb59651a5b4d946d7b (patch)
treeeae59ac31ca8acf628b48cf2fae606f0e66343de
parent0b121fd28d071c766dddab743031ba6cfe9be68e (diff)
downloadop-kernel-dev-2b018d57ff18e5405823e5cb59651a5b4d946d7b.zip
op-kernel-dev-2b018d57ff18e5405823e5cb59651a5b4d946d7b.tar.gz
pppoe: drop PPPOX_ZOMBIEs in pppoe_release
When PPPOE is running over a virtual ethernet interface (e.g., a bonding interface) and the user tries to delete the interface in case the PPPOE state is ZOMBIE, the kernel will loop forever while unregistering net_device for the reference count is not decreased to zero which should have been done with dev_put(). Signed-off-by: Xiaodong Xu <stid.smth@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ppp/pppoe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index cbf7047..20f31d0 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -570,7 +570,7 @@ static int pppoe_release(struct socket *sock)
po = pppox_sk(sk);
- if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
+ if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) {
dev_put(po->pppoe_dev);
po->pppoe_dev = NULL;
}
OpenPOWER on IntegriCloud