[patch] s390: fix syscall restart handling.

From: Martin Schwidefsky
Date: Wed Aug 16 2006 - 08:07:21 EST

From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>

[S390] fix syscall restart handling.

If do_signal() gets called several times before returning to user space
and no signal is pending (e.g. cancelled by a debugger) syscall restart
handling could be done several times. This would change the user space
PSW to an address prior to the syscall instruction.
Fix this by making sure that syscall restart handling is only done once.

Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

arch/s390/kernel/signal.c | 1 +
1 files changed, 1 insertion(+)

diff -urpN linux-2.6/arch/s390/kernel/signal.c linux-2.6-patched/arch/s390/kernel/signal.c
--- linux-2.6/arch/s390/kernel/signal.c 2006-08-16 13:35:54.000000000 +0200
+++ linux-2.6-patched/arch/s390/kernel/signal.c 2006-08-16 13:36:51.000000000 +0200
@@ -457,6 +457,7 @@ void do_signal(struct pt_regs *regs)
regs->gprs[2] = -EINTR;
+ regs->trap = -1; /* Don't deal with this again. */

/* Get signal to deliver. When running under ptrace, at this point
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/