diff options
| author |   Jesper Juhl <jesper.juhl@gmail.com> | 2007-09-28 22:42:09 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:53:51 -0700 |
| commit | bcfef8c3681fa59b653871682956a8fdf5c27c5a (patch) | |
| tree | 7fa3c9df43063f00474c1ca00066728cd3136c6a /drivers/net/tokenring | |
| parent | drivers/net/cxgb3/xgmac.c: remove dead code (diff) | |
| download | linux-dev-bcfef8c3681fa59b653871682956a8fdf5c27c5a.tar.xz linux-dev-bcfef8c3681fa59b653871682956a8fdf5c27c5a.zip | |
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: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/3c359.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index 88d03c085d54..7224d368b2a7 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c @@ -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 */ |