Changeset 43

Timestamp:

Aug 31, 2011, 4:37:38 PM (14 years ago)

Author:

bird

Message:

kLdrModMachO.cpp: detect debug info and be more flexible wrt unimplemented sections.

File:

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

trunk/kLdr/kLdrModMachO.c

@@ -131 +131 @@
     /** The size of the mapped image. */
     KLDRADDR                cbImage;
+    /** Whether we're capable of loading the image. */
+    KBOOL                   fCanLoad;
     /** Whether we're creating a global offset table segment.
      * This dependes on the cputype and image type. */
@@ -186 +188 @@
 static int  kldrModMachODoCreate(PKRDR pRdr, KLDRFOFF offImage, PKLDRMODMACHO *ppMod);
 static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr, KLDRFOFF offImage,
-                                             KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool);
+                                             KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool, PKBOOL pfCanLoad);
 static int  kldrModMachOParseLoadCommands(PKLDRMODMACHO pModMachO, char *pbStringPool, KU32 cbStringPool);
 static int  kldrModMachOAdjustBaseAddress(PKLDRMODMACHO pModMachO, PKLDRADDR pBaseAddress);
@@ -289 +291 @@
     KSIZE cb;
     KBOOL fMakeGot;
+    KBOOL fCanLoad = K_TRUE;
     KU8 cbJmpStub;
     int rc;
@@ -348 +351 @@
                   : sizeof(mach_header_64_t) + offImage);
     if (!rc)
-        rc = kldrModMachOPreParseLoadCommands(pbLoadCommands, &s.Hdr32, pRdr, offImage, &cSegments, &cSections, &cbStringPool);
+        rc = kldrModMachOPreParseLoadCommands(pbLoadCommands, &s.Hdr32, pRdr, offImage,
+                                              &cSegments, &cSections, &cbStringPool, &fCanLoad);
     if (rc)
     {
@@ -454 +458 @@
     pModMachO->LinkAddress = 0;
     pModMachO->cbImage = 0;
+    pModMachO->fCanLoad = fCanLoad;
     pModMachO->fMakeGot = fMakeGot;
     pModMachO->cbJmpStub = cbJmpStub;
@@ -498 +503 @@
  * @param   pcSegments      Where to store the section count.
  * @param   pcbStringPool   Where to store the string pool size.
+ * @param   pfCanLoad       Where to store the can-load-image indicator.
  */
 static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr, KLDRFOFF offImage,
-                                             KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool)
+                                             KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool, PKBOOL pfCanLoad)
 {
     union
@@ -527 +533 @@
     *pcSections = 0;
     *pcbStringPool = 0;
+    *pfCanLoad = K_TRUE;
 
     while (cLeft-- > 0)
@@ -636 +643 @@
                             break;
 
+                        case S_SYMBOL_STUBS:
+                            if (   pSect->reserved1
+                                || pSect->reserved2 < 1
+                                || pSect->reserved2 > 64 )
+                                return KLDR_ERR_MACHO_BAD_SECTION;
+                            fFileBits = 0;
+                            break;
+
+                        case S_NON_LAZY_SYMBOL_POINTERS:
+                        case S_LAZY_SYMBOL_POINTERS:
+                            if (pSect->reserved2) /* (reserved 1 is indirect symbol table index)*/
+                                return KLDR_ERR_MACHO_BAD_SECTION;
+                            *pfCanLoad = K_FALSE;
+                            fFileBits = 0;
+                            break;
+
                         case S_LITERAL_POINTERS:
                         case S_INTERPOSING:
                         case S_GB_ZEROFILL:
-                        case S_NON_LAZY_SYMBOL_POINTERS:
-                        case S_LAZY_SYMBOL_POINTERS:
-                        case S_SYMBOL_STUBS:
-                            return KLDR_ERR_MACHO_UNSUPPORTED_SECTION;
                         case S_MOD_INIT_FUNC_POINTERS:
                             return KLDR_ERR_MACHO_UNSUPPORTED_INIT_SECTION;
@@ -687 +706 @@
                             cSections++;
 
-                            /* Don't load debug symbols. (test this) */
-                            if (pSect->flags & S_ATTR_DEBUG)
+                            /* Don't load debug symbols. */
+                            if (   (pSect->flags & S_ATTR_DEBUG)
+                                || !kHlpStrComp(pSect->segname, "__DWARF"))
                                 break;
 
@@ -807 +827 @@
                             break;
 
+                        case S_SYMBOL_STUBS:
+                            if (   pSect->reserved1
+                                || pSect->reserved2 < 1  /* stub size.*/
+                                || pSect->reserved2 > 64 )
+                                return KLDR_ERR_MACHO_BAD_SECTION;
+                            fFileBits = 1;
+                            break;
+
+                        case S_NON_LAZY_SYMBOL_POINTERS:
+                        case S_LAZY_SYMBOL_POINTERS:
+                            if (pSect->reserved2) /* (reserved 1 is indirect symbol table index)*/
+                                return KLDR_ERR_MACHO_BAD_SECTION;
+                            *pfCanLoad = K_FALSE;
+                            fFileBits = 0;
+                            break;
+
                         case S_LITERAL_POINTERS:
                         case S_INTERPOSING:
                         case S_GB_ZEROFILL:
-                        case S_NON_LAZY_SYMBOL_POINTERS:
-                        case S_LAZY_SYMBOL_POINTERS:
-                        case S_SYMBOL_STUBS:
                             return KLDR_ERR_MACHO_UNSUPPORTED_SECTION;
 #if 1 /** @todo this requires a query API or flag... */
@@ -866 +899 @@
 
                             /* Don't load debug symbols. (test this) */
-                            if (pSect->flags & S_ATTR_DEBUG)
+                            if (   (pSect->flags & S_ATTR_DEBUG)
+                                || !kHlpStrComp(pSect->segname, "__DWARF"))
                                 break;
 
@@ -1109 +1143 @@
 
                             /* Don't load debug symbols. (test this!) */
-                            if (pSect->flags & S_ATTR_DEBUG)
+                            if (   (pSect->flags & S_ATTR_DEBUG)
+                                || !kHlpStrComp(pSect->segname, "__DWARF"))
                             {
                                 pSectExtra++;
@@ -1243 +1278 @@
 
                             /* Don't load debug symbols. (test this!) */
-                            if (pSect->flags & S_ATTR_DEBUG)
+                            if (   (pSect->flags & S_ATTR_DEBUG)
+                                || !kHlpStrComp(pSect->segname, "__DWARF"))
                             {
                                 pSectExtra++;
@@ -2197 +2233 @@
     void *pvBase;
     int rc;
+
+    if (!pModMachO->fCanLoad)
+        return KLDR_ERR_TODO;
 
     /*
@@ -3248 +3287 @@
     int         rc;
 
+    if (!pModMachO->fCanLoad)
+        return KLDR_ERR_TODO;
+
     /*
      * Zero the entire buffer first to simplify things.