From: Matthias Goergens <matthias.goergens@gmail.com>
To: Hui Peng <benquike@gmail.com>
Cc: Damien Le Moal <dlemoal@kernel.org>,
Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
Jeff Layton <jlayton@kernel.org>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH v2 1/6] qnx6: validate di_filelevels in qnx6_iget()
Date: Thu, 24 Sep 2026 12:31:35 +0800 [thread overview]
Message-ID: <20260924043135.3894182-1-matthias.goergens@gmail.com> (raw)
In-Reply-To: <20260921042511.1473629-1-benquike@gmail.com>
Hi Hui,
I hit the bugs fixed by 1/6 and 3/6 while fuzzing qnx6, so I tested
your series rather than send my own fixes. On mainline 40288c9206c1
with v2 1-6 applied:
- KASAN/UBSAN kernel under qemu: the Inode.levels = 6 fuzz image and
two Longfile.levels = 6 images, one per active-superblock branch, no
longer trigger the double-brelse warning. A root inode with
di_filelevels = 255 is rejected in qnx6_iget() without the UBSAN
shift reports.
- Userspace fs/qnx6 build under ASan/UBSan: LeakSanitizer no longer
reports the buffer_head leaks from qnx6_block_map() (2/6) or the
mmi_fs error path (4/6); bad sb1 magic under SB_SILENT is rejected
(5/6), and sb_blocksize = 0 no longer divides by zero (6/6).
- Six valid images with the same trees in both superblocks produced
the same names, sizes and MD5 sums before and after the series. They
cover 512-byte and 4K blocks, zero to two indirect levels, either
active superblock, and normal and MMI layouts.
Feel free to add:
Tested-by: Matthias Goergens <matthias.goergens@gmail.com>
Reviewed-by: Matthias Goergens <matthias.goergens@gmail.com>
Two pre-existing problems turned up; neither needs to hold up the
series:
1. qnx6_block_map() shifts a 32-bit block index by ptrbits * depth:
35 bits for 512-byte blocks at depth 5 and 40 for 4K blocks at
depth 4. Both levels are valid, but UBSAN still flags them. At a
bit offset of at least 32, the tree-index component is zero; the
mapper continues with the remaining indices. Guarding both shifts
against the index width avoids the undefined shifts without
rejecting either level. A test-only u64 cast removes those two
reports, but the images force high levels onto shallow trees and do
not test genuine level-4 or level-5 trees.
2. When superblock #2 is newer, qnx6_fill_super() selects it in
sbi->sb and sbi->sb_buf and releases bh1, but still uses sb1 for the
Inode and Longfile level checks and root nodes. Thus it reads #1's
inode and longfilename trees through a released buffer while
sbi->sb points to #2. On an image whose superblocks point at
different inode trees, old_file appears instead of new_file.
Setting sb1 = sb2 fixes all four later uses in my tests.
I can send both as follow-ups on top of your series, or you can fold
the shift fix into 1/6. I'm also happy to share the images.
Thanks,
Matthias
next prev parent reply other threads:[~2026-09-24 4:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-19 22:25 [PATCH] qnx6: validate di_filelevels in qnx6_iget() and fix mount error handling Hui Peng
2026-09-20 4:02 ` Damien Le Moal
2026-09-21 4:25 ` [PATCH v2 1/6] qnx6: validate di_filelevels in qnx6_iget() Hui Peng
2026-09-21 4:25 ` [PATCH v2 2/6] qnx6: release buffer_head on error in qnx6_block_map() Hui Peng
2026-09-24 4:31 ` Matthias Goergens
2026-09-24 7:39 ` [PATCH v3 1/6] qnx6: validate di_filelevels in qnx6_iget() before accessing level pointers Hui Peng
2026-09-21 4:25 ` [PATCH v2 3/6] qnx6: avoid double brelse() on error path in qnx6_fill_super() Hui Peng
2026-09-24 4:31 ` Matthias Goergens
2026-09-24 7:39 ` [PATCH v3 2/6] qnx6: release bh on error path in qnx6_block_map() Hui Peng
2026-09-21 4:25 ` [PATCH v2 4/6] qnx6: release sb_buf on mmi_fs error path in qnx6_fill_super() Hui Peng
2026-09-24 4:31 ` Matthias Goergens
2026-09-24 7:39 ` [PATCH v3 3/6] qnx6: avoid double brelse() on " Hui Peng
2026-09-21 4:25 ` [PATCH v2 5/6] qnx6: abort mount on superblock magic mismatch when silent is set Hui Peng
2026-09-24 4:31 ` Matthias Goergens
2026-09-24 7:39 ` [PATCH v3 4/6] qnx6: release sb_buf on mmi_fs error path in qnx6_fill_super() Hui Peng
2026-09-21 4:25 ` [PATCH v2 6/6] qnx6: validate sb_blocksize before dividing in qnx6_mmi_fill_super() Hui Peng
2026-09-24 4:31 ` Matthias Goergens
2026-09-24 7:39 ` [PATCH v3 5/6] qnx6: abort mount on superblock magic mismatch when silent is set Hui Peng
2026-09-24 4:31 ` Matthias Goergens [this message]
2026-09-24 7:39 ` [PATCH v3 0/6] fs/qnx6: fix buffer head leaks, double free, and inode validation Hui Peng
2026-09-24 10:11 ` Matthias Goergens
[not found] ` <20260921042511.1473629-7-benquike@gmail.com>
2026-09-24 7:39 ` [PATCH v3 6/6] qnx6: validate sb_blocksize before dividing in qnx6_mmi_fill_super() Hui Peng
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=20260924043135.3894182-1-matthias.goergens@gmail.com \
--to=matthias.goergens@gmail.com \
--cc=benquike@gmail.com \
--cc=brauner@kernel.org \
--cc=dlemoal@kernel.org \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@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®