[dpdk-dev] [PATCH] net/ice: fix missed pointer check

[Ananyev, Konstantin]

> -----Original Message-----
> From: dev <dev-bounces at dpdk.org> On Behalf Of Wenzhuo Lu
> Sent: Tuesday, November 10, 2020 6:46 AM
> To: dev at dpdk.org
> Cc: Lu, Wenzhuo <wenzhuo.lu at intel.com>
> Subject: [dpdk-dev] [PATCH] net/ice: fix missed pointer check
> 
> The return value of rte_mempool_default_cache should be
> checked as it can be NULL.
> 
> Fixes: a4e480de268e ("net/ice: optimize Tx by using AVX512")
> 
> Reported-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
> Signed-off-by: Wenzhuo Lu <wenzhuo.lu at intel.com>
> ---
>  drivers/net/ice/ice_rxtx_vec_avx512.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ice/ice_rxtx_vec_avx512.c b/drivers/net/ice/ice_rxtx_vec_avx512.c
> index e5e7cc1..af6b324 100644
> --- a/drivers/net/ice/ice_rxtx_vec_avx512.c
> +++ b/drivers/net/ice/ice_rxtx_vec_avx512.c
> @@ -781,9 +781,14 @@
> 
>  	if (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE && (n & 31) == 0) {
>  		struct rte_mempool *mp = txep[0].mbuf->pool;
> +		void **cache_objs;
>  		struct rte_mempool_cache *cache = rte_mempool_default_cache(mp,
>  				rte_lcore_id());
> -		void **cache_objs = &cache->objs[cache->len];
> +
> +		if (!cache || cache->len == 0)
> +			goto normal;
> +
> +		cache_objs = &cache->objs[cache->len];
> 
>  		if (n > RTE_MEMPOOL_CACHE_MAX_SIZE) {
>  			rte_mempool_ops_enqueue_bulk(mp, (void *)txep, n);
> @@ -821,6 +826,7 @@
>  		goto done;
>  	}
> 
> +normal:
>  	m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
>  	if (likely(m)) {
>  		free[0] = m;
> --

Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>

> 1.9.3