2022-04-22 18:20:49

by Filipe Manana

[permalink] [raw]
Subject: Re: [PATCH] btrfs: Fix a memory leak in btrfs_ioctl_balance()

On Thu, Apr 21, 2022 at 05:51:17PM +0800, Haowen Bai wrote:
> Free "bargs" before return.
>
> Signed-off-by: Haowen Bai <[email protected]>
> ---
> fs/btrfs/ioctl.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index f08233c2b0b2..d4c8bea914b7 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -4389,13 +4389,13 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
> /* this is (2) */
> mutex_unlock(&fs_info->balance_mutex);
> ret = -EINPROGRESS;
> - goto out;
> + goto out_bargs;
> }
> } else {
> /* this is (1) */
> mutex_unlock(&fs_info->balance_mutex);
> ret = BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS;
> - goto out;
> + goto out_bargs;

In addition to Qu's comment about the double unlock, this is also a fix
for a recent patch that is not yet on Linus' tree:

btrfs: simplify codeflow in btrfs_ioctl_balance

(https://lore.kernel.org/linux-btrfs/[email protected]/)

Something usually worth mentioning, as we can't add a Fixes tag in this
case.

Thanks.

> }
>
> locked:
> --
> 2.7.4
>