Changeset 51969 in vbox

Timestamp:

Jul 10, 2014 12:58:20 PM (10 years ago)

Author:

vboxsync

Message:

SUPLib-win: Make sure to call supR3HardenedWinInitVersion and supHardenedWinInitImageVerifier regardless of whether fPreInited is set or clear.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp (modified) (2 diffs)

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

@@ -84 +84 @@
 {
     /*
-     * Almost nothing to do if pre-inited.
+     * 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);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
+
+    /*
+     * Done if of pre-inited.
      */
     if (fPreInited)
@@ -92 +102 @@
         return VERR_NOT_SUPPORTED;
 # else
-        supR3HardenedWinInitVersion();
-        return supHardenedWinInitImageVerifier(NULL);
+        return VINF_SUCCESS;
 # endif
 #else