hash: fix crash when adding already inserted keys
authorXavier Simonart <xavier.simonart@intel.com>
Tue, 28 Jul 2015 14:54:39 +0000 (16:54 +0200)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Tue, 28 Jul 2015 20:09:30 +0000 (22:09 +0200)
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.

Fixes: 48a399119619 ("hash: replace with cuckoo hash implementation")

Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
lib/librte_hash/rte_cuckoo_hash.c

index 5cf4af6..4da859a 100644 (file)
@@ -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;
                                /*