Changeset 88329 in vbox for trunk

Timestamp:

Mar 31, 2021 7:02:46 AM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 WIP.

File:

• trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

@@ -405 +405 @@
 static const uint8_t *g_apbRw1cMasks[] = { (uint8_t *)&g_au32Rw1cMasks0[0], (uint8_t *)&g_au32Rw1cMasks1[0] };
 
+/* Masks arrays must be identical in size (even bounds checking code assumes this). */
+AssertCompile(sizeof(g_apbRw1cMasks) == sizeof(g_apbRwMasks));
+
 
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
@@ -414 +417 @@
  * @param   pThis       The shared IOMMU device state.
  * @param   offReg      The MMIO offset of the register.
- * @param   cbReg       The size of the access being made.
+ * @param   cbReg       The size of the access being made (for bounds checking on
+ *                      debug builds).
  * @param   pIdxGroup   Where to store the index of the register group the register
  *                      belongs to.
@@ -475 +479 @@
     uint8_t idxGroup;
     uint8_t const *pabRegs      = iommuIntelRegGetGroup(pThis, offReg, sizeof(uint64_t), &idxGroup);
+    Assert(idxGroup < RT_ELEMENTS(g_apbRwMasks));
     uint8_t const *pabRwMasks   = g_apbRwMasks[idxGroup];
     uint8_t const *pabRw1cMasks = g_apbRw1cMasks[idxGroup];
@@ -496 +501 @@
     uint8_t idxGroup;
     uint8_t const *pabRegs      = iommuIntelRegGetGroup(pThis, offReg, sizeof(uint32_t), &idxGroup);
+    Assert(idxGroup < RT_ELEMENTS(g_apbRwMasks));
     uint8_t const *pabRwMasks   = g_apbRwMasks[idxGroup];
     uint8_t const *pabRw1cMasks = g_apbRw1cMasks[idxGroup];