]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ice: Fix memory leak
authorSurabhi Boob <surabhi.boob@intel.com>
Sat, 16 May 2020 00:36:42 +0000 (17:36 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 28 May 2020 00:11:29 +0000 (17:11 -0700)
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>
drivers/net/ethernet/intel/ice/ice_common.c

index 5da369ae33e0bbf2986080973079493ce15e18bd..ee62cfa3a69eff526e6e4d8c011089a63586507a 100644 (file)
@@ -387,6 +387,7 @@ ice_aq_set_mac_cfg(struct ice_hw *hw, u16 max_frame_size, struct ice_sq_cd *cd)
 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);
@@ -397,7 +398,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;
 }
 
 /**