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

frv: double syscall restarts, syscall restart in sigreturn()

Browse Source 
We need to make sure that only the first do_signal() to be handled on
the way out syscall will bother with syscall restarts; additionally, the
check on the "signal has user handler" path had been wrong - compare
with restart prevention in sigreturn()...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2010-09-20 15:13:25 +01:00
committed by Linus Torvalds
parent 44c7afffa4
commit ed1cde6836
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/frv/kernel/signal.c
View File

@@ -446,7 +446,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
int ret; int ret;
/* Are we from a system call? */ /* Are we from a system call? */
if (in_syscall(__frame)) { if (__frame->syscallno != -1) {
/* If so, check system call restarting.. */ /* If so, check system call restarting.. */
switch (__frame->gr8) { switch (__frame->gr8) {
case -ERESTART_RESTARTBLOCK: case -ERESTART_RESTARTBLOCK:
@@ -465,6 +465,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
__frame->gr8 = __frame->orig_gr8; __frame->gr8 = __frame->orig_gr8;
__frame->pc -= 4; __frame->pc -= 4;
} }
__frame->syscallno = -1;
} }
/* Set up the stack frame */ /* Set up the stack frame */
@@ -551,6 +552,7 @@ no_signal:
__frame->pc -= 4; __frame->pc -= 4;
break; break;
} }
__frame->syscallno = -1;
} }
/* if there's no signal to deliver, we just put the saved sigmask /* if there's no signal to deliver, we just put the saved sigmask