Received-SPF: pass (google.com: domain of linux-kernel+bounces-30183-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: <14171fc4-8157-4919-86b8-bdec0493197d@web.de>
Date: Thu, 18 Jan 2024 15:06:53 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: linux-hardening@vger.kernel.org, kernel-janitors@vger.kernel.org,
 "Guilherme G. Piccoli" <gpiccoli@igalia.com>,
 Kees Cook <keescook@chromium.org>, Tony Luck <tony.luck@intel.com>
Content-Language: en-GB
Cc: LKML <linux-kernel@vger.kernel.org>, Kunwu Chan <chentao@kylinos.cn>
From: Markus Elfring <Markus.Elfring@web.de>
Subject: [PATCH] pstore/ram_core: Improve exception handling in
 persistent_ram_new()
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:y1tJt7FpCs4=;72+dE2IeuiHLVRsnwrXAscXo/3+
 lvUW7Cwig10uWMNkk8VoZsjoGTxhO8UkBuBLgmhNJbQQWUF4MZhVLvjFe+O45x6d8XsykU/+t
 Zajbvk0S9m5vDTZDvONSCr+BSAbeYmZqEJijzswUGv+BNHWchFEAo7wiUULf3sCC/NBgs5u2b
 MAq729vxCM+AA+uW3vRSEVD+epSW40GANRTa3ASQUuYI/P4ulMciw1Um5GwO7T/DLUPzQXwri
 3jFe6WGOiXNHrck3PozMnN2DtgFGgdHs8bUN0LN1hSBhTdPWbu7w8QE8Hpd3YSbMBVe0RIXk4
 WJqosgBJkZlZvitPC0bbUZuwlbQ2R0P0gmx+JDjMmB8inYk/ACtrIfuv7WAEDR34/OxzcTnWh
 xXan8ZTp3CYVvR81IFTH/2ze3HtRME4f5vZgCrf8SYacxEWMTcfudBmj4dE92NteLTFYo0UKs
 Ydz8njlWcFwb4RhD2/wosXv5Bx6nJcp1dTO3debhxvVIROfRLYsrNOCF/DKPCW8NKCmsOzHJ5
 HasbMgzopiHBANof97ShXv4O86FG7MgE1au11CCDvWsRRz/koRr36At3moaZwScQfYeYY2Q/l
 ByqJXMBADHYdsAf5vE4L6yp35o5syjIQRJW5omsvy/9VqffBtOfcv+2poKy0Y/JSES9zg/2iY
 DDhMPPsYzMFhJhc2MPGirACcfowJfOpYHuDGdrR0bSA7pcujnsOYNMOpcfsxu+kcFxRsCkjy1
 v3xUKTfv1iD9gXNTsan/jNxruyGuh7K+WUWfxMeLa93S3oBkVuUXAmqQnSv8/A+Nf/aIDziaR
 w4rjbwWwrDmE1EhVBvC6w/MIC1woQH2EcKIYlE2+n7fa/98AJbwa1Q/eNK1maP6+naBUZ71aq
 6CF8to4q7Z/arkn+R5WnPIU5ZZ4WKgKiiBkCNYwRIbkZr//5yHJra6Jw10d+9YzmtjxNzL6tU
 EzlcPw==

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 18 Jan 2024 14:57:21 +0100

* Omit an initialisation (for the variable =E2=80=9Cret=E2=80=9D)
  which became unnecessary with this refactoring
  because a memory allocation failure will be directly indicated
  by a corresponding return statement in an if branch.

* Move a call of the function =E2=80=9Ckstrdup=E2=80=9D before two other s=
tatements.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
=2D--
 fs/pstore/ram_core.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index f1848cdd6d34..5047a8502e17 100644
=2D-- a/fs/pstore/ram_core.c
+++ b/fs/pstore/ram_core.c
@@ -586,21 +586,23 @@ struct persistent_ram_zone *persistent_ram_new(phys_=
addr_t start, size_t size,
 			unsigned int memtype, u32 flags, char *label)
 {
 	struct persistent_ram_zone *prz;
-	int ret =3D -ENOMEM;
+	int ret;

 	prz =3D kzalloc(sizeof(struct persistent_ram_zone), GFP_KERNEL);
 	if (!prz) {
 		pr_err("failed to allocate persistent ram zone\n");
-		goto err;
+		return ERR_PTR(-ENOMEM);
+	}
+
+	prz->label =3D kstrdup(label, GFP_KERNEL);
+	if (!prz->label) {
+		kfree(prz);
+		return ERR_PTR(-ENOMEM);
 	}

 	/* Initialize general buffer state. */
 	raw_spin_lock_init(&prz->buffer_lock);
 	prz->flags =3D flags;
-	prz->label =3D kstrdup(label, GFP_KERNEL);
-	if (!prz->label)
-		goto err;
-
 	ret =3D persistent_ram_buffer_map(start, size, prz, memtype);
 	if (ret)
 		goto err;
=2D-
2.43.0