Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <c7d16718-1071-2b57-fc77-968945cfb4f5@suse.com>
Date:   Thu, 21 Apr 2022 14:25:39 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH] btrfs: Fix a memory leak in btrfs_ioctl_balance()
Content-Language: en-US
From:   Nikolay Borisov <nborisov@suse.com>
To:     Haowen Bai <baihaowen@meizu.com>, Chris Mason <clm@fb.com>,
        Josef Bacik <josef@toxicpanda.com>,
        David Sterba <dsterba@suse.com>
Cc:     linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
References: <1650534677-31554-1-git-send-email-baihaowen@meizu.com>
 <2aeffa33-e591-acad-f96f-59cfadb5aeb2@suse.com>
In-Reply-To: <2aeffa33-e591-acad-f96f-59cfadb5aeb2@suse.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk


On 21.04.22 г. 14:21 ч., Nikolay Borisov wrote:
> 
> 
> On 21.04.22 г. 12:51 ч., Haowen Bai wrote:
>> Free "bargs" before return.
>>
>> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
>> ---
>>   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:
> 


Actually to simplify further:

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 7a6974e877f4..bbda55d41a06 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4353,6 +4353,7 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
         bargs = memdup_user(arg, sizeof(*bargs));
         if (IS_ERR(bargs)) {
                 ret = PTR_ERR(bargs);
+               bargs = NULL;
                 goto out;
         }
  
@@ -4391,13 +4392,11 @@ 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;
                 }
         } else {
                 /* this is (1) */
-               mutex_unlock(&fs_info->balance_mutex);
                 ret = BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS;
                 goto out;
         }
@@ -4406,7 +4405,7 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
         if (bargs->flags & BTRFS_BALANCE_RESUME) {
                 if (!fs_info->balance_ctl) {
                         ret = -ENOTCONN;
-                       goto out_bargs;
+                       goto out;
                 }
  
                 bctl = fs_info->balance_ctl;
@@ -4420,18 +4419,18 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
  
         if (bargs->flags & ~(BTRFS_BALANCE_ARGS_MASK | BTRFS_BALANCE_TYPE_MASK)) {
                 ret = -EINVAL;
-               goto out_bargs;
+               goto out;
         }
  
         if (fs_info->balance_ctl) {
                 ret = -EINPROGRESS;
-               goto out_bargs;
+               goto out;
         }
  
         bctl = kzalloc(sizeof(*bctl), GFP_KERNEL);
         if (!bctl) {
                 ret = -ENOMEM;
-               goto out_bargs;
+               goto out;
         }
  
         memcpy(&bctl->data, &bargs->data, sizeof(bctl->data));
@@ -4457,12 +4456,11 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
         }
  
         kfree(bctl);
-out_bargs:
+out:
         kfree(bargs);
         mutex_unlock(&fs_info->balance_mutex);
         if (need_unlock)
                 btrfs_exclop_finish(fs_info);
-out:
         mnt_drop_write_file(file);
         return ret;
  }