From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 3/4] btrfs-progs: check/original: Avoid infinite loop when failed to repair inode
Date: Thu, 5 Jul 2018 15:37:30 +0800 [thread overview]
Message-ID: <20180705073731.18459-4-wqu@suse.com> (raw)
In-Reply-To: <20180705073731.18459-1-wqu@suse.com>
Exposed by fuzz-tests/003-multi-check-unmounted/ on fuzzed image
bko-161811.raw.xz.
It's caused by the fact when check_fs_roots() finds tree root is
modified, it re-search tree root by goto again: tag.
However again: tag will also reset root objectid to 0.
If we failed to repair one fs root but still modified tree root, we will
go into such infinite loop.
Fix it by record which root we should skip for repair mode.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
check/main.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/check/main.c b/check/main.c
index c8c347236543..2b5abb2d025b 100644
--- a/check/main.c
+++ b/check/main.c
@@ -3380,6 +3380,7 @@ static int check_fs_roots(struct btrfs_fs_info *fs_info,
struct extent_buffer *leaf, *tree_node;
struct btrfs_root *tmp_root;
struct btrfs_root *tree_root = fs_info->tree_root;
+ u64 skip_root = 0;
int ret;
int err = 0;
@@ -3400,7 +3401,10 @@ static int check_fs_roots(struct btrfs_fs_info *fs_info,
again:
key.offset = 0;
- key.objectid = 0;
+ if (skip_root)
+ key.objectid = skip_root + 1;
+ else
+ key.objectid = 0;
key.type = BTRFS_ROOT_ITEM_KEY;
ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0);
if (ret < 0) {
@@ -3409,6 +3413,7 @@ again:
}
tree_node = tree_root->node;
while (1) {
+
if (tree_node != tree_root->node) {
free_root_recs_tree(root_cache);
btrfs_release_path(&path);
@@ -3445,8 +3450,18 @@ again:
btrfs_release_path(&path);
goto again;
}
- if (ret)
+ if (ret) {
err = 1;
+
+ /*
+ * We failed to repair this root but modified tree
+ * root, after again: tag we will still hit this
+ * root and fail to repair, must skip this root to
+ * avoid infinite loop
+ */
+ if (repair)
+ skip_root = key.objectid;
+ }
if (key.objectid == BTRFS_TREE_RELOC_OBJECTID)
btrfs_free_fs_root(tmp_root);
} else if (key.type == BTRFS_ROOT_REF_KEY ||
--
2.18.0
next prev parent reply other threads:[~2018-07-05 7:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 7:37 [PATCH 0/4] Some random fuzz test fixes Qu Wenruo
2018-07-05 7:37 ` [PATCH 1/4] btrfs-progs: check: Remove the ability to rebuild root overwritting existing tree blocks Qu Wenruo
2018-07-05 8:50 ` Gu, Jinxiang
2018-07-05 9:41 ` Qu Wenruo
2018-07-06 1:53 ` Gu, Jinxiang
2018-08-02 19:36 ` David Sterba
2018-07-05 7:37 ` [PATCH 2/4] btrfs-progs: transaction: Error out other than panic when committing transaction Qu Wenruo
2018-07-05 9:33 ` Gu, Jinxiang
2018-07-05 7:37 ` Qu Wenruo [this message]
2018-07-06 3:22 ` [PATCH 3/4] btrfs-progs: check/original: Avoid infinite loop when failed to repair inode Gu, Jinxiang
2018-07-05 7:37 ` [PATCH 4/4] btrfs-progs: check/original: Don't overwrite return value when we failed to repair Qu Wenruo
2018-07-06 4:57 ` Gu, Jinxiang
2018-08-02 20:03 ` [PATCH 0/4] Some random fuzz test fixes David Sterba
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=20180705073731.18459-4-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).