linux-kernel - Re: [PATCH] [media] cx18: remove redundant zero check on retval

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: <341f5097-1c15-21b4-7e58-bab62f9ea913@canonical.com>
Date:   Tue, 12 Jun 2018 10:12:53 +0100
From:   Colin Ian King <colin.king@...onical.com>
To:     Dan Carpenter <dan.carpenter@...cle.com>
Cc:     Stefan Richter <stefanr@...6.in-berlin.de>,
        Mauro Carvalho Chehab <mchehab@...nel.org>,
        Andy Walls <awalls@...metrocast.net>,
        Liam Girdwood <lgirdwood@...il.com>,
        Mark Brown <broonie@...nel.org>, linux-media@...r.kernel.org,
        linux1394-devel@...ts.sourceforge.net,
        kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] [media] cx18: remove redundant zero check on retval

On 12/06/18 10:07, Dan Carpenter wrote:
> You accidentally committed several changes...

Sheesh, I was on some strong pain killers yesterday for a slipped disc,
I think they are impacting on my ability to think straight.

Colin

> 
> regards,
> dan carpenter
> 
> On Mon, Jun 11, 2018 at 04:10:45PM +0100, Colin King wrote:
>> From: Colin Ian King <colin.king@...onical.com>
>>
>> The check for a zero retval is redundant as all paths that lead to
>> this point have set retval to an error return value that is non-zero.
>> Remove the redundant check.
>>
>> Detected by CoverityScan, CID#102589 ("Logically dead code")
>>
>> Signed-off-by: Colin Ian King <colin.king@...onical.com>
>> ---
>>  drivers/media/firewire/firedtv-fw.c  | 3 +++
>>  drivers/media/pci/cx18/cx18-driver.c | 2 --
>>  drivers/regulator/vctrl-regulator.c  | 2 +-
>>  3 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
>> index 92f4112d2e37..eed55be21836 100644
>> --- a/drivers/media/firewire/firedtv-fw.c
>> +++ b/drivers/media/firewire/firedtv-fw.c
>> @@ -271,6 +271,9 @@ static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
>>  
>>  	name_len = fw_csr_string(unit->directory, CSR_MODEL,
>>  				 name, sizeof(name));
>> +	if (name_len < 0)
>> +		return name_len;
>> +
>>  	for (i = ARRAY_SIZE(model_names); --i; )
>>  		if (strlen(model_names[i]) <= name_len &&
>>  		    strncmp(name, model_names[i], name_len) == 0)
>> diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
>> index 8f314ca320c7..0c389a3fb4e5 100644
>> --- a/drivers/media/pci/cx18/cx18-driver.c
>> +++ b/drivers/media/pci/cx18/cx18-driver.c
>> @@ -1134,8 +1134,6 @@ static int cx18_probe(struct pci_dev *pci_dev,
>>  free_workqueues:
>>  	destroy_workqueue(cx->in_work_queue);
>>  err:
>> -	if (retval == 0)
>> -		retval = -ENODEV;
>>  	CX18_ERR("Error %d on initialization\n", retval);
>>  
>>  	v4l2_device_unregister(&cx->v4l2_dev);
>> diff --git a/drivers/regulator/vctrl-regulator.c b/drivers/regulator/vctrl-regulator.c
>> index 78de002037c7..044e5a5ca163 100644
>> --- a/drivers/regulator/vctrl-regulator.c
>> +++ b/drivers/regulator/vctrl-regulator.c
>> @@ -340,7 +340,7 @@ static int vctrl_init_vtable(struct platform_device *pdev)
>>  		}
>>  	}
>>  
>> -	if (rdesc->n_voltages == 0) {
>> +	if (rdesc->n_voltages <= 0) {
>>  		dev_err(&pdev->dev, "invalid configuration\n");
>>  		return -EINVAL;
>>  	}
>> -- 
>> 2.17.0
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
>> the body of a message to majordomo@...r.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>