Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-26 22:50:48 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Check esil references on flags in 'aae' ##analysis
Some checks are pending
build / linux-wasi (push) Waiting to run
Details
build / linux-wasi-api (push) Waiting to run
Details
build / linux-csnext (push) Waiting to run
Details
build / tarball (push) Waiting to run
Details
build / linux-static (push) Waiting to run
Details
build / linux-acr-rpm-64 (push) Waiting to run
Details
build / linux-acr-deb (amd64) (push) Waiting to run
Details
build / linux-acr-deb (arm64, aarch64-linux-gnu) (push) Waiting to run
Details
build / linux-acr-deb (i386, multilib) (push) Waiting to run
Details
build / macos-acr (arm64, 13) (push) Waiting to run
Details
build / macos-acr (x86_64, 12) (push) Waiting to run
Details
build / ios (cydia32) (push) Waiting to run
Details
build / ios (true, cydia) (push) Waiting to run
Details
build / android-acr (16, arm) (push) Waiting to run
Details
build / android-acr (aarch64) (push) Waiting to run
Details
build / android-meson (x86_64) (push) Waiting to run
Details
build / w32-meson (push) Waiting to run
Details
build / w64-static-2022 (push) Waiting to run
Details
build / w64-static (push) Waiting to run
Details
build / w64-meson (push) Waiting to run
Details
build / check_abi_compatibility (push) Blocked by required conditions
Details
build / check_release (push) Blocked by required conditions
Details
build / release (push) Blocked by required conditions
Details
CI / linux-acr-oldlibsbug (push) Waiting to run
Details
CI / linux-nocs (push) Waiting to run
Details
CI / linux-acr-gperf (push) Waiting to run
Details
CI / linux-sys-capstone (push) Waiting to run
Details
CI / linux-acr-resymlink (push) Waiting to run
Details
CI / linux-test (push) Waiting to run
Details
CI / linux-static-meson (push) Waiting to run
Details
CI / macos-test (push) Waiting to run
Details
CI / linux-rpath (push) Waiting to run
Details
CI / macos-rpath (push) Waiting to run
Details
CI / linux-meson-spaces (push) Waiting to run
Details
CI / linux-tinyasan-fuzz (push) Waiting to run
Details
CI / linux-asan-fuzz (push) Waiting to run
Details
CI / w64-make (push) Waiting to run
Details
CI / w32-mingw (push) Waiting to run
Details
CI / w64-mingw (push) Waiting to run
Details
Code scanning - action / CodeQL-Build (push) Waiting to run
Details
Coverity Scan / latest (push) Waiting to run
Details
tcc / ubuntu-tcc-newabi (push) Waiting to run
Details
tcc / ubuntu-tcc-test (push) Waiting to run
Details
tcc / ubuntu-tcc-nodbg (push) Waiting to run
Details
tcc / r2pm-tcc (push) Waiting to run
Details
tcc / ubuntu-tcc-syslibs (push) Waiting to run
Details

Browse Source
This commit is contained in:
pancake 2024-10-09 20:12:54 +02:00 committed by GitHub
parent 08e6e2befb
commit 3d12d2990d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libr/core/canal.c
View File

@ -5266,7 +5266,14 @@ static void cccb(void *u) {
}
// dup with isValidAddress wtf
static bool myvalid(RIO *io, ut64 addr) {
static bool myvalid(RCore *core, ut64 addr) {
RIO *io = core->io;
#if 1
RFlagItem *fi = r_flag_get_i (core->flags, addr);
if (fi && strchr (fi->name, '.')) {
return true;
}
#endif
if (addr < 0x100) {
return false;
}
@ -5363,7 +5370,7 @@ static bool esilbreak_mem_write(REsil *esil, ut64 addr, const ut8 *buf, int len)
RCore *core = esil->anal->coreb.core;
handle_var_stack_access (esil, addr, R_PERM_W, len);
// ignore writes in stack
if (myvalid (core->io, addr) && r_io_read_at (core->io, addr, (ut8*)buf, len)) {
if (myvalid (core, addr) && r_io_read_at (core->io, addr, (ut8*)buf, len)) {
if (!is_stack (core->io, addr)) {
r_anal_xrefs_set (core->anal, esil->addr, addr, R_ANAL_REF_TYPE_DATA | R_ANAL_REF_TYPE_WRITE);
/** resolve ptr */
@ -5388,7 +5395,7 @@ static bool esilbreak_mem_read(REsil *esil, ut64 addr, ut8 *buf, int len) {
esilbreak_last_read = addr;
}
handle_var_stack_access (esil, addr, R_PERM_R, len);
if (myvalid (core->io, addr) && r_io_read_at (core->io, addr, (ut8*)buf, len)) {
if (myvalid (core, addr) && r_io_read_at (core->io, addr, (ut8*)buf, len)) {
ut64 refptr = UT64_MAX;
bool trace = true;
switch (len) {
@ -5410,7 +5417,7 @@ static bool esilbreak_mem_read(REsil *esil, ut64 addr, ut8 *buf, int len) {
break;
}
// TODO incorrect
if (trace && myvalid (core->io, refptr)) {
if (trace && myvalid (core, refptr)) {
if (ntarget == UT64_MAX || ntarget == refptr) {
str[0] = 0;
if (r_io_read_at (core->io, refptr, str, sizeof (str)) < 1) {
@ -5424,7 +5431,7 @@ static bool esilbreak_mem_read(REsil *esil, ut64 addr, ut8 *buf, int len) {
}
}
}
if (myvalid (core->io, addr) && r_io_read_at (core->io, addr, (ut8*)buf, len)) {
if (myvalid (core, addr) && r_io_read_at (core->io, addr, (ut8*)buf, len)) {
if (!is_stack (core->io, addr)) {
r_anal_xrefs_set (core->anal, esil->addr, addr, R_ANAL_REF_TYPE_DATA | R_ANAL_REF_TYPE_READ);
}
@ -6024,6 +6031,37 @@ R_API void r_core_anal_esil(RCore *core, const char *str /* len */, const char *
if (CHECKREF (ESIL->cur)) {
r_anal_xrefs_set (core->anal, cur, ESIL->cur, R_ANAL_REF_TYPE_STRN | R_ANAL_REF_TYPE_READ);
}
#if 0
ut64 dst = esilbreak_last_read;
if (dst != UT64_MAX && CHECKREF (dst)) {
if (myvalid (core, dst)) {
r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA | R_ANAL_REF_TYPE_READ);
if (cfg_anal_strings) {
add_string_ref (core, op.addr, dst);
}
}
}
#if 0
dst = r_reg_getv (core->anal->reg, "tmp");
if (dst != UT64_MAX && CHECKREF (dst)) {
if (myvalid (core, dst)) {
r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA | R_ANAL_REF_TYPE_READ);
if (cfg_anal_strings) {
add_string_ref (core, op.addr, dst);
}
}
}
#endif
dst = esilbreak_last_data;
if (dst != UT64_MAX && CHECKREF (dst)) {
if (myvalid (core, dst)) {
r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA | R_ANAL_REF_TYPE_READ);
if (cfg_anal_strings) {
add_string_ref (core, op.addr, dst);
}
}
}
#endif
} else if ((target && op.ptr == ntarget) || !target) {
if (CHECKREF (ESIL->cur)) {
if (op.ptr && r_io_is_valid_offset (core->io, op.ptr, !core->anal->opt.noncode)) {
@ -6073,7 +6111,7 @@ R_API void r_core_anal_esil(RCore *core, const char *str /* len */, const char *
break;
}
if ((target && dst == ntarget) || !target) {
if (dst > 0xffff && opsrc1 && (dst & 0xffff) == (opsrc1->imm & 0xffff) && myvalid (core->io, dst)) {
if (dst > 0xffff && opsrc1 && (dst & 0xffff) == (opsrc1->imm & 0xffff) && myvalid (core, dst)) {
RFlagItem *f;
char *str;
if (CHECKREF (dst) || CHECKREF (cur)) {
@ -6109,7 +6147,7 @@ R_API void r_core_anal_esil(RCore *core, const char *str /* len */, const char *
{
ut64 dst = esilbreak_last_read;
if (dst != UT64_MAX && CHECKREF (dst)) {
if (myvalid (core->io, dst)) {
if (myvalid (core, dst)) {
r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA | R_ANAL_REF_TYPE_READ);
if (cfg_anal_strings) {
add_string_ref (core, op.addr, dst);
@ -6118,7 +6156,7 @@ R_API void r_core_anal_esil(RCore *core, const char *str /* len */, const char *
}
dst = esilbreak_last_data;
if (dst != UT64_MAX && CHECKREF (dst)) {
if (myvalid (core->io, dst)) {
if (myvalid (core, dst)) {
r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA | R_ANAL_REF_TYPE_READ);
if (cfg_anal_strings) {
add_string_ref (core, op.addr, dst);
@ -6131,7 +6169,7 @@ R_API void r_core_anal_esil(RCore *core, const char *str /* len */, const char *
{
ut64 dst = op.jump;
if (CHECKREF (dst)) {
if (myvalid (core->io, dst)) {
if (myvalid (core, dst)) {
r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_CODE | R_ANAL_REF_TYPE_EXEC);
}
}
@ -6141,7 +6179,7 @@ R_API void r_core_anal_esil(RCore *core, const char *str /* len */, const char *
{
ut64 dst = op.jump;
if (CHECKREF (dst) || (target && dst == ntarget)) {
if (myvalid (core->io, dst)) {
if (myvalid (core, dst)) {
r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_CALL | R_ANAL_REF_TYPE_EXEC);
}
ESIL->old = cur + op.size;
@ -6161,7 +6199,7 @@ R_API void r_core_anal_esil(RCore *core, const char *str /* len */, const char *
dst = r_reg_getv (core->anal->reg, pcname);
}
if (CHECKREF (dst)) {
if (myvalid (core->io, dst)) {
if (myvalid (core, dst)) {
RAnalRefType ref =
(op.type & R_ANAL_OP_TYPE_MASK) == R_ANAL_OP_TYPE_UCALL
? R_ANAL_REF_TYPE_CALL

1
libr/flag/flag.c
View File

@ -509,6 +509,7 @@ R_API RFlagItem *r_flag_get(RFlag *f, const char *name) {
}
/* return the first flag item that can be found at offset "off", or NULL otherwise */
// R2_600 - rename to r_flag_get_at and r_flag_get_in ??
R_API RFlagItem *r_flag_get_i(RFlag *f, ut64 off) {
R_RETURN_VAL_IF_FAIL (f, NULL);
if (f->mask) {