commit e3e760cddbc56cdc0e05644780a0570033a3da2e
author Ryan Everett <ryan.everett@arm.com> Fri Jan 19 16:03:50 2024 +0000
committer Ryan Everett <ryan.everett@arm.com> Fri Feb 02 10:50:51 2024 +0000
tree 2d66c2c318e38deaa1b60cd3a63a40d7e2fa1fb4
parent 6b9702546653083100049bb97f81ae67898d1ce5

Protect buffer in psa_export_key

Signed-off-by: Ryan Everett <ryan.everett@arm.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 2b09d8f..9690d53 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1483,14 +1483,14 @@
 }
 
 psa_status_t psa_export_key(mbedtls_svc_key_id_t key,
-                            uint8_t *data,
+                            uint8_t *data_external,
                             size_t data_size,
                             size_t *data_length)
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
     psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
     psa_key_slot_t *slot;
-
+    LOCAL_OUTPUT_DECLARE(data_external, data);
     /* Reject a zero-length output buffer now, since this can never be a
      * valid key representation. This way we know that data must be a valid
      * pointer and we can do things like memset(data, ..., data_size). */
@@ -1514,6 +1514,8 @@
         return status;
     }
 
+    LOCAL_OUTPUT_ALLOC(data_external, data_size, data);
+
     psa_key_attributes_t attributes = {
         .core = slot->attr
     };
@@ -1521,8 +1523,10 @@
                                            slot->key.data, slot->key.bytes,
                                            data, data_size, data_length);
 
+exit:
     unlock_status = psa_unlock_key_slot(slot);
 
+    LOCAL_OUTPUT_FREE(data_external, data);
     return (status == PSA_SUCCESS) ? unlock_status : status;
 }