Received-SPF: pass (google.com: domain of linux-kernel+bounces-13765-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <477e5649-87e3-44d9-8226-010b9822e649@web.de>
Date: Sun, 31 Dec 2023 18:42:30 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: [PATCH 1/4] netlink: Improve exception handling in
 __netlink_kernel_create()
Content-Language: en-GB
From: Markus Elfring <Markus.Elfring@web.de>
To: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org,
 Anjali Kulkarni <anjali.k.kulkarni@oracle.com>,
 "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>,
 Jakub Kicinski <kuba@kernel.org>, Kuniyuki Iwashima <kuniyu@amazon.com>,
 Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
References: <90679f69-951c-47b3-b86f-75fd9fde3da3@web.de>
In-Reply-To: <90679f69-951c-47b3-b86f-75fd9fde3da3@web.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:uL3bqpCvN40=;f5sfi6UEwM8NowNjnPPmo4TDgUO
 1vSsX6wf89Mjla0suxg0Qs2mRe5zOHMqj9UVOlNJ8xthxIk1tjemi4JFjN0nNKUyF89dxQmpt
 J3LPYp5fCmcn/j1DuHHV00W1xsAtpu9uSrGVg+2QomIIhD6fvkcc82ZaonDz3X/ghB9QscoGz
 JAO7aSrnN8BJjT08rI8UbqI/lt0NZxhaN2Cahdsewz/qkYNJn1KJkMqSXmCZ0kG5160qF3kWX
 ZP+f4b5BI2XEaRYl1Knyy7qRhm7hup5nizx+WVsuSoontTxx/DRPbLzmJ9lfqdyf4cJR5XxmZ
 vJjAbwAoT1zGiEBhTZoPVmR0rEAcIEPLZiW7qKDMgUM4755/n8Ue+EpueRRfYQ4TKiI64AEZU
 H9RFwprov86CVEk0Qiv9pQSO60XUNLjpaHKXk9nzYxp4Ow1XKrlyq9bWfgqMrXooYKBsHrqGg
 ttIAQeaqIkPR+POJxwYe3VONoq5xaTi8bVcenIPhaCkhxDD9Sp/TACx3Z253AzaI+UEsRE2PI
 ANuEQ1qNoz+0H1H0aWjjuhdswrBTA5TkWu2wjWyiYIiWI0c471tqfTnvpQ6IuKLLV4/op0IXL
 ZDka2t9SgLrJy/BwKY19SoK+6LtxGe9ZfyMQUbY9kMg74KT4PdoHhsYT0xoS73mCUTpMEI48s
 o4YyePdnbOtyYD7GT4lIENU/QDnG5soyYuwuFdZmA6u1SfNJO2JJj4O1QIn8BSa7fCXxUiFSg
 LSw/YZzMdUOfsXfeFqtcQiJjMQMT7NUzUu7JdJu2rXcQmMKbowl2MjlN1dKm0Ptny1ksQ7M8+
 pAUkfj0DGr1eaX9gL4H5vHMA/OTFzASJCPuZ+w8/lifC+4s9A15s1iAdIsha4CT4pkoJJh7vQ
 51wRRojg1EejQ67CTcdxOOjjjj8H9fRYgRC3ttMV3Nasr/0AZtO38Z+XtP0FbzroKmh0JiF6y
 UbSh7A==

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 31 Dec 2023 17:26:41 +0100

The kfree() function was called in one case by
the __netlink_kernel_create() function during error handling
even if the passed variable contained a null pointer.
This issue was detected by using the Coccinelle software.

Thus use another label.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
=2D--
 net/netlink/af_netlink.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 4ed8ffd58ff3..c3f88015cacf 100644
=2D-- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2042,7 +2042,7 @@ __netlink_kernel_create(struct net *net, int unit, s=
truct module *module,

 	listeners =3D kzalloc(sizeof(*listeners) + NLGRPSZ(groups), GFP_KERNEL);
 	if (!listeners)
-		goto out_sock_release;
+		goto out_netlink_release_sock;

 	sk->sk_data_ready =3D netlink_data_ready;
 	if (cfg && cfg->input)
@@ -2076,6 +2076,7 @@ __netlink_kernel_create(struct net *net, int unit, s=
truct module *module,

 out_sock_release:
 	kfree(listeners);
+out_netlink_release_sock:
 	netlink_kernel_release(sk);
 	return NULL;

=2D-
2.43.0