From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, Benjamin Berg <benjamin.berg@intel.com>
Subject: [PATCH 02/17] wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Date: Wed, 20 Mar 2024 23:26:23 +0200 [thread overview]
Message-ID: <20240320232419.d523167bda9c.I1cffd86363805bf86a95d8bdfd4b438bb54baddc@changeid> (raw)
In-Reply-To: <20240320212638.1446082-1-miriam.rachel.korenblit@intel.com>
From: Benjamin Berg <benjamin.berg@intel.com>
Guard against invalid station IDs in iwl_mvm_mld_rm_sta_id as that would
result in out-of-bounds array accesses. This prevents issues should the
driver get into a bad state during error handling.
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 6f9ba0c18fa3..4ba1599ed71c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -855,10 +855,15 @@ int iwl_mvm_mld_rm_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
int iwl_mvm_mld_rm_sta_id(struct iwl_mvm *mvm, u8 sta_id)
{
- int ret = iwl_mvm_mld_rm_sta_from_fw(mvm, sta_id);
+ int ret;
lockdep_assert_held(&mvm->mutex);
+ if (WARN_ON(sta_id == IWL_MVM_INVALID_STA))
+ return 0;
+
+ ret = iwl_mvm_mld_rm_sta_from_fw(mvm, sta_id);
+
RCU_INIT_POINTER(mvm->fw_id_to_mac_id[sta_id], NULL);
RCU_INIT_POINTER(mvm->fw_id_to_link_sta[sta_id], NULL);
return ret;
--
2.34.1
next prev parent reply other threads:[~2024-03-20 21:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 21:26 [PATCH 00/17] wifi: iwlwifi: updates - 2024-03-20 Miri Korenblit
2024-03-20 21:26 ` [PATCH 01/17] wifi: iwlwifi: mvm: include link ID when releasing frames Miri Korenblit
2024-03-20 21:26 ` Miri Korenblit [this message]
2024-03-20 21:26 ` [PATCH 03/17] wifi: iwlwifi: mvm: assign link STA ID lookups during restart Miri Korenblit
2024-03-20 21:26 ` [PATCH 04/17] wifi: iwlwifi: mvm: fix active link counting during recovery Miri Korenblit
2024-03-20 21:26 ` [PATCH 05/17] wifi: iwlwifi: mvm: mark EMLSR disabled in cleanup iterator Miri Korenblit
2024-03-20 21:26 ` [PATCH 06/17] wifi: iwlwifi: remove devices that never came out Miri Korenblit
2024-03-20 21:26 ` [PATCH 07/17] wifi: iwlwifi: remove wrong CRF_IDs Miri Korenblit
2024-03-20 21:26 ` [PATCH 08/17] wifi: iwlwifi: Print a specific device name Miri Korenblit
2024-03-20 21:26 ` [PATCH 09/17] wifi: iwlwifi: add support for BZ_W Miri Korenblit
2024-03-20 21:26 ` [PATCH 10/17] wifi: iwlwifi: mvm: Remove outdated comment Miri Korenblit
2024-03-20 21:26 ` [PATCH 11/17] wifi: iwlwifi: mvm: handle debugfs names more carefully Miri Korenblit
2024-03-20 21:26 ` [PATCH 12/17] wifi: iwlwifi: mvm: Declare HE/EHT capabilities support for P2P interfaces Miri Korenblit
2024-03-20 21:26 ` [PATCH 13/17] wifi: iwlwifi: Add support for LARI_CONFIG_CHANGE_CMD cmd v9 Miri Korenblit
2024-03-20 21:26 ` [PATCH 14/17] wifi: iwlwifi: mvm: set wider BW OFDMA ignore correctly Miri Korenblit
2024-03-20 21:26 ` [PATCH 15/17] wifi: iwlwifi: mvm: select STA mask only for active links Miri Korenblit
2024-03-25 14:27 ` Johannes Berg
2024-03-20 21:26 ` [PATCH 16/17] wifi: iwlwifi: mvm: don't change BA sessions during restart Miri Korenblit
2024-03-20 21:26 ` [PATCH 17/17] wifi: iwlwifi: reconfigure TLC during HW restart Miri Korenblit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240320232419.d523167bda9c.I1cffd86363805bf86a95d8bdfd4b438bb54baddc@changeid \
--to=miriam.rachel.korenblit@intel.com \
--cc=benjamin.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.