qcacld-3.0: Reset SPMK cache before every connection

SPMK global cache in the vdev private is persistent
across connections. Therefore, in cross-ssid roaming
cases with different AKMs, SPMK in the global cache
will always be sent to the firmware in RSO start, even
for non-SAE connections. This causes roam failure.

Reset the spmk global cache for every new connection.

Change-Id: I03deefe16242ef79d0985a8c05881914e6f7af01
CRs-Fixed: 3310182

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c

@@ -1036,10 +1036,13 @@ QDF_STATUS cm_fw_roam_complete(struct cnx_mgr *cm_ctx, void *data)
 		roam_synch_data->hw_mode_trans_ind.vdev_mac_map,
 		0, NULL, psoc);
 
-	if (roam_synch_data->pmk_len)
+	if (roam_synch_data->pmk_len) {
+		mlme_debug("Received pmk in roam sync. Length: %d",
+			   roam_synch_data->pmk_len);
 		cm_check_and_set_sae_single_pmk_cap(psoc, vdev_id,
 						    roam_synch_data->pmk,
 						    roam_synch_data->pmk_len);
+	}
 
 	cm_csr_send_set_ie(cm_ctx->vdev);
 

core/mac/src/pe/include/lim_api.h

@@ -738,5 +738,9 @@ lim_mlo_roam_delete_link_peer(struct pe_session *pe_session,
 {
 }
 #endif /* WLAN_FEATURE_ROAM_OFFLOAD && WLAN_FEATURE_11BE_MLO */
+
+enum ani_akm_type
+lim_get_connected_akm(struct pe_session *session, int32_t ucast_cipher,
+		      int32_t auth_mode, int32_t akm);
 /************************************************************/
 #endif /* __LIM_API_H */

core/mac/src/pe/lim/lim_api.c

@@ -1895,11 +1895,18 @@ static void pe_update_crypto_params(struct mac_context *mac_ctx,
 		pe_err("crypto params is null");
 		return;
 	}
-	pe_nofl_debug("vdev %d roam auth 0x%x akm 0x%0x rsn_caps 0x%x",
+
+	ft_session->connected_akm =
+		lim_get_connected_akm(ft_session, crypto_params->ucastcipherset,
+				      crypto_params->authmodeset,
+				      crypto_params->key_mgmt);
+	pe_nofl_debug("vdev %d roam auth 0x%x akm 0x%0x rsn_caps 0x%x ucastcipher 0x%x akm %d",
 		      ft_session->vdev_id,
 		      crypto_params->authmodeset,
 		      crypto_params->key_mgmt,
-		      crypto_params->rsn_caps);
+		      crypto_params->rsn_caps,
+		      crypto_params->ucastcipherset,
+		      ft_session->connected_akm);
 }
 
 /**
@@ -2749,6 +2756,10 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 	qdf_mem_copy(roam_sync_ind_ptr->ssid.ssid, ft_session_ptr->ssId.ssId,
 		     roam_sync_ind_ptr->ssid.length);
 	pe_update_crypto_params(mac_ctx, ft_session_ptr, roam_sync_ind_ptr);
+
+	/* Reset the SPMK global cache */
+	wlan_mlme_set_sae_single_pmk_bss_cap(mac_ctx->psoc, vdev_id, false);
+
 	/* Next routine may update nss based on dot11Mode */
 
 	lim_ft_prepare_add_bss_req(mac_ctx, ft_session_ptr, bss_desc);

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -3605,7 +3605,7 @@ lim_get_rsn_akm(uint32_t akm)
 		return ANI_AKM_TYPE_NONE;
 }
 
-static enum ani_akm_type
+enum ani_akm_type
 lim_get_connected_akm(struct pe_session *session, int32_t ucast_cipher,
 		      int32_t auth_mode, int32_t akm)
 {
@@ -4122,6 +4122,15 @@ lim_fill_session_params(struct mac_context *mac_ctx,
 	assoc_ie_len = req->assoc_ie.len;
 	lim_fill_crypto_params(mac_ctx, session, req);
 
+	/* Reset the SPMK global cache for non-SAE connection */
+	if (session->connected_akm != ANI_AKM_TYPE_SAE) {
+		wlan_mlme_set_sae_single_pmk_bss_cap(mac_ctx->psoc,
+						     session->vdev_id,
+						     false);
+		wlan_mlme_clear_sae_single_pmk_info(session->vdev,
+						    NULL);
+	}
+
 	if (assoc_ie_len != req->assoc_ie.len) {
 		pe_debug("After stripping Assoc IE len: %d", req->assoc_ie.len);
 		if (req->assoc_ie.len)
@@ -4231,7 +4240,7 @@ lim_cm_handle_join_req(struct cm_vdev_join_req *req)
 	if (QDF_IS_STATUS_ERROR(status))
 		goto fail;
 
-	pe_debug("Freq %d width %d freq0 %d freq1 %d, Smps %d: mode %d action %d, nss 1x1 %d vdev_nss %d nss %d cbMode %d dot11mode %d subfer %d subfee %d csn %d is_cisco %d WPS %d OSEN %d fils %d",
+	pe_debug("Freq %d width %d freq0 %d freq1 %d, Smps %d: mode %d action %d, nss 1x1 %d vdev_nss %d nss %d cbMode %d dot11mode %d subfer %d subfee %d csn %d is_cisco %d WPS %d OSEN %d fils %d akm %d",
 		 pe_session->curr_op_freq, pe_session->ch_width,
 		 pe_session->ch_center_freq_seg0,
 		 pe_session->ch_center_freq_seg1,
@@ -4246,7 +4255,8 @@ lim_cm_handle_join_req(struct cm_vdev_join_req *req)
 		 pe_session->isCiscoVendorAP,
 		 pe_session->wps_registration,
 		 pe_session->isOSENConnection,
-		 lim_is_fils_connection(pe_session));
+		 lim_is_fils_connection(pe_session),
+		 pe_session->connected_akm);
 
 	lim_set_emlsr_caps(mac_ctx, pe_session);