Changeset 57253 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin

Timestamp:

Aug 8, 2015 11:32:32 PM (10 years ago)

Author:

vboxsync

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

102007

Message:

VBoxNetFlt/darwin: Save and restore EFLAGS.AC in code that may possibly be called via SUPDrv I/O control code.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (17 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -1014 +1014 @@
 {
     LogFlow(("vboxNetFltDarwinAttachToInterface: pThis=%p (%s)\n", pThis, pThis->szName));
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     /*
@@ -1031 +1032 @@
         else
             Log(("VBoxFltDrv: failed to find ifnet '%s' (err=%d)\n", pThis->szName, err));
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return VERR_INTNET_FLT_IF_NOT_FOUND;
     }
@@ -1098 +1100 @@
     else
         LogRel(("VBoxFltDrv: failed to attach to ifnet '%s' (err=%d)\n", pThis->szName, err));
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return rc;
 }
@@ -1111 +1114 @@
 int  vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
 {
+    IPRT_DARWIN_SAVE_EFL_AC();
     NOREF(pvIfData);
 
@@ -1163 +1167 @@
     }
 
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return rc;
 }
@@ -1169 +1174 @@
 void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
 {
+    IPRT_DARWIN_SAVE_EFL_AC();
     ifnet_t pIfNet = vboxNetFltDarwinRetainIfNet(pThis);
     if (pIfNet)
@@ -1267 +1273 @@
         vboxNetFltDarwinReleaseIfNet(pThis, pIfNet);
     }
+    IPRT_DARWIN_RESTORE_EFL_AC();
 }
 
@@ -1286 +1293 @@
 void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
 {
-    interface_filter_t pIfFilter;
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     /*
@@ -1292 +1299 @@
      */
     RTSpinlockAcquire(pThis->hSpinlock);
-    pIfFilter = ASMAtomicUoReadPtrT(&pThis->u.s.pIfFilter, interface_filter_t);
+    interface_filter_t pIfFilter = ASMAtomicUoReadPtrT(&pThis->u.s.pIfFilter, interface_filter_t);
     if (pIfFilter)
         ASMAtomicUoWriteNullPtr(&pThis->u.s.pIfFilter);
@@ -1305 +1312 @@
         pThis->u.s.pSysSock = NULL;
     }
+
+    IPRT_DARWIN_RESTORE_EFL_AC();
 }
 
@@ -1328 +1337 @@
      * specific to ifnet here is its IPv6 link-local address.
      */
+    IPRT_DARWIN_SAVE_EFL_AC();
     errno_t error;
 
+    /** @todo reorg code to not have numerous returns with duplicate code... */
     error = sock_socket(PF_SYSTEM, SOCK_RAW, SYSPROTO_EVENT,
                         vboxNetFltDarwinSysSockUpcall, pThis,
@@ -1336 +1347 @@
     {
         LogRel(("sock_socket(SYSPROTO_EVENT): error %d\n", error));
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return rc;
     }
@@ -1345 +1357 @@
         LogRel(("FIONBIO: error %d\n", error));
         sock_close(pThis->u.s.pSysSock);
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return rc;
     }
@@ -1352 +1365 @@
         LogRel(("FIONBIO ok, but socket is blocking?!\n"));
         sock_close(pThis->u.s.pSysSock);
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return rc;
     }
@@ -1365 +1379 @@
         LogRel(("SIOCSKEVFILT: error %d\n", error));
         sock_close(pThis->u.s.pSysSock);
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return rc;
     }
@@ -1375 +1390 @@
     {
         LogRel(("ifnet_get_address_list: error %d\n", error));
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return rc;
     }
@@ -1431 +1447 @@
     vboxNetFltDarwinSysSockUpcall(pThis->u.s.pSysSock, pThis, MBUF_DONTWAIT);
 
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return rc;
 }