Skip to content

Commit 9403001

Browse files
konisakpm00
authored andcommitted
nilfs2: fix potential null-ptr-deref in nilfs_btree_insert()
Patch series "nilfs2: fix potential issues with empty b-tree nodes". This series addresses three potential issues with empty b-tree nodes that can occur with corrupted filesystem images, including one recently discovered by syzbot. This patch (of 3): 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/[email protected] Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Fixes: 17c76b0 ("nilfs2: B-tree based block mapping") Signed-off-by: Ryusuke Konishi <[email protected]> Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=9bff4c7b992038a7409f Cc: Lizhi Xu <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 546f028 commit 9403001

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/nilfs2/btree.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node,
381381
if (unlikely(level < NILFS_BTREE_LEVEL_NODE_MIN ||
382382
level >= NILFS_BTREE_LEVEL_MAX ||
383383
nchildren < 0 ||
384-
nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX)) {
384+
nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX ||
385+
(nchildren == 0 && level > NILFS_BTREE_LEVEL_NODE_MIN))) {
385386
nilfs_crit(inode->i_sb,
386387
"bad btree root (ino=%lu): level = %d, flags = 0x%x, nchildren = %d",
387388
inode->i_ino, level, flags, nchildren);

0 commit comments

Comments
 (0)