[PATCH] net/ice: fix null pointer dereferences

[PATCH] net/ice: fix null pointer dereferences

[Wenwu Ma]

This patch fixes two null pointer dereferences detected by
coverity scan.

Coverity issue: 414096
Fixes: 6ccef90ff5d3 ("net/ice: support VSI level bandwidth config")

Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
---
 drivers/net/ice/ice_tm.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c
index fbab0b8808..e10ac855f9 100644
--- a/drivers/net/ice/ice_tm.c
+++ b/drivers/net/ice/ice_tm.c
@@ -616,7 +616,10 @@ static int ice_set_node_rate(struct ice_hw *hw,
 					   ICE_MAX_BW,
 					   rate);
 	if (status) {
-		PMD_DRV_LOG(ERR, "Failed to set max bandwidth for node %u", tm_node->id);
+		if (tm_node != NULL)
+			PMD_DRV_LOG(ERR, "Failed to set max bandwidth for node %u", tm_node->id);
+		else
+			PMD_DRV_LOG(ERR, "Failed to set max bandwidth");
 		return -EINVAL;
 	}
 
@@ -630,7 +633,10 @@ static int ice_set_node_rate(struct ice_hw *hw,
 					   ICE_MIN_BW,
 					   rate);
 	if (status) {
-		PMD_DRV_LOG(ERR, "Failed to set min bandwidth for node %u", tm_node->id);
+		if (tm_node != NULL)
+			PMD_DRV_LOG(ERR, "Failed to set min bandwidth for node %u", tm_node->id);
+		else
+			PMD_DRV_LOG(ERR, "Failed to set min bandwidth");
 		return -EINVAL;
 	}
 
-- 
2.25.1

Re: [PATCH] net/ice: fix null pointer dereferences

[Bruce Richardson]

On Fri, Mar 01, 2024 at 01:20:29PM +0800, Wenwu Ma wrote:
> This patch fixes two null pointer dereferences detected by
> coverity scan.
> 
> Coverity issue: 414096
> Fixes: 6ccef90ff5d3 ("net/ice: support VSI level bandwidth config")
> 
> Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
> ---
>  drivers/net/ice/ice_tm.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c
> index fbab0b8808..e10ac855f9 100644
> --- a/drivers/net/ice/ice_tm.c
> +++ b/drivers/net/ice/ice_tm.c
> @@ -616,7 +616,10 @@ static int ice_set_node_rate(struct ice_hw *hw,
>  					   ICE_MAX_BW,
>  					   rate);
>  	if (status) {
> -		PMD_DRV_LOG(ERR, "Failed to set max bandwidth for node %u", tm_node->id);
> +		if (tm_node != NULL)
> +			PMD_DRV_LOG(ERR, "Failed to set max bandwidth for node %u", tm_node->id);
> +		else
> +			PMD_DRV_LOG(ERR, "Failed to set max bandwidth");
>  		return -EINVAL;
>  	}
>  
> @@ -630,7 +633,10 @@ static int ice_set_node_rate(struct ice_hw *hw,
>  					   ICE_MIN_BW,
>  					   rate);
>  	if (status) {
> -		PMD_DRV_LOG(ERR, "Failed to set min bandwidth for node %u", tm_node->id);
> +		if (tm_node != NULL)
> +			PMD_DRV_LOG(ERR, "Failed to set min bandwidth for node %u", tm_node->id);
> +		else
> +			PMD_DRV_LOG(ERR, "Failed to set min bandwidth");
>  		return -EINVAL;
>  	}
>  
Hi Wenwu,

I'm not sure that this is the best fix here, since the error message
doesn't seem particularly useful without the node id. Looking at the code,
this is a static function, so non-public, and only called in three places in
rte_tm.c: from ice_cfg_hw_node, ice_do_hierarchy_commit and
ice_reset_nolead_nodes. In all three cases, failure of this function is
immediately followed by a more specific error message from the calling
function. Therefore, I think we can solve the coverity problem by just
deleting the error prints from here completely, and let the callers manage
error reporting.

What do you think?

/Bruce

RE: [PATCH] net/ice: fix null pointer dereferences

[Ma, WenwuX]

> -----Original Message-----
> From: Richardson, Bruce <bruce.richardson@intel.com>
> Sent: Friday, March 1, 2024 6:35 PM
> To: Ma, WenwuX <wenwux.ma@intel.com>
> Cc: dev@dpdk.org; Jiale, SongX <songx.jiale@intel.com>
> Subject: Re: [PATCH] net/ice: fix null pointer dereferences
> 
> On Fri, Mar 01, 2024 at 01:20:29PM +0800, Wenwu Ma wrote:
> > This patch fixes two null pointer dereferences detected by coverity
> > scan.
> >
> > Coverity issue: 414096
> > Fixes: 6ccef90ff5d3 ("net/ice: support VSI level bandwidth config")
> >
> > Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
> > ---
> >  drivers/net/ice/ice_tm.c | 10 ++++++++--
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c index
> > fbab0b8808..e10ac855f9 100644
> > --- a/drivers/net/ice/ice_tm.c
> > +++ b/drivers/net/ice/ice_tm.c
> > @@ -616,7 +616,10 @@ static int ice_set_node_rate(struct ice_hw *hw,
> >  					   ICE_MAX_BW,
> >  					   rate);
> >  	if (status) {
> > -		PMD_DRV_LOG(ERR, "Failed to set max bandwidth for
> node %u", tm_node->id);
> > +		if (tm_node != NULL)
> > +			PMD_DRV_LOG(ERR, "Failed to set max bandwidth for
> node %u", tm_node->id);
> > +		else
> > +			PMD_DRV_LOG(ERR, "Failed to set max bandwidth");
> >  		return -EINVAL;
> >  	}
> >
> > @@ -630,7 +633,10 @@ static int ice_set_node_rate(struct ice_hw *hw,
> >  					   ICE_MIN_BW,
> >  					   rate);
> >  	if (status) {
> > -		PMD_DRV_LOG(ERR, "Failed to set min bandwidth for
> node %u", tm_node->id);
> > +		if (tm_node != NULL)
> > +			PMD_DRV_LOG(ERR, "Failed to set min bandwidth for
> node %u", tm_node->id);
> > +		else
> > +			PMD_DRV_LOG(ERR, "Failed to set min bandwidth");
> >  		return -EINVAL;
> >  	}
> >
> Hi Wenwu,
> 
> I'm not sure that this is the best fix here, since the error message doesn't seem
> particularly useful without the node id. Looking at the code, this is a static
> function, so non-public, and only called in three places in
> rte_tm.c: from ice_cfg_hw_node, ice_do_hierarchy_commit and
> ice_reset_nolead_nodes. In all three cases, failure of this function is
> immediately followed by a more specific error message from the calling
> function. Therefore, I think we can solve the coverity problem by just deleting
> the error prints from here completely, and let the callers manage error
> reporting.
> 
> What do you think?
> 
Ok, I will submit a new patch later.

> /Bruce

[PATCH v2] net/ice: fix null pointer dereferences

[Wenwu Ma]

This patch fixes two null pointer dereferences detected by
coverity scan.

Coverity issue: 414096
Fixes: 6ccef90ff5d3 ("net/ice: support VSI level bandwidth config")
Cc: stable@dpdk.org

Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
---
v2:
 - deleting rather than modifying the prints that
   cause null pointer dereferences

---
 drivers/net/ice/ice_tm.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c
index fbab0b8808..17f0ca0ce0 100644
--- a/drivers/net/ice/ice_tm.c
+++ b/drivers/net/ice/ice_tm.c
@@ -615,10 +615,8 @@ static int ice_set_node_rate(struct ice_hw *hw,
 					   sched_node,
 					   ICE_MAX_BW,
 					   rate);
-	if (status) {
-		PMD_DRV_LOG(ERR, "Failed to set max bandwidth for node %u", tm_node->id);
+	if (status)
 		return -EINVAL;
-	}
 
 	if (reset || committed == 0)
 		rate = ICE_SCHED_DFLT_BW;
@@ -629,10 +627,8 @@ static int ice_set_node_rate(struct ice_hw *hw,
 					   sched_node,
 					   ICE_MIN_BW,
 					   rate);
-	if (status) {
-		PMD_DRV_LOG(ERR, "Failed to set min bandwidth for node %u", tm_node->id);
+	if (status)
 		return -EINVAL;
-	}
 
 	return 0;
 }
-- 
2.25.1

Re: [PATCH v2] net/ice: fix null pointer dereferences

[Bruce Richardson]

On Mon, Mar 04, 2024 at 01:37:51PM +0800, Wenwu Ma wrote:
> This patch fixes two null pointer dereferences detected by
> coverity scan.
> 
> Coverity issue: 414096
> Fixes: 6ccef90ff5d3 ("net/ice: support VSI level bandwidth config")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>

Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>

Applied to dpdk-next-net-intel with expanded commit log message.

thanks,
/Bruce