Received-SPF: pass (google.com: domain of linux-kernel+bounces-12713-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <4616e325-e313-4078-9788-dd1e6e51b9e0@web.de>
Date: Thu, 28 Dec 2023 15:48:14 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: linux-scsi@vger.kernel.org, kernel-janitors@vger.kernel.org,
 "James E. J. Bottomley" <jejb@linux.ibm.com>,
 "Martin K. Petersen" <martin.petersen@oracle.com>
Content-Language: en-GB
Cc: LKML <linux-kernel@vger.kernel.org>
From: Markus Elfring <Markus.Elfring@web.de>
Subject: [PATCH] scsi: ses: Move a label in ses_enclosure_data_process()
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:266RluJvshA=;zjH5Ja1AxNWNUrQdgP3O215bFxS
 8OCqy2IlVCThSpJPHZ2IQRF5OGUdDoyeC/j48chu+QMTCHtn/dAv5BrlwTLIM99ZluG6sPV5d
 zyxY39E0Kpl1wmFamQVpxp+0j2waenSiV1BkVwgVIPqvrxXSTe4qhxOrIi8GeBp3QUVvasjFL
 5FK41LHmcYHhzDh3/2EiaQUJI3syk4XMyFkAY/u+CxwoICzZGZbyr6VRHQCuJo6wJFqNhfSB1
 WooiFGHyQFUprw4lYNYUtuF/xbDIFtXTMpy7TJraxI2w8+gXQmq+gHp3cHirMgpKRaMLKJtcg
 DDtaomSpB9Lpes3h4rrVVGvFxAtBwC9HGBG7/g7kctt+15kq4xRVu+33HgdwB5Flirxu+fJ7l
 pMEtNgExQnhvPbouKSE0Yrfk/tGO7K0W5O0m3cAbnqXPdn9nGFPxNG5XzaqnKVa7bX/rGKZ5i
 DjpwRRwbLHfLM28sS4P7JS5lyzcLmprEhAY+X5IwBGmDgdli/oZo/kgSpOUDboCvomaE4TlLt
 4lk1hhYPLjoD66GPWM5VIOV+G8qLzQt3aHaOb8neUoAmi7IcE+GfM2ujQFg6rjTAggx+zuk61
 5oTenHClItNJiSnKa1a0d9WPDGD9vSZFIa0vD/wkTBp+9AM9F6obEv/8peWIs/XEYw/pGDUEx
 wNNMM5IO4pOqbzyCE2ibikzCp1ERBY0QKuLGPK93dlNtPGLHFeIuJ9dCfZNLM2e89oCEda+OM
 yrgbWDQZ+H9IGSBOuycaw9xMeqqeXYiPHJiOHSPBqMSYpOaZOhk6zz512EFaVWiBynzlbz4Sf
 7K/UyZYAQxuyjeHPWcZlUbfUxJdVVlHFu94n121+gbJuuNr4h8UOAz83EkJKrOYpkLwHNfSHK
 5iV7SUFJ4IvruniCz2O+EGPmubSUSBQ+eVZJmhQH5UGcvQznWDj3SGm5hgBf6xmURkmYC1FPa
 we1uJA==

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 28 Dec 2023 15:38:09 +0100

The kfree() function was called in up to three cases by
the ses_enclosure_data_process() function during error handling
even if the passed variable contained a null pointer.
This issue was detected by using the Coccinelle software.

* Thus move the label =E2=80=9Csimple_populate=E2=80=9D behind this kfree(=
) call.

* Delete an initialisation (for the variable =E2=80=9Cbuf=E2=80=9D)
  which became unnecessary with this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
=2D--
 drivers/scsi/ses.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index d7d0c35c58b8..e98f47d8206f 100644
=2D-- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -528,7 +528,7 @@ static void ses_enclosure_data_process(struct enclosur=
e_device *edev,
 				       int create)
 {
 	u32 result;
-	unsigned char *buf =3D NULL, *type_ptr, *desc_ptr, *addl_desc_ptr =3D NU=
LL;
+	unsigned char *buf, *type_ptr, *desc_ptr, *addl_desc_ptr =3D NULL;
 	int i, j, page7_len, len, components;
 	struct ses_device *ses_dev =3D edev->scratch;
 	int types =3D ses_dev->page1_num_types;
@@ -552,8 +552,8 @@ static void ses_enclosure_data_process(struct enclosur=
e_device *edev,
 		goto simple_populate;
 	result =3D ses_recv_diag(sdev, 7, buf, len);
 	if (result) {
- simple_populate:
 		kfree(buf);
+simple_populate:
 		buf =3D NULL;
 		desc_ptr =3D NULL;
 		len =3D 0;
=2D-
2.43.0