From: Anand Jain <anand.jain@oracle.com>
To: David Sterba <dsterba@suse.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 05/20] btrfs: handle invalid root reference found in btrfs_find_root()
Date: Fri, 26 Jan 2024 20:06:06 +0800 [thread overview]
Message-ID: <9ee6b3bd-a409-4eda-bcd9-b0527b1b1b33@oracle.com> (raw)
In-Reply-To: <0011782bc0af988fc393ae8cee8b2d761def05d4.1706130791.git.dsterba@suse.com>
On 1/25/24 05:18, David Sterba wrote:
> The btrfs_find_root() looks up a root by a key, allowing to do an
> inexact search when key->offset is -1. It's never expected to find such
> item, as it would break allowed the range of a root id.
>
> Signed-off-by: David Sterba <dsterba@suse.com>
> ---
> fs/btrfs/root-tree.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
> index ba7e2181ff4e..326cd0d03287 100644
> --- a/fs/btrfs/root-tree.c
> +++ b/fs/btrfs/root-tree.c
> @@ -82,7 +82,14 @@ int btrfs_find_root(struct btrfs_root *root, const struct btrfs_key *search_key,
> if (ret > 0)
> goto out;
> } else {
> - BUG_ON(ret == 0); /* Logical error */
> + /*
> + * Key with offset -1 found, there would have to exist a root
> + * with such id, but this is out of the valid range.
> + */
> + if (ret == 0) {
> + ret = -EUCLEAN;
> + goto out;
> + }
> if (path->slots[0] == 0)
> goto out;
> path->slots[0]--;
While here, why not also add an error message, especially for calls
from btrfs_read_roots() when the IGNOREBADROOTS is set, we ignore
the error and continue without the abort(). Including an error
message will provide more information about the bad root.
btrfs_read_roots()
::
btrfs_read_tree_root() | btrfs_get_fs_root_commit_root() |
load_global_roots_objectid()
read_tree_root_path()
btrfs_find_root()
Thanks, Anand
next prev parent reply other threads:[~2024-01-26 12:06 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 21:17 [PATCH 00/20] Error handling fixes David Sterba
2024-01-24 21:17 ` [PATCH 01/20] btrfs: handle directory and dentry mismatch in btrfs_may_delete() David Sterba
2024-01-24 21:17 ` [PATCH 02/20] btrfs: handle invalid range and start in merge_extent_mapping() David Sterba
2024-01-25 3:53 ` Qu Wenruo
2024-01-25 16:07 ` David Sterba
2024-01-24 21:17 ` [PATCH 03/20] btrfs: handle block group lookup error when it's being removed David Sterba
2024-01-25 3:58 ` Qu Wenruo
2024-01-25 16:12 ` David Sterba
2024-01-25 23:09 ` Qu Wenruo
2024-01-29 15:49 ` David Sterba
2024-01-24 21:18 ` [PATCH 04/20] btrfs: handle root deletion lookup error in btrfs_del_root() David Sterba
2024-01-25 4:01 ` Qu Wenruo
2024-01-25 16:19 ` David Sterba
2024-01-24 21:18 ` [PATCH 05/20] btrfs: handle invalid root reference found in btrfs_find_root() David Sterba
2024-01-25 4:03 ` Qu Wenruo
2024-01-25 16:28 ` David Sterba
2024-01-25 23:14 ` Qu Wenruo
2024-01-26 14:19 ` Josef Bacik
2024-01-29 15:55 ` David Sterba
2024-01-26 12:06 ` Anand Jain [this message]
2024-01-29 15:56 ` David Sterba
2024-01-24 21:18 ` [PATCH 06/20] btrfs: handle invalid root reference found in btrfs_init_root_free_objectid() David Sterba
2024-01-25 4:06 ` Qu Wenruo
2024-01-24 21:18 ` [PATCH 07/20] btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks() David Sterba
2024-01-25 4:08 ` Qu Wenruo
2024-01-24 21:18 ` [PATCH 08/20] btrfs: handle invalid extent item reference found in check_committed_ref() David Sterba
2024-01-25 4:10 ` Qu Wenruo
2024-01-25 16:31 ` David Sterba
2024-01-24 21:18 ` [PATCH 09/20] btrfs: export: handle invalid inode or root reference in btrfs_get_parent() David Sterba
2024-01-24 21:18 ` [PATCH 10/20] btrfs: delayed-inode: drop pointless BUG_ON in __btrfs_remove_delayed_item() David Sterba
2024-01-24 21:18 ` [PATCH 11/20] btrfs: change BUG_ON to assertion when checking for delayed_node root David Sterba
2024-01-24 21:18 ` [PATCH 12/20] btrfs: defrag: change BUG_ON to assertion in btrfs_defrag_leaves() David Sterba
2024-01-24 21:18 ` [PATCH 13/20] btrfs: change BUG_ON to assertion in btrfs_read_roots() David Sterba
2024-01-24 21:18 ` [PATCH 14/20] btrfs: change BUG_ON to assertion when verifying lockdep class setup David Sterba
2024-01-24 21:18 ` [PATCH 15/20] btrfs: change BUG_ON to assertion when verifying root in btrfs_alloc_reserved_file_extent() David Sterba
2024-01-24 21:18 ` [PATCH 16/20] btrfs: change BUG_ON to assertion in reset_balance_state() David Sterba
2024-01-24 21:18 ` [PATCH 17/20] btrfs: unify handling of return values of btrfs_insert_empty_items() David Sterba
2024-01-24 21:18 ` [PATCH 18/20] btrfs: move transaction abort to the error site in btrfs_delete_free_space_tree() David Sterba
2024-01-24 21:18 ` [PATCH 19/20] btrfs: move transaction abort to the error site in btrfs_create_free_space_tree() David Sterba
2024-01-24 21:18 ` [PATCH 20/20] btrfs: move transaction abort to the error site btrfs_rebuild_free_space_tree() David Sterba
2024-01-24 22:14 ` [PATCH 00/20] Error handling fixes Josef Bacik
2024-01-25 4:21 ` Qu Wenruo
2024-01-25 16:34 ` David Sterba
2024-01-26 12:28 ` Anand Jain
2024-01-29 16:13 ` David Sterba
2024-01-29 23:33 ` Anand Jain
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=9ee6b3bd-a409-4eda-bcd9-b0527b1b1b33@oracle.com \
--to=anand.jain@oracle.com \
--cc=dsterba@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