From: Emil Tantilov <emil.s.tantilov@intel.com>
Date: Fri, 29 Sep 2017 17:55:42 +0000 (-0700)
Subject: ixgbe: fix crash when injecting AER after failed reset
X-Git-Tag: v4.15-rc1~84^2~511^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b64666ae00327efe53613fc180df6ffbeee1d8d1;p=thirdparty%2Fkernel%2Flinux.git

ixgbe: fix crash when injecting AER after failed reset

In case where AER recovery fails the device is left in a down state.
Consecutive AER error injection can lead to a double IRQ free.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 5e2686d106dbb..c6f9da7990c77 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -10861,6 +10861,9 @@ skip_bad_vf_detection:
 	if (!test_bit(__IXGBE_SERVICE_INITED, &adapter->state))
 		return PCI_ERS_RESULT_DISCONNECT;
 
+	if (!netif_device_present(netdev))
+		return PCI_ERS_RESULT_DISCONNECT;
+
 	rtnl_lock();
 	netif_device_detach(netdev);