Changeset 38827 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 22, 2011 3:42:33 PM (13 years ago)

Author:

vboxsync

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

74122

Message:

Additions/solaris: Fix panic while mounting shared folders when no previous userland connections to VBoxGuest is alive.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-solaris.c (modified) (4 diffs)
• VBoxGuestIDC-unix.c.h (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -29 +29 @@
 #include <sys/sunddi.h>
 #include <sys/open.h>
+#include <sys/sunldi.h>
+#include <sys/file.h>
 #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 
@@ -173 +175 @@
 /** The IRQ Mutex */
 static kmutex_t             g_IrqMtx;
+/** Layered device handle for kernel keep-attached opens */
+static ldi_handle_t         g_LdiHandle = NULL;
+/** Ref counting for IDCOpen calls */
+static uint64_t             g_cLdiOpens = 0;
+/** The Mutex protecting the LDI handle in IDC opens */
+static kmutex_t             g_LdiMtx;
 
 /**
@@ -195 +203 @@
             cmn_err(CE_NOTE, "failed to initialize driver logging rc=%d!\n", rc);
 
+        mutex_init(&g_LdiMtx, NULL, MUTEX_DRIVER, NULL);
+
         /*
          * Prevent module autounloading.
@@ -231 +241 @@
     RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
     RTLogDestroy(RTLogSetDefaultInstance(NULL));
+
+    mutex_destroy(&g_LdiMtx);
 
     RTR0Term();

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h

@@ -40 +40 @@
 
     AssertPtrReturn(pu32Version, NULL);
+
+#ifdef RT_OS_SOLARIS
+    mutex_enter(&g_LdiMtx);
+    if (!g_LdiHandle)
+    {
+        ldi_ident_t DevIdent = ldi_ident_from_anon();
+        rc = ldi_open_by_name(VBOXGUEST_DEVICE_NAME, FREAD, kcred, &g_LdiHandle, DevIdent);
+        ldi_ident_release(DevIdent);
+        if (rc)
+        {
+            LogRel(("VBoxGuestIDCOpen: ldi_open_by_name failed. rc=%d\n", rc));
+            mutex_exit(&g_LdiMtx);
+            return NULL;
+        }
+    }
+    ++g_cLdiOpens;
+    mutex_exit(&g_LdiMtx);
+#endif
+
     rc = VBoxGuestCreateKernelSession(&g_DevExt, &pSession);
     if (RT_SUCCESS(rc))
@@ -46 +65 @@
         return pSession;
     }
+
+#ifdef RT_OS_SOLARIS
+    mutex_enter(&g_LdiMtx);
+    if (g_cLdiOpens > 0)
+        --g_cLdiOpens;
+    if (   g_cLdiOpens == 0
+        && g_LdiHandle)
+    {
+        ldi_close(g_LdiHandle, FREAD, kcred);
+        g_LdiHandle = NULL;
+    }
+    mutex_exit(&g_LdiMtx);
+#endif
+
     LogRel(("VBoxGuestIDCOpen: VBoxGuestCreateKernelSession failed. rc=%d\n", rc));
     return NULL;
@@ -64 +97 @@
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
     VBoxGuestCloseSession(&g_DevExt, pSession);
+
+#ifdef RT_OS_SOLARIS
+    mutex_enter(&g_LdiMtx);
+    if (g_cLdiOpens > 0)
+        --g_cLdiOpens;
+    if (   g_cLdiOpens == 0
+        && g_LdiHandle)
+    {
+        ldi_close(g_LdiHandle, FREAD, kcred);
+        g_LdiHandle = NULL;
+    }
+    mutex_exit(&g_LdiMtx);
+#endif
+
     return VINF_SUCCESS;
 }