X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Felf.c;h=71e9a92baf9d0e125df9363d575338cac6c8f217;hb=eb42cce3c834d711e888d7866db98c563710993d;hp=995d5ea7386a22500244c5483a594d9f88e35e07;hpb=92e1384ea0be30ae9ab82af6864da2806286e864;p=tpg%2Facess2.git diff --git a/Usermode/Libraries/ld-acess.so_src/elf.c b/Usermode/Libraries/ld-acess.so_src/elf.c index 995d5ea7..71e9a92b 100644 --- a/Usermode/Libraries/ld-acess.so_src/elf.c +++ b/Usermode/Libraries/ld-acess.so_src/elf.c @@ -5,10 +5,19 @@ * elf.c * - ELF32/ELF64 relocation */ -#define DEBUG 0 +#ifndef DEBUG // This code is #include'd from the kernel, so DEBUG may already be defined +# define DEBUG 0 +#endif + +#ifndef PAGE_SIZE +# define PAGE_SIZE 4096 +#endif #include "common.h" #include +#ifndef assert +# include +#endif #include "elf32.h" #include "elf64.h" @@ -18,9 +27,9 @@ # define DEBUGS(...) #endif -//#if BITS > 32 +#ifndef DISABLE_ELF64 # define SUPPORT_ELF64 -//#endif +#endif // === CONSTANTS === #if DEBUG @@ -33,7 +42,11 @@ void *ElfRelocate(void *Base, char **envp, const char *Filename); int ElfGetSymbol(void *Base, const char *Name, void **Ret, size_t *Size); void *Elf32Relocate(void *Base, char **envp, const char *Filename); int Elf32GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size); + int elf_doRelocate_386(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff); + int elf_doRelocate_arm(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff); + int elf_doRelocate_unk(uint32_t , uint32_t *, Elf32_Addr , int , int , const char *, intptr_t); #ifdef SUPPORT_ELF64 +int _Elf64DoReloc_X86_64(void *Base, const char *strtab, Elf64_Sym *symtab, Elf64_Xword r_info, void *ptr, Elf64_Sxword addend); void *Elf64Relocate(void *Base, char **envp, const char *Filename); int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size); #endif @@ -83,26 +96,28 @@ int ElfGetSymbol(void *Base, const char *Name, void **ret, size_t *Size) } } -void elf_doRelocate_386(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff) +int elf_doRelocate_386(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, + int bRela, const char *Sym, intptr_t iBaseDiff) { - intptr_t val; + void *symval; switch( type ) { // Standard 32 Bit Relocation (S+A) case R_386_32: - val = (intptr_t) GetSymbol(Sym, NULL); - DEBUGS(" elf_doRelocate: R_386_32 *0x%x += 0x%x('%s')", - ptr, val, Sym); - *ptr = val + addend; + if( !GetSymbol(Sym, &symval, NULL) ) + return 1; + DEBUGS(" elf_doRelocate: R_386_32 *0x%x += %p('%s')", + ptr, symval, Sym); + *ptr = (intptr_t)symval + addend; break; // 32 Bit Relocation wrt. Offset (S+A-P) case R_386_PC32: DEBUGS(" elf_doRelocate: '%s'", Sym); - val = (intptr_t) GetSymbol(Sym, NULL); - DEBUGS(" elf_doRelocate: R_386_PC32 *0x%x = 0x%x + 0x%x - 0x%x", - ptr, *ptr, val, (intptr_t)ptr ); - *ptr = val + addend - (intptr_t)ptr; + if( !GetSymbol(Sym, &symval, NULL) ) return 1; + DEBUGS(" elf_doRelocate: R_386_PC32 *0x%x = 0x%x + 0x%p - 0x%x", + ptr, *ptr, symval, (intptr_t)ptr ); + *ptr = (intptr_t)symval + addend - (intptr_t)ptr; //*ptr = val + addend - ((Uint)ptr - iBaseDiff); break; @@ -110,9 +125,9 @@ void elf_doRelocate_386(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int t case R_386_GLOB_DAT: case R_386_JMP_SLOT: DEBUGS(" elf_doRelocate: '%s'", Sym); - val = (intptr_t) GetSymbol( Sym, NULL ); - DEBUGS(" elf_doRelocate: %s *0x%x = 0x%x", csaR_NAMES[type], ptr, val); - *ptr = val; + if( !GetSymbol(Sym, &symval, NULL) ) return 1; + DEBUGS(" elf_doRelocate: %s *0x%x = %p", csaR_NAMES[type], ptr, symval); + *ptr = (intptr_t)symval; break; // Base Address (B+A) @@ -123,18 +138,19 @@ void elf_doRelocate_386(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int t case R_386_COPY: { size_t size; - void *src = GetSymbol(Sym, &size); - DEBUGS(" elf_doRelocate_386: R_386_COPY (%p, %p, %i)", ptr, src, size); - memcpy(ptr, src, size); + if( !GetSymbol(Sym, &symval, &size) ) return 1; + DEBUGS(" elf_doRelocate_386: R_386_COPY (%p, %p, %i)", ptr, symval, size); + memcpy(ptr, symval, size); break; } default: SysDebug("elf_doRelocate_386: Unknown relocation %i", type); - break; + return 2; } + return 0; } -void elf_doRelocate_arm(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff) +int elf_doRelocate_arm(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff) { uint32_t val; switch(type) @@ -142,32 +158,35 @@ void elf_doRelocate_arm(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int t // (S + A) | T case R_ARM_ABS32: DEBUGS(" elf_doRelocate_arm: R_ARM_ABS32 %p (%s + %x)", ptr, Sym, addend); - val = (intptr_t)GetSymbol(Sym, NULL); + if( !GetSymbol(Sym, (void**)&val, NULL) ) return 1; *ptr = val + addend; break; case R_ARM_GLOB_DAT: DEBUGS(" elf_doRelocate_arm: R_ARM_GLOB_DAT %p (%s + %x)", ptr, Sym, addend); - val = (intptr_t)GetSymbol(Sym, NULL); + if( !GetSymbol(Sym, (void**)&val, NULL) ) return 1; *ptr = val + addend; break; case R_ARM_JUMP_SLOT: if(!bRela) addend = 0; DEBUGS(" elf_doRelocate_arm: R_ARM_JUMP_SLOT %p (%s + %x)", ptr, Sym, addend); - val = (intptr_t)GetSymbol(Sym, NULL); + if( !GetSymbol(Sym, (void**)&val, NULL) ) return 1; *ptr = val + addend; break; // Copy case R_ARM_COPY: { size_t size; - void *src = GetSymbol(Sym, &size); + void *src; + if( !GetSymbol(Sym, &src, &size) ) return 1; DEBUGS(" elf_doRelocate_arm: R_ARM_COPY (%p, %p, %i)", ptr, src, size); memcpy(ptr, src, size); break; } // Delta between link and runtime locations + A case R_ARM_RELATIVE: + DEBUGS(" elf_doRelocate_arm: R_ARM_RELATIVE %p (0x%x + 0x%x)", ptr, iBaseDiff, addend); if(Sym[0] != '\0') { // TODO: Get delta for a symbol SysDebug("elf_doRelocate_arm: TODO - Implment R_ARM_RELATIVE for symbols"); + return 2; } else { *ptr = iBaseDiff + addend; @@ -175,20 +194,24 @@ void elf_doRelocate_arm(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int t break; default: SysDebug("elf_doRelocate_arm: Unknown Relocation, %i", type); - break; + return 2; } + return 0; +} + +int elf_doRelocate_unk(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff) +{ + return 1; } void *Elf32Relocate(void *Base, char **envp, const char *Filename) { Elf32_Ehdr *hdr = Base; Elf32_Phdr *phtab; - int i, j; // Counters char *libPath; intptr_t iRealBase = -1; intptr_t iBaseDiff; int iSegmentCount; -// int iSymCount; Elf32_Rel *rel = NULL; Elf32_Rela *rela = NULL; void *plt = NULL; @@ -198,7 +221,7 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) Elf32_Dyn *dynamicTab = NULL; // Dynamic Table Pointer char *dynstrtab = NULL; // .dynamic String Table Elf32_Sym *dynsymtab; - void (*do_relocate)(uint32_t t_info, uint32_t *ptr, Elf32_Addr addend, int Type, int bRela, const char *Sym, intptr_t iBaseDiff); + int (*do_relocate)(uint32_t t_info, uint32_t *ptr, Elf32_Addr addend, int Type, int bRela, const char *Sym, intptr_t iBaseDiff); DEBUGS("ElfRelocate: (Base=0x%x)", Base); @@ -206,22 +229,26 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) // Parse Program Header to get Dynamic Table - phtab = Base + hdr->phoff; + phtab = (void*)( (uintptr_t)Base + hdr->phoff ); iSegmentCount = hdr->phentcount; - for(i=0;i phtab[i].VAddr) - iRealBase = phtab[i].VAddr; - - // Find Dynamic Section - if(phtab[i].Type == PT_DYNAMIC) { - if(dynamicTab) { + switch(phtab[i].Type) + { + case PT_LOAD: + // Determine linked base address + if( iRealBase > phtab[i].VAddr) + iRealBase = phtab[i].VAddr; + break; + case PT_DYNAMIC: + // Find Dynamic Section + if(!dynamicTab) { + dynamicTab = (void *) (intptr_t) phtab[i].VAddr; + } + else { DEBUGS(" WARNING - elf_relocate: Multiple PT_DYNAMIC segments"); - continue; } - dynamicTab = (void *) (intptr_t) phtab[i].VAddr; - j = i; // Save Dynamic Table ID + break; } } @@ -231,7 +258,7 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) // Adjust "Real" Base iBaseDiff = (intptr_t)Base - iRealBase; - + // hdr->entrypoint += iBaseDiff; // Adjust Entrypoint // Check if a PT_DYNAMIC segement was found @@ -239,12 +266,25 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) SysDebug(" elf_relocate: No PT_DYNAMIC segment in image %p, returning", Base); return (void *)(intptr_t)(hdr->entrypoint + iBaseDiff); } - + + // Allow writing to read-only segments, just in case they need to be relocated + // - Will be reversed at the end of the function + for( int i = 0; i < iSegmentCount; i ++ ) + { + if(phtab[i].Type == PT_LOAD && !(phtab[i].Flags & PF_W) ) { + uintptr_t addr = phtab[i].VAddr + iBaseDiff; + uintptr_t end = addr + phtab[i].MemSize; + for( ; addr < end; addr += PAGE_SIZE ) + _SysSetMemFlags(addr, 0, 1); // Unset RO + } + } + // Adjust Dynamic Table dynamicTab = (void *)( (intptr_t)dynamicTab + iBaseDiff ); // === Get Symbol table and String Table === - for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++) + dynsymtab = NULL; + for( int j = 0; dynamicTab[j].d_tag != DT_NULL; j++) { switch(dynamicTab[j].d_tag) { @@ -252,19 +292,19 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) case DT_SYMTAB: DEBUGS(" elf_relocate: DYNAMIC Symbol Table 0x%x (0x%x)", dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff); - if(iBaseDiff != 0) dynamicTab[j].d_val += iBaseDiff; - dynsymtab = (void*)(intptr_t)dynamicTab[j].d_val; + dynsymtab = (void*)((intptr_t)dynamicTab[j].d_val + iBaseDiff); + //if(iBaseDiff != 0) dynamicTab[j].d_val += iBaseDiff; break; // --- String Table --- case DT_STRTAB: DEBUGS(" elf_relocate: DYNAMIC String Table 0x%x (0x%x)", dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff); - if(iBaseDiff != 0) dynamicTab[j].d_val += iBaseDiff; - dynstrtab = (void*)(intptr_t)dynamicTab[j].d_val; + dynstrtab = (void*)((intptr_t)dynamicTab[j].d_val + iBaseDiff); + //if(iBaseDiff != 0) dynamicTab[j].d_val += iBaseDiff; break; // --- Hash Table -- case DT_HASH: - if(iBaseDiff != 0) dynamicTab[j].d_val += iBaseDiff; + //if(iBaseDiff != 0) dynamicTab[j].d_val += iBaseDiff; // iSymCount = ((Elf32_Word*)(intptr_t)dynamicTab[j].d_val)[1]; break; } @@ -280,7 +320,7 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) // === Parse Relocation Data === DEBUGS(" elf_relocate: dynamicTab = 0x%x", dynamicTab); - for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++) + for( int j = 0; dynamicTab[j].d_tag != DT_NULL; j++) { switch(dynamicTab[j].d_tag) { @@ -291,6 +331,7 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) // --- Needed Library --- case DT_NEEDED: libPath = dynstrtab + dynamicTab[j].d_val; + DEBUGS(" dynstrtab = %p, d_val = 0x%x", dynstrtab, dynamicTab[j].d_val); DEBUGS(" Required Library '%s'", libPath); if(LoadLibrary(libPath, NULL, envp) == 0) { #if DEBUG @@ -335,13 +376,7 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) DEBUGS(" elf_relocate: Beginning Relocation"); - void _doRelocate(uint32_t r_info, uint32_t *ptr, int bRela, Elf32_Addr addend) - { - int type = ELF32_R_TYPE(r_info); - int sym = ELF32_R_SYM(r_info); - const char *symname = dynstrtab + dynsymtab[sym].nameOfs; - do_relocate(r_info, ptr, addend, type, bRela, symname, iBaseDiff); - } + int fail = 0; switch(hdr->machine) { @@ -353,22 +388,28 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) break; default: SysDebug("Elf32Relocate: Unknown machine type %i", hdr->machine); + do_relocate = elf_doRelocate_unk; + fail = 1; break; } DEBUGS("do_relocate = %p (%p or %p)", do_relocate, &elf_doRelocate_386, &elf_doRelocate_arm); + #define _doRelocate(r_info, ptr, bRela, addend) \ + do_relocate(r_info, ptr, addend, ELF32_R_TYPE(r_info), bRela, \ + dynstrtab + dynsymtab[ELF32_R_SYM(r_info)].nameOfs, iBaseDiff); + // Parse Relocation Entries if(rel && relSz) { Elf32_Word *ptr; DEBUGS(" elf_relocate: rel=0x%x, relSz=0x%x, relEntSz=0x%x", rel, relSz, relEntSz); - j = relSz / relEntSz; - for( i = 0; i < j; i++ ) + int max = relSz / relEntSz; + for( int i = 0; i < max; i++ ) { //DEBUGS(" Rel %i: 0x%x+0x%x", i, iBaseDiff, rel[i].r_offset); ptr = (void*)(iBaseDiff + rel[i].r_offset); - _doRelocate(rel[i].r_info, ptr, 0, *ptr); + fail |= _doRelocate(rel[i].r_info, ptr, 0, *ptr); } } // Parse Relocation Entries @@ -376,11 +417,11 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) { Elf32_Word *ptr; DEBUGS(" elf_relocate: rela=0x%x, relaSz=0x%x, relaEntSz=0x%x", rela, relaSz, relaEntSz); - j = relaSz / relaEntSz; - for( i = 0; i < j; i++ ) + int count = relaSz / relaEntSz; + for( int i = 0; i < count; i++ ) { ptr = (void*)(iBaseDiff + rela[i].r_offset); - _doRelocate(rel[i].r_info, ptr, 1, rela[i].r_addend); + fail |= _doRelocate(rel[i].r_info, ptr, 1, rela[i].r_addend); } } @@ -392,27 +433,46 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) if(pltType == DT_REL) { Elf32_Rel *pltRel = plt; - j = pltSz / sizeof(Elf32_Rel); - DEBUGS(" elf_relocate: PLT Reloc Type = Rel, %i entries", j); - for(i=0;ientrypoint + iBaseDiff, __builtin_return_address(0)); return (void*)(intptr_t)( hdr->entrypoint + iBaseDiff ); } @@ -420,21 +480,19 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename) int Elf32GetSymbol(void *Base, const char *Name, void **ret, size_t *Size) { Elf32_Ehdr *hdr = Base; - Elf32_Sym *symtab; + Elf32_Sym *symtab = NULL; int nbuckets = 0; -// int iSymCount = 0; - int i; - Elf32_Word *pBuckets; + Elf32_Word *pBuckets = NULL; Elf32_Word *pChains; uint32_t iNameHash; - const char *dynstrtab; + const char *dynstrtab = NULL; uintptr_t iBaseDiff = -1; Elf32_Phdr *phtab; Elf32_Dyn *dynTab = NULL; // Locate the tables - phtab = (void*)( Base + hdr->phoff ); - for( i = 0; i < hdr->phentcount; i ++ ) + phtab = (void*)( (uintptr_t)Base + hdr->phoff ); + for( int i = 0; i < hdr->phentcount; i ++ ) { if(phtab[i].Type == PT_LOAD && iBaseDiff > phtab[i].VAddr) iBaseDiff = phtab[i].VAddr; @@ -448,61 +506,119 @@ int Elf32GetSymbol(void *Base, const char *Name, void **ret, size_t *Size) } iBaseDiff = (intptr_t)Base - iBaseDiff; // Make iBaseDiff actually the diff dynTab = (void*)( (intptr_t)dynTab + iBaseDiff ); - for( i = 0; dynTab[i].d_tag != DT_NULL; i++) + for( int i = 0; dynTab[i].d_tag != DT_NULL; i++) { switch(dynTab[i].d_tag) { // --- Symbol Table --- case DT_SYMTAB: - symtab = (void*)(intptr_t) dynTab[i].d_val; // Rebased in Relocate + symtab = (void*)((intptr_t)dynTab[i].d_val + iBaseDiff); // Rebased in Relocate break; case DT_STRTAB: - dynstrtab = (void*)(intptr_t) dynTab[i].d_val; + dynstrtab = (void*)((intptr_t)dynTab[i].d_val + iBaseDiff); break; // --- Hash Table -- case DT_HASH: - pBuckets = (void*)(intptr_t) dynTab[i].d_val; + pBuckets = (void*)((intptr_t)dynTab[i].d_val + iBaseDiff); break; } } + if( !symtab ) { + SysDebug("ERRO - No DT_SYMTAB in %p", Base); + return 0; + } + if( !pBuckets ) { + SysDebug("ERRO - No DT_HASH in %p", Base); + return 0; + } + if( !dynstrtab ) { + SysDebug("ERRO - No DT_STRTAB in %p", Base); + return 0; + } + + // ... ok... maybe they haven't been relocated + if( (uintptr_t)symtab < (uintptr_t)Base ) + { + symtab = (void*)( (uintptr_t)symtab + iBaseDiff ); + pBuckets = (void*)( (uintptr_t)pBuckets + iBaseDiff ); + dynstrtab = (void*)( (uintptr_t)dynstrtab + iBaseDiff ); + SysDebug("Executable not yet relocated"); + } + nbuckets = pBuckets[0]; // iSymCount = pBuckets[1]; pBuckets = &pBuckets[2]; pChains = &pBuckets[ nbuckets ]; - + assert(pChains); + // Get hash iNameHash = ElfHashString(Name); iNameHash %= nbuckets; // Walk Chain - i = pBuckets[ iNameHash ]; - if(symtab[i].shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[i].nameOfs, Name) == 0) { - *ret = (void*) (intptr_t) symtab[ i ].value + iBaseDiff; - if(Size) *Size = symtab[i].size; - return 1; - } - - while(pChains[i] != STN_UNDEF) - { - i = pChains[i]; - if(symtab[i].shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[ i ].nameOfs, Name) == 0) { - *ret = (void*)(intptr_t)symtab[ i ].value + iBaseDiff; - if(Size) *Size = symtab[i].size; + int idx = pBuckets[ iNameHash ]; + do { + Elf32_Sym *sym = &symtab[idx]; + assert(sym); + if(sym->shndx != SHN_UNDEF && strcmp(dynstrtab + sym->nameOfs, Name) == 0) { + *ret = (void*)( (uintptr_t)sym->value + iBaseDiff ); + if(Size) *Size = sym->size; return 1; } - } + } while( (idx = pChains[idx]) != STN_UNDEF && idx != pBuckets[iNameHash] ); return 0; } #ifdef SUPPORT_ELF64 +typedef int (*t_elf64_doreloc)(void *Base, const char *strtab, Elf64_Sym *symtab, Elf64_Xword r_info, void *ptr, Elf64_Sxword addend); + +int _Elf64DoReloc_X86_64(void *Base, const char *strtab, Elf64_Sym *symtab, Elf64_Xword r_info, void *ptr, Elf64_Sxword addend) +{ + int sym = ELF64_R_SYM(r_info); + int type = ELF64_R_TYPE(r_info); + const char *symname = strtab + symtab[sym].st_name; + void *symval; + //DEBUGS("_Elf64DoReloc: %s", symname); + switch( type ) + { + case R_X86_64_NONE: + break; + case R_X86_64_64: + if( !GetSymbol(symname, &symval, NULL) ) return 1; + *(uint64_t*)ptr = (uintptr_t)symval + addend; + break; + case R_X86_64_COPY: { + size_t size; + if( !GetSymbol(symname, &symval, &size) ) return 1; + memcpy(ptr, symval, size); + } break; + case R_X86_64_GLOB_DAT: + if( !GetSymbol(symname, &symval, NULL) ) return 1; + *(uint64_t*)ptr = (uintptr_t)symval; + break; + case R_X86_64_JUMP_SLOT: + if( !GetSymbol(symname, &symval, NULL) ) return 1; + *(uint64_t*)ptr = (uintptr_t)symval; + break; + case R_X86_64_RELATIVE: + *(uint64_t*)ptr = (uintptr_t)Base + addend; + break; + default: + SysDebug("ld-acess - _Elf64DoReloc: Unknown relocation type %i", type); + return 2; + } + //DEBUGS("_Elf64DoReloc: - Good"); + return 0; +} + void *Elf64Relocate(void *Base, char **envp, const char *Filename) { int i; Elf64_Ehdr *hdr = Base; Elf64_Phdr *phtab; - Elf64_Dyn *dyntab; + Elf64_Dyn *dyntab = NULL; Elf64_Addr compiledBase = -1, baseDiff; Elf64_Sym *symtab = NULL; char *strtab = NULL; @@ -528,7 +644,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) DEBUGS("Elf64Relocate: e_phnum = %i", hdr->e_phnum); // Scan for the dynamic table (and find the compiled base) - phtab = Base + hdr->e_phoff; + phtab = (void*)((uintptr_t)Base + (uintptr_t)hdr->e_phoff); for( i = 0; i < hdr->e_phnum; i ++ ) { if(phtab[i].p_type == PT_DYNAMIC) @@ -637,45 +753,17 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) } // Relocation function - void _Elf64DoReloc(Elf64_Xword r_info, void *ptr, Elf64_Sxword addend) - { - int sym = ELF64_R_SYM(r_info); - int type = ELF64_R_TYPE(r_info); - const char *symname = strtab + symtab[sym].st_name; - switch( type ) - { - case R_X86_64_NONE: - break; - case R_X86_64_64: - *(uint64_t*)ptr = (uintptr_t)GetSymbol(symname, NULL) + addend; - break; - case R_X86_64_COPY: { - size_t size; - void *sym = GetSymbol(symname, &size); - memcpy(ptr, sym, size); - } break; - case R_X86_64_GLOB_DAT: - *(uint64_t*)ptr = (uintptr_t)GetSymbol(symname, NULL); - break; - case R_X86_64_JUMP_SLOT: - *(uint64_t*)ptr = (uintptr_t)GetSymbol(symname, NULL); - break; - case R_X86_64_RELATIVE: - *(uint64_t*)ptr = (uintptr_t)Base + addend; - break; - default: - SysDebug("ld-acess - _Elf64DoReloc: Unknown relocation type %i", type); - break; - } - } + t_elf64_doreloc fpElf64DoReloc = &_Elf64DoReloc_X86_64; + #define _Elf64DoReloc(info, ptr, addend) fpElf64DoReloc(Base, strtab, symtab, info, ptr, addend) + int fail = 0; if( rel ) { DEBUGS("rel_count = %i", rel_count); for( i = 0; i < rel_count; i ++ ) { uint64_t *ptr = (void *)(uintptr_t)( rel[i].r_offset + baseDiff ); - _Elf64DoReloc( rel[i].r_info, ptr, *ptr); + fail |= _Elf64DoReloc( rel[i].r_info, ptr, *ptr); } } @@ -685,7 +773,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) for( i = 0; i < rela_count; i ++ ) { uint64_t *ptr = (void *)(uintptr_t)( rela[i].r_offset + baseDiff ); - _Elf64DoReloc( rela[i].r_info, ptr, rela[i].r_addend ); + fail |= _Elf64DoReloc( rela[i].r_info, ptr, rela[i].r_addend ); } } @@ -698,7 +786,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) for( i = 0; i < count; i ++ ) { uint64_t *ptr = (void *)(uintptr_t)( plt[i].r_offset + baseDiff ); - _Elf64DoReloc( plt[i].r_info, ptr, *ptr); + fail |= _Elf64DoReloc( plt[i].r_info, ptr, *ptr); } } else { @@ -708,11 +796,16 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) for( i = 0; i < count; i ++ ) { uint64_t *ptr = (void *)(uintptr_t)( plt[i].r_offset + baseDiff ); - _Elf64DoReloc( plt[i].r_info, ptr, plt[i].r_addend); + fail |= _Elf64DoReloc( plt[i].r_info, ptr, plt[i].r_addend); } } } + if( fail ) { + DEBUGS("Elf64Relocate: Failure"); + return NULL; + } + { void *ret = (void *)(uintptr_t)(hdr->e_entry + baseDiff); DEBUGS("Elf64Relocate: Relocations done, return %p", ret); @@ -745,7 +838,7 @@ int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size) int j; // Locate the tables - phtab = (void*)( Base + hdr->e_phoff ); + phtab = (void*)( (intptr_t)Base + (uintptr_t)hdr->e_phoff ); for( i = 0; i < hdr->e_phnum; i ++ ) { if(phtab[i].p_type == PT_LOAD && iBaseDiff > phtab[i].p_vaddr) @@ -792,7 +885,7 @@ int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size) // Walk Chain i = pBuckets[ iNameHash ]; if(symtab[i].st_shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[i].st_name, Name) == 0) { - *Ret = (void*) (intptr_t) symtab[i].st_value + iBaseDiff; + *Ret = (void*)( (intptr_t)symtab[i].st_value + iBaseDiff ); if(Size) *Size = symtab[i].st_size; DEBUGS("%s = %p", Name, *Ret); return 1; @@ -802,7 +895,7 @@ int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size) { i = pChains[i]; if(symtab[i].st_shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[i].st_name, Name) == 0) { - *Ret = (void*)(intptr_t)symtab[i].st_value + iBaseDiff; + *Ret = (void*)((intptr_t)symtab[i].st_value + iBaseDiff); if(Size) *Size = symtab[i].st_size; DEBUGS("%s = %p", Name, *Ret); return 1;