mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Guikun Yang <yangguikun19@qq.com>
To: Christian Brauner <brauner@kernel.org>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ufs: validate fs_cgsize when reading the superblock
Date: Sun, 08 Nov 2026 10:00:00 +0800	[thread overview]
Message-ID: <tencent_EBEADAF7CF88B39381E959548BCF46146006@qq.com> (raw)
In-Reply-To: <c5-ufs-cgsize-ubsan-20261031@qq.com>

fs_cgsize is read from disk into uspi->s_cgsize without any check.
Its only consumer derives a buffer count from it:

	UCPI_UBH(ucpi)->count = uspi->s_cgsize >> sb->s_blocksize_bits;
	...
	for (i = 1; i < UCPI_UBH(ucpi)->count; i++) {
		UCPI_UBH(ucpi)->bh[i] = sb_bread(...);

struct ufs_buffer_head.bh[] has UFS_MAXFRAG (8) entries, so a crafted
fs_cgsize whose block shift exceeds 8 writes past the array while
loading a cylinder group. fs_cgsize of zero, or smaller than the
fragment size, produces a zero count and leaves the cylinder group in
a half-initialized state.

Reject those values where the rest of the geometry is already
validated.

Reported-by: Guikun Yang <yangguikun19@qq.com>  (bug report of 2026-10-31, <c5-ufs-cgsize-ubsan-20261031@qq.com>)
Signed-off-by: Guikun Yang <yangguikun19@qq.com>
---
 fs/ufs/super.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 1111111..2222222 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1140,6 +1140,14 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
 	uspi->s_cgsize = fs32_to_cpu(sb, usb1->fs_cgsize);
+	if (!uspi->s_cgsize ||
+	    uspi->s_cgsize < uspi->s_fsize ||
+	    (uspi->s_cgsize >> sb->s_blocksize_bits) > UFS_MAXFRAG) {
+		pr_err("%s(): invalid cylinder group size (%u)\n",
+		       __func__, uspi->s_cgsize);
+		goto failed;
+	}
 	uspi->s_ntrak = fs32_to_cpu(sb, usb1->fs_ntrak);

Tested on the image from the bug report: the crafted fs_cgsize is now
rejected at mount with the message above instead of writing past
bh[]; the unmodified image still mounts.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
--
2.43.0


           reply	other threads:[~2026-11-07 17:01 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <c5-ufs-cgsize-ubsan-20261031@qq.com>]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tencent_EBEADAF7CF88B39381E959548BCF46146006@qq.com \
    --to=yangguikun19@qq.com \
    --cc=brauner@kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®