[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 53/59] linux-user: Pass ka_restorer to do_sigaction
From: |
Laurent Vivier |
Subject: |
[PULL 53/59] linux-user: Pass ka_restorer to do_sigaction |
Date: |
Tue, 18 May 2021 07:31:25 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
The value of ka_restorer needs to be saved in sigact_table.
At the moment, the attempt to save it in do_syscall is
improperly clobbering user memory.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210422230227.314751-4-richard.henderson@linaro.org>
[lv: remove tab]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/signal.c | 5 ++++-
linux-user/syscall.c | 19 ++++++-------------
linux-user/syscall_defs.h | 2 +-
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index cbd80b28cf5a..9016896dcda0 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -842,7 +842,7 @@ abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong
uoss_addr,
/* do_sigaction() return target values and host errnos */
int do_sigaction(int sig, const struct target_sigaction *act,
- struct target_sigaction *oact)
+ struct target_sigaction *oact, abi_ulong ka_restorer)
{
struct target_sigaction *k;
struct sigaction act1;
@@ -875,6 +875,9 @@ int do_sigaction(int sig, const struct target_sigaction
*act,
__get_user(k->sa_flags, &act->sa_flags);
#ifdef TARGET_ARCH_HAS_SA_RESTORER
__get_user(k->sa_restorer, &act->sa_restorer);
+#endif
+#ifdef TARGET_ARCH_HAS_KA_RESTORER
+ k->ka_restorer = ka_restorer;
#endif
/* To be swapped in target_to_host_sigset. */
k->sa_mask = act->sa_mask;
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 82736540ebcc..15b3af257bef 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8989,11 +8989,10 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
act._sa_handler = old_act->_sa_handler;
target_siginitset(&act.sa_mask, old_act->sa_mask);
act.sa_flags = old_act->sa_flags;
- act.ka_restorer = 0;
unlock_user_struct(old_act, arg2, 0);
pact = &act;
}
- ret = get_errno(do_sigaction(arg1, pact, &oact));
+ ret = get_errno(do_sigaction(arg1, pact, &oact, 0));
if (!is_error(ret) && arg3) {
if (!lock_user_struct(VERIFY_WRITE, old_act, arg3, 0))
return -TARGET_EFAULT;
@@ -9017,7 +9016,7 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
pact = NULL;
}
- ret = get_errno(do_sigaction(arg1, pact, &oact));
+ ret = get_errno(do_sigaction(arg1, pact, &oact, 0));
if (!is_error(ret) && arg3) {
if (!lock_user_struct(VERIFY_WRITE, old_act, arg3, 0))
@@ -9040,15 +9039,12 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
target_siginitset(&act.sa_mask, old_act->sa_mask);
act.sa_flags = old_act->sa_flags;
act.sa_restorer = old_act->sa_restorer;
-#ifdef TARGET_ARCH_HAS_KA_RESTORER
- act.ka_restorer = 0;
-#endif
unlock_user_struct(old_act, arg2, 0);
pact = &act;
} else {
pact = NULL;
}
- ret = get_errno(do_sigaction(arg1, pact, &oact));
+ ret = get_errno(do_sigaction(arg1, pact, &oact, 0));
if (!is_error(ret) && arg3) {
if (!lock_user_struct(VERIFY_WRITE, old_act, arg3, 0))
return -TARGET_EFAULT;
@@ -9085,11 +9081,10 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
act._sa_handler = rt_act->_sa_handler;
act.sa_mask = rt_act->sa_mask;
act.sa_flags = rt_act->sa_flags;
- act.ka_restorer = arg5;
unlock_user_struct(rt_act, arg2, 0);
pact = &act;
}
- ret = get_errno(do_sigaction(arg1, pact, &oact));
+ ret = get_errno(do_sigaction(arg1, pact, &oact, arg5));
if (!is_error(ret) && arg3) {
if (!lock_user_struct(VERIFY_WRITE, rt_act, arg3, 0))
return -TARGET_EFAULT;
@@ -9104,6 +9099,7 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
target_ulong sigsetsize = arg5;
#else
target_ulong sigsetsize = arg4;
+ target_ulong restorer = 0;
#endif
struct target_sigaction *act;
struct target_sigaction *oact;
@@ -9115,9 +9111,6 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
if (!lock_user_struct(VERIFY_READ, act, arg2, 1)) {
return -TARGET_EFAULT;
}
-#ifdef TARGET_ARCH_HAS_KA_RESTORER
- act->ka_restorer = restorer;
-#endif
} else {
act = NULL;
}
@@ -9128,7 +9121,7 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
}
} else
oact = NULL;
- ret = get_errno(do_sigaction(arg1, act, oact));
+ ret = get_errno(do_sigaction(arg1, act, oact, restorer));
rt_sigaction_fail:
if (act)
unlock_user_struct(act, arg2, 0);
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 693d4f3788d4..e4aaf8412f56 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -492,7 +492,7 @@ void target_to_host_old_sigset(sigset_t *sigset,
const abi_ulong *old_sigset);
struct target_sigaction;
int do_sigaction(int sig, const struct target_sigaction *act,
- struct target_sigaction *oact);
+ struct target_sigaction *oact, abi_ulong ka_restorer);
#include "target_signal.h"
--
2.31.1
- [PULL 23/59] linux-user/sparc: Split out save_reg_win, (continued)
- [PULL 23/59] linux-user/sparc: Split out save_reg_win, Laurent Vivier, 2021/05/18
- [PULL 37/59] linux-user/s390x: Fix trace in restore_regs, Laurent Vivier, 2021/05/18
- [PULL 32/59] tests/tcg/sparc64: Re-enable linux-test, Laurent Vivier, 2021/05/18
- [PULL 34/59] linux-user/s390x: Use uint16_t for signal retcode, Laurent Vivier, 2021/05/18
- [PULL 44/59] linux-user/s390x: Fix frame_addr corruption in setup_frame, Laurent Vivier, 2021/05/18
- [PULL 45/59] linux-user/s390x: Add build asserts for sigset sizes, Laurent Vivier, 2021/05/18
- [PULL 49/59] linux-user: Fix erroneous conversion in copy_file_range, Laurent Vivier, 2021/05/18
- [PULL 48/59] linux-user: Add copy_file_range to strace.list, Laurent Vivier, 2021/05/18
- [PULL 27/59] linux-user/sparc: Clean up setup_frame, Laurent Vivier, 2021/05/18
- [PULL 50/59] linux-user: use GDateTime for formatting timestamp for core file, Laurent Vivier, 2021/05/18
- [PULL 53/59] linux-user: Pass ka_restorer to do_sigaction,
Laurent Vivier <=
- [PULL 31/59] linux-user/sparc: Implement sparc64 rt signals, Laurent Vivier, 2021/05/18
- [PULL 36/59] linux-user/s390x: Remove restore_sigregs return value, Laurent Vivier, 2021/05/18
- [PULL 38/59] linux-user/s390x: Fix sigcontext sregs value, Laurent Vivier, 2021/05/18
- [PULL 40/59] linux-user/s390x: Tidy save_sigregs, Laurent Vivier, 2021/05/18
- [PULL 47/59] linux-user/s390x: Handle vector regs in signal stack, Laurent Vivier, 2021/05/18
- [PULL 35/59] linux-user/s390x: Remove PSW_ADDR_AMODE, Laurent Vivier, 2021/05/18
- [PULL 41/59] linux-user/s390x: Clean up single-use gotos in signal.c, Laurent Vivier, 2021/05/18
- [PULL 56/59] linux-user/alpha: Share code for TARGET_NR_sigaction, Laurent Vivier, 2021/05/18
- [PULL 52/59] linux-user/alpha: Rename the sigaction restorer field, Laurent Vivier, 2021/05/18
- [PULL 55/59] linux-user/alpha: Define TARGET_ARCH_HAS_KA_RESTORER, Laurent Vivier, 2021/05/18