FAPI: Fix session cleanup.

The session cleanup in error cases tried to flush a password session. Fixes: tpm2-software#2735 Signed-off-by: Juergen Repp <[email protected]>
JuergenReppSIT · Dec 22, 2023 · 69442c2 · 69442c2
1 parent 166a553
commit 69442c2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/tss2-fapi/fapi_util.c b/src/tss2-fapi/fapi_util.c
@@ -1204,7 +1204,7 @@ ifapi_session_clean(FAPI_CONTEXT *context)
     if (context->policy_session && context->policy_session != ESYS_TR_NONE) {
         Esys_FlushContext(context->esys, context->policy_session);
     }
-    if (context->session1 != ESYS_TR_NONE) {
+    if (context->session1 != ESYS_TR_NONE && context->session1 != ESYS_TR_PASSWORD) {
         if (context->session1 == context->session2) {
             context->session2 = ESYS_TR_NONE;
         }
@@ -1213,7 +1213,7 @@ ifapi_session_clean(FAPI_CONTEXT *context)
         }
         context->session1 = ESYS_TR_NONE;
     }
-    if (context->session2 != ESYS_TR_NONE) {
+    if (context->session2 != ESYS_TR_NONE && context->policy_session != ESYS_TR_NONE) {
         if (Esys_FlushContext(context->esys, context->session2) != TSS2_RC_SUCCESS) {
             LOG_ERROR("Cleanup session failed.");
             context->session2 = ESYS_TR_NONE;