[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <b9646b4a-61a2-41fb-8fea-ba63e08996f3@web.de>
Date: Sun, 31 Dec 2023 12:30:34 +0100
From: Markus Elfring <Markus.Elfring@....de>
To: tipc-discussion@...ts.sourceforge.net, netdev@...r.kernel.org,
kernel-janitors@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Jon Maloy <jmaloy@...hat.com>, Paolo Abeni <pabeni@...hat.com>,
Ying Xue <ying.xue@...driver.com>
Cc: LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] tipc: Improve exception handling in tipc_bcast_init()
From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Sun, 31 Dec 2023 12:20:06 +0100
The kfree() function was called in two cases by
the tipc_bcast_init() function during error handling
even if the passed variable contained a null pointer.
This issue was detected by using the Coccinelle software.
* Thus return directly after a call of the function “kzalloc” failed
at the beginning.
* Move one assignment for the variable “tn” closer to the place
where this pointer is used.
* Delete a redundant kfree() call.
* Omit initialisations (for the local variables)
which became unnecessary with this refactoring.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
net/tipc/bcast.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 593846d25214..631aef2dde45 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -688,13 +688,15 @@ int tipc_nl_bc_link_set(struct net *net, struct nlattr *attrs[])
int tipc_bcast_init(struct net *net)
{
- struct tipc_net *tn = tipc_net(net);
- struct tipc_bc_base *bb = NULL;
- struct tipc_link *l = NULL;
+ struct tipc_net *tn;
+ struct tipc_bc_base *bb;
+ struct tipc_link *l;
bb = kzalloc(sizeof(*bb), GFP_KERNEL);
if (!bb)
- goto enomem;
+ return -ENOMEM;
+
+ tn = tipc_net(net);
tn->bcbase = bb;
spin_lock_init(&tipc_net(net)->bclock);
@@ -715,7 +717,6 @@ int tipc_bcast_init(struct net *net)
return 0;
enomem:
kfree(bb);
- kfree(l);
return -ENOMEM;
}
--
2.43.0
Powered by blists - more mailing lists