From: Dave Kleikamp <dave.kleikamp@oracle.com>
To: Juntong Deng <juntong.deng@outlook.com>,
shaggy@kernel.org, wonguk.lee1023@gmail.com,
liushixin2@huawei.com, andrew.kanner@gmail.com,
wuhoipok@gmail.com
Cc: jfs-discussion@lists.sourceforge.net,
linux-kernel@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org,
syzbot+debee9ab7ae2b34b0307@syzkaller.appspotmail.com
Subject: Re: [PATCH v2] fs/jfs: Add check for negative db_l2nbperpage
Date: Tue, 3 Oct 2023 18:27:45 -0500 [thread overview]
Message-ID: <c943f428-3759-4922-9622-fd481d0ac26d@oracle.com> (raw)
In-Reply-To: <VI1P193MB0752E63048A98BC70E4CFA9E99C5A@VI1P193MB0752.EURP193.PROD.OUTLOOK.COM>
On 10/2/23 4:56AM, Juntong Deng wrote:
> l2nbperpage is log2(number of blks per page), and the minimum legal
> value should be 0, not negative.
>
> In the case of l2nbperpage being negative, an error will occur
> when subsequently used as shift exponent.
>
> Syzbot reported this bug:
>
> UBSAN: shift-out-of-bounds in fs/jfs/jfs_dmap.c:799:12
> shift exponent -16777216 is negative
Looks good. (A little part of me wants to go through the code and make a
lot of signed ints unsigned, but not today.)
Applied to jfs-next
Thanks,
Shaggy
>
> Reported-by: syzbot+debee9ab7ae2b34b0307@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=debee9ab7ae2b34b0307
> Signed-off-by: Juntong Deng <juntong.deng@outlook.com>
> ---
> fs/jfs/jfs_dmap.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
> index 88afd108c2dd..3a1842348112 100644
> --- a/fs/jfs/jfs_dmap.c
> +++ b/fs/jfs/jfs_dmap.c
> @@ -180,7 +180,8 @@ int dbMount(struct inode *ipbmap)
> bmp->db_nfree = le64_to_cpu(dbmp_le->dn_nfree);
>
> bmp->db_l2nbperpage = le32_to_cpu(dbmp_le->dn_l2nbperpage);
> - if (bmp->db_l2nbperpage > L2PSIZE - L2MINBLOCKSIZE) {
> + if (bmp->db_l2nbperpage > L2PSIZE - L2MINBLOCKSIZE ||
> + bmp->db_l2nbperpage < 0) {
> err = -EINVAL;
> goto err_release_metapage;
> }
prev parent reply other threads:[~2023-10-03 23:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 9:56 Juntong Deng
2023-10-02 15:56 ` Ricardo B. Marliere
2023-10-02 18:24 ` Juntong Deng
2023-10-03 23:27 ` Dave Kleikamp [this message]
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=c943f428-3759-4922-9622-fd481d0ac26d@oracle.com \
--to=dave.kleikamp@oracle.com \
--cc=andrew.kanner@gmail.com \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=juntong.deng@outlook.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liushixin2@huawei.com \
--cc=shaggy@kernel.org \
--cc=syzbot+debee9ab7ae2b34b0307@syzkaller.appspotmail.com \
--cc=wonguk.lee1023@gmail.com \
--cc=wuhoipok@gmail.com \
/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®