ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: Lock log around strace 

Do not allow syscall arguments to be interleaved between threads.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220829021006.67305-8-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2022-08-28 19:10:05 -07:00 committed by Laurent Vivier
parent 53b578f31f
commit c5a1c6b88c
1 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
linux-user/strace.c
View File

@ -3919,26 +3919,37 @@ print_syscall(CPUArchState *cpu_env, int num,
abi_long arg4, abi_long arg5, abi_long arg6) abi_long arg4, abi_long arg5, abi_long arg6)
{ {
int i; int i;
const char *format="%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ")"; FILE *f;
const char *format = "%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ","
TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ","
TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ")";
qemu_log("%d ", getpid()); f = qemu_log_trylock();
if (!f) {
return;
}
fprintf(f, "%d ", getpid());
for(i=0;i<nsyscalls;i++) for (i = 0; i < nsyscalls; i++) {
if( scnames[i].nr == num ) { if (scnames[i].nr == num) {
if( scnames[i].call != NULL ) { if (scnames[i].call != NULL) {
scnames[i].call( scnames[i].call(cpu_env, &scnames[i], arg1, arg2, arg3,
cpu_env, &scnames[i], arg1, arg2, arg3, arg4, arg5, arg6); arg4, arg5, arg6);
} else { } else {
/* XXX: this format system is broken because it uses /* XXX: this format system is broken because it uses
host types and host pointers for strings */ host types and host pointers for strings */
if( scnames[i].format != NULL ) if (scnames[i].format != NULL) {
format = scnames[i].format; format = scnames[i].format;
qemu_log(format, }
scnames[i].name, arg1, arg2, arg3, arg4, arg5, arg6); fprintf(f, format, scnames[i].name, arg1, arg2,
arg3, arg4, arg5, arg6);
} }
qemu_log_unlock(f);
return; return;
} }
qemu_log("Unknown syscall %d\n", num); }
fprintf(f, "Unknown syscall %d\n", num);
qemu_log_unlock(f);
} }
@ -3948,21 +3959,29 @@ print_syscall_ret(CPUArchState *cpu_env, int num, abi_long ret,
abi_long arg4, abi_long arg5, abi_long arg6) abi_long arg4, abi_long arg5, abi_long arg6)
{ {
int i; int i;
FILE *f;
for(i=0;i<nsyscalls;i++) f = qemu_log_trylock();
if( scnames[i].nr == num ) { if (!f) {
if( scnames[i].result != NULL ) { return;
}
for (i = 0; i < nsyscalls; i++) {
if (scnames[i].nr == num) {
if (scnames[i].result != NULL) {
scnames[i].result(cpu_env, &scnames[i], ret, scnames[i].result(cpu_env, &scnames[i], ret,
arg1, arg2, arg3, arg1, arg2, arg3,
arg4, arg5, arg6); arg4, arg5, arg6);
} else { } else {
if (!print_syscall_err(ret)) { if (!print_syscall_err(ret)) {
qemu_log(TARGET_ABI_FMT_ld, ret); fprintf(f, TARGET_ABI_FMT_ld, ret);
} }
qemu_log("\n"); fprintf(f, "\n");
} }
break; break;
} }
}
qemu_log_unlock(f);
} }
void print_taken_signal(int target_signum, const target_siginfo_t *tinfo) void print_taken_signal(int target_signum, const target_siginfo_t *tinfo)
@ -3970,9 +3989,17 @@ void print_taken_signal(int target_signum, const target_siginfo_t *tinfo)
/* Print the strace output for a signal being taken: /* Print the strace output for a signal being taken:
* --- SIGSEGV {si_signo=SIGSEGV, si_code=SI_KERNEL, si_addr=0} --- * --- SIGSEGV {si_signo=SIGSEGV, si_code=SI_KERNEL, si_addr=0} ---
*/ */
qemu_log("--- "); FILE *f;
f = qemu_log_trylock();
if (!f) {
return;
}
fprintf(f, "--- ");
print_signal(target_signum, 1); print_signal(target_signum, 1);
qemu_log(" "); fprintf(f, " ");
print_siginfo(tinfo); print_siginfo(tinfo);
qemu_log(" ---\n"); fprintf(f, " ---\n");
qemu_log_unlock(f);
} }