Commit f327236d authored by Sharon's avatar Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: fix aux station leak 



When mvm is initialized we alloc aux station with aux queue.
We later free the station memory when driver is stopped, but we
never free the queue's memory, which casues a leak.

Add a proper de-initialization of the station.

Signed-off-by: default avatarSharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200529092401.0121c5be55e9.Id7516fbb3482131d0c9dfb51ff20b226617ddb49@changeid
parent 4f4822b7

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+2 −3
Original line number Diff line number Diff line
@@ -1208,14 +1208,13 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm) 
	 */

	flush_work(&mvm->roc_done_wk);



	iwl_mvm_rm_aux_sta(mvm);



	iwl_mvm_stop_device(mvm);



	iwl_mvm_async_handlers_purge(mvm);

	/* async_handlers_list is empty and will stay empty: HW is stopped */



	/* the fw is stopped, the aux sta is dead: clean up driver state */

	iwl_mvm_del_aux_sta(mvm);



	/*

	 * Clear IN_HW_RESTART and HW_RESTART_REQUESTED flag when stopping the

	 * hw (as restart_complete() won't be called in this case) and mac80211

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+13 −5
Original line number Diff line number Diff line
@@ -2093,16 +2093,24 @@ int iwl_mvm_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	return ret;

}



void iwl_mvm_dealloc_snif_sta(struct iwl_mvm *mvm)

int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm)

{

	iwl_mvm_dealloc_int_sta(mvm, &mvm->snif_sta);

}

	int ret;



void iwl_mvm_del_aux_sta(struct iwl_mvm *mvm)

{

	lockdep_assert_held(&mvm->mutex);



	iwl_mvm_disable_txq(mvm, NULL, mvm->aux_queue, IWL_MAX_TID_COUNT, 0);

	ret = iwl_mvm_rm_sta_common(mvm, mvm->aux_sta.sta_id);

	if (ret)

		IWL_WARN(mvm, "Failed sending remove station\n");

	iwl_mvm_dealloc_int_sta(mvm, &mvm->aux_sta);



	return ret;

}



void iwl_mvm_dealloc_snif_sta(struct iwl_mvm *mvm)

{

	iwl_mvm_dealloc_int_sta(mvm, &mvm->snif_sta);

}



/*

drivers/net/wireless/intel/iwlwifi/mvm/sta.h

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2016 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2016 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -541,7 +541,7 @@ int iwl_mvm_sta_tx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
		       int tid, u8 queue, bool start);



int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm);

void iwl_mvm_del_aux_sta(struct iwl_mvm *mvm);

int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm);



int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

CRA Git | Maintained and supported by SUSTech CRA and CCSE