diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/config.c b/wpa_supplicant-2.9_standard/wpa_supplicant/config.c
index d500cf31d6335d9f914bc20fa639be37c7364ed1..2f8e4eddcadda50bcb0994ffcedf6a31f75c0426 100644
--- a/wpa_supplicant-2.9_standard/wpa_supplicant/config.c
+++ b/wpa_supplicant-2.9_standard/wpa_supplicant/config.c
@@ -668,8 +668,10 @@ static int wpa_config_parse_psk(const struct parse_data *data,
 		ssid->psk_set = 0;
 		str_clear_free(ssid->passphrase);
 		ssid->passphrase = dup_binstr(value1, len);
-		if (ssid->passphrase == NULL)
+		if (ssid->passphrase == NULL) {
+			wpa_printf(MSG_ERROR, "ssid passphrase is NULL");
 			return -1;
+		}
 		return 0;
 #else /* CONFIG_NO_PBKDF2 */
 		wpa_printf(MSG_ERROR, "Line %d: ASCII passphrase not "
@@ -3510,8 +3512,10 @@ int wpa_config_set(struct wpa_ssid *ssid, const char *var, const char *value,
 	size_t i;
 	int ret = 0;
 
-	if (ssid == NULL || var == NULL || value == NULL)
+	if (ssid == NULL || var == NULL || value == NULL) {
+		wpa_printf(MSG_ERROR, "wpa config set param is NULL");
 		return -1;
+	}
 
 	for (i = 0; i < NUM_SSID_FIELDS; i++) {
 		const struct parse_data *field = &ssid_fields[i];
@@ -3532,6 +3536,7 @@ int wpa_config_set(struct wpa_ssid *ssid, const char *var, const char *value,
 				wpa_printf(MSG_ERROR, "Line %d: failed to "
 					   "parse %s '%s'.", line, var, value);
 			}
+			wpa_printf(MSG_ERROR, "wpa config set parse failed");
 			ret = -1;
 		}
 #ifdef CONFIG_SAE
@@ -3556,6 +3561,7 @@ int wpa_config_set(struct wpa_ssid *ssid, const char *var, const char *value,
 			wpa_printf(MSG_ERROR, "Line %d: unknown network field "
 				   "'%s'.", line, var);
 		}
+		wpa_printf(MSG_ERROR, "wpa config set unknown network field");
 		ret = -1;
 	}
 	ssid->was_recently_reconfigured = true;
diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c
index 64818ae3d7cd2f63123b3c56de168742d282bd0f..b95ad9c496b800818942a452c008b24664f98724 100644
--- a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c
@@ -4089,14 +4089,14 @@ int wpa_supplicant_ctrl_iface_set_network(
 #endif /* CONFIG_WIFI_RPT */
 #ifdef CONFIG_EAP_AUTH
 	if (wpa_supplicant_ctrl_iface_get_eap_params(name, value))
-		wpa_printf(MSG_DEBUG, "get eap params success");
+		wpa_printf(MSG_INFO, "get eap params success");
 #endif
 	wpa_hexdump_ascii_key(MSG_DEBUG, "CTRL_IFACE: value",
 			      (u8 *) value, os_strlen(value));
 
 	ssid = wpa_config_get_network(wpa_s->conf, id);
 	if (ssid == NULL) {
-		wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find network "
+		wpa_printf(MSG_ERROR, "CTRL_IFACE: Could not find network "
 			   "id=%d", id);
 		return -1;
 	}
@@ -11327,7 +11327,7 @@ static int wpas_ctrl_iface_mac_rand_scan(struct wpa_supplicant *wpa_s,
 			if (hwaddr_aton(token + 5, addr)) {
 				wpa_printf(MSG_INFO,
 					   "CTRL: Invalid MAC address: %s",
-					   token);
+					   anonymize_common(token));
 				return -1;
 			}
 		} else if (os_strncasecmp(token, "mask=", 5) == 0) {
@@ -14656,6 +14656,7 @@ static char * wpas_global_ctrl_iface_ifname(struct wpa_global *global,
 	}
 
 	if (wpa_s == NULL) {
+		wpa_printf(MSG_ERROR, "wpas global ctrl iface ifname param is NULL");
 		char *resp = os_strdup("FAIL-NO-IFNAME-MATCH\n");
 		if (resp)
 			*resp_len = os_strlen(resp);
diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c
index 766fceb7e449a301a7ea2e7c06739a03b1a2b9bc..52f035ee4f8f9c3d310ca19491eb043e90c55691 100644
--- a/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c
@@ -3035,7 +3035,7 @@ static void wpas_dev_found(void *ctx, const u8 *addr,
 		MAC2STR_SEC(addr), MAC2STR_SEC(info->p2p_device_addr),
 		wps_dev_type_bin2str(info->pri_dev_type, devtype,
 		sizeof(devtype)),
-		info->device_name, info->config_methods,
+		anonymize_common(info->device_name), info->config_methods,
 		info->dev_capab, info->group_capab,
 		wfd_dev_info_hex ? " wfd_dev_info=0x" : "",
 		wfd_dev_info_hex ? wfd_dev_info_hex : "",
diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant_lib/wpa_evp_key.c b/wpa_supplicant-2.9_standard/wpa_supplicant_lib/wpa_evp_key.c
index 740f98f51a3ca4244905d4e9822c70916ad3c690..4ec9c60889e3aee398314788b34b6e957394165e 100644
--- a/wpa_supplicant-2.9_standard/wpa_supplicant_lib/wpa_evp_key.c
+++ b/wpa_supplicant-2.9_standard/wpa_supplicant_lib/wpa_evp_key.c
@@ -278,8 +278,8 @@ BIO *BIO_from_cm(const char *key_id, struct Credential certificate)
     certificate.credData.size = MAX_LEN_CERTIFICATE_CHAIN;
     int ret = CmGetAppCert(&keyUri, store, &certificate);
     if (ret != 0) {
-        wpa_printf(MSG_ERROR, "%s key:%s, size:%u, ret:%d", __func__,
-            key_id, certificate.credData.size, ret);
+        wpa_printf(MSG_ERROR, "%s size:%u, ret:%d", __func__,
+            certificate.credData.size, ret);
         return bio;
     }