mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Viacheslav Dubeyko <slava@dubeyko.com>
To: Hui Peng <benquike@gmail.com>,
	glaubitz@physik.fu-berlin.de,  frank.li@vivo.com,
	brauner@kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] hfs: validate drAlBlkSiz and fs_ablocks in hfs_mdb_get()
Date: Mon, 21 Sep 2026 14:33:11 -0700	[thread overview]
Message-ID: <1164821496f54d2fe03af44283d48db707a5e391.camel@dubeyko.com> (raw)
In-Reply-To: <20260919222605.3794529-1-benquike@gmail.com>

On Sat, 2026-09-19 at 22:26 +0000, Hui Peng wrote:
> In hfs_mdb_get() (fs/hfs/mdb.c), reject images with allocation block
> size (drAlBlkSiz) of 0 or not a multiple of HFS_SECTOR_SIZE (512), or
> with fs_ablocks == 0, preventing a divide-by-zero trap and out-of-
> bounds
> bitmap scans on crafted HFS images.
> 
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Assisted-by: LLM
> Signed-off-by: Hui Peng <benquike@gmail.com>
> ---
> diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c
> index 277de712f9d4..9e78c561a3f1 100644
> --- a/fs/hfs/mdb.c
> +++ b/fs/hfs/mdb.c
> @@ -204,6 +204,11 @@ int hfs_mdb_get(struct super_block *sb)
>  	/* These parameters are read from the MDB, and never written
> */
>  	HFS_SB(sb)->part_start = part_start;
>  	HFS_SB(sb)->fs_ablocks = be16_to_cpu(mdb->drNmAlBlks);
> +	if (!HFS_SB(sb)->fs_ablocks) {

This check doesn't look like checking that it's "not a multiple of
HFS_SECTOR_SIZE (512)". Could you make your check more accurate?

Also, if you started this check, then let's check that all these fields
are consistent:

	__be16 drNmAlBlks;		/* number of allocation blocks
*/
	__be32 drAlBlkSiz;		/* bytes in an allocation
block */

	__be16 drFreeBks;		/* number of free allocation
blocks */

Could you please add these checks?

Thanks,
Slava.

> +		brelse(bh);
> +		HFS_SB(sb)->mdb_bh = NULL;
> +		return -EINVAL;
> +	}
>  	HFS_SB(sb)->fs_div = HFS_SB(sb)->alloc_blksz >> sb-
> >s_blocksize_bits;
>  	HFS_SB(sb)->clumpablks = be32_to_cpu(mdb->drClpSiz) /
>  				 HFS_SB(sb)->alloc_blksz;

  reply	other threads:[~2026-09-21 21:33 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-19 22:26 Hui Peng
2026-09-21 21:33 ` Viacheslav Dubeyko [this message]
2026-09-21 22:01   ` Krzysztof Kozlowski

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=1164821496f54d2fe03af44283d48db707a5e391.camel@dubeyko.com \
    --to=slava@dubeyko.com \
    --cc=benquike@gmail.com \
    --cc=brauner@kernel.org \
    --cc=frank.li@vivo.com \
    --cc=glaubitz@physik.fu-berlin.de \
    --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®