[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210819002109.534600-10-eric.snowberg@oracle.com>
Date: Wed, 18 Aug 2021 20:21:06 -0400
From: Eric Snowberg <eric.snowberg@...cle.com>
To: keyrings@...r.kernel.org, linux-integrity@...r.kernel.org,
zohar@...ux.ibm.com, dhowells@...hat.com, dwmw2@...radead.org,
herbert@...dor.apana.org.au, davem@...emloft.net,
jarkko@...nel.org, jmorris@...ei.org, serge@...lyn.com
Cc: eric.snowberg@...cle.com, keescook@...omium.org,
gregkh@...uxfoundation.org, torvalds@...ux-foundation.org,
scott.branden@...adcom.com, weiyongjun1@...wei.com,
nayna@...ux.ibm.com, ebiggers@...gle.com, ardb@...nel.org,
nramas@...ux.microsoft.com, lszubowi@...hat.com,
linux-kernel@...r.kernel.org, linux-crypto@...r.kernel.org,
linux-security-module@...r.kernel.org,
James.Bottomley@...senPartnership.com, pjones@...hat.com,
konrad.wilk@...cle.com
Subject: [PATCH v4 09/12] KEYS: link secondary_trusted_keys to mok trusted keys
Allow the .mok keyring to be linked to the secondary_trusted_keys. After
the link is created, keys contained in the .mok keyring will automatically
be searched when searching secondary_trusted_keys.
Signed-off-by: Eric Snowberg <eric.snowberg@...cle.com>
---
v3: Initial version
v4: Unmodified from v3
---
certs/system_keyring.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index 1c39af137cf1..4ce39b4ccc04 100644
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -101,6 +101,9 @@ static __init struct key_restriction *get_builtin_and_secondary_restriction(void
void __init set_mok_trusted_keys(struct key *keyring)
{
mok_trusted_keys = keyring;
+
+ if (key_link(secondary_trusted_keys, mok_trusted_keys) < 0)
+ panic("Can't link (mok) trusted keyrings\n");
}
/**
--
2.18.4
Powered by blists - more mailing lists