Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01e783b4 authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

nios2: fix syscall restart checks 



commit 2d631bd58fe0ea3e3350212e23c9aba1fb606514 upstream.

sys_foo() returns -512 (aka -ERESTARTSYS) => do_signal() sees
512 in r2 and 1 in r1.

sys_foo() returns 512 => do_signal() sees 512 in r2 and 0 in r1.

The former is restart-worthy; the latter obviously isn't.

Fixes: b53e906d ("nios2: Signal handling support")
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e915176

arch/nios2/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int do_signal(struct pt_regs *regs) 
	/*

	 * If we were from a system call, check for system call restarting...

	 */

	if (regs->orig_r2 >= 0) {

	if (regs->orig_r2 >= 0 && regs->r1) {

		continue_addr = regs->ea;

		restart_addr = continue_addr - 4;

		retval = regs->r2;