From: Viacheslav Dubeyko <slava@dubeyko.com>
To: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Cc: Wang Jianjian <wangjianjian3@huawei.com>,
linux-nilfs <linux-nilfs@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
syzbot+158be45e4d99232e1900@syzkaller.appspotmail.com,
syzkaller-bugs@googlegroups.com
Subject: Re: [PATCH] nilfs2: enhance btree node keys check
Date: Mon, 10 Aug 2026 16:08:00 -0700 [thread overview]
Message-ID: <32b74743e9eb4da2c2fd0f045c06a4916389358d.camel@dubeyko.com> (raw)
In-Reply-To: <20260810142125.60264-1-konishi.ryusuke@gmail.com>
On Mon, 2026-08-10 at 23:20 +0900, Ryusuke Konishi wrote:
> From: Wang Jianjian <wangjianjian3@huawei.com>
>
> syzbot reported a warning on nilfs_btree_assign:
> WARNING: fs/nilfs2/btree.c:2302 at nilfs_btree_assign+0x983/0xbe0
> fs/nilfs2/btree.c:2302,
>
> Analysis found that a corrupted file has the following btree layout:
> Level2(key/ptr): [ 256/15 ]
> Level1(key/ptr): [ 0/8, 1/9, 0/10, 3/11, 4/12, 5/13, 6/14,
> 139637976727559/16, 0/17 ]
>
> The test truncated the file to 2 bytes, which partially zeroes the
> first
> block and adds the file to the dirty list. When the segment
> constructor
> writes it and assigns a new blocknr for the index block, it searches
> the
> btree with key=0 and min level=2, and apparently returns -ENOENT.
>
> Therefore, we should perform more checks on the btree nodes and
> return
> early.
>
> [ryusuke: split long lines in btree.c to satisfy checkpatch and
> improved the error message format for clarity]
>
> Reported-by: syzbot+158be45e4d99232e1900@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=158be45e4d99232e1900
> Signed-off-by: Wang Jianjian <wangjianjian3@huawei.com>
> Fixes: 17c76b0104e4 ("nilfs2: B-tree based block mapping")
> Cc: <stable+noautosel@kernel.org> # Warning suppression primarily
> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
> ---
> Hi Viacheslav,
>
> Please apply this for the next cycle.
>
> This introduces a check for sorted keys when reading btree node
> blocks
> into the cache, preventing unexpected errors during the block number
> assignment phase in log writing caused by key order inconsistencies,
> as well as the kernel warnings reported by syzbot.
>
> Thanks,
> Ryusuke Konishi
>
> fs/nilfs2/btree.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
> index 64bac66af25b..6b8332e8c0db 100644
> --- a/fs/nilfs2/btree.c
> +++ b/fs/nilfs2/btree.c
> @@ -341,7 +341,8 @@ static int nilfs_btree_node_broken(const struct
> nilfs_btree_node *node,
> sector_t blocknr)
> {
> int level, flags, nchildren;
> - int ret = 0;
> + __u64 key, prev_key;
> + int i;
>
> level = nilfs_btree_node_get_level(node);
> flags = nilfs_btree_node_get_flags(node);
> @@ -356,9 +357,21 @@ static int nilfs_btree_node_broken(const struct
> nilfs_btree_node *node,
> "bad btree node (ino=%llu, blocknr=%llu):
> level = %d, flags = 0x%x, nchildren = %d",
> inode->i_ino, (unsigned long
> long)blocknr, level,
> flags, nchildren);
> - ret = 1;
> + return 1;
> }
> - return ret;
> +
> + for (i = 1, prev_key = nilfs_btree_node_get_key(node, 0);
> + i < nchildren; i++, prev_key = key) {
> + key = nilfs_btree_node_get_key(node, i);
> + if (unlikely(key <= prev_key)) {
> + nilfs_crit(inode->i_sb,
> + "bad btree node (ino=%llu,
> blocknr=%llu): unsorted keys at index %d (%llu) and %d (%llu)",
> + inode->i_ino, (unsigned long
> long)blocknr,
> + i - 1, prev_key, i, key);
> + return 1;
> + }
> + }
> + return 0;
> }
>
> /**
Applied.
Thanks,
Slava.
prev parent reply other threads:[~2026-08-10 23:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-10 14:20 Ryusuke Konishi
2026-08-10 23:08 ` Viacheslav Dubeyko [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=32b74743e9eb4da2c2fd0f045c06a4916389358d.camel@dubeyko.com \
--to=slava@dubeyko.com \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=syzbot+158be45e4d99232e1900@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
--cc=wangjianjian3@huawei.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®