Changeset 70257 in vbox for trunk/src/VBox

Timestamp:

Dec 21, 2017 6:15:11 AM (7 years ago)

Author:

vboxsync

Message:

IPRT/ldrPE.cpp: Almost forgotten old linkers didn't set IMAGE_SECTION_HEADER::Misc.VirtualSize - implemented the usual workaround.

File:

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

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

@@ -3376 +3376 @@
 
 /**
- * Validates the section headers.
+ * Validates and touch up the section headers.
+ *
+ * The touching up is restricted to setting the VirtualSize field for old-style
+ * linkers that sets it to zero.
  *
  * @returns iprt status code.
@@ -3387 +3390 @@
  * @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, bool fNoCode)
+static int rtldrPEValidateAndTouchUpSectionHeaders(IMAGE_SECTION_HEADER *paSections, unsigned cSections, const char *pszLogName,
+                                                   const IMAGE_OPTIONAL_HEADER64 *pOptHdr, RTFOFF cbRawImage, uint32_t fFlags,
+                                                   bool fNoCode)
 {
     RT_NOREF_PV(pszLogName);
 
+    /*
+     * Do a quick pass to detect linker setting VirtualSize to zero.
+     */
+    bool                  fFixupVirtualSize = true;
+    IMAGE_SECTION_HEADER *pSH = &paSections[0];
+    for (unsigned cSHdrsLeft = cSections; cSHdrsLeft > 0; cSHdrsLeft--, pSH++)
+        if (    pSH->Misc.VirtualSize != 0
+            && !(pSH->Characteristics & IMAGE_SCN_TYPE_NOLOAD))
+        {
+            fFixupVirtualSize = false;
+            break;
+        }
+
+    /*
+     * Actual pass.
+     */
     const uint32_t              cbImage  = pOptHdr->SizeOfImage;
-    const IMAGE_SECTION_HEADER *pSH      = &paSections[0];
     uint32_t                    uRvaPrev = pOptHdr->SizeOfHeaders;
+    pSH = &paSections[0];
     Log3(("RTLdrPE: Section Headers:\n"));
-    for (unsigned cSHdrsLeft = cSections;  cSHdrsLeft > 0; cSHdrsLeft--, pSH++)
+    for (unsigned cSHdrsLeft = cSections; cSHdrsLeft > 0; cSHdrsLeft--, pSH++)
     {
         const unsigned iSH = (unsigned)(pSH - &paSections[0]); NOREF(iSH);
@@ -3419 +3439 @@
         }
 
-        if (    pSH->Misc.VirtualSize
-            &&  !(pSH->Characteristics & IMAGE_SCN_TYPE_NOLOAD)) /* binutils uses this for '.stab' even if it's reserved/obsoleted by MS. */
-        {
-            if (pSH->VirtualAddress < uRvaPrev)
-            {
-                Log(("rtldrPEOpen: %s: Overlaps previous section or sections aren't in ascending order, VirtualAddress=%#x uRvaPrev=%#x - section #%d '%.*s'!!!\n",
-                     pszLogName, pSH->VirtualAddress, uRvaPrev, iSH, sizeof(pSH->Name), pSH->Name));
-                return VERR_BAD_EXE_FORMAT;
-            }
-            if (pSH->VirtualAddress > cbImage)
-            {
-                Log(("rtldrPEOpen: %s: VirtualAddress=%#x - beyond image size (%#x) - section #%d '%.*s'!!!\n",
-                     pszLogName, pSH->VirtualAddress, cbImage, iSH, sizeof(pSH->Name), pSH->Name));
-                return VERR_BAD_EXE_FORMAT;
-            }
-
-            if (pSH->VirtualAddress & (pOptHdr->SectionAlignment - 1)) //ASSUMES power of 2 alignment.
-            {
-                Log(("rtldrPEOpen: %s: VirtualAddress=%#x misaligned (%#x) - section #%d '%.*s'!!!\n",
-                     pszLogName, pSH->VirtualAddress, pOptHdr->SectionAlignment, iSH, sizeof(pSH->Name), pSH->Name));
-                return VERR_BAD_EXE_FORMAT;
-            }
-
-#ifdef PE_FILE_OFFSET_EQUALS_RVA
-            /* Our loader code assume rva matches the file offset. */
-            if (    pSH->SizeOfRawData
-                &&  pSH->PointerToRawData != pSH->VirtualAddress)
-            {
-                Log(("rtldrPEOpen: %s: ASSUMPTION FAILED: file offset %#x != RVA %#x - section #%d '%.*s'!!!\n",
-                     pszLogName, pSH->PointerToRawData, pSH->VirtualAddress, iSH, sizeof(pSH->Name), pSH->Name));
-                return VERR_BAD_EXE_FORMAT;
-            }
-#endif
-        }
-
-        /// @todo only if SizeOfRawData > 0 ?
         if (    pSH->PointerToRawData > cbRawImage /// @todo pSH->PointerToRawData >= cbRawImage ?
             ||  pSH->SizeOfRawData > cbRawImage
@@ -3472 +3456 @@
         }
 
+        if (!(pSH->Characteristics & IMAGE_SCN_TYPE_NOLOAD)) /* binutils uses this for '.stab' even if it's reserved/obsoleted by MS. */
+        {
+            /* Calc VirtualSize if necessary.  This is for internal reasons. */
+            if (   pSH->Misc.VirtualSize == 0
+                && fFixupVirtualSize)
+            {
+                pSH->Misc.VirtualSize = cbImage - RT_MIN(pSH->VirtualAddress, cbImage);
+                for (uint32_t i = 1; i < cSHdrsLeft; i++)
+                    if (   !(pSH[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)
+                        && pSH[i].VirtualAddress >= pSH->VirtualAddress)
+                    {
+                        pSH->Misc.VirtualSize = RT_MIN(pSH[i].VirtualAddress - pSH->VirtualAddress, pSH->Misc.VirtualSize);
+                        break;
+                    }
+            }
+
+            if (pSH->Misc.VirtualSize > 0)
+            {
+                if (pSH->VirtualAddress < uRvaPrev)
+                {
+                    Log(("rtldrPEOpen: %s: Overlaps previous section or sections aren't in ascending order, VirtualAddress=%#x uRvaPrev=%#x - section #%d '%.*s'!!!\n",
+                         pszLogName, pSH->VirtualAddress, uRvaPrev, iSH, sizeof(pSH->Name), pSH->Name));
+                    return VERR_BAD_EXE_FORMAT;
+                }
+                if (pSH->VirtualAddress > cbImage)
+                {
+                    Log(("rtldrPEOpen: %s: VirtualAddress=%#x - beyond image size (%#x) - section #%d '%.*s'!!!\n",
+                         pszLogName, pSH->VirtualAddress, cbImage, iSH, sizeof(pSH->Name), pSH->Name));
+                    return VERR_BAD_EXE_FORMAT;
+                }
+
+                if (pSH->VirtualAddress & (pOptHdr->SectionAlignment - 1)) //ASSUMES power of 2 alignment.
+                {
+                    Log(("rtldrPEOpen: %s: VirtualAddress=%#x misaligned (%#x) - section #%d '%.*s'!!!\n",
+                         pszLogName, pSH->VirtualAddress, pOptHdr->SectionAlignment, iSH, sizeof(pSH->Name), pSH->Name));
+                    return VERR_BAD_EXE_FORMAT;
+                }
+
+#ifdef PE_FILE_OFFSET_EQUALS_RVA
+                /* Our loader code assume rva matches the file offset. */
+                if (    pSH->SizeOfRawData
+                    &&  pSH->PointerToRawData != pSH->VirtualAddress)
+                {
+                    Log(("rtldrPEOpen: %s: ASSUMPTION FAILED: file offset %#x != RVA %#x - section #%d '%.*s'!!!\n",
+                         pszLogName, pSH->PointerToRawData, pSH->VirtualAddress, iSH, sizeof(pSH->Name), pSH->Name));
+                    return VERR_BAD_EXE_FORMAT;
+                }
+#endif
+
+                uRvaPrev = pSH->VirtualAddress + pSH->Misc.VirtualSize;
+            }
+        }
+
         /* ignore the relocations and linenumbers. */
-
-        uRvaPrev = pSH->VirtualAddress + pSH->Misc.VirtualSize;
     }
 
@@ -3940 +3975 @@
     if (RT_SUCCESS(rc))
     {
-        rc = rtldrPEValidateSectionHeaders(paSections, FileHdr.NumberOfSections, pszLogName,
-                                           &OptHdr, pReader->pfnSize(pReader), fFlags, fArchNoCodeCheckPending);
+        rc = rtldrPEValidateAndTouchUpSectionHeaders(paSections, FileHdr.NumberOfSections, pszLogName,
+                                                     &OptHdr, pReader->pfnSize(pReader), fFlags, fArchNoCodeCheckPending);
         if (RT_SUCCESS(rc))
         {