Changeset 81840 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 13, 2019 10:39:16 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134631

Message:

PDM: Defined a total PDM device instance limit of 4MB (for now). Need some 2.5MB for ATA. bugref:9218

File:

• trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -47 +47 @@
 #include "dtrace/VBoxVMM.h"
 #include "PDMInline.h"
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+/** The maximum device instance (total) size. */
+#define PDM_MAX_DEVICE_INSTANCE_SIZE    _4M
 
 
@@ -1639 +1646 @@
     uint32_t const cbPciDevs   = cbPciDev * cPciDevs;
     uint32_t const cbTotal     = RT_ALIGN_32(cbRing0 + cbRing3 + cbRC + cbShared + cbCritSect + cbPciDevs, PAGE_SIZE);
+    AssertLogRelMsgReturn(cbTotal <= PDM_MAX_DEVICE_INSTANCE_SIZE,
+                          ("Instance of '%s' is too big: cbTotal=%u, max %u\n",
+                           pDevReg->szName, cbTotal, PDM_MAX_DEVICE_INSTANCE_SIZE),
+                          VERR_OUT_OF_RANGE);
 
     RTR0MEMOBJ hMemObj;
@@ -1824 +1835 @@
     AssertReturn(cchModName < sizeof(pReq->szModName), VERR_NO_STRING_TERMINATOR);
     AssertReturn(cchModName > 0, VERR_EMPTY_STRING);
-    AssertReturn(pReq->cbInstanceR3 <= _2M, VERR_OUT_OF_RANGE);
-    AssertReturn(pReq->cbInstanceRC <= _512K, VERR_OUT_OF_RANGE);
+    AssertReturn(pReq->cbInstanceShared <= PDM_MAX_DEVICE_INSTANCE_SIZE, VERR_OUT_OF_RANGE);
+    AssertReturn(pReq->cbInstanceR3 <= PDM_MAX_DEVICE_INSTANCE_SIZE, VERR_OUT_OF_RANGE);
+    AssertReturn(pReq->cbInstanceRC <= PDM_MAX_DEVICE_INSTANCE_SIZE, VERR_OUT_OF_RANGE);
     AssertReturn(pReq->iInstance < 1024, VERR_OUT_OF_RANGE);
     AssertReturn(pReq->iInstance < pReq->cMaxInstances, VERR_OUT_OF_RANGE);