linux-kernel - Re: [PATCH] btrfs: add a sanity check for btrfs root in btrfs_search_old

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAL3q7H5nq9jv59YdhPjUuMYVLgyVTG1fuurGdhiqtqCz2K6khQ@mail.gmail.com>
Date: Mon, 24 Feb 2025 14:24:38 +0000
From: Filipe Manana <fdmanana@...nel.org>
To: Ma Ke <make24@...as.ac.cn>
Cc: clm@...com, josef@...icpanda.com, dsterba@...e.com, jeffm@...e.com, 
	linux-btrfs@...r.kernel.org, linux-kernel@...r.kernel.org, 
	stable@...r.kernel.org
Subject: Re: [PATCH] btrfs: add a sanity check for btrfs root in btrfs_search_old_slot()

On Mon, Feb 24, 2025 at 7:52 AM Ma Ke <make24@...as.ac.cn> wrote:
>
> When searching the extent tree to gather the needed extent info,
> btrfs_search_old_slot() 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_search_old_slot().
>
> Found by code review.
>
> Cc: stable@...r.kernel.org
> Fixes: 0b246afa62b0 ("btrfs: root->fs_info cleanup, add fs_info convenience variables")

Besides what was already pointed out by Qu, that you should explain
how can the root be NULL, etc, this is also a completely wrong commit
in the Fixes tag.

You can only get a NULL extent root if the fs was mounted with
ignorebadroots and there is a corruption in the extent tree (or maybe
we got some transient error while attempting to read it like -ENOMEM).

So ignorebadroots was introduced in commit 42437a6386ff ("btrfs:
introduce mount option rescue=ignorebadroots") which is dated from
2020, but that commit you added in the Fixes tag is from 2016, back
when we could never have successfully mounted the fs with a NULL
extent root.

> Signed-off-by: Ma Ke <make24@...as.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 3dc5a35dd19b..4e2e1c38d33a 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -2232,7 +2232,7 @@ ALLOW_ERROR_INJECTION(btrfs_search_slot, ERRNO);
>  int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key,
>                           struct btrfs_path *p, u64 time_seq)
>  {
> -       struct btrfs_fs_info *fs_info = root->fs_info;
> +       struct btrfs_fs_info *fs_info;
>         struct extent_buffer *b;
>         int slot;
>         int ret;
> @@ -2241,6 +2241,10 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key,
>         int lowest_unlock = 1;
>         u8 lowest_level = 0;
>
> +       if (!root)
> +               return -EINVAL;
> +
> +       fs_info = root->fs_info;
>         lowest_level = p->lowest_level;
>         WARN_ON(p->nodes[0] != NULL);
>         ASSERT(!p->nowait);
> --
> 2.25.1
>
>