Changeset 53818 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 15, 2015 1:49:51 PM (10 years ago)

Author:

vboxsync

Message:

RTLdr: Added RTLDR_O_IGNORE_ARCH_IF_NO_CODE for PE resource dlls and RTLDR_O_WHATEVER_ARCH for future mach-O hacking.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -3217 +3217 @@
  * @param   cbRawImage  The raw image size.
  * @param   fFlags      Loader flags, RTLDR_O_XXX.
+ * @param   fNoCode     Verify that the image contains no code.
  */
 static int rtldrPEValidateSectionHeaders(const IMAGE_SECTION_HEADER *paSections, unsigned cSections, const char *pszLogName,
-                                         const IMAGE_OPTIONAL_HEADER64 *pOptHdr, RTFOFF cbRawImage, uint32_t fFlags)
+                                         const IMAGE_OPTIONAL_HEADER64 *pOptHdr, RTFOFF cbRawImage, uint32_t fFlags, bool fNoCode)
 {
     const uint32_t              cbImage  = pOptHdr->SizeOfImage;
@@ -3305 +3306 @@
         uRvaPrev = pSH->VirtualAddress + pSH->Misc.VirtualSize;
     }
+
+    /*
+     * Do a separate run if we need to validate the no-code claim from the
+     * optional header.
+     */
+    if (fNoCode)
+    {
+        pSH = &paSections[0];
+        for (unsigned cSHdrsLeft = cSections; cSHdrsLeft > 0; cSHdrsLeft--, pSH++)
+            if (pSH->Characteristics & (IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE))
+                return VERR_LDR_ARCH_MISMATCH;
+    }
+
 
     /** @todo r=bird: more sanity checks! */
@@ -3618 +3632 @@
      * Match the CPU architecture.
      */
-    if (    enmArch != RTLDRARCH_WHATEVER
-        &&  enmArch != enmArchImage)
-        return VERR_LDR_ARCH_MISMATCH;
+    bool fArchNoCodeCheckPending = false;
+    if (    enmArch != enmArchImage
+        &&  (   enmArch != RTLDRARCH_WHATEVER
+             && !(fFlags & RTLDR_O_WHATEVER_ARCH)) )
+    {
+        if (!(fFlags & RTLDR_O_IGNORE_ARCH_IF_NO_CODE))
+            return VERR_LDR_ARCH_MISMATCH;
+        fArchNoCodeCheckPending = true;
+    }
 
     /*
@@ -3634 +3654 @@
     if (RT_FAILURE(rc))
         return rc;
+    if (fArchNoCodeCheckPending && OptHdr.SizeOfCode != 0)
+        return VERR_LDR_ARCH_MISMATCH;
 
     /*
@@ -3647 +3669 @@
     {
         rc = rtldrPEValidateSectionHeaders(paSections, FileHdr.NumberOfSections, pszLogName,
-                                           &OptHdr, pReader->pfnSize(pReader), fFlags);
+                                           &OptHdr, pReader->pfnSize(pReader), fFlags, fArchNoCodeCheckPending);
         if (RT_SUCCESS(rc))
         {