]> git.ipfire.org Git - thirdparty/linux.git/commit
rhashtable: Fix rhashtable_try_insert test
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 14 Jan 2025 03:15:19 +0000 (11:15 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sun, 19 Jan 2025 04:44:28 +0000 (12:44 +0800)
commit9d4f8e54cef2c42e23ef258833dbd06a1eaff89b
treec615255a7203eb9b9e3cca1fd3f6cd2b33322244
parent076d9119cc3292c20524ceeecfbed9b3e9c7221b
rhashtable: Fix rhashtable_try_insert test

The test on whether rhashtable_insert_one did an insertion relies
on the value returned by rhashtable_lookup_one.  Unfortunately that
value is overwritten after rhashtable_insert_one returns.  Fix this
by moving the test before data gets overwritten.

Simplify the test as only data == NULL matters.

Finally move atomic_inc back within the lock as otherwise it may
be reordered with the atomic_dec on the removal side, potentially
leading to an underflow.

Reported-by: Michael Kelley <mhklinux@outlook.com>
Fixes: e1d3422c95f0 ("rhashtable: Fix potential deadlock by moving schedule_work outside lock")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Michael Kelley <mhklinux@outlook.com>
Reviewed-by: Breno Leitao <leitao@debian.org>
Tested-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
lib/rhashtable.c