[PATCH net-next v17 12/14] net: ethtool: strset: Remove unnecessary check on genl_info

Maxime Chevallier posted 14 patches 1 year, 5 months ago
There is a newer version of this series
[PATCH net-next v17 12/14] net: ethtool: strset: Remove unnecessary check on genl_info
Posted by Maxime Chevallier 1 year, 5 months ago
All call paths coming from genetlink initialize the genl_info structure,
so that command handlers may use them.

Remove an un-needed check for NULL when crafting error messages in the
strset command. This prevents smatch from assuming this pointer may be
NULL, and therefore warn if it's being used without a NULL check.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reported-by: Simon Horman <horms@kernel.org>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202407030529.aOYGI0u2-lkp@intel.com/
---
 net/ethtool/strset.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c
index c678b484a079..56b99606f00b 100644
--- a/net/ethtool/strset.c
+++ b/net/ethtool/strset.c
@@ -289,8 +289,7 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,
 		for (i = 0; i < ETH_SS_COUNT; i++) {
 			if ((req_info->req_ids & (1U << i)) &&
 			    data->sets[i].per_dev) {
-				if (info)
-					GENL_SET_ERR_MSG(info, "requested per device strings without dev");
+				GENL_SET_ERR_MSG(info, "requested per device strings without dev");
 				return -EINVAL;
 			}
 		}
-- 
2.45.1
Re: [PATCH net-next v17 12/14] net: ethtool: strset: Remove unnecessary check on genl_info
Posted by Christophe Leroy 1 year, 4 months ago

Le 09/07/2024 à 08:30, Maxime Chevallier a écrit :
> All call paths coming from genetlink initialize the genl_info structure,
> so that command handlers may use them.
> 
> Remove an un-needed check for NULL when crafting error messages in the
> strset command. This prevents smatch from assuming this pointer may be
> NULL, and therefore warn if it's being used without a NULL check.
> 
> Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
> Reported-by: Simon Horman <horms@kernel.org>
> Reported-by: kernel test robot <lkp@intel.com>
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Closes: https://lore.kernel.org/r/202407030529.aOYGI0u2-lkp@intel.com/

Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Tested-by: Christophe Leroy <christophe.leroy@csgroup.eu>

> ---
>   net/ethtool/strset.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c
> index c678b484a079..56b99606f00b 100644
> --- a/net/ethtool/strset.c
> +++ b/net/ethtool/strset.c
> @@ -289,8 +289,7 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,
>   		for (i = 0; i < ETH_SS_COUNT; i++) {
>   			if ((req_info->req_ids & (1U << i)) &&
>   			    data->sets[i].per_dev) {
> -				if (info)
> -					GENL_SET_ERR_MSG(info, "requested per device strings without dev");
> +				GENL_SET_ERR_MSG(info, "requested per device strings without dev");
>   				return -EINVAL;
>   			}
>   		}