Changeset 1575 in vbox for trunk

Timestamp:

Mar 20, 2007 10:23:17 AM (18 years ago)

Author:

vboxsync

Message:

Check for hypervisor area & intermediate mapping conflicts too.

File:

• trunk/src/VBox/VMM/PGMMap.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMMap.cpp

@@ -465 +465 @@
 PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages)
 {
+    size_t  cbHyper;
+    RTGCPTR pvHyperGC;
+
     LogFlow(("PGMR3MapIntermediate: Addr=%RTptr HCPhys=%VHp cbPages=%#x\n", Addr, HCPhys, cbPages));
 
@@ -497 +500 @@
         AssertMsgFailed(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages));
         LogRel(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages));
+        return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo new error code */
+    }
+
+    /* The intermediate mapping must not conflict with our default hypervisor address. */
+    pvHyperGC = MMHyperGetArea(pVM, &cbHyper);
+    if (   uAddress < pvHyperGC
+           ? uAddress + cbPages > pvHyperGC
+           : pvHyperGC + cbHyper > uAddress
+       )
+    {
+        AssertMsgFailed(("Addr=%RTptr HyperGC=%VGv cbPages=%d\n", Addr, pvHyperGC, cbPages));
+        LogRel(("Addr=%RTptr HyperGC=%VGv cbPages=%d\n", Addr, pvHyperGC, cbPages));
         return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo new error code */
     }