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

Commit c1147280 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e: handle possible memory allocation failure 



The init_interrupt_scheme function had a possible failure
path to allocate memory that was found by smatch.

This adds the correct handling to the function to abort
probe if the memory allocation fails.

Change-ID: I2bf1d826a244209619da4c452d0d58b3eb5e26a3
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 73b23402

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

+11 −3
Original line number Diff line number Diff line
@@ -7301,7 +7301,7 @@ static int i40e_vsi_alloc_q_vectors(struct i40e_vsi *vsi) 
 * i40e_init_interrupt_scheme - Determine proper interrupt scheme

 * @pf: board private structure to initialize

 **/

static void i40e_init_interrupt_scheme(struct i40e_pf *pf)

static int i40e_init_interrupt_scheme(struct i40e_pf *pf)

{

	int vectors = 0;

	ssize_t size;
@@ -7343,11 +7343,17 @@ static void i40e_init_interrupt_scheme(struct i40e_pf *pf) 
	/* set up vector assignment tracking */

	size = sizeof(struct i40e_lump_tracking) + (sizeof(u16) * vectors);

	pf->irq_pile = kzalloc(size, GFP_KERNEL);

	if (!pf->irq_pile) {

		dev_err(&pf->pdev->dev, "error allocating irq_pile memory\n");

		return -ENOMEM;

	}

	pf->irq_pile->num_entries = vectors;

	pf->irq_pile->search_hint = 0;



	/* track first vector for misc interrupts */

	/* track first vector for misc interrupts, ignore return */

	(void)i40e_get_lump(pf, pf->irq_pile, 1, I40E_PILE_VALID_BIT - 1);



	return 0;

}



/**
@@ -9827,7 +9833,9 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* set up the main switch operations */

	i40e_determine_queue_usage(pf);

	i40e_init_interrupt_scheme(pf);

	err = i40e_init_interrupt_scheme(pf);

	if (err)

		goto err_switch_setup;



	/* The number of VSIs reported by the FW is the minimum guaranteed

	 * to us; HW supports far more and we share the remaining pool with