Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4d2603d authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

rhashtable: Fix RCU dereference annotation in rht_bucket_nested 



The current annotation is wrong as it says that we're only called
under spinlock.  In fact it should be marked as under either
spinlock or RCU read lock.

Fixes: da20420f ("rhashtable: Add nested tables")
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca435407

lib/rhashtable.c

+3 −2
Original line number Diff line number Diff line
@@ -1121,12 +1121,13 @@ struct rhash_head __rcu **rht_bucket_nested(const struct bucket_table *tbl, 
	union nested_table *ntbl;



	ntbl = (union nested_table *)rcu_dereference_raw(tbl->buckets[0]);

	ntbl = rht_dereference_bucket(ntbl[index].table, tbl, hash);

	ntbl = rht_dereference_bucket_rcu(ntbl[index].table, tbl, hash);

	subhash >>= tbl->nest;



	while (ntbl && size > (1 << shift)) {

		index = subhash & ((1 << shift) - 1);

		ntbl = rht_dereference_bucket(ntbl[index].table, tbl, hash);

		ntbl = rht_dereference_bucket_rcu(ntbl[index].table,

						  tbl, hash);

		size >>= shift;

		subhash >>= shift;

	}