From: Kevin Traynor <ktraynor@redhat.com>
To: dev@dpdk.org, yipeng1.wang@intel.com, sameh.gobriel@intel.com,
bruce.richardson@intel.com
Cc: honnappa.nagarahalli@arm.com, ferruh.yigit@intel.com,
david.marchand@redhat.com, Kevin Traynor <ktraynor@redhat.com>,
stable@dpdk.org
Subject: [dpdk-dev] [PATCH] hash: fix gcc 10 maybe-uninitialized warning
Date: Fri, 15 May 2020 15:28:08 +0100 [thread overview]
Message-ID: <20200515142808.14064-1-ktraynor@redhat.com> (raw)
gcc 10.1.1 reports a warning for the ext_bkt_id variable:
../lib/librte_hash/rte_cuckoo_hash.c:
In function ‘__rte_hash_add_key_with_hash’:
../lib/librte_hash/rte_cuckoo_hash.c:1104:29:
warning: ‘ext_bkt_id’ may be used uninitialized in this function
[-Wmaybe-uninitialized]
1104 | (h->buckets_ext[ext_bkt_id - 1]).sig_current[0] = short_sig;
| ~~~~~~~~~~~^~~
The return value of rte_ring_sc_dequeue_elem() is already checked,
but also initialize ext_bkt_id to zero (invalid value) and check
that it also overwritten.
Fixes: fbfe568103b0 ("hash: use 32-bit elements rings to save memory")
Cc: stable@dpdk.org
Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
---
lib/librte_hash/rte_cuckoo_hash.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 38767a8a1..90cb99b0e 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -940,6 +940,6 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,
struct rte_hash_bucket *prim_bkt, *sec_bkt, *cur_bkt;
struct rte_hash_key *new_k, *keys = h->key_store;
+ uint32_t ext_bkt_id = 0;
uint32_t slot_id;
- uint32_t ext_bkt_id;
int ret;
unsigned n_slots;
@@ -1096,5 +1096,6 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,
*/
if (rte_ring_sc_dequeue_elem(h->free_ext_bkts, &ext_bkt_id,
- sizeof(uint32_t)) != 0) {
+ sizeof(uint32_t)) != 0 ||
+ ext_bkt_id == 0) {
ret = -ENOSPC;
goto failure;
--
2.21.3
next reply other threads:[~2020-05-15 14:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 14:28 Kevin Traynor [this message]
2020-05-15 19:06 ` Wang, Yipeng1
2020-05-15 19:17 ` Kevin Traynor
2020-05-15 20:04 ` Wang, Yipeng1
2020-05-18 11:48 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200515142808.14064-1-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=honnappa.nagarahalli@arm.com \
--cc=sameh.gobriel@intel.com \
--cc=stable@dpdk.org \
--cc=yipeng1.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).