linux-kernel - Re: [PATCH] drivers: thermal: mediatek: fix of_iomap leak in mtk_thermal

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 3 Apr 2023 13:32:21 +0200
From:   Daniel Lezcano <daniel.lezcano@...aro.org>
To:     Kang Chen <void0red@...t.edu.cn>, dzm91@...t.edu.cn
Cc:     rafael@...nel.org, amitk@...nel.org, rui.zhang@...el.com,
        matthias.bgg@...il.com, angelogioacchino.delregno@...labora.com,
        daniel@...rotopia.org, rdunlap@...radead.org, bchihi@...libre.com,
        henry.yen@...iatek.com, linux-pm@...r.kernel.org,
        linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
        linux-mediatek@...ts.infradead.org,
        hust-os-kernel-patches@...glegroups.com, void0red@...il.com,
        error27@...il.com
Subject: Re: [PATCH] drivers: thermal: mediatek: fix of_iomap leak in
 mtk_thermal_probe

On 03/04/2023 12:38, Kang Chen wrote:
> Smatch reports:
> 1. mtk_thermal_probe() warn: 'apmixed_base' from of_iomap() not released.
> 2. mtk_thermal_probe() warn: 'auxadc_base' from of_iomap() not released.
> 
> The original code forgets to release iomap resource when handling errors,
> fix it through unified error handling code at the end of mtk_thermal_probe.
> 
> Fixes: 89945047b166 ("thermal: mediatek: Add tsensor support for V2 thermal system")
> Signed-off-by: Kang Chen <void0red@...t.edu.cn>
> ---
> I think the this should be released on the success path but I was too
> scared of breaking things. Let me know and I will resend if people want
> me to do that.
> 
>   drivers/thermal/mediatek/auxadc_thermal.c | 18 ++++++++++++------
>   1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/thermal/mediatek/auxadc_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c
> index ab730f9552d0..741c7d8151bd 100644
> --- a/drivers/thermal/mediatek/auxadc_thermal.c
> +++ b/drivers/thermal/mediatek/auxadc_thermal.c
> @@ -1149,13 +1149,15 @@ static int mtk_thermal_probe(struct platform_device *pdev)
>   
>   	if (auxadc_phys_base == OF_BAD_ADDR) {
>   		dev_err(&pdev->dev, "Can't get auxadc phys address\n");
> -		return -EINVAL;
> +		ret = -EINVAL;
> +		goto err_iounmap_auxadc;
>   	}

Better to use the devm_of_iomap() variant

And also take the opportunity to use devm_clk_get_enabled(), remove 
clk_prepare_enable() and the rollbacking in the err_disable_clk_per*: 
label sections.

-- 
<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