linux-kernel - [PATCH] cxgb4: Return an error code only as a constant in cxgb4_init_ethtool

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <a70bf317-33c3-48eb-a454-9d95117eaa6c@web.de>
Date: Wed, 23 Apr 2025 08:35:01 +0200
From: Markus Elfring <Markus.Elfring@....de>
To: netdev@...r.kernel.org, Abdun Nihaal <abdun.nihaal@...il.com>,
 Andrew Lunn <andrew+netdev@...n.ch>, "David S. Miller"
 <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
 Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
 Potnuri Bharat Teja <bharat@...lsio.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
 Jacob Keller <jacob.e.keller@...el.com>,
 Rahul Lakkireddy <rahul.lakkireddy@...lsio.com>,
 Simon Horman <horms@...nel.org>, Vishal Kulkarni <vishal@...lsio.com>
Subject: [PATCH] cxgb4: Return an error code only as a constant in
 cxgb4_init_ethtool_filters()

From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Wed, 23 Apr 2025 08:15:24 +0200

Return an error code without storing it in an intermediate variable.

Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
index 1546c3db08f0..fd4f6c146ad2 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
@@ -2238,7 +2238,6 @@ int cxgb4_init_ethtool_filters(struct adapter *adap)
 	struct cxgb4_ethtool_filter *eth_filter;
 	struct tid_info *tids = &adap->tids;
 	u32 nentries, i;
-	int ret;
 
 	eth_filter = kzalloc(sizeof(*eth_filter), GFP_KERNEL);
 	if (!eth_filter)
@@ -2247,10 +2246,8 @@ int cxgb4_init_ethtool_filters(struct adapter *adap)
 	eth_filter_info = kcalloc(adap->params.nports,
 				  sizeof(*eth_filter_info),
 				  GFP_KERNEL);
-	if (!eth_filter_info) {
-		ret = -ENOMEM;
+	if (!eth_filter_info)
 		goto free_eth_filter;
-	}
 
 	eth_filter->port = eth_filter_info;
 
@@ -2262,14 +2259,11 @@ int cxgb4_init_ethtool_filters(struct adapter *adap)
 
 	for (i = 0; i < adap->params.nports; i++) {
 		eth_filter->port[i].loc_array = kvzalloc(nentries, GFP_KERNEL);
-		if (!eth_filter->port[i].loc_array) {
-			ret = -ENOMEM;
+		if (!eth_filter->port[i].loc_array)
 			goto free_eth_finfo;
-		}
 
 		eth_filter->port[i].bmap = bitmap_zalloc(nentries, GFP_KERNEL);
 		if (!eth_filter->port[i].bmap) {
-			ret = -ENOMEM;
 			kvfree(eth_filter->port[i].loc_array);
 			goto free_eth_finfo;
 		}
@@ -2287,8 +2281,7 @@ int cxgb4_init_ethtool_filters(struct adapter *adap)
 
 free_eth_filter:
 	kfree(eth_filter);
-
-	return ret;
+	return -ENOMEM;
 }
 
 void cxgb4_set_ethtool_ops(struct net_device *netdev)
-- 
2.49.0