linux-kernel - Re: [PATCH -next] clk: tegra: tegra124-emc: fix missing clk_disable_unprepare() on error in emc_set

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]

Message-ID: <162262068754.4130789.12258910664512101759@swboyd.mtv.corp.google.com>
Date:   Wed, 02 Jun 2021 00:58:07 -0700
From:   Stephen Boyd <sboyd@...nel.org>
To:     Yang Yingliang <yangyingliang@...wei.com>,
        linux-clk@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-tegra@...r.kernel.org
Cc:     jonathanh@...dia.com, thierry.reding@...il.com
Subject: Re: [PATCH -next] clk: tegra: tegra124-emc: fix missing clk_disable_unprepare() on error in emc_set_timing()

Why does the subject have -next in it?

Quoting Yang Yingliang (2021-05-17 21:42:47)
> After calling clk_prepare_enable(), clk_disable_unprepare() need
> be called when prepare_timing_change() failed.
> 
> Fixes: 2db04f16b589 ("clk: tegra: Add EMC clock driver")

And then the Fixes tag is for a patch that was merged in v4.10?

> Reported-by: Hulk Robot <hulkci@...wei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@...wei.com>
> ---
>  drivers/clk/tegra/clk-tegra124-emc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/tegra/clk-tegra124-emc.c b/drivers/clk/tegra/clk-tegra124-emc.c
> index bdf6f4a51617..74c1d894cca8 100644
> --- a/drivers/clk/tegra/clk-tegra124-emc.c
> +++ b/drivers/clk/tegra/clk-tegra124-emc.c
> @@ -249,8 +249,10 @@ static int emc_set_timing(struct tegra_clk_emc *tegra,
>         div = timing->parent_rate / (timing->rate / 2) - 2;
>  
>         err = tegra->prepare_timing_change(emc, timing->rate);
> -       if (err)
> +       if (err) {
> +               clk_disable_unprepare(timing->parent);
>                 return err;
> +       }
>  
>         spin_lock_irqsave(tegra->lock, flags);
>  

Looks correct to me. I assume Thierry will pick it up for the next merge
window.