Changeset 48 in kStuff for trunk

Timestamp:

Aug 26, 2012 3:53:57 PM (12 years ago)

Author:

bird

Message:

mach-o: Added new load commands from 10.6 and 10.7. Made the loader ignore version requirements and code signatures.

Location:

trunk

Files:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (c) 2006-2007 Knut St. Osmundsen <[email protected]>
+ * Copyright (c) 2006-2012 Knut St. Osmundsen <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person
@@ -362 +362 @@
 #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_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_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_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. */
 /** @} */
 
@@ -593 +606 @@
 /** @todo fvmlib_command (LC_IDFVMLIB or LC_LOADFVMLIB) */
 /** @todo dylib */
-/** @todo dylib_command (LC_ID_DYLIB, LC_LOAD_DYLIB, LC_LOAD_WEAK_DYLIB) */
+/** @todo dylib_command (LC_ID_DYLIB, LC_LOAD_DYLIB, LC_LOAD_WEAK_DYLIB,
+ *        LC_REEXPORT_DYLIB, LC_LAZY_LOAD_DYLIB) */
 /** @todo sub_framework_command (LC_SUB_FRAMEWORK) */
 /** @todo sub_client_command (LC_SUB_CLIENT) */
@@ -599 +613 @@
 /** @todo sub_library_command (LC_SUB_LIBRARY) */
 /** @todo prebound_dylib_command (LC_PREBOUND_DYLIB) */
-/** @todo dylinker_command (LC_ID_DYLINKER or LC_LOAD_DYLINKER) */
-
+/** @todo dylinker_command (LC_ID_DYLINKER or LC_LOAD_DYLINKER,
+ *        LC_DYLD_ENVIRONMENT) */
 
 /**
@@ -664 +678 @@
 /** @todo ident_command (LC_IDENT) */
 /** @todo fvmfile_command (LC_FVMFILE) */
+/** @todo rpath_command (LC_RPATH) */
+
+typedef struct linkedit_data_command 
+{
+    KU32            cmd;        /**< LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO, LC_FUNCTION_STARTS */
+    KU32            cmdsize;    /**< size of this structure. */
+    KU32            dataoff;    /**< Offset into the file of the data. */
+    KU32            datasize;   /**< The size of the data. */
+} linkedit_data_command_t;
+
+/** @todo encryption_info_command (LC_ENCRYPTION_INFO) */
+/** @todo dyld_info_command (LC_DYLD_INFO, LC_DYLD_INFO_ONLY) */
+
+typedef struct version_min_command
+{
+    KU32            cmd;        /**< LC_VERSION_MIN_MACOSX, LC_VERSION_MIN_IPHONEOS */
+    KU32            cmdsize;    /**< size of this structure. */
+    KU32            version;    /**< 31..16=major, 15..8=minor, 7..0=patch. */
+    KU32            reserved;   /**< MBZ. */
+} version_min_command_t;
 
 /** @} */

trunk/kLdr/kLdrModMachO.c

@@ -1008 +1008 @@
                     return KLDR_ERR_MACHO_BAD_LOAD_COMMAND;
                 /** @todo Check anything here need converting? */
+                break;
+
+            case LC_CODE_SIGNATURE:
+                if (u.pUuid->cmdsize != sizeof(linkedit_data_command_t))
+                    return KLDR_ERR_MACHO_BAD_LOAD_COMMAND;
+                break;
+
+            case LC_VERSION_MIN_MACOSX:
+            case LC_VERSION_MIN_IPHONEOS:
+                if (u.pUuid->cmdsize != sizeof(version_min_command_t))
+                    return KLDR_ERR_MACHO_BAD_LOAD_COMMAND;
                 break;