]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: iwlwifi: mvm: fix setting the TK when associated
authorAvraham Stern <avraham.stern@intel.com>
Sat, 8 Mar 2025 21:19:25 +0000 (23:19 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 11 Mar 2025 15:29:23 +0000 (16:29 +0100)
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>
drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c

index dfb25b964f0eb65459e0fa3f66f01b9461435434..a493ef6bedc3e036b0ee1d50e37a8bd0a964ce8e 100644 (file)
@@ -672,7 +672,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));
                }