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

Timestamp:

Mar 25, 2010 11:54:23 AM (15 years ago)

Author:

vboxsync

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

59292

Message:

Solaris/VBoxNetFlt: fix panic in failure exit path. (public #6412)

File:

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

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

@@ -1827 +1827 @@
     pszEnd++;
 
-    int rc;
-    long PPA;
+    int rc = VERR_GENERAL_FAILURE;
+    long PPA = -1;
     if (   pszEnd
         && ddi_strtol(pszEnd, NULL, 10, &PPA) == 0)
@@ -1853 +1853 @@
 
             ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
+            pThis->u.s.hIface = NULL;
             LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 dl_attach failed. rc=%d szDev=%s PPA=%d rc=%d\n", rc, szDev, PPA));
         }
@@ -1952 +1953 @@
 
     ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
+    pThis->u.s.hIface = NULL;
 
     return VERR_INTNET_FLT_IF_FAILED;
@@ -1966 +1968 @@
     LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisCloseStream pThis=%p\n"));
 
-    ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
+    if (pThis->u.s.hIface)
+    {
+        ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
+        pThis->u.s.hIface = NULL;
+    }
 }
 
@@ -2484 +2490 @@
     LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling pThis=%p\n", pThis));
 
-    int rc = VINF_SUCCESS;
+    int rc = VERR_GENERAL_FAILURE;
     vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
     if (RT_LIKELY(pPromiscStream))
@@ -2498 +2504 @@
                 LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Invalid polling interval %d. Expected between 1 and 120 secs.\n",
                                     Interval));
-                return VINF_SUCCESS;
+                return VERR_INVALID_PARAMETER;
             }
 
@@ -2515 +2521 @@
         }
         else
+        {
             LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Polling already started.\n"));
+            rc = VINF_SUCCESS;
+        }
     }
     return rc;
@@ -2572 +2581 @@
         if (RT_SUCCESS(rc))
         {
+            /*
+             * Ipv6 attaching is optional and can fail. We don't bother to bring down the whole
+             * attach process just if Ipv6 interface is unavailable.
+             */
             int rc2 = vboxNetFltSolarisAttachIp6(pThis, true /* fAttach */);
+
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+            /*
+             * If Ip6 interface is not plumbed and an Ip6 polling interval is specified, we need
+             * to begin polling to attach on the Ip6 interface whenver it comes up.
+             */
             if (   rc2 == VERR_INTNET_FLT_IF_NOT_FOUND
                 && g_VBoxNetFltSolarisPollInterval != -1)
             {
-                rc = vboxNetFltSolarisSetupIp6Polling(pThis);
-                if (RT_FAILURE(rc))
+                int rc3 = vboxNetFltSolarisSetupIp6Polling(pThis);
+                if (RT_FAILURE(rc3))
                 {
-                    ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pvIp6Stream, NULL);
-                    vboxNetFltSolarisDetachFromInterface(pThis);
+                    /*
+                     * If we failed to setup Ip6 polling, warn in the release log and continue.
+                     */
+                    LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface IPv6 polling inactive. rc=%Rrc\n", rc3));
                 }
             }
-            else
 #endif
-                ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, false);
-        }
-        else
-            vboxNetFltSolarisCloseStream(pThis);
+
+            /*
+             * Ipv4 is successful, and maybe Ipv6, we're ready for transfers.
+             */
+            ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, false);
+            return VINF_SUCCESS;
+        }
+
+        vboxNetFltSolarisCloseStream(pThis);
     }
     else
@@ -3549 +3573 @@
      * Init. the solaris specific data.
      */
+    pThis->u.s.hIface = NULL;
     pThis->u.s.pvIp4Stream = NULL;
     pThis->u.s.pvIp6Stream = NULL;