]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40evf: null out ring pointers on free
authorMitch Williams <mitch.a.williams@intel.com>
Wed, 9 Dec 2015 23:50:30 +0000 (15:50 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Mar 2016 16:36:50 +0000 (08:36 -0800)
Orabug: 22342532

Since we check these ring pointers to make sure we don't double-allocate
or double-free the rings, we had better null them out after we free
them. In very rare cases this can cause a panic if the driver is removed
during reset recovery.

Change-ID: Ib06eb4910a3058275c8f7ec5ef7f45baa4674f96
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 10311540fab76c7e5530bf5f0267a3d1b8d5818e)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/i40evf/i40evf_main.c

index 3a992524eba40b145ecda16a59fbb0ed58bfcb2f..6963874fa9b103d74323944cd16ccddbda4f309f 100644 (file)
@@ -1122,7 +1122,9 @@ static void i40evf_free_queues(struct i40evf_adapter *adapter)
        if (!adapter->vsi_res)
                return;
        kfree(adapter->tx_rings);
+       adapter->tx_rings = NULL;
        kfree(adapter->rx_rings);
+       adapter->rx_rings = NULL;
 }
 
 /**