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

[Nikolay Borisov]

On 21.04.22 г. 12:51 ч., Haowen Bai wrote:
> Free "bargs" before return.
>
> Signed-off-by: Haowen Bai <baihaowen@xxxxxxxxx>
> ---
>   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;
>   	}
>   
>   locked:

I think this is a better fix:

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 7a6974e877f4..906ed1b93654 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4391,15 +4391,13 @@ static long btrfs_ioctl_balance(struct file 
*file, void __user *arg)
                        goto again;
                } else {
                        /* 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;
        }

 locked: