[net-next 11/17] ice: Fix resource leak on early exit from function

* [net-next 11/17] ice: Fix resource leak on early exit from function
       [not found] <20200522065607.1680050-1-jeffrey.t.kirsher@intel.com>
@ 2020-05-22  6:56 ` Jeff Kirsher
  2020-05-26  0:23   ` Sasha Levin
  0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2020-05-22  6:56 UTC (permalink / raw)
  To: davem
  Cc: Eric Joyner, netdev, nhorman, sassmann, stable, Tony Nguyen,
	Andrew Bowers, Jeff Kirsher

From: Eric Joyner <eric.joyner@intel.com>

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.

CC: stable <stable@vger.kernel.org>
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>
---
 drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
index 4dc72aef5381..38c37f506257 100644
--- a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
+++ b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
@@ -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);
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread