Changeset 8327 in vbox for trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c

Timestamp:

Apr 23, 2008 12:49:49 PM (17 years ago)

Author:

vboxsync

Message:

r=bird: Plugged two more leaks in the error handling. (there are more, please fix)

File:

• trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c (modified) (1 diff)

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

@@ -280 +280 @@
     /* Lock down user pages */
     int rc = as_pagelock(useras, &ppl, (caddr_t)R3Ptr, cb, S_WRITE);
-    if (rc != 0)
-    {
-        cmn_err(CE_NOTE,"rtR0MemObjNativeLockUser: as_pagelock failed rc=%d\n", rc);
-        return VERR_LOCK_FAILED;
-    }
-
-    if (!ppl)
-    {
+    if (!rc)
+    {
+        if (ppl)
+        {
+            pMemSolaris->Core.u.Lock.R0Process = (RTR0PROCESS)userproc;
+            pMemSolaris->ppShadowPages = ppl;
+            *ppMem = &pMemSolaris->Core;
+            return VINF_SUCCESS;
+        }
+
         as_pageunlock(useras, ppl, (caddr_t)R3Ptr, cb, S_WRITE);
         cmn_err(CE_NOTE, "rtR0MemObjNativeLockUser: as_pagelock failed to get shadow pages\n");
-        return VERR_LOCK_FAILED;
-    }
-
-    pMemSolaris->Core.u.Lock.R0Process = (RTR0PROCESS)userproc;
-    pMemSolaris->ppShadowPages = ppl;
-    *ppMem = &pMemSolaris->Core;
-    return VINF_SUCCESS;
+    }
+    else
+        cmn_err(CE_NOTE,"rtR0MemObjNativeLockUser: as_pagelock failed rc=%d\n", rc);
+    rtR0MemObjDelete(pMemSolaris);
+    return VERR_LOCK_FAILED;
 }