diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:53:04 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:53:04 +0000 |
commit | de18003b6e759e1f5309cd3f00d63f6b447f5fe1 (patch) | |
tree | 3221367a6827f83a068a290cd876b19b4c88454f /target/linux/generic/patches-3.18/081-05-ppp-fix-pppoe_dev-deletion-condition-in-pppoe_releas.patch | |
parent | cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 (diff) | |
download | upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.tar.gz upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.tar.bz2 upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.zip |
kernel/3.18: update to version 3.18.25
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 48225
Diffstat (limited to 'target/linux/generic/patches-3.18/081-05-ppp-fix-pppoe_dev-deletion-condition-in-pppoe_releas.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/081-05-ppp-fix-pppoe_dev-deletion-condition-in-pppoe_releas.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/target/linux/generic/patches-3.18/081-05-ppp-fix-pppoe_dev-deletion-condition-in-pppoe_releas.patch b/target/linux/generic/patches-3.18/081-05-ppp-fix-pppoe_dev-deletion-condition-in-pppoe_releas.patch deleted file mode 100644 index b1ae60b028..0000000000 --- a/target/linux/generic/patches-3.18/081-05-ppp-fix-pppoe_dev-deletion-condition-in-pppoe_releas.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Guillaume Nault <g.nault@alphalink.fr> -Date: Thu, 22 Oct 2015 16:57:10 +0200 -Subject: [PATCH] ppp: fix pppoe_dev deletion condition in pppoe_release() - -We can't rely on PPPOX_ZOMBIE to decide whether to clear po->pppoe_dev. -PPPOX_ZOMBIE can be set by pppoe_disc_rcv() even when po->pppoe_dev is -NULL. So we have no guarantee that (sk->sk_state & PPPOX_ZOMBIE) implies -(po->pppoe_dev != NULL). -Since we're releasing a PPPoE socket, we want to release the pppoe_dev -if it exists and reset sk_state to PPPOX_DEAD, no matter the previous -value of sk_state. So we can just check for po->pppoe_dev and avoid any -assumption on sk->sk_state. - -Fixes: 2b018d57ff18 ("pppoe: drop PPPOX_ZOMBIEs in pppoe_release") -Signed-off-by: Guillaume Nault <g.nault@alphalink.fr> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - ---- a/drivers/net/ppp/pppoe.c -+++ b/drivers/net/ppp/pppoe.c -@@ -589,7 +589,7 @@ static int pppoe_release(struct socket * - - po = pppox_sk(sk); - -- if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { -+ if (po->pppoe_dev) { - dev_put(po->pppoe_dev); - po->pppoe_dev = NULL; - } |