diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-11 19:08:08 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-11 19:08:08 +0000 |
commit | b5842aed82e0c9101e99ec4bcf5959b931e98989 (patch) | |
tree | f9749eb8ce7d61f284cc4d91bac5aafd07de8344 /target/linux/generic/patches-4.3/101-pppoe-fix-disconnect-crash.patch | |
parent | 3d1a65adb41db2758827fe81f36d92ab61618ea3 (diff) | |
download | upstream-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.gz upstream-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.bz2 upstream-b5842aed82e0c9101e99ec4bcf5959b931e98989.zip |
kernel: generic: add kernel 4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47182
Diffstat (limited to 'target/linux/generic/patches-4.3/101-pppoe-fix-disconnect-crash.patch')
-rw-r--r-- | target/linux/generic/patches-4.3/101-pppoe-fix-disconnect-crash.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.3/101-pppoe-fix-disconnect-crash.patch b/target/linux/generic/patches-4.3/101-pppoe-fix-disconnect-crash.patch new file mode 100644 index 0000000000..f2e6e45b0b --- /dev/null +++ b/target/linux/generic/patches-4.3/101-pppoe-fix-disconnect-crash.patch @@ -0,0 +1,16 @@ +Fix crash with actions performed on the underlying interface (MAC address, +MTU or link state update). This triggers pppoe_flush_dev(), which cleans up +the device without announcing it in sk->sk_state. + +Patch by Guillaume Nault (pulled from netdev@vger) + +--- a/drivers/net/ppp/pppoe.c ++++ b/drivers/net/ppp/pppoe.c +@@ -313,7 +313,6 @@ static void pppoe_flush_dev(struct net_d + if (po->pppoe_dev == dev && + sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { + pppox_unbind_sock(sk); +- sk->sk_state = PPPOX_ZOMBIE; + sk->sk_state_change(sk); + po->pppoe_dev = NULL; + dev_put(dev); |