From: Ma Ke <make24@iscas.ac.cn>
To: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com, jeffm@suse.com
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Ma Ke <make24@iscas.ac.cn>,
stable@vger.kernel.org
Subject: [PATCH] btrfs: add a sanity check for btrfs root in btrfs_search_old_slot()
Date: Mon, 24 Feb 2025 15:51:42 +0800 [thread overview]
Message-ID: <20250224075142.2959155-1-make24@iscas.ac.cn> (raw)
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@vger.kernel.org
Fixes: 0b246afa62b0 ("btrfs: root->fs_info cleanup, add fs_info convenience variables")
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 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
next reply other threads:[~2025-02-24 7:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 7:51 Ma Ke [this message]
2025-02-24 7:56 ` Qu Wenruo
2025-02-24 14:24 ` Filipe Manana
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=20250224075142.2959155-1-make24@iscas.ac.cn \
--to=make24@iscas.ac.cn \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=jeffm@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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®