Commit d3dcf8eb authored Mar 04, 2018 by Paul Blakey Committed by David S. Miller Mar 07, 2018

rhashtable: Fix rhlist duplicates insertion



When inserting duplicate objects (those with the same key),
current rhlist implementation messes up the chain pointers by
updating the bucket pointer instead of prev next pointer to the
newly inserted node. This causes missing elements on removal and
travesal.

Fix that by properly updating pprev pointer to point to
the correct rhash_head next pointer.

Issue: 1241076
Change-Id: I86b2c140bcb4aeb10b70a72a267ff590bb2b17e7
Fixes: ca26893f ('rhashtable: Add rhlist interface')
Signed-off-by: Paul Blakey <paulb@mellanox.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 25b5cdfc

include/linux/rhashtable.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -766,8 +766,10 @@ slow_path:
		if (!key \|\|
		(params.obj_cmpfn ?
		params.obj_cmpfn(&arg, rht_obj(ht, head)) :
		rhashtable_compare(&arg, rht_obj(ht, head))))
		rhashtable_compare(&arg, rht_obj(ht, head)))) {
		pprev = &head->next;
		continue;
		}

		data = rht_obj(ht, head);

lib/rhashtable.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -506,8 +506,10 @@ static void rhashtable_lookup_one(struct rhashtable ht,
		if (!key \|\|
		(ht->p.obj_cmpfn ?
		ht->p.obj_cmpfn(&arg, rht_obj(ht, head)) :
		rhashtable_compare(&arg, rht_obj(ht, head))))
		rhashtable_compare(&arg, rht_obj(ht, head)))) {
		pprev = &head->next;
		continue;
		}

		if (!ht->rhlist)
		return rht_obj(ht, head);

Admin message