Re: [PATCH] btrfs: fix a memory leak in read_zone_info

From: Anand Jain <anand.jain@oracle.com>
To: Christoph Hellwig <hch@lst.de>,
	clm@fb.com, josef@toxicpanda.com, dsterba@suse.com,
	naohiro.aota@wdc.com
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] btrfs: fix a memory leak in read_zone_info
Date: Fri, 8 Jul 2022 06:39:10 +0800	[thread overview]
Message-ID: <5bac8a23-0f53-c671-81bb-376557eff2ae@oracle.com> (raw)
In-Reply-To: <20220704081022.27512-1-hch@lst.de>

On 04/07/2022 16:10, Christoph Hellwig wrote:
> Don't leak the bioc on normal completion or when finding a parity
> raid extent.
> 
> Fixes: 7db1c5d14dcd ("btrfs: zoned: support dev-replace in zoned filesystems")
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: Anand Jain <anand.jain@oracle.com>


> ---
>   fs/btrfs/zoned.c | 12 ++++++++----
>   1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
> index 7a0f8fa448006..46e6c70217e08 100644
> --- a/fs/btrfs/zoned.c
> +++ b/fs/btrfs/zoned.c
> @@ -1735,12 +1735,14 @@ static int read_zone_info(struct btrfs_fs_info *fs_info, u64 logical,
>   	ret = btrfs_map_sblock(fs_info, BTRFS_MAP_GET_READ_MIRRORS, logical,
>   			       &mapped_length, &bioc);
>   	if (ret || !bioc || mapped_length < PAGE_SIZE) {
> -		btrfs_put_bioc(bioc);
> -		return -EIO;
> +		ret = -EIO;
> +		goto out_put_bioc;
>   	}
>   
> -	if (bioc->map_type & BTRFS_BLOCK_GROUP_RAID56_MASK)
> -		return -EINVAL;
> +	if (bioc->map_type & BTRFS_BLOCK_GROUP_RAID56_MASK) {
> +		ret = -EINVAL;
> +		goto out_put_bioc;
> +	}
>   
>   	nofs_flag = memalloc_nofs_save();
>   	nmirrors = (int)bioc->num_stripes;
> @@ -1760,6 +1762,8 @@ static int read_zone_info(struct btrfs_fs_info *fs_info, u64 logical,
>   	}
>   	memalloc_nofs_restore(nofs_flag);
>   
> +out_put_bioc:
> +	btrfs_put_bioc(bioc);
>   	return ret;
>   }
>