Commit 8132e17d authored Aug 02, 2019 by Jeb Cramer Committed by Jeff Kirsher Sep 03, 2019

ice: Fix resource leak in ice_remove_rule_internal()

We don't free s_rule if ice_aq_sw_rules() returns a non-zero status. If
it returned a zero status, s_rule would be freed right after, so this
implies it should be freed within the scope of the function regardless.

Signed-off-by: Jeb Cramer <jeb.j.cramer@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 03af8406

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -1623,12 +1623,13 @@ ice_remove_rule_internal(struct ice_hw *hw, u8 recp_id,
		status = ice_aq_sw_rules(hw, s_rule,
		ICE_SW_RULE_RX_TX_NO_HDR_SIZE, 1,
		ice_aqc_opc_remove_sw_rules, NULL);
		if (status)
		goto exit;

		/* Remove a book keeping from the list */
		devm_kfree(ice_hw_to_dev(hw), s_rule);

		if (status)
		goto exit;

		list_del(&list_elem->list_entry);
		devm_kfree(ice_hw_to_dev(hw), list_elem);
		}