Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-10 00:02:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

* Fix reloc offset resolution in r_bin_elf

Browse Source
This commit is contained in:
Nibble 2010-10-13 04:00:32 +02:00
parent 11e8d6a1da
commit add2efee74
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libr/bin/format/elf/elf.c
View File

@ -491,11 +491,15 @@ struct r_bin_elf_reloc_t* Elf_(r_bin_elf_get_relocs)(struct Elf_(r_bin_elf_obj_t
Elf_(Shdr) *strtab_section;
Elf_(Sym) *sym;
Elf_(Rel) *rel;
ut64 got_addr, got_offset;
char *strtab;
int i, j, nrel, tsize, len, nsym, idx;
if (!bin->shdr || !bin->strtab)
return NULL;
if ((got_addr = Elf_ (r_bin_elf_get_section_offset) (bin, ".got")) == -1 &&
(got_addr = Elf_ (r_bin_elf_get_section_offset) (bin, ".got.plt")) == -1)
return NULL;
for (i = 0, nsym = 0; i < bin->ehdr.e_shnum; i++)
if (bin->shdr[i].sh_type == (bin->ehdr.e_type == ET_REL ? SHT_SYMTAB : SHT_DYNSYM)) {
strtab_section = &bin->shdr[bin->shdr[i].sh_link];
@ -546,6 +550,7 @@ struct r_bin_elf_reloc_t* Elf_(r_bin_elf_get_relocs)(struct Elf_(r_bin_elf_obj_t
return NULL;
}
}
got_offset = (rel[0].r_offset - bin->baddr - got_addr) & ELF_GOTOFF_MASK;
if ((ret = (struct r_bin_elf_reloc_t *)malloc ((nrel+1) * sizeof (struct r_bin_elf_reloc_t))) == NULL) {
perror ("malloc (reloc)");
return NULL;
@ -558,7 +563,8 @@ struct r_bin_elf_reloc_t* Elf_(r_bin_elf_get_relocs)(struct Elf_(r_bin_elf_obj_t
} else strncpy (ret[j].name, "unknown", ELF_STRING_LENGTH);
ret[j].sym = ELF_R_SYM (rel[j].r_info);
ret[j].type = ELF_R_TYPE (rel[j].r_info);
ret[j].offset = rel[j].r_offset - bin->baddr;
ret[j].offset = rel[j].r_offset - got_offset - bin->baddr;
ret[j].rva = rel[j].r_offset - bin->baddr;
ret[j].last = 0;
}
ret[j].last = 1;

1
libr/bin/format/elf/elf.h
View File

@ -38,6 +38,7 @@ typedef struct r_bin_elf_reloc_t {
int sym;
int type;
ut64 offset;
ut64 rva;
int last;
char name[ELF_STRING_LENGTH];
} RBinElfReloc;

2
libr/bin/p/bin_elf.c
View File

@ -168,7 +168,7 @@ static RList* relocs(RBinArch *arch) {
if (!(ptr = R_NEW (RBinReloc)))
break;
strncpy (ptr->name, relocs[i].name, R_BIN_SIZEOF_STRINGS);
ptr->rva = relocs[i].offset;
ptr->rva = relocs[i].rva;
ptr->offset = relocs[i].offset;
ptr->type = relocs[i].type;
ptr->sym = relocs[i].sym;