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

gdbstub: Change GDBState::query_cpu to CPUState

Browse Source 
Since first_cpu/next_cpu are CPUState, CPUArchState is no longer needed.

This resolves a NULL pointer dereference of query_cpu, introduced
with commit 182735efaf and reported by
TeLeMan and Max Filippov.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-06-27 13:44:40 +02:00
parent 3464700f6a
commit 52f34623b4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdbstub.c
View File

@ -289,7 +289,7 @@ enum RSState {
typedef struct GDBState { typedef struct GDBState {
CPUArchState *c_cpu; /* current CPU for step/continue ops */ CPUArchState *c_cpu; /* current CPU for step/continue ops */
CPUArchState *g_cpu; /* current CPU for other ops */ CPUArchState *g_cpu; /* current CPU for other ops */
CPUArchState *query_cpu; /* for q{f|s}ThreadInfo */ CPUState *query_cpu; /* for q{f|s}ThreadInfo */
enum RSState state; /* parsing state */ enum RSState state; /* parsing state */
char line_buf[MAX_PACKET_LENGTH]; char line_buf[MAX_PACKET_LENGTH];
int line_buf_index; int line_buf_index;
@ -2401,15 +2401,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
put_packet(s, "QC1"); put_packet(s, "QC1");
break; break;
} else if (strcmp(p,"fThreadInfo") == 0) { } else if (strcmp(p,"fThreadInfo") == 0) {
s->query_cpu = first_cpu->env_ptr; s->query_cpu = first_cpu;
goto report_cpuinfo; goto report_cpuinfo;
} else if (strcmp(p,"sThreadInfo") == 0) { } else if (strcmp(p,"sThreadInfo") == 0) {
report_cpuinfo: report_cpuinfo:
if (s->query_cpu) { if (s->query_cpu) {
snprintf(buf, sizeof(buf), "m%x", snprintf(buf, sizeof(buf), "m%x", cpu_index(s->query_cpu));
cpu_index(ENV_GET_CPU(s->query_cpu)));
put_packet(s, buf); put_packet(s, buf);
s->query_cpu = ENV_GET_CPU(s->query_cpu)->next_cpu->env_ptr; s->query_cpu = s->query_cpu->next_cpu;
} else } else
put_packet(s, "l"); put_packet(s, "l");
break; break;