Skip to content

Commit

Permalink
Conver as commands to the rzshell
Browse files Browse the repository at this point in the history
  • Loading branch information
@XVilka
XVilka committed Feb 14, 2022
1 parent 6ba4e79 commit 4ff6d4d
Show file tree
Hide file tree
Showing 8 changed files with 333 additions and 223 deletions.
323 changes: 103 additions & 220 deletions librz/core/cmd/cmd_analysis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,19 +395,6 @@ static const char *help_msg_ao[] = {
NULL
};

static const char *help_msg_as[] = {
"Usage: as[ljk?]", "", "syscall name <-> number utility",
"as", "", "show current syscall and arguments",
"as", " 4", "show syscall 4 based on asm.os and current regs/mem",
"asc[a]", " 4", "dump syscall info in .asm or .h",
"asj", "", "list of syscalls in JSON",
"asl", "", "list of syscalls by asm.os and asm.arch",
"asl", " close", "returns the syscall number for close",
"asl", " 4", "returns the name of the syscall number 4",
"ask", " [query]", "perform syscall/ queries",
NULL
};

/**
* \brief Helper to get function in \p offset
*
Expand Down Expand Up @@ -711,86 +698,6 @@ static void cmd_analysis_trampoline(RzCore *core, const char *input) {
}
}

static const char *syscallNumber(int n) {
return sdb_fmt(n > 1000 ? "0x%x" : "%d", n);
}

RZ_API char *cmd_syscall_dostr(RzCore *core, st64 n, ut64 addr) {
int i;
char str[64];
st64 N = n;
int defVector = rz_syscall_get_swi(core->analysis->syscall);
if (defVector > 0) {
n = -1;
}
if (n == -1 || defVector > 0) {
n = (int)rz_core_reg_getv_by_role_or_name(core, "oeax");
if (!n || n == -1) {
const char *a0 = rz_reg_get_name(core->analysis->reg, RZ_REG_NAME_SN);
n = (a0 == NULL) ? -1 : (int)rz_core_reg_getv_by_role_or_name(core, a0);
}
}
RzSyscallItem *item = rz_syscall_get(core->analysis->syscall, n, defVector);
if (!item) {
item = rz_syscall_get(core->analysis->syscall, N, -1);
}
if (!item) {
return rz_str_newf("%s = unknown ()", syscallNumber(n));
}
char *res = rz_str_newf("%s = %s (", syscallNumber(item->num), item->name);
// TODO: move this to rz_syscall
const char *cc = rz_analysis_syscc_default(core->analysis);
// TODO replace the hardcoded CC with the sdb ones
for (i = 0; i < item->args; i++) {
// XXX this is a hack to make syscall args work on x86-32 and x86-64
// we need to shift sn first.. which is bad, but needs to be redesigned
int regidx = i;
if (core->rasm->bits == 32 && core->rasm->cur && !strcmp(core->rasm->cur->arch, "x86")) {
regidx++;
}
ut64 arg = rz_core_arg_get(core, cc, regidx); // TODO here
// rz_cons_printf ("(%d:0x%"PFMT64x")\n", i, arg);
if (item->sargs) {
switch (item->sargs[i]) {
case 'p': // pointer
res = rz_str_appendf(res, "0x%08" PFMT64x "", arg);
break;
case 'i':
res = rz_str_appendf(res, "%" PFMT64u "", arg);
break;
case 'z':
memset(str, 0, sizeof(str));
rz_io_read_at(core->io, arg, (ut8 *)str, sizeof(str) - 1);
rz_str_filter(str, strlen(str));
res = rz_str_appendf(res, "\"%s\"", str);
break;
case 'Z': {
// TODO replace the hardcoded CC with the sdb ones
ut64 len = rz_core_arg_get(core, cc, i + 2);
len = RZ_MIN(len + 1, sizeof(str) - 1);
if (len == 0) {
len = 16; // override default
}
(void)rz_io_read_at(core->io, arg, (ut8 *)str, len);
str[len] = 0;
rz_str_filter(str, -1);
res = rz_str_appendf(res, "\"%s\"", str);
} break;
default:
res = rz_str_appendf(res, "0x%08" PFMT64x "", arg);
break;
}
} else {
res = rz_str_appendf(res, "0x%08" PFMT64x "", arg);
}
if (i + 1 < item->args) {
res = rz_str_appendf(res, ", ");
}
}
rz_syscall_item_free(item);
return rz_str_appendf(res, ")");
}

static int mw(RzAnalysisEsil *esil, ut64 addr, const ut8 *buf, int len) {
int *ec = (int *)esil->user;
*ec += (len * 2);
Expand Down Expand Up @@ -818,14 +725,6 @@ static int esil_cost(RzCore *core, ut64 addr, const char *expr) {
return ec;
}

static void cmd_syscall_do(RzCore *core, st64 n, ut64 addr) {
char *msg = cmd_syscall_dostr(core, n, addr);
if (msg) {
rz_cons_println(msg);
free(msg);
}
}

#define printline(k, fmt, arg) \
{ \
if (use_color) \
Expand Down Expand Up @@ -3942,131 +3841,118 @@ static void cmd_sdbk(Sdb *db, const char *input) {
}
}

static void cmd_analysis_syscall(RzCore *core, const char *input) {
PJ *pj = NULL;
RzSyscallItem *si;
RZ_IPI RzCmdStatus rz_analysis_syscall_show_handler(RzCore *core, int argc, const char **argv) {
st64 n = argc > 1 ? rz_num_math(core->num, argv[1]) : -1;
char *sysc = rz_core_syscall_as_string(core, n, core->offset);
if (!sysc) {
RZ_LOG_ERROR("Cannot resolve syscall: %" PFMT64d "\n", n);
return RZ_CMD_STATUS_ERROR;
}
rz_cons_println(sysc);
free(sysc);
return RZ_CMD_STATUS_OK;
}

static const char *syscallNumber(int n) {
return sdb_fmt(n > 1000 ? "0x%x" : "%d", n);
}

RZ_IPI RzCmdStatus rz_analysis_syscall_print_handler(RzCore *core, int argc, const char **argv, RzCmdStateOutput *state) {
RzListIter *iter;
RzList *list;
RzNum *num = NULL;
int n;
RzSyscallItem *si;
RzList *list = rz_syscall_list(core->analysis->syscall);
rz_cmd_state_output_array_start(state);
rz_list_foreach (list, iter, si) {
switch (state->mode) {
case RZ_OUTPUT_MODE_STANDARD:
rz_cons_printf("%s = 0x%02x.%s\n",
si->name, si->swi, syscallNumber(si->num));
break;
case RZ_OUTPUT_MODE_JSON:
pj_o(state->d.pj);
pj_ks(state->d.pj, "name", si->name);
pj_ki(state->d.pj, "swi", si->swi);
pj_ki(state->d.pj, "num", si->num);
pj_end(state->d.pj);
break;
default:
rz_warn_if_reached();
break;
}
}
rz_cmd_state_output_array_end(state);
rz_list_free(list);
return RZ_CMD_STATUS_OK;
}

switch (input[0]) {
case 'c': // "asc"
if (input[1] == 'a') {
if (input[2] == ' ') {
if (!isalpha((ut8)input[3]) && (n = rz_num_math(num, input + 3)) >= 0) {
si = rz_syscall_get(core->analysis->syscall, n, -1);
if (si) {
rz_cons_printf(".equ SYS_%s %s\n", si->name, syscallNumber(n));
rz_syscall_item_free(si);
} else
eprintf("Unknown syscall number\n");
} else {
n = rz_syscall_get_num(core->analysis->syscall, input + 3);
if (n != -1) {
rz_cons_printf(".equ SYS_%s %s\n", input + 3, syscallNumber(n));
} else {
eprintf("Unknown syscall name\n");
}
}
} else {
list = rz_syscall_list(core->analysis->syscall);
rz_list_foreach (list, iter, si) {
rz_cons_printf(".equ SYS_%s %s\n",
si->name, syscallNumber(si->num));
}
rz_list_free(list);
}
RZ_IPI RzCmdStatus rz_analysis_syscall_name_handler(RzCore *core, int argc, const char **argv) {
st64 num = rz_syscall_get_num(core->analysis->syscall, argv[1]);
if (num < 1) {
RZ_LOG_ERROR("Cannot resolve syscall: %s\n", argv[1]);
return RZ_CMD_STATUS_ERROR;
}
char *sysc = rz_core_syscall_as_string(core, num, core->offset);
if (!sysc) {
RZ_LOG_ERROR("Cannot resolve syscall: %" PFMT64d "\n", num);
return RZ_CMD_STATUS_ERROR;
}
rz_cons_println(sysc);
free(sysc);
return RZ_CMD_STATUS_OK;
}

static syscall_dump(RzCore *core, int argc, const char **argv, bool is_c) {
if (argc > 1) {
st64 n = rz_num_math(core->num, argv[1]);
if (n < 1) {
RZ_LOG_ERROR("Cannot resolve syscall: %s\n", argv[1]);
return RZ_CMD_STATUS_ERROR;
}
RzSyscallItem *si = rz_syscall_get(core->analysis->syscall, n, -1);
if (!si) {
RZ_LOG_ERROR("Cannot resolve syscall: %" PFMT64d "\n", n);
return RZ_CMD_STATUS_ERROR;
}
if (is_c) {
rz_cons_printf("#define SYS_%s %s\n", si->name, syscallNumber(n));
} else {
if (input[1] == ' ') {
if (!isalpha((ut8)input[2]) && (n = rz_num_math(num, input + 2)) >= 0) {
si = rz_syscall_get(core->analysis->syscall, n, -1);
if (si) {
rz_cons_printf("#define SYS_%s %s\n", si->name, syscallNumber(n));
rz_syscall_item_free(si);
} else
eprintf("Unknown syscall number\n");
} else {
n = rz_syscall_get_num(core->analysis->syscall, input + 2);
if (n != -1) {
rz_cons_printf("#define SYS_%s %s\n", input + 2, syscallNumber(n));
} else {
eprintf("Unknown syscall name\n");
}
}
} else {
list = rz_syscall_list(core->analysis->syscall);
rz_list_foreach (list, iter, si) {
rz_cons_printf("#define SYS_%s %s\n",
si->name, syscallNumber(si->num));
}
rz_list_free(list);
}
rz_cons_printf(".equ SYS_%s %s\n", si->name, syscallNumber(n));
}
break;
case 'k': // "ask"
cmd_sdbk(core->analysis->syscall->db, input + 1);
break;
case 'l': // "asl"
if (input[1] == ' ') {
if (!isalpha((ut8)input[2]) && (n = rz_num_math(num, input + 2)) >= 0) {
si = rz_syscall_get(core->analysis->syscall, n, -1);
if (si) {
rz_cons_println(si->name);
rz_syscall_item_free(si);
} else
eprintf("Unknown syscall number\n");
} else {
n = rz_syscall_get_num(core->analysis->syscall, input + 2);
if (n != -1) {
rz_cons_printf("%s\n", syscallNumber(n));
} else {
eprintf("Unknown syscall name\n");
}
}
rz_syscall_item_free(si);
// FIXME: A case where there is a name used instead of the number
/*
} else {
n = rz_syscall_get_num(core->analysis->syscall, argv[1]);
if (n != -1) {
rz_cons_printf(".equ SYS_%s %s\n", input + 3, syscallNumber(n));
} else {
list = rz_syscall_list(core->analysis->syscall);
rz_list_foreach (list, iter, si) {
rz_cons_printf("%s = 0x%02x.%s\n",
si->name, si->swi, syscallNumber(si->num));
}
rz_list_free(list);
eprintf("Unknown syscall name\n");
}
break;
case 'j': // "asj"
pj = pj_new();
pj_a(pj);
list = rz_syscall_list(core->analysis->syscall);
*/
} else {
RzListIter *iter;
RzSyscallItem *si;
RzList *list = rz_syscall_list(core->analysis->syscall);
rz_list_foreach (list, iter, si) {
pj_o(pj);
pj_ks(pj, "name", si->name);
pj_ki(pj, "swi", si->swi);
pj_ki(pj, "num", si->num);
pj_end(pj);
}
pj_end(pj);
if (pj) {
rz_cons_println(pj_string(pj));
pj_free(pj);
}
break;
case '\0': // "as"
cmd_syscall_do(core, -1, core->offset);
break;
case ' ': // "as "
{
const char *sn = rz_str_trim_head_ro(input + 1);
st64 num = rz_syscall_get_num(core->analysis->syscall, sn);
if (num < 1) {
num = (int)rz_num_get(core->num, sn);
if (is_c) {
rz_cons_printf("#define SYS_%s %s\n",
si->name, syscallNumber(si->num));
} else {
rz_cons_printf(".equ SYS_%s %s\n",
si->name, syscallNumber(si->num));
}
}
cmd_syscall_do(core, num, -1);
} break;
default:
case '?': // "as?"
rz_core_cmd_help(core, help_msg_as);
break;
rz_list_free(list);
}
return RZ_CMD_STATUS_OK;
}

RZ_IPI RzCmdStatus rz_analysis_syscall_dump_assembly_handler(RzCore *core, int argc, const char **argv) {
return syscall_dump(core, argc, argv, false);
}

RZ_IPI RzCmdStatus rz_analysis_syscall_dump_c_handler(RzCore *core, int argc, const char **argv) {
return syscall_dump(core, argc, argv, true);
}

static void cmd_analysis_ucall_ref(RzCore *core, ut64 addr) {
Expand Down Expand Up @@ -5837,9 +5723,6 @@ RZ_IPI int rz_cmd_analysis(void *data, const char *input) {
case 'g': // "ag"
cmd_analysis_graph(core, input + 1);
break;
case 's': // "as"
cmd_analysis_syscall(core, input + 1);
break;
case '*': // "a*"
rz_core_cmd0_rzshell(core, "afl*");
rz_core_cmd0_rzshell(core, "ah*");
Expand Down
Loading

0 comments on commit 4ff6d4d

Please sign in to comment.