Changeset 68 in kStuff for trunk

Timestamp:

Apr 29, 2015 11:59:02 AM (10 years ago)

Author:

bird

Message:

kLdrModMachO.c: Relocation fixes.

File:

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

trunk/kLdr/kLdrModMachO.c

@@ -3081 +3081 @@
                             break;
                         case X86_64_RELOC_SIGNED:
+                        case X86_64_RELOC_SIGNED_1:
+                        case X86_64_RELOC_SIGNED_2:
+                        case X86_64_RELOC_SIGNED_4:
                             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:
@@ -3177 +3165 @@
                                               && Fixup2.r_type == X86_64_RELOC_UNSIGNED
                                               && !Fixup2.r_pcrel
-                                              && Fixup2.r_extern /*??*/
                                               && Fixup2.r_symbolnum < cSyms,
                                               KLDR_ERR_BAD_FIXUP);
 
-                    pSym = &paSyms[Fixup.r.r_symbolnum];
-                    KLDRMODMACHO_CHECK_RETURN(!(pSym->n_type & MACHO_N_STAB), KLDR_ERR_BAD_FIXUP);
-
-                    /* Add it's value to SymAddr. */
-                    switch (pSym->n_type & MACHO_N_TYPE)
+                    if (Fixup2.r_extern)
                     {
-                        case MACHO_N_SECT:
+                        KLDRMODMACHO_CHECK_RETURN(Fixup2.r_symbolnum < cSyms, KLDR_ERR_BAD_FIXUP);
+                        pSym = &paSyms[Fixup2.r_symbolnum];
+                        KLDRMODMACHO_CHECK_RETURN(!(pSym->n_type & MACHO_N_STAB), KLDR_ERR_BAD_FIXUP);
+
+                        /* Add it's value to SymAddr. */
+                        switch (pSym->n_type & MACHO_N_TYPE)
                         {
-                            PKLDRMODMACHOSECT pSymSect;
-                            KLDRMODMACHO_CHECK_RETURN((KU32)pSym->n_sect - 1 <= pModMachO->cSections, KLDR_ERR_MACHO_BAD_SYMBOL);
-                            pSymSect = &pModMachO->paSections[pSym->n_sect - 1];
-                            SymAddr += pSym->n_value - pSymSect->LinkAddress + pSymSect->RVA + NewBaseAddress;
-                            break;
+                            case MACHO_N_SECT:
+                            {
+                                PKLDRMODMACHOSECT pSymSect;
+                                KLDRMODMACHO_CHECK_RETURN((KU32)pSym->n_sect - 1 <= pModMachO->cSections, KLDR_ERR_MACHO_BAD_SYMBOL);
+                                pSymSect = &pModMachO->paSections[pSym->n_sect - 1];
+                                SymAddr += pSym->n_value - pSymSect->LinkAddress + pSymSect->RVA + NewBaseAddress;
+                                break;
+                            }
+
+                            case MACHO_N_UNDF:
+                            case MACHO_N_ABS:
+                                SymAddr += pSym->n_value;
+                                break;
+
+                            case MACHO_N_INDR:
+                            case MACHO_N_PBUD:
+                                KLDRMODMACHO_CHECK_RETURN(0, KLDR_ERR_TODO);
+                            default:
+                                KLDRMODMACHO_CHECK_RETURN(0, KLDR_ERR_MACHO_BAD_SYMBOL);
                         }
-
-                        case MACHO_N_UNDF:
-                        case MACHO_N_ABS:
-                            SymAddr += pSym->n_value;
-                            break;
-
-                        case MACHO_N_INDR:
-                        case MACHO_N_PBUD:
-                            KLDRMODMACHO_CHECK_RETURN(0, KLDR_ERR_TODO);
-                        default:
-                            KLDRMODMACHO_CHECK_RETURN(0, KLDR_ERR_MACHO_BAD_SYMBOL);
                     }
+                    else if (Fixup2.r_symbolnum != R_ABS)
+                    {
+                        PKLDRMODMACHOSECT pSymSect;
+                        KLDRADDR TmpAddr;
+                        KLDRMODMACHO_CHECK_RETURN(Fixup2.r_symbolnum <= pModMachO->cSections, KLDR_ERR_BAD_FIXUP);
+                        pSymSect = &pModMachO->paSections[Fixup2.r_symbolnum - 1];
+                        SymAddr += pSymSect->RVA + NewBaseAddress;
+                    }
+                    else
+                        KLDRMODMACHO_CHECK_RETURN(0, KLDR_ERR_BAD_FIXUP);
                 }
                 break;
@@ -3213 +3214 @@
         else
         {
-            /* verify against fixup type */
+            /* verify against fixup type and make adjustments */
             switch (Fixup.r.r_type)
             {
                 case X86_64_RELOC_UNSIGNED:
+                    KLDRMODMACHO_CHECK_RETURN(!Fixup.r.r_pcrel, KLDR_ERR_BAD_FIXUP);
+                    break;
+                case X86_64_RELOC_BRANCH:
+                    KLDRMODMACHO_CHECK_RETURN(Fixup.r.r_pcrel, KLDR_ERR_BAD_FIXUP);
+                    SymAddr += 4; /* dunno what the assmbler/linker really is doing here... */
+                    break;
                 case X86_64_RELOC_SIGNED:
-                case X86_64_RELOC_BRANCH:
-                /*case X86_64_RELOC_GOT_LOAD:*/
-                /*case X86_64_RELOC_GOT: */
-                /*case X86_64_RELOC_SUBTRACTOR: - ???*/
                 case X86_64_RELOC_SIGNED_1:
                 case X86_64_RELOC_SIGNED_2:
                 case X86_64_RELOC_SIGNED_4:
+                    KLDRMODMACHO_CHECK_RETURN(Fixup.r.r_pcrel, KLDR_ERR_BAD_FIXUP);
                     break;
+                /*case X86_64_RELOC_GOT_LOAD:*/
+                /*case X86_64_RELOC_GOT: */
+                /*case X86_64_RELOC_SUBTRACTOR: - must be r_extern=1 says as. */
                 default:
                     KLDRMODMACHO_CHECK_RETURN(0, KLDR_ERR_BAD_FIXUP);
@@ -3237 +3244 @@
                 SymAddr -= pSymSect->LinkAddress;
                 SymAddr += pSymSect->RVA + NewBaseAddress;
+                if (Fixup.r.r_pcrel)
+                    SymAddr += Fixup.r.r_address;
             }
         }