FROMLIST: [PATCH 1/6] arm64: compat: Use vDSO sigreturn trampolines if available

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / arch / arm64 / kernel / signal32.c

diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index 71ef6dc89ae509cd299eab3f1959ffe4e8f96a33..666363d127e53bf2e0e401cf1d64b5ad03d9849f 100644 (file)
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -28,42 +28,7 @@
 #include <asm/signal32.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
-
-struct compat_sigcontext {
-       /* We always set these two fields to 0 */
-       compat_ulong_t                  trap_no;
-       compat_ulong_t                  error_code;
-
-       compat_ulong_t                  oldmask;
-       compat_ulong_t                  arm_r0;
-       compat_ulong_t                  arm_r1;
-       compat_ulong_t                  arm_r2;
-       compat_ulong_t                  arm_r3;
-       compat_ulong_t                  arm_r4;
-       compat_ulong_t                  arm_r5;
-       compat_ulong_t                  arm_r6;
-       compat_ulong_t                  arm_r7;
-       compat_ulong_t                  arm_r8;
-       compat_ulong_t                  arm_r9;
-       compat_ulong_t                  arm_r10;
-       compat_ulong_t                  arm_fp;
-       compat_ulong_t                  arm_ip;
-       compat_ulong_t                  arm_sp;
-       compat_ulong_t                  arm_lr;
-       compat_ulong_t                  arm_pc;
-       compat_ulong_t                  arm_cpsr;
-       compat_ulong_t                  fault_address;
-};
-
-struct compat_ucontext {
-       compat_ulong_t                  uc_flags;
-       compat_uptr_t                   uc_link;
-       compat_stack_t                  uc_stack;
-       struct compat_sigcontext        uc_mcontext;
-       compat_sigset_t                 uc_sigmask;
-       int             __unused[32 - (sizeof (compat_sigset_t) / sizeof (int))];
-       compat_ulong_t  uc_regspace[128] __attribute__((__aligned__(8)));
-};
+#include <asm/vdso.h>
 
 struct compat_vfp_sigframe {
        compat_ulong_t  magic;
@@ -91,16 +56,6 @@ struct compat_aux_sigframe {
        unsigned long                   end_magic;
 } __attribute__((__aligned__(8)));
 
-struct compat_sigframe {
-       struct compat_ucontext  uc;
-       compat_ulong_t          retcode[2];
-};
-
-struct compat_rt_sigframe {
-       struct compat_siginfo info;
-       struct compat_sigframe sig;
-};
-
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
 static inline int put_sigset_t(compat_sigset_t __user *uset, sigset_t *set)
@@ -356,7 +311,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)
@@ -484,14 +439,27 @@ static void compat_setup_return(struct pt_regs *regs, struct k_sigaction *ka,
                retcode = ptr_to_compat(ka->sa.sa_restorer);
        } else {
                /* Set up sigreturn pointer */
+#ifdef CONFIG_VDSO32
+               void *vdso_base = current->mm->context.vdso;
+               void *trampoline =
+                       (ka->sa.sa_flags & SA_SIGINFO
+                        ? (thumb
+                           ? VDSO_SYMBOL(vdso_base, compat_rt_sigreturn_thumb)
+                           : VDSO_SYMBOL(vdso_base, compat_rt_sigreturn_arm))
+                        : (thumb
+                           ? VDSO_SYMBOL(vdso_base, compat_sigreturn_thumb)
+                           : VDSO_SYMBOL(vdso_base, compat_sigreturn_arm)));
+
+               retcode = ptr_to_compat(trampoline) + thumb;
+#else
+               void *sigreturn_base = current->mm->context.vdso;
                unsigned int idx = thumb << 1;
 
                if (ka->sa.sa_flags & SA_SIGINFO)
                        idx += 3;
 
-               retcode = AARCH32_VECTORS_BASE +
-                         AARCH32_KERN_SIGRET_CODE_OFFSET +
-                         (idx << 2) + thumb;
+               retcode = ptr_to_compat(sigreturn_base) + (idx << 2) + thumb;
+#endif
        }
 
        regs->regs[0]   = usig;