[ARM] Add code to prevent system calls from being restarted muliple times before...

Fixes crashes with thumb syscalls.

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index e7714f367eb83aa0a4b0224e5129ec94c87c3391..29a905bf747d967f05c9c720a44af8e120028bfb 100644 (file)
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -517,6 +517,14 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
 
 static inline void setup_syscall_restart(struct pt_regs *regs)
 {
+       if (regs->ARM_ORIG_r0 == -ERESTARTNOHAND ||
+           regs->ARM_ORIG_r0 == -ERESTARTSYS ||
+           regs->ARM_ORIG_r0 == -ERESTARTNOINTR ||
+           regs->ARM_ORIG_r0 == -ERESTART_RESTARTBLOCK) {
+               /* the syscall cannot be safely restarted, return -EINTR instead */
+               regs->ARM_r0 = -EINTR;
+               return;
+       }
        regs->ARM_r0 = regs->ARM_ORIG_r0;
        regs->ARM_pc -= thumb_mode(regs) ? 2 : 4;
 }
@@ -649,6 +657,7 @@ static void do_signal(struct pt_regs *regs, int syscall)
         */
        if (syscall) {
                if (regs->ARM_r0 == -ERESTART_RESTARTBLOCK) {
+                       regs->ARM_r0 = -EAGAIN; /* prevent multiple restarts */
                        if (thumb_mode(regs)) {
                                regs->ARM_r7 = __NR_restart_syscall - __NR_SYSCALL_BASE;
                                regs->ARM_pc -= 2;