diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-03-24 19:36:13 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-06-08 00:47:09 +0200 |
| commit | 60f704bdd703447fd0e5a3e0a09d9a84d523292e (patch) | |
| tree | edc1d14c55dc9ae0e90a03f8d1e8235fa87b8923 /net | |
| parent | 3d46433da69cf192317c0368082caa33177a3939 (diff) | |
| download | linux-60f704bdd703447fd0e5a3e0a09d9a84d523292e.tar.gz linux-60f704bdd703447fd0e5a3e0a09d9a84d523292e.tar.bz2 linux-60f704bdd703447fd0e5a3e0a09d9a84d523292e.zip | |
ping: implement proper locking
commit 43a6684519ab0a6c52024b5e25322476cabad893 upstream.
We got a report of yet another bug in ping
http://www.openwall.com/lists/oss-security/2017/03/24/6
->disconnect() is not called with socket lock held.
Fix this by acquiring ping rwlock earlier.
Thanks to Daniel, Alexander and Andrey for letting us know this problem.
Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Daniel Jiang <danieljiang0415@gmail.com>
Reported-by: Solar Designer <solar@openwall.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[wt: the function is ping_v4_unhash() in 3.10]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ping.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 431d597515d2..0b778d75e38d 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -135,17 +135,18 @@ static void ping_v4_hash(struct sock *sk) static void ping_v4_unhash(struct sock *sk) { struct inet_sock *isk = inet_sk(sk); + pr_debug("ping_v4_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num); + write_lock_bh(&ping_table.lock); if (sk_hashed(sk)) { - write_lock_bh(&ping_table.lock); hlist_nulls_del(&sk->sk_nulls_node); sk_nulls_node_init(&sk->sk_nulls_node); sock_put(sk); isk->inet_num = 0; isk->inet_sport = 0; sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); - write_unlock_bh(&ping_table.lock); } + write_unlock_bh(&ping_table.lock); } static struct sock *ping_v4_lookup(struct net *net, __be32 saddr, __be32 daddr, |