Avoid possible NULL pointer deref in 3c359 driver
authorJesper Juhl <jesper.juhl@gmail.com>
Sat, 29 Sep 2007 05:42:09 +0000 (22:42 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:53:51 +0000 (16:53 -0700)
In xl_freemem(), if dev_if is NULL, the line

  struct xl_private *xl_priv =(struct xl_private *)dev->priv;

will cause a NULL pointer dereference.

(akpm: don't try to fix it: just delete the pointless test-for-null)

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/tokenring/3c359.c

index 88d03c085d54b1bb85bec4b6741bae19e91dfec3..7224d368b2a71ed2b4f986a434ff8eb52a75223b 100644 (file)
@@ -1045,11 +1045,6 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id)
        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
        u16 intstatus, macstatus  ;
 
-       if (!dev) { 
-               printk(KERN_WARNING "Device structure dead, aaahhhh !\n") ;
-               return IRQ_NONE; 
-       }
-
        intstatus = readw(xl_mmio + MMIO_INTSTATUS) ;  
 
        if (!(intstatus & 1)) /* We didn't generate the interrupt */