]> git.baikalelectronics.ru Git - kernel.git/commit
wireguard: peerlookup: take lock before checking hash in replace operation
authorJason A. Donenfeld <Jason@zx2c4.com>
Wed, 9 Sep 2020 11:58:15 +0000 (13:58 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Sep 2020 18:31:38 +0000 (11:31 -0700)
commite720b7fdf00976bbe139c06e5b3433155a6a24f4
tree4c71c1a13438f2e6ebd8b9fec36a77f8efcd5d94
parent3c8c097f18e80da08aed1a11952bb2922ea798b6
wireguard: peerlookup: take lock before checking hash in replace operation

Eric's suggested fix for the previous commit's mentioned race condition
was to simply take the table->lock in wg_index_hashtable_replace(). The
table->lock of the hash table is supposed to protect the bucket heads,
not the entires, but actually, since all the mutator functions are
already taking it, it makes sense to take it too for the test to
hlist_unhashed, as a defense in depth measure, so that it no longer
races with deletions, regardless of what other locks are protecting
individual entries. This is sensible from a performance perspective
because, as Eric pointed out, the case of being unhashed is already the
unlikely case, so this won't add common contention. And comparing
instructions, this basically doesn't make much of a difference other
than pushing and popping %r13, used by the new `bool ret`. More
generally, I like the idea of locking consistency across table mutator
functions, and this might let me rest slightly easier at night.

Suggested-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/wireguard/20200908145911.4090480-1-edumazet@google.com/
Fixes: 4dff5496e367 ("net: WireGuard secure network tunnel")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireguard/peerlookup.c