2024-06-05 03:58:35

by Su Hui

Subject: [PATCH net] net: ethtool: fix the error condition in ethtool_get_phy_stats_ethtool()

Clang static checker (scan-build) warning:
net/ethtool/ioctl.c:line 2233, column 2
Called function pointer is null (null dereference).

Return '-EOPNOTSUPP' when 'ops->get_ethtool_phy_stats' is NULL to fix
this typo error.

Fixes: 201ed315f967 ("net/ethtool/ioctl: split ethtool_get_phy_stats into multiple helpers")
Signed-off-by: Su Hui <[email protected]>
---
net/ethtool/ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 5a55270aa86e..e645d751a5e8 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -2220,7 +2220,7 @@ static int ethtool_get_phy_stats_ethtool(struct net_device *dev,
const struct ethtool_ops *ops = dev->ethtool_ops;
int n_stats, ret;

- if (!ops || !ops->get_sset_count || ops->get_ethtool_phy_stats)
+ if (!ops || !ops->get_sset_count || !ops->get_ethtool_phy_stats)
return -EOPNOTSUPP;

n_stats = ops->get_sset_count(dev, ETH_SS_PHY_STATS);
--
2.30.2

2024-06-05 04:05:34

by Przemek Kitszel

Subject: Re: [PATCH net] net: ethtool: fix the error condition in ethtool_get_phy_stats_ethtool()

On 6/5/24 05:47, Su Hui wrote:
> Clang static checker (scan-build) warning:
> net/ethtool/ioctl.c:line 2233, column 2
> Called function pointer is null (null dereference).
>
> Return '-EOPNOTSUPP' when 'ops->get_ethtool_phy_stats' is NULL to fix
> this typo error.
>
> Fixes: 201ed315f967 ("net/ethtool/ioctl: split ethtool_get_phy_stats into multiple helpers")
> Signed-off-by: Su Hui <[email protected]>
> ---
> net/ethtool/ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
> index 5a55270aa86e..e645d751a5e8 100644
> --- a/net/ethtool/ioctl.c
> +++ b/net/ethtool/ioctl.c
> @@ -2220,7 +2220,7 @@ static int ethtool_get_phy_stats_ethtool(struct net_device *dev,
> const struct ethtool_ops *ops = dev->ethtool_ops;
> int n_stats, ret;
>
> - if (!ops || !ops->get_sset_count || ops->get_ethtool_phy_stats)
> + if (!ops || !ops->get_sset_count || !ops->get_ethtool_phy_stats)
> return -EOPNOTSUPP;
>
> n_stats = ops->get_sset_count(dev, ETH_SS_PHY_STATS);

Thank you,
both the change and provided Fixes tag are correct.

Reviewed-by: Przemek Kitszel <[email protected]>

2024-06-05 07:01:34

by Hariprasad Kelam

Subject: net: ethtool: fix the error condition in ethtool_get_phy_stats_ethtool()

> Clang static checker (scan-build) warning:
> net/ethtool/ioctl.c:line 2233, column 2
> Called function pointer is null (null dereference).
>
> Return '-EOPNOTSUPP' when 'ops->get_ethtool_phy_stats' is NULL to fix this
> typo error.
>
> Fixes: 201ed315f967 ("net/ethtool/ioctl: split ethtool_get_phy_stats into
> multiple helpers")
> Signed-off-by: Su Hui <[email protected]>
> ---
> net/ethtool/ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index
> 5a55270aa86e..e645d751a5e8 100644
> --- a/net/ethtool/ioctl.c
> +++ b/net/ethtool/ioctl.c
> @@ -2220,7 +2220,7 @@ static int ethtool_get_phy_stats_ethtool(struct
> net_device *dev,
> const struct ethtool_ops *ops = dev->ethtool_ops;
> int n_stats, ret;
>
> - if (!ops || !ops->get_sset_count || ops->get_ethtool_phy_stats)
> + if (!ops || !ops->get_sset_count || !ops->get_ethtool_phy_stats)
> return -EOPNOTSUPP;
>
> n_stats = ops->get_sset_count(dev, ETH_SS_PHY_STATS);
> --
> 2.30.2
>
Good catch!!

Reviewed-by: Hariprasad Kelam <[email protected]>

2024-06-06 11:40:43

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net] net: ethtool: fix the error condition in ethtool_get_phy_stats_ethtool()

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

On Wed, 5 Jun 2024 11:47:43 +0800 you wrote:
> Clang static checker (scan-build) warning:
> net/ethtool/ioctl.c:line 2233, column 2
> Called function pointer is null (null dereference).
>
> Return '-EOPNOTSUPP' when 'ops->get_ethtool_phy_stats' is NULL to fix
> this typo error.
>
> [...]

Here is the summary with links:
- [net] net: ethtool: fix the error condition in ethtool_get_phy_stats_ethtool()
https://git.kernel.org/netdev/net/c/0dcc53abf58d

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html