Changeset 13910 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Nov 6, 2008 12:27:56 PM (16 years ago)

Author:

vboxsync

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

38917

Message:

Solaris/VBoxNetFlt: failure case fixes.

File:

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

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

@@ -1794 +1794 @@
                             {
                                 /*
+                                 * Inject/Eject from the host IP stack.
+                                 */
+                                if (!fAttach)
+                                    vboxNetFltRetain(pThis, false /* fBusy */);
+
+                                /*
                                  * Set global data which will be grabbed by ModOpen.
                                  * There is a known (though very unlikely) race here because
@@ -1801 +1807 @@
                                 g_VBoxNetFltSolarisStreamType = kIp4Stream;
 
-                                /*
-                                 * Inject/Eject from the host IP stack.
-                                 */
-                                if (!fAttach)
-                                    vboxNetFltRetain(pThis, false /* fBusy */);
                                 rc = strioctl(pIp4VNode, fAttach ? _I_INSERT : _I_REMOVE, (intptr_t)&StrMod, 0, K_TO_K,
                                             kcred, &ret);
@@ -1854 +1855 @@
                                          */
                                         if (fAttach)
-                                            strioctl(pIp4VNode, _I_REMOVE, (intptr_t)&StrMod, 0, K_TO_K, kcred, &ret);
+                                            strioctl(pArpVNode, _I_REMOVE, (intptr_t)&StrMod, 0, K_TO_K, kcred, &ret);
                                     }
                                     else
@@ -1860 +1861 @@
                                         LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: failed to %s the ARP stack. rc=%d\n",
                                                 fAttach ? "inject into" : "eject from", rc));
-                                        if (!fAttach)
-                                            vboxNetFltRelease(pThis, false /* fBusy */);
                                     }
 
@@ -1868 +1867 @@
 
                                     vboxNetFltSolarisRelinkIp4(pUdp4VNode, &Ip4Interface, Ip4MuxFd, ArpMuxFd);
+
+                                    if (!fAttach)
+                                        vboxNetFltRelease(pThis, false /* fBusy */);
                                 }
                                 else
@@ -1873 +1875 @@
                                     LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: failed to %s the IP stack. rc=%d\n",
                                             fAttach ? "inject into" : "eject from", rc));
-                                    if (!fAttach)
-                                        vboxNetFltRelease(pThis, false /* fBusy */);
                                 }
+
+                                g_VBoxNetFltSolarisInstance = NULL;
+                                g_VBoxNetFltSolarisStreamType = kUndefined;
+
+                                if (!fAttach)
+                                    vboxNetFltRelease(pThis, false /* fBusy */);
                             }
                             else
@@ -2011 +2017 @@
                             if (RT_SUCCESS(rc))
                             {
+                                if (!fAttach)
+                                    vboxNetFltRetain(pThis, false /* fBusy */);
+
                                 /*
                                  * Set global data which will be grabbed by ModOpen.
@@ -2018 +2027 @@
                                 g_VBoxNetFltSolarisInstance = pThis;
                                 g_VBoxNetFltSolarisStreamType = kIp6Stream;
-
-                                if (!fAttach)
-                                    vboxNetFltRetain(pThis, false /* fBusy */);
 
                                 /*