diff options
| author | Xiaodong Xu <stid.smth@gmail.com> | 2012-09-22 00:09:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-22 15:49:31 -0400 |
| commit | 2b018d57ff18e5405823e5cb59651a5b4d946d7b (patch) | |
| tree | eae59ac31ca8acf628b48cf2fae606f0e66343de /drivers/net/ppp | |
| parent | 0b121fd28d071c766dddab743031ba6cfe9be68e (diff) | |
| download | linux-2b018d57ff18e5405823e5cb59651a5b4d946d7b.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/ppp')
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index cbf7047decc0..20f31d0d1536 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; } |