Changeset 57254 in vbox for trunk/src/VBox/HostDrivers/Support/darwin

Timestamp:

Aug 9, 2015 2:26:51 PM (10 years ago)

Author:

vboxsync

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

102008

Message:

SUPDrv: Enabled AC=1 I/O control checks on Linux and extended the checks to include the interrupt flag, I/O privilege level and the direction flag.

File:

• trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -645 +645 @@
      * SMAP check.
      */
-#ifdef VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV
     RTCCUINTREG fSavedEfl = ASMAddFlags(X86_EFL_AC);
-#else
-    RTCCUINTREG fSavedEfl = ASMGetFlags();
-    ASMSetAC();
+
+    int rc = VBoxDrvDarwinIOCtl(Dev, iCmd, pData, fFlags, pProcess);
+
+#if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
+    /*
+     * Before we restore AC and the rest of EFLAGS, check if the IOCtl handler code
+     * accidentially modified it or some other important flag.
+     */
+    if (RT_UNLIKELY(   (ASMGetFlags() & (X86_EFL_AC | X86_EFL_IF | X86_EFL_DF | X86_EFL_IOPL))
+                    != ((fSavedEfl    & (X86_EFL_AC | X86_EFL_IF | X86_EFL_DF | X86_EFL_IOPL)) | X86_EFL_AC) ))
+    {
+        char szTmp[48];
+        RTStrPrintf(szTmp, sizeof(szTmp), "iCmd=%#x: %#x->%#x!", iCmd, (uint32_t)fSavedEfl, (uint32_t)ASMGetFlags());
+        supdrvBadContext(&g_DevExt, "SUPDrv-darwin.cpp",  __LINE__, szTmp);
+    }
 #endif
 
-    int rc = VBoxDrvDarwinIOCtl(Dev, iCmd, pData, fFlags, pProcess);
-
-#if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
-    if (RT_UNLIKELY(!(ASMGetFlags() & X86_EFL_AC)))
-    {
-        char szTmp[32];
-        RTStrPrintf(szTmp, sizeof(szTmp), "iCmd=%#x!", iCmd);
-        supdrvBadContext(&g_DevExt, "SUPDrv-darwin.cpp",  __LINE__, szTmp);
-    }
-#endif
     ASMSetFlags(fSavedEfl);
     return rc;