wifi: iwlwifi: mvm: fix setting the TK when associated

[ Upstream commit 3ad61970ac9e164be1b09b46c01aa942e8966132 ]

When running secured ranging and the initiator is associated with
the responder, the TK was not set in the range request command.
Fix it.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250308231427.603dc31579d9.Icd19d797e56483c08dd22c55b96fee481c4d2f3d@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
index b26141c30c61c5cdcf4647f49666a995c2647b09..0a96c26e741b860c4990ba8d68514761e66fa94e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
@@ -773,7 +773,11 @@ iwl_mvm_ftm_set_secured_ranging(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
                        target.bssid = bssid;
                        target.cipher = cipher;
+                       target.tk = NULL;
                        ieee80211_iter_keys(mvm->hw, vif, iter, &target);
+
+                       if (!WARN_ON(!target.tk))
+                               memcpy(tk, target.tk, TK_11AZ_LEN);
                } else {
                        memcpy(tk, entry->tk, sizeof(entry->tk));
                }