[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/7] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_sysca
From: |
Richard Henderson |
Subject: |
[PATCH v2 4/7] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall |
Date: |
Thu, 22 Apr 2021 16:02:24 -0700 |
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>
---
linux-user/syscall.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 36169a0ded..89d641856c 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.25.1
- [PATCH v2 0/7] linux-user: sigaction fixes/cleanups, Richard Henderson, 2021/04/22
- [PATCH v2 1/7] linux-user/alpha: Fix rt sigframe return, Richard Henderson, 2021/04/22
- [PATCH v2 2/7] linux-user/alpha: Rename the sigaction restorer field, Richard Henderson, 2021/04/22
- [PATCH v2 4/7] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall,
Richard Henderson <=
- [PATCH v2 7/7] linux-user: Tidy TARGET_NR_rt_sigaction, Richard Henderson, 2021/04/22
- [PATCH v2 6/7] linux-user/alpha: Share code for TARGET_NR_sigaction, Richard Henderson, 2021/04/22
- [PATCH v2 5/7] linux-user/alpha: Define TARGET_ARCH_HAS_KA_RESTORER, Richard Henderson, 2021/04/22