aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
diff options
context:
space:
mode:
authorSharon Dvir <[email protected]>2017-02-21 08:41:31 +0000
committerLuca Coelho <[email protected]>2017-04-25 12:17:58 +0000
commite3df1e4b51e5e54637355db7d732fedf271530e7 (patch)
treedaa81ab72ab3229589750f438eb032aa4d82bd35 /drivers/net/wireless/intel/iwlwifi/mvm/sta.c
parentiwlwifi: mvm: make iwl_run_unified_mvm_ucode() static (diff)
downloadkernel-e3df1e4b51e5e54637355db7d732fedf271530e7.tar.gz
kernel-e3df1e4b51e5e54637355db7d732fedf271530e7.zip
iwlwifi: mvm: check if returned value is NULL
While freeing inactive queue, check mvmsta to be valid before dereferencing it. Found by Klocwork. Signed-off-by: Sharon Dvir <[email protected]> Signed-off-by: Luca Coelho <[email protected]>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/sta.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/sta.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index a2a1fa06b781..fc6d854b04b6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -495,6 +495,8 @@ static int iwl_mvm_free_inactive_queue(struct iwl_mvm *mvm, int queue,
spin_unlock_bh(&mvm->queue_info_lock);
mvmsta = iwl_mvm_sta_from_staid_protected(mvm, sta_id);
+ if (WARN_ON(!mvmsta))
+ return -EINVAL;
disable_agg_tids = iwl_mvm_remove_sta_queue_marking(mvm, queue);
/* Disable the queue */