Changeset 72247 in vbox

Timestamp:

May 17, 2018 5:28:18 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt and HostDriver/Support: bugref:9049: Hardening support for split GUI functionality (at least Win host).

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• Frontends/VirtualBox/src/hardenedmain.cpp (modified) (1 diff)
• HostDrivers/Support/Makefile.kmk (modified) (3 diffs)
• HostDrivers/Support/SUPR3HardenedVerify.cpp (modified) (1 diff)
• HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -89 +89 @@
  VirtualBoxHardenedVM_SOURCES.win = src/platform/win/VirtualBoxHardened.rc
  VirtualBoxHardenedVM_NAME = VirtualBoxVM
+ VirtualBoxHardenedVM_DEFS = VBOX_GUI_WITH_SHARED_LIBRARY
  VirtualBoxHardenedVM_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
  src/platform/win/VirtualBoxHardened.rc_INCS  = $(VirtualBox_0_OUTDIR)

trunk/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp

@@ -65 +65 @@
     uint32_t fFlags = (fStartVM && !fSeparateProcess) ? 0 : SUPSECMAIN_FLAGS_DONT_OPEN_DEV;
 
-#ifdef VBOX_RUNTIME_UI
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
+# ifdef VBOX_RUNTIME_UI
     return SUPR3HardenedMain("VirtualBoxVM",
                              fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR | SUPSECMAIN_FLAGS_OSX_VM_APP,
                              argc, argv, envp);
+# else
+    return SUPR3HardenedMain("VirtualBox",
+                             fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR,
+                             argc, argv, envp);
+# endif
 #else
-    return SUPR3HardenedMain("VirtualBox", fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR, argc, argv, envp);
+    return SUPR3HardenedMain("VirtualBoxVM",
+                             fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR,
+                             argc, argv, envp);
 #endif
 }

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

@@ -148 +148 @@
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
         $(if $(VBOX_WITH_REM),VBOX_WITH_REM,) \
+        $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \
         VBOX_PERMIT_MORE \
         VBOX_PERMIT_EVEN_MORE
@@ -193 +194 @@
         $(if $(VBOX_WITHOUT_DEBUGGER_CHECKS),VBOX_WITHOUT_DEBUGGER_CHECKS,) \
         $(if $(VBOX_PERMIT_VISUAL_STUDIO_PROFILING),VBOX_PERMIT_VISUAL_STUDIO_PROFILING,) \
+        $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \
         VBOX_PERMIT_MORE \
         VBOX_PERMIT_EVEN_MORE
@@ -629 +631 @@
   VBoxDrv_DEFS           += VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV IPRT_WITH_EFLAGS_AC_PRESERVING
  endif
+ ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+  VBoxDrv_DEFS           += VBOX_GUI_WITH_SHARED_LIBRARY
+ endif
 
  VBoxDrv_INCS             = . $(VBoxDrv_0_OUTDIR)

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -199 +199 @@
 //#ifdef VBOX_WITH_QTGUI
     {   kSupIFT_Exe,  kSupID_AppBin,             true, "VirtualBox" SUPLIB_EXE_SUFF },
+# ifndef VBOX_GUI_WITH_SHARED_LIBRARY
     {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VirtualBox" SUPLIB_DLL_SUFF },
-# ifdef RT_OS_DARWIN
+#  ifdef RT_OS_DARWIN
     {   kSupIFT_Exe,  kSupID_AppBin,             true, "VirtualBoxVM" SUPLIB_EXE_SUFF },
+#  endif
+# else
+    {   kSupIFT_Exe,  kSupID_AppBin,             true, "VirtualBoxVM" SUPLIB_EXE_SUFF },
+    {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VirtualBoxVM" SUPLIB_DLL_SUFF },
+    {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VBoxGlobal" SUPLIB_DLL_SUFF },
 # endif
 # if !defined(RT_OS_DARWIN) && !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)

trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp

@@ -213 +213 @@
 {
     "VBoxHeadless.exe",
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
     "VirtualBox.exe",
+#else
+    "VirtualBoxVM.exe",
+#endif
     "VBoxSDL.exe",
     "VBoxNetDHCP.exe",