diff options
author | Micah Gruber <micah.gruber@gmail.com> | 2007-09-29 01:42:11 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:53:53 -0400 |
commit | 1f8f4559f8c5829348a010a9e0bbb423310060d1 (patch) | |
tree | 2f1ec7d0febddda537062a3a914bcacadce32aed /drivers/net/tulip/uli526x.c | |
parent | 13f7b8c011cd8d16ad3063409b9d969466c9e2f4 (diff) |
Fix a potential NULL pointer dereference in uli526x_interrupt() in drivers/net/tulip/uli526x.c
This patch fixes an apparent potential null dereference bug where we
dereference dev before a null check. This patch simply remvoes the
can't-happen test for a null pointer.
Signed-off-by: Micah Gruber <micah.gruber@gmail.com>
Cc: Grant Grundler <grundler@parisc-linux.org>
Acked-by: Jeff Garzik <jeff@garzik.org>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/tulip/uli526x.c')
-rw-r--r-- | drivers/net/tulip/uli526x.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index e64bde46822e..76e55612430b 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -664,11 +664,6 @@ static irqreturn_t uli526x_interrupt(int irq, void *dev_id) | |||
664 | unsigned long ioaddr = dev->base_addr; | 664 | unsigned long ioaddr = dev->base_addr; |
665 | unsigned long flags; | 665 | unsigned long flags; |
666 | 666 | ||
667 | if (!dev) { | ||
668 | ULI526X_DBUG(1, "uli526x_interrupt() without DEVICE arg", 0); | ||
669 | return IRQ_NONE; | ||
670 | } | ||
671 | |||
672 | spin_lock_irqsave(&db->lock, flags); | 667 | spin_lock_irqsave(&db->lock, flags); |
673 | outl(0, ioaddr + DCR7); | 668 | outl(0, ioaddr + DCR7); |
674 | 669 | ||