Changeset 52424 in vbox

Timestamp:

Aug 20, 2014 3:25:37 AM (11 years ago)

Author:

vboxsync

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

95604

Message:

Only VirtualBox.dll has a TrustedError method, so add a flag to advertise it so we don't wast a lot of effort with VBoxHeadless, VBoxSDL and others that doesn't have it.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp (modified) (3 diffs)

trunk/include/VBox/sup.h

@@ -743 +743 @@
  *
  * This is exported as "TrustedError" by the dynamic libraries which contains
- * the "real" application binary for which the hardened stub is built.
+ * the "real" application binary for which the hardened stub is built. The
+ * hardened main() must specify SUPSECMAIN_FLAGS_TRUSTED_ERROR when calling
+ * SUPR3HardenedMain.
  *
  * @param   pszWhere        Where the error occurred (function name).
@@ -777 +779 @@
 DECLHIDDEN(int) SUPR3HardenedMain(const char *pszProgName, uint32_t fFlags, int argc, char **argv, char **envp);
 
-/** @name SUPR3SecureMain flags.
+/** @name SUPR3HardenedMain flags.
  * @{ */
 /** Don't open the device. (Intended for VirtualBox without -startvm.) */
 #define SUPSECMAIN_FLAGS_DONT_OPEN_DEV      RT_BIT_32(0)
+/** The hardened DLL has a "TrustedError" function (see FNSUPTRUSTEDERROR). */
+#define SUPSECMAIN_FLAGS_TRUSTED_ERROR      RT_BIT_32(1)
 /** @} */
 

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

@@ -57 +57 @@
         }
 
-    return SUPR3HardenedMain("VirtualBox", fFlags, argc, argv, envp);
+    return SUPR3HardenedMain("VirtualBox", fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR, argc, argv, envp);
 }
 

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

@@ -135 +135 @@
 /** The program name. */
 static const char      *g_pszSupLibHardenedProgName;
+/** The flags passed to SUPR3HardenedMain. */
+static uint32_t         g_fSupHardenedMain;
 
 #ifdef SUP_HARDENED_SUID
@@ -1538 +1540 @@
 {
     /*
+     * Don't bother if the main() function didn't advertise any TrustedError
+     * export.  It's both a waste of time and may trigger additional problems,
+     * confusing or obscuring the original issue.
+     */
+    if (!(g_fSupHardenedMain & SUPSECMAIN_FLAGS_TRUSTED_ERROR))
+        return NULL;
+
+    /*
      * Construct the name.
      */
@@ -1646 +1656 @@
      */
     g_pszSupLibHardenedProgName = pszProgName;
+    g_fSupHardenedMain          = fFlags;
     g_SupPreInitData.u32Magic     = SUPPREINITDATA_MAGIC;
     g_SupPreInitData.Data.hDevice = SUP_HDEVICE_NIL;