[PATCH] btrfs: fix memory leaks in create_space_info error paths

[PATCH] btrfs: fix memory leaks in create_space_info error paths

[Jiasheng Jiang]

In create_space_info(), the 'space_info' object is allocated at the
beginning of the function. However, there are two error paths where the
function returns an error code without freeing the allocated memory:

1. When create_space_info_sub_group() fails in zoned mode.
2. When btrfs_sysfs_add_space_info_type() fails.

In both cases, 'space_info' has not yet been added to the
fs_info->space_info list, resulting in a memory leak. Fix this by
adding an error handling label to kfree(space_info) before returning.

Fixes: 2be12ef79fe9 ("btrfs: Separate space_info create/update")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
 fs/btrfs/space-info.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 6babbe333741..3f08e450f796 100644
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -306,18 +306,22 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)
 							  0);
 
 		if (ret)
-			return ret;
+			goto out_free;
 	}
 
 	ret = btrfs_sysfs_add_space_info_type(space_info);
 	if (ret)
-		return ret;
+		goto out_free;
 
 	list_add(&space_info->list, &info->space_info);
 	if (flags & BTRFS_BLOCK_GROUP_DATA)
 		info->data_sinfo = space_info;
 
 	return ret;
+
+out_free:
+	kfree(space_info);
+	return ret;
 }
 
 int btrfs_init_space_info(struct btrfs_fs_info *fs_info)
-- 
2.25.1

Re: [PATCH] btrfs: fix memory leaks in create_space_info error paths

[Qu Wenruo]

在 2026/1/12 05:50, Jiasheng Jiang 写道:
> In create_space_info(), the 'space_info' object is allocated at the
> beginning of the function. However, there are two error paths where the
> function returns an error code without freeing the allocated memory:
> 
> 1. When create_space_info_sub_group() fails in zoned mode.
> 2. When btrfs_sysfs_add_space_info_type() fails.
> 
> In both cases, 'space_info' has not yet been added to the
> fs_info->space_info list, resulting in a memory leak. Fix this by
> adding an error handling label to kfree(space_info) before returning.
> 
> Fixes: 2be12ef79fe9 ("btrfs: Separate space_info create/update")
> Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

> ---
>   fs/btrfs/space-info.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
> index 6babbe333741..3f08e450f796 100644
> --- a/fs/btrfs/space-info.c
> +++ b/fs/btrfs/space-info.c
> @@ -306,18 +306,22 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)
>   							  0);
>   
>   		if (ret)
> -			return ret;
> +			goto out_free;
>   	}
>   
>   	ret = btrfs_sysfs_add_space_info_type(space_info);
>   	if (ret)
> -		return ret;
> +		goto out_free;
>   
>   	list_add(&space_info->list, &info->space_info);
>   	if (flags & BTRFS_BLOCK_GROUP_DATA)
>   		info->data_sinfo = space_info;
>   
>   	return ret;
> +
> +out_free:
> +	kfree(space_info);
> +	return ret;
>   }
>   
>   int btrfs_init_space_info(struct btrfs_fs_info *fs_info)