SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linux-user: Pass CPUArchState to do_sigaltstack

Browse Source 
Now that we have exactly one call, it's easy to pass
in env instead of passing in the sp value.
Use target_save_altstack, which required env.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210426025334.1168495-4-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2021-04-25 19:53:12 -07:00 committed by Laurent Vivier
parent 56384cf3ad
commit 6b20875503
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux-user/qemu.h
View File

@ -432,7 +432,8 @@ int target_to_host_signal(int sig);
int host_to_target_signal(int sig); int host_to_target_signal(int sig);
long do_sigreturn(CPUArchState *env); long do_sigreturn(CPUArchState *env);
long do_rt_sigreturn(CPUArchState *env); long do_rt_sigreturn(CPUArchState *env);
abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp); abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr,
CPUArchState *env);
int do_sigprocmask(int how, const sigset_t *set, sigset_t *oldset); int do_sigprocmask(int how, const sigset_t *set, sigset_t *oldset);
abi_long do_swapcontext(CPUArchState *env, abi_ulong uold_ctx, abi_long do_swapcontext(CPUArchState *env, abi_ulong uold_ctx,
abi_ulong unew_ctx, abi_long ctx_size); abi_ulong unew_ctx, abi_long ctx_size);

11
linux-user/signal.c
View File

@ -800,21 +800,18 @@ static void host_signal_handler(int host_signum, siginfo_t *info,
/* do_sigaltstack() returns target values and errnos. */ /* do_sigaltstack() returns target values and errnos. */
/* compare linux/kernel/signal.c:do_sigaltstack() */ /* compare linux/kernel/signal.c:do_sigaltstack() */
abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp) abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr,
CPUArchState *env)
{ {
target_stack_t oss, *uoss = NULL; target_stack_t oss, *uoss = NULL;
abi_long ret = -TARGET_EFAULT; abi_long ret = -TARGET_EFAULT;
if (uoss_addr) { if (uoss_addr) {
TaskState *ts = (TaskState *)thread_cpu->opaque;
/* Verify writability now, but do not alter user memory yet. */ /* Verify writability now, but do not alter user memory yet. */
if (!lock_user_struct(VERIFY_WRITE, uoss, uoss_addr, 0)) { if (!lock_user_struct(VERIFY_WRITE, uoss, uoss_addr, 0)) {
goto out; goto out;
} }
__put_user(ts->sigaltstack_used.ss_sp, &oss.ss_sp); target_save_altstack(&oss, env);
__put_user(ts->sigaltstack_used.ss_size, &oss.ss_size);
__put_user(sas_ss_flags(sp), &oss.ss_flags);
} }
if (uss_addr) { if (uss_addr) {
@ -823,7 +820,7 @@ abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp)
if (!lock_user_struct(VERIFY_READ, uss, uss_addr, 1)) { if (!lock_user_struct(VERIFY_READ, uss, uss_addr, 1)) {
goto out; goto out;
} }
ret = target_restore_altstack(uss, sp); ret = target_restore_altstack(uss, get_sp_from_cpustate(env));
if (ret) { if (ret) {
goto out; goto out;
} }

3
linux-user/syscall.c
View File

@ -11195,8 +11195,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
return ret; return ret;
} }
case TARGET_NR_sigaltstack: case TARGET_NR_sigaltstack:
return do_sigaltstack(arg1, arg2, return do_sigaltstack(arg1, arg2, cpu_env);
get_sp_from_cpustate((CPUArchState *)cpu_env));
#ifdef CONFIG_SENDFILE #ifdef CONFIG_SENDFILE
#ifdef TARGET_NR_sendfile #ifdef TARGET_NR_sendfile