FAPI: Fix session cleanup.

JuergenReppSIT · JuergenReppSIT · commit 69442c2b6354 · 2023-12-22T18:05:08.000+01:00
The session cleanup in error cases tried to flush a password session. Fixes: #2735 Signed-off-by: Juergen Repp <juergen_repp@web.de>
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;

Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,7 @@ ifapi_session_clean(FAPI_CONTEXT *context)`
`1204`	`1204`	`if (context->policy_session && context->policy_session != ESYS_TR_NONE) {`
`1205`	`1205`	`Esys_FlushContext(context->esys, context->policy_session);`
`1206`	`1206`	`}`
`1207`		`- if (context->session1 != ESYS_TR_NONE) {`
	`1207`	`+ if (context->session1 != ESYS_TR_NONE && context->session1 != ESYS_TR_PASSWORD) {`
`1208`	`1208`	`if (context->session1 == context->session2) {`
`1209`	`1209`	`context->session2 = ESYS_TR_NONE;`
`1210`	`1210`	`}`
`@@ -1213,7 +1213,7 @@ ifapi_session_clean(FAPI_CONTEXT *context)`
`1213`	`1213`	`}`
`1214`	`1214`	`context->session1 = ESYS_TR_NONE;`
`1215`	`1215`	`}`
`1216`		`- if (context->session2 != ESYS_TR_NONE) {`
	`1216`	`+ if (context->session2 != ESYS_TR_NONE && context->policy_session != ESYS_TR_NONE) {`
`1217`	`1217`	`if (Esys_FlushContext(context->esys, context->session2) != TSS2_RC_SUCCESS) {`
`1218`	`1218`	`LOG_ERROR("Cleanup session failed.");`
`1219`	`1219`	`context->session2 = ESYS_TR_NONE;`