Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-30 16:40:57 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Improve uricheck to avoid bin.relocs.apply mess things up ##bin

Browse Source
This commit is contained in:
pancake 2024-02-28 20:32:09 +01:00 committed by GitHub
parent 6b0032fa68
commit 08670dc007
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 54 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libr/core/cbin.c
View File

@ -1806,12 +1806,32 @@ static inline bool is_file_reloc(RBinReloc *r) {
return is_file_symbol (r->symbol);
}
static void warn_if_uri(RCore *r) {
int fd = r_io_fd_get_current (r->io);
RIODesc *desc = r_io_desc_get (r->io, fd);
if (desc->uri && strstr (desc->uri, "://")) {
R_LOG_ERROR ("bin.relocs and io.cache should not be used with the current io plugin");
static bool warn_if_uri(RCore *core) {
RIODesc *desc = NULL;
RIOMap *map = r_io_map_get_at (core->io, 0); // core->offset);
if (map) {
desc = r_io_desc_get (core->io, map->fd);
} else {
RBinFile *bf = core->bin->cur;
int fd;
if (bf) {
fd = bf->fd;
} else {
fd = r_io_fd_get_current (core->io);
}
if (fd != -1) {
desc = r_io_desc_get (core->io, fd);
}
}
if (desc) {
const char *uri = desc->uri;
R_LOG_DEBUG ("Using uri %s", uri);
if (uri && strstr (uri, "://")) {
R_LOG_ERROR ("bin.relocs and io.cache should not be used with the current io plugin");
return false;
}
}
return true;
}
static bool bin_relocs(RCore *r, PJ *pj, int mode, int va) {
@ -1832,7 +1852,9 @@ static bool bin_relocs(RCore *r, PJ *pj, int mode, int va) {
const bool apply_relocs = r_config_get_b (r->config, "bin.relocs.apply");
const bool bc = r_config_get_b (r->config, "bin.cache");
if (apply_relocs) {
warn_if_uri (r);
if (!warn_if_uri (r)) {
return false;
}
//TODO: remove the bin.cache crap
if (bc) {
if (!(r->io->cachemode & R_PERM_W)) {
@ -1848,7 +1870,9 @@ static bool bin_relocs(RCore *r, PJ *pj, int mode, int va) {
}
} else {
if (bc) {
warn_if_uri (r);
if (!warn_if_uri (r)) {
return false;
}
if (!(r->io->cachemode & R_PERM_W)) {
r_config_set_b (r->config, "io.cache", true);
}
@ -4999,12 +5023,12 @@ static bool r_core_bin_file_print(RCore *core, RBinFile *bf, PJ *pj, int mode) {
}
R_API bool r_core_bin_list(RCore *core, int mode) {
r_return_val_if_fail (core, false);
r_return_val_if_fail (core && core->bin, false);
// list all binfiles and there objects and there archs
RListIter *iter;
RBinFile *binfile = NULL;
RBin *bin = core->bin;
const RList *binfiles = bin ? bin->binfiles: NULL;
const RList *binfiles = bin->binfiles;
if (!binfiles) {
return false;
}

40
test/db/formats/dwarf
View File

@ -721,26 +721,26 @@ colu: 12
addr: 0x00001149
EOF
EXPECT_ERR=<<EOF
DEBUG: [cbin.c:3309] (section .dynstr) Css 141 @ 0x480
DEBUG: [cbin.c:3309] (section .rela.dyn) Cd 8[24] @ 0x550
DEBUG: [cbin.c:3309] (section .rela.plt) Cd 8[3] @ 0x610
DEBUG: [cbin.c:3309] (section .init_array) Cd 8[1] @ 0x3db8
DEBUG: [cbin.c:3309] (section .fini_array) Cd 8[1] @ 0x3dc0
DEBUG: [cbin.c:3309] (section .dynamic) Cd 8[62] @ 0x3dc8
DEBUG: [cbin.c:3309] (section .got) Cd 8[9] @ 0x3fb8
DEBUG: [cbin.c:3309] (section .dynstr) Css 141 @ 0x480
DEBUG: [cbin.c:3309] (section .rela.dyn) Cd 8[24] @ 0x550
DEBUG: [cbin.c:3309] (section .rela.plt) Cd 8[3] @ 0x610
DEBUG: [cbin.c:3309] (section .init_array) Cd 8[1] @ 0x3db8
DEBUG: [cbin.c:3309] (section .fini_array) Cd 8[1] @ 0x3dc0
DEBUG: [cbin.c:3309] (section .dynamic) Cd 8[62] @ 0x3dc8
DEBUG: [cbin.c:3309] (section .got) Cd 8[9] @ 0x3fb8
WARN: [cbin.c:1858] Relocs has not been applied. Please use `-e bin.relocs.apply=true` or `-e bin.cache=true` next time
DEBUG: [cbin.c:2565] Cannot resolve symbol address __libc_start_main
DEBUG: [cbin.c:2565] Cannot resolve symbol address _ITM_deregisterTMCloneTable
DEBUG: [cbin.c:2565] Cannot resolve symbol address __gmon_start__
DEBUG: [cbin.c:2565] Cannot resolve symbol address _ITM_registerTMCloneTable
DEBUG: [cbin.c:2565] Cannot resolve symbol address __cxa_finalize
DEBUG: [cbin.c:3333] (section .dynstr) Css 141 @ 0x480
DEBUG: [cbin.c:3333] (section .rela.dyn) Cd 8[24] @ 0x550
DEBUG: [cbin.c:3333] (section .rela.plt) Cd 8[3] @ 0x610
DEBUG: [cbin.c:3333] (section .init_array) Cd 8[1] @ 0x3db8
DEBUG: [cbin.c:3333] (section .fini_array) Cd 8[1] @ 0x3dc0
DEBUG: [cbin.c:3333] (section .dynamic) Cd 8[62] @ 0x3dc8
DEBUG: [cbin.c:3333] (section .got) Cd 8[9] @ 0x3fb8
DEBUG: [cbin.c:3333] (section .dynstr) Css 141 @ 0x480
DEBUG: [cbin.c:3333] (section .rela.dyn) Cd 8[24] @ 0x550
DEBUG: [cbin.c:3333] (section .rela.plt) Cd 8[3] @ 0x610
DEBUG: [cbin.c:3333] (section .init_array) Cd 8[1] @ 0x3db8
DEBUG: [cbin.c:3333] (section .fini_array) Cd 8[1] @ 0x3dc0
DEBUG: [cbin.c:3333] (section .dynamic) Cd 8[62] @ 0x3dc8
DEBUG: [cbin.c:3333] (section .got) Cd 8[9] @ 0x3fb8
WARN: [cbin.c:1882] Relocs has not been applied. Please use `-e bin.relocs.apply=true` or `-e bin.cache=true` next time
DEBUG: [cbin.c:2589] Cannot resolve symbol address __libc_start_main
DEBUG: [cbin.c:2589] Cannot resolve symbol address _ITM_deregisterTMCloneTable
DEBUG: [cbin.c:2589] Cannot resolve symbol address __gmon_start__
DEBUG: [cbin.c:2589] Cannot resolve symbol address _ITM_registerTMCloneTable
DEBUG: [cbin.c:2589] Cannot resolve symbol address __cxa_finalize
EOF
RUN

1
test/db/formats/rel
View File

@ -44,6 +44,7 @@ DEBUG: imp 5: 2 relocs
DEBUG: imp 6: 7 relocs
DEBUG: imp 7: 16 relocs
DEBUG: bin object have no information
DEBUG: Using uri bins/rel/d_profileNP.rel
ERROR: Imports from other REL (00000002) not yet implemented
ERROR: Imports from other REL (00000003) not yet implemented
ERROR: Imports from other REL (00000004) not yet implemented