linux-kernel - Re: [PATCH v2] iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc

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: <c86c7e85-31ec-725f-ed75-563c804868c7@huawei.com>
Date:   Tue, 3 Nov 2020 20:04:23 +0800
From:   Qinglang Miao <miaoqinglang@...wei.com>
To:     Robin Murphy <robin.murphy@....com>,
        Jonathan Cameron <jic23@...nel.org>,
        Lars-Peter Clausen <lars@...afoo.de>,
        Peter Meerwald-Stadler <pmeerw@...erw.net>,
        Heiko Stuebner <heiko@...ech.de>
CC:     <linux-iio@...r.kernel.org>, <linux-rockchip@...ts.infradead.org>,
        <linux-kernel@...r.kernel.org>,
        <linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH v2] iio: adc: rockchip_saradc: fix missing
 clk_disable_unprepare() on error in rockchip_saradc_resume



在 2020/11/3 19:11, Robin Murphy 写道:
> On 2020-11-03 07:49, Qinglang Miao wrote:
>> Fix the missing clk_disable_unprepare() of info->pclk
>> before return from rockchip_saradc_resume in the error
>> handling case when fails to prepare and enable info->clk.
>>
>> Fixes: 44d6f2ef94f9 ("iio: adc: add driver for Rockchip saradc")
>> Signed-off-by: Qinglang Miao <miaoqinglang@...wei.com>
>> ---
>>   drivers/iio/adc/rockchip_saradc.c | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/iio/adc/rockchip_saradc.c 
>> b/drivers/iio/adc/rockchip_saradc.c
>> index 1f3d7d639..5eb566274 100644
>> --- a/drivers/iio/adc/rockchip_saradc.c
>> +++ b/drivers/iio/adc/rockchip_saradc.c
>> @@ -461,9 +461,10 @@ static int rockchip_saradc_resume(struct device 
>> *dev)
>>           return ret;
>>       ret = clk_prepare_enable(info->clk);
>> -    if (ret)
>> +    if (ret) {
>> +        clk_disable_unprepare(info->pclk);
>>           return ret;
> 
> No need to add braces, just replace this utterly pointless "early" 
> return ;)
> 
> Robin.
You are right Robin, thanks a lot! :D

I've sent a 'real' v2 patch based on your advice.
> 
>> -
>> +    }
>>       return ret;
>>   }
>>   #endif
>>
> .