| Message ID | CANEcBPR8EvBTsJ0tG+kqvn578qXnqTMwdciS_WChe9sm5yKdaw@mail.gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Xiaodong Xu <stid.smth@gmail.com> Date: Sat, 22 Sep 2012 18:09:32 +0800 > From: Xiaodong Xu <stid.smth@gmail.com> > > 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> Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- linux/drivers/net/ppp/pppoe.c.orig 2012-09-19 11:49:27.921826868 +0800 +++ linux/drivers/net/ppp/pppoe.c 2012-09-22 17:44:03.642730082 +0800 @@ -570,7 +570,7 @@ static int pppoe_release(struct socket * 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; }