Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

nios2: fix syscall restart checks

Browse Source 
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: b53e906d25 ("nios2: Signal handling support")
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
This commit is contained in:
Al Viro 2022-08-08 16:08:48 +01:00 committed by Dinh Nguyen
parent 25ba820ef3
commit 2d631bd58f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/nios2/kernel/signal.c
View File

@ -242,7 +242,7 @@ static int do_signal(struct pt_regs *regs)
/* /*
* If we were from a system call, check for system call restarting... * 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; continue_addr = regs->ea;
restart_addr = continue_addr - 4; restart_addr = continue_addr - 4;
retval = regs->r2; retval = regs->r2;