Changeset 67 in kStuff for trunk

Timestamp:

Apr 28, 2015 10:31:51 PM (10 years ago)

Author:

bird

Message:

kLdrModMachO.c: Fixed how we apply X86_64_RELOC_SIGNED_1, X86_64_RELOC_SIGNED_2 and X86_64_RELOC_SIGNED_4.

File:

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

trunk/kLdr/kLdrModMachO.c

@@ -1021 +1021 @@
                 break;
 
+            case LC_FUNCTION_STARTS:    /** @todo dylib++ */
+                /* Ignore for now. */
+                break;
             case LC_ID_DYLIB:           /** @todo dylib */
             case LC_LOAD_DYLIB:         /** @todo dylib */
@@ -1033 +1036 @@
             case LC_DYLD_INFO_ONLY:     /** @todo dylib */
             case LC_LOAD_UPWARD_DYLIB:  /** @todo dylib */
-            case LC_FUNCTION_STARTS:    /** @todo dylib++ */
             case LC_DYLD_ENVIRONMENT:   /** @todo dylib */
             case LC_MAIN: /** @todo parse this and find and entry point or smth. */
@@ -3078 +3080 @@
                             SymAddr -= 4;
                             break;
-                        case X86_64_RELOC_SIGNED_1: SymAddr -= 1; break;
-                        case X86_64_RELOC_SIGNED_2: SymAddr -= 2; break;
                         case X86_64_RELOC_SIGNED:
-                        case X86_64_RELOC_SIGNED_4: SymAddr -= 4; break;
+                            SymAddr -= 4;
+                            break;
+                        case X86_64_RELOC_SIGNED_1:
+                            SymAddr -= 4 + 1;
+                            if (Fixup.r.r_extern)
+                                SymAddr += 1;
+                            break;
+                        case X86_64_RELOC_SIGNED_2:
+                            SymAddr -= 4 + 2;
+                            if (Fixup.r.r_extern)
+                                SymAddr += 2;
+                            break;
+                        case X86_64_RELOC_SIGNED_4:
+                            SymAddr -= 4 + 4;
+                            if (Fixup.r.r_extern)
+                                SymAddr += 4;
+                            break;
                         default:
                             KLDRMODMACHO_CHECK_RETURN(0, KLDR_ERR_BAD_FIXUP);