OSDN Git Service

l2tp: hold tunnel socket when handling control frames in l2tp_ip and l2tp_ip6
authorGuillaume Nault <g.nault@alphalink.fr>
Wed, 29 Mar 2017 06:44:59 +0000 (08:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 May 2017 15:36:35 +0000 (08:36 -0700)
commit59bc404b382967a41250cc01299b0419e61392c0
tree2f3d778a13c04e71c33622fad69cd07cdb4c2faf
parent501299e643814d2367aeeae8439129f0facc4183
l2tp: hold tunnel socket when handling control frames in l2tp_ip and l2tp_ip6

[ Upstream commit 94d7ee0baa8b764cf64ad91ed69464c1a6a0066b ]

The code following l2tp_tunnel_find() expects that a new reference is
held on sk. Either sk_receive_skb() or the discard_put error path will
drop a reference from the tunnel's socket.

This issue exists in both l2tp_ip and l2tp_ip6.

Fixes: a3c18422a4b4 ("l2tp: hold socket before dropping lock in l2tp_ip{, 6}_recv()")
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>
net/l2tp/l2tp_ip.c
net/l2tp/l2tp_ip6.c