Changeset 57313 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Aug 13, 2015 10:16:46 AM (10 years ago)

Author:

vboxsync

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

102075

Message:

IPRT,SUPDrv: More work on preserving certain EFLAGS for CONFIG_X86_SMAP.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (2 diffs)
• linux/Makefile (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -581 +581 @@
  endif
  if ($(VBOX_VERSION_BUILD) % 2) == 1
-  VBoxDrv_DEFS           += VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV
+  VBoxDrv_DEFS           += VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV IPRT_WITH_EFLAGS_AC_PRESERVING
  endif
 
@@ -707 +707 @@
         $(QUIET)$(SED) -e "" \
                 $(if-expr !defined(VBOX_WITH_HARDENING)   ,-e "s;-DVBOX_WITH_HARDENING;;g",) \
-                $(if-expr ($(VBOX_VERSION_BUILD) % 2) == 0 || 1,-e "s;-DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g",) \
+                $(if-expr ($(VBOX_VERSION_BUILD) % 2) == 0 || 1 \
+                 , -e "s;-DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" -e "s;-DIPRT_WITH_EFLAGS_AC_PRESERVING;;g",) \
                 --output $@ $<
         %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/vboxdrv-mod-1.dep' \

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -256 +256 @@
 KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
             -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
-            -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV \
+            -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV -DIPRT_WITH_EFLAGS_AC_PRESERVING \
             -Wno-declaration-after-statement
 ifdef VBOX_REDHAT_KABI

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -710 +710 @@
     {
         char szTmp[48];
-        RTStrPrintf(szTmp, sizeof(szTmp), "uCmd=%#x: %#x->%#x!", uCmd, (uint32_t)fSavedEfl, (uint32_t)ASMGetFlags());
+        RTStrPrintf(szTmp, sizeof(szTmp), "uCmd=%#x: %#x->%#x!", _IOC_NR(uCmd), (uint32_t)fSavedEfl, (uint32_t)ASMGetFlags());
         supdrvBadContext(&g_DevExt, "SUPDrv-linux.c",  __LINE__, szTmp);
     }
@@ -741 +741 @@
      * Read the header.
      */
-    if (RT_UNLIKELY(copy_from_user(&Hdr, (void *)ulArg, sizeof(Hdr))))
+    if (RT_FAILURE(RTR0MemUserCopyFrom(&Hdr, ulArg, sizeof(Hdr))))
     {
         Log(("VBoxDrvLinuxIOCtl: copy_from_user(,%#lx,) failed; uCmd=%#x\n", ulArg, uCmd));
@@ -772 +772 @@
         return -ENOMEM;
     }
-    if (RT_UNLIKELY(copy_from_user(pHdr, (void *)ulArg, Hdr.cbIn)))
+    if (RT_FAILURE(RTR0MemUserCopyFrom(pHdr, ulArg, Hdr.cbIn)))
     {
         Log(("VBoxDrvLinuxIOCtl: copy_from_user(,%#lx, %#x) failed; uCmd=%#x\n", ulArg, Hdr.cbIn, uCmd));
@@ -797 +797 @@
             cbOut = cbBuf;
         }
-        if (RT_UNLIKELY(copy_to_user((void *)ulArg, pHdr, cbOut)))
+        if (RT_FAILURE(RTR0MemUserCopyTo(ulArg, pHdr, cbOut)))
         {
             /* this is really bad! */