Changeset 53820 in vbox

Timestamp:

Jan 15, 2015 1:52:02 PM (10 years ago)

Author:

vboxsync

Message:

SUPHardenedVerfiyImage-win.cpp: Tell RTLdr to disregard the specified arch if there is no code in the DLL, this is what LdrLoadDll does.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp (modified) (1 diff)

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

@@ -1233 +1233 @@
          * Open the image.
          */
-        RTLDRMOD hLdrMod;
-        RTLDRARCH enmArch = fFlags & SUPHNTVI_F_RC_IMAGE ? RTLDRARCH_X86_32 : RTLDRARCH_HOST;
+        RTLDRMOD  hLdrMod;
+        RTLDRARCH enmArch   = fFlags & SUPHNTVI_F_RC_IMAGE ? RTLDRARCH_X86_32 : RTLDRARCH_HOST;
+        uint32_t  fLdrFlags = RTLDR_O_FOR_VALIDATION | RTLDR_O_IGNORE_ARCH_IF_NO_CODE;
         if (fFlags & SUPHNTVI_F_IGNORE_ARCHITECTURE)
-            enmArch = RTLDRARCH_WHATEVER;
-        rc = RTLdrOpenWithReader(&pNtViRdr->Core, RTLDR_O_FOR_VALIDATION, enmArch, &hLdrMod, pErrInfo);
+            fLdrFlags |= RTLDR_O_IGNORE_ARCH_IF_NO_CODE;
+        rc = RTLdrOpenWithReader(&pNtViRdr->Core, fLdrFlags, enmArch, &hLdrMod, pErrInfo);
         if (RT_SUCCESS(rc))
         {