diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-09-22 11:29:00 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-22 11:29:00 +0000 |
| commit | ec73b2e3832fcd0957603ad8d2aa6f3a13f09cdb (patch) | |
| tree | dcd26bd93f99870b1d0705dd491c2cc05447870b /target | |
| parent | 28a46862207c0a0178a0a1ecf8fea35b827a3ae0 (diff) | |
| download | upstream-ec73b2e3832fcd0957603ad8d2aa6f3a13f09cdb.tar.gz upstream-ec73b2e3832fcd0957603ad8d2aa6f3a13f09cdb.tar.bz2 upstream-ec73b2e3832fcd0957603ad8d2aa6f3a13f09cdb.zip | |
kernel: add a patch to fix crashes on pppoe disconnect/reconnect
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r47026
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47027 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-3.18/101-pppoe-fix-disconnect-crash.patch | 16 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.18/650-pppoe_header_pad.patch | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/101-pppoe-fix-disconnect-crash.patch b/target/linux/generic/patches-3.18/101-pppoe-fix-disconnect-crash.patch new file mode 100644 index 0000000000..f2e6e45b0b --- /dev/null +++ b/target/linux/generic/patches-3.18/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); diff --git a/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch b/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch index 3b4978be84..4b623fad29 100644 --- a/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch +++ b/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c -@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct kiocb *i +@@ -868,7 +868,7 @@ static int pppoe_sendmsg(struct kiocb *i goto end; @@ -9,7 +9,7 @@ 0, GFP_KERNEL); if (!skb) { error = -ENOMEM; -@@ -877,7 +877,7 @@ static int pppoe_sendmsg(struct kiocb *i +@@ -876,7 +876,7 @@ static int pppoe_sendmsg(struct kiocb *i } /* Reserve space for headers. */ |