Changeset 100892 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 17, 2023 10:04:15 AM (16 months ago)

Author:

vboxsync

Message:

Devices/Security/DevTpm: Fix regression introduced by r157063 causing a saved state to fail to load with a TPM enabled. The buffer size must (and can) be safely queried when the TPM is constructed or the command buffer size is 0 when the saved state is loaded causing a config mismatch error, bugref:10075 ticketref:21773

File:

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

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

@@ -1638 +1638 @@
 
     if (pThisCC->pDrvTpm)
-    {
         pThis->fEstablishmentSet = pThisCC->pDrvTpm->pfnGetEstablishedFlag(pThisCC->pDrvTpm);
-        pThis->cbCmdResp         = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
-    }
 }
 
@@ -1655 +1652 @@
     tpmR3HwReset(pThis);
     if (pThisCC->pDrvTpm)
-    {
         pThis->fEstablishmentSet = pThisCC->pDrvTpm->pfnGetEstablishedFlag(pThisCC->pDrvTpm);
-        pThis->cbCmdResp         = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
-    }
 }
 
@@ -1750 +1744 @@
         AssertLogRelMsgReturn(pThisCC->pDrvTpm, ("TPM#%d: Driver is missing the TPM interface.\n", iInstance), VERR_PDM_MISSING_INTERFACE);
 
+        pThis->cbCmdResp     = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
         pThis->fLocChangeSup = pThisCC->pDrvTpm->pfnGetLocalityMax(pThisCC->pDrvTpm) > 0;