lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mn10300: prevent double syscall restarts

Browse Source 
set ->orig_d0 to -1, same as what sigreturn does

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2010-09-26 19:28:42 +01:00
committed by Linus Torvalds
parent e46924d246
commit 00cbf6080c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/mn10300/kernel/signal.c
View File

@@ -432,6 +432,12 @@ give_sigsegv:
return -EFAULT; return -EFAULT;
} }
static inline void stepback(struct pt_regs *regs)
{
regs->pc -= 2;
regs->orig_d0 = -1;
}
/* /*
* handle the actual delivery of a signal to userspace * handle the actual delivery of a signal to userspace
*/ */
@@ -459,7 +465,7 @@ static int handle_signal(int sig,
/* fallthrough */ /* fallthrough */
case -ERESTARTNOINTR: case -ERESTARTNOINTR:
regs->d0 = regs->orig_d0; regs->d0 = regs->orig_d0;
regs->pc -= 2; stepback(regs);
} }
} }
@@ -527,12 +533,12 @@ static void do_signal(struct pt_regs *regs)
case -ERESTARTSYS: case -ERESTARTSYS:
case -ERESTARTNOINTR: case -ERESTARTNOINTR:
regs->d0 = regs->orig_d0; regs->d0 = regs->orig_d0;
regs->pc -= 2; stepback(regs);
break; break;
case -ERESTART_RESTARTBLOCK: case -ERESTART_RESTARTBLOCK:
regs->d0 = __NR_restart_syscall; regs->d0 = __NR_restart_syscall;
regs->pc -= 2; stepback(regs);
break; break;
} }
} }