hash: fix return value of null not checked
diff mbox series

Message ID d87e2f714999b83c69685950d43a85350dc1441c.1595335031.git.wangyunjian@huawei.com
State Superseded, archived
Delegated to: David Marchand
Headers show
Series
  • hash: fix return value of null not checked
Related show

Checks

Context Check Description
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

wangyunjian July 21, 2020, 1:31 p.m. UTC
From: Yunjian Wang <wangyunjian@huawei.com>

The function rte_zmalloc_socket() could return NULL, the return
value need to be checked.

Fixes: 5915699153d7 ("hash: fix scaling by reducing contention")
Cc: stable@dpdk.org

Reported-by: HuangBin <brian.huangbin@huawei.com>
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 lib/librte_hash/rte_cuckoo_hash.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Honnappa Nagarahalli July 21, 2020, 5:26 p.m. UTC | #1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of wangyunjian
> Sent: Tuesday, July 21, 2020 8:32 AM
> To: dev@dpdk.org
> Cc: yipeng1.wang@intel.com; sameh.gobriel@intel.com;
> bruce.richardson@intel.com; jerry.lilijun@huawei.com;
> xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] hash: fix return value of null not checked
> 
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> The function rte_zmalloc_socket() could return NULL, the return value need to
> be checked.
> 
> Fixes: 5915699153d7 ("hash: fix scaling by reducing contention")
> Cc: stable@dpdk.org
> 
> Reported-by: HuangBin <brian.huangbin@huawei.com>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Good catch
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>

> ---
>  lib/librte_hash/rte_cuckoo_hash.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/librte_hash/rte_cuckoo_hash.c
> b/lib/librte_hash/rte_cuckoo_hash.c
> index 5f701d579..0a6d47471 100644
> --- a/lib/librte_hash/rte_cuckoo_hash.c
> +++ b/lib/librte_hash/rte_cuckoo_hash.c
> @@ -151,6 +151,7 @@ rte_hash_create(const struct rte_hash_parameters
> *params)
>  	unsigned int no_free_on_del = 0;
>  	uint32_t *ext_bkt_to_free = NULL;
>  	uint32_t *tbl_chng_cnt = NULL;
> +	struct lcore_cache *local_free_slots = NULL;
>  	unsigned int readwrite_concur_lf_support = 0;
>  	uint32_t i;
> 
> @@ -383,9 +384,13 @@ rte_hash_create(const struct rte_hash_parameters
> *params)  #endif
> 
>  	if (use_local_cache) {
> -		h->local_free_slots = rte_zmalloc_socket(NULL,
> +		local_free_slots = rte_zmalloc_socket(NULL,
>  				sizeof(struct lcore_cache) * RTE_MAX_LCORE,
>  				RTE_CACHE_LINE_SIZE, params->socket_id);
> +		if (local_free_slots == NULL) {
> +			RTE_LOG(ERR, HASH, "local free slots memory
> allocation failed\n");
> +			goto err_unlock;
> +		}
>  	}
> 
>  	/* Default hash function */
> @@ -416,6 +421,7 @@ rte_hash_create(const struct rte_hash_parameters
> *params)
>  	*h->tbl_chng_cnt = 0;
>  	h->hw_trans_mem_support = hw_trans_mem_support;
>  	h->use_local_cache = use_local_cache;
> +	h->local_free_slots = local_free_slots;
>  	h->readwrite_concur_support = readwrite_concur_support;
>  	h->ext_table_support = ext_table_support;
>  	h->writer_takes_lock = writer_takes_lock; @@ -461,6 +467,7 @@
> rte_hash_create(const struct rte_hash_parameters *params)
>  	rte_ring_free(r);
>  	rte_ring_free(r_ext);
>  	rte_free(te);
> +	rte_free(local_free_slots);
>  	rte_free(h);
>  	rte_free(buckets);
>  	rte_free(buckets_ext);
> --
> 2.23.0
>
Wang, Yipeng1 July 21, 2020, 8:24 p.m. UTC | #2
> -----Original Message-----
> From: Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>
> Sent: Tuesday, July 21, 2020 10:27 AM
> To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: Wang, Yipeng1 <yipeng1.wang@intel.com>; Gobriel, Sameh
> <sameh.gobriel@intel.com>; Richardson, Bruce <bruce.richardson@intel.com>;
> jerry.lilijun@huawei.com; xudingke@huawei.com; stable@dpdk.org; nd
> <nd@arm.com>; Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>;
> nd <nd@arm.com>
> Subject: RE: [dpdk-dev] [PATCH] hash: fix return value of null not checked
> 
> 
> 
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of wangyunjian
> > Sent: Tuesday, July 21, 2020 8:32 AM
> > To: dev@dpdk.org
> > Cc: yipeng1.wang@intel.com; sameh.gobriel@intel.com;
> > bruce.richardson@intel.com; jerry.lilijun@huawei.com;
> > xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> > stable@dpdk.org
> > Subject: [dpdk-dev] [PATCH] hash: fix return value of null not checked
> >
> > From: Yunjian Wang <wangyunjian@huawei.com>
> >
> > The function rte_zmalloc_socket() could return NULL, the return value
> > need to be checked.
> >
> > Fixes: 5915699153d7 ("hash: fix scaling by reducing contention")
> > Cc: stable@dpdk.org
> >
> > Reported-by: HuangBin <brian.huangbin@huawei.com>
[Wang, Yipeng] missed a space in name?

> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> Good catch
> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
[Wang, Yipeng] 
Thanks for the fix!

Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
wangyunjian July 22, 2020, 3:20 a.m. UTC | #3
> -----Original Message-----
> From: Wang, Yipeng1 [mailto:yipeng1.wang@intel.com]
> Sent: Wednesday, July 22, 2020 4:24 AM
> To: Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>; wangyunjian
> <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: Gobriel, Sameh <sameh.gobriel@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; Lilijun (Jerry) <jerry.lilijun@huawei.com>;
> xudingke <xudingke@huawei.com>; stable@dpdk.org; nd <nd@arm.com>
> Subject: RE: [dpdk-dev] [PATCH] hash: fix return value of null not checked
> 
> > -----Original Message-----
> > From: Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>
> > Sent: Tuesday, July 21, 2020 10:27 AM
> > To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> > Cc: Wang, Yipeng1 <yipeng1.wang@intel.com>; Gobriel, Sameh
> > <sameh.gobriel@intel.com>; Richardson, Bruce
> > <bruce.richardson@intel.com>; jerry.lilijun@huawei.com;
> > xudingke@huawei.com; stable@dpdk.org; nd <nd@arm.com>; Honnappa
> > Nagarahalli <Honnappa.Nagarahalli@arm.com>; nd <nd@arm.com>
> > Subject: RE: [dpdk-dev] [PATCH] hash: fix return value of null not
> > checked
> >
> >
> >
> > > -----Original Message-----
> > > From: dev <dev-bounces@dpdk.org> On Behalf Of wangyunjian
> > > Sent: Tuesday, July 21, 2020 8:32 AM
> > > To: dev@dpdk.org
> > > Cc: yipeng1.wang@intel.com; sameh.gobriel@intel.com;
> > > bruce.richardson@intel.com; jerry.lilijun@huawei.com;
> > > xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> > > stable@dpdk.org
> > > Subject: [dpdk-dev] [PATCH] hash: fix return value of null not
> > > checked
> > >
> > > From: Yunjian Wang <wangyunjian@huawei.com>
> > >
> > > The function rte_zmalloc_socket() could return NULL, the return
> > > value need to be checked.
> > >
> > > Fixes: 5915699153d7 ("hash: fix scaling by reducing contention")
> > > Cc: stable@dpdk.org
> > >
> > > Reported-by: HuangBin <brian.huangbin@huawei.com>
> [Wang, Yipeng] missed a space in name?

Thanks, I will send v2 with correction.

Yunjian

> 
> > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > Good catch
> > Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
> [Wang, Yipeng]
> Thanks for the fix!
> 
> Acked-by: Yipeng Wang <yipeng1.wang@intel.com>

Patch
diff mbox series

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 5f701d579..0a6d47471 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -151,6 +151,7 @@  rte_hash_create(const struct rte_hash_parameters *params)
 	unsigned int no_free_on_del = 0;
 	uint32_t *ext_bkt_to_free = NULL;
 	uint32_t *tbl_chng_cnt = NULL;
+	struct lcore_cache *local_free_slots = NULL;
 	unsigned int readwrite_concur_lf_support = 0;
 	uint32_t i;
 
@@ -383,9 +384,13 @@  rte_hash_create(const struct rte_hash_parameters *params)
 #endif
 
 	if (use_local_cache) {
-		h->local_free_slots = rte_zmalloc_socket(NULL,
+		local_free_slots = rte_zmalloc_socket(NULL,
 				sizeof(struct lcore_cache) * RTE_MAX_LCORE,
 				RTE_CACHE_LINE_SIZE, params->socket_id);
+		if (local_free_slots == NULL) {
+			RTE_LOG(ERR, HASH, "local free slots memory allocation failed\n");
+			goto err_unlock;
+		}
 	}
 
 	/* Default hash function */
@@ -416,6 +421,7 @@  rte_hash_create(const struct rte_hash_parameters *params)
 	*h->tbl_chng_cnt = 0;
 	h->hw_trans_mem_support = hw_trans_mem_support;
 	h->use_local_cache = use_local_cache;
+	h->local_free_slots = local_free_slots;
 	h->readwrite_concur_support = readwrite_concur_support;
 	h->ext_table_support = ext_table_support;
 	h->writer_takes_lock = writer_takes_lock;
@@ -461,6 +467,7 @@  rte_hash_create(const struct rte_hash_parameters *params)
 	rte_ring_free(r);
 	rte_ring_free(r_ext);
 	rte_free(te);
+	rte_free(local_free_slots);
 	rte_free(h);
 	rte_free(buckets);
 	rte_free(buckets_ext);