Changeset 47115 in vbox

Timestamp:

Jul 12, 2013 12:27:42 PM (12 years ago)

Author:

vboxsync

Message:

initterm-r0drv.cpp: RTR0TermForced must not forget to set g_crtR0Users to zero. Darwin my try _start() a _stop()'ed module more than once if _start fails.

File:

• trunk/src/VBox/Runtime/r0drv/initterm-r0drv.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/initterm-r0drv.cpp

@@ -65 +65 @@
 {
     int rc;
+    uint32_t cNewUsers;
     Assert(fReserved == 0);
     RT_ASSERT_PREEMPTIBLE();
@@ -73 +74 @@
      * initialization races should two modules share the IPRT.
      */
-    if (ASMAtomicIncS32(&g_crtR0Users) != 1)
-        return VINF_SUCCESS;
+    cNewUsers = ASMAtomicIncS32(&g_crtR0Users);
+    if (cNewUsers != 1)
+    {
+        if (cNewUsers > 1)
+            return VINF_SUCCESS;
+        ASMAtomicDecS32(&g_crtR0Users);
+        return VERR_INTERNAL_ERROR_3;
+    }
 
     rc = rtR0InitNative();
@@ -127 +134 @@
     if (cNewUsers == 0)
         rtR0Term();
+    else if (cNewUsers < 0)
+        ASMAtomicIncS32(&g_crtR0Users);
 }
 RT_EXPORT_SYMBOL(RTR0Term);
@@ -135 +144 @@
 {
     RT_ASSERT_PREEMPTIBLE();
+
     AssertMsg(g_crtR0Users == 1, ("%d\n", g_crtR0Users));
+    ASMAtomicWriteS32(&g_crtR0Users, 0);
 
     rtR0Term();