Changeset 219 in vbox

Timestamp:

Jan 22, 2007 12:36:58 AM (18 years ago)

Author:

vboxsync

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

17711

Message:

MALLOC (kalloc) fails on relativly small amounts, use IOMallocAliged then.

File:

• trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.c

@@ -378 +378 @@
 {
     int                 rc;
+    void               *pvPageBuf = NULL;
     void               *pvBuf = NULL;
     int                 cbBuf = 0;
@@ -401 +402 @@
         MALLOC(pvBuf, void *, cbBuf, M_TEMP, M_WAITOK);
         if (pvBuf == NULL)
+            pvPageBuf = pvBuf = IOMallocAligned(cbBuf, 8);
+        if (pvBuf == NULL)
         {
             dprintf(("VBoxSupDrvIOCtl: failed to allocate buffer of %d bytes.\n", cbBuf));
@@ -409 +412 @@
         {
             dprintf(("VBoxSupDrvIOCtl: copyin(%p,,%d) failed.\n", pArgs->pvIn, cbBuf));
-            FREE(pvBuf, M_TEMP);
+            if (pvPageBuf)
+                IOFreeAligned(pvPageBuf, cbBuf);
+            else
+                FREE(pvBuf, M_TEMP);
             return rc;
         }
@@ -447 +453 @@
     }
 
-    if (pvBuf)
+    if (pvPageBuf)
+        IOFreeAligned(pvPageBuf, cbBuf);
+    else if (pvBuf)
         FREE(pvBuf, M_TEMP);