]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
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)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Wed, 17 May 2017 16:38:37 +0000 (13:38 -0300)
commitd1e0cfc05d7e1e70ad78c434044ccaa2e7fe8289
treeb103a1bde2656e6db552aa453a2b90dcff7b4e26
parent96a8e6336162f241279028ad6f3bdd551ff49e44
l2tp: hold tunnel socket when handling control frames in l2tp_ip and l2tp_ip6

BugLink: http://bugs.launchpad.net/bugs/1688499
[ 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>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
net/l2tp/l2tp_ip.c
net/l2tp/l2tp_ip6.c