From: Stephen Smalley <sds@tycho.nsa.gov>
To: Jann Horn <jann@thejh.net>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Roland McGrath <roland@hack.frob.com>,
Oleg Nesterov <oleg@redhat.com>,
John Johansen <john.johansen@canonical.com>,
James Morris <james.l.morris@oracle.com>,
"Serge E. Hallyn" <serge@hallyn.com>,
Paul Moore <aul@paul-moore.com>,
Eric Paris <eparis@parisplace.org>,
Casey Schaufler <casey@schaufler-ca.com>,
Kees Cook <eescook@chromium.org>,
Andrew Morton <akpm@linux-foundation.org>,
Janis Danisevskis <jdanis@google.com>,
Seth Forshee <seth.forshee@canonical.com>,
"Eric . Biederman" <ebiederm@xmission.com>,
Thomas Gleixner <tglx@linutronix.de>,
Benjamin LaHaise <bcrl@kvack.org>
Cc: linux-fsdevel@vger.kernel.org,
linux-security-module@vger.kernel.org, security@kernel.org
Subject: Re: [PATCH 3/9] proc: use open()-time creds for ptrace checks
Date: Mon, 19 Sep 2016 09:01:19 -0400 [thread overview]
Message-ID: <4f10ddba-fb7c-04a3-0426-550b435e6f3a@tycho.nsa.gov> (raw)
In-Reply-To: <1474211117-16674-4-git-send-email-jann@thejh.net>
On 09/18/2016 11:05 AM, Jann Horn wrote:
> This adds a new ptrace_may_access_noncurrent() method that
> uses the supplied credentials instead of those of the
> current task. (However, the current task may still be
> inspected for auditing purposes, e.g. by the Smack LSM.)
>
> procfs used the caller's creds for a few ptrace_may_access()
> checks at read() time, which made a confused deputy attack
> by passing an FD to a procfs file to a setuid program
> possible. Therefore, the following was a local userspace
> ASLR bypass:
>
> rm -f /tmp/foobar
> procmail <(echo 'DEFAULT=/tmp/foobar') </proc/1/stat
> (
> echo 'obase=16'
> cut -d' ' -f26-30,45-51 </tmp/foobar | tr ' ' '\n'
> ) | bc
> rm /tmp/foobar
>
> procmail is installed setuid root on Debian and read()s
> data from stdin before dropping privs, so the
> ptrace_may_access() check in the VFS read handler of
> /proc/1/stat passes. Procmail then dumps the read data
> to a user-accessible file (/tmp/foobar here).
>
> Signed-off-by: Jann Horn <jann@thejh.net>
> ---
> fs/proc/array.c | 3 +-
> fs/proc/base.c | 63 ++++++++++++++++++++++++++++++++++-------
> fs/proc/internal.h | 14 +++++++++
> include/linux/lsm_hooks.h | 3 +-
> include/linux/ptrace.h | 5 ++++
> include/linux/security.h | 10 ++++---
> kernel/ptrace.c | 40 +++++++++++++++++++-------
> security/apparmor/include/ipc.h | 2 +-
> security/apparmor/ipc.c | 4 +--
> security/apparmor/lsm.c | 14 +++++++--
> security/commoncap.c | 8 +++---
> security/security.c | 5 ++--
> security/selinux/hooks.c | 4 +--
> security/smack/smack_lsm.c | 18 ++++++++----
> security/yama/yama_lsm.c | 9 ++++--
> 15 files changed, 150 insertions(+), 52 deletions(-)
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 13185a6..f9a0be7 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -2133,10 +2133,10 @@ static int selinux_binder_transfer_file(struct task_struct *from,
> }
>
> static int selinux_ptrace_access_check(struct task_struct *child,
> - unsigned int mode)
> + unsigned int mode, const struct cred *cred)
> {
> if (mode & PTRACE_MODE_READ) {
> - u32 sid = current_sid();
> + u32 sid = cred_sid(cred);
> u32 csid = task_sid(child);
> return avc_has_perm(sid, csid, SECCLASS_FILE, FILE__READ, NULL);
> }
For consistency, don't you also need to change the next line of code to
use cred_has_perm() rather than current_has_perm()?
next prev parent reply other threads:[~2016-09-19 13:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-18 15:05 [PATCH 0/9] Various fixes related to ptrace_may_access() Jann Horn
2016-09-18 15:05 ` [PATCH 1/9] exec: introduce cred_guard_light Jann Horn
2016-09-18 15:05 ` [PATCH 2/9] exec: turn self_exec_id into self_privunit_id Jann Horn
2016-09-18 18:13 ` Ben Hutchings
2016-09-18 18:31 ` Jann Horn
2016-09-18 18:45 ` Ben Hutchings
2016-09-18 19:08 ` Jann Horn
2016-09-18 19:57 ` Andy Lutomirski
2016-09-19 15:31 ` Jann Horn
2016-09-18 15:05 ` [PATCH 3/9] proc: use open()-time creds for ptrace checks Jann Horn
2016-09-19 13:01 ` Stephen Smalley [this message]
2016-09-19 14:32 ` Jann Horn
2016-09-19 14:45 ` Stephen Smalley
2016-09-18 15:05 ` [PATCH 4/9] futex: don't leak robust_list pointer Jann Horn
2016-09-18 18:28 ` Ben Hutchings
2016-09-18 18:33 ` Jann Horn
2016-09-18 15:05 ` [PATCH 5/9] proc: lock properly in ptrace_may_access callers Jann Horn
2016-09-18 19:15 ` Jann Horn
2016-09-18 15:05 ` [PATCH 6/9] ptrace: warn on ptrace_may_access without proper locking Jann Horn
2016-09-18 15:05 ` [PATCH 7/9] ptrace: forbid ptrace checks against current_cred() from VFS context Jann Horn
2016-09-18 18:38 ` Ben Hutchings
2016-09-18 18:40 ` Jann Horn
2016-09-18 19:57 ` Andy Lutomirski
2016-09-18 20:38 ` Jann Horn
2016-09-18 20:18 ` Linus Torvalds
2016-09-18 20:52 ` Jann Horn
2016-09-18 15:05 ` [PATCH 8/9] fs/proc: fix attr access check Jann Horn
2016-09-18 15:05 ` [PATCH 9/9] Documentation: add security/ptrace_checks.txt Jann Horn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4f10ddba-fb7c-04a3-0426-550b435e6f3a@tycho.nsa.gov \
--to=sds@tycho.nsa.gov \
--cc=akpm@linux-foundation.org \
--cc=aul@paul-moore.com \
--cc=bcrl@kvack.org \
--cc=casey@schaufler-ca.com \
--cc=ebiederm@xmission.com \
--cc=eescook@chromium.org \
--cc=eparis@parisplace.org \
--cc=james.l.morris@oracle.com \
--cc=jann@thejh.net \
--cc=jdanis@google.com \
--cc=john.johansen@canonical.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=roland@hack.frob.com \
--cc=security@kernel.org \
--cc=serge@hallyn.com \
--cc=seth.forshee@canonical.com \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).