RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-01-27 07:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Fix stack overflow for checking qgroup on tree reloc tree

Browse Source 
For tree reloc tree whose level is >= 2, the root node's parent will
point to itself.
In this case it will make btrfsck overflow its stack and cause segfault.

While for tree reloc tree, it doesn't affect qgroup and kernel can
handle it well.

So add tree reloc tree check for qgroup-verify.c and fix the bug.

Test case will follow soon after I make a minimal image for it.
Current xz ziped image is still over 10M for a 512M fs.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2016-10-06 17:13:32 +08:00 committed by David Sterba
parent c9ec835ae1
commit d94816cbde
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qgroup-verify.c
View File

@ -369,6 +369,11 @@ static int find_parent_roots(struct ulist *roots, u64 parent)
if (ret < 0) if (ret < 0)
goto out; goto out;
} }
} else if (ref->parent == ref->bytenr) {
/*
* Special loop case for tree reloc tree
*/
ref->root = BTRFS_TREE_RELOC_OBJECTID;
} else { } else {
ret = find_parent_roots(roots, ref->parent); ret = find_parent_roots(roots, ref->parent);
if (ret < 0) if (ret < 0)
@ -578,6 +583,8 @@ static u64 resolve_one_root(u64 bytenr)
if (ref->root) if (ref->root)
return ref->root; return ref->root;
if (ref->parent == bytenr)
return BTRFS_TREE_RELOC_OBJECTID;
return resolve_one_root(ref->parent); return resolve_one_root(ref->parent);
} }
@ -748,6 +755,9 @@ static int add_refs_for_implied(struct btrfs_fs_info *info, u64 bytenr,
struct btrfs_root *root; struct btrfs_root *root;
struct btrfs_key key; struct btrfs_key key;
/* Tree reloc tree doesn't contribute qgroup, skip it */
if (root_id == BTRFS_TREE_RELOC_OBJECTID)
return 0;
key.objectid = root_id; key.objectid = root_id;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;