Changeset 91311 in vbox

Timestamp:

Sep 20, 2021 11:06:33 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Security/DrvTpmEmuTpms: Make use of the PDM VFS interface iv available for loading/storing the TPM state (untested), bugref:10075

File:

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

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

@@ -68 +68 @@
     /** Pointer to the driver instance. */
     PPDMDRVINS          pDrvIns;
+    /** The VFS interface of the driver below for NVRAM/TPM state loading and storing. */
+    PPDMIVFSCONNECTOR   pDrvVfs;
 
     /** The TPM version we are emulating. */
@@ -262 +264 @@
 
 
+/**
+ * Tries to load the NVRAM from the VFS driver below.
+ *
+ * @returns VBox status code.
+ * @param   pThis               The emulator driver instance data.
+ */
+static int drvTpmEmuTpmsNvramLoadFromVfs(PDRVTPMEMU pThis)
+{
+    uint64_t cbState = 0;
+    int rc = pThis->pDrvVfs->pfnQuerySize(pThis->pDrvVfs, pThis->pDrvIns->pReg->szName, TPM_PERMANENT_ALL_NAME, &cbState);
+    if (RT_SUCCESS(rc))
+    {
+        pThis->pvNvPermall = RTMemAllocZ(cbState);
+        if (pThis->pvNvPermall)
+        {
+            pThis->cbNvPermall = (size_t)cbState;
+            rc = pThis->pDrvVfs->pfnReadAll(pThis->pDrvVfs, pThis->pDrvIns->pReg->szName, TPM_PERMANENT_ALL_NAME,
+                                            pThis->pvNvPermall, pThis->cbNvPermall);
+            if (RT_SUCCESS(rc))
+            {
+                /* Load the volatile state if existing. */
+                rc = pThis->pDrvVfs->pfnQuerySize(pThis->pDrvVfs, pThis->pDrvIns->pReg->szName, TPM_VOLATILESTATE_NAME, &cbState);
+                if (RT_SUCCESS(rc))
+                {
+                    pThis->pvNvVolatile = RTMemAllocZ(cbState);
+                    if (pThis->pvNvVolatile)
+                    {
+                        pThis->cbNvVolatile = (size_t)cbState;
+                        rc = pThis->pDrvVfs->pfnReadAll(pThis->pDrvVfs, pThis->pDrvIns->pReg->szName, TPM_VOLATILESTATE_NAME,
+                                                        pThis->pvNvVolatile, pThis->cbNvVolatile);
+                    }
+                }
+                else if (rc == VERR_NOT_FOUND)
+                    rc = VINF_SUCCESS; /* This is fine if there is no volatile state. */
+            }
+        }
+        else
+            rc = VERR_NO_MEMORY;
+    }
+    else if (rc == VERR_NOT_FOUND)
+        rc = VINF_SUCCESS; /* This is fine for the first start of a new VM. */
+
+    return rc;
+}
+
+
+/**
+ * Stores the NVRAM content using the VFS driver below.
+ *
+ * @returns VBox status code.
+ * @param   pThis               The emulator driver instance data.
+ */
+static int drvTpmEmuTpmsNvramStoreToVfs(PDRVTPMEMU pThis)
+{
+    AssertPtr(pThis->pvNvPermall);
+    int rc = pThis->pDrvVfs->pfnWriteAll(pThis->pDrvVfs, pThis->pDrvIns->pReg->szName, TPM_PERMANENT_ALL_NAME,
+                                         pThis->pvNvPermall, pThis->cbNvPermall);
+    if (   RT_SUCCESS(rc)
+        && pThis->pvNvVolatile)
+        rc = pThis->pDrvVfs->pfnWriteAll(pThis->pDrvVfs, pThis->pDrvIns->pReg->szName, TPM_VOLATILESTATE_NAME,
+                                         pThis->pvNvVolatile, pThis->cbNvVolatile);
+
+    return rc;
+}
+
+
+/* -=-=-=-=- PDMITPMCONNECTOR interface callabcks. -=-=-=-=- */
+
+
 /** @interface_method_impl{PDMITPMCONNECTOR,pfnGetVersion} */
 static DECLCALLBACK(TPMVERSION) drvTpmEmuTpmsGetVersion(PPDMITPMCONNECTOR pInterface)
@@ -690 +761 @@
     if (!pThis->fSsmCalled)
     {
-        int rc = drvTpmEmuTpmsNvramStore(pThis);
+        int rc;
+        if (pThis->pDrvVfs)
+            rc = drvTpmEmuTpmsNvramStoreToVfs(pThis);
+        else
+            rc = drvTpmEmuTpmsNvramStore(pThis);
         AssertRC(rc);
     }
@@ -754 +829 @@
     TPMLIB_SetDebugLevel(~0);
 
-    int rc = CFGMR3QueryStringAlloc(pCfg, "NvramPath", &pThis->pszNvramPath);
-    if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
+    /*
+     * Try attach the VFS driver below and query it's VFS interface.
+     */
+    PPDMIBASE pBase = NULL;
+    int rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pBase);
+    if (RT_FAILURE(rc) && rc != VERR_PDM_NO_ATTACHED_DRIVER)
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("Configuration error: querying \"NvramPath\" resulted in %Rrc"), rc);
-
-    rc = drvTpmEmuTpmsNvramLoad(pThis);
-    if (RT_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("Failed to load TPM NVRAM data with %Rrc"), rc);
+                                   N_("Failed to attach driver below us! %Rrc"), rc);
+    if (pBase)
+    {
+        pThis->pDrvVfs = PDMIBASE_QUERY_INTERFACE(pBase, PDMIVFSCONNECTOR);
+        if (!pThis->pDrvVfs)
+            return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_MISSING_INTERFACE_BELOW,
+                                    N_("No VFS interface below"));
+
+        rc = drvTpmEmuTpmsNvramLoadFromVfs(pThis);
+        if (RT_FAILURE(rc))
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                       N_("Failed to load TPM NVRAM data with %Rrc"), rc);
+    }
+    else
+    {
+        rc = CFGMR3QueryStringAlloc(pCfg, "NvramPath", &pThis->pszNvramPath);
+        if (RT_FAILURE(rc))
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                       N_("Configuration error: querying \"NvramPath\" resulted in %Rrc"), rc);
+
+        rc = drvTpmEmuTpmsNvramLoad(pThis);
+        if (RT_FAILURE(rc))
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                       N_("Failed to load TPM NVRAM data with %Rrc"), rc);
+    }
 
     TPMLIB_TPMVersion enmVersion = TPMLIB_TPM_VERSION_2;