[PATCH][RESEND] Semi-pointless NULL test in uli526x driver

[Jesper Juhl]

(resending previously submitted patch from 16/7-2007 22:40)


Hi,

In drivers/net/tulip/uli526x.c::uli526x_interrupt() there's a test 
of the function argument 'void *dev_id' against NULL. But that 
test is pretty pointless, since if ever 'dev_id' is NULL we'll 
already have crashed inside "netdev_priv(dev)".

I don't think dev_id can ever actually be NULL, so the whole block 
inside "if (!dev) {" could probably just go away. But I guess 
there's a good reason someone put that ULI526X_DBUG() in there - and
if 'dev_id' /can/ actually be NULL then it's nice to have and in 
that case this patch actually fixes a possible crash (hence the 
version number update). 
So I guess that in this case we should just move the 
"db = netdev_priv(dev)" assignment past that NULL test. That's what 
this patch does.

Found by the Coverity checker.
Compile tested.


PS. Please keep me on Cc when replying.


Signed-off-by: Jesper Juhl <jesper.juhl@xxxxxxxxx>
---

 drivers/net/tulip/uli526x.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index ca2548e..3df2376 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -13,8 +13,8 @@
 */
 
 #define DRV_NAME	"uli526x"
-#define DRV_VERSION	"0.9.3"
-#define DRV_RELDATE	"2005-7-29"
+#define DRV_VERSION	"0.9.4"
+#define DRV_RELDATE	"2007-7-16"
 
 #include <linux/module.h>
 
@@ -662,7 +662,7 @@ static int uli526x_stop(struct net_device *dev)
 static irqreturn_t uli526x_interrupt(int irq, void *dev_id)
 {
 	struct net_device *dev = dev_id;
-	struct uli526x_board_info *db = netdev_priv(dev);
+	struct uli526x_board_info *db;
 	unsigned long ioaddr = dev->base_addr;
 	unsigned long flags;
 
@@ -670,6 +670,7 @@ static irqreturn_t uli526x_interrupt(int irq, void *dev_id)
 		ULI526X_DBUG(1, "uli526x_interrupt() without DEVICE arg", 0);
 		return IRQ_NONE;
 	}
+	db = netdev_priv(dev);
 
 	spin_lock_irqsave(&db->lock, flags);
 	outl(0, ioaddr + DCR7);


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/