This is a note to let you know that I've just added the patch titled
sparc: Prevent no-handler signal syscall restart recursion.
to the 2.6.32-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sparc-prevent-no-handler-signal-syscall-restart-recursion.patch
and it can be found in the queue-2.6.32 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From e1c8548d96185aba30c84187758d0b68f73d70a4 Mon Sep 17 00:00:00 2001
From: David S. Miller <[email protected]>
Date: Tue, 21 Sep 2010 22:30:13 -0700
Subject: sparc: Prevent no-handler signal syscall restart recursion.
From: David S. Miller <[email protected]>
[ Upstream commit c27852597829128a9c9d96d79ec454a83c6b0da5 ]
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/sparc/kernel/signal32.c | 4 +++-
arch/sparc/kernel/signal_32.c | 2 ++
arch/sparc/kernel/signal_64.c | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -616,7 +616,7 @@ static int setup_frame32(struct k_sigact
flush_signal_insns(address);
}
- return;
+ return 0;
sigill:
do_exit(SIGILL);
@@ -840,12 +840,14 @@ void do_signal32(sigset_t *oldset, struc
regs->u_regs[UREG_I0] = orig_i0;
regs->tpc -= 4;
regs->tnpc -= 4;
+ pt_regs_clear_syscall(regs);
}
if (restart_syscall &&
regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
regs->u_regs[UREG_G1] = __NR_restart_syscall;
regs->tpc -= 4;
regs->tnpc -= 4;
+ pt_regs_clear_syscall(regs);
}
/* If there's no signal to deliver, we just put the saved sigmask
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -580,12 +580,14 @@ static void do_signal(struct pt_regs *re
regs->u_regs[UREG_I0] = orig_i0;
regs->pc -= 4;
regs->npc -= 4;
+ pt_regs_clear_syscall(regs);
}
if (restart_syscall &&
regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
regs->u_regs[UREG_G1] = __NR_restart_syscall;
regs->pc -= 4;
regs->npc -= 4;
+ pt_regs_clear_syscall(regs);
}
/* if there's no signal to deliver, we just put the saved sigmask
--- 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 *re
regs->u_regs[UREG_I0] = orig_i0;
regs->tpc -= 4;
regs->tnpc -= 4;
+ pt_regs_clear_syscall(regs);
}
if (restart_syscall &&
regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
regs->u_regs[UREG_G1] = __NR_restart_syscall;
regs->tpc -= 4;
regs->tnpc -= 4;
+ pt_regs_clear_syscall(regs);
}
/* If there's no signal to deliver, we just put the saved sigmask
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.32/net-limit-socket-i-o-iovec-total-length-to-int_max.patch
queue-2.6.32/can-bcm-fix-minor-heap-overflow.patch
queue-2.6.32/x25-prevent-crashing-when-parsing-bad-x.25-facilities.patch
queue-2.6.32/gianfar-fix-crashes-on-rx-path-was-re-new-linux-2.6.36-rc5-crash-with-gianfar-ethernet-at-full-line-rate-traffic.patch
queue-2.6.32/jme-fix-phy-power-off-error.patch
queue-2.6.32/net-sched-fix-kernel-leak-in-act_police.patch
queue-2.6.32/limit-sysctl_tcp_mem-and-sysctl_udp_mem-initializers-to-prevent-integer-overflows.patch
queue-2.6.32/decnet-don-t-leak-uninitialized-stack-byte.patch
queue-2.6.32/x25-patch-to-fix-bug-15678-x25-accesses-fields-beyond-end-of-packet.patch
queue-2.6.32/sparc-prevent-no-handler-signal-syscall-restart-recursion.patch
queue-2.6.32/net-netif_f_hw_csum-does-not-imply-fcoe-crc-offload.patch
queue-2.6.32/net-clear-heap-allocation-for-ethtool_grxclsrlall.patch
queue-2.6.32/sparc-don-t-mask-signal-when-we-can-t-setup-signal-frame.patch
queue-2.6.32/net-truncate-recvfrom-and-sendto-length-to-int_max.patch
queue-2.6.32/sparc64-fix-race-in-signal-instruction-flushing.patch
queue-2.6.32/memory-corruption-in-x.25-facilities-parsing.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
