[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 54/59] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall
From: |
Laurent Vivier |
Subject: |
[PULL 54/59] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall |
Date: |
Mon, 17 May 2021 20:14:19 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
Do not access a field that may not be present. This will
become an issue when sharing more code in the next patch.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210422230227.314751-5-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/syscall.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1f282574a12c..7b139a9c3a55 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -9038,7 +9038,9 @@ 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;
+#ifdef TARGET_ARCH_HAS_SA_RESTORER
act.sa_restorer = old_act->sa_restorer;
+#endif
unlock_user_struct(old_act, arg2, 0);
pact = &act;
} else {
@@ -9051,7 +9053,9 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
old_act->_sa_handler = oact._sa_handler;
old_act->sa_mask = oact.sa_mask.sig[0];
old_act->sa_flags = oact.sa_flags;
+#ifdef TARGET_ARCH_HAS_SA_RESTORER
old_act->sa_restorer = oact.sa_restorer;
+#endif
unlock_user_struct(old_act, arg3, 1);
}
#endif
--
2.31.1
- [PULL 46/59] linux-user/s390x: Clean up signal.c, (continued)
- [PULL 46/59] linux-user/s390x: Clean up signal.c, Laurent Vivier, 2021/05/17
- [PULL 42/59] linux-user/s390x: Set psw.mask properly for the signal handler, Laurent Vivier, 2021/05/17
- [PULL 41/59] linux-user/s390x: Clean up single-use gotos in signal.c, Laurent Vivier, 2021/05/17
- [PULL 48/59] linux-user: Add copy_file_range to strace.list, Laurent Vivier, 2021/05/17
- [PULL 50/59] linux-user: use GDateTime for formatting timestamp for core file, Laurent Vivier, 2021/05/17
- [PULL 55/59] linux-user/alpha: Define TARGET_ARCH_HAS_KA_RESTORER, Laurent Vivier, 2021/05/17
- [PULL 44/59] linux-user/s390x: Fix frame_addr corruption in setup_frame, Laurent Vivier, 2021/05/17
- [PULL 51/59] linux-user/alpha: Fix rt sigframe return, Laurent Vivier, 2021/05/17
- [PULL 56/59] linux-user/alpha: Share code for TARGET_NR_sigaction, Laurent Vivier, 2021/05/17
- [PULL 52/59] linux-user/alpha: Rename the sigaction restorer field, Laurent Vivier, 2021/05/17
- [PULL 54/59] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall,
Laurent Vivier <=
- [PULL 59/59] linux-user/elfload: add s390x core dumping support, Laurent Vivier, 2021/05/17
- [PULL 47/59] linux-user/s390x: Handle vector regs in signal stack, Laurent Vivier, 2021/05/17
- [PULL 49/59] linux-user: Fix erroneous conversion in copy_file_range, Laurent Vivier, 2021/05/17
- [PULL 53/59] linux-user: Pass ka_restorer to do_sigaction, Laurent Vivier, 2021/05/17
- [PULL 57/59] linux-user: Tidy TARGET_NR_rt_sigaction, Laurent Vivier, 2021/05/17
- [PULL 38/59] linux-user/s390x: Fix sigcontext sregs value, Laurent Vivier, 2021/05/17
- Re: [PULL 00/59] Linux user for 6.1 patches, no-reply, 2021/05/17
- [PULL 00/59] Linux user for 6.1 patches, Laurent Vivier, 2021/05/18