From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: Kishore Padmanabha <kishore.padmanabha@broadcom.com>,
stable@dpdk.org,
Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>,
Mike Baucom <michael.baucom@broadcom.com>,
Randy Schacher <stuart.schacher@broadcom.com>
Subject: [dpdk-stable] [PATCH v4 03/20] net/bnxt: fix out of bounds issue in hash list
Date: Tue, 2 Nov 2021 17:52:34 -0700 [thread overview]
Message-ID: <20211103005251.25524-4-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20211103005251.25524-1-ajit.khaparde@broadcom.com>
[-- Attachment #1: Type: text/plain, Size: 3050 bytes --]
From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
The number of hash bucket list calculation is fixed.
Added check to avoid the out of bounds condition.
Fixes: 0001cc58d362 ("net/bnxt: support generic hash table")
Cc: stable@dpdk.org
Signed-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Reviewed-by: Mike Baucom <michael.baucom@broadcom.com>
Reviewed-by: Randy Schacher <stuart.schacher@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/tf_ulp/ulp_gen_hash.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_gen_hash.c b/drivers/net/bnxt/tf_ulp/ulp_gen_hash.c
index 3c6e7fe924..84c83de35c 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_gen_hash.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_gen_hash.c
@@ -16,20 +16,21 @@ int32_t ulp_bit_alloc_list_alloc(struct bit_alloc_list *blist,
{
uint64_t bentry;
uint32_t idx = 0, jdx = 0;
+ uint32_t bsize_64 = blist->bsize / ULP_64B_IN_BYTES;
/* Iterate all numbers that have all 1's */
do {
bentry = blist->bdata[idx++];
- } while (bentry == -1UL && idx < blist->bsize);
+ } while (bentry == -1UL && idx <= bsize_64);
- if (idx < blist->bsize) {
+ if (idx <= bsize_64) {
if (bentry)
jdx = __builtin_clzl(~bentry);
*index = ((idx - 1) * ULP_INDEX_BITMAP_SIZE) + jdx;
ULP_INDEX_BITMAP_SET(blist->bdata[(idx - 1)], jdx);
return 0;
}
- jdx = (uint32_t)(blist->bsize * ULP_INDEX_BITMAP_SIZE);
+ jdx = (uint32_t)(bsize_64 * ULP_INDEX_BITMAP_SIZE);
BNXT_TF_DBG(ERR, "bit allocator is full reached max:%x\n", jdx);
return -1;
}
@@ -39,9 +40,10 @@ int32_t ulp_bit_alloc_list_dealloc(struct bit_alloc_list *blist,
uint32_t index)
{
uint32_t idx = 0, jdx;
+ uint32_t bsize_64 = blist->bsize / ULP_64B_IN_BYTES;
idx = index / ULP_INDEX_BITMAP_SIZE;
- if (idx >= blist->bsize) {
+ if (idx >= bsize_64) {
BNXT_TF_DBG(ERR, "invalid bit index %x:%x\n", idx,
blist->bsize);
return -EINVAL;
@@ -127,7 +129,8 @@ ulp_gen_hash_tbl_list_init(struct ulp_hash_create_params *cparams,
hash_tbl->hash_mask = size - 1;
/* allocate the memory for the bit allocator */
- size = (cparams->num_key_entries / sizeof(uint64_t)) + 1;
+ size = (cparams->num_key_entries / sizeof(uint64_t));
+ size = ULP_BYTE_ROUND_OFF_8(size);
hash_tbl->bit_list.bsize = size;
hash_tbl->bit_list.bdata = rte_zmalloc("Generic hash bit alloc", size,
ULP_BUFFER_ALIGN_64_BYTE);
@@ -311,7 +314,12 @@ ulp_gen_hash_tbl_list_add(struct ulp_gen_hash_tbl *hash_tbl,
BNXT_TF_DBG(ERR, "Error in bit list alloc\n");
return -ENOMEM;
}
-
+ if (key_index > hash_tbl->num_key_entries) {
+ BNXT_TF_DBG(ERR, "reached max size %u:%u\n", key_index,
+ hash_tbl->num_key_entries);
+ ulp_bit_alloc_list_dealloc(&hash_tbl->bit_list, key_index);
+ return -ENOMEM;
+ }
/* Update the hash entry */
ULP_HASH_BUCKET_MARK_INUSE(bucket, (uint16_t)key_index);
--
2.30.1 (Apple Git-130)
next parent reply other threads:[~2021-11-03 0:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20211102040556.7840-1-venkatkumar.duvvuru@broadcom.com>
[not found] ` <20211103005251.25524-1-ajit.khaparde@broadcom.com>
2021-11-03 0:52 ` Ajit Khaparde [this message]
2021-11-03 0:52 ` [dpdk-stable] [PATCH v4 11/20] net/bnxt: fix clang compiler warnings Ajit Khaparde
2021-11-03 13:24 ` [dpdk-stable] [dpdk-dev] " Ferruh Yigit
[not found] ` <20211104215846.58672-1-ajit.khaparde@broadcom.com>
2021-11-04 21:58 ` [dpdk-stable] [PATCH v5 03/22] net/bnxt: fix out of bounds issue in hash list Ajit Khaparde
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=20211103005251.25524-4-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=kishore.padmanabha@broadcom.com \
--cc=michael.baucom@broadcom.com \
--cc=stable@dpdk.org \
--cc=stuart.schacher@broadcom.com \
--cc=venkatkumar.duvvuru@broadcom.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).