[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <67315726-de8a-bc58-e4fd-d312899d6362@linaro.org>
Date: Fri, 7 Apr 2023 18:35:35 +0200
From: Daniel Lezcano <daniel.lezcano@...aro.org>
To: rafael@...nel.org
Cc: rui.zhang@...el.com, linux-pm@...r.kernel.org,
linux-kernel@...r.kernel.org,
Florian Fainelli <f.fainelli@...il.com>,
Ray Jui <rjui@...adcom.com>,
Scott Branden <sbranden@...adcom.com>,
Amit Kucheria <amitk@...nel.org>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@...adcom.com>,
Niklas Söderlund
<niklas.soderlund+renesas@...natech.se>,
Kunihiko Hayashi <hayashi.kunihiko@...ionext.com>,
ye xingchen <ye.xingchen@....com.cn>,
"moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE"
<linux-rpi-kernel@...ts.infradead.org>,
"moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE"
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH v2 1/3] thermal/drivers/bcm2835: Remove buggy call to
thermal_of_zone_unregister
Hi,
it seems like the remaining patches of the previous series does not
raise feedbacks, I assume they are fine.
If nobody raises concern about it after this week-end, they will be
applied to candidate for linux-next
Thanks
-- Daniel
On 04/04/2023 09:51, Daniel Lezcano wrote:
> The driver is using the devm_thermal_of_zone_device_register().
>
> In the error path of the function calling
> devm_thermal_of_zone_device_register(), the function
> devm_thermal_of_zone_unregister() should be called instead of
> thermal_of_zone_unregister(), otherwise this one will be called twice
> when the device is freed.
>
> The same happens for the remove function where the devm_ guarantee the
> thermal_of_zone_unregister() will be called, so adding this call in
> the remove function will lead to a double free also.
>
> Use devm_ variant in the error path of the probe function.
>
> Remove thermal_of_zone_unregister() in the remove function.
>
> Cc: Florian Fainelli <f.fainelli@...il.com>
> Cc: Ray Jui <rjui@...adcom.com>
> Cc: Scott Branden <sbranden@...adcom.com>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
> ---
> V2:
> - Fixed wrong label call on the error path
> ---
> drivers/thermal/broadcom/bcm2835_thermal.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
> index a217d832f24e..3acc9288b310 100644
> --- a/drivers/thermal/broadcom/bcm2835_thermal.c
> +++ b/drivers/thermal/broadcom/bcm2835_thermal.c
> @@ -275,7 +275,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
>
> return 0;
> err_tz:
> - thermal_of_zone_unregister(tz);
> + devm_thermal_of_zone_unregister(&pdev->dev, tz);
> err_clk:
> clk_disable_unprepare(data->clk);
>
> @@ -285,10 +285,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
> static int bcm2835_thermal_remove(struct platform_device *pdev)
> {
> struct bcm2835_thermal_data *data = platform_get_drvdata(pdev);
> - struct thermal_zone_device *tz = data->tz;
>
> debugfs_remove_recursive(data->debugfsdir);
> - thermal_of_zone_unregister(tz);
> clk_disable_unprepare(data->clk);
>
> return 0;
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Powered by blists - more mailing lists