diff options
| author | Markos Chandras <markos.chandras@imgtec.com> | 2015-08-13 03:47:59 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-08-16 09:00:59 -0400 |
| commit | 9f161439e4104b641a7bfb9b89581d801159fec8 (patch) | |
| tree | 7bdb85d2b3260abb9824a144c94cc349742273ee | |
| parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 (diff) | |
MIPS: Fix seccomp syscall argument for MIPS64
Commit 4c21b8fd8f14 ("MIPS: seccomp: Handle indirect system calls (o32)")
fixed indirect system calls on O32 but it also introduced a bug for MIPS64
where it erroneously modified the v0 (syscall) register with the assumption
that the sycall offset hasn't been taken into consideration. This breaks
seccomp on MIPS64 n64 and n32 ABIs. We fix this by replacing the addition
with a move instruction.
Fixes: 4c21b8fd8f14 ("MIPS: seccomp: Handle indirect system calls (o32)")
Cc: <stable@vger.kernel.org> # 3.15+
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10951/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/kernel/scall64-64.S | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index ad4d44635c76..a6f6b762c47a 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -80,7 +80,7 @@ syscall_trace_entry: | |||
| 80 | SAVE_STATIC | 80 | SAVE_STATIC |
| 81 | move s0, t2 | 81 | move s0, t2 |
| 82 | move a0, sp | 82 | move a0, sp |
| 83 | daddiu a1, v0, __NR_64_Linux | 83 | move a1, v0 |
| 84 | jal syscall_trace_enter | 84 | jal syscall_trace_enter |
| 85 | 85 | ||
| 86 | bltz v0, 2f # seccomp failed? Skip syscall | 86 | bltz v0, 2f # seccomp failed? Skip syscall |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 446cc654da56..4b2010654c46 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -72,7 +72,7 @@ n32_syscall_trace_entry: | |||
| 72 | SAVE_STATIC | 72 | SAVE_STATIC |
| 73 | move s0, t2 | 73 | move s0, t2 |
| 74 | move a0, sp | 74 | move a0, sp |
| 75 | daddiu a1, v0, __NR_N32_Linux | 75 | move a1, v0 |
| 76 | jal syscall_trace_enter | 76 | jal syscall_trace_enter |
| 77 | 77 | ||
| 78 | bltz v0, 2f # seccomp failed? Skip syscall | 78 | bltz v0, 2f # seccomp failed? Skip syscall |