lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 049/261] ice: Fix memory leak
    Date
    From: Surabhi Boob <surabhi.boob@intel.com>

    [ 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 | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
    index 171f0b625407..d68b8aa31b19 100644
    --- a/drivers/net/ethernet/intel/ice/ice_common.c
    +++ b/drivers/net/ethernet/intel/ice/ice_common.c
    @@ -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;
    }

    /**
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:07    [W:4.024 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site