Selaa lähdekoodia

qcacmn: 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: Ifad0ccd76bd1184a9b1d20f3d7fa4455df924843
CRs-Fixed: 3291826
Yu Wang 2 vuotta sitten
vanhempi
sitoutus
093c816d05

+ 5 - 5
os_if/linux/mlme/src/osif_cm_connect_rsp.c

@@ -1077,11 +1077,11 @@ QDF_STATUS osif_connect_handler(struct wlan_objmgr_vdev *vdev,
 	struct vdev_osif_priv *osif_priv  = wlan_vdev_get_ospriv(vdev);
 	QDF_STATUS status;
 
-	osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"%.*s\" is %s cm_id 0x%x cm_reason %d status_code %d is_reassoc %d send discon %d",
+	osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"" QDF_SSID_FMT "\" is %s cm_id 0x%x cm_reason %d status_code %d is_reassoc %d send discon %d",
 		       osif_priv->wdev->netdev->name, rsp->vdev_id,
 		       QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)),
 		       QDF_MAC_ADDR_REF(rsp->bssid.bytes),
-		       rsp->ssid.length, rsp->ssid.ssid,
+		       QDF_SSID_REF(rsp->ssid.length, rsp->ssid.ssid),
 		       rsp->connect_status ? "FAILURE" : "SUCCESS", rsp->cm_id,
 		       rsp->reason, rsp->status_code, rsp->is_reassoc,
 		       rsp->send_disconnect);
@@ -1135,12 +1135,12 @@ QDF_STATUS osif_failed_candidate_handler(struct wlan_objmgr_vdev *vdev,
 {
 	struct vdev_osif_priv *osif_priv  = wlan_vdev_get_ospriv(vdev);
 
-	osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"%.*s\" FAILED cm_id 0x%x cm_reason %d reason_code %d",
+	osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"" QDF_SSID_FMT "\" FAILED cm_id 0x%x cm_reason %d reason_code %d",
 		       osif_priv->wdev->netdev->name, rsp->vdev_id,
 		       QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)),
 		       QDF_MAC_ADDR_REF(rsp->bssid.bytes),
-		       rsp->ssid.length, rsp->ssid.ssid, rsp->cm_id,
-		       rsp->reason, rsp->status_code);
+		       QDF_SSID_REF(rsp->ssid.length, rsp->ssid.ssid),
+		       rsp->cm_id, rsp->reason, rsp->status_code);
 
 	/**
 	 * Do not unlink the BSS if it is an ML candidate. In case of ML,

+ 3 - 3
os_if/linux/mlme/src/osif_cm_req.c

@@ -408,11 +408,11 @@ osif_cm_dump_connect_req(struct net_device *dev, uint8_t vdev_id,
 	num_akm_suites = osif_cm_get_num_akm_suites(req);
 	akm_suites = osif_cm_get_akm_suites(req);
 
-	osif_nofl_debug("connect req for %s(vdevid-%d) freq %d SSID %.*s auth type %d WPA ver %d n_akm %d n_cipher %d grp_cipher %x mfp %d freq hint %d",
+	osif_nofl_debug("connect req for %s(vdevid-%d) freq %d SSID " QDF_SSID_FMT " auth type %d WPA ver %d n_akm %d n_cipher %d grp_cipher %x mfp %d freq hint %d",
 			dev->name, vdev_id,
 			req->channel ? req->channel->center_freq : 0,
-			(int)req->ssid_len, req->ssid, req->auth_type,
-			req->crypto.wpa_versions,
+			QDF_SSID_REF((int)req->ssid_len, req->ssid),
+			req->auth_type, req->crypto.wpa_versions,
 			num_akm_suites,
 			req->crypto.n_ciphers_pairwise,
 			req->crypto.cipher_group, req->mfp,

+ 13 - 9
os_if/linux/scan/src/wlan_cfg80211_scan.c

@@ -631,9 +631,10 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 		   req->band_rssi_pref.rssi);
 
 	for (i = 0; i < req->networks_cnt; i++)
-		osif_debug("[%d] ssid: %.*s, RSSI th %d bc NW type %u",
-			   i, req->networks_list[i].ssid.length,
-			   req->networks_list[i].ssid.ssid,
+		osif_debug("[%d] ssid: " QDF_SSID_FMT ", RSSI th %d bc NW type %u",
+			   i,
+			   QDF_SSID_REF(req->networks_list[i].ssid.length,
+					req->networks_list[i].ssid.ssid),
 			   req->networks_list[i].rssi_thresh,
 			   req->networks_list[i].bc_new_type);
 
@@ -2198,8 +2199,9 @@ QDF_STATUS  __wlan_cfg80211_unlink_bss_list(struct wiphy *wiphy,
 		osif_info("BSS "QDF_MAC_ADDR_FMT" not found",
 			  QDF_MAC_ADDR_REF(bssid));
 	} else {
-		osif_debug("unlink entry for ssid:%.*s and BSSID "QDF_MAC_ADDR_FMT,
-			   ssid_len, ssid, QDF_MAC_ADDR_REF(bssid));
+		osif_debug("unlink entry for ssid:" QDF_SSID_FMT " and BSSID " QDF_MAC_ADDR_FMT,
+			   QDF_SSID_REF(ssid_len, ssid),
+			   QDF_MAC_ADDR_REF(bssid));
 		cfg80211_unlink_bss(wiphy, bss);
 		wlan_cfg80211_put_bss(wiphy, bss);
 	}
@@ -2215,11 +2217,13 @@ QDF_STATUS  __wlan_cfg80211_unlink_bss_list(struct wiphy *wiphy,
 	 */
 	bss = wlan_cfg80211_get_bss(wiphy, NULL, bssid, NULL, 0);
 	if (!bss) {
-		osif_debug("Hidden bss not found for Ssid:%.*s BSSID: "QDF_MAC_ADDR_FMT" sid_len %d",
-			   ssid_len, ssid, QDF_MAC_ADDR_REF(bssid), ssid_len);
+		osif_debug("Hidden bss not found for ssid:" QDF_SSID_FMT " BSSID: " QDF_MAC_ADDR_FMT " sid_len %d",
+			   QDF_SSID_REF(ssid_len, ssid),
+			   QDF_MAC_ADDR_REF(bssid), ssid_len);
 	} else {
-		osif_debug("unlink entry for Hidden ssid:%.*s and BSSID "QDF_MAC_ADDR_FMT,
-			   ssid_len, ssid, QDF_MAC_ADDR_REF(bssid));
+		osif_debug("unlink entry for Hidden ssid:" QDF_SSID_FMT " and BSSID " QDF_MAC_ADDR_FMT,
+			   QDF_SSID_REF(ssid_len, ssid),
+			   QDF_MAC_ADDR_REF(bssid));
 
 		cfg80211_unlink_bss(wiphy, bss);
 		/* cfg80211_get_bss get bss with ref count so release it */

+ 3 - 3
umac/mlme/connection_mgr/core/src/wlan_cm_connect.c

@@ -2085,10 +2085,10 @@ cm_resume_connect_after_peer_create(struct cnx_mgr *cm_ctx, wlan_cm_id *cm_id)
 	}
 
 	wlan_reg_get_cc_and_src(psoc, country_code);
-	mlme_nofl_info(CM_PREFIX_FMT "Connecting to %.*s " QDF_MAC_ADDR_FMT " rssi: %d freq: %d akm 0x%x cipher: uc 0x%x mc 0x%x, wps %d osen %d force RSN %d CC: %c%c",
+	mlme_nofl_info(CM_PREFIX_FMT "Connecting to " QDF_SSID_FMT " " QDF_MAC_ADDR_FMT " rssi: %d freq: %d akm 0x%x cipher: uc 0x%x mc 0x%x, wps %d osen %d force RSN %d CC: %c%c",
 		       CM_PREFIX_REF(req.vdev_id, req.cm_id),
-		       cm_req->connect_req.req.ssid.length,
-		       cm_req->connect_req.req.ssid.ssid,
+		       QDF_SSID_REF(cm_req->connect_req.req.ssid.length,
+				    cm_req->connect_req.req.ssid.ssid),
 		       QDF_MAC_ADDR_REF(req.bss->entry->bssid.bytes),
 		       req.bss->entry->rssi_raw,
 		       req.bss->entry->channel.chan_freq,

+ 3 - 3
umac/mlme/connection_mgr/core/src/wlan_cm_connect_scan.c

@@ -115,10 +115,10 @@ static QDF_STATUS cm_fill_scan_req(struct cnx_mgr *cm_ctx,
 		     cm_req->req.ssid.length);
 
 	req->scan_req.ssid[0].length = cm_req->req.ssid.length;
-	mlme_debug(CM_PREFIX_FMT "Connect scan for %.*s",
+	mlme_debug(CM_PREFIX_FMT "Connect scan for " QDF_SSID_FMT,
 		   CM_PREFIX_REF(vdev_id, cm_req->cm_id),
-		   req->scan_req.ssid[0].length,
-		   req->scan_req.ssid[0].ssid);
+		   QDF_SSID_REF(req->scan_req.ssid[0].length,
+				req->scan_req.ssid[0].ssid));
 
 	req->scan_req.num_bssid = 1;
 	if (qdf_is_macaddr_zero(&cm_req->req.bssid))

+ 4 - 3
umac/mlme/connection_mgr/core/src/wlan_cm_host_roam.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -435,10 +436,10 @@ cm_resume_reassoc_after_peer_create(struct cnx_mgr *cm_ctx, wlan_cm_id *cm_id)
 	req->self_reassoc = cm_req->roam_req.req.self_reassoc;
 	req->bss = cm_req->roam_req.cur_candidate;
 
-	mlme_nofl_info(CM_PREFIX_FMT "Reassoc to %.*s " QDF_MAC_ADDR_FMT " rssi: %d freq: %d source %d",
+	mlme_nofl_info(CM_PREFIX_FMT "Reassoc to " QDF_SSID_FMT " " QDF_MAC_ADDR_FMT " rssi: %d freq: %d source %d",
 		       CM_PREFIX_REF(req->vdev_id, req->cm_id),
-		       req->bss->entry->ssid.length,
-		       req->bss->entry->ssid.ssid,
+		       QDF_SSID_REF(req->bss->entry->ssid.length,
+				    req->bss->entry->ssid.ssid),
 		       QDF_MAC_ADDR_REF(req->bss->entry->bssid.bytes),
 		       req->bss->entry->rssi_raw,
 		       req->bss->entry->channel.chan_freq,

+ 3 - 3
umac/mlme/connection_mgr/core/src/wlan_cm_roam_util.c

@@ -94,9 +94,9 @@ QDF_STATUS cm_check_and_prepare_roam_req(struct cnx_mgr *cm_ctx,
 	/* Reject re-assoc unless ssid matches. */
 	if (ssid.length != req->ssid.length ||
 	    qdf_mem_cmp(ssid.ssid, req->ssid.ssid, ssid.length)) {
-		mlme_debug("SSID didn't matched: self ssid: \"%.*s\", ssid in req: \"%.*s\"",
-			   ssid.length, ssid.ssid, req->ssid.length,
-			   req->ssid.ssid);
+		mlme_debug("SSID didn't matched: self ssid: \"" QDF_SSID_FMT "\", ssid in req: \"" QDF_SSID_FMT "\"",
+			   QDF_SSID_REF(ssid.length, ssid.ssid),
+			   QDF_SSID_REF(req->ssid.length, req->ssid.ssid));
 		return QDF_STATUS_E_FAILURE;
 	}
 

+ 3 - 2
umac/scan/core/src/wlan_scan_cache_db.c

@@ -929,11 +929,12 @@ static QDF_STATUS scm_add_update_entry(struct wlan_objmgr_psoc *psoc,
 					  &dup_node);
 
 	security_type = scan_params->security_type;
-	scm_nofl_debug("Received %s: "QDF_MAC_ADDR_FMT" \"%.*s\" freq %d rssi %d tsf_delta %u seq %d snr %d phy %d hidden %d mismatch %d %s%s%s%s pdev %d boot_time %llu ns",
+	scm_nofl_debug("Received %s: " QDF_MAC_ADDR_FMT " \"" QDF_SSID_FMT "\" freq %d rssi %d tsf_delta %u seq %d snr %d phy %d hidden %d mismatch %d %s%s%s%s pdev %d boot_time %llu ns",
 		       (scan_params->frm_subtype == MGMT_SUBTYPE_PROBE_RESP) ?
 		       "prb rsp" : "bcn",
 		       QDF_MAC_ADDR_REF(scan_params->bssid.bytes),
-		       scan_params->ssid.length, scan_params->ssid.ssid,
+		       QDF_SSID_REF(scan_params->ssid.length,
+				    scan_params->ssid.ssid),
 		       scan_params->channel.chan_freq, scan_params->rssi_raw,
 		       scan_params->tsf_delta, scan_params->seq_num,
 		       scan_params->snr, scan_params->phy_mode,

+ 3 - 2
umac/scan/core/src/wlan_scan_manager.c

@@ -1221,8 +1221,9 @@ static inline void scm_print_scan_req_info(struct scan_req_params *req)
 		       req->scan_priority);
 
 	for (idx = 0; idx < req->num_ssids; idx++)
-		scm_nofl_debug("SSID[%d]: %.*s", idx, req->ssid[idx].length,
-			       req->ssid[idx].ssid);
+		scm_nofl_debug("SSID[%d]: " QDF_SSID_FMT, idx,
+			       QDF_SSID_REF(req->ssid[idx].length,
+					    req->ssid[idx].ssid));
 
 	chan_lst  = &req->chan_list;
 

+ 3 - 2
umac/scan/dispatcher/src/wlan_scan_ucfg_api.c

@@ -548,8 +548,9 @@ ucfg_scan_config_hidden_ssid_for_bssid(struct wlan_objmgr_pdev *pdev,
 	if (!scan_obj)
 		return QDF_STATUS_E_FAILURE;
 
-	scm_debug("Configure bsssid:"QDF_MAC_ADDR_FMT" ssid:%.*s",
-		  QDF_MAC_ADDR_REF(bssid), ssid->length, ssid->ssid);
+	scm_debug("Configure bsssid:" QDF_MAC_ADDR_FMT " ssid:" QDF_SSID_FMT,
+		  QDF_MAC_ADDR_REF(bssid),
+		  QDF_SSID_REF(ssid->length, ssid->ssid));
 	qdf_mem_copy(scan_obj->pdev_info[pdev_id].conf_bssid,
 		     bssid, QDF_MAC_ADDR_SIZE);
 	scan_obj->pdev_info[pdev_id].conf_ssid.length = ssid->length;

+ 3 - 2
umac/scan/dispatcher/src/wlan_scan_utils_api.c

@@ -2849,8 +2849,9 @@ static uint32_t util_gen_new_ie(uint8_t *ie, uint32_t ielen,
 	/* new ssid */
 	tmp_new = util_scan_find_ie(WLAN_ELEMID_SSID, sub_copy, subie_len);
 	if (tmp_new) {
-		scm_debug(" SSID %.*s", tmp_new[1],
-			  &tmp_new[PAYLOAD_START_POS]);
+		scm_debug(" SSID " QDF_SSID_FMT,
+			  QDF_SSID_REF(tmp_new[1],
+				       &tmp_new[PAYLOAD_START_POS]));
 		if ((pos + tmp_new[1] + MIN_IE_LEN) <=
 		    (new_ie + ielen)) {
 			qdf_mem_copy(pos, tmp_new,

+ 5 - 4
wmi/src/wmi_unified_extscan_tlv.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -214,10 +215,10 @@ static QDF_STATUS send_set_epno_network_list_cmd_tlv(wmi_unified_t wmi_handle,
 			qdf_mem_copy(nlo_list[i].ssid.ssid.ssid,
 				     req->networks[i].ssid.ssid,
 				     nlo_list[i].ssid.ssid.ssid_len);
-			wmi_debug("index: %d ssid: %.*s len: %d", i,
-				 nlo_list[i].ssid.ssid.ssid_len,
-				 (char *) nlo_list[i].ssid.ssid.ssid,
-				 nlo_list[i].ssid.ssid.ssid_len);
+			wmi_debug("index: %d ssid: " QDF_SSID_FMT " len: %d", i,
+				  QDF_SSID_REF(nlo_list[i].ssid.ssid.ssid_len,
+					       nlo_list[i].ssid.ssid.ssid),
+				  nlo_list[i].ssid.ssid.ssid_len);
 
 			/* Copy pno flags */
 			nlo_list[i].bcast_nw_type.valid = true;