You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
832 B
28 lines
832 B
10 years ago
|
From: Felix Fietkau <nbd@openwrt.org>
|
||
|
|
Date: Sat, 9 May 2015 23:03:47 +0200
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/drivers/net/ppp/pppoe.c
|
||
|
|
+++ b/drivers/net/ppp/pppoe.c
|
||
|
|
@@ -462,6 +462,10 @@ static void pppoe_unbind_sock_work(struc
|
||
|
|
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);
|