Commit 9c13cb8b authored by Nithin Nayak Sujir's avatar Nithin Nayak Sujir Committed by David S. Miller
Browse files

tg3: Avoid null pointer dereference in tg3_interrupt in netconsole mode



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: default avatarNithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47fb3a26
...@@ -6950,6 +6950,9 @@ static void tg3_poll_controller(struct net_device *dev) ...@@ -6950,6 +6950,9 @@ static void tg3_poll_controller(struct net_device *dev)
int i; int i;
struct tg3 *tp = netdev_priv(dev); struct tg3 *tp = netdev_priv(dev);
if (tg3_irq_sync(tp))
return;
for (i = 0; i < tp->irq_cnt; i++) for (i = 0; i < tp->irq_cnt; i++)
tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]); tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]);
} }
...@@ -16367,6 +16370,7 @@ static int tg3_init_one(struct pci_dev *pdev, ...@@ -16367,6 +16370,7 @@ static int tg3_init_one(struct pci_dev *pdev,
tp->pm_cap = pm_cap; tp->pm_cap = pm_cap;
tp->rx_mode = TG3_DEF_RX_MODE; tp->rx_mode = TG3_DEF_RX_MODE;
tp->tx_mode = TG3_DEF_TX_MODE; tp->tx_mode = TG3_DEF_TX_MODE;
tp->irq_sync = 1;
if (tg3_debug > 0) if (tg3_debug > 0)
tp->msg_enable = tg3_debug; tp->msg_enable = tg3_debug;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment