On 3/25/24 05:07, Ilya Leoshkevich wrote:
> The indices of arguments used with semctl() are all off-by-1, because
> arg1 is the ipc() command. Fix them. While at it, reuse print_semctl().
>
> New output (for a small test program):
>
> 3540333 semctl(999,888,SEM_INFO,0x00007fe5051ee9a0) = -1 errno=14 (Bad address)
>
> Fixes: 7ccfb2eb5f9d ("Fix warnings that would be caused by gcc flag -Wwrite-strings")
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> linux-user/strace.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/linux-user/strace.c b/linux-user/strace.c
> index 9934e2208e2..9be71af4016 100644
> --- a/linux-user/strace.c
> +++ b/linux-user/strace.c
> @@ -657,7 +657,7 @@ print_newselect(CPUArchState *cpu_env, const struct syscallname *name,
> }
> #endif
>
> -#ifdef TARGET_NR_semctl
> +#if defined(TARGET_NR_semctl) || defined(TARGET_NR_ipc)
> static void
> print_semctl(CPUArchState *cpu_env, const struct syscallname *name,
> abi_long arg1, abi_long arg2, abi_long arg3,
You can remove this ifdef, because one of the two is always defined.
Otherwise,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
> @@ -698,10 +698,8 @@ print_ipc(CPUArchState *cpu_env, const struct syscallname *name,
> {
> switch(arg1) {
> case IPCOP_semctl:
> - qemu_log("semctl(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",",
> - arg1, arg2);
> - print_ipc_cmd(arg3);
> - qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4);
> + print_semctl(cpu_env, &(const struct syscallname){ .name = "semctl" },
> + arg2, arg3, arg4, arg5, 0, 0);
> break;
> case IPCOP_shmat:
> print_shmat(cpu_env, &(const struct syscallname){ .name = "shmat" },