commit 5d2e82f0cecf85b347a7d170e55597c58226118c
author Ryan Everett <ryan.everett@arm.com> Wed Feb 07 17:24:59 2024 +0000
committer Ryan Everett <ryan.everett@arm.com> Wed Feb 07 17:32:16 2024 +0000
tree 3799ea472c53d4d6d48179fbeca37a7d67ed4a93
parent b41c3c958280ac790aba465ec4aa15adb7745faa

Guard memcpy so that it won't fail on null input pointer

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 e8ec3f2..5ad9f23 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -6864,12 +6864,12 @@
 {
     psa_status_t status = PSA_SUCCESS;
     if (input_len > PSA_HASH_BLOCK_LENGTH(hash_alg)) {
-        status = psa_hash_compute(hash_alg, input, input_len, output,
-                                  PSA_HMAC_MAX_HASH_BLOCK_SIZE, output_len);
-    } else {
+        return psa_hash_compute(hash_alg, input, input_len, output,
+                                PSA_HMAC_MAX_HASH_BLOCK_SIZE, output_len);
+    } else if (input_len > 0) {
         memcpy(output, input, input_len);
-        *output_len = PSA_HASH_BLOCK_LENGTH(hash_alg);
     }
+    *output_len = PSA_HASH_BLOCK_LENGTH(hash_alg);
     return status;
 }
 #endif /* MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC */