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

Commit ad621704 authored by Paul Blakey's avatar Paul Blakey Committed by Greg Kroah-Hartman
Browse files

rhashtable: Fix rhlist duplicates insertion 




[ Upstream commit d3dcf8eb615537526bd42ff27a081d46d337816e ]

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: default avatarPaul Blakey <paulb@mellanox.com>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe3627f6

include/linux/rhashtable.h

+3 −1
Original line number Diff line number Diff line
@@ -706,8 +706,10 @@ static inline void *__rhashtable_insert_fast( 
		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
@@ -448,8 +448,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);