dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix #12654 - resolv reloc symbols" (#12692)

This commit is contained in:
radare 2019-01-08 10:30:50 +01:00 committed by GitHub
parent b94bb1bca7
commit 08490d3e67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2510,10 +2510,6 @@ RBinElfReloc* Elf_(r_bin_elf_get_relocs)(ELFOBJ *bin) {
if (!bin || !bin->g_sections) {
return NULL;
}
else if (bin->g_relocs) {
return bin->g_relocs;
}
size_t reloc_num = get_relocs_num (bin);
if (!reloc_num) {
return NULL;
@ -2569,7 +2565,6 @@ RBinElfReloc* Elf_(r_bin_elf_get_relocs)(ELFOBJ *bin) {
}
}
ret[reloc_num].last = 1;
bin->g_relocs = ret;
return ret;
}
@ -3001,9 +2996,9 @@ static int Elf_(fix_symbols)(ELFOBJ *bin, int nsym, int type, RBinElfSymbol **sy
/* find match in phdr */
p = phdr_symbols;
while (!p->last) {
if (d->offset == p->offset || p->ordinal == d->ordinal) {
if (p->offset && d->offset == p->offset) {
p->in_shdr = true;
if (*p->name && *d->name && r_str_startswith (d->name, "$")) {
if (*p->name && *d->name && (r_str_startswith (d->name, p->name) || r_str_startswith (d->name, "$"))) {
strcpy (d->name, p->name);
}
}
@ -3164,29 +3159,10 @@ static RBinElfSymbol* Elf_(_r_bin_elf_get_symbols_imports)(ELFOBJ *bin, int type
bprintf ("Cannot allocate %d symbols\n", nsym);
goto beach;
}
RBinElfReloc* relocs;
if (type == R_BIN_ELF_IMPORTS) {
relocs = Elf_(r_bin_elf_get_relocs) (bin);
}
for (k = 1, ret_ctr = 0; k < nsym; k++) {
bool is_sht_null = false;
bool is_vaddr = false;
if (type == R_BIN_ELF_IMPORTS) {
// Workaround to add reloc symbols to imported symbols. This should probably be revised at some point.
bool found_reloc = false;
if (sym[k].st_shndx != STN_UNDEF && relocs) {
j = 0;
while (!relocs[j].last) {
if (k == relocs[j].sym) {
found_reloc = true;
break;
}
j++;
}
}
if (!found_reloc && sym[k].st_shndx != STN_UNDEF) {
continue;
}
if (type == R_BIN_ELF_IMPORTS && sym[k].st_shndx == STN_UNDEF) {
if (sym[k].st_value) {
toffset = sym[k].st_value;
} else if ((toffset = get_import_addr (bin, k)) == -1){
@ -3349,7 +3325,6 @@ void* Elf_(r_bin_elf_free)(ELFOBJ* bin) {
R_FREE (bin->g_imports);
ht_up_free (bin->rel_cache);
bin->rel_cache = NULL;
R_FREE (bin->g_relocs);
free (bin);
return NULL;
}

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

@ -114,7 +114,6 @@ struct Elf_(r_bin_elf_obj_t) {
RBinElfSection *g_sections;
RBinElfSymbol *g_symbols;
RBinElfSymbol *g_imports;
RBinElfReloc *g_relocs;
RBinElfSymbol *phdr_symbols;
RBinElfSymbol *phdr_imports;
HtUP *rel_cache;

1
libr/bin/p/bin_elf.inc
View File

@ -780,6 +780,7 @@ static RList* relocs(RBinFile *bf) {
}
r_list_append (ret, ptr);
}
free (relocs);
}
return ret;
}