[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/29] linux-user/arm: Handle invalid arm-specific syscalls correc
From: |
Peter Maydell |
Subject: |
[PULL 09/29] linux-user/arm: Handle invalid arm-specific syscalls correctly |
Date: |
Thu, 21 May 2020 20:15:50 +0100 |
The kernel has different handling for syscalls with invalid
numbers that are in the "arm-specific" range 0x9f0000 and up:
* 0x9f0000..0x9f07ff return -ENOSYS if not implemented
* other out of range syscalls cause a SIGILL
(see the kernel's arch/arm/kernel/traps.c:arm_syscall())
Implement this distinction. (Note that our code doesn't look
quite like the kernel's, because we have removed the
0x900000 prefix by this point, whereas the kernel retains
it in arm_syscall().)
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
---
linux-user/arm/cpu_loop.c | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index 025887d6b86..df8b7b3fa96 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -332,10 +332,32 @@ void cpu_loop(CPUARMState *env)
env->regs[0] = cpu_get_tls(env);
break;
default:
- qemu_log_mask(LOG_UNIMP,
- "qemu: Unsupported ARM syscall:
0x%x\n",
- n);
- env->regs[0] = -TARGET_ENOSYS;
+ if (n < 0xf0800) {
+ /*
+ * Syscalls 0xf0000..0xf07ff (or 0x9f0000..
+ * 0x9f07ff in OABI numbering) are defined
+ * to return -ENOSYS rather than raising
+ * SIGILL. Note that we have already
+ * removed the 0x900000 prefix.
+ */
+ qemu_log_mask(LOG_UNIMP,
+ "qemu: Unsupported ARM syscall: 0x%x\n",
+ n);
+ env->regs[0] = -TARGET_ENOSYS;
+ } else {
+ /* Otherwise SIGILL */
+ info.si_signo = TARGET_SIGILL;
+ info.si_errno = 0;
+ info.si_code = TARGET_ILL_ILLTRP;
+ info._sifields._sigfault._addr = env->regs[15];
+ if (env->thumb) {
+ info._sifields._sigfault._addr -= 2;
+ } else {
+ info._sifields._sigfault._addr -= 4;
+ }
+ queue_signal(env, info.si_signo,
+ QEMU_SI_FAULT, &info);
+ }
break;
}
} else {
--
2.20.1
- [PULL 00/29] target-arm queue, Peter Maydell, 2020/05/21
- [PULL 01/29] tests/acceptance: Add a test for the canon-a1100 machine, Peter Maydell, 2020/05/21
- [PULL 02/29] docs/system: Add 'Arm' to the Integrator/CP document title, Peter Maydell, 2020/05/21
- [PULL 03/29] docs/system: Sort Arm board index into alphabetical order, Peter Maydell, 2020/05/21
- [PULL 04/29] docs/system: Document Arm Versatile Express boards, Peter Maydell, 2020/05/21
- [PULL 05/29] docs/system: Document the various MPS2 models, Peter Maydell, 2020/05/21
- [PULL 06/29] docs/system: Document Musca boards, Peter Maydell, 2020/05/21
- [PULL 07/29] linux-user/arm: BKPT should cause SIGTRAP, not be a syscall, Peter Maydell, 2020/05/21
- [PULL 08/29] linux-user/arm: Remove bogus SVC 0xf0002 handling, Peter Maydell, 2020/05/21
- [PULL 09/29] linux-user/arm: Handle invalid arm-specific syscalls correctly,
Peter Maydell <=
- [PULL 10/29] linux-user/arm: Fix identification of syscall numbers, Peter Maydell, 2020/05/21
- [PULL 11/29] target/arm: Remove unused GEN_NEON_INTEGER_OP macro, Peter Maydell, 2020/05/21
- [PULL 12/29] hw: Move i.MX watchdog driver to hw/watchdog, Peter Maydell, 2020/05/21
- [PULL 13/29] hw/watchdog: Implement full i.MX watchdog support, Peter Maydell, 2020/05/21
- [PULL 14/29] hw/arm/fsl-imx25: Wire up watchdog, Peter Maydell, 2020/05/21
- [PULL 15/29] hw/arm/fsl-imx31: Wire up watchdog, Peter Maydell, 2020/05/21
- [PULL 16/29] hw/arm/fsl-imx6: Connect watchdog interrupts, Peter Maydell, 2020/05/21
- [PULL 17/29] hw/arm/fsl-imx6ul: Connect watchdog interrupts, Peter Maydell, 2020/05/21
- [PULL 18/29] hw/arm/fsl-imx7: Instantiate various unimplemented devices, Peter Maydell, 2020/05/21
- [PULL 19/29] hw/arm/fsl-imx7: Connect watchdog interrupts, Peter Maydell, 2020/05/21