2021-10-15 18:27:07

by Jiapeng Chong

Subject: [PATCH] ice: Fix missing error code in ice_ena_vfs()

The error code is missing in this code scenario, add the error code
'-EINVAL' to the return value 'ret'.

Eliminate the follow smatch warning:

drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c:1979 ice_ena_vfs()
warn: missing error code 'ret'.

Reported-by: Abaci Robot <[email protected]>
Fixes: 1c54c839935b ("ice: enable/disable switchdev when managing VFs")
Signed-off-by: Jiapeng Chong <[email protected]>
---
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index 4d0b643..b2a018c 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -1975,8 +1975,10 @@ static int ice_ena_vfs(struct ice_pf *pf, u16 num_vfs)

clear_bit(ICE_VF_DIS, pf->state);

- if (ice_eswitch_configure(pf))
+ if (ice_eswitch_configure(pf)) {
+ ret = -EINVAL;
goto err_unroll_sriov;
+ }

return 0;

--
1.8.3.1

2021-10-16 15:17:49

by Nitka, Grzegorz

Subject: RE: [Intel-wired-lan] [PATCH] ice: Fix missing error code in ice_ena_vfs()

> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf Of
> Jiapeng Chong
> Sent: Friday, October 15, 2021 12:04 PM
> To: Brandeburg, Jesse <[email protected]>
> Cc: Jiapeng Chong <[email protected]>;
> [email protected]; [email protected]; intel-wired-
> [email protected]; [email protected]; [email protected]
> Subject: [Intel-wired-lan] [PATCH] ice: Fix missing error code in ice_ena_vfs()
>
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'ret'.
>
> Eliminate the follow smatch warning:
>
> drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c:1979 ice_ena_vfs()
> warn: missing error code 'ret'.

Seems to be already addressed by Dan Carpenter with this patch:
https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20211013080012.GB6010@kili/

>
> Reported-by: Abaci Robot <[email protected]>
> Fixes: 1c54c839935b ("ice: enable/disable switchdev when managing VFs")
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
> b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
> index 4d0b643..b2a018c 100644
> --- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
> +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
> @@ -1975,8 +1975,10 @@ static int ice_ena_vfs(struct ice_pf *pf, u16
> num_vfs)
>
> clear_bit(ICE_VF_DIS, pf->state);
>
> - if (ice_eswitch_configure(pf))
> + if (ice_eswitch_configure(pf)) {
> + ret = -EINVAL;
> goto err_unroll_sriov;
> + }
>
> return 0;
>
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-wired-lan mailing list
> [email protected]
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan