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

Timestamp:

Jan 7, 2025 10:54:10 AM (5 weeks ago)

Author:

vboxsync

Message:

Devices/PC/DevACPI.cpp: Add missing error check, and re-arrange code reading custom ACPI tables to actually return an error if the check fails and not continue regardless, bugref:3409

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -2329 +2329 @@
     AssertRCReturn(rc, rc);
     rc = PDMDevHlpIoPortMap(pDevIns, pThis->hIoPortGpe0En,  acpiR3CalcPmPort(pThis, GPE0_OFFSET + GPE0_BLK_LEN / 2));
+    AssertRCReturn(rc, rc);
 
     return VINF_SUCCESS;
@@ -3680 +3681 @@
         {
             /* The following checks should be in sync the AssertReleaseMsg's below. */
-            if (    *pcbCustBin > cbBufAvail
-                ||  *pcbCustBin < sizeof(ACPITBLHEADER))
-                rc = VERR_TOO_MUCH_DATA;
-
-            /*
-             * Allocate buffer for the custom table binary data.
-             */
-            *ppu8CustBin = (uint8_t *)PDMDevHlpMMHeapAlloc(pDevIns, *pcbCustBin);
-            if (*ppu8CustBin)
+            if (    *pcbCustBin <= cbBufAvail
+                &&  *pcbCustBin > sizeof(ACPITBLHEADER))
             {
-                rc = RTFileRead(FileCUSTBin, *ppu8CustBin, *pcbCustBin, NULL);
-                if (RT_FAILURE(rc))
+                /*
+                 * Allocate buffer for the custom table binary data.
+                 */
+                *ppu8CustBin = (uint8_t *)PDMDevHlpMMHeapAlloc(pDevIns, *pcbCustBin);
+                if (*ppu8CustBin)
                 {
-                    AssertMsgFailed(("RTFileRead(,,%d,NULL) -> %Rrc\n", *pcbCustBin, rc));
-                    PDMDevHlpMMHeapFree(pDevIns, *ppu8CustBin);
-                    *ppu8CustBin = NULL;
+                    rc = RTFileRead(FileCUSTBin, *ppu8CustBin, *pcbCustBin, NULL);
+                    if (RT_FAILURE(rc))
+                    {
+                        AssertMsgFailed(("RTFileRead(,,%d,NULL) -> %Rrc\n", *pcbCustBin, rc));
+                        PDMDevHlpMMHeapFree(pDevIns, *ppu8CustBin);
+                        *ppu8CustBin = NULL;
+                    }
                 }
+                else
+                    rc = VERR_NO_MEMORY;
             }
             else
-            {
-                rc = VERR_NO_MEMORY;
-            }
+                rc = VERR_TOO_MUCH_DATA;
+
             RTFileClose(FileCUSTBin);
         }