Thread (3 messages) 3 messages, 3 authors, 2015-07-28

[PATCH] hash: fix crash when adding already inserted keys

flat view
STALE4103d

From: Xavier Simonart <hidden>
Date: 2015-07-28 15:02:46
Subsystem: library code, the rest · Maintainers: Andrew Morton, Linus Torvalds

When adding with cuckoo hash a key which was already inserted
a new slot is dequeued and then enqueued back, but the enqueue
operation was not done properly.

Signed-off-by: Xavier Simonart <redacted>
---
 lib/librte_hash/rte_cuckoo_hash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 5cf4af6..4da859a 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -509,7 +509,7 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,
 			k = (struct rte_hash_key *) ((char *)keys +
 					prim_bkt->key_idx[i] * h->key_entry_size);
 			if (h->rte_hash_cmp_eq(key, k->key, h->key_len) == 0) {
-				rte_ring_sp_enqueue(h->free_slots, &slot_id);
+				rte_ring_sp_enqueue(h->free_slots, slot_id);
 				/* Update data */
 				k->pdata = data;
 				/*
@@ -528,7 +528,7 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,
 			k = (struct rte_hash_key *) ((char *)keys +
 					sec_bkt->key_idx[i] * h->key_entry_size);
 			if (h->rte_hash_cmp_eq(key, k->key, h->key_len) == 0) {
-				rte_ring_sp_enqueue(h->free_slots, &slot_id);
+				rte_ring_sp_enqueue(h->free_slots, slot_id);
 				/* Update data */
 				k->pdata = data;
 				/*
-- 
1.8.3.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help