Skip to content

Commit 1ba98d0

Browse files
Liu Bomasoncl
authored andcommitted
Btrfs: detect corruption when non-root leaf has zero item
Right now we treat leaf which has zero item as a valid one because we could have an empty tree, that is, a root that is also a leaf without any item, however, in the same case but when the leaf is not a root, we can end up with hitting the BUG_ON(1) in btrfs_extend_item() called by setup_inline_extent_backref(). This makes us check the situation as a corruption if leaf is not its own root. Signed-off-by: Liu Bo <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]> Signed-off-by: Chris Mason <[email protected]>
1 parent 053ab70 commit 1ba98d0

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

fs/btrfs/disk-io.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,29 @@ static noinline int check_leaf(struct btrfs_root *root,
560560
u32 nritems = btrfs_header_nritems(leaf);
561561
int slot;
562562

563-
if (nritems == 0)
563+
if (nritems == 0) {
564+
struct btrfs_root *check_root;
565+
566+
key.objectid = btrfs_header_owner(leaf);
567+
key.type = BTRFS_ROOT_ITEM_KEY;
568+
key.offset = (u64)-1;
569+
570+
check_root = btrfs_get_fs_root(root->fs_info, &key, false);
571+
/*
572+
* The only reason we also check NULL here is that during
573+
* open_ctree() some roots has not yet been set up.
574+
*/
575+
if (!IS_ERR_OR_NULL(check_root)) {
576+
/* if leaf is the root, then it's fine */
577+
if (leaf->start !=
578+
btrfs_root_bytenr(&check_root->root_item)) {
579+
CORRUPT("non-root leaf's nritems is 0",
580+
leaf, root, 0);
581+
return -EIO;
582+
}
583+
}
564584
return 0;
585+
}
565586

566587
/* Check the 0 item */
567588
if (btrfs_item_offset_nr(leaf, 0) + btrfs_item_size_nr(leaf, 0) !=

0 commit comments

Comments
 (0)