Changeset 55

Timestamp:

Oct 11, 2013, 2:55:44 AM (12 years ago)

Author:

bird

Message:

Mach-O: Accept MH_KEXT_BUNDLE (untested for loading purposes).

Location:

trunk

Files:

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

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

@@ -145 +145 @@
 #define MH_DYLIB_STUB       KU32_C(9) /**< Shared library stub for static linking. */
 #define MH_DSYM             KU32_C(10)/**< Debug symbols. */
+#define MH_KEXT_BUNDLE      KU32_C(11)/**< Kernel extension (introduced with the AMD64 kernel). */
 
 /** @} */

trunk/kLdr/kLdrModMachO.c

@@ -345 +345 @@
         && s.Hdr32.filetype != MH_EXECUTE
         && s.Hdr32.filetype != MH_DYLIB
-        && s.Hdr32.filetype != MH_DSYM)
+        && s.Hdr32.filetype != MH_DSYM
+        && s.Hdr32.filetype != MH_KEXT_BUNDLE)
         return KLDR_ERR_MACHO_UNSUPPORTED_FILE_TYPE;
 
@@ -451 +452 @@
         case MH_EXECUTE:    pMod->enmType = KLDRTYPE_EXECUTABLE_FIXED; break;
         case MH_DYLIB:      pMod->enmType = KLDRTYPE_SHARED_LIBRARY_RELOCATABLE; break;
+        case MH_KEXT_BUNDLE:pMod->enmType = KLDRTYPE_SHARED_LIBRARY_RELOCATABLE; break;
         case MH_DSYM:       pMod->enmType = KLDRTYPE_DEBUG_INFO; break;
         default:
@@ -725 +727 @@
                         case MH_DYLIB:
                         case MH_DSYM:
+                        case MH_KEXT_BUNDLE:
                         {
                             cSections++;
@@ -920 +923 @@
                         case MH_DYLIB:
                         case MH_DSYM:
+                        case MH_KEXT_BUNDLE:
                         {
                             cSections++;
@@ -1088 +1092 @@
         case MH_DYLIB:
         case MH_DSYM:
+        case MH_KEXT_BUNDLE:
             if (!cSegments)
                 return KLDR_ERR_MACHO_BAD_OBJECT_FILE;
@@ -1165 +1170 @@
                         case MH_DYLIB:
                         case MH_DSYM:
+                        case MH_KEXT_BUNDLE:
                         {
                             /* Section data extract. */
@@ -1301 +1307 @@
                         case MH_DYLIB:
                         case MH_DSYM:
+                        case MH_KEXT_BUNDLE:
                         {
                             /* Section data extract. */
@@ -1423 +1430 @@
                     case MH_DYLIB: /** @todo ??? */
                     case MH_DSYM:
+                    case MH_KEXT_BUNDLE:
                         pModMachO->offSymbols = u.pSymTab->symoff + pModMachO->offImage;
                         pModMachO->cSymbols = u.pSymTab->nsyms;
@@ -1537 +1545 @@
         case MH_DYLIB: /** @todo dylib */
         case MH_DSYM:
+        case MH_KEXT_BUNDLE:
         {
             KLDRADDR cb1;
@@ -1794 +1803 @@
         || pModMachO->Hdr.filetype == MH_EXECUTE /** @todo dylib, execute, dsym: symbols */
         || pModMachO->Hdr.filetype == MH_DYLIB
-        || pModMachO->Hdr.filetype == MH_DSYM)
+        || pModMachO->Hdr.filetype == MH_DSYM
+        || pModMachO->Hdr.filetype == MH_KEXT_BUNDLE)
     {
         rc = kldrModMachOLoadObjSymTab(pModMachO);
@@ -2107 +2117 @@
         || pModMachO->Hdr.filetype == MH_EXECUTE /** @todo dylib, execute, dsym: symbols */
         || pModMachO->Hdr.filetype == MH_DYLIB
-        || pModMachO->Hdr.filetype == MH_DSYM)
+        || pModMachO->Hdr.filetype == MH_DSYM
+        || pModMachO->Hdr.filetype == MH_KEXT_BUNDLE)
     {
         rc = kldrModMachOLoadObjSymTab(pModMachO);