commit e75c6c506d4bdf6a83907a89264ffc6446ee68c8
author Mate Toth-Pal <mate.toth-pal@arm.com> Tue Jun 24 10:41:45 2025 +0200
committer Soby Mathew <soby.mathew@arm.com> Fri Jun 27 15:14:49 2025 +0100
tree 9538c30c34831c35af4ddcfe62aeab9b166909ae
parent ecb521827d1ae96133b9feacc1a601100d6c5d8e

chore(app/device_assignment): only free mbed TLS crypto ctx if inited

Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
Change-Id: I840e26dfca9acd97e5a10cbe8553c9daa229ce96

app/device_assignment/el0_app/src/dev_assign_el0_app.c

diff --git a/app/device_assignment/el0_app/src/dev_assign_el0_app.c b/app/device_assignment/el0_app/src/dev_assign_el0_app.c
index ef44b68..5a26820 100644
--- a/app/device_assignment/el0_app/src/dev_assign_el0_app.c
+++ b/app/device_assignment/el0_app/src/dev_assign_el0_app.c
@@ -421,11 +421,15 @@
 	libspdm_data_parameter_t parameter;
 	void *data_ptr;
 
-	if ((info->key_sig_algo == RMI_SIGNATURE_ALGORITHM_ECDSA_P256) ||
-	    (info->key_sig_algo == RMI_SIGNATURE_ALGORITHM_ECDSA_P384)) {
-		mbedtls_ecdh_free(&info->pk_ctx.ecdh);
-	} else {
-		mbedtls_rsa_free(&info->pk_ctx.rsa);
+	if (info->pk_ctx.initialised) {
+		if ((info->key_sig_algo == RMI_SIGNATURE_ALGORITHM_ECDSA_P256) ||
+		    (info->key_sig_algo == RMI_SIGNATURE_ALGORITHM_ECDSA_P384)) {
+			mbedtls_ecdh_free(&info->pk_ctx.ecdh);
+		} else {
+			assert(info->key_sig_algo == RMI_SIGNATURE_ALGORITHM_RSASSA_3072);
+			mbedtls_rsa_free(&info->pk_ctx.rsa);
+		}
+		info->pk_ctx.initialised = false;
 	}
 
 	/* Set LIBSPDM_DATA_PEER_USED_CERT_CHAIN_PUBLIC_KEY in spdm connection */
@@ -529,6 +533,7 @@
 	}
 
 	info->key_sig_algo = (uint32_t)key_sig_algo;
+	info->pk_ctx.initialised = true;
 
 	/* Set LIBSPDM_DATA_PEER_USED_CERT_CHAIN_PUBLIC_KEY in spdm connection */
 	(void)memset(&parameter, 0, sizeof(parameter));
@@ -692,6 +697,7 @@
 		info->ide_sid = params->ide_sid;
 	}
 	info->spdm_cert_chain_digest_length = 0;
+	info->pk_ctx.initialised = false;
 
 	info->psa_hash_algo = rmi_to_psa_hash_algo(params->rmi_hash_algo);
 

app/device_assignment/el0_app/src/dev_assign_private.h

diff --git a/app/device_assignment/el0_app/src/dev_assign_private.h b/app/device_assignment/el0_app/src/dev_assign_private.h
index 93c0dd0..4afbcb5 100644
--- a/app/device_assignment/el0_app/src/dev_assign_private.h
+++ b/app/device_assignment/el0_app/src/dev_assign_private.h
@@ -249,9 +249,12 @@
 
 	/* Public key context */
 	uint32_t key_sig_algo;
-	union {
-		mbedtls_ecdh_context ecdh;
-		mbedtls_rsa_context rsa;
+	struct {
+		union{
+			mbedtls_ecdh_context ecdh;
+			mbedtls_rsa_context rsa;
+		};
+		bool initialised;
 	} pk_ctx;
 
 	/* Exit and Entry args for dev_communicate cmds */