From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 54/59] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall
Date: Tue, 18 May 2021 07:31:26 +0200 [thread overview]
Message-ID: <20210518053131.87212-55-laurent@vivier.eu> (raw)
In-Reply-To: <20210518053131.87212-1-laurent@vivier.eu>
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 15b3af257bef..a2e18b06c6d0 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
next prev parent reply other threads:[~2021-05-18 6:23 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 5:30 [PULL 00/59] Linux user for 6.1 patches Laurent Vivier
2021-05-18 5:30 ` [PULL 01/59] linux-user: Remove dead code Laurent Vivier
2021-05-18 5:30 ` [PULL 02/59] linux-user: strace now handles unshare syscall args correctly Laurent Vivier
2021-05-18 5:30 ` [PULL 03/59] linux-user/arm: Split out emulate_arm_fpa11 Laurent Vivier
2021-05-18 5:30 ` [PULL 04/59] linux-user/arm: Do not emulate fpa11 in thumb mode Laurent Vivier
2021-05-18 5:30 ` [PULL 05/59] linux-user/arm: Do not fill in si_code for fpa11 exceptions Laurent Vivier
2021-05-18 5:30 ` [PULL 06/59] linux-user/arm: Simplify accumulating and raising " Laurent Vivier
2021-05-18 5:30 ` [PULL 07/59] linux-user: Add strace support for printing arguments of llseek Laurent Vivier
2021-05-18 5:30 ` [PULL 08/59] linux-user: Split out target_restore_altstack Laurent Vivier
2021-05-18 5:30 ` [PULL 09/59] linux-user: Use target_restore_altstack in all sigreturn Laurent Vivier
2021-05-18 5:30 ` [PULL 10/59] linux-user: Pass CPUArchState to do_sigaltstack Laurent Vivier
2021-05-18 5:30 ` [PULL 11/59] linux-user: Pass CPUArchState to target_restore_altstack Laurent Vivier
2021-05-18 5:30 ` [PULL 12/59] linux-user/sparc: Include TARGET_STACK_BIAS in get_sp_from_cpustate Laurent Vivier
2021-05-18 5:30 ` [PULL 13/59] linux-user/sparc: Clean up init_thread Laurent Vivier
2021-05-18 5:30 ` [PULL 14/59] linux-user/sparc: Merge sparc64 target_syscall.h Laurent Vivier
2021-05-18 5:30 ` [PULL 15/59] linux-user/sparc: Merge sparc64 target_elf.h Laurent Vivier
2021-05-18 5:30 ` [PULL 16/59] linux-user/sparc: Merge sparc64 target_structs.h Laurent Vivier
2021-05-18 5:30 ` [PULL 17/59] linux-user/sparc: Merge sparc64 termbits.h Laurent Vivier
2021-05-18 5:30 ` [PULL 18/59] linux-user/sparc: Merge sparc64/ into sparc/ Laurent Vivier
2021-05-18 5:30 ` [PULL 19/59] linux-user/sparc: Remove target_sigcontext as unused Laurent Vivier
2021-05-18 5:30 ` [PULL 20/59] linux-user/sparc: Remove target_rt_signal_frame " Laurent Vivier
2021-05-18 5:30 ` [PULL 21/59] linux-user/sparc: Fix the stackframe structure Laurent Vivier
2021-05-18 5:30 ` [PULL 22/59] linux-user/sparc: Use target_pt_regs Laurent Vivier
2021-05-18 5:30 ` [PULL 23/59] linux-user/sparc: Split out save_reg_win Laurent Vivier
2021-05-18 5:30 ` [PULL 24/59] linux-user/sparc: Clean up get_sigframe Laurent Vivier
2021-05-18 5:30 ` [PULL 25/59] linux-user/sparc: Save and restore fpu in signal frame Laurent Vivier
2021-05-18 5:30 ` [PULL 26/59] linux-user/sparc: Add rwin_save to " Laurent Vivier
2021-05-18 5:30 ` [PULL 27/59] linux-user/sparc: Clean up setup_frame Laurent Vivier
2021-05-18 5:31 ` [PULL 28/59] linux-user/sparc: Minor corrections to do_sigreturn Laurent Vivier
2021-05-18 5:31 ` [PULL 29/59] linux-user/sparc: Add 64-bit support to fpu save/restore Laurent Vivier
2021-05-18 5:31 ` [PULL 30/59] linux-user/sparc: Implement sparc32 rt signals Laurent Vivier
2021-05-18 5:31 ` [PULL 31/59] linux-user/sparc: Implement sparc64 " Laurent Vivier
2021-05-18 5:31 ` [PULL 32/59] tests/tcg/sparc64: Re-enable linux-test Laurent Vivier
2021-05-18 5:31 ` [PULL 33/59] linux-user/s390x: Fix sigframe types Laurent Vivier
2021-05-18 5:31 ` [PULL 34/59] linux-user/s390x: Use uint16_t for signal retcode Laurent Vivier
2021-05-18 5:31 ` [PULL 35/59] linux-user/s390x: Remove PSW_ADDR_AMODE Laurent Vivier
2021-05-18 5:31 ` [PULL 36/59] linux-user/s390x: Remove restore_sigregs return value Laurent Vivier
2021-05-18 5:31 ` [PULL 37/59] linux-user/s390x: Fix trace in restore_regs Laurent Vivier
2021-05-18 5:31 ` [PULL 38/59] linux-user/s390x: Fix sigcontext sregs value Laurent Vivier
2021-05-18 5:31 ` [PULL 39/59] linux-user/s390x: Use tswap_sigset in setup_rt_frame Laurent Vivier
2021-05-18 5:31 ` [PULL 40/59] linux-user/s390x: Tidy save_sigregs Laurent Vivier
2021-05-18 5:31 ` [PULL 41/59] linux-user/s390x: Clean up single-use gotos in signal.c Laurent Vivier
2021-05-18 5:31 ` [PULL 42/59] linux-user/s390x: Set psw.mask properly for the signal handler Laurent Vivier
2021-05-18 5:31 ` [PULL 43/59] linux-user/s390x: Add stub sigframe argument for last_break Laurent Vivier
2021-05-18 5:31 ` [PULL 44/59] linux-user/s390x: Fix frame_addr corruption in setup_frame Laurent Vivier
2021-05-18 5:31 ` [PULL 45/59] linux-user/s390x: Add build asserts for sigset sizes Laurent Vivier
2021-05-18 5:31 ` [PULL 46/59] linux-user/s390x: Clean up signal.c Laurent Vivier
2021-05-18 5:31 ` [PULL 47/59] linux-user/s390x: Handle vector regs in signal stack Laurent Vivier
2021-05-18 5:31 ` [PULL 48/59] linux-user: Add copy_file_range to strace.list Laurent Vivier
2021-05-18 5:31 ` [PULL 49/59] linux-user: Fix erroneous conversion in copy_file_range Laurent Vivier
2021-05-18 5:31 ` [PULL 50/59] linux-user: use GDateTime for formatting timestamp for core file Laurent Vivier
2021-05-18 5:31 ` [PULL 51/59] linux-user/alpha: Fix rt sigframe return Laurent Vivier
2021-05-18 5:31 ` [PULL 52/59] linux-user/alpha: Rename the sigaction restorer field Laurent Vivier
2021-05-18 5:31 ` [PULL 53/59] linux-user: Pass ka_restorer to do_sigaction Laurent Vivier
2021-05-18 5:31 ` Laurent Vivier [this message]
2021-05-18 5:31 ` [PULL 55/59] linux-user/alpha: Define TARGET_ARCH_HAS_KA_RESTORER Laurent Vivier
2021-05-18 5:31 ` [PULL 56/59] linux-user/alpha: Share code for TARGET_NR_sigaction Laurent Vivier
2021-05-18 5:31 ` [PULL 57/59] linux-user: Tidy TARGET_NR_rt_sigaction Laurent Vivier
2021-05-18 5:31 ` [PULL 58/59] linux-user/elfload: fix filling psinfo->pr_psargs Laurent Vivier
2021-05-18 5:31 ` [PULL 59/59] linux-user/elfload: add s390x core dumping support Laurent Vivier
2021-05-18 20:18 ` [PULL 00/59] Linux user for 6.1 patches Peter Maydell
2021-05-20 13:17 ` Philippe Mathieu-Daudé
-- strict thread matches above, loose matches on Subject: below --
2021-05-17 18:13 Laurent Vivier
2021-05-17 18:14 ` [PULL 54/59] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210518053131.87212-55-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).