sh: bring syscall_set_return_value in line with other architectures

Michael Karcher · Rich Felker · commit 03dd061f0d20 · 2020-08-14T22:05:20.000-04:00
Other architectures expect that syscall_set_return_value gets an already
negative value as error. That's also what kernel/seccomp.c provides.

Signed-off-by: Michael Karcher &lt;kernel@mkarcher.dialup.fu-berlin.de&gt;
Tested-by: John Paul Adrian Glaubitz &lt;glaubitz@physik.fu-berlin.de&gt;
Signed-off-by: Rich Felker &lt;dalias@libc.org&gt;
diff --git a/arch/sh/include/asm/syscall_32.h b/arch/sh/include/asm/syscall_32.h
@@ -40,10 +40,7 @@ static inline void syscall_set_return_value(struct task_struct *task,
 					    struct pt_regs *regs,
 					    int error, long val)
 {
-	if (error)
-		regs->regs[0] = -error;
-	else
-		regs->regs[0] = val;
+	regs->regs[0] = (long) error ?: val;
 }
 
 static inline void syscall_get_arguments(struct task_struct *task,

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ static inline void syscall_set_return_value(struct task_struct *task,`
`40`	`40`	`struct pt_regs *regs,`
`41`	`41`	`int error, long val)`
`42`	`42`	`{`
`43`		`- if (error)`
`44`		`- regs->regs[0] = -error;`
`45`		`- else`
`46`		`- regs->regs[0] = val;`
	`43`	`+ regs->regs[0] = (long) error ?: val;`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`static inline void syscall_get_arguments(struct task_struct *task,`