Skip to contentSkip to conversation

btrfs: cleanup and fix sample_block_group_extent_item()

PATCH In review [email protected] 5 participants 10 messages Jan 21 – Feb 8 Btrfs file system

lore
Share & tools
lore
#0 lore raw

cover btrfs: cleanup and fix sample_block_group_extent_item()

From: Filipe Manana <[email protected]>

Trivial changes, details in the change logs.

Filipe Manana (2):
btrfs: remove bogus root search condition in sample_block_group_extent_item()
btrfs: deal with missing root in sample_block_group_extent_item()

 fs/btrfs/block-group.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Signature · 1 line
2.47.2
#1 lore raw

PATCH 1/2 btrfs: remove bogus root search condition in sample_block_group_extent_item()

From: Filipe Manana <[email protected]>

There's no need to pass the maximum between the block group's start offset and BTRFS_SUPER_INFO_OFFSET (64K) since we can't have any block groups allocated in the first megabyte, as that's reserved space. Furthermore, even if we could, the correct thing to do was to pass the block group's start offset anyway - and that's precisely what we do for block groups that happen to contain superblock mirror (the range for the super block is never marked as free and it's marked as dirty in the fs_info->excluded_extents io tree).

So simplify this and get rid of that maximum expression.

---
 fs/btrfs/block-group.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/btrfs/block-group.c +1 -2
index feec6f513ea0..6387e11f8f8e 100644
@@ -606,8 +606,7 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_
 	lockdep_assert_held(&caching_ctl->mutex);
 	lockdep_assert_held_read(&fs_info->commit_root_sem);
 
-	extent_root = btrfs_extent_root(fs_info, max_t(u64, block_group->start,
-						       BTRFS_SUPER_INFO_OFFSET));
+	extent_root = btrfs_extent_root(fs_info, block_group->start);
 
 	search_offset = index * div_u64(block_group->length, max_index);
 	search_key.objectid = block_group->start + search_offset;
Signature · 1 line
2.47.2
#2 lore raw

PATCH 2/2 btrfs: deal with missing root in sample_block_group_extent_item()

In reply to [email protected]

From: Filipe Manana <[email protected]>

In case the does not exists, which is unexpected, btrfs_extent_root() returns NULL, but we ignore that and so if it happens we can trigger a NULL pointer dereference later. So verify if we found the root and log an error message in case it's missing.

---
 fs/btrfs/block-group.c | 6 ++++++
 1 file changed, 6 insertions(+)
fs/btrfs/block-group.c +6 -0
index 6387e11f8f8e..b3345792f3a1 100644
@@ -607,6 +607,12 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_
 	lockdep_assert_held_read(&fs_info->commit_root_sem);
 
 	extent_root = btrfs_extent_root(fs_info, block_group->start);
+	if (unlikely(!extent_root)) {
+		btrfs_err(fs_info,
+			  "Could not find extent root for block group at offset %llu\n",
+			  block_group->start);
+		return -EUCLEAN;
+	}
 
 	search_offset = index * div_u64(block_group->length, max_index);
 	search_key.objectid = block_group->start + search_offset;
Signature · 1 line
2.47.2
#3 lore raw

Re: [PATCH 2/2] btrfs: deal with missing root in sample_block_group_extent_item()

Quoted 18 lines · On Wed, Jan 21, 2026 at 9:08 PM <[email protected]> wrote:

From: Filipe Manana <[email protected]>

In case the does not exists, which is unexpected, btrfs_extent_root() returns NULL, but we ignore that and so if it happens we can trigger a NULL pointer dereference later. So verify if we found the root and log an error message in case it's missing.

---
 fs/btrfs/block-group.c | 6 ++++++
 1 file changed, 6 insertions(+)
fs/btrfs/block-group.c +0 -0
index 6387e11f8f8e..b3345792f3a1 100644

fs/btrfs/block-group.c static int sample_block_group_extent_item(struct btrfs_caching_control *caching_ · line 612

Quoted 6 lines
fs/btrfs/block-group.c +3 -0
@@ -607,6 +607,12 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_
        lockdep_assert_held_read(&fs_info->commit_root_sem);
 
        extent_root = btrfs_extent_root(fs_info, block_group->start);
+       if (unlikely(!extent_root)) {
+               btrfs_err(fs_info,
+                         "Could not find extent root for block group at offset %llu\n",

Unnecessary newline, will remove before commit or on v2 if needed.

Quoted 10 lines
fs/btrfs/block-group.c +3 -1
+                         block_group->start);
+               return -EUCLEAN;
+       }
 
        search_offset = index * div_u64(block_group->length, max_index);
        search_key.objectid = block_group->start + search_offset;
--

2.47.2

#4 lore raw

Re: [PATCH 2/2] btrfs: deal with missing root in sample_block_group_extent_item()

In reply to [email protected]
Quoted 3 lines · On Wed, Jan 21, 2026 at 08:52:38PM +0000, [email protected] wrote:

From: Filipe Manana <[email protected]>

In case the does not exists, which is unexpected, btrfs_extent_root()

In case the root does not exist

Quoted 29 lines

returns NULL, but we ignore that and so if it happens we can trigger a NULL pointer dereference later. So verify if we found the root and log an error message in case it's missing.

---
 fs/btrfs/block-group.c | 6 ++++++
 1 file changed, 6 insertions(+)
fs/btrfs/block-group.c +6 -0
index 6387e11f8f8e..b3345792f3a1 100644
@@ -607,6 +607,12 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_
 	lockdep_assert_held_read(&fs_info->commit_root_sem);
 
 	extent_root = btrfs_extent_root(fs_info, block_group->start);
+	if (unlikely(!extent_root)) {
+		btrfs_err(fs_info,
+			  "Could not find extent root for block group at offset %llu\n",
+			  block_group->start);
+		return -EUCLEAN;
+	}
 
 	search_offset = index * div_u64(block_group->length, max_index);
 	search_key.objectid = block_group->start + search_offset;
Signature · 1 line
2.47.2
Reviewed-by on the v1 series
#7 lore raw
In reply to [email protected]
Quoted 3 lines · On Wed, Jan 21, 2026 at 08:52:36PM +0000, [email protected] wrote:

From: Filipe Manana <[email protected]>

Trivial changes, details in the change logs.

LGTM, thanks.

Quoted 11 lines

Filipe Manana (2):
btrfs: remove bogus root search condition in sample_block_group_extent_item()
btrfs: deal with missing root in sample_block_group_extent_item()

 fs/btrfs/block-group.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Signature · 1 line
2.47.2
Reviewed-by on the v1 series
#8 lore raw
In reply to [email protected]
Quoted 3 lines · 在 2026/1/22 07:22, [email protected] 写道:

From: Filipe Manana <[email protected]>

Trivial changes, details in the change logs.

Thanks,
Qu

Quoted 8 lines

Filipe Manana (2):
btrfs: remove bogus root search condition in sample_block_group_extent_item()
btrfs: deal with missing root in sample_block_group_extent_item()

  fs/btrfs/block-group.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
#5 lore raw

Re: [PATCH 2/2] btrfs: deal with missing root in sample_block_group_extent_item()

In reply to [email protected]
Quoted 17 lines · On Wed, Jan 21, 2026 at 08:52:38PM +0000, [email protected] wrote:

From: Filipe Manana <[email protected]>

In case the does not exists, which is unexpected, btrfs_extent_root() returns NULL, but we ignore that and so if it happens we can trigger a NULL pointer dereference later. So verify if we found the root and log an error message in case it's missing.

---
 fs/btrfs/block-group.c | 6 ++++++
 1 file changed, 6 insertions(+)
fs/btrfs/block-group.c +0 -0
index 6387e11f8f8e..b3345792f3a1 100644

fs/btrfs/block-group.c static int sample_block_group_extent_item(struct btrfs_caching_control *caching_ · line 612

Quoted 6 lines
fs/btrfs/block-group.c +3 -0
@@ -607,6 +607,12 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_
 	lockdep_assert_held_read(&fs_info->commit_root_sem);
 
 	extent_root = btrfs_extent_root(fs_info, block_group->start);
+	if (unlikely(!extent_root)) {
+		btrfs_err(fs_info,
+			  "Could not find extent root for block group at offset %llu\n",

This is probably a message copied from elsewhere, we do't capitalize the first letter and the trailing "\n" is provided by btrfs_err()

Quoted 9 lines
fs/btrfs/block-group.c +3 -0
+			  block_group->start);
+		return -EUCLEAN;
+	}
 
 	search_offset = index * div_u64(block_group->length, max_index);
 	search_key.objectid = block_group->start + search_offset;
Signature · 1 line
2.47.2
#6 lore raw

Re: [PATCH 2/2] btrfs: deal with missing root in sample_block_group_extent_item()

In reply to [email protected]
Quoted 6 lines · [email protected] wrote:

From: Filipe Manana <[email protected]>

In case the does not exists, which is unexpected, btrfs_extent_root() returns NULL, but we ignore that and so if it happens we can trigger a NULL pointer dereference later. So verify if we found the root and log an error message in case it's missing.

Hi everyone,

I'm running the btrfs for-next branch, along with the encryption patch set through my AI review prompts:

https://github.com/masoncl/review-prompts

I'm working on some btrfs specific instructions, but hopefully these reviews are already useful. I've kept the headers to make it easier to double check that I'm actually replying to the right email, but please let me know if any parts of this are incorrect:

commit a8bec25e014eab671ec8a25b03d391cad3e55230
Author: Filipe Manana <[email protected]>

btrfs: deal with missing root in sample_block_group_extent_item()

This commit adds a NULL check for extent_root after calling btrfs_extent_root() in sample_block_group_extent_item(), addressing a potential NULL pointer dereference.

Quoted 7 lines
fs/btrfs/block-group.c +0 -0
index 66c512bc022c5..28aa87872f0d9 100644
@@ -607,6 +607,12 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_
 	lockdep_assert_held_read(&fs_info->commit_root_sem);
 

fs/btrfs/block-group.c static int sample_block_group_extent_item(struct btrfs_caching_control *caching_ · line 618

Quoted 10 lines
fs/btrfs/block-group.c +6 -0
 	extent_root = btrfs_extent_root(fs_info, block_group->start);
+	if (unlikely(!extent_root)) {
+		btrfs_err(fs_info,
+			  "missing extent root for block group at offset %llu",
+			  block_group->start);
+		return -EUCLEAN;
+	}
 
 	search_offset = index * div_u64(block_group->length, max_index);
 	search_key.objectid = block_group->start + search_offset;

Does load_extent_tree_free() in the same file have the same issue?

Looking at load_extent_tree_free() around line 741:

	last = max_t(u64, block_group->start, BTRFS_SUPER_INFO_OFFSET);
	extent_root = btrfs_extent_root(fs_info, last);

and then at line 767:

	ret = btrfs_search_slot(NULL, extent_root, &key, path, 0, 0);

There's no NULL check between the btrfs_extent_root() call and the btrfs_search_slot() call. If btrfs_extent_root() returns NULL (via btrfs_global_root() when rb_find() fails), extent_root would be dereferenced in btrfs_search_slot(), causing a NULL pointer dereference.

Both sample_block_group_extent_item() and load_extent_tree_free() are called from caching_thread() during block group caching operations, so they have the same risk profile. Should load_extent_tree_free() have the same NULL check added?