Merge branches 'fixes', 'misc' and 'spectre' into for-next

[sfrench/cifs-2.6.git] / arch / arm / kernel / signal.c

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index a5c5235ed39c35c22ce2c0778104b04de7cedb73..b908382b69ff55a4036fc03208e327df6bc3fbd0 100644 (file)
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -336,7 +336,7 @@ setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set)
        if (err == 0)
                err |= preserve_vfp_context(&aux->vfp);
 #endif
-       __put_user_error(0, &aux->end_magic, err);
+       err |= __put_user(0, &aux->end_magic);
 
        return err;
 }
@@ -499,7 +499,7 @@ setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
        /*
         * Set uc.uc_flags to a value which sc.trap_no would never have.
         */
-       __put_user_error(0x5ac3c35a, &frame->uc.uc_flags, err);
+       err = __put_user(0x5ac3c35a, &frame->uc.uc_flags);
 
        err |= setup_sigframe(frame, regs, set);
        if (err == 0)
@@ -519,8 +519,8 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 
        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
-       __put_user_error(0, &frame->sig.uc.uc_flags, err);
-       __put_user_error(NULL, &frame->sig.uc.uc_link, err);
+       err |= __put_user(0, &frame->sig.uc.uc_flags);
+       err |= __put_user(NULL, &frame->sig.uc.uc_link);
 
        err |= __save_altstack(&frame->sig.uc.uc_stack, regs->ARM_sp);
        err |= setup_sigframe(&frame->sig, regs, set);
@@ -548,6 +548,12 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
        sigset_t *oldset = sigmask_to_save();
        int ret;
 
+       /*
+        * Increment event counter and perform fixup for the pre-signal
+        * frame.
+        */
+       rseq_signal_deliver(ksig, regs);
+
        /*
         * Set up the stack frame
         */
@@ -668,6 +674,7 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
                        } else {
                                clear_thread_flag(TIF_NOTIFY_RESUME);
                                tracehook_notify_resume(regs);
+                               rseq_handle_notify_resume(NULL, regs);
                        }
                }
                local_irq_disable();
@@ -711,3 +718,10 @@ asmlinkage void addr_limit_check_failed(void)
 {
        addr_limit_user_check();
 }
+
+#ifdef CONFIG_DEBUG_RSEQ
+asmlinkage void do_rseq_syscall(struct pt_regs *regs)
+{
+       rseq_syscall(regs);
+}
+#endif