74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
28 lines
879 B
Diff
28 lines
879 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Sat, 9 May 2015 23:08:38 +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@nbd.name>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/drivers/net/ppp/pppoe.c
|
|
+++ b/drivers/net/ppp/pppoe.c
|
|
@@ -464,6 +464,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);
|