From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH] btrfs-progs: Check the csum tree node before go through the csum tree
Date: Mon, 6 Oct 2014 09:15:07 +0800 [thread overview]
Message-ID: <5431ED1B.3050006@cn.fujitsu.com> (raw)
In-Reply-To: <1412067130-11504-1-git-send-email-quwenruo@cn.fujitsu.com>
Please ignore this patch since Wang's patch has already fixed them.
https://patchwork.kernel.org/patch/4254631/
Thanks,
Qu
-------- Original Message --------
Subject: [PATCH] btrfs-progs: Check the csum tree node before go through
the csum tree
From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Date: 2014年09月30日 16:52
> [BUG]
> Some fsfuzzed btrfs image will cause btrfsck segfault.
>
> [REPRODUCER]
> Run btrfsck on a csum tree block corrupted image.
>
> [REASON]
> check_csums() function call btrfs_search_slot() on csum_tree but doesn't
> check whether the csum_tree contains a valid extent_buffer, which causes
> the segfault.
>
> [FIX]
> Check the csum_root->node before any search.
>
> Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
> ---
> cmds-check.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/cmds-check.c b/cmds-check.c
> index 9471709..537376a 100644
> --- a/cmds-check.c
> +++ b/cmds-check.c
> @@ -3905,6 +3905,10 @@ static int check_csums(struct btrfs_root *root)
> unsigned long leaf_offset;
>
> root = root->fs_info->csum_root;
> + if (!extent_buffer_uptodate(root->node)) {
> + fprintf(stderr, "No valid csum tree found\n");
> + return -ENOENT;
> + }
>
> key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
> key.type = BTRFS_EXTENT_CSUM_KEY;
next prev parent reply other threads:[~2014-10-06 1:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-30 8:52 [PATCH] btrfs-progs: Check the csum tree node before go through the csum tree Qu Wenruo
2014-10-06 1:15 ` Qu Wenruo [this message]
2014-10-06 3:17 ` Qu Wenruo
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=5431ED1B.3050006@cn.fujitsu.com \
--to=quwenruo@cn.fujitsu.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).