diff options
author | Eric Dumazet <edumazet@google.com> | 2017-03-24 19:36:13 -0700 |
---|---|---|
committer | Andreas Blaesius <skate4life@gmx.de> | 2017-06-07 16:50:06 +0200 |
commit | 524c55b2e35b43861b1c02d6dddfa6c604a9e61d (patch) | |
tree | a8ee3677abcb4fb8f3d897af801102e790592529 | |
parent | cf47c5c53757d49dbcf7088364d00e99b3f8774e (diff) | |
download | kernel_samsung_espresso10-524c55b2e35b43861b1c02d6dddfa6c604a9e61d.tar.gz kernel_samsung_espresso10-524c55b2e35b43861b1c02d6dddfa6c604a9e61d.tar.bz2 kernel_samsung_espresso10-524c55b2e35b43861b1c02d6dddfa6c604a9e61d.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.
Change-Id: I7de7df3a5ab5b5f7a41635799522bbf9a5395ad0
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>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 c6cff9a247a..740bbe2c5b7 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -150,15 +150,16 @@ void ping_unhash(struct sock *sk) { struct inet_sock *isk = inet_sk(sk); pr_debug("ping_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 = 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); } EXPORT_SYMBOL_GPL(ping_unhash); |