Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <4aa42c38-e0e2-4d2d-bfe2-15bc151f7117@linaro.org>
Date:   Fri, 19 May 2023 11:39:59 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Subject: Re: [PATCH] misc: fastrpc: Fix double free of 'buf' in error path
Content-Language: en-US
To:     Dan Carpenter <dan.carpenter@linaro.org>
Cc:     Sukrut Bellary <sukrut.bellary@linux.com>,
        Abel Vesa <abel.vesa@linaro.org>,
        Amol Maheshwari <amahesh@qti.qualcomm.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
        kernel-janitors@vger.kernel.org,
        Shuah Khan <skhan@linuxfoundation.org>
References: <20230518100829.515143-1-sukrut.bellary@linux.com>
 <9194ebdf-f335-4cd6-bf89-bb4f86a57784@kili.mountain>
 <f47b17c1-1c02-2aa3-ba10-fcef70cb25a8@linaro.org>
 <b0115d7d-d15a-4948-8726-09a8b37f3f36@kili.mountain>
From:   Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
In-Reply-To: <b0115d7d-d15a-4948-8726-09a8b37f3f36@kili.mountain>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 19/05/2023 11:22, Dan Carpenter wrote:
>> ----------------------->cut<---------------------------
>> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
>> index f60bbf99485c..3fdd326e1ae8 100644
>> --- a/drivers/misc/fastrpc.c
>> +++ b/drivers/misc/fastrpc.c
>> @@ -1891,7 +1891,8 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl,
>> char __user *argp)
>>                                        &args[0]);
>>          if (err) {
>>                  dev_err(dev, "mmap error (len 0x%08llx)\n", buf->size);
>> -               goto err_invoke;
>> +               fastrpc_buf_free(buf);
>> +               return err;
>>          }
>>
>>          /* update the buffer to be able to deallocate the memory on the DSP
>> */
>> @@ -1930,11 +1931,7 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl,
>> char __user *argp)
>>          return 0;
>>
>>   err_assign:
>> -       fastrpc_req_munmap_impl(fl, buf);
>> -err_invoke:
>> -       fastrpc_buf_free(buf);
>> -
>> -       return err;
>> +       return fastrpc_req_munmap_impl(fl, buf);
> 
> This will return success if copy_to_user() fails.
> 
that is true, using return value of fastrpc_req_munmap_impl does not 
really make sense here we should just return err in either case to the user.

--srini

> regards,
> dan carpenter
>