Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b03013 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: fix error handling when alloc of vsi array fails 



Swap a couple lines around in the error handling if the kzalloc() for
the pf->vsi array fails.  This was causing a kernel BUG because the
call to i40e_clear_interrupt_scheme() was assuming the pf->vsi[] array
existed.  In this fix it is possible that i40e_reset_interrupt_capability()
will get called twice, but this is a safe action.

Change-Id: I939163ccaa89baac7511556d36bc873864c35ae1
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2f019123

drivers/net/ethernet/intel/i40e/i40e_main.c

+2 −1
Original line number Diff line number Diff line
@@ -7775,9 +7775,10 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Unwind what we've done if something failed in the setup */

err_vsis:

	set_bit(__I40E_DOWN, &pf->state);

err_switch_setup:

	i40e_clear_interrupt_scheme(pf);

	kfree(pf->vsi);

err_switch_setup:

	i40e_reset_interrupt_capability(pf);

	del_timer_sync(&pf->service_timer);

err_mac_addr:

err_configure_lan_hmc: