linux-kernel - Re: [PATCH 1/1] mfd: stmfx: fix dev_err_probe call in stmfx_chip

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]

Date:   Fri, 13 Nov 2020 13:28:38 +0100
From:   Amelie DELAUNAY <amelie.delaunay@...com>
To:     Lee Jones <lee.jones@...aro.org>
CC:     Maxime Coquelin <mcoquelin.stm32@...il.com>,
        Alexandre Torgue <alexandre.torgue@...com>,
        Krzysztof Kozlowski <krzk@...nel.org>,
        <linux-stm32@...md-mailman.stormreply.com>,
        <linux-arm-kernel@...ts.infradead.org>,
        <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 1/1] mfd: stmfx: fix dev_err_probe call in stmfx_chip_init

On 11/13/20 11:09 AM, Lee Jones wrote:
> On Tue, 10 Nov 2020, Amelie Delaunay wrote:
> 
>> ret may be 0 so, dev_err_probe should be called only when ret is an error
>> code.
>>
>> Fixes: 41c9c06c491a ("mfd: stmfx: Simplify with dev_err_probe()")
>> Signed-off-by: Amelie Delaunay <amelie.delaunay@...com>
>> ---
>>   drivers/mfd/stmfx.c | 5 ++---
>>   1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c
>> index 5e680bfdf5c9..360fb4646688 100644
>> --- a/drivers/mfd/stmfx.c
>> +++ b/drivers/mfd/stmfx.c
>> @@ -329,12 +329,11 @@ static int stmfx_chip_init(struct i2c_client *client)
>>   
>>   	stmfx->vdd = devm_regulator_get_optional(&client->dev, "vdd");
>>   	ret = PTR_ERR_OR_ZERO(stmfx->vdd);
>> -	if (ret == -ENODEV) {
>> +	if (ret == -ENODEV)
>>   		stmfx->vdd = NULL;
>> -	} else {
>> +	else if (ret)
>>   		return dev_err_probe(&client->dev, ret,
>>   				     "Failed to get VDD regulator\n");
>> -	}
> 
> Probably nicer to keep all of the error handing in one area, like:
> 
> 	if (ret) {
> 		if (ret == -ENODEV)
> 			stmfx->vdd = NULL;
> 		else
> 			return dev_err_probe(&client->dev, ret,
> 					     "Failed to get VDD regulator\n");
> 	}
> 
> I'll let you make the call though.
> 

Thanks for the review. I agree. Fixed in v2.

Regards,
Amelie