summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2017-06-29 10:12:35 +0100
committerRalf Baechle <ralf@linux-mips.org>2017-07-11 14:13:06 +0200
commitbecddba9f80f26a2b9ebe9bad2806304ed5e00e1 (patch)
tree93e393bee3f3bf46d62e208da2ced0b7022c8605 /arch
parent4f32a39d49b25eaa66d2420f1f03d371ea4cd906 (diff)
downloadlinux-stable-becddba9f80f26a2b9ebe9bad2806304ed5e00e1.tar.gz
linux-stable-becddba9f80f26a2b9ebe9bad2806304ed5e00e1.tar.bz2
linux-stable-becddba9f80f26a2b9ebe9bad2806304ed5e00e1.zip
MIPS: Correct forced syscall errors
When the system call return value is forced to be an error (for example due to SECCOMP_RET_ERRNO), syscall_set_return_value() puts the error code in the return register $v0 and -1 in the error register $a3. However normally executed system calls put 1 in the error register rather than -1, so fix syscall_set_return_value() to be consistent with that. I don't anticipate that anything would have been broken by this, since the most natural way to check the error register on MIPS would be a conditional branch if error register is [not] equal to zero (bnez or beqz). Fixes: 1d7bf993e073 ("MIPS: ftrace: Add support for syscall tracepoints.") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16652/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/include/asm/syscall.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h
index d87882513ee3..7c713025b23f 100644
--- a/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@ -85,7 +85,7 @@ static inline void syscall_set_return_value(struct task_struct *task,
{
if (error) {
regs->regs[2] = -error;
- regs->regs[7] = -1;
+ regs->regs[7] = 1;
} else {
regs->regs[2] = val;
regs->regs[7] = 0;