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)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 1 Jan 2018 20:51:01 +0000 (20:51 +0000)
commit9b9d4fd4f7e21c19718691fca547d5445639a96e
tree8cd3edf019f8ef6dea29a315916b540426d711e9
parent4ea094bb4db82122d8ebc84e9f10293e56453690
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>
[bwh: Backported to 3.2:
 - Drop changes to l2tp_ip6.c
 - Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/l2tp/l2tp_ip.c