Received-SPF: pass (google.com: domain of linux-kernel+bounces-13066-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <b109b7dc-3972-4b2e-ae4c-89bf8eecf8f2@web.de>
Date: Fri, 29 Dec 2023 12:40:12 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: [PATCH 2/2] hugetlbfs: Improve exception handling in
 hugetlbfs_fill_super()
Content-Language: en-GB
From: Markus Elfring <Markus.Elfring@web.de>
To: linux-mm@kvack.org, kernel-janitors@vger.kernel.org,
 Muchun Song <muchun.song@linux.dev>
Cc: LKML <linux-kernel@vger.kernel.org>
References: <9ce3f553-24bc-4ecd-ac5e-7ba27caeff57@web.de>
In-Reply-To: <9ce3f553-24bc-4ecd-ac5e-7ba27caeff57@web.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:R9CIMRG8WIo=;I1ZtYzDfS2V0P2/oJTEFDGzc7mE
 waxeyt9HIlp9n4gvok5KWoDW1+h9mpIgpqv2Ie0cP4Vw1waLrSMVN6RObZX4jyCn3vFOF6YqP
 g6XAsPN2GrLIxb59gmwUIO3BLvHWseyR6D4hIVtKMvpLQzNyhnrl7M9hthpRy46Fb3YQoVcxf
 kgL9qQwbSKK89YEpXQ0aYTmI/a9c39lSznzGb1xVGaqDoC633AIi+BF3Cl+37DwbiIuqb54Cp
 6y0XXzW3diz0T+w9GCf+nTGyhL7FagbzcIdIw7toB8UQ4r5TUo0TKnl+QEzyo39WdiythCO/U
 BZNzTgh8ha4XvlOC3m7W4sMAvjHkhSL5LqENUMZDxzz9L3+PEHVKY5irR4+objIaAj3n3zKIZ
 9/aC1SjFl/yQKOWLSPZxsZoBl6KFdU0wPHCbE8+hLHjk+ylv1oaPgGtcOY65Sw8TcDsk5KKFw
 FUHVwzmu0DMshBq8eB0LZ9ti3nk8C8IVoUkZtV23Gv/VvV85WVeikZy3bjedcEKOHzA9q01AE
 whGROhfkz1oSCwb2JEkTMYL35qH9YxeUwZWKwAgjf+2aiE8fnyGmuO5JOvtX/96QbpDKPbUJZ
 IEN0D+XErBg1mOZPprVfcTWqewzsZ5Q/qloNch8itL3Y58JH+KwRrc9pcugxVj9nrG57C+CLW
 nl0sZ2rl64GoRN5nSZyKgikgyBUkYBSpp9dExGyIgaQIkI0p3m1gr1sAbUqyZLIenau0JSnZj
 En4Gy9iGOpAIcyVrtxvJmnbDXM93LVsWBoUTjoUWLphEZHshMdckGT9/EoU7T7Pj87PjYfwWs
 cESdoxfqo+UI+nRTrzkZITwVkDvqLClv4TWLigVwgXZ3Wivr6X3NwLC67NGsIOtXMRfxrheqv
 sAninmNQwYMjP/GiOE53yfyOusvU3rOUpngN44XCAZNZbgrd0U82a34bT8gNS3LVkY/ENuqi8
 AJFvoA==

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 29 Dec 2023 11:46:32 +0100

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

Thus adjust jump targets.

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

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 24401a5046dd..5687ec574dc4 100644
=2D-- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -1483,7 +1483,7 @@ hugetlbfs_fill_super(struct super_block *sb, struct =
fs_context *fc)
 						     ctx->max_hpages,
 						     ctx->min_hpages);
 		if (!sbinfo->spool)
-			goto out_free;
+			goto free_sbinfo;
 	}
 	sb->s_maxbytes =3D MAX_LFS_FILESIZE;
 	sb->s_blocksize =3D huge_page_size(ctx->hstate);
@@ -1499,10 +1499,12 @@ hugetlbfs_fill_super(struct super_block *sb, struc=
t fs_context *fc)
 	sb->s_stack_depth =3D FILESYSTEM_MAX_STACK_DEPTH;
 	sb->s_root =3D d_make_root(hugetlbfs_get_root(sb, ctx));
 	if (!sb->s_root)
-		goto out_free;
+		goto free_spool;
 	return 0;
-out_free:
+
+free_spool:
 	kfree(sbinfo->spool);
+free_sbinfo:
 	kfree(sbinfo);
 	return -ENOMEM;
 }
=2D-
2.43.0