diff options
| author | Jann Horn | 2019-05-29 13:31:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-19 08:18:00 +0200 |
| commit | 31e216cf9dc2346a20e8361b55807ef7135459c6 (patch) | |
| tree | 67bc0db1cb9a822cec7b9311e08da53e8f1d7242 /kernel/cred.c | |
| parent | signal/ptrace: Don't leak unitialized kernel memory with PTRACE_PEEK_SIGINFO (diff) | |
| download | kernel-qcow2-linux-31e216cf9dc2346a20e8361b55807ef7135459c6.tar.gz kernel-qcow2-linux-31e216cf9dc2346a20e8361b55807ef7135459c6.tar.xz kernel-qcow2-linux-31e216cf9dc2346a20e8361b55807ef7135459c6.zip | |
ptrace: restore smp_rmb() in __ptrace_may_access()
commit f6581f5b55141a95657ef5742cf6a6bfa20a109f upstream.
Restore the read memory barrier in __ptrace_may_access() that was deleted
a couple years ago. Also add comments on this barrier and the one it pairs
with to explain why they're there (as far as I understand).
Fixes: bfedb589252c ("mm: Add a user_ns owner to mm_struct and fix ptrace permission checks")
Cc: stable@vger.kernel.org
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/cred.c')
| -rw-r--r-- | kernel/cred.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index ecf03657e71c..efd04b2ec84c 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -448,6 +448,15 @@ int commit_creds(struct cred *new) if (task->mm) set_dumpable(task->mm, suid_dumpable); task->pdeath_signal = 0; + /* + * If a task drops privileges and becomes nondumpable, + * the dumpability change must become visible before + * the credential change; otherwise, a __ptrace_may_access() + * racing with this change may be able to attach to a task it + * shouldn't be able to attach to (as if the task had dropped + * privileges without becoming nondumpable). + * Pairs with a read barrier in __ptrace_may_access(). + */ smp_wmb(); } |