Changeset 91327 in vbox

Timestamp:

Sep 22, 2021 3:15:08 PM (3 years ago)

Author:

vboxsync

Message:

Devices/Security/DrvTpmEmuTpms: Store the TPM state in the power off callback because the NVRAM store driver below is already destroyed when the destruction callback is called, bugref:10075

File:

• trunk/src/VBox/Devices/Security/DrvTpmEmuTpms.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Security/DrvTpmEmuTpms.cpp

@@ -747 +747 @@
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
 
+    PDRVTPMEMU pThis = PDMINS_2_DATA(pDrvIns, PDRVTPMEMU);
+
     TPMLIB_Terminate();
+
+    int rc;
+    if (pThis->pDrvVfs)
+        rc = drvTpmEmuTpmsNvramStoreToVfs(pThis);
+    else
+        rc = drvTpmEmuTpmsNvramStore(pThis);
+    AssertRC(rc);
 }
 
@@ -758 +767 @@
     PDRVTPMEMU pThis = PDMINS_2_DATA(pDrvIns, PDRVTPMEMU);
     LogFlow(("%s\n", __FUNCTION__));
-
-    if (!pThis->fSsmCalled)
-    {
-        int rc;
-        if (pThis->pDrvVfs)
-            rc = drvTpmEmuTpmsNvramStoreToVfs(pThis);
-        else
-            rc = drvTpmEmuTpmsNvramStore(pThis);
-        AssertRC(rc);
-    }
 
     if (pThis->pvNvPermall)