Commit bcfef8c3 authored by Jesper Juhl's avatar Jesper Juhl Committed by David S. Miller
Browse files

Avoid possible NULL pointer deref in 3c359 driver 



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: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 0da18e38

drivers/net/tokenring/3c359.c

+0 −5
Original line number Diff line number Diff line
@@ -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 */