Received-SPF: pass (google.com: domain of linux-kernel+bounces-13743-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <828bb442-29d0-4bb8-b90d-f200bdd4faf6@web.de>
Date: Sun, 31 Dec 2023 16:39:02 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: 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>, Paolo Abeni <pabeni@redhat.com>,
 Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Content-Language: en-GB
Cc: LKML <linux-kernel@vger.kernel.org>
From: Markus Elfring <Markus.Elfring@web.de>
Subject: [PATCH] packet: Improve exception handling in fanout_add()
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:PecX/maW88s=;PRkbnBeZHNnfH6i7gmhwN1xAa65
 CEQsb2bwOI4O+ELnibNzZmCTKgR1Fx8p2S+7jEalI8stWrYWSWF+VRTqfYI2KAPocipY2SneW
 kALaiXIjH8v/MIPsmvB89xTY6QnTJMX7ro9pcokqRfjxscUDUjsUD6Iw806XVYYcPKSmooHXs
 68A8xUw00Yi9mxE2b4M7grV7tYdkZsoRY1IeKztDoQnFuvZgThFWgUUtJjcBFg9wz3IOUU+Jz
 iufdnUzdYuNCQIOam2+wBsXgHrMTR4VzSIIhkoIOGj0jcVHX3aOE6a7m9OxCCm349cC0b2XtB
 YTREly5DBOIN17sz95wELvnGRD3ZSNJjdTTc9JxgBkK66Yyj7vwz/kSpZFeE08Ty35B4tsoYD
 gZALL2DOaOwAnM+k6LuhLzWPJ8EYiFaiDWMMP2VWo/LKjohFArbKlYPQFcAsJivXkXMzVA+lz
 2v0/Tj4/Idj/ZMnpslzqzVFnC+Pv+pVa+XFHXtTLjyARn9apzLnqh6N9KNPD197gedWt2Nwbh
 yj7xxYsenWjewWwdn/jvAc7LcggMJ135yoVpMSumYoCItSFnbPxKJOapOq6dmHvPLwOy6awOo
 UmKFlnxUSoYq73wfctggz7ay5mFeOPK5X4exq4i8zUCulZ9udWiuUGzdoDCXFYITboImGwIXj
 cyYrcOWt94y/VrHeSwk6dBdsU4gaRBtsNQ13oUOrxtUbH+lcZ+gkKlKPCxbBPbo8CZsssxunz
 V7xUsslfvz21f+u8haZwKXIEN0DlK2sYbraJARBUFN/xWFzvvCCcWvJQNji2Kn5UuWjtaTSHI
 17+KirMbBNpK4D/3+WFj5+9fkUfx5b1ZotX3eY4cWzttAwE44pMmzNhzjLIbxLB4AAydJH2wg
 AJzO4nWcr9dW3iD/NTkN+y22izte0wJ4xo16Vni5wVSJxHEijmhmTcIuOo3DMNbiEG/u38T4Q
 4l2v6HUQVU6njCwUDctC0Uhp9m8=

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 31 Dec 2023 16:30:51 +0100

The kfree() function was called in some cases by the fanout_add() function
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/packet/af_packet.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 5f1757a32842..0681d4f1ed85 100644
=2D-- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1712,14 +1712,14 @@ static int fanout_add(struct sock *sk, struct fano=
ut_args *args)

 	err =3D -EALREADY;
 	if (po->fanout)
-		goto out;
+		goto unlock_mutex;

 	if (type =3D=3D PACKET_FANOUT_ROLLOVER ||
 	    (type_flags & PACKET_FANOUT_FLAG_ROLLOVER)) {
 		err =3D -ENOMEM;
 		rollover =3D kzalloc(sizeof(*rollover), GFP_KERNEL);
 		if (!rollover)
-			goto out;
+			goto unlock_mutex;
 		atomic_long_set(&rollover->num, 0);
 		atomic_long_set(&rollover->num_huge, 0);
 		atomic_long_set(&rollover->num_failed, 0);
@@ -1812,6 +1812,7 @@ static int fanout_add(struct sock *sk, struct fanout=
_args *args)

 out:
 	kfree(rollover);
+unlock_mutex:
 	mutex_unlock(&fanout_mutex);
 	return err;
 }
=2D-
2.43.0