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>
Sat, 10 Nov 2018 15:41:43 +0000 (07:41 -0800)
commit80ab1e24e2c03585fe4883aaf591cfe07da96edd
tree55462b330ff025337b98f4d695a0c91ac68ab307
parent8a1d3de19b0afbf069baf704afecfbeba9059fce
l2tp: hold tunnel socket when handling control frames in l2tp_ip and l2tp_ip6

commit 94d7ee0baa8b764cf64ad91ed69464c1a6a0066b upstream.

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