mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hmp: Pass monitor to mon_get_cpu_env()

Browse Source 
mon_get_cpu_env() is indirectly called monitor_parse_arguments() where
the current monitor isn't set yet. Instead of using monitor_cur_env(),
explicitly pass the Monitor pointer to the function.

Without this fix, an HMP command like "x $pc" crashes like this:

  #0  0x0000555555caa01f in mon_get_cpu_sync (mon=0x0, synchronize=true) at ../monitor/misc.c:270
  #1  0x0000555555caa141 in mon_get_cpu (mon=0x0) at ../monitor/misc.c:294
  #2  0x0000555555caa158 in mon_get_cpu_env () at ../monitor/misc.c:299
  #3  0x0000555555b19739 in monitor_get_pc (mon=0x555556ad2de0, md=0x5555565d2d40 <monitor_defs+1152>, val=0) at ../target/i386/monitor.c:607
  #4  0x0000555555cadbec in get_monitor_def (mon=0x555556ad2de0, pval=0x7fffffffc208, name=0x7fffffffc220 "pc") at ../monitor/misc.c:1681
  #5  0x000055555582ec4f in expr_unary (mon=0x555556ad2de0) at ../monitor/hmp.c:387
  #6  0x000055555582edbb in expr_prod (mon=0x555556ad2de0) at ../monitor/hmp.c:421
  #7  0x000055555582ee79 in expr_logic (mon=0x555556ad2de0) at ../monitor/hmp.c:455
  #8  0x000055555582eefe in expr_sum (mon=0x555556ad2de0) at ../monitor/hmp.c:484
  #9  0x000055555582efe8 in get_expr (mon=0x555556ad2de0, pval=0x7fffffffc418, pp=0x7fffffffc408) at ../monitor/hmp.c:511
  #10 0x000055555582fcd4 in monitor_parse_arguments (mon=0x555556ad2de0, endp=0x7fffffffc890, cmd=0x555556675b50 <hmp_cmds+7920>) at ../monitor/hmp.c:876
  #11 0x00005555558306a8 in handle_hmp_command (mon=0x555556ad2de0, cmdline=0x555556ada452 "$pc") at ../monitor/hmp.c:1087
  #12 0x000055555582df14 in monitor_command_cb (opaque=0x555556ad2de0, cmdline=0x555556ada450 "x $pc", readline_opaque=0x0) at ../monitor/hmp.c:47

After this fix, nothing is left in monitor_parse_arguments() that can
indirectly call monitor_cur(), so the fix is complete.

Fixes: ff04108a0e
Reported-by: lichun <lichun@ruijie.com.cn>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201113114326.97663-4-kwolf@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Kevin Wolf 2020-11-13 12:43:26 +01:00 committed by Dr. David Alan Gilbert
parent 43cf067ff8
commit e7cff9c68d
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/monitor/hmp-target.h
View File

@ -41,7 +41,7 @@ struct MonitorDef {
const MonitorDef *target_monitor_defs(void); const MonitorDef *target_monitor_defs(void);
int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
CPUArchState *mon_get_cpu_env(void); CPUArchState *mon_get_cpu_env(Monitor *mon);
CPUState *mon_get_cpu(Monitor *mon); CPUState *mon_get_cpu(Monitor *mon);
void hmp_info_mem(Monitor *mon, const QDict *qdict); void hmp_info_mem(Monitor *mon, const QDict *qdict);

6
monitor/misc.c
View File

@ -294,9 +294,9 @@ CPUState *mon_get_cpu(Monitor *mon)
return mon_get_cpu_sync(mon, true); return mon_get_cpu_sync(mon, true);
} }
CPUArchState *mon_get_cpu_env(void) CPUArchState *mon_get_cpu_env(Monitor *mon)
{ {
CPUState *cs = mon_get_cpu(monitor_cur()); CPUState *cs = mon_get_cpu(mon);
return cs ? cs->env_ptr : NULL; return cs ? cs->env_ptr : NULL;
} }
@ -1680,7 +1680,7 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const char *name)
if (md->get_value) { if (md->get_value) {
*pval = md->get_value(mon, md, md->offset); *pval = md->get_value(mon, md, md->offset);
} else { } else {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
ptr = (uint8_t *)env + md->offset; ptr = (uint8_t *)env + md->offset;
switch(md->type) { switch(md->type) {
case MD_I32: case MD_I32:

6
target/i386/monitor.c
View File

@ -222,7 +222,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env; CPUArchState *env;
env = mon_get_cpu_env(); env = mon_get_cpu_env(mon);
if (!env) { if (!env) {
monitor_printf(mon, "No CPU available\n"); monitor_printf(mon, "No CPU available\n");
return; return;
@ -550,7 +550,7 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env; CPUArchState *env;
env = mon_get_cpu_env(); env = mon_get_cpu_env(mon);
if (!env) { if (!env) {
monitor_printf(mon, "No CPU available\n"); monitor_printf(mon, "No CPU available\n");
return; return;
@ -604,7 +604,7 @@ void hmp_mce(Monitor *mon, const QDict *qdict)
static target_long monitor_get_pc(Monitor *mon, const struct MonitorDef *md, static target_long monitor_get_pc(Monitor *mon, const struct MonitorDef *md,
int val) int val)
{ {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
return env->eip + env->segs[R_CS].base; return env->eip + env->segs[R_CS].base;
} }

2
target/m68k/monitor.c
View File

@ -12,7 +12,7 @@
void hmp_info_tlb(Monitor *mon, const QDict *qdict) void hmp_info_tlb(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env1 = mon_get_cpu_env(); CPUArchState *env1 = mon_get_cpu_env(mon);
if (!env1) { if (!env1) {
monitor_printf(mon, "No CPU available\n"); monitor_printf(mon, "No CPU available\n");

2
target/nios2/monitor.c
View File

@ -29,7 +29,7 @@
void hmp_info_tlb(Monitor *mon, const QDict *qdict) void hmp_info_tlb(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env1 = mon_get_cpu_env(); CPUArchState *env1 = mon_get_cpu_env(mon);
dump_mmu(env1); dump_mmu(env1);
} }

10
target/ppc/monitor.c
View File

@ -32,7 +32,7 @@
static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *md, static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *md,
int val) int val)
{ {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
unsigned int u; unsigned int u;
int i; int i;
@ -47,27 +47,27 @@ static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *md,
static target_long monitor_get_decr(Monitor *mon, const struct MonitorDef *md, static target_long monitor_get_decr(Monitor *mon, const struct MonitorDef *md,
int val) int val)
{ {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
return cpu_ppc_load_decr(env); return cpu_ppc_load_decr(env);
} }
static target_long monitor_get_tbu(Monitor *mon, const struct MonitorDef *md, static target_long monitor_get_tbu(Monitor *mon, const struct MonitorDef *md,
int val) int val)
{ {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
return cpu_ppc_load_tbu(env); return cpu_ppc_load_tbu(env);
} }
static target_long monitor_get_tbl(Monitor *mon, const struct MonitorDef *md, static target_long monitor_get_tbl(Monitor *mon, const struct MonitorDef *md,
int val) int val)
{ {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
return cpu_ppc_load_tbl(env); return cpu_ppc_load_tbl(env);
} }
void hmp_info_tlb(Monitor *mon, const QDict *qdict) void hmp_info_tlb(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env1 = mon_get_cpu_env(); CPUArchState *env1 = mon_get_cpu_env(mon);
if (!env1) { if (!env1) {
monitor_printf(mon, "No CPU available\n"); monitor_printf(mon, "No CPU available\n");

2
target/riscv/monitor.c
View File

@ -204,7 +204,7 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env; CPUArchState *env;
env = mon_get_cpu_env(); env = mon_get_cpu_env(mon);
if (!env) { if (!env) {
monitor_printf(mon, "No CPU available\n"); monitor_printf(mon, "No CPU available\n");
return; return;

2
target/sh4/monitor.c
View File

@ -41,7 +41,7 @@ static void print_tlb(Monitor *mon, int idx, tlb_t *tlb)
void hmp_info_tlb(Monitor *mon, const QDict *qdict) void hmp_info_tlb(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
int i; int i;
if (!env) { if (!env) {

6
target/sparc/monitor.c
View File

@ -30,7 +30,7 @@
void hmp_info_tlb(Monitor *mon, const QDict *qdict) void hmp_info_tlb(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env1 = mon_get_cpu_env(); CPUArchState *env1 = mon_get_cpu_env(mon);
if (!env1) { if (!env1) {
monitor_printf(mon, "No CPU available\n"); monitor_printf(mon, "No CPU available\n");
@ -43,7 +43,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict)
static target_long monitor_get_psr(Monitor *mon, const struct MonitorDef *md, static target_long monitor_get_psr(Monitor *mon, const struct MonitorDef *md,
int val) int val)
{ {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
return cpu_get_psr(env); return cpu_get_psr(env);
} }
@ -52,7 +52,7 @@ static target_long monitor_get_psr(Monitor *mon, const struct MonitorDef *md,
static target_long monitor_get_reg(Monitor *mon, const struct MonitorDef *md, static target_long monitor_get_reg(Monitor *mon, const struct MonitorDef *md,
int val) int val)
{ {
CPUArchState *env = mon_get_cpu_env(); CPUArchState *env = mon_get_cpu_env(mon);
return env->regwptr[val]; return env->regwptr[val];
} }

2
target/xtensa/monitor.c
View File

@ -29,7 +29,7 @@
void hmp_info_tlb(Monitor *mon, const QDict *qdict) void hmp_info_tlb(Monitor *mon, const QDict *qdict)
{ {
CPUArchState *env1 = mon_get_cpu_env(); CPUArchState *env1 = mon_get_cpu_env(mon);
if (!env1) { if (!env1) {
monitor_printf(mon, "No CPU available\n"); monitor_printf(mon, "No CPU available\n");