From: Eric Snowberg <eric.snowberg@oracle.com>
To: keyrings@vger.kernel.org, linux-integrity@vger.kernel.org,
zohar@linux.ibm.com, dhowells@redhat.com, dwmw2@infradead.org,
herbert@gondor.apana.org.au, davem@davemloft.net,
jarkko@kernel.org, jmorris@namei.org, serge@hallyn.com
Cc: eric.snowberg@oracle.com, keescook@chromium.org,
gregkh@linuxfoundation.org, torvalds@linux-foundation.org,
scott.branden@broadcom.com, weiyongjun1@huawei.com,
nayna@linux.ibm.com, ebiggers@google.com, ardb@kernel.org,
nramas@linux.microsoft.com, lszubowi@redhat.com,
linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-security-module@vger.kernel.org,
James.Bottomley@HansenPartnership.com, pjones@redhat.com,
konrad.wilk@oracle.com
Subject: [PATCH v6 10/13] KEYS: link secondary_trusted_keys to machine trusted keys
Date: Tue, 14 Sep 2021 17:14:13 -0400 [thread overview]
Message-ID: <20210914211416.34096-11-eric.snowberg@oracle.com> (raw)
In-Reply-To: <20210914211416.34096-1-eric.snowberg@oracle.com>
Allow the .machine keyring to be linked to the secondary_trusted_keys.
After the link is created, keys contained in the .machine keyring will
automatically be searched when searching secondary_trusted_keys.
Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
---
v3: Initial version
v4: Unmodified from v3
v5: Rename to machine keyring
v6: Unmodified from v5
---
certs/system_keyring.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index ba732856ebd0..2a2dc70b126c 100644
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -101,6 +101,9 @@ static __init struct key_restriction *get_secondary_restriction(void)
void __init set_machine_trusted_keys(struct key *keyring)
{
machine_trusted_keys = keyring;
+
+ if (key_link(secondary_trusted_keys, machine_trusted_keys) < 0)
+ panic("Can't link (machine) trusted keyrings\n");
}
/**
--
2.18.4
next prev parent reply other threads:[~2021-09-14 21:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 21:14 [PATCH v6 00/13] Enroll kernel keys thru MOK Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 01/13] integrity: Introduce a Linux keyring called machine Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 02/13] integrity: Do not allow machine keyring updates following init Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 03/13] KEYS: CA link restriction Eric Snowberg
2021-09-16 20:05 ` Nayna
2021-09-14 21:14 ` [PATCH v6 04/13] integrity: restrict INTEGRITY_KEYRING_MACHINE to restrict_link_by_ca Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 05/13] integrity: add new keyring handler for mok keys Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 06/13] KEYS: Rename get_builtin_and_secondary_restriction Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 07/13] KEYS: add a reference to machine keyring Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 08/13] KEYS: Introduce link restriction for machine keys Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 09/13] KEYS: integrity: change link restriction to trust the machine keyring Eric Snowberg
2021-09-14 21:14 ` Eric Snowberg [this message]
2021-09-14 21:14 ` [PATCH v6 11/13] integrity: store reference to " Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 12/13] integrity: Trust MOK keys if MokListTrustedRT found Eric Snowberg
2021-09-16 22:19 ` Peter Jones
2021-09-17 2:00 ` Eric Snowberg
2021-09-17 15:03 ` Peter Jones
2021-09-17 16:06 ` Eric Snowberg
2021-09-14 21:14 ` [PATCH v6 13/13] integrity: Only use machine keyring when uefi_check_trust_mok_keys is true Eric Snowberg
2021-09-15 17:57 ` [PATCH v6 00/13] Enroll kernel keys thru MOK Jarkko Sakkinen
2021-09-15 21:28 ` Eric Snowberg
2021-09-16 15:15 ` Jarkko Sakkinen
2021-09-16 22:14 ` Peter Jones
2021-09-17 1:58 ` Eric Snowberg
2021-09-21 21:03 ` Jarkko Sakkinen
2021-09-16 20:03 ` Nayna
2021-09-17 1:55 ` Eric Snowberg
2021-09-17 18:02 ` Mimi Zohar
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=20210914211416.34096-11-eric.snowberg@oracle.com \
--to=eric.snowberg@oracle.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=ardb@kernel.org \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=ebiggers@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=jarkko@kernel.org \
--cc=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=keyrings@vger.kernel.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=lszubowi@redhat.com \
--cc=nayna@linux.ibm.com \
--cc=nramas@linux.microsoft.com \
--cc=pjones@redhat.com \
--cc=scott.branden@broadcom.com \
--cc=serge@hallyn.com \
--cc=torvalds@linux-foundation.org \
--cc=weiyongjun1@huawei.com \
--cc=zohar@linux.ibm.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).