Message ID | 20100922204158.GA1372@nb-core2.darkstar.lan |
---|---|
State | Accepted, archived |
Headers | show |
From: Luca Tettamanti <kronos.it@gmail.com> Date: Wed, 22 Sep 2010 22:41:58 +0200 > adapter->cmb.cmb is initialized when the device is opened and freed when > it's closed. Accessing it unconditionally during resume results either > in a crash (NULL pointer dereference, when the interface has not been > opened yet) or data corruption (when the interface has been used and > brought down adapter->cmb.cmb points to a deallocated memory area). > > Cc: stable@kernel.org > Signed-off-by: Luca Tettamanti <kronos.it@gmail.com> > Acked-by: Chris Snook <chris.snook@gmail.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 63b9ba0..bbd6e30 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -2847,10 +2847,11 @@ static int atl1_resume(struct pci_dev *pdev) pci_enable_wake(pdev, PCI_D3cold, 0); atl1_reset_hw(&adapter->hw); - adapter->cmb.cmb->int_stats = 0; - if (netif_running(netdev)) + if (netif_running(netdev)) { + adapter->cmb.cmb->int_stats = 0; atl1_up(adapter); + } netif_device_attach(netdev); return 0;