diff options
| author | Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de> | 2020-07-23 01:13:19 +0200 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2020-07-27 16:12:49 -0400 |
| commit | 04a8a3d0a73f51c7c2da84f494db7ec1df230e69 (patch) | |
| tree | 737d62bc56ae7957ca702c6db4092de575f6a7de | |
| parent | c7bcbc8ab9cb20536b8f50c62a48cebda965fdba (diff) | |
| download | um-04a8a3d0a73f51c7c2da84f494db7ec1df230e69.tar.gz | |
sh: Fix validation of system call number
The slow path for traced system call entries accessed a wrong memory
location to get the number of the maximum allowed system call number.
Renumber the numbered "local" label for the correct location to avoid
collisions with actual local labels.
Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Fixes: f3a8308864f920d2 ("sh: Add a few missing irqflags tracing markers.")
Signed-off-by: Rich Felker <dalias@libc.org>
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 956a7a03b0c838..9bac5bbb67f33d 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -199,7 +199,7 @@ syscall_trace_entry: mov.l @(OFF_R7,r15), r7 ! arg3 mov.l @(OFF_R3,r15), r3 ! syscall_nr ! - mov.l 2f, r10 ! Number of syscalls + mov.l 6f, r10 ! Number of syscalls cmp/hs r10, r3 bf syscall_call mov #-ENOSYS, r0 @@ -353,7 +353,7 @@ ENTRY(system_call) tst r9, r8 bf syscall_trace_entry ! - mov.l 2f, r8 ! Number of syscalls + mov.l 6f, r8 ! Number of syscalls cmp/hs r8, r3 bt syscall_badsys ! @@ -392,7 +392,7 @@ syscall_exit: #if !defined(CONFIG_CPU_SH2) 1: .long TRA #endif -2: .long NR_syscalls +6: .long NR_syscalls 3: .long sys_call_table 7: .long do_syscall_trace_enter 8: .long do_syscall_trace_leave |