linux-kernel - [PATCH v2] squashfs: Avoid mem leak in squashfs_fill

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250812030403.517269-1-scott_gzh@163.com>
Date: Tue, 12 Aug 2025 11:04:03 +0800
From: scott_gzh@....com
To: phillip@...ashfs.org.uk
Cc: linux-kernel@...r.kernel.org,
	Scott GUO <scottzhguo@...cent.com>
Subject: [PATCH v2] squashfs: Avoid mem leak in squashfs_fill_super()

From: Scott GUO <scottzhguo@...cent.com>

If sb_min_blocksize() returns 0, -EINVAL was returned without freeing
sb->s_fs_info, causing mem leak.

Fix it by calling and checking result of sb_min_blocksize() before
kzalloc.

Fixes: 734aa85390ea ("Squashfs: check return result of sb_min_blocksize")
Signed-off-by: Scott GUO <scottzhguo@...cent.com>

---

v2:
  Adjust commit message based on Markus' advice, and refine fix
  following Phillip's comment.
---
 fs/squashfs/super.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 992ea0e37257..073462b098c5 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -188,9 +188,16 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc)
 	unsigned int fragments;
 	u64 lookup_table_start, xattr_id_table_start, next_table;
 	int err;
+	int devblksize;
 
 	TRACE("Entered squashfs_fill_superblock\n");
 
+	devblksize = sb_min_blocksize(sb, SQUASHFS_DEVBLK_SIZE);
+	if (!devblksize) {
+		errorf(fc, "squashfs: unable to set blocksize\n");
+		return -EINVAL;
+	}
+
 	sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL);
 	if (sb->s_fs_info == NULL) {
 		ERROR("Failed to allocate squashfs_sb_info\n");
@@ -201,12 +208,7 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc)
 
 	msblk->panic_on_errors = (opts->errors == Opt_errors_panic);
 
-	msblk->devblksize = sb_min_blocksize(sb, SQUASHFS_DEVBLK_SIZE);
-	if (!msblk->devblksize) {
-		errorf(fc, "squashfs: unable to set blocksize\n");
-		return -EINVAL;
-	}
-
+	msblk->devblksize = devblksize;
 	msblk->devblksize_log2 = ffz(~msblk->devblksize);
 
 	mutex_init(&msblk->meta_index_mutex);
-- 
2.41.3