Changeset 23361 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Sep 28, 2009 9:35:48 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: fixed crash with kcred deallocation behind our back.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (10 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -372 +372 @@
 
 /** The list of all opened streams. */
-vboxnetflt_stream_t *g_VBoxNetFltSolarisStreams;
+vboxnetflt_stream_t *g_VBoxNetFltSolarisStreams = NULL;
 
 /** Global mutex protecting open/close. */
@@ -384 +384 @@
  * in ModOpen. This is just shared global data between the dynamic attach and the ModOpen procedure.
  */
-PVBOXNETFLTINS volatile g_VBoxNetFltSolarisInstance;
+PVBOXNETFLTINS volatile g_VBoxNetFltSolarisInstance = NULL;
 
 /** Goes along with the instance to determine type of stream being opened/created. */
@@ -391 +391 @@
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
 /** Global IPv6 polling interval */
-static int g_VBoxNetFltSolarisPollInterval = 0;
+static int g_VBoxNetFltSolarisPollInterval = -1;
 #endif
 
@@ -422 +422 @@
         g_VBoxNetFltSolarisStreams = NULL;
         g_VBoxNetFltSolarisInstance = NULL;
-
-        int rc = RTSemFastMutexCreate(&g_VBoxNetFltSolarisMtx);
-        if (RT_SUCCESS(rc))
-        {
-            /*
-             * Initialize the globals and connect to the support driver.
-             *
-             * This will call back vboxNetFltOsOpenSupDrv (and maybe vboxNetFltOsCloseSupDrv)
-             * for establishing the connect to the support driver.
-             */
-            memset(&g_VBoxNetFltSolarisGlobals, 0, sizeof(g_VBoxNetFltSolarisGlobals));
-            rc = vboxNetFltInitGlobalsAndIdc(&g_VBoxNetFltSolarisGlobals);
+        g_pVBoxNetFltSolarisCred = crdup(kcred);
+        if (RT_LIKELY(g_pVBoxNetFltSolarisCred))
+        {
+            rc = RTSemFastMutexCreate(&g_VBoxNetFltSolarisMtx);
             if (RT_SUCCESS(rc))
             {
-                rc = mod_install(&g_VBoxNetFltSolarisModLinkage);
-                if (!rc)
-                    return rc;
-
-                LogRel((DEVICE_NAME ":mod_install failed. rc=%d\n", rc));
-                vboxNetFltTryDeleteIdcAndGlobals(&g_VBoxNetFltSolarisGlobals);
+                /*
+                 * Initialize the globals and connect to the support driver.
+                 *
+                 * This will call back vboxNetFltOsOpenSupDrv (and maybe vboxNetFltOsCloseSupDrv)
+                 * for establishing the connect to the support driver.
+                 */
+                memset(&g_VBoxNetFltSolarisGlobals, 0, sizeof(g_VBoxNetFltSolarisGlobals));
+                rc = vboxNetFltInitGlobalsAndIdc(&g_VBoxNetFltSolarisGlobals);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = mod_install(&g_VBoxNetFltSolarisModLinkage);
+                    if (!rc)
+                        return rc;
+
+                    LogRel((DEVICE_NAME ":mod_install failed. rc=%d\n", rc));
+                    vboxNetFltTryDeleteIdcAndGlobals(&g_VBoxNetFltSolarisGlobals);
+                }
+                else
+                    LogRel((DEVICE_NAME ":failed to initialize globals.\n"));
+
+                RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
+                g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
             }
-            else
-                LogRel((DEVICE_NAME ":failed to initialize globals.\n"));
-
-            RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
-            g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
+        }
+        else
+        {
+            LogRel((DEVICE_NAME ":failed to allocate credentials.\n"));
+            rc = VERR_NO_MEMORY;
         }
 
@@ -478 +486 @@
     if (!rc)
     {
+        if (g_pVBoxNetFltSolarisCred)
+        {
+            crfree(g_pVBoxNetFltSolarisCred);
+            g_pVBoxNetFltSolarisCred = NULL;
+        }
+
         if (g_VBoxNetFltSolarisMtx != NIL_RTSEMFASTMUTEX)
         {
@@ -523 +537 @@
             {
                 g_pVBoxNetFltSolarisDip = pDip;
-                g_pVBoxNetFltSolarisCred = crdup(kcred);
-                if (RT_LIKELY(g_pVBoxNetFltSolarisCred))
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+                /*
+                 * Get the user prop. for polling interval.
+                 */
+                int Interval = ddi_getprop(DDI_DEV_T_ANY, pDip, DDI_PROP_DONTPASS, VBOXNETFLT_IP6POLLINTERVAL, -1 /* default */);
+                if (Interval == -1)
+                    LogFlow((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: no poll interval property specified. Skipping Ipv6 polling.\n"));
+                else if (Interval < 1 || Interval > 120)
                 {
-#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
-                    /*
-                     * Get the user prop. for polling interval.
-                     */
-                    int Interval = ddi_getprop(DDI_DEV_T_ANY, pDip, DDI_PROP_DONTPASS, VBOXNETFLT_IP6POLLINTERVAL, -1 /* default */);
-                    if (Interval == -1)
-                        LogFlow((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: no poll interval property specified. Skipping Ipv6 polling.\n"));
-                    else if (Interval < 1 || Interval > 120)
-                    {
-                        LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Invalid polling interval %d. Expected between 1 and 120 secs.\n",
-                                            Interval));
-                        Interval = -1;
-                    }
-
-                    g_VBoxNetFltSolarisPollInterval = Interval;
+                    LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Invalid polling interval %d. Expected between 1 and 120 secs.\n",
+                                        Interval));
+                    Interval = -1;
+                }
+
+                g_VBoxNetFltSolarisPollInterval = Interval;
 #endif
-                    ddi_report_dev(pDip);
-                    return DDI_SUCCESS;
-                }
-                else
-                    LogRel((DEVICE_NAME ":failed to alloc credentials.\n"));
+                ddi_report_dev(pDip);
+                return DDI_SUCCESS;
             }
             else
@@ -580 +588 @@
         {
             int instance = ddi_get_instance(pDip);
-            if (g_pVBoxNetFltSolarisCred)
-            {
-                crfree(g_pVBoxNetFltSolarisCred);
-                g_pVBoxNetFltSolarisCred = NULL;
-            }
             ddi_remove_minor_node(pDip, NULL);
             return DDI_SUCCESS;
@@ -1906 +1909 @@
         if (!ret)
         {
-            rc = RTSemFastMutexRequest(g_VBoxNetFltSolarisMtx);
-            AssertRCReturn(rc, rc);
-
-            g_VBoxNetFltSolarisInstance = pThis;
-            g_VBoxNetFltSolarisStreamType = kPromiscStream;
-
-            rc = ldi_ioctl(pThis->u.s.hIface, I_PUSH, (intptr_t)DEVICE_NAME, FKIOCTL, g_pVBoxNetFltSolarisCred, &ret);
-
-            g_VBoxNetFltSolarisInstance = NULL;
-            g_VBoxNetFltSolarisStreamType = kUndefined;
-
-            RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
+            if (RT_LIKELY(g_pVBoxNetFltSolarisCred))        /* Paranoia */
+            {
+                rc = RTSemFastMutexRequest(g_VBoxNetFltSolarisMtx);
+                AssertRCReturn(rc, rc);
+
+                g_VBoxNetFltSolarisInstance = pThis;
+                g_VBoxNetFltSolarisStreamType = kPromiscStream;
+
+                rc = ldi_ioctl(pThis->u.s.hIface, I_PUSH, (intptr_t)DEVICE_NAME, FKIOCTL, g_pVBoxNetFltSolarisCred, &ret);
+
+                g_VBoxNetFltSolarisInstance = NULL;
+                g_VBoxNetFltSolarisStreamType = kUndefined;
+
+                RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
+            }
+            else
+            {
+                LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStream huh!? Missing credentials.\n"));
+                rc = VERR_INVALID_POINTER;
+            }
 
             if (!rc)
@@ -1929 +1940 @@
     else
         LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStream Failed to search for filter in interface '%s'.\n", pThis->szName));
+
+    ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
 
     return VERR_INTNET_FLT_IF_FAILED;
@@ -2174 +2187 @@
                                             fAttach ? "inject into" : "eject from", rc));
                                 }
-
-                                g_VBoxNetFltSolarisInstance = NULL;
-                                g_VBoxNetFltSolarisStreamType = kUndefined;
                             }
                             else