hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: ca26893f05 ('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>
This commit is contained in:
Paul Blakey 2018-03-04 17:29:48 +02:00 committed by David S. Miller
parent 25b5cdfcce
commit d3dcf8eb61
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/rhashtable.h
View File

@ -766,8 +766,10 @@ slow_path:
if (!key || if (!key ||
(params.obj_cmpfn ? (params.obj_cmpfn ?
params.obj_cmpfn(&arg, rht_obj(ht, head)) : 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; continue;
}
data = rht_obj(ht, head); data = rht_obj(ht, head);

4
lib/rhashtable.c
View File

@ -506,8 +506,10 @@ static void *rhashtable_lookup_one(struct rhashtable *ht,
if (!key || if (!key ||
(ht->p.obj_cmpfn ? (ht->p.obj_cmpfn ?
ht->p.obj_cmpfn(&arg, rht_obj(ht, head)) : 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; continue;
}
if (!ht->rhlist) if (!ht->rhlist)
return rht_obj(ht, head); return rht_obj(ht, head);