From: Qu Wenruo <quwenruo.btrfs@gmx.com>
To: Ma Ke <make24@iscas.ac.cn>,
clm@fb.com, josef@toxicpanda.com, dsterba@suse.com,
fdmanana@suse.com
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH] btrfs: add a sanity check for btrfs root in btrfs_next_old_leaf()
Date: Mon, 24 Feb 2025 18:48:19 +1030 [thread overview]
Message-ID: <0d9f6477-04c2-486a-ae72-c39b6d235891@gmx.com> (raw)
In-Reply-To: <20250224075937.2959546-1-make24@iscas.ac.cn>
在 2025/2/24 18:29, Ma Ke 写道:
> btrfs_next_old_leaf() doesn't check if the target root is NULL or not,
> resulting the null-ptr-deref. Add sanity check for btrfs root before
> using it in btrfs_next_old_leaf().
Please provide a real world call trace when this is triggered.
There is a prerequisite, the extent tree can only be NULL if
rescue=ibadroots is provided and the extent root is corrupted.
And "rescue=" mount options can only be specified for a fully read-only
fs (no internal log replay or any other thing to write even a bit into
the fs).
Previously read-only scrub can still be triggered on such fs, but
6aecd91a5c5b ("btrfs: avoid NULL pointer dereference if no valid extent
tree") fixed that.
And if you hit such a case in real world, please provide the call trace
so that we know we're not missing some critical situations that extent
tree is accessed for read-only operations.
Thanks,
Qu
>
> Found by code review.
>
> Cc: stable@vger.kernel.org
> Fixes: d96b34248c2f ("btrfs: make send work with concurrent block group relocation")
> Signed-off-by: Ma Ke <make24@iscas.ac.cn>
> ---
> fs/btrfs/ctree.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> index 4e2e1c38d33a..1a3fc3863860 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -4794,13 +4794,17 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path,
> int level;
> struct extent_buffer *c;
> struct extent_buffer *next;
> - struct btrfs_fs_info *fs_info = root->fs_info;
> + struct btrfs_fs_info *fs_info;
> struct btrfs_key key;
> bool need_commit_sem = false;
> u32 nritems;
> int ret;
> int i;
>
> + if (!root)
> + return -EINVAL;
> +
> + fs_info = root->fs_info;
> /*
> * The nowait semantics are used only for write paths, where we don't
> * use the tree mod log and sequence numbers.
next prev parent reply other threads:[~2025-02-24 8:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 7:59 Ma Ke
2025-02-24 8:18 ` Qu Wenruo [this message]
2025-02-24 9:45 ` 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=0d9f6477-04c2-486a-ae72-c39b6d235891@gmx.com \
--to=quwenruo.btrfs@gmx.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=fdmanana@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=make24@iscas.ac.cn \
--cc=stable@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
all inboxes | Powered by JetHome®