Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / arch / arm64 / kernel / signal32.c

diff --git a/kernel/arch/arm64/kernel/signal32.c b/kernel/arch/arm64/kernel/signal32.c
index c58aee0..1073356 100644 (file)
--- a/kernel/arch/arm64/kernel/signal32.c
+++ b/kernel/arch/arm64/kernel/signal32.c
@@ -356,7 +356,7 @@ static int compat_restore_sigframe(struct pt_regs *regs,
         */
        regs->syscallno = ~0UL;
 
-       err |= !valid_user_regs(&regs->user_regs);
+       err |= !valid_user_regs(&regs->user_regs, current);
 
        aux = (struct compat_aux_sigframe __user *) sf->uc.uc_regspace;
        if (err == 0)
@@ -394,7 +394,7 @@ badframe:
        if (show_unhandled_signals)
                pr_info_ratelimited("%s[%d]: bad frame in %s: pc=%08llx sp=%08llx\n",
                                    current->comm, task_pid_nr(current), __func__,
-                                   regs->pc, regs->sp);
+                                   regs->pc, regs->compat_sp);
        force_sig(SIGSEGV, current);
        return 0;
 }
@@ -431,7 +431,7 @@ badframe:
        if (show_unhandled_signals)
                pr_info_ratelimited("%s[%d]: bad frame in %s: pc=%08llx sp=%08llx\n",
                                    current->comm, task_pid_nr(current), __func__,
-                                   regs->pc, regs->sp);
+                                   regs->pc, regs->compat_sp);
        force_sig(SIGSEGV, current);
        return 0;
 }