[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <b109b7dc-3972-4b2e-ae4c-89bf8eecf8f2@web.de>
Date: Fri, 29 Dec 2023 12:40:12 +0100
From: Markus Elfring <Markus.Elfring@....de>
To: linux-mm@...ck.org, kernel-janitors@...r.kernel.org,
Muchun Song <muchun.song@...ux.dev>
Cc: LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH 2/2] hugetlbfs: Improve exception handling in
hugetlbfs_fill_super()
From: Markus Elfring <elfring@...rs.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@...rs.sourceforge.net>
---
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
--- 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 = MAX_LFS_FILESIZE;
sb->s_blocksize = huge_page_size(ctx->hstate);
@@ -1499,10 +1499,12 @@ hugetlbfs_fill_super(struct super_block *sb, struct fs_context *fc)
sb->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH;
sb->s_root = 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;
}
--
2.43.0
Powered by blists - more mailing lists