Commit 857a4f0e authored May 07, 2020 by Eric Joyner Committed by Jeff Kirsher May 21, 2020

ice: Fix resource leak on early exit from function



Memory allocated in the ice_add_prof_id_vsig() function wasn't being
properly freed if an error occurred inside the for-loop in the function.

In particular, 'p' wasn't being freed if an error occurred before it was
added to the resource list at the end of the for-loop.

Signed-off-by: Eric Joyner <eric.joyner@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 53bb6698

drivers/net/ethernet/intel/ice/ice_flex_pipe.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -4228,8 +4228,10 @@ ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,
		t->tcam[i].prof_id,
		t->tcam[i].ptg, vsig, 0, 0,
		vl_msk, dc_msk, nm_msk);
		if (status)
		if (status) {
		devm_kfree(ice_hw_to_dev(hw), p);
		goto err_ice_add_prof_id_vsig;
		}

		/* log change */
		list_add(&p->list_entry, chg);

Admin message