FAPI: Fix Fapi_Quote errors.

* Invalid free was executed when the event list is empty. * QuoteInfo was not freed in error cases. * Initialization of certificate was moved to last state of state machine. Signed-off-by: Juergen Repp <[email protected]>
JuergenReppSIT · Jan 25, 2024 · 6b0b1dd · 6b0b1dd
1 parent 84ead1b
commit 6b0b1dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/tss2-fapi/api/Fapi_Quote.c b/src/tss2-fapi/api/Fapi_Quote.c
@@ -425,11 +425,6 @@ Fapi_Quote_Finish(
                                          quoteInfo);
             goto_if_error(r, "Create compute quote info.", error_cleanup);
 
-            /* Return the key's certificate if requested. */
-            if (certificate) {
-                strdup_check(*certificate, sig_key_object->misc.key.certificate, r, error_cleanup);
-            }
-
             /* If the pcrLog was not requested, the operation is done. */
             if (!pcrLog) {
                 context->state = PCR_QUOTE_CLEANUP;
@@ -458,6 +453,11 @@ Fapi_Quote_Finish(
             r = ifapi_cleanup_session(context);
             try_again_or_error_goto(r, "Cleanup", error_cleanup);
 
+            /* Return the key's certificate if requested. */
+            if (certificate) {
+                strdup_check(*certificate, sig_key_object->misc.key.certificate, r, error_cleanup);
+            }
+
             if (pcrLog)
                 *pcrLog = command->pcrLog;
             *signature = command->signature;
@@ -474,6 +474,7 @@ Fapi_Quote_Finish(
     SAFE_FREE(command->keyPath);
     SAFE_FREE(command->pcrList);
     if (r) {
+        SAFE_FREE(command->quoteInfo);
         SAFE_FREE(command->pcrLog);
         SAFE_FREE(command->signature);
     }

diff --git a/src/tss2-fapi/ifapi_helpers.c b/src/tss2-fapi/ifapi_helpers.c
@@ -2233,7 +2233,7 @@ ifapi_calculate_pcrs(
                 }
             }
         }
-        if (i_evt == n_events && quote_digest) {
+        if (n_events > 0 && i_evt == n_events && quote_digest) {
             /* Quote digest was not found. */
             r = TSS2_FAPI_RC_SIGNATURE_VERIFICATION_FAILED;
         }
@@ -2242,7 +2242,9 @@ ifapi_calculate_pcrs(
 error_cleanup:
     if (cryptoContext)
         ifapi_crypto_hash_abort(&cryptoContext);
-    ifapi_cleanup_event(&event);
+    if (n_events > 0) {
+        ifapi_cleanup_event(&event);
+    }
     return r;
 }