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

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

[Wenzhuo Lu]

The return value of rte_mempool_default_cache should be
checked as it can be NULL.

Fixes: 9ab9514c150e ("net/iavf: enable AVX512 for Tx")

Reported-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
index 8680734..584d12e 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
@@ -1424,7 +1424,12 @@
 		struct rte_mempool *mp = txep[0].mbuf->pool;
 		struct rte_mempool_cache *cache = rte_mempool_default_cache(mp,
 								rte_lcore_id());
-		void **cache_objs = &cache->objs[cache->len];
+		void **cache_objs;
+
+		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);
@@ -1462,6 +1467,7 @@
 		goto done;
 	}
 
+normal:
 	m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
 	if (likely(m)) {
 		free[0] = m;
-- 
1.9.3

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

[Ananyev, Konstantin]

> The return value of rte_mempool_default_cache should be
> checked as it can be NULL.
> 
> Fixes: 9ab9514c150e ("net/iavf: enable AVX512 for Tx")
> 
> Reported-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
> ---
>  drivers/net/iavf/iavf_rxtx_vec_avx512.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
> index 8680734..584d12e 100644
> --- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
> +++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
> @@ -1424,7 +1424,12 @@
>  		struct rte_mempool *mp = txep[0].mbuf->pool;
>  		struct rte_mempool_cache *cache = rte_mempool_default_cache(mp,
>  								rte_lcore_id());
> -		void **cache_objs = &cache->objs[cache->len];
> +		void **cache_objs;
> +
> +		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);
> @@ -1462,6 +1467,7 @@
>  		goto done;
>  	}
> 
> +normal:
>  	m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
>  	if (likely(m)) {
>  		free[0] = m;
> --

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

> 1.9.3

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

[Zhang, Qi Z]

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Ananyev, Konstantin
> Sent: Tuesday, November 10, 2020 6:06 PM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; dev@dpdk.org
> Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>
> Subject: Re: [dpdk-dev] [PATCH] net/iavf: fix missed pointer check
> 
> 
> 
> > The return value of rte_mempool_default_cache should be checked as it
> > can be NULL.
> >
> > Fixes: 9ab9514c150e ("net/iavf: enable AVX512 for Tx")
> >
> > Reported-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> > Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
> > ---
> >  drivers/net/iavf/iavf_rxtx_vec_avx512.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
> > b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
> > index 8680734..584d12e 100644
> > --- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
> > +++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
> > @@ -1424,7 +1424,12 @@
> >  		struct rte_mempool *mp = txep[0].mbuf->pool;
> >  		struct rte_mempool_cache *cache =
> rte_mempool_default_cache(mp,
> >  								rte_lcore_id());
> > -		void **cache_objs = &cache->objs[cache->len];
> > +		void **cache_objs;
> > +
> > +		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); @@
> -1462,6
> > +1467,7 @@
> >  		goto done;
> >  	}
> >
> > +normal:
> >  	m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
> >  	if (likely(m)) {
> >  		free[0] = m;
> > --
> 
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
> 
> > 1.9.3