Changeset 52963 in vbox

Timestamp:

Oct 6, 2014 8:10:55 PM (10 years ago)

Author:

vboxsync

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

96406

Message:

Runtime/memsafer-r3.cpp: Refine previous fix, don't ignore VERR_INVALID_PARAMETER but skip changing the protection of the guard pages on OS X

File:

• trunk/src/VBox/Runtime/r3/memsafer-r3.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/memsafer-r3.cpp

@@ -286 +286 @@
 
         /*
+         * On darwin we cannot allocate pages without an R0 mapping and
+         * SUPR3PageAllocEx falls back to another method which is incompatible with
+         * the way SUPR3PageProtect works. Ignore changing the protection of the guard
+         * pages.
+         */
+#ifdef RT_OS_DARWIN
+        return VINF_SUCCESS;
+#else
+        /*
          * Configure the guard pages.
          * SUPR3PageProtect isn't supported on all hosts, we ignore that.
-         * Additionally on darwin we cannot allocate pages without a R0 mapping and
-         * SUPR3PageAllocEx falls back to another method which is incompatible with
-         * the way SUPR3PageProtect works, it returns VERR_INVALID_PARAMETER. Ignore that case too.
          */
         rc = SUPR3PageProtect(pvPages, NIL_RTR0PTR, 0, PAGE_SIZE, RTMEM_PROT_NONE);
@@ -305 +311 @@
         /* failed. */
         int rc2 = SUPR3PageFreeEx(pvPages, pThis->cPages); AssertRC(rc2);
+#endif
     }
     return rc;