summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Willeke <willeke@de.ibm.com>2014-07-22 16:50:57 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-07-28 10:02:31 +0200
commitdc295880c6752076f8b94ba3885d0bfff09e3e82 (patch)
tree193959044c6458cb104cdf3f14bd00920bacdb97
parentc60d1ae4efcb5790f7d085369baf66c167a6484f (diff)
downloadlinux-dc295880c6752076f8b94ba3885d0bfff09e3e82.tar.gz
linux-dc295880c6752076f8b94ba3885d0bfff09e3e82.tar.bz2
linux-dc295880c6752076f8b94ba3885d0bfff09e3e82.zip
s390/seccomp: fix error return for filtered system calls
The syscall_set_return_value function of s390 negates the error argument before storing the value to the return register gpr2. This is incorrect, the seccomp code already passes the negative error value. Store the unmodified error value to gpr2. Signed-off-by: Jan Willeke <willeke@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/syscall.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index abad78d5b10c..5bc12598ae9e 100644
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -54,7 +54,7 @@ static inline void syscall_set_return_value(struct task_struct *task,
struct pt_regs *regs,
int error, long val)
{
- regs->gprs[2] = error ? -error : val;
+ regs->gprs[2] = error ? error : val;
}
static inline void syscall_get_arguments(struct task_struct *task,