Changeset 97875 in vbox

Timestamp:

Dec 27, 2022 10:08:00 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154965

Message:

IPRT/ldrPE: Corrections to mke tstLdr-4 pass.

File:

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

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

@@ -122 +122 @@
     /** Size of the header (IMAGE_OPTIONAL_HEADER32::SizeOfHeaders). */
     uint32_t                cbHeaders;
+    /** Section alignment (IMAGE_OPTIONAL_HEADER32::SectionAlignment). */
+    uint32_t                uSectionAlign;
     /** The image timestamp. */
     uint32_t                uTimestamp;
@@ -1672 +1674 @@
     SegInfo.cbFile      = pModPe->cbHeaders;
     SegInfo.cbMapped    = pModPe->cbHeaders;
-    if ((pModPe->paSections[0].Characteristics & IMAGE_SCN_TYPE_NOLOAD))
+    if (!(pModPe->paSections[0].Characteristics & IMAGE_SCN_TYPE_NOLOAD))
         SegInfo.cbMapped = pModPe->paSections[0].VirtualAddress;
     int rc = pfnCallback(pMod, &SegInfo, pvUser);
@@ -1709 +1711 @@
         if (SegInfo.Alignment > 0)
             SegInfo.Alignment   = RT_BIT_64(SegInfo.Alignment - 1);
+        else
+            SegInfo.Alignment   = pModPe->uSectionAlign;
         if (pSh->Characteristics & IMAGE_SCN_TYPE_NOLOAD)
         {
             SegInfo.LinkAddress = NIL_RTLDRADDR;
             SegInfo.RVA         = NIL_RTLDRADDR;
-            SegInfo.cbMapped    = pSh->Misc.VirtualSize;
+            SegInfo.cbMapped    = 0;
         }
         else
@@ -1719 +1723 @@
             SegInfo.LinkAddress = pSh->VirtualAddress + pModPe->uImageBase;
             SegInfo.RVA         = pSh->VirtualAddress;
-            SegInfo.cbMapped    = RT_ALIGN(SegInfo.cb, SegInfo.Alignment);
+            SegInfo.cbMapped    = RT_ALIGN(pSh->Misc.VirtualSize, SegInfo.Alignment);
             if (i + 1 < pModPe->cSections && !(pSh[1].Characteristics & IMAGE_SCN_TYPE_NOLOAD))
                 SegInfo.cbMapped = pSh[1].VirtualAddress - pSh->VirtualAddress;
@@ -1808 +1812 @@
     if (iSeg == 0)
         *pRva = offSeg;
-    else if (pModPe->paSections[iSeg].Characteristics & IMAGE_SCN_TYPE_NOLOAD)
+    else if (!(pModPe->paSections[iSeg - 1].Characteristics & IMAGE_SCN_TYPE_NOLOAD))
+        *pRva = offSeg + pModPe->paSections[iSeg - 1].VirtualAddress;
+    else
         return VERR_LDR_INVALID_SEG_OFFSET;
-    else
-        *pRva = offSeg + pModPe->paSections[iSeg - 1].VirtualAddress;
     return VINF_SUCCESS;
 }
@@ -4297 +4301 @@
     }
 #endif
+    if (!RT_IS_POWER_OF_TWO(pOptHdr->SectionAlignment))
+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
+                                   "SectionAlignment=%#x - not a power of two", pOptHdr->SectionAlignment);
+    if (pOptHdr->SectionAlignment < 16 || pOptHdr->SectionAlignment > _128K)
+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
+                                   "SectionAlignment=%#x - unsupported value, not between 16 and 128KB", pOptHdr->SectionAlignment);
     if (pOptHdr->SizeOfHeaders >= cbImage)
     {
@@ -5115 +5125 @@
                 pModPe->cbImage       = OptHdr.SizeOfImage;
                 pModPe->cbHeaders     = OptHdr.SizeOfHeaders;
+                pModPe->uSectionAlign = OptHdr.SectionAlignment;
                 pModPe->uTimestamp    = FileHdr.TimeDateStamp;
                 pModPe->cImports      = UINT32_MAX;