From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-nilfs <linux-nilfs@vger.kernel.org>,
syzbot <syzbot+9bff4c7b992038a7409f@syzkaller.appspotmail.com>,
syzkaller-bugs@googlegroups.com,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/3] nilfs2: fix potential null-ptr-deref in nilfs_btree_insert()
Date: Wed, 4 Sep 2024 17:13:07 +0900 [thread overview]
Message-ID: <20240904081401.16682-2-konishi.ryusuke@gmail.com> (raw)
In-Reply-To: <20240904081401.16682-1-konishi.ryusuke@gmail.com>
If a b-tree is broken on the device, and the b-tree height is greater
than 2 (the level of the root node is greater than 1) even if the
number of child nodes of the b-tree root is 0, a NULL pointer
dereference occurs in nilfs_btree_prepare_insert(), which is called
from nilfs_btree_insert().
This is because, when the number of child nodes of the b-tree root is
0, nilfs_btree_do_lookup() does not set the block buffer head in any
of path[x].bp_bh, leaving it as the initial value of NULL, but if the
level of the b-tree root node is greater than 1,
nilfs_btree_get_nonroot_node(), which accesses the buffer memory of
path[x].bp_bh, is called.
Fix this issue by adding a check to nilfs_btree_root_broken(), which
performs sanity checks when reading the root node from the device, to
detect this inconsistency.
Thanks to Lizhi Xu for trying to solve the bug and clarifying the
cause early on.
Link: https://lkml.kernel.org/r/20240902084101.138971-1-lizhi.xu@windriver.com
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Reported-by: syzbot+9bff4c7b992038a7409f@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=9bff4c7b992038a7409f
Fixes: 17c76b0104e4 ("nilfs2: B-tree based block mapping")
---
fs/nilfs2/btree.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 862bdf23120e..d390b8ba00d4 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -381,7 +381,8 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node,
if (unlikely(level < NILFS_BTREE_LEVEL_NODE_MIN ||
level >= NILFS_BTREE_LEVEL_MAX ||
nchildren < 0 ||
- nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX)) {
+ nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX ||
+ (nchildren == 0 && level > NILFS_BTREE_LEVEL_NODE_MIN))) {
nilfs_crit(inode->i_sb,
"bad btree root (ino=%lu): level = %d, flags = 0x%x, nchildren = %d",
inode->i_ino, level, flags, nchildren);
--
2.43.0
next prev parent reply other threads:[~2024-09-04 8:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-01 20:39 [syzbot] [nilfs?] general protection fault in nilfs_btree_insert (2) syzbot
2024-09-02 8:41 ` Lizhi Xu
2024-09-02 10:08 ` syzbot
2024-09-02 19:40 ` Ryusuke Konishi
2024-09-04 8:13 ` [PATCH 0/3] nilfs2: fix potential issues with empty b-tree nodes Ryusuke Konishi
2024-09-04 8:13 ` Ryusuke Konishi [this message]
2024-09-04 8:13 ` [PATCH 2/3] nilfs2: determine empty node blocks as corrupted Ryusuke Konishi
2024-09-04 8:13 ` [PATCH 3/3] nilfs2: fix potential oob read in nilfs_btree_check_delete() Ryusuke Konishi
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=20240904081401.16682-2-konishi.ryusuke@gmail.com \
--to=konishi.ryusuke@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=syzbot+9bff4c7b992038a7409f@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.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®