commit ca192277db2bfc466840f19f2ee314a84fc78d5c
author Richard Henderson <richard.henderson@linaro.org> Thu Apr 22 16:02:24 2021 -0700
committer Laurent Vivier <laurent@vivier.eu> Tue May 18 07:10:45 2021 +0200
tree 42fbca38ff52f3ed004fbdd4b45be90904048fb6
parent 02fb28e8effe5090ded4d36ea1c947a615099c26

linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall

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

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 15b3af2..a2e18b0 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -9038,7 +9038,9 @@
                 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 @@
                 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