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

Timestamp:

Nov 26, 2009 1:20:33 PM (15 years ago)

Author:

vboxsync

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

55303

Message:

Proper boundary checks for 32 bits paging modes.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

@@ -63 +63 @@
 #elif PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE || PGM_GST_TYPE == PGM_TYPE_AMD64
 
+#if PGM_GST_MODE != PGM_MODE_AMD64
+    /* Boundary check. */
+    if (GCPtr >= _4G)
+        return VERR_INVALID_ADDRESS;
+# endif
+
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     /*
@@ -181 +187 @@
 
     Assert((cb & PAGE_OFFSET_MASK) == 0);
+
+#if PGM_GST_MODE != PGM_MODE_AMD64
+    /* Boundary check. */
+    if (GCPtr >= _4G)
+        return VERR_INVALID_ADDRESS;
+# endif
 
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -286 +298 @@
  || PGM_GST_TYPE == PGM_TYPE_PAE   \
  || PGM_GST_TYPE == PGM_TYPE_AMD64
+
+#if PGM_GST_MODE != PGM_MODE_AMD64
+    /* Boundary check. */
+    if (GCPtr >= _4G)
+        return VERR_INVALID_ADDRESS;
+# endif
 
 # if PGM_GST_TYPE == PGM_TYPE_32BIT