diff options
| author | Xiaodong Xu <stid.smth@gmail.com> | 2012-09-22 00:09:32 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:28:07 +0900 |
| commit | 0ddaf88b27c6c942d3e921a2b0a7d8cae6d5be19 (patch) | |
| tree | 8034e3110f3d4c4cd36166b186ffcb437bebb0a0 /drivers/net/pppoe.c | |
| parent | 126268e1d7790725c2bb0e394652c70ced6ee2ea (diff) | |
| download | kernel_samsung_smdk4412-0ddaf88b27c6c942d3e921a2b0a7d8cae6d5be19.zip kernel_samsung_smdk4412-0ddaf88b27c6c942d3e921a2b0a7d8cae6d5be19.tar.gz kernel_samsung_smdk4412-0ddaf88b27c6c942d3e921a2b0a7d8cae6d5be19.tar.bz2 | |
pppoe: drop PPPOX_ZOMBIEs in pppoe_release
[ Upstream commit 2b018d57ff18e5405823e5cb59651a5b4d946d7b ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/pppoe.c')
| -rw-r--r-- | drivers/net/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index bc9a4bb..1161584 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -576,7 +576,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; } |