x86/bugs: Expose x86_spec_ctrl_base directly

[mirror_ubuntu-artful-kernel.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index f2f0f1aeabaff18648fee00a03e70d79db114adc..60f356d91060c8974268cc5bc02d57c75d359afc 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -268,10 +268,9 @@ static int ptrace_has_cap(struct user_namespace *ns, unsigned int mode)
 }
 
 /* Returns 0 on success, -errno on denial. */
-int ___ptrace_may_access(struct task_struct *cur, struct task_struct *task,
-               unsigned int mode)
+static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
 {
-       const struct cred *cred = __task_cred(cur), *tcred;
+       const struct cred *cred = current_cred(), *tcred;
        struct mm_struct *mm;
        kuid_t caller_uid;
        kgid_t caller_gid;
@@ -291,7 +290,7 @@ int ___ptrace_may_access(struct task_struct *cur, struct task_struct *task,
         */
 
        /* Don't let security modules deny introspection */
-       if (same_thread_group(task, cur))
+       if (same_thread_group(task, current))
                return 0;
        rcu_read_lock();
        if (mode & PTRACE_MODE_FSCREDS) {
@@ -329,16 +328,7 @@ ok:
             !ptrace_has_cap(mm->user_ns, mode)))
            return -EPERM;
 
-       if (!(mode & PTRACE_MODE_NOACCESS_CHK))
-               return security_ptrace_access_check(task, mode);
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(___ptrace_may_access);
-
-static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
-{
-       return ___ptrace_may_access(current, task, mode);
+       return security_ptrace_access_check(task, mode);
 }
 
 bool ptrace_may_access(struct task_struct *task, unsigned int mode)