]> www.infradead.org Git - users/jedix/linux-maple.git/commit
ppp: fix pppoe_dev deletion condition in pppoe_release()
authorGuillaume Nault <g.nault@alphalink.fr>
Thu, 22 Oct 2015 14:57:10 +0000 (16:57 +0200)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 5 Feb 2016 03:28:32 +0000 (19:28 -0800)
commit68d3f555d929d6c93562770cbaabb242a39e7740
tree980d594d7cbb64e711efec5a50cce2744f060b18
parentf4f5a716cc13b42fc3f38e7ff154cef5778ad97a
ppp: fix pppoe_dev deletion condition in pppoe_release()

Orabug: 22623834

[ Upstream commit 1acea4f6ce1b1c0941438aca75dd2e5c6b09db60 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit b4158226f16fb48eb25ad8882888e45b4465bd83)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
drivers/net/ppp/pppoe.c