X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Felf.c;h=fa2e3f44da6ad793ccc9d914cb29469a2c85935d;hb=d8d31a4ec9a28eb8de493146ce75e8238e8e13b1;hp=b60c8a8ac61d4ea378db4e7eb44730b833e57b2e;hpb=5c889781da5fb7cc927e9f3dfea45f62b3db42f1;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 b60c8a8a..fa2e3f44 100644 --- a/Usermode/Libraries/ld-acess.so_src/elf.c +++ b/Usermode/Libraries/ld-acess.so_src/elf.c @@ -4,8 +4,10 @@ * * elf.c * - ELF32/ELF64 relocation + * + * TODO: Have GetSymbol() return a symbol "strength" on success. Allows STB_WEAK to be overriden by STB_GLOBAL */ -#ifndef DEBUG // This code is #include'd from the kernel, so DEBUG may already be defined +#ifndef KERNEL_VERSION # define DEBUG 0 #endif @@ -15,15 +17,24 @@ #include "common.h" #include +#include +#ifndef assert +# include +#endif #include "elf32.h" #include "elf64.h" #if DEBUG -# define DEBUGS(v...) SysDebug("ld-acess - " v) +# define DEBUG_OUT(...) SysDebug(__VA_ARGS__) #else -# define DEBUGS(...) +# define DEBUG_OUT(...) do{}while(0) //((void)(__VA_ARGS__)) #endif +#define WARNING(f,...) SysDebug("WARN: "f ,## __VA_ARGS__) // Malformed file +#define NOTICE(f,...) SysDebug("NOTICE: "f ,## __VA_ARGS__) // Missing relocation +//#define TRACE(f,...) DEBUG_OUT("TRACE:%s:%i "f, __func__, __LINE__ ,## __VA_ARGS__) // Debugging trace +#define TRACE(f,...) DEBUG_OUT("TRACE:%s "f, __func__,## __VA_ARGS__) // Debugging trace + #ifndef DISABLE_ELF64 # define SUPPORT_ELF64 #endif @@ -31,20 +42,20 @@ // === CONSTANTS === #if DEBUG //static const char *csaDT_NAMES[] = {"DT_NULL", "DT_NEEDED", "DT_PLTRELSZ", "DT_PLTGOT", "DT_HASH", "DT_STRTAB", "DT_SYMTAB", "DT_RELA", "DT_RELASZ", "DT_RELAENT", "DT_STRSZ", "DT_SYMENT", "DT_INIT", "DT_FINI", "DT_SONAME", "DT_RPATH", "DT_SYMBOLIC", "DT_REL", "DT_RELSZ", "DT_RELENT", "DT_PLTREL", "DT_DEBUG", "DT_TEXTREL", "DT_JMPREL"}; -static const char *csaR_NAMES[] = {"R_386_NONE", "R_386_32", "R_386_PC32", "R_386_GOT32", "R_386_PLT32", "R_386_COPY", "R_386_GLOB_DAT", "R_386_JMP_SLOT", "R_386_RELATIVE", "R_386_GOTOFF", "R_386_GOTPC", "R_386_LAST"}; +//static const char *csaR_NAMES[] = {"R_386_NONE", "R_386_32", "R_386_PC32", "R_386_GOT32", "R_386_PLT32", "R_386_COPY", "R_386_GLOB_DAT", "R_386_JMP_SLOT", "R_386_RELATIVE", "R_386_GOTOFF", "R_386_GOTPC", "R_386_LAST"}; +#endif + +#ifdef SUPPORT_ELF64 #endif // === PROTOTYPES === 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); +void *Elf32_Relocate(void *Base, char **envp, const char *Filename); + int Elf32_GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size); #ifdef SUPPORT_ELF64 -void *Elf64Relocate(void *Base, char **envp, const char *Filename); - int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size); +void *Elf64_Relocate(void *Base, char **envp, const char *Filename); + int Elf64_GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size); #endif uint32_t ElfHashString(const char *name); @@ -60,10 +71,10 @@ void *ElfRelocate(void *Base, char **envp, const char *Filename) switch(hdr->e_ident[4]) { case ELFCLASS32: - return Elf32Relocate(Base, envp, Filename); + return Elf32_Relocate(Base, envp, Filename); #ifdef SUPPORT_ELF64 case ELFCLASS64: - return Elf64Relocate(Base, envp, Filename); + return Elf64_Relocate(Base, envp, Filename); #endif default: SysDebug("ld-acess - ElfRelocate: Unknown file class %i", hdr->e_ident[4]); @@ -81,10 +92,10 @@ int ElfGetSymbol(void *Base, const char *Name, void **ret, size_t *Size) switch(hdr->e_ident[4]) { case ELFCLASS32: - return Elf32GetSymbol(Base, Name, ret, Size); + return Elf32_GetSymbol(Base, Name, ret, Size); #ifdef SUPPORT_ELF64 case ELFCLASS64: - return Elf64GetSymbol(Base, Name, ret, Size); + return Elf64_GetSymbol(Base, Name, ret, Size); #endif default: SysDebug("ld-acess - ElfRelocate: Unknown file class %i", hdr->e_ident[4]); @@ -92,482 +103,219 @@ int ElfGetSymbol(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) +// -------------------------------------------------------------------- +// Elf32 support +// -------------------------------------------------------------------- +#define ELFTYPE Elf32 +#include "elf_impl.c" +#undef ELFTYPE + +Elf32_RelocFcn elf_doRelocate_386; +Elf32_RelocFcn elf_doRelocate_arm; + +int elf_doRelocate_386(const Elf32_RelocInfo *Info, Elf32_Word r_info, Elf32_Word* ptr, Elf32_Addr addend, bool bRela) { - void *symval; - switch( type ) + const Elf32_Sym *sym = &Info->symtab[ ELF32_R_SYM(r_info) ]; + void *symval = (void*)(intptr_t)sym->st_value; + size_t size = sym->st_size; + TRACE("%i '%s'", ELF32_R_TYPE(r_info), Info->strtab + sym->st_name); + switch( ELF32_R_TYPE(r_info) ) { // Standard 32 Bit Relocation (S+A) case R_386_32: - if( !GetSymbol(Sym, &symval, NULL) ) - return 1; - DEBUGS(" elf_doRelocate: R_386_32 *0x%x += %p('%s')", - ptr, symval, Sym); + TRACE("R_386_32 *0x%x = %p + 0x%x", ptr, symval, addend); *ptr = (intptr_t)symval + addend; break; // 32 Bit Relocation wrt. Offset (S+A-P) case R_386_PC32: - DEBUGS(" elf_doRelocate: '%s'", Sym); - 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 ); + TRACE("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; // Absolute Value of a symbol (S) case R_386_GLOB_DAT: + TRACE("R_386_GLOB_DAT *0x%x = %p", ptr, symval); if(0) case R_386_JMP_SLOT: - DEBUGS(" elf_doRelocate: '%s'", Sym); - if( !GetSymbol(Sym, &symval, NULL) ) return 1; - DEBUGS(" elf_doRelocate: %s *0x%x = %p", csaR_NAMES[type], ptr, symval); + TRACE("R_386_JMP_SLOT *0x%x = %p", ptr, symval); *ptr = (intptr_t)symval; break; // Base Address (B+A) case R_386_RELATIVE: - DEBUGS(" elf_doRelocate: R_386_RELATIVE *0x%x = 0x%x + 0x%x", ptr, iBaseDiff, addend); - *ptr = iBaseDiff + addend; + TRACE("R_386_RELATIVE *0x%x = 0x%x + 0x%x", ptr, Info->iBaseDiff, addend); + *ptr = Info->iBaseDiff + addend; break; case R_386_COPY: { - size_t 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); + void *old_symval = symval; + GetSymbol(Info->strtab + sym->st_name, &symval, &size, Info->Base); + if( symval == old_symval ) + { + if( ELF32_ST_BIND(sym->st_info) != STB_WEAK ) + { + WARNING("sym={val:%p,size:0x%x,info:0x%x,other:0x%x,shndx:%i}", + sym->st_value, sym->st_size, sym->st_info, sym->st_other, sym->st_shndx); + WARNING("Can't find required external symbol '%s' for R_386_COPY", Info->strtab + sym->st_name); + return 1; + } + // Don't bother doing the memcpy + TRACE("R_386_COPY (%p, %p, %i)", ptr, symval, size); + } + else + { + TRACE("R_386_COPY (%p, %p, %i)", ptr, symval, size); + memcpy(ptr, symval, size); + } break; } default: - SysDebug("elf_doRelocate_386: Unknown relocation %i", type); + WARNING("Unknown relocation %i", ELF32_ST_TYPE(r_info)); return 2; } return 0; } -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_arm(const Elf32_RelocInfo *Info, Elf32_Word r_info, Elf32_Word* ptr, Elf32_Addr addend, bool bRela) { - uint32_t val; - switch(type) + const Elf32_Sym *sym = &Info->symtab[ ELF32_R_SYM(r_info) ]; + void *symval = (void*)(intptr_t)sym->st_value; + size_t size = sym->st_size; + TRACE("%i '%s'", ELF32_R_TYPE(r_info), Info->strtab + sym->st_name); + uintptr_t val = (uintptr_t)symval; + switch( ELF32_R_TYPE(r_info) ) { // (S + A) | T case R_ARM_ABS32: - DEBUGS(" elf_doRelocate_arm: R_ARM_ABS32 %p (%s + %x)", ptr, Sym, addend); - if( !GetSymbol(Sym, (void**)&val, NULL) ) return 1; + TRACE("R_ARM_ABS32 %p (%p + %x)", ptr, symval, addend); *ptr = val + addend; break; case R_ARM_GLOB_DAT: - DEBUGS(" elf_doRelocate_arm: R_ARM_GLOB_DAT %p (%s + %x)", ptr, Sym, addend); - if( !GetSymbol(Sym, (void**)&val, NULL) ) return 1; + TRACE("R_ARM_GLOB_DAT %p (%p + %x)", ptr, symval, addend); *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); - if( !GetSymbol(Sym, (void**)&val, NULL) ) return 1; + TRACE("R_ARM_JUMP_SLOT %p (%p + %x)", ptr, symval, addend); *ptr = val + addend; break; // Copy - case R_ARM_COPY: { - size_t 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; } + case R_ARM_COPY: + TRACE("R_ARM_COPY (%p, %p, %i)", ptr, symval, size); + memcpy(ptr, symval, 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') { + TRACE("R_ARM_RELATIVE %p (0x%x + 0x%x)", ptr, Info->iBaseDiff, addend); + if(ELF32_R_SYM(r_info) != 0) { // TODO: Get delta for a symbol - SysDebug("elf_doRelocate_arm: TODO - Implment R_ARM_RELATIVE for symbols"); + WARNING("TODO - Implment R_ARM_RELATIVE for symbols"); return 2; } else { - *ptr = iBaseDiff + addend; + *ptr = Info->iBaseDiff + addend; } break; default: - SysDebug("elf_doRelocate_arm: Unknown Relocation, %i", type); + WARNING("Unknown Relocation, %i", ELF32_R_TYPE(r_info)); 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_RelocFcn* Elf32_GetRelocFcn(unsigned Machine) { - Elf32_Ehdr *hdr = Base; - Elf32_Phdr *phtab; - char *libPath; - intptr_t iRealBase = -1; - intptr_t iBaseDiff; - int iSegmentCount; - Elf32_Rel *rel = NULL; - Elf32_Rela *rela = NULL; - void *plt = NULL; - int relSz=0, relEntSz=8; - int relaSz=0, relaEntSz=8; - int pltSz=0, pltType=0; - Elf32_Dyn *dynamicTab = NULL; // Dynamic Table Pointer - char *dynstrtab = NULL; // .dynamic String Table - Elf32_Sym *dynsymtab; - 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); - - // Check magic header - - - // Parse Program Header to get Dynamic Table - phtab = (void*)( (uintptr_t)Base + hdr->phoff ); - iSegmentCount = hdr->phentcount; - for(int i = 0; i < iSegmentCount; i ++) + switch(Machine) { - 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"); - } - break; - } - } - - // Page Align real base - iRealBase &= ~0xFFF; - DEBUGS(" elf_relocate: True Base = 0x%x, Compiled Base = 0x%x", Base, iRealBase); - - // Adjust "Real" Base - iBaseDiff = (intptr_t)Base - iRealBase; - -// hdr->entrypoint += iBaseDiff; // Adjust Entrypoint - - // Check if a PT_DYNAMIC segement was found - if(!dynamicTab) { - SysDebug(" elf_relocate: No PT_DYNAMIC segment in image %p, returning", Base); - return (void *)(intptr_t)(hdr->entrypoint + iBaseDiff); + case EM_386: return elf_doRelocate_386; + case EM_ARM: return elf_doRelocate_arm; + default: return NULL; } +} - // 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 === - dynsymtab = NULL; - for( int j = 0; dynamicTab[j].d_tag != DT_NULL; j++) - { - switch(dynamicTab[j].d_tag) - { - // --- Symbol Table --- - case DT_SYMTAB: - DEBUGS(" elf_relocate: DYNAMIC Symbol Table 0x%x (0x%x)", - dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff); - 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); - 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; -// iSymCount = ((Elf32_Word*)(intptr_t)dynamicTab[j].d_val)[1]; - break; - } - } +// -------------------------------------------------------------------- +// Elf64 support +// -------------------------------------------------------------------- +#ifdef SUPPORT_ELF64 - if(dynsymtab == NULL) { - SysDebug("ld-acess.so - WARNING: No Dynamic Symbol table in %p, returning", hdr); - return (void *)(intptr_t) (hdr->entrypoint + iBaseDiff); - } +#define ELFTYPE Elf64 +#include "elf_impl.c" +#undef ELFTYPE - // === Add to loaded list (can be imported now) === - AddLoaded( Filename, Base ); +Elf64_RelocFcn elf_doRelocate_x86_64; - // === Parse Relocation Data === - DEBUGS(" elf_relocate: dynamicTab = 0x%x", dynamicTab); - for( int j = 0; dynamicTab[j].d_tag != DT_NULL; j++) - { - switch(dynamicTab[j].d_tag) - { - // --- Shared Library Name --- - case DT_SONAME: - DEBUGS(" elf_relocate: .so Name '%s'", dynstrtab+dynamicTab[j].d_val); - break; - // --- 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 - DEBUGS(" elf_relocate: Unable to load '%s'", libPath); - #else - SysDebug("Unable to load required library '%s'", libPath); - #endif - return 0; - } - DEBUGS(" Lib loaded"); - break; - // --- PLT/GOT --- -// case DT_PLTGOT: pltgot = (void*)(iBaseDiff + dynamicTab[j].d_val); break; - case DT_JMPREL: plt = (void*)(iBaseDiff + dynamicTab[j].d_val); break; - case DT_PLTREL: pltType = dynamicTab[j].d_val; break; - case DT_PLTRELSZ: pltSz = dynamicTab[j].d_val; break; - - // --- Relocation --- - case DT_REL: rel = (void*)(iBaseDiff + dynamicTab[j].d_val); break; - case DT_RELSZ: relSz = dynamicTab[j].d_val; break; - case DT_RELENT: relEntSz = dynamicTab[j].d_val; break; - case DT_RELA: rela = (void*)(iBaseDiff + dynamicTab[j].d_val); break; - case DT_RELASZ: relaSz = dynamicTab[j].d_val; break; - case DT_RELAENT: relaEntSz = dynamicTab[j].d_val; break; - - // --- Symbol Table --- - case DT_SYMTAB: - // --- Hash Table --- - case DT_HASH: - // --- String Table --- - case DT_STRTAB: - break; - - // --- Unknown --- - default: - if(dynamicTab[j].d_tag > DT_JMPREL) continue; - //DEBUGS(" elf_relocate: %i-%i = %s,0x%x", - // i,j, csaDT_NAMES[dynamicTab[j].d_tag],dynamicTab[j].d_val); - break; - } - } - - DEBUGS(" elf_relocate: Beginning Relocation"); - - int fail = 0; - - switch(hdr->machine) +int elf_doRelocate_x86_64(const Elf64_RelocInfo *Info, Elf64_Xword r_info, Elf64_Xword* ptr, Elf64_Addr addend, bool bRela) +{ + const Elf64_Sym *sym = &Info->symtab[ ELF64_R_SYM(r_info) ]; + void *symval = (void*)(intptr_t)sym->st_value; + size_t size = sym->st_size; + TRACE("%i '%s'", ELF64_R_TYPE(r_info), Info->strtab + sym->st_name); + switch( ELF64_R_TYPE(r_info) ) { - case EM_386: - do_relocate = elf_doRelocate_386; + case R_X86_64_NONE: break; - case EM_ARM: - do_relocate = elf_doRelocate_arm; + case R_X86_64_64: + TRACE("R_X86_64_64 *0x%x = %p + 0x%x", ptr, symval, addend); + *ptr = (intptr_t)symval + addend; break; - default: - SysDebug("Elf32Relocate: Unknown machine type %i", hdr->machine); - do_relocate = elf_doRelocate_unk; - fail = 1; + // Absolute Value of a symbol (S) + case R_X86_64_GLOB_DAT: + TRACE("R_X86_64_GLOB_DAT *0x%x = %p", ptr, symval); if(0) + case R_X86_64_JUMP_SLOT: + TRACE("R_X86_64_JUMP_SLOT *0x%x = %p", ptr, symval); + *ptr = (intptr_t)symval; 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); + // Base Address (B+A) + case R_X86_64_RELATIVE: + TRACE("R_X86_64_RELATIVE *0x%x = 0x%x + 0x%x", ptr, Info->iBaseDiff, addend); + *ptr = Info->iBaseDiff + addend; + break; - // Parse Relocation Entries - if(rel && relSz) - { - Elf32_Word *ptr; - DEBUGS(" elf_relocate: rel=0x%x, relSz=0x%x, relEntSz=0x%x", rel, relSz, relEntSz); - 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); - fail |= _doRelocate(rel[i].r_info, ptr, 0, *ptr); - } - } - // Parse Relocation Entries - if(rela && relaSz) - { - Elf32_Word *ptr; - DEBUGS(" elf_relocate: rela=0x%x, relaSz=0x%x, relaEntSz=0x%x", rela, relaSz, relaEntSz); - int count = relaSz / relaEntSz; - for( int i = 0; i < count; i++ ) - { - ptr = (void*)(iBaseDiff + rela[i].r_offset); - fail |= _doRelocate(rel[i].r_info, ptr, 1, rela[i].r_addend); - } - } - - // === Process PLT (Procedure Linkage Table) === - if(plt && pltSz) - { - Elf32_Word *ptr; - DEBUGS(" elf_relocate: Relocate PLT, plt=0x%x", plt); - if(pltType == DT_REL) + case R_X86_64_COPY: { + void *old_symval = symval; + GetSymbol(Info->strtab + sym->st_name, &symval, &size, Info->Base); + if( symval == old_symval ) { - Elf32_Rel *pltRel = plt; - int count = pltSz / sizeof(Elf32_Rel); - DEBUGS(" elf_relocate: PLT Reloc Type = Rel, %i entries", count); - for(int i = 0; i < count; i ++) + if( ELF64_ST_BIND(sym->st_info) != STB_WEAK ) { - ptr = (void*)(iBaseDiff + pltRel[i].r_offset); - fail |= _doRelocate(pltRel[i].r_info, ptr, 0, *ptr); + WARNING("sym={val:%p,size:0x%x,info:0x%x,other:0x%x,shndx:%i}", + sym->st_value, sym->st_size, sym->st_info, sym->st_other, sym->st_shndx); + WARNING("Can't find required external symbol '%s' for R_X86_64_COPY", Info->strtab + sym->st_name); + return 1; } + // Don't bother doing the memcpy + TRACE("R_X86_64_COPY (%p, %p, %i)", ptr, symval, size); } else { - Elf32_Rela *pltRela = plt; - int count = pltSz / sizeof(Elf32_Rela); - DEBUGS(" elf_relocate: PLT Reloc Type = Rela, %i entries", count); - for(int i=0;ientrypoint + iBaseDiff, __builtin_return_address(0)); - return (void*)(intptr_t)( hdr->entrypoint + iBaseDiff ); + return 0; } -int Elf32GetSymbol(void *Base, const char *Name, void **ret, size_t *Size) +Elf64_RelocFcn* Elf64_GetRelocFcn(unsigned Machine) { - Elf32_Ehdr *hdr = Base; - Elf32_Sym *symtab = NULL; - int nbuckets = 0; - Elf32_Word *pBuckets = NULL; - Elf32_Word *pChains; - uint32_t iNameHash; - const char *dynstrtab = NULL; - uintptr_t iBaseDiff = -1; - Elf32_Phdr *phtab; - Elf32_Dyn *dynTab = NULL; - - // Locate the tables - phtab = (void*)( (uintptr_t)Base + hdr->phoff ); - for( int i = 0; i < hdr->phentcount; i ++ ) + switch(Machine) { - if(phtab[i].Type == PT_LOAD && iBaseDiff > phtab[i].VAddr) - iBaseDiff = phtab[i].VAddr; - if( phtab[i].Type == PT_DYNAMIC ) { - dynTab = (void*)(intptr_t)phtab[i].VAddr; - } - } - if( !dynTab ) { - SysDebug("ERROR - Unable to find DYNAMIC segment in %p", Base); - return 0; + case EM_X86_64: return elf_doRelocate_x86_64; + default: return NULL; } - iBaseDiff = (intptr_t)Base - iBaseDiff; // Make iBaseDiff actually the diff - dynTab = (void*)( (intptr_t)dynTab + iBaseDiff ); - 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 + iBaseDiff); // Rebased in Relocate - break; - case DT_STRTAB: - dynstrtab = (void*)((intptr_t)dynTab[i].d_val + iBaseDiff); - break; - // --- Hash Table -- - case DT_HASH: - 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; +#endif // SUPPORT_ELF64 - // Walk Chain - 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 +#if 0 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) @@ -582,20 +330,20 @@ int _Elf64DoReloc_X86_64(void *Base, const char *strtab, Elf64_Sym *symtab, Elf6 case R_X86_64_NONE: break; case R_X86_64_64: - if( !GetSymbol(symname, &symval, NULL) ) return 1; + if( !GetSymbol(symname, &symval, NULL, 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; + if( !GetSymbol(symname, &symval, &size, NULL) ) return 1; memcpy(ptr, symval, size); } break; case R_X86_64_GLOB_DAT: - if( !GetSymbol(symname, &symval, NULL) ) return 1; + if( !GetSymbol(symname, &symval, NULL, NULL) ) return 1; *(uint64_t*)ptr = (uintptr_t)symval; break; case R_X86_64_JUMP_SLOT: - if( !GetSymbol(symname, &symval, NULL) ) return 1; + if( !GetSymbol(symname, &symval, NULL, NULL) ) return 1; *(uint64_t*)ptr = (uintptr_t)symval; break; case R_X86_64_RELATIVE: @@ -626,18 +374,18 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) void *pltrel = NULL; int plt_size = 0, plt_type = 0; - DEBUGS("Elf64Relocate: hdr = {"); - DEBUGS("Elf64Relocate: e_ident = '%.16s'", hdr->e_ident); - DEBUGS("Elf64Relocate: e_type = 0x%x", hdr->e_type); - DEBUGS("Elf64Relocate: e_machine = 0x%x", hdr->e_machine); - DEBUGS("Elf64Relocate: e_version = 0x%x", hdr->e_version); - DEBUGS("Elf64Relocate: e_entry = %p", hdr->e_entry); - DEBUGS("Elf64Relocate: e_phoff = 0x%llx", hdr->e_phoff); - DEBUGS("Elf64Relocate: e_shoff = 0x%llx", hdr->e_shoff); - DEBUGS("Elf64Relocate: e_flags = 0x%x", hdr->e_flags); - DEBUGS("Elf64Relocate: e_ehsize = 0x%x", hdr->e_ehsize); - DEBUGS("Elf64Relocate: e_phentsize = 0x%x", hdr->e_phentsize); - DEBUGS("Elf64Relocate: e_phnum = %i", hdr->e_phnum); + TRACE("hdr = {"); + TRACE(" e_ident = '%.16s'", hdr->e_ident); + TRACE(" e_type = 0x%x", hdr->e_type); + TRACE(" e_machine = 0x%x", hdr->e_machine); + TRACE(" e_version = 0x%x", hdr->e_version); + TRACE(" e_entry = %p", hdr->e_entry); + TRACE(" e_phoff = 0x%llx", hdr->e_phoff); + TRACE(" e_shoff = 0x%llx", hdr->e_shoff); + TRACE(" e_flags = 0x%x", hdr->e_flags); + TRACE(" e_ehsize = 0x%x", hdr->e_ehsize); + TRACE(" e_phentsize = 0x%x", hdr->e_phentsize); + TRACE(" e_phnum = %i", hdr->e_phnum); // Scan for the dynamic table (and find the compiled base) phtab = (void*)((uintptr_t)Base + (uintptr_t)hdr->e_phoff); @@ -651,7 +399,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) baseDiff = (uintptr_t)Base - compiledBase; - DEBUGS("baseDiff = %p", baseDiff); + TRACE("baseDiff = %p", baseDiff); if(dyntab == NULL) { SysDebug(" Elf64Relocate: No PT_DYNAMIC segment in image %p, returning", Base); @@ -692,14 +440,14 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) // Second pass on dynamic table for(i = 0; dyntab[i].d_tag != DT_NULL; i ++) { - DEBUGS("dyntab[%i].d_tag = %i", i, dyntab[i].d_tag); + TRACE("dyntab[%i].d_tag = %i", i, dyntab[i].d_tag); switch(dyntab[i].d_tag) { case DT_SONAME: break; case DT_NEEDED: { char *libPath = strtab + dyntab[i].d_un.d_val; - DEBUGS("Elf64Relocate: libPath = '%s'", libPath); + TRACE("Elf64Relocate: libPath = '%s'", libPath); if(LoadLibrary(libPath, NULL, envp) == 0) { SysDebug("ld-acess - Elf64Relocate: Unable to load '%s'", libPath); return NULL; @@ -748,6 +496,8 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) } } + // TODO: Relocate symbols + // Relocation function t_elf64_doreloc fpElf64DoReloc = &_Elf64DoReloc_X86_64; #define _Elf64DoReloc(info, ptr, addend) fpElf64DoReloc(Base, strtab, symtab, info, ptr, addend) @@ -755,7 +505,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) int fail = 0; if( rel ) { - DEBUGS("rel_count = %i", rel_count); + TRACE("rel_count = %i", rel_count); for( i = 0; i < rel_count; i ++ ) { uint64_t *ptr = (void *)(uintptr_t)( rel[i].r_offset + baseDiff ); @@ -765,7 +515,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) if( rela ) { - DEBUGS("rela_count = %i", rela_count); + TRACE("rela_count = %i", rela_count); for( i = 0; i < rela_count; i ++ ) { uint64_t *ptr = (void *)(uintptr_t)( rela[i].r_offset + baseDiff ); @@ -778,7 +528,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) if( plt_type == DT_REL ) { Elf64_Rel *plt = pltrel; int count = plt_size / sizeof(Elf64_Rel); - DEBUGS("plt rel count = %i", count); + TRACE("plt rel count = %i", count); for( i = 0; i < count; i ++ ) { uint64_t *ptr = (void *)(uintptr_t)( plt[i].r_offset + baseDiff ); @@ -788,7 +538,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) else { Elf64_Rela *plt = pltrel; int count = plt_size / sizeof(Elf64_Rela); - DEBUGS("plt rela count = %i", count); + TRACE("plt rela count = %i", count); for( i = 0; i < count; i ++ ) { uint64_t *ptr = (void *)(uintptr_t)( plt[i].r_offset + baseDiff ); @@ -798,13 +548,13 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename) } if( fail ) { - DEBUGS("Elf64Relocate: Failure"); + TRACE("Failure"); return NULL; } { void *ret = (void *)(uintptr_t)(hdr->e_entry + baseDiff); - DEBUGS("Elf64Relocate: Relocations done, return %p", ret); + TRACE("Relocations done, return %p", ret); return ret; } } @@ -883,7 +633,7 @@ int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size) if(symtab[i].st_shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[i].st_name, Name) == 0) { *Ret = (void*)( (intptr_t)symtab[i].st_value + iBaseDiff ); if(Size) *Size = symtab[i].st_size; - DEBUGS("%s = %p", Name, *Ret); + TRACE("%s = %p", Name, *Ret); return 1; } @@ -893,7 +643,7 @@ int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size) if(symtab[i].st_shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[i].st_name, Name) == 0) { *Ret = (void*)((intptr_t)symtab[i].st_value + iBaseDiff); if(Size) *Size = symtab[i].st_size; - DEBUGS("%s = %p", Name, *Ret); + TRACE("%s = %p", Name, *Ret); return 1; } } @@ -901,7 +651,7 @@ int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size) return 0; } #endif - +#endif uint32_t ElfHashString(const char *name) {