libtpms: fix reset handling

Signed-off-by: Johannes Holland <johannes.holland@infineon.de>
xcfxr · Jul 19, 2024 · b3fb6d9 · b3fb6d9
1 parent 8344491
commit b3fb6d9
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 26 deletions.
diff --git a/configure.ac b/configure.ac
@@ -287,6 +287,8 @@ AC_ARG_ENABLE([tcti-libtpms],
                                                     [enable_tcti_libtpms=no]
                                                     [AC_MSG_WARN([library libtpms missing])])])
 AM_CONDITIONAL([ENABLE_TCTI_LIBTPMS], [test "x$enable_tcti_libtpms" != xno])
+AS_IF([test "x$enable_tcti_libtpms" = "xyes"],
+	[AC_DEFINE([TCTI_LIBTPMS],[1], [TCTI FOR LIBTPMS BASED ACCESS TO TPM2 DEVICE])])
 
 AC_ARG_ENABLE([tcti-cmd],
             [AS_HELP_STRING([--disable-tcti-cmd],

diff --git a/src/tss2-tcti/tcti-libtpms.c b/src/tss2-tcti/tcti-libtpms.c
@@ -367,9 +367,38 @@ Tss2_Tcti_Libtpms_Reset(TSS2_TCTI_CONTEXT *tcti_ctx)
     int ret;
     TSS2_TCTI_LIBTPMS_CONTEXT *tcti_libtpms = tcti_libtpms_context_cast(tcti_ctx);
 
-    LIBTPMS_API_CALL(fail, tcti_libtpms, TPM_IO_TpmEstablished_Reset);
+    if (TSS2_TCTI_MAGIC(tcti_libtpms) != TCTI_LIBTPMS_MAGIC) {
+        return TSS2_TCTI_RC_BAD_CONTEXT;
+    }
+
+    /* Get NV (i.e. permanent state) */
+    unsigned char *permanent_state;
+    uint32_t permanent_state_len;
+    LIBTPMS_API_CALL(fail,
+                     tcti_libtpms,
+                     TPMLIB_GetState,
+                     TPMLIB_STATE_PERMANENT,
+                     &permanent_state,
+                     &permanent_state_len);
+
+    /* TPM power off */
+    tcti_libtpms->TPMLIB_Terminate();
+
+    /* Set NV to the same value, will be picked up by MainInit() */
+    LIBTPMS_API_CALL(cleanup,
+                     tcti_libtpms,
+                     TPMLIB_SetState,
+                     TPMLIB_STATE_PERMANENT,
+                     permanent_state,
+                     permanent_state_len);
+
+    /* Load state and power on */
+    LIBTPMS_API_CALL(cleanup, tcti_libtpms, TPMLIB_MainInit);
+
     rc = TSS2_RC_SUCCESS;
 
+cleanup:
+    free(permanent_state);
 fail:
     return rc;
 }

diff --git a/test/tpmclient/tpmclient.int.c b/test/tpmclient/tpmclient.int.c
@@ -24,10 +24,16 @@
 #include "util/tpm2b.h"                   // for TPM2B
 #ifdef TCTI_MSSIM
 #include "tss2_tcti_mssim.h"              // for tcti_platform_command, MS_S...
+#include "tss2-tcti/tcti-mssim.h"         // for TCTI_MSSIM_MAGIC
 #endif /* TCTI_MSSIM */
 #ifdef TCTI_SWTPM
 #include "tss2_tcti_swtpm.h"              // for Tss2_Tcti_Swtpm_Reset
+#include "tss2-tcti/tcti-swtpm.h"         // for TCTI_SWTPM_MAGIC
 #endif /* TCTI_SWTPM */
+#ifdef TCTI_LIBTPMS
+#include "tss2_tcti_libtpms.h"              // for Tss2_Tcti_Libtpms_Reset
+#include "tss2-tcti/tcti-libtpms.h"         // for TCTI_LIBTPMS_MAGIC
+#endif /* TCTI_LIBTPMS */
 
 #include "../integration/session-util.h"  // for SESSION, create_auth_session
 #include "../integration/sys-util.h"      // for CopySizedByteBuffer, Define...
@@ -170,46 +176,57 @@ static TSS2_RC TpmReset()
     while (magic == 0 || magic == TCTILDR_MAGIC || magic == TCTI_PCAP_MAGIC) {
         magic = *((uint64_t*) tcti);
         if (magic == TCTILDR_MAGIC) {
+            LOG_TRACE("TCTI is tctildr (0x%" PRIx64 "). Unwrapping...", magic);
             tcti = ((TSS2_TCTILDR_CONTEXT *) tcti)->tcti;
         } else if (magic == TCTI_PCAP_MAGIC) {
+            LOG_TRACE("TCTI is tcti-pcap (0x%" PRIx64 "). Unwrapping...", magic);
             tcti = ((TSS2_TCTI_PCAP_CONTEXT *) tcti)->tcti_child;
         }
     }
 
-#ifdef TCTI_LIBTPMS
-    rval = Tss2_Tcti_Libtpms_Reset(tcti);
+    switch (magic) {
 
-    /* If TCTI is not libtpms, bad context is returned. */
-    if (rval != TSS2_TCTI_RC_BAD_CONTEXT) {
-        return rval;
-    } else {
-        LOG_WARNING("TPM Reset failed: wrong TCTI type retrying with swtpm...");
-    }
+#ifdef TCTI_LIBTPMS
+        case TCTI_LIBTPMS_MAGIC:
+            LOG_DEBUG("Calling Tss2_Tcti_Libtpms_Reset()");
+            rval = Tss2_Tcti_Libtpms_Reset(tcti);
+            break;
 #endif /* TCTI_LIBTPMS */
 
 #ifdef TCTI_SWTPM
-    rval = Tss2_Tcti_Swtpm_Reset(tcti);
-
-    /* If TCTI is not swtpm, bad context is returned. */
-    if (rval != TSS2_TCTI_RC_BAD_CONTEXT) {
-        return rval;
-    } else {
-        LOG_WARNING("TPM Reset failed: wrong TCTI type retrying with mssim...");
-    }
+        case TCTI_SWTPM_MAGIC:
+            LOG_DEBUG("Calling Tss2_Tcti_Swtpm_Reset()");
+            rval = Tss2_Tcti_Swtpm_Reset(tcti);
+            break;
 #endif /* TCTI_SWTPM */
 
 #ifdef TCTI_MSSIM
-    rval = (TSS2_RC)tcti_platform_command( tcti, MS_SIM_POWER_OFF );
-    if (rval == TSS2_RC_SUCCESS) {
-        rval = (TSS2_RC)tcti_platform_command( tcti, MS_SIM_POWER_ON );
-    } else {
-        LOG_WARNING("TPM Reset failed: mssim returned 0x%x.", rval);
-    }
+        case TCTI_MSSIM_MAGIC:
+            LOG_DEBUG("Calling tcti_platform_command()");
+            rval = (TSS2_RC)tcti_platform_command( tcti, MS_SIM_POWER_OFF );
+            if (rval == TSS2_RC_SUCCESS) {
+                rval = (TSS2_RC)tcti_platform_command( tcti, MS_SIM_POWER_ON );
+            }
+            break;
 #endif /* TCTI_MSSIM */
 
-    if (rval == TSS2_TCTI_RC_BAD_CONTEXT) {
-        LOG_WARNING("TPM Reset failed: could not reset using known TCTI types. TCTI magic: %" PRIx64, *((uint64_t *) tcti));
-        rval = EXIT_SKIP;
+        default:
+            LOG_WARNING("TPM reset failed. TCTI unknown. Got TCTI magic: 0x%" PRIx64 ". Enabled TCTIs with reset support: "
+#ifdef TCTI_LIBTPMS
+                        "libtpms (" xstr(TCTI_LIBTPMS_MAGIC) "), "
+#endif /* TCTI_LIBTPMS */
+#ifdef TCTI_SWTPM
+                        "swtpm (" xstr(TCTI_SWTPM_MAGIC) "), "
+#endif /* TCTI_SWTPM */
+#ifdef TCTI_MSSIM
+                        "mssim (" xstr(TCTI_MSSIM_MAGIC) "), "
+#endif /* TCTI_MSSIM */
+                        "", magic);
+            return EXIT_SKIP;
+    }
+
+    if (rval != TSS2_RC_SUCCESS) {
+        LOG_WARNING("TPM reset failed: 0x%08x", rval);
     }
 
     return rval;