Changeset 96994 in vbox

Timestamp:

Oct 5, 2022 7:59:19 AM (2 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested VMX: bugref:10092 Fix pointer alignment for ASMBitTest too.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -2493 +2493 @@
     uint32_t const offMsrRead = offBitmapRead + offMsr;
     Assert(offMsrRead + (iBit >> 3) < offBitmapWrite);
-    if (ASMBitTest(pbMsrBitmap + offMsrRead, iBit))
+    if (ASMBitTest(pbMsrBitmap, (offMsrRead << 3) + iBit))
         fRet = VMXMSRPM_EXIT_RD;
     else
@@ -2503 +2503 @@
     uint32_t const offMsrWrite = offBitmapWrite + offMsr;
     Assert(offMsrWrite + (iBit >> 3) < X86_PAGE_4K_SIZE);
-    if (ASMBitTest(pbMsrBitmap + offMsrWrite, iBit))
+    if (ASMBitTest(pbMsrBitmap, (offMsrWrite << 3) + iBit))
         fRet |= VMXMSRPM_EXIT_WR;
     else
@@ -2923 +2923 @@
     Assert(pbBitmap);
     Assert(u32VmcsField >> 3 < VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);
-    return ASMBitTest(&pbBitmap[u32VmcsField >> 3], u32VmcsField & 7);
+    return ASMBitTest(pbBitmap, (u32VmcsField << 3) + (u32VmcsField & 7));
 }