ice: remove an unneeded NULL check

Message ID 20181012071709.GA10212@mwanda
State Under Review
Delegated to: Jeff Kirsher
Headers show
Series
  • ice: remove an unneeded NULL check
Related show

Commit Message

Dan Carpenter Oct. 12, 2018, 7:17 a.m.
We added a NULL check in commit 072f0c3db9da ("ice: Fix potential null
pointer issues") but it causes static checker warnings.

    drivers/net/ethernet/intel/ice/ice_switch.c:2145 ice_add_to_vsi_fltr_list()
    warn: address of 'fm_entry->fltr_info' is non-NULL

We can just remove it.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Allan, Bruce W Oct. 15, 2018, 4:18 p.m. | #1
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On Behalf
> Of Dan Carpenter
> Sent: Friday, October 12, 2018 12:17 AM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; Ertman, David M
> <david.m.ertman@intel.com>
> Cc: kernel-janitors@vger.kernel.org; intel-wired-lan@lists.osuosl.org
> Subject: [Intel-wired-lan] [PATCH] ice: remove an unneeded NULL check
> 
> We added a NULL check in commit 072f0c3db9da ("ice: Fix potential null
> pointer issues") but it causes static checker warnings.

Which static checker and with what options?

> 
>     drivers/net/ethernet/intel/ice/ice_switch.c:2145 ice_add_to_vsi_fltr_list()
>     warn: address of 'fm_entry->fltr_info' is non-NULL
> 
> We can just remove it.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c
> b/drivers/net/ethernet/intel/ice/ice_switch.c
> index 33403f39f1b3..a9ef19da6e61 100644
> --- a/drivers/net/ethernet/intel/ice/ice_switch.c
> +++ b/drivers/net/ethernet/intel/ice/ice_switch.c
> @@ -2142,7 +2142,7 @@ ice_add_to_vsi_fltr_list(struct ice_hw *hw, u16
> vsi_handle,
>  		struct ice_fltr_info *fi;
> 
>  		fi = &fm_entry->fltr_info;
> -		if (!fi || !ice_vsi_uses_fltr(fm_entry, vsi_handle))
> +		if (!ice_vsi_uses_fltr(fm_entry, vsi_handle))
>  			continue;
> 
>  		status = ice_add_entry_to_vsi_fltr_list(hw, vsi_handle,
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Bowers, AndrewX Oct. 15, 2018, 9:17 p.m. | #2
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On
> Behalf Of Dan Carpenter
> Sent: Friday, October 12, 2018 12:17 AM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; Ertman, David M
> <david.m.ertman@intel.com>
> Cc: kernel-janitors@vger.kernel.org; intel-wired-lan@lists.osuosl.org
> Subject: [Intel-wired-lan] [PATCH] ice: remove an unneeded NULL check
> 
> We added a NULL check in commit 072f0c3db9da ("ice: Fix potential null
> pointer issues") but it causes static checker warnings.
> 
>     drivers/net/ethernet/intel/ice/ice_switch.c:2145 ice_add_to_vsi_fltr_list()
>     warn: address of 'fm_entry->fltr_info' is non-NULL
> 
> We can just remove it.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Dan Carpenter Oct. 16, 2018, 10:59 a.m. | #3
On Mon, Oct 15, 2018 at 04:18:35PM +0000, Allan, Bruce W wrote:
> > -----Original Message-----
> > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On Behalf
> > Of Dan Carpenter
> > Sent: Friday, October 12, 2018 12:17 AM
> > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; Ertman, David M
> > <david.m.ertman@intel.com>
> > Cc: kernel-janitors@vger.kernel.org; intel-wired-lan@lists.osuosl.org
> > Subject: [Intel-wired-lan] [PATCH] ice: remove an unneeded NULL check
> > 
> > We added a NULL check in commit 072f0c3db9da ("ice: Fix potential null
> > pointer issues") but it causes static checker warnings.
> 
> Which static checker and with what options?
> 

Future versions of Smatch will complain probably.  It turns out there
are many many unnecessary NULL checks and they seldome indicate a bug so
I'm waffling on this...

regards,
dan carpenter
David Arcari Oct. 17, 2018, 2:04 p.m. | #4
On 10/16/2018 06:59 AM, Dan Carpenter wrote:
> On Mon, Oct 15, 2018 at 04:18:35PM +0000, Allan, Bruce W wrote:
>>> -----Original Message-----
>>> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On Behalf
>>> Of Dan Carpenter
>>> Sent: Friday, October 12, 2018 12:17 AM
>>> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; Ertman, David M
>>> <david.m.ertman@intel.com>
>>> Cc: kernel-janitors@vger.kernel.org; intel-wired-lan@lists.osuosl.org
>>> Subject: [Intel-wired-lan] [PATCH] ice: remove an unneeded NULL check
>>>
>>> We added a NULL check in commit 072f0c3db9da ("ice: Fix potential null
>>> pointer issues") but it causes static checker warnings.
>>
>> Which static checker and with what options?
>>
> 
> Future versions of Smatch will complain probably.  It turns out there
> are many many unnecessary NULL checks and they seldome indicate a bug so
> I'm waffling on this...

I don't see how fi could ever be NULL.  It's set to the address of
fm_entry->fltr_info.

Given that, it really seems like the check should go, since it is clearly
unnecessary.

-Dave

> 
> regards,
> dan carpenter
> 
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>

Patch

diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index 33403f39f1b3..a9ef19da6e61 100644
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -2142,7 +2142,7 @@  ice_add_to_vsi_fltr_list(struct ice_hw *hw, u16 vsi_handle,
 		struct ice_fltr_info *fi;
 
 		fi = &fm_entry->fltr_info;
-		if (!fi || !ice_vsi_uses_fltr(fm_entry, vsi_handle))
+		if (!ice_vsi_uses_fltr(fm_entry, vsi_handle))
 			continue;
 
 		status = ice_add_entry_to_vsi_fltr_list(hw, vsi_handle,