From 52c7abbea95064edd73eee6ab1ceafaab066d55a Mon Sep 17 00:00:00 2001 From: Dharmik Thakkar Date: Thu, 9 May 2019 17:19:06 +0000 Subject: [PATCH] hash: fix total entries count In rte_hash, with current implementation, it is possible that keys are stored at indexes greater than the number of total entries. Currently, in rte_hash_free_key_with_position(), due to incorrect computation of total_entries, application cannot free keys with indexes greater than the number of total entries. This patch fixes this incorrect computation of total_entries. Bugzilla ID: 261 Fixes: 9d033dac7d7c ("hash: support no free on delete") Cc: stable@dpdk.org Reported-by: Linfan Suggested-by: Linfan Signed-off-by: Dharmik Thakkar Acked-by: Yipeng Wang --- lib/librte_hash/rte_cuckoo_hash.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c index 1f5808ebaf..2dc423fba0 100644 --- a/lib/librte_hash/rte_cuckoo_hash.c +++ b/lib/librte_hash/rte_cuckoo_hash.c @@ -1594,7 +1594,9 @@ rte_hash_free_key_with_position(const struct rte_hash *h, unsigned int lcore_id, n_slots; struct lcore_cache *cached_free_slots; - const uint32_t total_entries = h->num_buckets * RTE_HASH_BUCKET_ENTRIES; + const uint32_t total_entries = h->use_local_cache ? + h->entries + (RTE_MAX_LCORE - 1) * (LCORE_CACHE_SIZE - 1) + 1 + : h->entries + 1; /* Out of bounds */ if (key_idx >= total_entries) -- 2.20.1