btrfs: add missing ASSERT for system space_info in reserve_chunk_space
PATCH 1/1 btrfs: add missing ASSERT for system space_info in reserve_chunk_space
In reserve_chunk_space(), btrfs_find_space_info() is called to retrieve the space_info for the SYSTEM block group. However, the returned pointer is immediately dereferenced by spin_lock(&info->lock) without validation.
While the SYSTEM space_info is expected to be present during normal operations, direct dereference without checking creates a risk of a null pointer dereference. This deviates from the coding pattern seen in peer functions like btrfs_chunk_alloc() where such returns are validated with an ASSERT.
Add an ASSERT() to ensure the pointer is valid before access, improving code robustness and consistency with the rest of the block-group logic.
--- fs/btrfs/block-group.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/block-group.c +1 -0
@@ -4313,6 +4313,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,lockdep_assert_held (&fs_info->chunk_mutex); info =btrfs_find_space_info (fs_info,BTRFS_BLOCK_GROUP_SYSTEM ); +ASSERT (info);spin_lock (&info->lock); left = info->total_bytes -btrfs_space_info_used (info, true);spin_unlock (&info->lock);
Signature · 1 line
2.25.1
Quoted 4 lines · Jiasheng Jiang
In
reserve_chunk_space(),btrfs_find_space_info()is called to retrieve thespace_infofor the SYSTEM block group. However, the returned pointer is immediately dereferenced byspin_lock(&info->lock)without validation.
Quoted 8 lines
While the SYSTEM
space_infois expected to be present during normal operations, direct dereference without checking creates a risk of a null pointer dereference. This deviates from the coding pattern seen in peer functions likebtrfs_chunk_alloc()where such returns are validated with an ASSERT.Add an
ASSERT()to ensure the pointer is valid before access, improving code robustness and consistency with the rest of the block-group logic.
If you know how system chunk works, you must understand without a system chunk a btrfs will never be mounted.
The ASSERT() looks unnecessary to me.
Thanks,
Qu
Quoted 18 lines
Signed-off-by Jiasheng Jiang <[email protected]>--- fs/btrfs/block-group.c | 1 + 1 file changed, 1 insertion(+)fs/btrfs/block-group.c +1
-0@@ -4313,6 +4313,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,lockdep_assert_held (&fs_info->chunk_mutex); info =btrfs_find_space_info (fs_info,BTRFS_BLOCK_GROUP_SYSTEM ); +ASSERT (info);spin_lock (&info->lock); left = info->total_bytes -btrfs_space_info_used (info, true);spin_unlock (&info->lock);
Quoted 13 lines · Qu Wenruo
Quoted 10 lines · Jiasheng Jiang
In
reserve_chunk_space(),btrfs_find_space_info()is called to retrieve thespace_infofor the SYSTEM block group. However, the returned pointer is immediately dereferenced byspin_lock(&info->lock)without validation.While the SYSTEM
space_infois expected to be present during normal operations, direct dereference without checking creates a risk of a null pointer dereference. This deviates from the coding pattern seen in peer functions likebtrfs_chunk_alloc()where such returns are validated with an ASSERT.
Quoted 7 lines
Quoted 2 lines
Add an
ASSERT()to ensure the pointer is valid before access, improving code robustness and consistency with the rest of the block-group logic.If you know how system chunk works, you must understand without a system chunk a btrfs will never be mounted.
The
ASSERT()looks unnecessary to me.
Agreed. I tried to look for justification or an assertion pattern we might have yet incomplete but I don't see it. The system chunk assertion is in some functions but not everywhere, was added when zoned code was extended so this makes some sense. We also don't validate most of the btrfs_find_space_info() calls and I don't think we should, besides the initial setup that must lead to a real error.