]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ixgbe: Handle previously-freed msix_entries
authorMark Rustad <mark.d.rustad@intel.com>
Wed, 28 Sep 2016 22:36:38 +0000 (15:36 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sat, 25 Feb 2017 05:48:10 +0000 (21:48 -0800)
Orabug: 24568240

The msix_entries memory can be freed by a previous suspend or
remove, so don't crash on close when it isn't there.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 1fa71252778d6fe151438b009416e4ce7bc1c802)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

index a811f85a7e015d8840ea0daf9897f2fea775e270..de96d30fb2070d17d34b8608e2cd3a3a75302915 100644 (file)
@@ -3073,6 +3073,9 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter)
                return;
        }
 
+       if (!adapter->msix_entries)
+               return;
+
        for (vector = 0; vector < adapter->num_q_vectors; vector++) {
                struct ixgbe_q_vector *q_vector = adapter->q_vector[vector];
                struct msix_entry *entry = &adapter->msix_entries[vector];