l2tp: hold tunnel socket when handling control frames in l2tp_ip and l2tp_ip6

Browse source

[ Upstream commit 94d7ee0baa ]

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: a3c18422a4 ("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>

...

This commit is contained in:

Guillaume Nault 2017-03-29 08:44:59 +02:00 • committed by Greg Kroah-Hartman

parent 501299e643

commit 59bc404b38

2 changed files with 6 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

net/l2tp/l2tp_ip.c

View file

5

net/l2tp/l2tp_ip6.c

View file