mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: Liao Chang <liaochang1@huawei.com>
Cc: willy@infradead.org, damien.lemoal@opensource.wdc.com,
	akpm@linux-foundation.org, jack@suse.cz, qhjin.dev@gmail.com,
	songmuchun@bytedance.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fs: Fix UBSAN detected shift-out-bounds error for bad superblock
Date: Mon, 14 Nov 2022 12:04:59 +0100	[thread overview]
Message-ID: <20221114110459.x7yb6rhgwpi6kyjj@quack3> (raw)
In-Reply-To: <20221114024957.60916-1-liaochang1@huawei.com>

On Mon 14-11-22 10:49:57, Liao Chang wrote:
> UBSAN: shift-out-of-bounds in fs/minix/bitmap.c:103:3
> shift exponent 8192 is too large for 32-bit type 'unsigned int'
> CPU: 1 PID: 32273 Comm: syz-executor.0 Tainted: G        W
> 6.1.0-rc4-dirty #11
> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996),
> BIOS rel-1.15.0-0-g2dd4b9b3f840-prebuilt.qemu.org 04/01/2014
> Call Trace:
>  <TASK>
>  dump_stack_lvl+0xcd/0x134
>  ubsan_epilogue+0xb/0x50
>  __ubsan_handle_shift_out_of_bounds.cold+0xb1/0x18d
>  minix_count_free_blocks.cold+0x16/0x1b
>  minix_statfs+0x22a/0x490
>  statfs_by_dentry+0x133/0x210
>  user_statfs+0xa9/0x160
>  __do_sys_statfs+0x7a/0xf0
>  do_syscall_64+0x35/0x80
>  entry_SYSCALL_64_after_hwframe+0x63/0xcd
> 
> The superblock stores on disk contains the size of a data zone, which is
> too large to used as the shift when kernel try to calculate the total
> size of zones, so it needs to check the superblock when kernel mounts
> MINIX-FS.
> 
> Signed-off-by: Liao Chang <liaochang1@huawei.com>

Thanks for the patch. Just one nit:

> diff --git a/fs/minix/inode.c b/fs/minix/inode.c
> index da8bdd1712a7..f1d1c2312817 100644
> --- a/fs/minix/inode.c
> +++ b/fs/minix/inode.c
> @@ -166,6 +166,12 @@ static bool minix_check_superblock(struct super_block *sb)
>  	    sb->s_maxbytes > (7 + 512 + 512*512) * BLOCK_SIZE)
>  		return false;
>  
> +	/* the total size of zones must no exceed the limitation of U32_MAX. */
> +	if (sbi->s_log_zone_size && (sbi->s_nzones - sbi->s_firstdatazone) &&
> +	    (__builtin_clzl((__u32)(sbi->s_nzones - sbi->s_firstdatazone)) <=

Why this strange __builtin_clzl() function? We have a ffs() function in
the kernel for this :)

								Honza

> +	     sbi->s_log_zone_size))
> +		return false;
> +
>  	return true;
>  }
>  
> -- 
> 2.17.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

  reply	other threads:[~2022-11-14 11:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-14  2:49 Liao Chang
2022-11-14 11:04 ` Jan Kara [this message]
2022-11-14 11:59   ` liaochang (A)
2022-11-14 12:07     ` Jan Kara
2022-11-14 21:09 ` Randy Dunlap
2022-11-15  0:44   ` liaochang (A)

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=20221114110459.x7yb6rhgwpi6kyjj@quack3 \
    --to=jack@suse.cz \
    --cc=akpm@linux-foundation.org \
    --cc=damien.lemoal@opensource.wdc.com \
    --cc=liaochang1@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=qhjin.dev@gmail.com \
    --cc=songmuchun@bytedance.com \
    --cc=willy@infradead.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®