]> git.karo-electronics.de Git - linux-beck.git/commitdiff
i40e: catch unset q_vector
authorShannon Nelson <shannon.nelson@intel.com>
Thu, 28 Nov 2013 06:39:36 +0000 (06:39 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sun, 5 Jan 2014 07:54:42 +0000 (23:54 -0800)
Don't try to free a q_vector that hasn't been set up as it can
panic the kernel.

Change-Id: I0650cc6c441d0779788c522c790293c276d14fbc
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 2785d7e59b30a4cf2c398fba4db40dfe3b0e85cd..bfc3037c9426261d609aceb11f9cad9b01977c28 100644 (file)
@@ -3153,7 +3153,8 @@ static void i40e_vsi_free_irq(struct i40e_vsi *vsi)
                        u16 vector = i + base;
 
                        /* free only the irqs that were actually requested */
-                       if (vsi->q_vectors[i]->num_ringpairs == 0)
+                       if (!vsi->q_vectors[i] ||
+                           !vsi->q_vectors[i]->num_ringpairs)
                                continue;
 
                        /* clear the affinity_mask in the IRQ descriptor */