commit 8c9efa78922916d90ecdacc7370e2369e84a93b4
author Summer Qin <summer.qin@arm.com> Fri Jul 09 17:28:09 2021 +0800
committer Ken Liu <ken.liu@arm.com> Wed Jul 21 09:25:42 2021 +0200
tree 9335f5bf7bad1ab4c3fc3ae10316c46a603b06c3
parent b9492d295c10a1ccabdaccad773c334631328273

Crypto: Fix handle_owner allocation issue

Source key and target key should be allocated in different
handle_owner slot.

Change-Id: Ia3052c24fb0dd4489bb2a12ac4611bc9f4a597b1
Signed-off-by: Summer Qin <summer.qin@arm.com>

secure_fw/partitions/crypto/crypto_key.c

diff --git a/secure_fw/partitions/crypto/crypto_key.c b/secure_fw/partitions/crypto/crypto_key.c
index ec9bf0f..0d95ac6 100644
--- a/secure_fw/partitions/crypto/crypto_key.c
+++ b/secure_fw/partitions/crypto/crypto_key.c
@@ -687,12 +687,12 @@
     const struct psa_client_key_attributes_s *client_key_attr = in_vec[1].base;
     psa_status_t status;
     psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT;
-    uint8_t i = 0;
+    uint8_t source_idx = 0, target_idx = 0;
     int32_t partition_id = 0;
     mbedtls_svc_key_id_t target_key;
     mbedtls_svc_key_id_t encoded_key;
 
-    status = find_empty_handle_owner_slot(&i);
+    status = find_empty_handle_owner_slot(&target_idx);
     if (status != PSA_SUCCESS) {
         return status;
     }
@@ -709,12 +709,12 @@
         return status;
     }
 
-    status = check_handle_owner(source_key_id, NULL);
+    status = check_handle_owner(source_key_id, &source_idx);
     if (status != PSA_SUCCESS) {
         return status;
     }
 
-    encoded_key_id_make(source_key_id, i, &encoded_key);
+    encoded_key_id_make(source_key_id, source_idx, &encoded_key);
 
     status = psa_copy_key(encoded_key, &key_attributes, &target_key);
 #ifdef CRYPTO_KEY_ID_ENCODES_OWNER
@@ -723,7 +723,7 @@
     *target_key_id = (psa_key_id_t)target_key;
 #endif
     if (status == PSA_SUCCESS) {
-        set_handle_owner(i, partition_id, *target_key_id);
+        set_handle_owner(target_idx, partition_id, *target_key_id);
     }
 
     return status;