linux-kernel - Re: [PATCH -next] ARM: mmp: Add missing clk_disable_unprepare() in mmp_dt_init

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] [day] [month] [year] [list]

Message-ID: <e4008fd2-86b3-c515-e9ec-40c11b28545c@huawei.com>
Date:   Sat, 8 Oct 2022 16:43:40 +0800
From:   chenlifu <chenlifu@...wei.com>
To:     <lkundrak@...sk>, <linux@...linux.org.uk>, <olof@...om.net>,
        <pavel@....cz>, <linux-arm-kernel@...ts.infradead.org>,
        <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH -next] ARM: mmp: Add missing clk_disable_unprepare() in
 mmp_dt_init_timer()

在 2022/9/7 14:14, Chen Lifu 写道:
> mmp_dt_init_timer() may have called clk_prepare_enable() before return
> from failed branches, add missing clk_disable_unprepare() in these cases.
> 
> Fixes: f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock")
> Signed-off-by: Chen Lifu <chenlifu@...wei.com>
> ---
>   arch/arm/mach-mmp/time.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
> index 41b2e8abc9e6..6d2db1fea1be 100644
> --- a/arch/arm/mach-mmp/time.c
> +++ b/arch/arm/mach-mmp/time.c
> @@ -207,16 +207,20 @@ static int __init mmp_dt_init_timer(struct device_node *np)
>   	} else {
>   		rate = 3250000;
>   	}
>   
>   	irq = irq_of_parse_and_map(np, 0);
> -	if (!irq)
> +	if (!irq) {
> +		clk_disable_unprepare(clk);
>   		return -EINVAL;
> +	}
>   
>   	mmp_timer_base = of_iomap(np, 0);
> -	if (!mmp_timer_base)
> +	if (!mmp_timer_base) {
> +		clk_disable_unprepare(clk);
>   		return -ENOMEM;
> +	}
>   
>   	mmp_timer_init(irq, rate);
>   	return 0;
>   }
>   
friendly ping ...