| commit | 7d5eb39c0d8cb1a8ddfc137dac2086692362a044 | |
| author | Guillaume Nault <g.nault@alphalink.fr> | |
| Wed, 29 Mar 2017 06:44:59 +0000 (29 08:44 +0200) | ||
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| Wed, 3 May 2017 15:37:39 +0000 (3 08:37 -0700) | ||
| tree | 20d9ba31ee69f20741008369a087344f181cae17 | treesnapshot (tar.gz zip) |
| parent | 63ae30d5caa7dbca7128bb3bc325e72b73cea945 | commitdiff |
l2tp: hold tunnel socket when handling control frames in l2tp_ip and l2tp_ip6
[ 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>
[ 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>
| net/l2tp/l2tp_ip.c | diffblobblamehistory | |
| net/l2tp/l2tp_ip6.c | diffblobblamehistory |