lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a potential NULL pointer dereference in mace_interrupt() in drivers/net/pcmcia/nmclan_cs.c

Browse Source 
This patch fixes a potential null dereference bug where we dereference
DEV before a null check. This patch simply moves the dereferencing after
the null check.

Signed-off-by: Micah Gruber <micah.gruber@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Micah Gruber
2007-07-24 10:44:56 +08:00
committed by Jeff Garzik
parent 85e2783194
commit c196d80f99
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/pcmcia/nmclan_cs.c
View File

@@ -996,7 +996,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = (struct net_device *) dev_id;
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; kio_addr_t ioaddr;
int status; int status;
int IntrCnt = MACE_MAX_IR_ITERATIONS; int IntrCnt = MACE_MAX_IR_ITERATIONS;
@@ -1006,6 +1006,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
return IRQ_NONE; return IRQ_NONE;
} }
ioaddr = dev->base_addr;
if (lp->tx_irq_disabled) { if (lp->tx_irq_disabled) {
printk( printk(
(lp->tx_irq_disabled? (lp->tx_irq_disabled?