* [PATCH] btrfs-progs: Fix stack overflow for checking qgroup on tree reloc tree
@ 2016-10-06 9:13 Qu Wenruo
2016-10-13 15:58 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: Qu Wenruo @ 2016-10-06 9:13 UTC (permalink / raw)
To: linux-btrfs; +Cc: dsterba
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>
---
qgroup-verify.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/qgroup-verify.c b/qgroup-verify.c
index df0e547..9a56f59 100644
--- a/qgroup-verify.c
+++ b/qgroup-verify.c
@@ -369,6 +369,11 @@ static int find_parent_roots(struct ulist *roots, u64 parent)
if (ret < 0)
goto out;
}
+ } else if (ref->parent == ref->bytenr) {
+ /*
+ * Special loop case for tree reloc tree
+ */
+ ref->root = BTRFS_TREE_RELOC_OBJECTID;
} else {
ret = find_parent_roots(roots, ref->parent);
if (ret < 0)
@@ -578,6 +583,8 @@ static u64 resolve_one_root(u64 bytenr)
if (ref->root)
return ref->root;
+ if (ref->parent == bytenr)
+ return BTRFS_TREE_RELOC_OBJECTID;
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_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.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1;
--
2.10.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] btrfs-progs: Fix stack overflow for checking qgroup on tree reloc tree
2016-10-06 9:13 [PATCH] btrfs-progs: Fix stack overflow for checking qgroup on tree reloc tree Qu Wenruo
@ 2016-10-13 15:58 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2016-10-13 15:58 UTC (permalink / raw)
To: Qu Wenruo; +Cc: linux-btrfs, dsterba
On Thu, Oct 06, 2016 at 05:13:32PM +0800, Qu Wenruo wrote:
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-13 15:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-06 9:13 [PATCH] btrfs-progs: Fix stack overflow for checking qgroup on tree reloc tree Qu Wenruo
2016-10-13 15:58 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).