linux-kernel - Re: [PATCH -next 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c

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: <4958c580-bcdb-c4bf-7669-b4ced4c2ec2f@huawei.com>
Date:   Sat, 14 May 2022 10:11:38 +0800
From:   Yang Yingliang <yangyingliang@...wei.com>
To:     Christophe JAILLET <christophe.jaillet@...adoo.fr>,
        <linux-kernel@...r.kernel.org>,
        <linux-mediatek@...ts.infradead.org>,
        <linux-arm-kernel@...ts.infradead.org>, <linux-i2c@...r.kernel.org>
CC:     <matthias.bgg@...il.com>, <sr@...x.de>, <wsa@...-dreams.de>
Subject: Re: [PATCH -next 1/2] i2c: mt7621: fix missing
 clk_disable_unprepare() on error in mtk_i2c_probe()


On 2022/5/14 0:15, Christophe JAILLET wrote:
> Le 13/05/2022 à 12:08, Yang Yingliang a écrit :
>> Fix the missing clk_disable_unprepare() before return
>> from mtk_i2c_probe() in the error handling case.
>>
>> Fixes: d04913ec5f89 ("i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C 
>> driver")
>> Signed-off-by: Yang Yingliang <yangyingliang@...wei.com>
>> ---
>>   drivers/i2c/busses/i2c-mt7621.c | 8 ++++++--
>>   1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-mt7621.c 
>> b/drivers/i2c/busses/i2c-mt7621.c
>> index 45fe4a7fe0c0..f117c3d9ca19 100644
>> --- a/drivers/i2c/busses/i2c-mt7621.c
>> +++ b/drivers/i2c/busses/i2c-mt7621.c
>> @@ -304,7 +304,8 @@ static int mtk_i2c_probe(struct platform_device 
>> *pdev)
>>         if (i2c->bus_freq == 0) {
>>           dev_warn(i2c->dev, "clock-frequency 0 not supported\n");
>> -        return -EINVAL;
>> +        ret = -EINVAL;
>> +        goto err_disable_clk;
>>       }
>>         adap = &i2c->adap;
>> @@ -322,10 +323,13 @@ static int mtk_i2c_probe(struct platform_device 
>> *pdev)
>>         ret = i2c_add_adapter(adap);
>>       if (ret < 0)
>> -        return ret;
>> +        goto err_disable_clk;
>>         dev_info(&pdev->dev, "clock %u kHz\n", i2c->bus_freq / 1000);
>
> Hi,
>
> should'nt we have a:
>     return 0;
> here?
>
> otherwise we will call clk_disable_unprepare() even on the normal path.
Yes, I missed that.

Thanks,
Yang
>
> CJ
>
>>   +err_disable_clk:
>> +    clk_disable_unprepare(i2c->clk);
>> +
>>       return ret;
>>   }
>
> .