diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-03-24 19:36:13 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-06-17 16:06:04 +0200 |
| commit | 4eeb4909d28214a263ddbe532a2e26c23af66a07 (patch) | |
| tree | 92d7262898b06d62373ae8f9fd92d8f24c1b2e41 /net | |
| parent | 069ffd0fa2e7dc173f3d3a9b48f24c28275c328b (diff) | |
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>
Conflicts:
net/ipv4/ping.c
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ping.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 153762377..9c5c9311c 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -151,7 +151,7 @@ void ping_unhash(struct sock *sk) { struct inet_sock *isk = inet_sk(sk); - pr_info("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num); + pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num); write_lock_bh(&ping_table.lock); if (sk_hashed(sk)) { hlist_nulls_del(&sk->sk_nulls_node); @@ -160,7 +160,6 @@ void ping_unhash(struct sock *sk) isk->inet_num = 0; isk->inet_sport = 0; sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); - pr_info("ping_unhash(isk=%p,sk=%p)\n", isk, sk); } write_unlock_bh(&ping_table.lock); } |