From: Paul Moore <paul@paul-moore.com>
To: Ondrej Mosnacek <omosnace@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
selinux@vger.kernel.org, linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>,
Matthew Garrett <mjg59@google.com>
Subject: Re: [PATCH] perf/core: fix unconditional security_locked_down() call
Date: Tue, 16 Mar 2021 09:53:21 -0400 [thread overview]
Message-ID: <CAHC9VhQHrmKHxYuTBOy-JHTXHjGTU9UX-AWk3jbiaNfSkZ+N1A@mail.gmail.com> (raw)
In-Reply-To: <20210224215628.192519-1-omosnace@redhat.com>
On Wed, Feb 24, 2021 at 4:59 PM Ondrej Mosnacek <omosnace@redhat.com> wrote:
>
> Currently, the lockdown state is queried unconditionally, even though
> its result is used only if the PERF_SAMPLE_REGS_INTR bit is set in
> attr.sample_type. While that doesn't matter in case of the Lockdown LSM,
> it causes trouble with the SELinux's lockdown hook implementation.
>
> SELinux implements the locked_down hook with a check whether the current
> task's type has the corresponding "lockdown" class permission
> ("integrity" or "confidentiality") allowed in the policy. This means
> that calling the hook when the access control decision would be ignored
> generates a bogus permission check and audit record.
>
> Fix this by checking sample_type first and only calling the hook when
> its result would be honored.
>
> Fixes: b0c8fdc7fdb7 ("lockdown: Lock down perf when in confidentiality mode")
> Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
> ---
> kernel/events/core.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
Perf/core folks, do you want to pull this in via your tree? If I
don't hear anything in the next day I'll pull this in via the
selinux/next tree.
Reviewed-by: Paul Moore <paul@paul-moore.com>
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 129dee540a8b..0f857307e9bd 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -11796,12 +11796,12 @@ SYSCALL_DEFINE5(perf_event_open,
> return err;
> }
>
> - err = security_locked_down(LOCKDOWN_PERF);
> - if (err && (attr.sample_type & PERF_SAMPLE_REGS_INTR))
> - /* REGS_INTR can leak data, lockdown must prevent this */
> - return err;
> -
> - err = 0;
> + /* REGS_INTR can leak data, lockdown must prevent this */
> + if (attr.sample_type & PERF_SAMPLE_REGS_INTR) {
> + err = security_locked_down(LOCKDOWN_PERF);
> + if (err)
> + return err;
> + }
>
> /*
> * In cgroup mode, the pid argument is used to pass the fd
> --
> 2.29.2
--
paul moore
www.paul-moore.com
next prev parent reply other threads:[~2021-03-16 13:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-24 21:56 [PATCH] perf/core: fix unconditional security_locked_down() call Ondrej Mosnacek
2021-03-16 13:53 ` Paul Moore [this message]
2021-03-16 14:30 ` Peter Zijlstra
2021-03-16 15:12 ` Paul Moore
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=CAHC9VhQHrmKHxYuTBOy-JHTXHjGTU9UX-AWk3jbiaNfSkZ+N1A@mail.gmail.com \
--to=paul@paul-moore.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=dhowells@redhat.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=mjg59@google.com \
--cc=namhyung@kernel.org \
--cc=omosnace@redhat.com \
--cc=peterz@infradead.org \
--cc=selinux@vger.kernel.org \
/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).