Received-SPF: pass (google.com: domain of linux-kernel+bounces-13696-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <b9646b4a-61a2-41fb-8fea-ba63e08996f3@web.de>
Date: Sun, 31 Dec 2023 12:30:34 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: tipc-discussion@lists.sourceforge.net, netdev@vger.kernel.org,
 kernel-janitors@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
 Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>,
 Jon Maloy <jmaloy@redhat.com>, Paolo Abeni <pabeni@redhat.com>,
 Ying Xue <ying.xue@windriver.com>
Content-Language: en-GB
Cc: LKML <linux-kernel@vger.kernel.org>
From: Markus Elfring <Markus.Elfring@web.de>
Subject: [PATCH] tipc: Improve exception handling in tipc_bcast_init()
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:YTPF1jvdTGs=;zJ3xJemRZiorgjWTtMXD5gJdx2g
 oT8ysAYylDZ4b5aGJymiTYpVJpus0zE6vTVAE/hPhx45M1uJcczl71C8o+PXAMg+ECxOJa78S
 lnIS08Bw+6lSF2wap4PJeOIH2LqZGd0u/vcF2glXDtuzhKIG+EWUc8apkUMb8HPMouRV7q3/O
 oIOhtM7M9NmsZP8FihiJIWF2bTyy6tnmdHpZ0xA2ZWHuDyIbBPGAYf76EP6TiGbM+ZDpym6jL
 moIC2Zpa8LeOhiQ9pkutaD68l1RsfmxYFGosSE5IXaHQepnFozk4qt8RdW7aV9iALQSM3L/y0
 ou3D/PYEbY02TFXweCR2cnJRUs6QK9AIjWfKWCpAcqJnq3LHTZ1lGQOgxTE5/B4OiTsQHUhUV
 +cQByw9piIm0a5lELAuIv8Cdj8j7zAZhRrD/e4eOWEtvKV6yuQsFky9CbxLRk5c++PQBC3pzc
 4jJ9wzn86OB8Xeabc/0nIgVuH1x5k9uZb6Rn52hjkfyqedeq7nLGyEeWc5B9ZnGNJPEs95lKO
 SKHagYEn8/SUz9GS3cUVkMjeEpfbkX7RKEVo106UcaX0qlhOZdw6YokZIsbNQoFVHucm5YLHS
 rjhrnHeQ5hNV5etRAchpLtaFmz0Lx46s9Myx/C2nOxh9xOyxDzZj49KdQf42yyuQiNhkfPH0l
 bdEWGL3cDwsQv84lyKEAZgIqHi5Pq3xGha5lUCk+y88P92Mx8HGyTfMebPsacLqi3Lw/+yvmE
 boU0Jl4qLK8lOr7vW6mZlVrtaL5DeWJgsoUz5SCjAZdgCLkWQE6cPKKlZwgXfe+HGql9F1HB2
 wSyG0SLjCEa2T5SZPtmfNi6JmffL3z9JpFDNX8bZZdy0jMKcC8JhuJB1+lZ4l9Xd7o+vaniZz
 XTqblTdfi68eqDKitvoh1JRolfH6HBgNKTwFvkM3LSPJLaa4lf0XdLFgOh3TuWXMyDBhBDwkc
 0G/M2A==

From: Markus Elfring <elfring@users.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 =E2=80=9Ckzalloc=E2=80=
=9D failed
  at the beginning.

* Move one assignment for the variable =E2=80=9Ctn=E2=80=9D 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@users.sourceforge.net>
=2D--
 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
=2D-- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -688,13 +688,15 @@ int tipc_nl_bc_link_set(struct net *net, struct nlat=
tr *attrs[])

 int tipc_bcast_init(struct net *net)
 {
-	struct tipc_net *tn =3D tipc_net(net);
-	struct tipc_bc_base *bb =3D NULL;
-	struct tipc_link *l =3D NULL;
+	struct tipc_net *tn;
+	struct tipc_bc_base *bb;
+	struct tipc_link *l;

 	bb =3D kzalloc(sizeof(*bb), GFP_KERNEL);
 	if (!bb)
-		goto enomem;
+		return -ENOMEM;
+
+	tn =3D tipc_net(net);
 	tn->bcbase =3D 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;
 }

=2D-
2.43.0