diff options
| author |   Guillaume Nault <g.nault@alphalink.fr> | 2016-11-29 13:09:45 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-30 14:14:07 -0500 |
| commit | a3c18422a4b4e108bcf6a2328f48867e1003fd95 (patch) | |
| tree | eeca3ead29ffaf135c31d9a11b29b082766b22cc /net/l2tp/l2tp_ip.c | |
| parent | l2tp: lock socket before checking flags in connect() (diff) | |
| download | linux-dev-a3c18422a4b4e108bcf6a2328f48867e1003fd95.tar.xz linux-dev-a3c18422a4b4e108bcf6a2328f48867e1003fd95.zip | |
l2tp: hold socket before dropping lock in l2tp_ip{, 6}_recv()
Socket must be held while under the protection of the l2tp lock; there
is no guarantee that sk remains valid after the read_unlock_bh() call.
Same issue for l2tp_ip and l2tp_ip6.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_ip.c')
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 1f57094d3111..4d1c942cc91b 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -183,14 +183,15 @@ pass_up: read_lock_bh(&l2tp_ip_lock); sk = __l2tp_ip_bind_lookup(net, iph->daddr, 0, tunnel_id); + if (!sk) { + read_unlock_bh(&l2tp_ip_lock); + goto discard; + } + + sock_hold(sk); read_unlock_bh(&l2tp_ip_lock); } - if (sk == NULL) - goto discard; - - sock_hold(sk); - if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) goto discard_put; |