* [PATCH] PPC64: Fix possible race in syscall restart
@ 2003-11-18 10:53 Paul Mackerras
0 siblings, 0 replies; only message in thread
From: Paul Mackerras @ 2003-11-18 10:53 UTC (permalink / raw)
To: torvalds; +Cc: anton, linux-kernel
Linus, please apply.
This is the PPC64 counterpart of the fix for the potential race in the
syscall restart code that has gone into other architectures. It resets
current_thread_info()->restart_block.fn to do_no_syscall_restart in
the sigreturn code.
Thanks,
Paul.
diff -urN ppc64-linux-2.5/arch/ppc64/kernel/signal.c ppc64-2.5/arch/ppc64/kernel/signal.c
--- ppc64-linux-2.5/arch/ppc64/kernel/signal.c 2003-10-22 21:59:05.000000000 +1000
+++ ppc64-2.5/arch/ppc64/kernel/signal.c 2003-11-17 08:52:15.000000000 +1100
@@ -220,6 +220,9 @@
sigset_t set;
stack_t st;
+ /* Always make any pending restarted system calls return -EINTR */
+ current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
if (verify_area(VERIFY_READ, uc, sizeof(*uc)))
goto badframe;
@@ -354,8 +357,6 @@
{
switch ((int)regs->result) {
case -ERESTART_RESTARTBLOCK:
- current_thread_info()->restart_block.fn = do_no_restart_syscall;
- /* fallthrough */
case -ERESTARTNOHAND:
/* ERESTARTNOHAND means that the syscall should only be
* restarted if there was no handler for the signal, and since
diff -urN ppc64-linux-2.5/arch/ppc64/kernel/signal32.c ppc64-2.5/arch/ppc64/kernel/signal32.c
--- ppc64-linux-2.5/arch/ppc64/kernel/signal32.c 2003-10-22 21:59:05.000000000 +1000
+++ ppc64-2.5/arch/ppc64/kernel/signal32.c 2003-11-17 08:54:29.000000000 +1100
@@ -300,6 +300,9 @@
struct sigcontext32 *sc = (struct sigcontext32 *)(u64)newsp;
int i;
+ /* Always make any pending restarted system calls return -EINTR */
+ current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
if (verify_area(VERIFY_WRITE, frame, sizeof(*frame)))
goto badframe;
if (regs->msr & MSR_FP)
@@ -420,6 +423,9 @@
int i;
mm_segment_t old_fs;
+ /* Always make any pending restarted system calls return -EINTR */
+ current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
/* Adjust the inputted reg1 to point to the first rt signal frame */
rt_sf = (struct rt_sigframe_32 *)(regs->gpr[1] + __SIGNAL_FRAMESIZE32);
/* Copy the information from the user stack */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-11-18 10:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-11-18 10:53 [PATCH] PPC64: Fix possible race in syscall restart Paul Mackerras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®