commit 980c48aadaf6755c9d260a62a0b05b806d181ef6
author Gabriel Biren <gbiren@google.com> Mon Mar 27 21:49:21 2023 +0000
committer Gabriel Biren <gbiren@google.com> Tue Mar 28 16:57:42 2023 +0000
tree 67337ac20b85e790a8487b55a32076f0b49db539
parent 92af4bd7d58b093570e176080d3c7a25cc784477

Add log messages to the certificate callback path.

Logs are meant to test 2 theories regarding the
SIGSEGV in the attached bug:

 1. Failure is happening somewhere in the middle
    of the call path from tls_openssl to AIDL.
 2. sm struct becomes stale before the callback is
    used.

Bug: 275293332
Test: Connect to WPA-Enterprise network and verify logs.
Change-Id: I7b654d2a63f7f453f05b586f84c42702ac899d1e

src/crypto/tls_openssl.c

diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 29f0d18..edb3f0c 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -172,6 +172,7 @@
 	BIO *bio = NULL;
 	uint8_t *value = NULL;
 	if (tls_global != NULL && certificate_callback_global != NULL) {
+		wpa_printf(MSG_INFO, "Retrieving certificate using callback");
 		int length = (*certificate_callback_global)(tls_global->cb_ctx, alias, &value);
 		if (length != -1 && (bio = BIO_new(BIO_s_mem())) != NULL)
 			BIO_write(bio, value, length);

src/eap_peer/eap.c

diff --git a/src/eap_peer/eap.c b/src/eap_peer/eap.c
index ce44a4f..8338c47 100644
--- a/src/eap_peer/eap.c
+++ b/src/eap_peer/eap.c
@@ -2200,6 +2200,7 @@
 ssize_t tls_certificate_callback(void* ctx, const char* alias, uint8_t** value) {
 	if (alias == NULL || ctx == NULL || value == NULL) return -1;
 	struct eap_sm *sm = (struct eap_sm*) ctx;
+	wpa_printf(MSG_INFO, "tls_certificate_callback: received sm=%p", (void*)sm);
 	if (sm->eapol_cb && sm->eapol_cb->get_certificate) {
 		return sm->eapol_cb->get_certificate(sm->eapol_ctx, alias, value);
 	}
@@ -2228,6 +2229,7 @@
 	struct tls_config tlsconf;
 
 	sm = os_zalloc(sizeof(*sm));
+	wpa_printf(MSG_INFO, "Init sm=%p", (void*)sm);
 	if (sm == NULL)
 		return NULL;
 	sm->eapol_ctx = eapol_ctx;
@@ -2277,6 +2279,7 @@
  */
 void eap_peer_sm_deinit(struct eap_sm *sm)
 {
+	wpa_printf(MSG_INFO, "Deinit sm=%p", (void*)sm);
 	if (sm == NULL)
 		return;
 	eap_deinit_prev_method(sm, "EAP deinit");

src/eapol_supp/eapol_supp_sm.c

diff --git a/src/eapol_supp/eapol_supp_sm.c b/src/eapol_supp/eapol_supp_sm.c
index a8ac6fd..334ce6c 100644
--- a/src/eapol_supp/eapol_supp_sm.c
+++ b/src/eapol_supp/eapol_supp_sm.c
@@ -2116,6 +2116,7 @@
 eapol_sm_get_certificate(void *ctx, const char* alias, uint8_t** value)
 {
 	struct eapol_sm *sm = ctx;
+	wpa_printf(MSG_INFO, "eapol_sm_get_certificate");
 
 	if (sm->ctx->get_certificate_cb) {
 		return sm->ctx->get_certificate_cb(alias, value);