Changeset 4474 in vbox for trunk/src/VBox/HostDrivers/Support/solaris

Timestamp:

Aug 31, 2007 7:23:49 PM (17 years ago)

Author:

vboxsync

Message:

Solaris.

File:

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

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

@@ -513 +513 @@
     PSUPDRVIOCTLDATA    pArgData = (PSUPDRVIOCTLDATA)pArgs;
 
-    cmn_err(CE_CONT, "VBoxDrvSolarisIOCtlSlow\n");
    /*
      * Allocate and copy user space input data buffer to kernel space.
@@ -528 +527 @@
         }
         
-        rc = ddi_copyin(pArgData->pvIn, pvBuf, cbBuf, Mode);
+        rc = ddi_copyin(pArgData->pvIn, pvBuf, pArgData->cbIn, Mode);
         
         if (rc != 0)
         {
-            OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: ddi_copyin(%p,%d) failed.\n", pArgData->pvIn, cbBuf));
+            OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: ddi_copyin(%p,%d) failed.\n", pArgData->pvIn, pArgData->cbIn));
 
             RTMemTmpFree(pvBuf);
@@ -555 +554 @@
             rc = ddi_copyout(pvBuf, pArgData->pvOut, cbOut, Mode);
             if (rc != 0)
+            {
                 OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: ddi_copyout(,%p,%d) failed.\n", pArgData->pvOut, cbBuf));
+
+                /** @todo r=bird: why this extra return? setting rc = EFAULT; should do the trick, shouldn't it? */
+                RTMemTmpFree(pvBuf);
+                return EFAULT;
+            }
         }
         else
@@ -564 +569 @@
     }
 
+    if (pvBuf)
+        RTMemTmpFree(pvBuf);
+    
     OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: returns %d cbOut=%d\n", rc, cbOut));
     return rc;