ice: Fix memory leak
authorSurabhi Boob <surabhi.boob@intel.com>
Sat, 16 May 2020 00:36:42 +0000 (17:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:30:56 +0000 (09:30 +0200)
[ Upstream commit 1aaef2bc4e0a5ce9e4dd86359e6a0bf52c6aa64f ]

Handle memory leak on filter management initialization failure.

Signed-off-by: Surabhi Boob <surabhi.boob@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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/intel/ice/ice_common.c

index 171f0b6..d68b8aa 100644 (file)
@@ -436,6 +436,7 @@ static void ice_init_flex_flds(struct ice_hw *hw, enum ice_rxdid prof_id)
 static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)
 {
        struct ice_switch_info *sw;
+       enum ice_status status;
 
        hw->switch_info = devm_kzalloc(ice_hw_to_dev(hw),
                                       sizeof(*hw->switch_info), GFP_KERNEL);
@@ -446,7 +447,12 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)
 
        INIT_LIST_HEAD(&sw->vsi_list_map_head);
 
-       return ice_init_def_sw_recp(hw);
+       status = ice_init_def_sw_recp(hw);
+       if (status) {
+               devm_kfree(ice_hw_to_dev(hw), hw->switch_info);
+               return status;
+       }
+       return 0;
 }
 
 /**