openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

igb: close/suspend race in netif_device_detach 

Similar to ixgbe, when an interface is part of a namespace it is
possible that igb_close() may be called while __igb_shutdown() is
running which ends up in a double free WARN and/or a BUG in
free_msi_irqs().

Extend the rtnl_lock() to protect the call to netif_device_detach() and
igb_clear_interrupt_scheme() in __igb_shutdown() and check for
netif_device_present() to avoid calling igb_clear_interrupt_scheme() a
second time in igb_close().

Also extend the rtnl lock in igb_resume() to netif_device_attach().

Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Todd Fujinaka 2016-11-15 08:54:26 -08:00 committed by Jeff Kirsher
parent 69b97cf6db
commit 9474933caf
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/intel/igb/igb_main.c
View File

@ -3275,7 +3275,9 @@ static int __igb_close(struct net_device *netdev, bool suspending)
int igb_close(struct net_device *netdev) int igb_close(struct net_device *netdev)
{ {
if (netif_device_present(netdev))
return __igb_close(netdev, false); return __igb_close(netdev, false);
return 0;
} }
/** /**
@ -7564,6 +7566,7 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,
int retval = 0; int retval = 0;
#endif #endif
rtnl_lock();
netif_device_detach(netdev); netif_device_detach(netdev);
if (netif_running(netdev)) if (netif_running(netdev))
@ -7572,6 +7575,7 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,
igb_ptp_suspend(adapter); igb_ptp_suspend(adapter);
igb_clear_interrupt_scheme(adapter); igb_clear_interrupt_scheme(adapter);
rtnl_unlock();
#ifdef CONFIG_PM #ifdef CONFIG_PM
retval = pci_save_state(pdev); retval = pci_save_state(pdev);
@ -7690,16 +7694,15 @@ static int igb_resume(struct device *dev)
wr32(E1000_WUS, ~0); wr32(E1000_WUS, ~0);
if (netdev->flags & IFF_UP) {
rtnl_lock(); rtnl_lock();
if (!err && netif_running(netdev))
err = __igb_open(netdev, true); err = __igb_open(netdev, true);
rtnl_unlock();
if (err)
return err;
}
if (!err)
netif_device_attach(netdev); netif_device_attach(netdev);
return 0; rtnl_unlock();
return err;
} }
static int igb_runtime_idle(struct device *dev) static int igb_runtime_idle(struct device *dev)