qcacld-3.0: print SSID with QDF_SSID_FMT and QDF_SSID_REF

To protect user privacy, print SSID with QDF_SSID_FMT
and QDF_SSID_REF, then SSID will be hide in logs if
anonymization is enabled.

Change-Id: I3dd129b52c85c84e666f4f07b28a1e58f81259b7
CRs-Fixed: 3291841

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

@@ -91,9 +91,9 @@ QDF_STATUS cm_update_advance_roam_scan_filter(
 		wlan_vdev_mlme_get_ssid(vdev, filter->ssid_list[0].ssid,
 					&filter->ssid_list[0].length);
 
-		mlme_debug("Filtering for SSID %.*s,length of SSID = %u",
-			   filter->ssid_list[0].length,
-			   filter->ssid_list[0].ssid,
+		mlme_debug("Filtering for SSID " QDF_SSID_FMT ",length of SSID = %u",
+			   QDF_SSID_REF(filter->ssid_list[0].length,
+					filter->ssid_list[0].ssid),
 			   filter->ssid_list[0].length);
 	}
 

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

@@ -1387,8 +1387,8 @@ void cm_update_owe_info(struct wlan_objmgr_vdev *vdev,
 	qdf_mem_copy(owe_info->ssid.ssid, owe_transition_ie + OWE_SSID_OFFSET,
 		     owe_info->ssid.length);
 
-	mlme_debug("[OWE_TRANSITION] open bss ssid: \"%.*s\"",
-		   owe_info->ssid.length, owe_info->ssid.ssid);
+	mlme_debug("[OWE_TRANSITION] open bss ssid: \"" QDF_SSID_FMT "\"",
+		   QDF_SSID_REF(owe_info->ssid.length, owe_info->ssid.ssid));
 	return;
 
 reset:
@@ -2338,9 +2338,9 @@ cm_roam_scan_filter(struct wlan_objmgr_psoc *psoc,
 			     rso_usr_cfg->ssid_allowed_list[i].length);
 		params->ssid_allowed_list[i].length =
 				rso_usr_cfg->ssid_allowed_list[i].length;
-		mlme_debug("SSID %d: %.*s", i,
-			   params->ssid_allowed_list[i].length,
-			   params->ssid_allowed_list[i].ssid);
+		mlme_debug("SSID %d: " QDF_SSID_FMT, i,
+			   QDF_SSID_REF(params->ssid_allowed_list[i].length,
+					params->ssid_allowed_list[i].ssid));
 	}
 
 	if (params->num_bssid_preferred_list) {

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

@@ -591,8 +591,8 @@ cm_roam_candidate_event_handler(struct wlan_objmgr_psoc *psoc,
 							   ie_ptr, ie_len);
 	if (extracted_ie && extracted_ie[0] == WLAN_ELEMID_SSID &&
 	    extracted_ie[1] > MIN_IE_LEN) {
-		mlme_debug("SSID of the candidate is %.*s", extracted_ie[1],
-			   &extracted_ie[2]);
+		mlme_debug("SSID of the candidate is " QDF_SSID_FMT,
+			   QDF_SSID_REF(extracted_ie[1], &extracted_ie[2]));
 		wlan_cm_set_roam_offload_ssid(vdev, extracted_ie);
 	}
 

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

@@ -809,8 +809,8 @@ void cm_connect_info(struct wlan_objmgr_vdev *vdev, bool connect_success,
 	mlme_nofl_debug("VDEV-ID: %d self_mac:"QDF_MAC_ADDR_FMT,
 			wlan_vdev_get_id(vdev),
 			QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)));
-	mlme_nofl_debug("ssid: %.*s bssid: "QDF_MAC_ADDR_FMT" RSSI: %d dBm",
-			conn_stats.ssid_len, conn_stats.ssid,
+	mlme_nofl_debug("ssid: " QDF_SSID_FMT " bssid: " QDF_MAC_ADDR_FMT " RSSI: %d dBm",
+			QDF_SSID_REF(conn_stats.ssid_len, conn_stats.ssid),
 			QDF_MAC_ADDR_REF(conn_stats.bssid), conn_stats.rssi);
 	mlme_nofl_debug("Channel Freq: %d channel_bw: %s dot11Mode: %s",
 			conn_stats.op_freq,

components/wmi/src/wmi_unified_roam_tlv.c

@@ -4511,6 +4511,7 @@ send_roam_scan_offload_ap_profile_cmd_tlv(wmi_unified_t wmi_handle,
 	wmi_owe_ap_profile *owe_ap_profile;
 	enum roam_trigger_reason trig_reason;
 	uint32_t *authmode_list;
+	wmi_ssid *ssid;
 	int i;
 
 	len = sizeof(wmi_roam_ap_profile_fixed_param) + sizeof(wmi_ap_profile);
@@ -4573,14 +4574,15 @@ send_roam_scan_offload_ap_profile_cmd_tlv(wmi_unified_t wmi_handle,
 				ap_profile->profile.rsn_mcastmgmtcipherset;
 	profile->rssi_abs_thresh = ap_profile->profile.rssi_abs_thresh;
 
-	wmi_debug("vdev %d AP PROFILE: flags:%x rssi_thres:%d bg_rssi_thres:%d ssid:%.*s authmode:%d uc cipher:%d mc cipher:%d mc mgmt cipher:%d rssi abs thresh:%d",
-		 roam_ap_profile_fp->vdev_id,
-		 profile->flags, profile->rssi_threshold,
-		 profile->bg_rssi_threshold,
-		 profile->ssid.ssid_len, ap_profile->profile.ssid.ssid,
-		 profile->rsn_authmode, profile->rsn_ucastcipherset,
-		 profile->rsn_mcastcipherset, profile->rsn_mcastmgmtcipherset,
-		 profile->rssi_abs_thresh);
+	wmi_debug("vdev %d AP PROFILE: flags:%x rssi_thres:%d bg_rssi_thres:%d ssid:" QDF_SSID_FMT " authmode:%d uc cipher:%d mc cipher:%d mc mgmt cipher:%d rssi abs thresh:%d",
+		  roam_ap_profile_fp->vdev_id,
+		  profile->flags, profile->rssi_threshold,
+		  profile->bg_rssi_threshold,
+		  QDF_SSID_REF(profile->ssid.ssid_len,
+			       ap_profile->profile.ssid.ssid),
+		  profile->rsn_authmode, profile->rsn_ucastcipherset,
+		  profile->rsn_mcastcipherset, profile->rsn_mcastmgmtcipherset,
+		  profile->rssi_abs_thresh);
 
 	buf_ptr += sizeof(wmi_ap_profile);
 
@@ -4816,18 +4818,17 @@ send_roam_scan_offload_ap_profile_cmd_tlv(wmi_unified_t wmi_handle,
 		buf_ptr += WMI_TLV_HDR_SIZE;
 
 		owe_ap_profile = (wmi_owe_ap_profile *)buf_ptr;
+		ssid = &owe_ap_profile->open_ssid_for_owe_transition;
 		WMITLV_SET_HDR(&owe_ap_profile->tlv_header,
 			       WMITLV_TAG_STRUC_wmi_owe_ap_profile,
 			       WMITLV_GET_STRUCT_TLVLEN(wmi_owe_ap_profile));
 
-		owe_ap_profile->open_ssid_for_owe_transition.ssid_len =
-					ap_profile->owe_ap_profile.ssid.length;
-		qdf_mem_copy(owe_ap_profile->open_ssid_for_owe_transition.ssid,
+		ssid->ssid_len = ap_profile->owe_ap_profile.ssid.length;
+		qdf_mem_copy(ssid->ssid,
 			     ap_profile->owe_ap_profile.ssid.ssid,
 			     ap_profile->owe_ap_profile.ssid.length);
-		wmi_debug("[OWE_TRANSITION]: open ssid:%.*s",
-		      owe_ap_profile->open_ssid_for_owe_transition.ssid_len,
-		     (char *)owe_ap_profile->open_ssid_for_owe_transition.ssid);
+		wmi_debug("[OWE_TRANSITION]: open ssid:" QDF_SSID_FMT,
+			  QDF_SSID_REF(ssid->ssid_len, (char *)ssid->ssid));
 
 		buf_ptr += sizeof(*owe_ap_profile);
 	} else {
@@ -5592,11 +5593,11 @@ send_offload_11k_cmd_tlv(wmi_unified_t wmi_handle,
 		  params->neighbor_report_params.low_rssi_offset,
 		  params->neighbor_report_params.bmiss_count_trigger,
 		  params->neighbor_report_params.per_threshold_offset);
-	wmi_debug("RSO_CFG: neighbor_report_cache_timeout:%u max_neighbor_report_req_cap:%u SSID:%.*s",
+	wmi_debug("RSO_CFG: neighbor_report_cache_timeout:%u max_neighbor_report_req_cap:%u SSID:" QDF_SSID_FMT,
 		  params->neighbor_report_params.neighbor_report_cache_timeout,
 		  params->neighbor_report_params.max_neighbor_report_req_cap,
-		  params->neighbor_report_params.ssid.length,
-		  params->neighbor_report_params.ssid.ssid);
+		  QDF_SSID_REF(params->neighbor_report_params.ssid.length,
+			       params->neighbor_report_params.ssid.ssid));
 
 	wmi_mtrace(WMI_11K_OFFLOAD_REPORT_CMDID, cmd->vdev_id, 0);
 	status = wmi_unified_cmd_send(wmi_handle, buf, len,

core/hdd/src/wlan_hdd_cfg80211.c

@@ -4810,6 +4810,7 @@ static int hdd_set_allow_list(struct hdd_context *hdd_ctx,
 	struct nlattr *tb2[MAX_ROAMING_PARAM + 1];
 	struct nlattr *curr_attr = NULL;
 	mac_handle_t mac_handle;
+	struct wlan_ssid *ssid;
 
 	i = 0;
 	if (tb[PARAM_NUM_NW]) {
@@ -4847,20 +4848,19 @@ static int hdd_set_allow_list(struct hdd_context *hdd_ctx,
 			 * the NULL termination character to the driver
 			 * buffer.
 			 */
-			if (buf_len > 1 &&
-			    ((buf_len - 1) <= WLAN_SSID_MAX_LEN)) {
-				nla_memcpy(rso_config->ssid_allowed_list[i].ssid,
-					tb2[PARAM_LIST_SSID], buf_len - 1);
-				rso_config->ssid_allowed_list[i].length = buf_len - 1;
-				hdd_debug("SSID[%d]: %.*s,length = %d",
-					i,
-					rso_config->ssid_allowed_list[i].length,
-					rso_config->ssid_allowed_list[i].ssid,
-					rso_config->ssid_allowed_list[i].length);
-					i++;
-			} else {
+			if (buf_len <= 1 || (buf_len - 1) > WLAN_SSID_MAX_LEN) {
 				hdd_err("Invalid buffer length");
+				continue;
 			}
+
+			ssid = &rso_config->ssid_allowed_list[i];
+			nla_memcpy(ssid->ssid,
+				   tb2[PARAM_LIST_SSID], buf_len - 1);
+			ssid->length = buf_len - 1;
+			hdd_debug("SSID[%d]: " QDF_SSID_FMT ",length = %d", i,
+				  QDF_SSID_REF(ssid->length, ssid->ssid),
+				  rso_config->ssid_allowed_list[i].length);
+			i++;
 		}
 	}
 
@@ -22309,10 +22309,10 @@ static void hdd_fill_pmksa_info(struct hdd_adapter *adapter,
 		qdf_mem_copy(pmk_cache->cache_id, pmksa->cache_id,
 			     CACHE_ID_LEN);
 		pmk_cache->ssid_len = pmksa->ssid_len;
-		hdd_debug("%s PMKSA for ssid %*.*s cache_id %x %x",
+		hdd_debug("%s PMKSA for ssid " QDF_SSID_FMT " cache_id %x %x",
 			  is_delete ? "Delete" : "Set",
-			  pmk_cache->ssid_len, pmk_cache->ssid_len,
-			  pmk_cache->ssid, pmk_cache->cache_id[0],
+			  QDF_SSID_REF(pmk_cache->ssid_len, pmk_cache->ssid),
+			  pmk_cache->cache_id[0],
 			  pmk_cache->cache_id[1]);
 	}
 

core/hdd/src/wlan_hdd_cm_disconnect.c

@@ -102,11 +102,12 @@ static void hdd_cm_print_bss_info(struct hdd_station_ctx *hdd_sta_ctx)
 	conn_info = &hdd_sta_ctx->conn_info;
 
 	hdd_nofl_debug("*********** WIFI DATA LOGGER **************");
-	hdd_nofl_debug("freq: %d dot11mode %d AKM %d ssid: \"%.*s\" ,roam_count %d nss %d legacy %d mcs %d signal %d noise: %d",
+	hdd_nofl_debug("freq: %d dot11mode %d AKM %d ssid: \"" QDF_SSID_FMT "\" ,roam_count %d nss %d legacy %d mcs %d signal %d noise: %d",
 		       conn_info->chan_freq, conn_info->dot11mode,
 		       conn_info->last_auth_type,
-		       conn_info->last_ssid.SSID.length,
-		       conn_info->last_ssid.SSID.ssId, conn_info->roam_count,
+		       QDF_SSID_REF(conn_info->last_ssid.SSID.length,
+				    conn_info->last_ssid.SSID.ssId),
+		       conn_info->roam_count,
 		       conn_info->txrate.nss, conn_info->txrate.legacy,
 		       conn_info->txrate.mcs, conn_info->signal,
 		       conn_info->noise);

core/hdd/src/wlan_hdd_ext_scan.c

@@ -416,26 +416,13 @@ wlan_hdd_cfg80211_extscan_cached_results_ind(struct hdd_context *hdd_ctx,
 			 * BSSID was cached.
 			 */
 			ap->ts += hdd_ctx->ext_scan_start_since_boot;
-			hdd_debug("Timestamp %llu "
-				"Ssid: %s "
-				"Bssid (" QDF_MAC_ADDR_FMT ") "
-				"Channel %u "
-				"Rssi %d "
-				"RTT %u "
-				"RTT_SD %u "
-				"Beacon Period %u "
-				"Capability 0x%x "
-				"Ie length %d",
-				ap->ts,
-				ap->ssid,
-				QDF_MAC_ADDR_REF(ap->bssid.bytes),
-				ap->channel,
-				ap->rssi,
-				ap->rtt,
-				ap->rtt_sd,
-				ap->beaconPeriod,
-				ap->capability,
-				ap->ieLength);
+			hdd_debug("Timestamp %llu Ssid: " QDF_SSID_FMT " Bssid (" QDF_MAC_ADDR_FMT ") Channel %u Rssi %d RTT %u RTT_SD %u Beacon Period %u Capability 0x%x Ie length %d",
+				  ap->ts,
+				  QDF_SSID_REF(WLAN_SSID_MAX_LEN, ap->ssid),
+				  QDF_MAC_ADDR_REF(ap->bssid.bytes),
+				  ap->channel, ap->rssi, ap->rtt, ap->rtt_sd,
+				  ap->beaconPeriod, ap->capability,
+				  ap->ieLength);
 			ap++;
 		}
 		result++;
@@ -579,21 +566,12 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(struct hdd_context *hdd_ctx,
 
 	for (i = 0; i < data->numOfAps; i++) {
 		data->ap[i].ts = qdf_get_monotonic_boottime();
-
-		hdd_debug("[i=%d] Timestamp %llu "
-		       "Ssid: %s "
-		       "Bssid (" QDF_MAC_ADDR_FMT ") "
-		       "Channel %u "
-		       "Rssi %d "
-		       "RTT %u "
-		       "RTT_SD %u",
-		       i,
-		       data->ap[i].ts,
-		       data->ap[i].ssid,
-		       QDF_MAC_ADDR_REF(data->ap[i].bssid.bytes),
-		       data->ap[i].channel,
-		       data->ap[i].rssi,
-		       data->ap[i].rtt, data->ap[i].rtt_sd);
+		hdd_debug("[i=%d] Timestamp %llu Ssid: " QDF_SSID_FMT " Bssid (" QDF_MAC_ADDR_FMT ") Channel %u Rssi %d RTT %u RTT_SD %u",
+			  i, data->ap[i].ts,
+			  QDF_SSID_REF(WLAN_SSID_MAX_LEN, data->ap[i].ssid),
+			  QDF_MAC_ADDR_REF(data->ap[i].bssid.bytes),
+			  data->ap[i].channel, data->ap[i].rssi,
+			  data->ap[i].rtt, data->ap[i].rtt_sd);
 	}
 
 	if (nla_put_u32(skb,
@@ -844,26 +822,14 @@ wlan_hdd_cfg80211_extscan_full_scan_result_event(struct hdd_context *hdd_ctx,
 	 */
 	data->ap.ts = qdf_get_monotonic_boottime();
 
-	hdd_debug("Req Id %u More Data %u", data->requestId,
-		  data->moreData);
-	hdd_debug("AP Info: Timestamp %llu Ssid: %s "
-	       "Bssid (" QDF_MAC_ADDR_FMT ") "
-	       "Channel %u "
-	       "Rssi %d "
-	       "RTT %u "
-	       "RTT_SD %u "
-	       "Bcn Period %d "
-	       "Capability 0x%X "
-	       "IE Length %d",
-	       data->ap.ts,
-	       data->ap.ssid,
-	       QDF_MAC_ADDR_REF(data->ap.bssid.bytes),
-	       data->ap.channel,
-	       data->ap.rssi,
-	       data->ap.rtt,
-	       data->ap.rtt_sd,
-	       data->ap.beaconPeriod,
-	       data->ap.capability, data->ap.ieLength);
+	hdd_debug("Req Id %u More Data %u", data->requestId, data->moreData);
+	hdd_debug("AP Info: Timestamp %llu Ssid: " QDF_SSID_FMT " Bssid (" QDF_MAC_ADDR_FMT ") Channel %u Rssi %d RTT %u RTT_SD %u Bcn Period %d Capability 0x%X IE Length %d",
+		  data->ap.ts,
+		  QDF_SSID_REF(WLAN_SSID_MAX_LEN, data->ap.ssid),
+		  QDF_MAC_ADDR_REF(data->ap.bssid.bytes),
+		  data->ap.channel, data->ap.rssi, data->ap.rtt,
+		  data->ap.rtt_sd, data->ap.beaconPeriod,
+		  data->ap.capability, data->ap.ieLength);
 
 	if (nla_put_u32(skb,
 		QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_REQUEST_ID,
@@ -1123,25 +1089,14 @@ wlan_hdd_cfg80211_extscan_epno_match_found(struct hdd_context *hdd_ctx,
 		data->request_id, data->more_data, data->num_results);
 	for (i = 0; i < data->num_results; i++) {
 		data->ap[i].channel = cds_chan_to_freq(data->ap[i].channel);
-		hdd_debug("AP Info: Timestamp %llu) Ssid: %s "
-					"Bssid (" QDF_MAC_ADDR_FMT ") "
-					"Channel %u "
-					"Rssi %d "
-					"RTT %u "
-					"RTT_SD %u "
-					"Bcn Period %d "
-					"Capability 0x%X "
-					"IE Length %d",
-					data->ap[i].ts,
-					data->ap[i].ssid,
-					QDF_MAC_ADDR_REF(data->ap[i].bssid.bytes),
-					data->ap[i].channel,
-					data->ap[i].rssi,
-					data->ap[i].rtt,
-					data->ap[i].rtt_sd,
-					data->ap[i].beaconPeriod,
-					data->ap[i].capability,
-					data->ap[i].ieLength);
+		hdd_debug("AP Info: Timestamp %llu) Ssid: " QDF_SSID_FMT " Bssid (" QDF_MAC_ADDR_FMT ") Channel %u Rssi %d RTT %u RTT_SD %u Bcn Period %d Capability 0x%X IE Length %d",
+			  data->ap[i].ts,
+			  QDF_SSID_REF(WLAN_SSID_MAX_LEN, data->ap[i].ssid),
+			  QDF_MAC_ADDR_REF(data->ap[i].bssid.bytes),
+			  data->ap[i].channel, data->ap[i].rssi,
+			  data->ap[i].rtt, data->ap[i].rtt_sd,
+			  data->ap[i].beaconPeriod, data->ap[i].capability,
+			  data->ap[i].ieLength);
 	}
 
 	if (nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_REQUEST_ID,
@@ -1229,25 +1184,13 @@ wlan_hdd_cfg80211_passpoint_match_found(void *ctx,
 	hdd_debug("Req Id %u Id %u ANQP length %u num_matches %u",
 		data->request_id, data->id, data->anqp_len, num_matches);
 	for (i = 0; i < num_matches; i++) {
-		hdd_debug("AP Info: Timestamp %llu Ssid: %s "
-					"Bssid (" QDF_MAC_ADDR_FMT ") "
-					"Channel %u "
-					"Rssi %d "
-					"RTT %u "
-					"RTT_SD %u "
-					"Bcn Period %d "
-					"Capability 0x%X "
-					"IE Length %d",
-					data->ap.ts,
-					data->ap.ssid,
-					QDF_MAC_ADDR_REF(data->ap.bssid.bytes),
-					data->ap.channel,
-					data->ap.rssi,
-					data->ap.rtt,
-					data->ap.rtt_sd,
-					data->ap.beaconPeriod,
-					data->ap.capability,
-					data->ap.ieLength);
+		hdd_debug("AP Info: Timestamp %llu Ssid: " QDF_SSID_FMT " Bssid (" QDF_MAC_ADDR_FMT ") Channel %u Rssi %d RTT %u RTT_SD %u Bcn Period %d Capability 0x%X IE Length %d",
+			  data->ap.ts,
+			  QDF_SSID_REF(WLAN_SSID_MAX_LEN, data->ap.ssid),
+			  QDF_MAC_ADDR_REF(data->ap.bssid.bytes),
+			  data->ap.channel, data->ap.rssi, data->ap.rtt,
+			  data->ap.rtt_sd, data->ap.beaconPeriod,
+			  data->ap.capability, data->ap.ieLength);
 	}
 
 	if (nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_REQUEST_ID,
@@ -3420,7 +3363,8 @@ hdd_extscan_epno_fill_network(struct nlattr *network,
 	hdd_debug("network ssid length %d", ssid_len);
 	ssid = nla_data(tb[id]);
 	qdf_mem_copy(nw->ssid.ssid, ssid, ssid_len);
-	hdd_debug("Ssid (%.*s)", nw->ssid.length, nw->ssid.ssid);
+	hdd_debug("Ssid (" QDF_SSID_FMT ")",
+		  QDF_SSID_REF(nw->ssid.length, nw->ssid.ssid));
 
 	/* Parse and fetch epno flags */
 	id = QCA_WLAN_VENDOR_ATTR_PNO_SET_LIST_PARAM_EPNO_NETWORK_FLAGS;

core/hdd/src/wlan_hdd_hostapd.c

@@ -6538,10 +6538,11 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 		goto error;
 	}
 
-	hdd_nofl_debug("SAP mac:" QDF_MAC_ADDR_FMT " SSID: %.*s BCNINTV:%d Freq:%d freq_seg0:%d freq_seg1:%d ch_width:%d HW mode:%d privacy:%d akm:%d acs_mode:%d acs_dfs_mode %d dtim period:%d MFPC %d, MFPR %d",
+	hdd_nofl_debug("SAP mac:" QDF_MAC_ADDR_FMT " SSID: " QDF_SSID_FMT " BCNINTV:%d Freq:%d freq_seg0:%d freq_seg1:%d ch_width:%d HW mode:%d privacy:%d akm:%d acs_mode:%d acs_dfs_mode %d dtim period:%d MFPC %d, MFPR %d",
 		       QDF_MAC_ADDR_REF(adapter->mac_addr.bytes),
-		       config->SSIDinfo.ssid.length,
-		       config->SSIDinfo.ssid.ssId, (int)config->beacon_int,
+		       QDF_SSID_REF(config->SSIDinfo.ssid.length,
+				    config->SSIDinfo.ssid.ssId),
+		       (int)config->beacon_int,
 		       config->chan_freq, config->ch_params.mhz_freq_seg0,
 		       config->ch_params.mhz_freq_seg1,
 		       config->ch_params.ch_width,

core/hdd/src/wlan_hdd_station_info.c

@@ -839,10 +839,11 @@ static int hdd_get_station_info(struct hdd_context *hdd_ctx,
 	}
 
 	hdd_nofl_debug(
-		"STA Info:: SSID:%s, BSSID:" QDF_MAC_ADDR_FMT ", freq:%d, "
+		"STA Info:: SSID:" QDF_SSID_FMT ", BSSID:" QDF_MAC_ADDR_FMT ", freq:%d, "
 		"Noise:%d, signal:%d, roam_count:%d, last_auth_type:%d, "
 		"dot11mode:%d, disconnect_reason:%d, ",
-		hdd_sta_ctx->cache_conn_info.last_ssid.SSID.ssId,
+		QDF_SSID_REF(WLAN_SSID_MAX_LEN,
+			hdd_sta_ctx->cache_conn_info.last_ssid.SSID.ssId),
 		QDF_MAC_ADDR_REF(hdd_sta_ctx->cache_conn_info.bssid.bytes),
 		hdd_sta_ctx->cache_conn_info.chan_freq,
 		(hdd_sta_ctx->cache_conn_info.noise + 100),

core/hdd/src/wlan_hdd_wext.c

@@ -8131,10 +8131,9 @@ static int __iw_set_pno(struct net_device *dev,
 			goto exit;
 		}
 
-		hdd_debug("PNO len %d ssid %.*s auth %d encry %d channel count %d offset %d",
-			  req.networks_list[i].ssid.length,
-			  req.networks_list[i].ssid.length,
-			  req.networks_list[i].ssid.ssid,
+		hdd_debug("PNO ssid " QDF_SSID_FMT " auth %d encry %d channel count %d offset %d",
+			  QDF_SSID_REF(req.networks_list[i].ssid.length,
+				       req.networks_list[i].ssid.ssid),
 			  req.networks_list[i].authentication,
 			  req.networks_list[i].encryption,
 			  req.networks_list[i].pno_chan_list.num_chan, offset);

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

@@ -351,12 +351,11 @@ static bool lim_chk_ssid(struct mac_context *mac_ctx, tSirMacAddr sa,
 	if (!lim_cmp_ssid(&assoc_req->ssId, session))
 		return true;
 
-	pe_err("%s Req with ssid wrong(Rcvd: %.*s self: %.*s) from "
-			QDF_MAC_ADDR_FMT,
-		(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
-		assoc_req->ssId.length, assoc_req->ssId.ssId,
-		session->ssId.length, session->ssId.ssId,
-		QDF_MAC_ADDR_REF(sa));
+	pe_err("%s Req with ssid wrong(Rcvd: " QDF_SSID_FMT " self: " QDF_SSID_FMT ") from " QDF_MAC_ADDR_FMT,
+	       (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
+	       QDF_SSID_REF(assoc_req->ssId.length, assoc_req->ssId.ssId),
+	       QDF_SSID_REF(session->ssId.length, session->ssId.ssId),
+	       QDF_MAC_ADDR_REF(sa));
 
 	/*
 	 * Received Re/Association Request with either Broadcast SSID OR with
@@ -3412,9 +3411,10 @@ QDF_STATUS lim_send_mlm_assoc_ind(struct mac_context *mac_ctx,
 	else
 		sub_type = LIM_ASSOC;
 
-	pe_debug("Sessionid: %d ssid: %s sub_type: %d Associd: %d staAddr: "
+	pe_debug("Sessionid: %d ssid: " QDF_SSID_FMT " sub_type: %d Associd: %d staAddr: "
 		 QDF_MAC_ADDR_FMT, session_entry->peSessionId,
-		 assoc_req->ssId.ssId, sub_type, sta_ds->assocId,
+		 QDF_SSID_REF(assoc_req->ssId.length, assoc_req->ssId.ssId),
+		 sub_type, sta_ds->assocId,
 		 QDF_MAC_ADDR_REF(sta_ds->staAddr));
 
 	wlan_son_ind_assoc_req_frm(session_entry->vdev, sta_ds->staAddr,

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

@@ -613,11 +613,10 @@ QDF_STATUS lim_trigger_auth_req_sae(struct mac_context *mac_ctx,
 		session->ssId.ssId,
 		session->ssId.length);
 
-	pe_debug("vdev_id %d ssid %.*s "QDF_MAC_ADDR_FMT,
-		sae_info->vdev_id,
-		sae_info->ssid.length,
-		sae_info->ssid.ssId,
-		QDF_MAC_ADDR_REF(sae_info->peer_mac_addr.bytes));
+	pe_debug("vdev_id %d ssid " QDF_SSID_FMT " " QDF_MAC_ADDR_FMT,
+		 sae_info->vdev_id,
+		 QDF_SSID_REF(sae_info->ssid.length, sae_info->ssid.ssId),
+		 QDF_MAC_ADDR_REF(sae_info->peer_mac_addr.bytes));
 
 	msg.type = eWNI_SME_TRIGGER_SAE;
 	msg.bodyptr = sae_info;

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

@@ -258,8 +258,9 @@ void lim_process_mlm_start_cnf(struct mac_context *mac, uint32_t *msg_buf)
 
 		if (send_bcon_ind) {
 			/* Configure beacon and send beacons to HAL */
-			pe_debug("Start Beacon with ssid %s Ch freq %d",
-				 pe_session->ssId.ssId,
+			pe_debug("Start Beacon with ssid " QDF_SSID_FMT " Ch freq %d",
+				 QDF_SSID_REF(pe_session->ssId.length,
+					      pe_session->ssId.ssId),
 				 pe_session->curr_op_freq);
 			lim_send_beacon(mac, pe_session);
 			lim_enable_obss_detection_config(mac, pe_session);
@@ -2957,8 +2958,10 @@ static void lim_process_switch_channel_join_req(
 	/* assign appropriate sessionId to the timer object */
 	mac_ctx->lim.lim_timers.gLimPeriodicJoinProbeReqTimer.sessionId =
 		session_entry->peSessionId;
-	pe_debug("vdev %d Send Probe req on freq %d %.*s  " QDF_MAC_ADDR_FMT, session_entry->vdev_id,
-		 session_entry->curr_op_freq, ssId.length, ssId.ssId,
+	pe_debug("vdev %d Send Probe req on freq %d " QDF_SSID_FMT " " QDF_MAC_ADDR_FMT,
+		 session_entry->vdev_id,
+		 session_entry->curr_op_freq,
+		 QDF_SSID_REF(ssId.length, ssId.ssId),
 		 QDF_MAC_ADDR_REF(
 		 session_entry->pLimMlmJoinReq->bssDescription.bssId));
 

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

@@ -3847,8 +3847,9 @@ lim_fill_rsn_ie(struct mac_context *mac_ctx, struct pe_session *session,
 
 	pmksa_peer = wlan_crypto_get_peer_pmksa(session->vdev, &pmksa);
 	if (!pmksa_peer)
-		pe_debug("FILS: vdev:%d Peer PMKSA not found ssid:%.*s cache_id_present:%d",
-			 session->vdev_id, pmksa.ssid_len, pmksa.ssid,
+		pe_debug("FILS: vdev:%d Peer PMKSA not found ssid:" QDF_SSID_FMT " cache_id_present:%d",
+			 session->vdev_id,
+			 QDF_SSID_REF(pmksa.ssid_len, pmksa.ssid),
 			 bss_desc->fils_info_element.is_cache_id_present);
 
 	lim_update_connect_rsn_ie(session, rsn_ie, pmksa_peer);
@@ -4092,8 +4093,9 @@ lim_fill_session_params(struct mac_context *mac_ctx,
 	    QDF_HAS_PARAM(akm, WLAN_CRYPTO_KEY_MGMT_OWE) &&
 	    req->owe_trans_ssid.length) {
 		req->entry->ssid = req->owe_trans_ssid;
-		pe_debug("OWE transition ssid is %.*s", req->entry->ssid.length,
-			 req->entry->ssid.ssid);
+		pe_debug("OWE transition ssid is " QDF_SSID_FMT,
+			 QDF_SSID_REF(req->entry->ssid.length,
+				      req->entry->ssid.ssid));
 	}
 
 	/* Copy the SSID from req to session entry  */
@@ -8339,8 +8341,10 @@ static void lim_process_sme_start_beacon_req(struct mac_context *mac, uint32_t *
 		 * Tx right after the WMA_ADD_BSS_RSP.
 		 */
 		lim_apply_configuration(mac, pe_session);
-		pe_debug("Start Beacon with ssid %s Ch freq %d",
-			 pe_session->ssId.ssId, pe_session->curr_op_freq);
+		pe_debug("Start Beacon with ssid " QDF_SSID_FMT " Ch freq %d",
+			 QDF_SSID_REF(pe_session->ssId.length,
+				      pe_session->ssId.ssId),
+			 pe_session->curr_op_freq);
 		lim_send_beacon(mac, pe_session);
 		lim_enable_obss_detection_config(mac, pe_session);
 		lim_send_obss_color_collision_cfg(mac, pe_session,

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

@@ -152,12 +152,13 @@ lim_collect_bss_description(struct mac_context *mac,
 	pBssDescr->tsf_delta = WMA_GET_RX_TSF_DELTA(pRxPacketInfo);
 	pBssDescr->seq_ctrl = pHdr->seqControl;
 
-	pe_debug("Received %s from BSSID: "QDF_MAC_ADDR_FMT" tsf_delta = %u Seq Num: %x ssid:%.*s, rssi: %d",
+	pe_debug("Received %s from BSSID: " QDF_MAC_ADDR_FMT " tsf_delta = %u Seq Num: %x ssid:" QDF_SSID_FMT ", rssi: %d",
 		 pBssDescr->fProbeRsp ? "Probe Rsp" : "Beacon",
 		 QDF_MAC_ADDR_REF(pHdr->bssId),
 		 pBssDescr->tsf_delta, ((pHdr->seqControl.seqNumHi <<
 		 HIGH_SEQ_NUM_OFFSET) | pHdr->seqControl.seqNumLo),
-		 pBPR->ssId.length, pBPR->ssId.ssId, pBssDescr->rssi_raw);
+		 QDF_SSID_REF(pBPR->ssId.length, pBPR->ssId.ssId),
+		 pBssDescr->rssi_raw);
 
 	if (fScanning) {
 		rrm_get_start_tsf(mac, pBssDescr->startTSF);

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

@@ -4613,11 +4613,11 @@ void lim_diag_mgmt_tx_event_report(struct mac_context *mac_ctx, void *mgmt_hdr,
 	lim_diag_fill_mgmt_event_report(mac_ctx, mac_hdr, session,
 					result_code, reason_code, &mgmt_event);
 
-	pe_debug("TX frame: type:%d sub_type:%d seq_num:%d ssid:%.*s selfmacaddr:"QDF_MAC_ADDR_FMT" bssid:"QDF_MAC_ADDR_FMT" channel:%d",
+	pe_debug("TX frame: type:%d sub_type:%d seq_num:%d ssid:" QDF_SSID_FMT " selfmacaddr:" QDF_MAC_ADDR_FMT " bssid:" QDF_MAC_ADDR_FMT " channel:%d",
 		 mgmt_event.mgmt_type, mgmt_event.mgmt_subtype,
 		 ((mac_hdr->seqControl.seqNumHi << 4) |
 				mac_hdr->seqControl.seqNumLo),
-		 mgmt_event.ssid_len, mgmt_event.ssid,
+		 QDF_SSID_REF(mgmt_event.ssid_len, mgmt_event.ssid),
 		 QDF_MAC_ADDR_REF(mgmt_event.self_mac_addr),
 		 QDF_MAC_ADDR_REF(mgmt_event.bssid),
 		 mgmt_event.operating_channel);
@@ -4638,11 +4638,11 @@ void lim_diag_mgmt_rx_event_report(struct mac_context *mac_ctx, void *mgmt_hdr,
 	}
 	lim_diag_fill_mgmt_event_report(mac_ctx, mac_hdr, session,
 					result_code, reason_code, &mgmt_event);
-	pe_debug("RX frame: type:%d sub_type:%d seq_num:%d ssid:%.*s selfmacaddr:"QDF_MAC_ADDR_FMT" bssid:"QDF_MAC_ADDR_FMT" channel:%d",
+	pe_debug("RX frame: type:%d sub_type:%d seq_num:%d ssid:" QDF_SSID_FMT " selfmacaddr:" QDF_MAC_ADDR_FMT " bssid:" QDF_MAC_ADDR_FMT " channel:%d",
 		 mgmt_event.mgmt_type, mgmt_event.mgmt_subtype,
 		 ((mac_hdr->seqControl.seqNumHi << 4) |
 				mac_hdr->seqControl.seqNumLo),
-		 mgmt_event.ssid_len, mgmt_event.ssid,
+		 QDF_SSID_REF(mgmt_event.ssid_len, mgmt_event.ssid),
 		 QDF_MAC_ADDR_REF(mgmt_event.self_mac_addr),
 		 QDF_MAC_ADDR_REF(mgmt_event.bssid),
 		 mgmt_event.operating_channel);

core/mac/src/pe/rrm/rrm_api.c

@@ -626,11 +626,13 @@ rrm_process_beacon_report_req(struct mac_context *mac,
 
 	measDuration = pBeaconReq->measurement_request.Beacon.meas_duration;
 
-	pe_nofl_info("RX: [802.11 BCN_RPT] seq:%d SSID:%.*s BSSID:"QDF_MAC_ADDR_FMT" Token:%d op_class:%d ch:%d meas_mode:%d meas_duration:%d max_dur: %d sign: %d max_meas_dur: %d",
+	pe_nofl_info("RX: [802.11 BCN_RPT] seq:%d SSID:" QDF_SSID_FMT " BSSID:" QDF_MAC_ADDR_FMT " Token:%d op_class:%d ch:%d meas_mode:%d meas_duration:%d max_dur: %d sign: %d max_meas_dur: %d",
 		     mac->rrm.rrmPEContext.prev_rrm_report_seq_num,
-		     pBeaconReq->measurement_request.Beacon.SSID.num_ssid,
-		     pBeaconReq->measurement_request.Beacon.SSID.ssid,
-		     QDF_MAC_ADDR_REF(pBeaconReq->measurement_request.Beacon.BSSID),
+		     QDF_SSID_REF(
+			pBeaconReq->measurement_request.Beacon.SSID.num_ssid,
+			pBeaconReq->measurement_request.Beacon.SSID.ssid),
+		     QDF_MAC_ADDR_REF(
+			pBeaconReq->measurement_request.Beacon.BSSID),
 		     pBeaconReq->measurement_token,
 		     pBeaconReq->measurement_request.Beacon.regClass,
 		     pBeaconReq->measurement_request.Beacon.channel,

os_if/son/src/os_if_son.c

@@ -475,7 +475,9 @@ int os_if_son_get_ssid(struct wlan_objmgr_vdev *vdev,
 	}
 
 	ucfg_wlan_vdev_mgr_get_param_ssid(vdev, ssid, ssid_len);
-	osif_debug("vdev %d ssid %s", wlan_vdev_get_id(vdev), ssid);
+	osif_debug("vdev %d ssid " QDF_SSID_FMT,
+		   wlan_vdev_get_id(vdev),
+		   QDF_SSID_REF(*ssid_len, ssid));
 
 	return 0;
 }