Changeset 106259 in vbox for trunk/src

Timestamp:

Oct 9, 2024 4:09:15 PM (7 weeks ago)

Author:

vboxsync

Message:

Devices/Security: Query the buffer size of the device above and use that to set the buffer size in libtpms, bugref:10772

Location:

trunk/src/VBox/Devices/Security

Files:

• DevTpm.cpp (modified) (3 diffs)
• DrvTpmEmu.cpp (modified) (3 diffs)
• DrvTpmEmuTpms.cpp (modified) (3 diffs)

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

@@ -544 +544 @@
     /** The base interface for LUN\#0. */
     PDMIBASE                        IBase;
+    /** The base interface for LUN\#0. */
+    PDMITPMPORT                     ITpmPort;
     /** The base interface below. */
     R3PTRTYPE(PPDMIBASE)            pDrvBase;
@@ -1627 +1629 @@
     PDEVTPMCC pThisCC = RT_FROM_MEMBER(pInterface, DEVTPMCC, IBase);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThisCC->IBase);
-    //PDMIBASE_RETURN_INTERFACE(pszIID, PDMITPMPORT, &pThisCC->ITpmPort);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMITPMPORT, &pThisCC->ITpmPort);
     return NULL;
+}
+
+
+/* -=-=-=-=-=-=-=-=- PDMITPMPORT -=-=-=-=-=-=-=-=- */
+
+/**
+ * @interface_method_impl{PDMITPMPORT,pfnGetMaxBufferSize}
+ */
+static DECLCALLBACK(uint32_t) tpmR3TpmPortGetMaxBufferSize(PPDMITPMPORT pInterface)
+{
+        RT_NOREF(pInterface);
+    return TPM_DATA_BUFFER_SIZE_MAX;
 }
 
@@ -1694 +1708 @@
     /* IBase */
     pThisCC->IBase.pfnQueryInterface = tpmR3QueryInterface;
+
+    /* ITpmPort */
+    pThisCC->ITpmPort.pfnGetMaxBufferSize = tpmR3TpmPortGetMaxBufferSize;
+
 
     /*

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

@@ -292 +292 @@
     /** Pointer to the driver instance. */
     PPDMDRVINS          pDrvIns;
+    /** Pointer to the TPM port interface above. */
+    PPDMITPMPORT        pTpmPort;
 
     /** Socket handle for the control connection. */
@@ -854 +856 @@
 
     /*
+     * Query the TPM port interface of the device above.
+     */
+    pThis->pTpmPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMITPMPORT);
+    if (!pThis->pTpmPort)
+    {
+        AssertMsgFailed(("Configuration error: the above device/driver didn't export the TPM port interface!\n"));
+        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_MISSING_INTERFACE_ABOVE,
+                                N_("No TPM port interface above"));
+    }
+
+    /*
      * Validate and read the configuration.
      */
@@ -946 +959 @@
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                    N_("Configuration error: querying \"BufferSize\" resulted in %Rrc"), rc);
+
+    /* Limit to the maximum buffer size of the device above. */
+    pThis->cbBuffer = RT_MIN(pThis->cbBuffer, pThis->pTpmPort->pfnGetMaxBufferSize(pThis->pTpmPort));
 
     /* Set the buffer size. */

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

@@ -79 +79 @@
     /** The VFS interface of the driver below for NVRAM/TPM state loading and storing. */
     PPDMIVFSCONNECTOR   pDrvVfs;
+    /** Pointer to the TPM port interface above. */
+    PPDMITPMPORT        pTpmPort;
 
     /** The TPM version we are emulating. */
@@ -480 +482 @@
 
     /*
+     * Query the TPM port interface of the device above.
+     */
+    pThis->pTpmPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMITPMPORT);
+    if (!pThis->pTpmPort)
+    {
+        AssertMsgFailed(("Configuration error: the above device/driver didn't export the TPM port interface!\n"));
+        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_MISSING_INTERFACE_ABOVE,
+                                N_("No TPM port interface above"));
+    }
+
+    /*
      * Try attach the VFS driver below and query it's VFS interface.
      */
@@ -529 +542 @@
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                    N_("Configuration error: querying \"BufferSize\" resulted in %Rrc"), rc);
+
+    /* Limit to the buffer size of the device above. */
+    pThis->cbBuffer = RT_MIN(pThis->cbBuffer, pThis->pTpmPort->pfnGetMaxBufferSize(pThis->pTpmPort));
 
     uint32_t cbBufferMin = 0;