diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-05-10 00:08:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-11 19:58:22 +0300 |
| commit | 665a6cd809f43eec2b51413816a4178a3390a870 (patch) | |
| tree | 91e8c4725d2067ac7dfc78003433fd0d0f08fbcd | |
| parent | 268be0f7a7d9b3644bcb99568efba13cb208b627 (diff) | |
| download | linux-665a6cd809f43eec2b51413816a4178a3390a870.tar.xz | |
pppoe: drop pppoe device in pppoe_unbind_sock_work
After receiving a PADT and the socket is closed, user space will no
longer drop the reference to the pppoe device.
This leads to errors like this:
[ 488.570000] unregister_netdevice: waiting for eth0.2 to become free. Usage count = 2
Fixes: 287f3a943fe ("pppoe: Use workqueue to die properly when a PADT is received")
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index aa1dd926623a..b62a5e3a1c65 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -465,6 +465,10 @@ static void pppoe_unbind_sock_work(struct work_struct *work) struct sock *sk = sk_pppox(po); lock_sock(sk); + if (po->pppoe_dev) { + dev_put(po->pppoe_dev); + po->pppoe_dev = NULL; + } pppox_unbind_sock(sk); release_sock(sk); sock_put(sk); |