51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
|
From 80d8aa8e3d15fd01eacb40200b80a83ed940c207 Mon Sep 17 00:00:00 2001
|
||
|
|
From: JerryDevis <857869045@qq.com>
|
||
|
|
Date: Sun, 9 Jan 2022 16:31:09 +0800
|
||
|
|
Subject: [PATCH 16/23] FAPI: Clean up memory when Fapi_Delete_Async failed
|
||
|
|
|
||
|
|
Signed-off-by: JerryDevis <857869045@qq.com>
|
||
|
|
---
|
||
|
|
src/tss2-fapi/api/Fapi_Delete.c | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/tss2-fapi/api/Fapi_Delete.c b/src/tss2-fapi/api/Fapi_Delete.c
|
||
|
|
index 43ea0332..2b5826ab 100644
|
||
|
|
--- a/src/tss2-fapi/api/Fapi_Delete.c
|
||
|
|
+++ b/src/tss2-fapi/api/Fapi_Delete.c
|
||
|
|
@@ -419,14 +419,14 @@ Fapi_Delete_Async(
|
||
|
|
/* No session will be needed these files can be deleted without
|
||
|
|
interaction with the TPM */
|
||
|
|
r = ifapi_non_tpm_mode_init(context);
|
||
|
|
- return_if_error(r, "Initialize Entity_Delete");
|
||
|
|
+ goto_if_error(r, "Initialize Entity_Delete", error_cleanup);
|
||
|
|
context->session1 = ESYS_TR_NONE;
|
||
|
|
|
||
|
|
context->state = ENTITY_DELETE_GET_FILE;
|
||
|
|
} else {
|
||
|
|
/* Check whether TCTI and ESYS are initialized */
|
||
|
|
- return_if_null(context->esys, "Command can't be executed in none TPM mode.",
|
||
|
|
- TSS2_FAPI_RC_NO_TPM);
|
||
|
|
+ goto_if_null(context->esys, "Command can't be executed in none TPM mode.",
|
||
|
|
+ TSS2_FAPI_RC_NO_TPM, error_cleanup);
|
||
|
|
|
||
|
|
/* If the async state automata of FAPI shall be tested, then we must not set
|
||
|
|
the timeouts of ESYS to blocking mode.
|
||
|
|
@@ -435,12 +435,12 @@ Fapi_Delete_Async(
|
||
|
|
to block until a result is available. */
|
||
|
|
#ifndef TEST_FAPI_ASYNC
|
||
|
|
r = Esys_SetTimeout(context->esys, TSS2_TCTI_TIMEOUT_BLOCK);
|
||
|
|
- return_if_error_reset_state(r, "Set Timeout to blocking");
|
||
|
|
+ goto_if_error_reset_state(r, "Set Timeout to blocking", error_cleanup);
|
||
|
|
#endif /* TEST_FAPI_ASYNC */
|
||
|
|
|
||
|
|
/* A TPM session will be created to enable object authorization */
|
||
|
|
r = ifapi_session_init(context);
|
||
|
|
- return_if_error(r, "Initialize Entity_Delete");
|
||
|
|
+ goto_if_error(r, "Initialize Entity_Delete", error_cleanup);
|
||
|
|
|
||
|
|
r = ifapi_get_sessions_async(context,
|
||
|
|
IFAPI_SESSION_GENEK | IFAPI_SESSION1,
|
||
|
|
--
|
||
|
|
2.34.3
|
||
|
|
|