Changeset 56

Timestamp:

Oct 11, 2013, 4:07:22 AM (12 years ago)

Author:

bird

Message:

More mach-o debug info loading adjustments.

Location:

trunk

Files:

• include/k/kLdrFmts/mach-o.h (modified) (1 diff)
• kLdr/kLdrModMachO.c (modified) (4 diffs)

trunk/include/k/kLdrFmts/mach-o.h

@@ -370 +370 @@
 #define LC_ROUTINES_64      KU32_C(0x1a)  /**< Image routines (64-bit). See routines_command_32. */
 #define LC_UUID             KU32_C(0x1b)  /**< The UUID of the object module. See uuid_command.  */
-#define LC_RPATH            KU32_C(0x1c | LC_REQ_DYLD) /**< Runpth additions. See rpath_command. */
+#define LC_RPATH           (KU32_C(0x1c) | LC_REQ_DYLD) /**< Runpth additions. See rpath_command. */
 #define LC_CODE_SIGNATURE   KU32_C(0x1d)  /**< Code signature location. See linkedit_data_command. */
 #define LC_SEGMENT_SPLIT_INFO KU32_C(0x1e)/**< Segment split info location. See linkedit_data_command. */
-#define LC_REEXPORT_DYLIB   KU32_C(0x1f | LC_REQ_DYLD)/**< Load and re-export the given dylib - DLL forwarding. See dylib_command. */
+#define LC_REEXPORT_DYLIB  (KU32_C(0x1f) | LC_REQ_DYLD)/**< Load and re-export the given dylib - DLL forwarding. See dylib_command. */
 #define LC_LAZY_LOAD_DYLIB  KU32_C(0x20)  /**< Delays loading of the given dylib until used. See dylib_command? */
 #define LC_ENCRYPTION_INFO  KU32_C(0x21)  /**< Segment encryption information. See encryption_info_command. */
 #define LC_DYLD_INFO        KU32_C(0x22)  /**< Compressed dylib relocation information, alternative present. See dyld_info_command. */
-#define LC_DYLD_INFO_ONLY   KU32_C(0x22 | LC_REQ_DYLD) /**< Compressed dylib relocation information, no alternative. See dyld_info_command. */
+#define LC_DYLD_INFO_ONLY  (KU32_C(0x22) | LC_REQ_DYLD) /**< Compressed dylib relocation information, no alternative. See dyld_info_command. */
 #define LC_LOAD_UPWARD_DYLIB KU32_C(0x23) /**< ???? */
 #define LC_VERSION_MIN_MACOSX KU32_C(0x24)   /**< The image requires the given Mac OS X version. See version_min_command. */
 #define LC_VERSION_MIN_IPHONEOS KU32_C(0x25) /**< The image requires the given iOS version. See version_min_command. */
 #define LC_FUNCTION_STARTS  KU32_C(0x26)  /**< Where to find the compress function start addresses. See linkedit_data_command. */
-#define LC_DYLD_ENVIRONMENT KU32_C(0x26)  /**< Environment variable for the dynamic linker. See dylinker_command. */
+#define LC_DYLD_ENVIRONMENT KU32_C(0x27)  /**< Environment variable for the dynamic linker. See dylinker_command. */
+#define LC_MAIN            (KU32_C(0x28) | LC_REQ_DYLD) /**< Simpler alternative to LC_UNIXTHREAD. */
+#define LC_DATA_IN_CODE     KU32_C(0x29)  /**< Table of data in the the text section. */
+#define LC_SOURCE_VERSION   KU32_C(0x2a)  /**< Source code revision / version hint. */
+#define LC_DYLIB_CODE_SIGN_DRS KU32_C(0x2b) /**< Code signing designated requirements copied from dylibs prequisites. */
 /** @} */
 

trunk/kLdr/kLdrModMachO.c

@@ -857 +857 @@
                         case S_SYMBOL_STUBS:
                             if (   pSect->reserved1
-                                || pSect->reserved2 < 1  /* stub size.*/
-                                || pSect->reserved2 > 64 )
+                                || pSect->reserved2 > 64 /* stub size. 0 has been seen (corecrypto.kext) */ )
                                 return KLDR_ERR_MACHO_BAD_SECTION;
                             fFileBits = 1;
@@ -1055 +1054 @@
                 break;
 
+            case LC_SOURCE_VERSION:     /* Harmless. It just gives a clue regarding the source code revision/version. */
+            case LC_DATA_IN_CODE:       /* Ignore */
+            case LC_DYLIB_CODE_SIGN_DRS:/* Ignore */
+                /** @todo valid command size. */
+                break;
+
+            case LC_ID_DYLIB:           /** @todo dylib */
+            case LC_LOAD_DYLIB:         /** @todo dylib */
+            case LC_LOAD_DYLINKER:      /** @todo dylib */
+            case LC_TWOLEVEL_HINTS:     /** @todo dylib */
+            case LC_LOAD_WEAK_DYLIB:    /** @todo dylib */
+            case LC_ID_DYLINKER:        /** @todo dylib */
+            case LC_DYLD_ENVIRONMENT:   /** @todo dylib */
+            case LC_MAIN: /** @todo parse this and find and entry point or smth. */
+                /** @todo valid command size. */
+                if (!(fOpenFlags & KLDRMOD_OPEN_FLAGS_FOR_INFO))
+                    return KLDR_ERR_MACHO_UNSUPPORTED_LOAD_COMMAND;
+                break;
+
             case LC_LOADFVMLIB:
             case LC_IDFVMLIB:
@@ -1060 +1078 @@
             case LC_FVMFILE:
             case LC_PREPAGE:
-            case LC_LOAD_DYLIB:
-            case LC_ID_DYLIB:
-            case LC_LOAD_DYLINKER:
-            case LC_ID_DYLINKER:
             case LC_PREBOUND_DYLIB:
             case LC_ROUTINES:
@@ -1071 +1085 @@
             case LC_SUB_CLIENT:
             case LC_SUB_LIBRARY:
-            case LC_TWOLEVEL_HINTS:
             case LC_PREBIND_CKSUM:
-            case LC_LOAD_WEAK_DYLIB:
             case LC_SYMSEG:
                 return KLDR_ERR_MACHO_UNSUPPORTED_LOAD_COMMAND;