Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db5ae5b authored by Zhang Qilong's avatar Zhang Qilong Committed by Greg Kroah-Hartman
Browse files

iwlwifi: mvm: fix a memory leak in iwl_mvm_mac_ctxt_beacon_changed 



[ 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: default avatarZhang Qilong <zhangqilong3@huawei.com>
[reworded the commit message]
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210802172232.d16206ca60fc.I9984a9b442c84814c307cee3213044e24d26f38a@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3da13a1e

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+3 −1
Original line number Diff line number Diff line
@@ -1043,8 +1043,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);