Changeset 90285 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 22, 2021 11:59:15 AM (4 years ago)

Author:

vboxsync

Message:

Runtime/efi: Started implementing the functionality to parse, create and modify EFI signature databases, bugref:9580 [build fix]

File:

• trunk/src/VBox/Runtime/common/efi/efisignaturedb.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/efi/efisignaturedb.cpp

@@ -60 +60 @@
     RTUUID                  UuidOwner;
     /** Size of the signature data in bytes. */
-    size_t                  cbSignature;
+    uint32_t                cbSignature;
     /** The signature data (variable in size). */
     RT_FLEXIBLE_ARRAY_EXTENSION
@@ -91 +91 @@
     EFI_GUID                GuidSignatureType;
     /** The additional signature header for this signature type. */
-    size_t                  cbSigHdr;
+    uint32_t                cbSigHdr;
     /** Size of the signature data (including EFI_SIGNATURE_DATA),
      * can be 0 size varies with each signature (X.509 for example). */
-    size_t                  cbSig;
+    uint32_t                cbSig;
     /** The internal signature type enum. */
     RTEFISIGTYPE            enmSigType;
@@ -378 +378 @@
  * @param   cbSig               Size of the signature data in bytes.
  */
-static PRTEFISIGNATURE rtEfiSigDbAllocSignature(PCRTUUID pUuidOwner, size_t cbSig)
+static PRTEFISIGNATURE rtEfiSigDbAllocSignature(PCRTUUID pUuidOwner, uint32_t cbSig)
 {
     PRTEFISIGNATURE pSig = (PRTEFISIGNATURE)RTMemAllocZ(RT_UOFFSETOF_DYN(RTEFISIGNATURE, abSignature[cbSig]));
@@ -463 +463 @@
     if (RT_SUCCESS(rc))
     {
-        if (   !pDesc->cbSig
-            || pDesc->cbSig - sizeof(EFI_SIGNATURE_DATA) == cbSig)
-        {
-            PRTEFISIGNATURE pSig = rtEfiSigDbAllocSignature(pUuidOwner, cbSig);
+        if (   (   !pDesc->cbSig
+                || pDesc->cbSig - sizeof(EFI_SIGNATURE_DATA) == cbSig)
+            && cbSig < UINT32_MAX)
+        {
+            PRTEFISIGNATURE pSig = rtEfiSigDbAllocSignature(pUuidOwner, (uint32_t)cbSig);
             if (pSig)
             {
-                rc = RTVfsFileRead(hVfsFileIn, &pSig->abSignature[0], cbSig, NULL /*pcbRead*/);
+                rc = RTVfsFileRead(hVfsFileIn, &pSig->abSignature[0], (size_t)cbSig, NULL /*pcbRead*/);
                 if (RT_SUCCESS(rc))
                     RTListAppend(&pThis->aLstSigTypes[enmSigType], &pSig->NdLst);
@@ -494 +495 @@
     AssertPtrReturn(pUuidOwner, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
-    AssertReturn(cbBuf, VERR_INVALID_PARAMETER);
+    AssertReturn(cbBuf && cbBuf < UINT32_MAX, VERR_INVALID_PARAMETER);
 
     int rc = VINF_SUCCESS;