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)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Mar 2017 16:26:28 +0000 (09:26 -0700)
commit94d7ee0baa8b764cf64ad91ed69464c1a6a0066b
tree03e6f31158e3e4da7163606af6729383013a7a48
parentb768b16de58d5e0b1d7c3f936825b25327ced20c
l2tp: hold tunnel socket when handling control frames in l2tp_ip and l2tp_ip6

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>
net/l2tp/l2tp_ip.c
net/l2tp/l2tp_ip6.c