Changeset 99554 in vbox for trunk/src/VBox/Devices/Security

Timestamp:

Apr 28, 2023 7:36:38 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157063

Message:

Devices/Security/DevTpm: Query the established flag and buffer size only after the TPM got instantiated, fixes a crash early on during VM power on when TPM 1.2 is used, bugref:10075

File:

• trunk/src/VBox/Devices/Security/DevTpm.cpp (modified) (6 diffs)

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

@@ -1454 +1454 @@
 
 
+/**
+ * Resets the shared hardware TPM state.
+ *
+ * @returns nothing.
+ * @param   pThis               Pointer to the shared TPM device.
+ */
+static void tpmR3HwReset(PDEVTPM pThis)
+{
+    pThis->enmState       = DEVTPMSTATE_IDLE;
+    pThis->bLoc           = TPM_NO_LOCALITY_SELECTED;
+    pThis->bmLocReqAcc    = 0;
+    pThis->bmLocSeizedAcc = 0;
+    pThis->offCmdResp     = 0;
+    RT_ZERO(pThis->abCmdResp);
+
+    for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aLoc); i++)
+    {
+        PDEVTPMLOCALITY pLoc = &pThis->aLoc[i];
+        pLoc->uRegIntEn  = 0;
+        pLoc->uRegIntSts = 0;
+    }
+}
+
+
 /* -=-=-=-=-=-=-=-=- Saved State -=-=-=-=-=-=-=-=- */
 
@@ -1611 +1635 @@
 
 /**
+ * @interface_method_impl{PDMDEVREG,pfnPowerOn}
+ */
+static DECLCALLBACK(void) tpmR3PowerOn(PPDMDEVINS pDevIns)
+{
+    PDEVTPM   pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVTPM);
+    PDEVTPMCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVTPMCC);
+
+    if (pThisCC->pDrvTpm)
+    {
+        pThis->fEstablishmentSet = pThisCC->pDrvTpm->pfnGetEstablishedFlag(pThisCC->pDrvTpm);
+        pThis->cbCmdResp         = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
+    }
+}
+
+
+/**
  * @interface_method_impl{PDMDEVREG,pfnReset}
  */
@@ -1616 +1656 @@
 {
     PDEVTPM   pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVTPM);
-
-    pThis->enmState       = DEVTPMSTATE_IDLE;
-    pThis->bLoc           = TPM_NO_LOCALITY_SELECTED;
-    pThis->bmLocReqAcc    = 0;
-    pThis->bmLocSeizedAcc = 0;
-    pThis->offCmdResp     = 0;
-    RT_ZERO(pThis->abCmdResp);
-
-    for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aLoc); i++)
+    PDEVTPMCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVTPMCC);
+
+    tpmR3HwReset(pThis);
+    if (pThisCC->pDrvTpm)
     {
-        PDEVTPMLOCALITY pLoc = &pThis->aLoc[i];
-        pLoc->uRegIntEn  = 0;
-        pLoc->uRegIntSts = 0;
+        pThis->fEstablishmentSet = pThisCC->pDrvTpm->pfnGetEstablishedFlag(pThisCC->pDrvTpm);
+        pThis->cbCmdResp         = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
     }
 }
@@ -1721 +1755 @@
         AssertLogRelMsgReturn(pThisCC->pDrvTpm, ("TPM#%d: Driver is missing the TPM interface.\n", iInstance), VERR_PDM_MISSING_INTERFACE);
 
-        pThis->fLocChangeSup     = pThisCC->pDrvTpm->pfnGetLocalityMax(pThisCC->pDrvTpm) > 0;
-        pThis->fEstablishmentSet = pThisCC->pDrvTpm->pfnGetEstablishedFlag(pThisCC->pDrvTpm);
-        pThis->cbCmdResp         = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
+        pThis->fLocChangeSup = pThisCC->pDrvTpm->pfnGetLocalityMax(pThisCC->pDrvTpm) > 0;
 
         pThis->enmTpmVers = pThisCC->pDrvTpm->pfnGetVersion(pThisCC->pDrvTpm);
@@ -1754 +1786 @@
     AssertRCReturn(rc, rc);
 
-    tpmR3Reset(pDevIns);
+    tpmR3HwReset(pThis);
     return VINF_SUCCESS;
 }
@@ -1801 +1833 @@
     /* .pfnRelocate = */            NULL,
     /* .pfnMemSetup = */            NULL,
-    /* .pfnPowerOn = */             NULL,
-    /* .pfnReset = */               NULL,
+    /* .pfnPowerOn = */             tpmR3PowerOn,
+    /* .pfnReset = */               tpmR3Reset,
     /* .pfnSuspend = */             NULL,
     /* .pfnResume = */              NULL,