summaryrefslogtreecommitdiffstats
path: root/arch/x86/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-04-22 03:27:28 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-21 14:19:31 -0400
commit3b7d15bde54be81e3edd773724d85d20ae42a4da (patch)
tree1c4f848ead2edae056c4a9c3e2d119ac1b50ac96 /arch/x86/um
parent76e10d158efb6d4516018846f60c2ab5501900bc (diff)
downloadlinux-3b7d15bde54be81e3edd773724d85d20ae42a4da.tar.bz2
um: ->restart_block.fn needs to be reset on sigreturn
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86/um')
-rw-r--r--arch/x86/um/signal.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c
index 4883b9546016..72eafa6c6a52 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;