Patchwork pasemi_mac: mac_to_intf() error not noticed

login
register
mail settings
Submitter roel kluin
Date April 23, 2009, 5:44 p.m.
Message ID <49F0A8E9.2010702@gmail.com>
Download mbox | patch
Permalink /patch/26378/
State Superseded
Delegated to: David Miller
Headers show

Comments

roel kluin - April 23, 2009, 5:44 p.m.
mac_to_intf() can return -1 when no device or function was found, but when
mac->dma_if is unsigned. The error wasn't noticed.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson - April 23, 2009, 5:56 p.m.
On Thu, Apr 23, 2009 at 07:44:09PM +0200, Roel Kluin wrote:
> mac_to_intf() can return -1 when no device or function was found, but when
> mac->dma_if is unsigned. The error wasn't noticed.

This can in practice never happen which is likely why it went
unnoticed.

I object to the usage of err in the way you use it, it's completely
counterintuitive to name a variable that will hold valid data to 'err'.

So, define a new variable with an appropriate name, please.


-Olof

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 5eeb5a8..1857974 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1798,12 +1798,13 @@  pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	}
 	memcpy(dev->dev_addr, mac->mac_addr, sizeof(mac->mac_addr));
 
-	mac->dma_if = mac_to_intf(mac);
-	if (mac->dma_if < 0) {
+	err = mac_to_intf(mac);
+	if (err < 0) {
 		dev_err(&mac->pdev->dev, "Can't map DMA interface\n");
 		err = -ENODEV;
 		goto out;
 	}
+	mac->dma_if = err;
 
 	switch (pdev->device) {
 	case 0xa005: