Changeset 18124 in vbox for trunk/src/VBox/Additions/linux/module/vboxmod.c

Timestamp:

Mar 20, 2009 9:17:53 PM (16 years ago)

Author:

vboxsync

Message:

Additions/Linux/vboxadd: use RTMemAlloc instead of kmalloc for allocating bounce buffers for HGCM, to better cope with large buffers

File:

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

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

@@ -71 +71 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <iprt/mem.h>
 #include <iprt/memobj.h>
 #include <linux/miscdevice.h>
@@ -415 +416 @@
     AssertPtrReturn(pUser, -EINVAL);
 
-    pBuf = kmalloc(sizeof(*pBuf), GFP_KERNEL);
+    pBuf = RTMemAlloc(sizeof(*pBuf));
     if (pBuf == NULL)
         rc = -ENOMEM;
     if (rc >= 0)
     {
-        pKernel = kmalloc(cb, GFP_KERNEL);
+        pKernel = RTMemAlloc(cb);
         if (pKernel == NULL)
             rc = -ENOMEM;
@@ -437 +438 @@
     else
     {
-        kfree(pBuf);
-        kfree(pKernel);
+        RTMemFree(pBuf);
+        RTMemFree(pKernel);
         LogFunc(("failed, returning %d\n", rc));
     }
@@ -451 +452 @@
     if (copy && copy_to_user(pBuf->pUser, pBuf->pKernel, pBuf->cb) != 0)
         rc = -EFAULT;
-    kfree(pBuf->pKernel);  /* We want to do this whatever the outcome. */
-    kfree(pBuf);
+    RTMemFree(pBuf->pKernel);  /* We want to do this whatever the outcome. */
+    RTMemFree(pBuf);
     if (rc < 0)
         LogFunc(("failed, returning %d\n", rc));