summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-04-22 03:31:24 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-21 23:52:38 -0400
commitef9b122f322d9d9550160ca33a6efbd759a43b55 (patch)
treedec00c0b0c377b8bf1e3587ca677be4d83bad55b /arch
parent2a3fdc117cdd664814d7374941698729e47fea95 (diff)
downloadlinux-stable-ef9b122f322d9d9550160ca33a6efbd759a43b55.tar.gz
linux-stable-ef9b122f322d9d9550160ca33a6efbd759a43b55.tar.bz2
linux-stable-ef9b122f322d9d9550160ca33a6efbd759a43b55.zip
hexagon: ->restart_block.fn needs to be reset on rt_sigreturn
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/hexagon/kernel/signal.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/hexagon/kernel/signal.c b/arch/hexagon/kernel/signal.c
index ab5f5ad12713..434866eb0f1c 100644
--- a/arch/hexagon/kernel/signal.c
+++ b/arch/hexagon/kernel/signal.c
@@ -294,6 +294,9 @@ asmlinkage int sys_rt_sigreturn(void)
struct rt_sigframe __user *frame;
sigset_t blocked;
+ /* Always make any pending restarted system calls return -EINTR */
+ current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
frame = (struct rt_sigframe __user *)pt_psp(regs);
if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
goto badframe;