diff options
| author | Michael Chan <mchan@broadcom.com> | 2007-04-07 02:35:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-04-07 02:35:37 +0200 |
| commit | b8fa2f3a82069304acac1f9e957d491585f4f49a (patch) | |
| tree | 8fc4023a131d17fc74835bf0c955280e35a3afdf /drivers/net/tg3.c | |
| parent | [IPV6]: Revert recent change to rt6_check_dev(). (diff) | |
| download | linux-b8fa2f3a82069304acac1f9e957d491585f4f49a.tar.xz linux-b8fa2f3a82069304acac1f9e957d491585f4f49a.zip | |
[TG3]: Fix crash during tg3_init_one().
The driver will crash when the chip has been initialized by EFI before
tg3_init_one(). In this case, the driver will call tg3_chip_reset()
before allocating consistent memory.
The bug is fixed by checking for tp->hw_status before accessing it
during tg3_chip_reset().
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 0acee9f324e9..256969e1300c 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -4834,8 +4834,10 @@ static int tg3_chip_reset(struct tg3 *tp) * sharing or irqpoll. */ tp->tg3_flags |= TG3_FLAG_CHIP_RESETTING; - tp->hw_status->status = 0; - tp->hw_status->status_tag = 0; + if (tp->hw_status) { + tp->hw_status->status = 0; + tp->hw_status->status_tag = 0; + } tp->last_tag = 0; smp_mb(); synchronize_irq(tp->pdev->irq); |