Changeset 64 in kStuff for trunk

Timestamp:

Nov 6, 2013 9:04:11 PM (11 years ago)

Author:

bird

Message:

kLdrModMachO.c: Don't load LINKEDIT.

File:

• trunk/kLdr/kLdrModMachO.c (modified) (3 diffs)

trunk/kLdr/kLdrModMachO.c

@@ -1315 +1315 @@
      */
     {
+        KBOOL               fLoadLinkEdit = K_FALSE;
         PKLDRMODMACHOSECT   pSectExtraItr;
         KLDRADDR            uNextRVA = 0;
         KLDRADDR            cb;
+        KU32                cSegmentsToAdjust = cSegments - pModMachO->fMakeGot;
         KU32                c;
 
+        for (;;)
+        {
+            /* Check if there is __DWARF segment at the end and make sure it's left
+               out of the RVA negotiations and image loading. */
+            if (   cSegmentsToAdjust > 0
+                && !kHlpStrComp(pModMachO->pMod->aSegments[cSegmentsToAdjust - 1].pchName, "__DWARF"))
+            {
+                cSegmentsToAdjust--;
+                pModMachO->pMod->aSegments[cSegmentsToAdjust].RVA = NIL_KLDRADDR;
+                pModMachO->pMod->aSegments[cSegmentsToAdjust].cbMapped = 0;
+                continue;
+            }
+
+            /* If we're skipping the __LINKEDIT segment, check for it and adjust
+               the number of segments we'll be messing with here.  ASSUMES it's
+               last (by now anyway). */
+            if (   !fLoadLinkEdit
+                && cSegmentsToAdjust > 0
+                && !kHlpStrComp(pModMachO->pMod->aSegments[cSegmentsToAdjust - 1].pchName, "__LINKEDIT"))
+            {
+                cSegmentsToAdjust--;
+                pModMachO->pMod->aSegments[cSegmentsToAdjust].RVA = NIL_KLDRADDR;
+                pModMachO->pMod->aSegments[cSegmentsToAdjust].cbMapped = 0;
+                continue;
+            }
+            break;
+        }
+
         /* Adjust RVAs. */
-        c = cSegments - pModMachO->fMakeGot;
+        c = cSegmentsToAdjust;
         for (pDstSeg = &pModMachO->pMod->aSegments[0]; c-- > 0; pDstSeg++)
         {
@@ -1334 +1364 @@
 
         /* Calculate the cbMapping members. */
-        c = cSegments - pModMachO->fMakeGot;
+        c = cSegmentsToAdjust;
         for (pDstSeg = &pModMachO->pMod->aSegments[0]; c-- > 1; pDstSeg++)
         {
+
             cb = pDstSeg[1].RVA - pDstSeg->RVA;
             pDstSeg->cbMapped = (KSIZE)cb == cb ? cb : KSIZE_MAX;
@@ -1347 +1378 @@
         pModMachO->cbImage = pDstSeg->RVA + cb;
 
-        /* Fixup the section RVA (internal). */
-        c        = cSegments - pModMachO->fMakeGot;
+        /* Fixup the section RVAs (internal). */
+        c        = cSegmentsToAdjust;
         uNextRVA = pModMachO->cbImage;
         pDstSeg  = &pModMachO->pMod->aSegments[0];