]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wifi: iwlwifi: mvm: set the cipher for secured NDP ranging
authorAvraham Stern <avraham.stern@intel.com>
Mon, 29 Jul 2024 17:20:11 +0000 (20:20 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 27 Aug 2024 08:15:14 +0000 (10:15 +0200)
The cipher pointer is not set, but is derefereced trying to set its
content, which leads to a NULL pointer dereference.
Fix it by pointing to the cipher parameter before dereferencing.

Fixes: 626be4bf99f6 ("wifi: iwlwifi: mvm: modify iwl_mvm_ftm_set_secured_ranging() parameters")
Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20240729201718.24e83369f136.I80501ddcb82920561f450d00020d860e7a3f90c6@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c

index afd90a52d4ecbefe98cfab511bb2642481ca25a6..55245f913286b9d3bb2a66eb1303c70be0808f72 100644 (file)
@@ -772,6 +772,7 @@ iwl_mvm_ftm_set_secured_ranging(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                        struct iwl_mvm_ftm_iter_data target;
 
                        target.bssid = bssid;
+                       target.cipher = cipher;
                        ieee80211_iter_keys(mvm->hw, vif, iter, &target);
                } else {
                        memcpy(tk, entry->tk, sizeof(entry->tk));