Changeset 25434 in vbox

Timestamp:

Dec 16, 2009 3:01:29 PM (15 years ago)

Author:

vboxsync

Message:

SUPDrv.c: Failing to take the loader lock is fatal.

File:

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

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

@@ -618 +618 @@
 void VBOXCALL supdrvCleanupSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession)
 {
-    int                 rc, rcLock;
+    int                 rc;
     PSUPDRVBUNDLE       pBundle;
     LogFlow(("supdrvCleanupSession: pSession=%p\n", pSession));
@@ -783 +783 @@
      * Loaded images needs to be dereferenced and possibly freed up.
      */
-    rcLock = supdrvLdrLock(pDevExt);
-    if (rcLock != VINF_SUCCESS)
-        Log(("supdrvLdrLock failed with rc=%d\n", rcLock));
+    supdrvLdrLock(pDevExt);
     Log2(("freeing images:\n"));
     if (pSession->pLdrUsage)
@@ -804 +802 @@
         }
     }
-    /* Calling supdrvLdrUnlock when the above lock failed raises a fatal exception in Windows. */
-    if (rcLock == VINF_SUCCESS)
-        supdrvLdrUnlock(pDevExt);
+    supdrvLdrUnlock(pDevExt);
     Log2(("freeing images - done\n"));
 
@@ -4076 +4072 @@
 {
 #ifdef SUPDRV_USE_MUTEX_FOR_LDR
-    return RTSemMutexRequest(pDevExt->mtxLdr, RT_INDEFINITE_WAIT);
+    int rc = RTSemMutexRequest(pDevExt->mtxLdr, RT_INDEFINITE_WAIT);
 #else
-    return RTSemFastMutexRequest(pDevExt->mtxLdr);
+    int rc = RTSemFastMutexRequest(pDevExt->mtxLdr);
 #endif
+    AssertRC(rc);
+    return rc;
 }