Skip to contentSkip to conversation

ethtool: linkinfo: remove an unnecessary NULL check

PATCH Applied Dan Carpenter 3 participants 3 messages Jun 5, 2020

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

PATCH 1/1 ethtool: linkinfo: remove an unnecessary NULL check

This code generates a Smatch warning:

net/ethtool/linkinfo.c:143 ethnl_set_linkinfo()
warn: variable dereferenced before check 'info' (see line 119)

Fortunately, the "info" pointer is never NULL so the check can be removed.

---
 net/ethtool/linkinfo.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/ethtool/linkinfo.c +1 -2
index 677068deb68c0..5eaf173eaaca5 100644
@@ -140,8 +140,7 @@ int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info)
 
 	ret = __ethtool_get_link_ksettings(dev, &ksettings);
 	if (ret < 0) {
-		if (info)
-			GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
+		GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
 		goto out_ops;
 	}
 	lsettings = &ksettings.base;
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Dan Carpenter

This code generates a Smatch warning:

net/ethtool/linkinfo.c:143 ethnl_set_linkinfo()
warn: variable dereferenced before check 'info' (see line 119)

Fortunately, the "info" pointer is never NULL so the check can be removed.

The same useless check is also in ethnl_set_linkmodes(), I'll send a patch for that one.

Michal

Quoted 21 lines
---
 net/ethtool/linkinfo.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/ethtool/linkinfo.c +1 -2
index 677068deb68c0..5eaf173eaaca5 100644
@@ -140,8 +140,7 @@ int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info)
 
 	ret = __ethtool_get_link_ksettings(dev, &ksettings);
 	if (ret < 0) {
-		if (info)
-			GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
+		GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
 		goto out_ops;
 	}
 	lsettings = &ksettings.base;
Signature · 1 line
2.26.2