Changeset 19110 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Apr 22, 2009 1:35:31 PM (16 years ago)

Author:

vboxsync

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

46287

Message:

Additions/Linux/vboxadd: empty R3 HGCM buffers should have a NULL address

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -442 +442 @@
 
     AssertPtrReturn(ppBuf, -EINVAL);
+    /* Empty buffers are allowed, but then the user pointer should be NULL */
+    AssertReturn(((cb > 0) && VALID_PTR(pUser)) || (pUser == NULL), -EINVAL);
 
     pBuf = RTMemAlloc(sizeof(*pBuf));
@@ -459 +461 @@
         }
         else
-            /* Empty buffers are allowed, but then the user pointer is not
-             * required to be valid, and we definitely don't want to copy
-             * anything. */
+            /* We definitely don't want to copy anything from an empty
+             * buffer. */
             pKernel = NULL;
     }