commit d40c2b65a6978329b6608e0445fe489e4799c513
author Andrzej Kurek <andrzej.kurek@arm.com> Mon Feb 13 07:01:59 2023 -0500
committer Andrzej Kurek <andrzej.kurek@arm.com> Wed Mar 29 11:03:01 2023 -0400
tree 44601dd1072597c5e6fff852c4dbe2463ad2cd9d
parent 4a4f1ec8e9625ffb01b7de2351e0e0b6d819d840

Introduce proper memory management for SANs

DirectoryName parsing performs allocation that has to be handled.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

library/x509.c

diff --git a/library/x509.c b/library/x509.c
index da772b8..f8695d4 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -1283,6 +1283,7 @@
             return ret;
         }
 
+        mbedtls_x509_free_subject_alt_name(&dummy_san_buf);
         /* Allocate and assign next pointer */
         if (cur->buf.p != NULL) {
             if (cur->next != NULL) {
@@ -1467,6 +1468,13 @@
     return 0;
 }
 
+void mbedtls_x509_free_subject_alt_name(mbedtls_x509_subject_alternative_name *san)
+{
+    if (san->type == MBEDTLS_X509_SAN_DIRECTORY_NAME) {
+        mbedtls_asn1_free_named_data_list_shallow(san->san.directory_name.next);
+    }
+}
+
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
 int mbedtls_x509_info_subject_alt_name(char **buf, size_t *size,
                                        const mbedtls_x509_sequence
@@ -1586,6 +1594,7 @@
                 ret = mbedtls_snprintf(p, n, "\n%s    directoryName : ", prefix);
                 MBEDTLS_X509_SAFE_SNPRINTF;
                 ret = mbedtls_x509_dn_gets(p, n, &san.san.directory_name);
+
                 if (ret < 0) {
                     return ret;
                 }
@@ -1603,6 +1612,9 @@
                 break;
         }
 
+        /* So far memory is freed only in the case of directoryName
+         * parsing succeeding, as mbedtls_x509_dn_gets allocates memory. */
+        mbedtls_x509_free_subject_alt_name(&san);
         cur = cur->next;
     }