hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwlwifi: mvm: d3: Fix off by ones in iwl_mvm_wowlan_get_rsc_v5_data()

Browse Source 
These should be >= ARRAY_SIZE() instead of > ARRAY_SIZE() to prevent an
out of bounds write on the next line.

Fixes: 79e561f0f0 ("iwlwifi: mvm: d3: implement RSC command version 5")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Luca Coelho <luca@coelho.fi>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210831081802.GA9846@kili
This commit is contained in:
Dan Carpenter 2021-08-31 11:18:02 +03:00 committed by Kalle Valo
parent 24d5f16e40
commit 27a221f433
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/intel/iwlwifi/mvm/d3.c
View File

@ -360,11 +360,11 @@ static void iwl_mvm_wowlan_get_rsc_v5_data(struct ieee80211_hw *hw,
if (sta) { if (sta) {
rsc = data->rsc->ucast_rsc; rsc = data->rsc->ucast_rsc;
} else { } else {
if (WARN_ON(data->gtks > ARRAY_SIZE(data->gtk_ids))) if (WARN_ON(data->gtks >= ARRAY_SIZE(data->gtk_ids)))
return; return;
data->gtk_ids[data->gtks] = key->keyidx; data->gtk_ids[data->gtks] = key->keyidx;
rsc = data->rsc->mcast_rsc[data->gtks % 2]; rsc = data->rsc->mcast_rsc[data->gtks % 2];
if (WARN_ON(key->keyidx > if (WARN_ON(key->keyidx >=
ARRAY_SIZE(data->rsc->mcast_key_id_map))) ARRAY_SIZE(data->rsc->mcast_key_id_map)))
return; return;
data->rsc->mcast_key_id_map[key->keyidx] = data->gtks % 2; data->rsc->mcast_key_id_map[key->keyidx] = data->gtks % 2;