Skip to contentSkip to conversation

ethtool: return error from ethnl_ops_begin if dev is NULL

PATCH Applied Heiner Kallweit 2 participants 2 messages Aug 5, 2021 – Aug 6, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ethtool: return error from ethnl_ops_begin if dev is NULL

Julian reported that after d43c65b05b84 Coverity complains about a missing check whether dev is NULL in ethnl_ops_complete(). There doesn't seem to be any valid case where dev could be NULL when calling ethnl_ops_begin(), therefore return an error if dev is NULL.

Fixes d43c65b05b84 ("ethtool: runtime-resume netdev parent in ethnl_ops_begin")
---
 net/ethtool/netlink.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/ethtool/netlink.c +2 -2
index 417aaf9ca..fe8bf2b3c 100644
@@ -35,7 +35,7 @@ int ethnl_ops_begin(struct net_device *dev)
 	int ret;
 
 	if (!dev)
-		return 0;
+		return -ENODEV;
 
 	if (dev->dev.parent)
 		pm_runtime_get_sync(dev->dev.parent);
@@ -61,7 +61,7 @@ int ethnl_ops_begin(struct net_device *dev)
 
 void ethnl_ops_complete(struct net_device *dev)
 {
-	if (dev && dev->ethtool_ops->complete)
+	if (dev->ethtool_ops->complete)
 		dev->ethtool_ops->complete(dev);
 
 	if (dev->dev.parent)
Signature · 1 line
2.32.0
#1 lore raw
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 10 lines · On Thu, 5 Aug 2021 21:08:22 +0200 you wrote:

Julian reported that after d43c65b05b84 Coverity complains about a missing check whether dev is NULL in ethnl_ops_complete(). There doesn't seem to be any valid case where dev could be NULL when calling ethnl_ops_begin(), therefore return an error if dev is NULL.

Fixes d43c65b05b84 ("ethtool: runtime-resume netdev parent in ethnl_ops_begin")

[...]

Here is the summary with links:
- [net-next] ethtool: return error from ethnl_ops_begin if dev is NULL

    https://git.kernel.org/netdev/net-next/c/596690e9f4fc

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