Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 0A47960907
Subject: Re: stm class: Fix possible double free
To:     Pan Bian <bianpan2016@163.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Maxime Coquelin <mcoquelin.stm32@gmail.com>,
        Alexandre Torgue <alexandre.torgue@st.com>
Cc:     linux-stm32@st-md-mailman.stormreply.com,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
References: <1555572178-73786-1-git-send-email-bianpan2016@163.com>
From:   Mukesh Ojha <mojha@codeaurora.org>
Message-ID: <6d629a30-0acb-803e-c6f3-978e2a32c12d@codeaurora.org>
Date:   Thu, 18 Apr 2019 13:35:48 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101
 Thunderbird/60.6.1
MIME-Version: 1.0
In-Reply-To: <1555572178-73786-1-git-send-email-bianpan2016@163.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 4/18/2019 12:52 PM, Pan Bian wrote:
> The function stm_register_device() calls put_device(&stm->dev) to
> release allocated memory (in stm_device_release()) on error paths.
> However, after that, the freed memory stm is released again, resulting
> in a double free bug. There is a similar issue in the function
> stm_source_register_device. This patch fixes these issues.
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>


Looks good to me.
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>

Cheers,
-Mukesh

> ---
>   drivers/hwtracing/stm/core.c | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
> index c7ba8ac..cfb5c4d 100644
> --- a/drivers/hwtracing/stm/core.c
> +++ b/drivers/hwtracing/stm/core.c
> @@ -886,8 +886,10 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data,
>   		return -ENOMEM;
>   
>   	stm->major = register_chrdev(0, stm_data->name, &stm_fops);
> -	if (stm->major < 0)
> -		goto err_free;
> +	if (stm->major < 0) {
> +		vfree(stm);
> +		return err;
> +	}
>   
>   	device_initialize(&stm->dev);
>   	stm->dev.devt = MKDEV(stm->major, 0);
> @@ -933,8 +935,6 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data,
>   
>   	/* matches device_initialize() above */
>   	put_device(&stm->dev);
> -err_free:
> -	vfree(stm);
>   
>   	return err;
>   }
> @@ -1277,7 +1277,6 @@ int stm_source_register_device(struct device *parent,
>   
>   err:
>   	put_device(&src->dev);
> -	kfree(src);
>   
>   	return err;
>   }