[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <22ac2987-9077-4927-aa01-447d4cf593e7@wdc.com>
Date: Wed, 8 Oct 2025 16:06:15 +0000
From: Johannes Thumshirn <Johannes.Thumshirn@....com>
To: Miquel Sabaté Solà <mssola@...ola.com>,
"linux-btrfs@...r.kernel.org" <linux-btrfs@...r.kernel.org>
CC: "clm@...com" <clm@...com>, "dsterba@...e.com" <dsterba@...e.com>, Naohiro
Aota <Naohiro.Aota@....com>, "boris@....io" <boris@....io>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3] btrfs: fix memory leaks when rejecting a non SINGLE
data profile without an RST
On 10/8/25 2:19 PM, Miquel Sabaté Solà wrote:
> At the end of btrfs_load_block_group_zone_info() the first thing we do
> is to ensure that if the mapping type is not a SINGLE one and there is
> no RAID stripe tree, then we return early with an error.
>
> Doing that, though, prevents the code from running the last calls from
> this function which are about freeing memory allocated during its
> run. Hence, in this case, instead of returning early, we set the ret
> value and fall through the rest of the cleanup code.
>
> Fixes: 5906333cc4af ("btrfs: zoned: don't skip block group profile checks on conventional zones")
> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@....com>
> Signed-off-by: Miquel Sabaté Solà <mssola@...ola.com>
> ---
> Changes in v3:
> - Remove comment which was deemed unnecessary.
>
> Changes in v2:
> - Change 'goto' to just assigning the 'ret' variable and falling through.
>
> fs/btrfs/zoned.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
> index e3341a84f4ab..838149fa60ce 100644
> --- a/fs/btrfs/zoned.c
> +++ b/fs/btrfs/zoned.c
> @@ -1753,7 +1753,7 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)
> !fs_info->stripe_root) {
> btrfs_err(fs_info, "zoned: data %s needs raid-stripe-tree",
> btrfs_bg_type_to_raid_name(map->type));
> - return -EINVAL;
> + ret = -EINVAL;
> }
>
> if (unlikely(cache->alloc_offset > cache->zone_capacity)) {
> --
> 2.51.0
>
>
Applied, thanks.
Powered by blists - more mailing lists