Changeset 21497 in vbox for trunk/src/VBox/Runtime/r0drv/linux

Timestamp:

Jul 10, 2009 8:24:18 PM (16 years ago)

Author:

vboxsync

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

49946

Message:

RTR0MemObj*: correctly reject unsupported alignment requirements (VERR_NOT_SUPPORTED).

File:

• trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

@@ -904 +904 @@
     /* check for unsupported stuff. */
     AssertMsgReturn(pvFixed == (void *)-1, ("%p\n", pvFixed), VERR_NOT_SUPPORTED);
-    AssertMsgReturn(uAlignment <= PAGE_SIZE, ("%#x\n", uAlignment), VERR_NOT_SUPPORTED);
+    if (uAlignment > PAGE_SIZE)
+        return VERR_NOT_SUPPORTED;
 
     /*
@@ -1018 +1019 @@
 
     /*
+     * Check that the specified alignment is supported.
+     */
+    if (uAlignment > PAGE_SIZE)
+        return VERR_NOT_SUPPORTED;
+
+    /*
      * Let rtR0MemObjLinuxDoMmap do the difficult bits.
      */
@@ -1051 +1058 @@
     AssertMsgReturn(!offSub && !cbSub, ("%#x %#x\n", offSub, cbSub), VERR_NOT_SUPPORTED);
     AssertMsgReturn(pvFixed == (void *)-1, ("%p\n", pvFixed), VERR_NOT_SUPPORTED);
-    AssertMsgReturn(uAlignment <= PAGE_SIZE, ("%#x\n", uAlignment), VERR_NOT_SUPPORTED);
+    if (uAlignment > PAGE_SIZE)
+        return VERR_NOT_SUPPORTED;
 
     /*
@@ -1135 +1143 @@
      */
     if (!pTask)
+        return VERR_NOT_SUPPORTED;
+    if (uAlignment > PAGE_SIZE)
         return VERR_NOT_SUPPORTED;