Changeset 51978 in vbox for trunk/src

Timestamp:

Jul 11, 2014 2:57:40 AM (11 years ago)

Author:

vboxsync

Message:

Need to initialize the SUPR3HardenedVerify* bits in the extension pack manager too, so split it (the init code) out into a separate API.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• HostDrivers/Support/SUPLibInternal.h (modified) (1 diff)
• HostDrivers/Support/win/SUPLib-win.cpp (modified) (3 diffs)
• Main/src-all/ExtPackManagerImpl.cpp (modified) (1 diff)
• Main/src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (1 diff)

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

@@ -1467 +1467 @@
 
 
+SUPR3DECL(int) SUPR3HardenedVerifyInit(void)
+{
+#ifdef RT_OS_WINDOWS
+    if (g_cInits == 0)
+        return suplibOsHardenedVerifyInit();
+#endif
+    return VINF_SUCCESS;
+}
+
+
+SUPR3DECL(int) SUPR3HardenedVerifyTerm(void)
+{
+#ifdef RT_OS_WINDOWS
+    if (g_cInits == 0)
+        return suplibOsHardenedVerifyTerm();
+#endif
+    return VINF_SUCCESS;
+}
+
+
 SUPR3DECL(int) SUPR3HardenedVerifyFile(const char *pszFilename, const char *pszMsg, PRTFILE phFile)
 {

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -334 +334 @@
 int     suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted);
 int     suplibOsTerm(PSUPLIBDATA pThis);
+int     suplibOsHardenedVerifyInit(void);
+int     suplibOsHardenedVerifyTerm(void);
 int     suplibOsIOCtl(PSUPLIBDATA pThis, uintptr_t uFunction, void *pvReq, size_t cbReq);
 int     suplibOsIOCtlFast(PSUPLIBDATA pThis, uintptr_t uFunction, uintptr_t idCpu);

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

@@ -80 +80 @@
 #endif
 
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+static bool g_fHardenedVerifyInited = false;
+
+
+int suplibOsHardenedVerifyInit(void)
+{
+    if (!g_fHardenedVerifyInited)
+    {
+#if defined(VBOX_WITH_HARDENING) && !defined(IN_SUP_HARDENED_R3) && !defined(IN_SUP_R3_STATIC)
+        supR3HardenedWinInitVersion();
+        int rc = supHardenedWinInitImageVerifier(NULL);
+        if (RT_FAILURE(rc))
+            return rc;
+        supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation();
+#endif
+        g_fHardenedVerifyInited = true;
+    }
+    return VINF_SUCCESS;
+}
+
+
+int suplibOsHardenedVerifyTerm(void)
+{
+    /** @todo free resources...  */
+    return VINF_SUCCESS;
+}
+
 
 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted)
@@ -86 +115 @@
      * Make sure the image verifier is fully initialized.
      */
-#if defined(VBOX_WITH_HARDENING) && !defined(IN_SUP_HARDENED_R3) && !defined(IN_SUP_R3_STATIC)
-    supR3HardenedWinInitVersion();
-    int rc = supHardenedWinInitImageVerifier(NULL);
+    int rc = suplibOsHardenedVerifyInit();
     if (RT_FAILURE(rc))
         return rc;
-    supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation();
-#endif
 
     /*
@@ -199 +224 @@
 }
 
+
 #ifndef IN_SUP_HARDENED_R3
 

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -716 +716 @@
     m->enmContext                   = a_enmContext;
     m->fMadeReadyCall               = false;
+
+    /*
+     * Make sure the SUPR3Hardened API works (ignoring errors for now).
+     */
+    int rc = SUPR3HardenedVerifyInit();
+    if (RT_FAILURE(rc))
+        LogRel(("SUPR3HardenedVerifyInit failed: %Rrc\n", rc));
 
     /*

trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp

@@ -1787 +1787 @@
         return RTMsgInitFailure(rc);
 
-#ifdef RT_OS_WINDOWS
-    SUPR3InitEx(false /*fUnrestricted*/, NULL); /* Ignore return code, we only need the image verifier bits to work. */
-#endif
+    SUPR3HardenedVerifyInit();
     RTERRINFOSTATIC ErrInfo;
     RTErrInfoInitStatic(&ErrInfo);