Changeset 63 for trunk/kLdr/kLdrModMachO.c

Timestamp:

Oct 30, 2013, 3:00:14 AM (12 years ago)

Author:

bird

Message:

kLdrModMachO.c: Workaround for misaligned TEXT.unwind_info found once in VirtualBox.dylib (Xcode 3.2.6, I think). DYLIB debug info loading adjustments.

File:

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

trunk/kLdr/kLdrModMachO.c

@@ -739 +739 @@
                             case S_NON_LAZY_SYMBOL_POINTERS: \
                             case S_LAZY_SYMBOL_POINTERS: \
+                            case S_LAZY_DYLIB_SYMBOL_POINTERS: \
                                 /* (reserved 1 = is indirect symbol table index) */ \
                                 KLDRMODMACHO_CHECK_RETURN(!pSect->reserved2, KLDR_ERR_MACHO_BAD_SECTION); \
@@ -759 +760 @@
                             \
                             case S_LITERAL_POINTERS: \
+                            case S_DTRACE_DOF: \
+                                KLDRMODMACHO_CHECK_RETURN(!pSect->reserved1, KLDR_ERR_MACHO_BAD_SECTION); \
+                                KLDRMODMACHO_CHECK_RETURN(!pSect->reserved2, KLDR_ERR_MACHO_BAD_SECTION); \
+                                fFileBits = 1; \
+                                break; \
+                            \
                             case S_INTERPOSING: \
                             case S_GB_ZEROFILL: \
@@ -780 +787 @@
                         KLDRMODMACHO_CHECK_RETURN(pSect->align < 31, \
                                                   KLDR_ERR_MACHO_BAD_SECTION); \
+                        /* Workaround for buggy ld64 (or as, llvm, ++) that produces a misaligned __TEXT.__unwind_info. */ \
+                        /* Seen: pSect->align = 4, pSect->addr = 0x5ebe14.  Just adjust the alignment down. */ \
+                        if (   ((K_BIT32(pSect->align) - KU32_C(1)) & pSect->addr) \
+                            && pSect->align == 4 \
+                            && kHlpStrComp(pSect->sectname, "__unwind_info") == 0) \
+                            pSect->align = 2; \
                         KLDRMODMACHO_CHECK_RETURN(!((K_BIT32(pSect->align) - KU32_C(1)) & pSect->addr), \
                                                   KLDR_ERR_MACHO_BAD_SECTION); \
@@ -1025 +1038 @@
                 if (!(fOpenFlags & KLDRMOD_OPEN_FLAGS_FOR_INFO))
                     KLDRMODMACHO_FAILED_RETURN(KLDR_ERR_MACHO_UNSUPPORTED_LOAD_COMMAND);
+                *pfCanLoad = K_FALSE;
                 break;