diff options
author | David S. Miller <davem@davemloft.net> | 2010-09-22 01:30:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-22 01:30:13 -0400 |
commit | c27852597829128a9c9d96d79ec454a83c6b0da5 (patch) | |
tree | 3fe8d2b5cd9d59a47c64491ba2398bc2039d339c /arch/sparc/kernel/signal_64.c | |
parent | 392c21802ee3aa85cee0e703105f797a8a7b9416 (diff) |
sparc: Prevent no-handler signal syscall restart recursion.
Explicitly clear the "in-syscall" bit when we have no signal
handler and back up the program counters to back up the system
call.
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/signal_64.c')
-rw-r--r-- | arch/sparc/kernel/signal_64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c index 3f19e673e2c..006fe451588 100644 --- a/arch/sparc/kernel/signal_64.c +++ b/arch/sparc/kernel/signal_64.c | |||
@@ -600,12 +600,14 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) | |||
600 | regs->u_regs[UREG_I0] = orig_i0; | 600 | regs->u_regs[UREG_I0] = orig_i0; |
601 | regs->tpc -= 4; | 601 | regs->tpc -= 4; |
602 | regs->tnpc -= 4; | 602 | regs->tnpc -= 4; |
603 | pt_regs_clear_syscall(regs); | ||
603 | } | 604 | } |
604 | if (restart_syscall && | 605 | if (restart_syscall && |
605 | regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { | 606 | regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { |
606 | regs->u_regs[UREG_G1] = __NR_restart_syscall; | 607 | regs->u_regs[UREG_G1] = __NR_restart_syscall; |
607 | regs->tpc -= 4; | 608 | regs->tpc -= 4; |
608 | regs->tnpc -= 4; | 609 | regs->tnpc -= 4; |
610 | pt_regs_clear_syscall(regs); | ||
609 | } | 611 | } |
610 | 612 | ||
611 | /* If there's no signal to deliver, we just put the saved sigmask | 613 | /* If there's no signal to deliver, we just put the saved sigmask |