diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-22 03:27:28 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-21 14:19:31 -0400 |
| commit | 3b7d15bde54be81e3edd773724d85d20ae42a4da (patch) | |
| tree | 1c4f848ead2edae056c4a9c3e2d119ac1b50ac96 /arch | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
um: ->restart_block.fn needs to be reset on sigreturn
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/kernel/signal.c | 3 | ||||
| -rw-r--r-- | arch/x86/um/signal.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c index fb12f4c5e64..0dfcef92ec9 100644 --- a/arch/um/kernel/signal.c +++ b/arch/um/kernel/signal.c @@ -29,9 +29,6 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr, unsigned long sp; int err; - /* Always make any pending restarted system calls return -EINTR */ - current_thread_info()->restart_block.fn = do_no_restart_syscall; - /* Did we come from a system call? */ if (PT_REGS_SYSCALL_NR(regs) >= 0) { /* If so, check system call restarting.. */ diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c index 4883b954601..72eafa6c6a5 100644 --- a/arch/x86/um/signal.c +++ b/arch/x86/um/signal.c @@ -156,6 +156,9 @@ static int copy_sc_from_user(struct pt_regs *regs, struct sigcontext sc; int err, pid; + /* Always make any pending restarted system calls return -EINTR */ + current_thread_info()->restart_block.fn = do_no_restart_syscall; + err = copy_from_user(&sc, from, sizeof(sc)); if (err) return err; |