domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: add a patch to fix crashes on pppoe disconnect/reconnect

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47026
This commit is contained in:
Felix Fietkau
2015-09-22 11:28:28 +00:00
parent 9893f5f00e
commit b0f48b6ebc
4 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/generic/patches-3.18/101-pppoe-fix-disconnect-crash.patch Normal file
View File

@@ -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);

4
target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
View File

@@ -1,6 +1,6 @@
--- a/drivers/net/ppp/pppoe.c --- a/drivers/net/ppp/pppoe.c
+++ b/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; goto end;
@@ -9,7 +9,7 @@
0, GFP_KERNEL); 0, GFP_KERNEL);
if (!skb) { if (!skb) {
error = -ENOMEM; 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. */ /* Reserve space for headers. */

16
target/linux/generic/patches-4.1/101-pppoe-fix-disconnect-crash.patch Normal file
View File

@@ -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);

4
target/linux/generic/patches-4.1/650-pppoe_header_pad.patch
View File

@@ -1,6 +1,6 @@
--- a/drivers/net/ppp/pppoe.c --- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c
@@ -872,7 +872,7 @@ static int pppoe_sendmsg(struct socket * @@ -871,7 +871,7 @@ static int pppoe_sendmsg(struct socket *
goto end; goto end;
@@ -9,7 +9,7 @@
0, GFP_KERNEL); 0, GFP_KERNEL);
if (!skb) { if (!skb) {
error = -ENOMEM; error = -ENOMEM;
@@ -880,7 +880,7 @@ static int pppoe_sendmsg(struct socket * @@ -879,7 +879,7 @@ static int pppoe_sendmsg(struct socket *
} }
/* Reserve space for headers. */ /* Reserve space for headers. */