From: Joel Fernandes <joel@joelfernandes.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org, rostedt@goodmis.org,
primiano@google.com, rsavitski@google.com, jeffv@google.com,
kernel-team@android.com, Alexei Starovoitov <ast@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
bpf@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>,
Ingo Molnar <mingo@redhat.com>, James Morris <jmorris@namei.org>,
Jiri Olsa <jolsa@redhat.com>, Kees Cook <keescook@chromium.org>,
linux-security-module@vger.kernel.org,
Matthew Garrett <matthewgarrett@google.com>,
Namhyung Kim <namhyung@kernel.org>,
selinux@vger.kernel.org, Song Liu <songliubraving@fb.com>,
"maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)"
<x86@kernel.org>, Yonghong Song <yhs@fb.com>
Subject: Re: [PATCH RFC] perf_event: Add support for LSM and SELinux checks
Date: Thu, 10 Oct 2019 11:13:33 -0400 [thread overview]
Message-ID: <20191010151333.GE96813@google.com> (raw)
In-Reply-To: <20191010081251.GP2311@hirez.programming.kicks-ass.net>
On Thu, Oct 10, 2019 at 10:12:51AM +0200, Peter Zijlstra wrote:
> On Wed, Oct 09, 2019 at 04:36:57PM -0400, Joel Fernandes (Google) wrote:
> > In currentl mainline, the degree of access to perf_event_open(2) system
> > call depends on the perf_event_paranoid sysctl. This has a number of
> > limitations:
> >
> > 1. The sysctl is only a single value. Many types of accesses are controlled
> > based on the single value thus making the control very limited and
> > coarse grained.
> > 2. The sysctl is global, so if the sysctl is changed, then that means
> > all processes get access to perf_event_open(2) opening the door to
> > security issues.
> >
> > This patch adds LSM and SELinux access checking which will be used in
> > Android to access perf_event_open(2) for the purposes of attaching BPF
> > programs to tracepoints, perf profiling and other operations from
> > userspace. These operations are intended for production systems.
> >
> > 5 new LSM hooks are added:
> > 1. perf_event_open: This controls access during the perf_event_open(2)
> > syscall itself. The hook is called from all the places that the
> > perf_event_paranoid sysctl is checked to keep it consistent with the
> > systctl. The hook gets passed a 'type' argument which controls CPU,
> > kernel and tracepoint accesses (in this context, CPU, kernel and
> > tracepoint have the same semantics as the perf_event_paranoid sysctl).
> > Additionally, I added an 'open' type which is similar to
> > perf_event_paranoid sysctl == 3 patch carried in Android and several other
> > distros but was rejected in mainline [1] in 2016.
> >
> > 2. perf_event_alloc: This allocates a new security object for the event
> > which stores the current SID within the event. It will be useful when
> > the perf event's FD is passed through IPC to another process which may
> > try to read the FD. Appropriate security checks will limit access.
> >
> > 3. perf_event_free: Called when the event is closed.
> >
> > 4. perf_event_read: Called from the read(2) system call path for the event.
>
> + mmap()
> >
> > 5. perf_event_write: Called from the read(2) system call path for the event.
>
> - read() + ioctl()
Fixed.
>
> fresh from the keyboard.. but maybe consoldate things a little.
Looks great to me, I folded it into the patch. Thanks Peter! Just one comment
on change in existing logic of the code, below:
[snip]
> --- a/arch/x86/events/intel/p4.c
> +++ b/arch/x86/events/intel/p4.c
> @@ -8,7 +8,6 @@
> */
>
> #include <linux/perf_event.h>
> -#include <linux/security.h>
>
> #include <asm/perf_event_p4.h>
> #include <asm/hardirq.h>
> @@ -777,10 +776,7 @@ static int p4_validate_raw_event(struct
> * the user needs special permissions to be able to use it
> */
> if (p4_ht_active() && p4_event_bind_map[v].shared) {
> - if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
> - return -EACCES;
> -
> - v = security_perf_event_open(&event->attr, PERF_SECURITY_CPU);
> + v = perf_allow_cpu(&event->attr);
> if (v)
> return v;
> }
> --- a/include/linux/perf_event.h
> +++ b/include/linux/perf_event.h
> @@ -56,6 +56,7 @@ struct perf_guest_info_callbacks {
> #include <linux/perf_regs.h>
> #include <linux/cgroup.h>
> #include <linux/refcount.h>
> +#include <linux/security.h>
> #include <asm/local.h>
>
> struct perf_callchain_entry {
> @@ -1244,19 +1245,28 @@ extern int perf_cpu_time_max_percent_han
> int perf_event_max_stack_handler(struct ctl_table *table, int write,
> void __user *buffer, size_t *lenp, loff_t *ppos);
>
> -static inline bool perf_paranoid_tracepoint_raw(void)
> +static inline int perf_allow_kernel(struct perf_event_attr *attr)
> {
> - return sysctl_perf_event_paranoid > -1;
> + if (sysctl_perf_event_paranoid > 1 && !capable(CAP_SYS_ADMIN))
> + return -EACCES;
> +
> + return security_perf_event_open(attr, PERF_SECURITY_KERNEL);
> }
>
> -static inline bool perf_paranoid_cpu(void)
> +static inline int perf_allow_cpu(struct perf_event_attr *attr)
> {
> - return sysctl_perf_event_paranoid > 0;
> + if (sysctl_perf_event_paranoid > 0 && !capable(CAP_SYS_ADMIN))
> + return -EACCES;
> +
> + return security_perf_event_open(attr, PERF_SECURITY_CPU);
> }
>
> -static inline bool perf_paranoid_kernel(void)
> +static inline int perf_allow_tracepoint(struct perf_event_attr *attr)
> {
> - return sysctl_perf_event_paranoid > 1;
> + if (sysctl_perf_event_paranoid > -1 && !capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
Here the sysctl check of > -1 also is now coupled with a CAP_SYS_ADMIN check.
However..
> + return security_perf_event_open(attr, PERF_SECURITY_TRACEPOINT);
> }
>
> extern void perf_event_init(void);
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -4229,10 +4229,7 @@ find_get_context(struct pmu *pmu, struct
>
> if (!task) {
> /* Must be root to operate on a CPU event: */
> - if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
> - return ERR_PTR(-EACCES);
> -
> - err = security_perf_event_open(&event->attr, PERF_SECURITY_CPU);
> + err = perf_allow_cpu(&event->attr);
> if (err)
> return ERR_PTR(err);
>
> @@ -5862,14 +5859,8 @@ static int perf_mmap(struct file *file,
> lock_limit >>= PAGE_SHIFT;
> locked = atomic64_read(&vma->vm_mm->pinned_vm) + extra;
>
> - if (locked > lock_limit) {
> - if (perf_paranoid_tracepoint_raw() && !capable(CAP_IPC_LOCK)) {
> - ret = -EPERM;
> - goto unlock;
> - }
> -
> - ret = security_perf_event_open(&event->attr,
> - PERF_SECURITY_TRACEPOINT);
> + if (locked > lock_limit && !capable(CAP_IPC_LOCK)) {
> + ret = perf_allow_tracepoint(&event->attr);
In previous code, this check did not involve a check for CAP_SYS_ADMIN.
I am Ok with adding the CAP_SYS_ADMIN check as well which does make sense to
me for tracepoint access. But it is still a change in the logic so I wanted
to bring it up.
Let me know any other thoughts and then I'll post a new patch.
thanks,
- Joel
[snip]
next prev parent reply other threads:[~2019-10-10 15:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 20:36 [PATCH RFC] perf_event: Add support for LSM and SELinux checks Joel Fernandes (Google)
2019-10-09 21:55 ` Casey Schaufler
2019-10-09 22:14 ` James Morris
2019-10-09 22:41 ` Casey Schaufler
2019-10-10 0:40 ` Joel Fernandes
2019-10-10 0:53 ` Casey Schaufler
2019-10-10 2:44 ` James Morris
2019-10-10 18:12 ` Casey Schaufler
2019-10-10 19:41 ` James Morris
2019-10-09 22:11 ` James Morris
2019-10-10 0:43 ` Joel Fernandes
2019-10-10 7:23 ` Alexey Budankov
2019-10-10 8:12 ` Peter Zijlstra
2019-10-10 15:13 ` Joel Fernandes [this message]
2019-10-10 17:09 ` Peter Zijlstra
2019-10-10 18:31 ` Joel Fernandes
2019-10-11 7:05 ` Peter Zijlstra
2019-10-11 15:47 ` Joel Fernandes
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=20191010151333.GE96813@google.com \
--to=joel@joelfernandes.org \
--cc=acme@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jeffv@google.com \
--cc=jmorris@namei.org \
--cc=jolsa@redhat.com \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=matthewgarrett@google.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=primiano@google.com \
--cc=rostedt@goodmis.org \
--cc=rsavitski@google.com \
--cc=selinux@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=x86@kernel.org \
--cc=yhs@fb.com \
/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).