Changeset 6876 in vbox for trunk/src/VBox/Devices/PC/DevPcBios.cpp

Timestamp:

Feb 10, 2008 7:44:59 PM (17 years ago)

Author:

vboxsync

Message:

DMI: made size consistent, removed double size check, fix error message

File:

• trunk/src/VBox/Devices/PC/DevPcBios.cpp (modified) (5 diffs)

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

@@ -844 +844 @@
     do { \
         size_t _len = strlen(s) + 1; \
-        if (pszStr + _len - (char *)pTable >= cbMax) \
+        size_t _max = (unsigned)(pszStr + _len - (char *)pTable) + 1; \
+        if (_max > cbMax) \
             return PDMDevHlpVMSetError(pDevIns, VERR_TOO_MUCH_DATA, RT_SRC_POS, \
-                    N_("DMI string too long (%zu): \"%s\""), _len, s); \
+                    N_("One of the DMI strings is too long. Check all bios/Dmi* configuration entries. At least %zu bytes are needed but there is no space for more than %d bytes"), _max, cbMax); \
         memcpy(p, s, _len); \
         p += _len; \
@@ -874 +875 @@
     READCFG("DmiFamily",  pszDmiFamily,   "Virtual Machine");
 
+    /* DMI BIOS information */
     PDMIBIOSINF pBIOSInf         = (PDMIBIOSINF)pszStr;
     pszStr                       = (char *)(pBIOSInf + 1);
@@ -904 +906 @@
     *pszStr++                    = '\0';
 
-
+    /* DMI system information */
     PDMISYSTEMINF pSystemInf     = (PDMISYSTEMINF)pszStr;
     pszStr                       = (char *)(pSystemInf + 1);
@@ -940 +942 @@
     *pszStr++                    = '\0';
 
+    /* If more fields are added here, fix the size check in STRCPY */
+
 #undef STRCPY
 #undef READCFG
-
-    if (pszStr - (char *)pTable > VBOX_DMI_TABLE_SIZE)
-        return PDMDevHlpVMSetError(pDevIns, VERR_BUFFER_OVERFLOW, RT_SRC_POS,
-                                   N_("DMI table too long (have=%d, max=%d)"),
-                                   pszStr - (char *)pTable, VBOX_DMI_TABLE_SIZE);
 
     MMR3HeapFree(pszDmiVendor);
@@ -1373 +1372 @@
     uuid.Gen.u16TimeMid = RT_H2BE_U16(uuid.Gen.u16TimeMid);
     uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
-    rc = pcbiosPlantDMITable(pDevIns, pData->au8DMIPage, 0x100 /* see below */, &uuid, pCfgHandle);
+    rc = pcbiosPlantDMITable(pDevIns, pData->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle);
     if (VBOX_FAILURE(rc))
         return rc;
     if (pData->u8IOAPIC)
-        pcbiosPlantMPStable(pDevIns, pData->au8DMIPage + 0x100);
+        pcbiosPlantMPStable(pDevIns, pData->au8DMIPage + VBOX_DMI_TABLE_SIZE);
 
     rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, 0x1000, pData->au8DMIPage, false /* fShadow */, "DMI tables");