lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 161/176] iwlwifi: mvm: fix a memory leak in iwl_mvm_mac_ctxt_beacon_changed
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 0f5d44ac6e55551798dd3da0ff847c8df5990822 ]

    If beacon_inject_active is true, we will return without freeing
    beacon. Fid that by freeing it before returning.

    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    [reworded the commit message]
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Link: https://lore.kernel.org/r/iwlwifi.20210802172232.d16206ca60fc.I9984a9b442c84814c307cee3213044e24d26f38a@changeid
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
    index cbdebefb854a..6f5951aed8a7 100644
    --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
    @@ -1044,8 +1044,10 @@ int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,
    return -ENOMEM;

    #ifdef CONFIG_IWLWIFI_DEBUGFS
    - if (mvm->beacon_inject_active)
    + if (mvm->beacon_inject_active) {
    + dev_kfree_skb(beacon);
    return -EBUSY;
    + }
    #endif

    ret = iwl_mvm_mac_ctxt_send_beacon(mvm, vif, beacon);
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 14:50    [W:4.104 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site