netdev - Re: [PATCH v2] net: ethernet: davicom: fix devicetree irq resource

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]

Date:	Sun, 07 Feb 2016 11:46:01 +0100
From:	Robert Jarzmik <robert.jarzmik@...e.fr>
To:	Francois Romieu <romieu@...zoreil.com>
Cc:	netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
	linux-kernel@...r.kernel.org,
	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Subject: Re: [PATCH v2] net: ethernet: davicom: fix devicetree irq resource

Francois Romieu <romieu@...zoreil.com> writes:

> Robert Jarzmik <robert.jarzmik@...e.fr> :
> [...]
>> diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
>> index cf94b72dbacd..2bae5c8c1f85 100644
>> --- a/drivers/net/ethernet/davicom/dm9000.c
>> +++ b/drivers/net/ethernet/davicom/dm9000.c
> [...]
>> @@ -1500,15 +1496,21 @@ dm9000_probe(struct platform_device *pdev)
>>  
>>  	db->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>>  	db->data_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>> -	db->irq_res  = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
>>  
>> -	if (db->addr_res == NULL || db->data_res == NULL ||
>> -	    db->irq_res == NULL) {
>> -		dev_err(db->dev, "insufficient resources\n");
>> +	if (!db->addr_res || !db->data_res) {
>> +		dev_err(db->dev, "insufficient resources addr=%p data=%p\n",
>> +			db->addr_res, db->data_res);
>>  		ret = -ENOENT;
>>  		goto out;
>>  	}
>>  
>> +	ndev->irq = platform_get_irq(pdev, 0);
>> +	if (ndev->irq < 0) {
>> +		dev_err(db->dev, "interrupt resource unavailable: %d\n",
>> +			ndev->irq);
>> +		return ndev->irq;
>> +	}
>> +
>
> Leak: please set 'ret = ndev->irq;' and proceed to the 'out' label.
Indeed, the etherdev, good catch.

> If you have some spare time, it would be nice to avoid db->irq_wake leak
> on probe failure or driver removal.
Sorry but not in this patch.

I suppose the right patch would be to use devm_*() in the probe function for
ioremaps and request_irqs, which would address this point.

Cheers.

-- 
Robert