From: Mimi Zohar <zohar@linux.ibm.com>
To: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>,
linux-integrity@vger.kernel.org, sashal@kernel.org,
jamorris@linux.microsoft.com, kgoldman@us.ibm.com,
mjg59@google.com, dhowells@redhat.com
Cc: balajib@linux.microsoft.com, prsriva@linux.microsoft.com,
jorhand@linux.microsoft.com, patatash@linux.microsoft.com
Subject: Re: [PATCH v0 2/2] KEYS: LSM Hook for key_create_or_update
Date: Sat, 12 Oct 2019 22:57:52 -0400 [thread overview]
Message-ID: <1570935472.5250.124.camel@linux.ibm.com> (raw)
In-Reply-To: <20191011173547.3200-3-nramas@linux.microsoft.com>
On Fri, 2019-10-11 at 10:35 -0700, Lakshmi Ramasubramanian wrote:
> diff --git a/security/keys/key.c b/security/keys/key.c
> index 764f4c57913e..973dfead490c 100644
> --- a/security/keys/key.c
> +++ b/security/keys/key.c
> @@ -14,6 +14,7 @@
> #include <linux/workqueue.h>
> #include <linux/random.h>
> #include <linux/err.h>
> +#include <keys/system_keyring.h>
> #include "internal.h"
>
> struct kmem_cache *key_jar;
> @@ -823,6 +824,7 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
> key_ref_t key_ref;
> int ret;
> struct key_restriction *restrict_link = NULL;
> + bool trusted_keyring = false;
>
> /* look up the key type to see if it's one of the registered kernel
> * types */
> @@ -936,6 +938,16 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
> goto error_link_end;
> }
>
> + /* let the security module know about the key */
> + trusted_keyring = is_builtin_or_secondary_trusted_keyring(keyring);
Nothing should be added to the keys subsystem, other than the LSM
hook.
Mimi
> + ret = security_key_create_or_update(keyring, key, cred, flags,
> + trusted_keyring);
> + if (ret < 0) {
> + key_put(key);
> + key_ref = ERR_PTR(ret);
> + goto error_link_end;
> + }
> +
prev parent reply other threads:[~2019-10-13 2:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 17:35 [PATCH v0 0/2] KEYS: Measure keys added to builtin or secondary trusted keys keyring Lakshmi Ramasubramanian
2019-10-11 17:35 ` [PATCH v0 1/2] " Lakshmi Ramasubramanian
2019-10-13 2:49 ` Mimi Zohar
2019-10-13 18:34 ` Nayna
2019-10-14 16:21 ` Lakshmi Ramasubramanian
2019-10-11 17:35 ` [PATCH v0 2/2] KEYS: LSM Hook for key_create_or_update Lakshmi Ramasubramanian
2019-10-13 2:57 ` Mimi Zohar [this message]
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=1570935472.5250.124.camel@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=balajib@linux.microsoft.com \
--cc=dhowells@redhat.com \
--cc=jamorris@linux.microsoft.com \
--cc=jorhand@linux.microsoft.com \
--cc=kgoldman@us.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=mjg59@google.com \
--cc=nramas@linux.microsoft.com \
--cc=patatash@linux.microsoft.com \
--cc=prsriva@linux.microsoft.com \
--cc=sashal@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).