diff options
| author | Nithin Nayak Sujir <nsujir@broadcom.com> | 2013-01-14 17:10:59 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-14 10:49:07 -0800 |
| commit | a10a3daa591e6ea2619da1e0418af2a30aa77ac5 (patch) | |
| tree | 587a642eeacb3486398aa7e715d20be1ba66f60e | |
| parent | 94fab0a18e9cbec420c58c7b12b93acf1663c3fd (diff) | |
| download | linux-3.10-a10a3daa591e6ea2619da1e0418af2a30aa77ac5.tar.gz linux-3.10-a10a3daa591e6ea2619da1e0418af2a30aa77ac5.tar.bz2 linux-3.10-a10a3daa591e6ea2619da1e0418af2a30aa77ac5.zip | |
tg3: Avoid null pointer dereference in tg3_interrupt in netconsole mode
[ Upstream commit 9c13cb8bb477a83b9a3c9e5a5478a4e21294a760 ]
When netconsole is enabled, logging messages generated during tg3_open
can result in a null pointer dereference for the uninitialized tg3
status block. Use the irq_sync flag to disable polling in the early
stages. irq_sync is cleared when the driver is enabling interrupts after
all initialization is completed.
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 689d2a1935b..42e621a2d24 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -6574,6 +6574,9 @@ static void tg3_poll_controller(struct net_device *dev) int i; struct tg3 *tp = netdev_priv(dev); + if (tg3_irq_sync(tp)) + return; + for (i = 0; i < tp->irq_cnt; i++) tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]); } @@ -15529,6 +15532,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, tp->pm_cap = pm_cap; tp->rx_mode = TG3_DEF_RX_MODE; tp->tx_mode = TG3_DEF_TX_MODE; + tp->irq_sync = 1; if (tg3_debug > 0) tp->msg_enable = tg3_debug; |