From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: James Bottomley <jejb@linux.ibm.com>,
Jarkko Sakkinen <jarkko@kernel.org>,
Mimi Zohar <zohar@linux.ibm.com>,
David Howells <dhowells@redhat.com>
Cc: kernel@pengutronix.de, "Ahmad Fatoum" <a.fatoum@pengutronix.de>,
"James Morris" <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
"Horia Geantă" <horia.geanta@nxp.com>,
"Aymen Sghaier" <aymen.sghaier@nxp.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
"Udit Agarwal" <udit.agarwal@nxp.com>,
"Jan Luebbe" <j.luebbe@penutronix.de>,
"David Gstir" <david@sigma-star.at>,
"Franck LENORMAND" <franck.lenormand@nxp.com>,
"Sumit Garg" <sumit.garg@linaro.org>,
keyrings@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: [PATCH v1 2/3] KEYS: trusted: implement fallback to kernel RNG
Date: Tue, 16 Mar 2021 18:01:17 +0100 [thread overview]
Message-ID: <a5c2a1507cf2bd1b5b6531ce2c0d9d496b8d3d7e.1615914058.git-series.a.fatoum@pengutronix.de> (raw)
In-Reply-To: <cover.56fff82362af6228372ea82e6bd7e586e23f0966.1615914058.git-series.a.fatoum@pengutronix.de>
For cases a trusted key source already sources the kernel RNG, we can
use get_random_bytes_wait to get the random data for key material.
Make the get_random callback optional to allow sources to make use of
this.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
To: James Bottomley <jejb@linux.ibm.com>
To: Jarkko Sakkinen <jarkko@kernel.org>
To: Mimi Zohar <zohar@linux.ibm.com>
To: David Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: "Horia Geantă" <horia.geanta@nxp.com>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Udit Agarwal <udit.agarwal@nxp.com>
Cc: Jan Luebbe <j.luebbe@penutronix.de>
Cc: David Gstir <david@sigma-star.at>
Cc: Franck LENORMAND <franck.lenormand@nxp.com>
Cc: Sumit Garg <sumit.garg@linaro.org>
Cc: keyrings@vger.kernel.org
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
---
include/keys/trusted-type.h | 2 +-
security/keys/trusted-keys/trusted_core.c | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/include/keys/trusted-type.h b/include/keys/trusted-type.h
index d89fa2579ac0..4eb64548a74f 100644
--- a/include/keys/trusted-type.h
+++ b/include/keys/trusted-type.h
@@ -64,7 +64,7 @@ struct trusted_key_ops {
/* Unseal a key. */
int (*unseal)(struct trusted_key_payload *p, char *datablob);
- /* Get a randomized key. */
+ /* Optional: Get a randomized key. */
int (*get_random)(unsigned char *key, size_t key_len);
/* Exit key interface. */
diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
index ec3a066a4b42..5f92323efedf 100644
--- a/security/keys/trusted-keys/trusted_core.c
+++ b/security/keys/trusted-keys/trusted_core.c
@@ -16,6 +16,7 @@
#include <linux/key-type.h>
#include <linux/module.h>
#include <linux/parser.h>
+#include <linux/random.h>
#include <linux/rcupdate.h>
#include <linux/slab.h>
#include <linux/static_call.h>
@@ -310,8 +311,14 @@ struct key_type key_type_trusted = {
};
EXPORT_SYMBOL_GPL(key_type_trusted);
+static int kernel_get_random(unsigned char *key, size_t key_len)
+{
+ return get_random_bytes_wait(key, key_len) ?: key_len;
+}
+
static int __init init_trusted(void)
{
+ int (*get_random)(unsigned char *key, size_t key_len);
int i, ret = 0;
for (i = 0; i < ARRAY_SIZE(trusted_key_sources); i++) {
@@ -320,6 +327,8 @@ static int __init init_trusted(void)
strlen(trusted_key_sources[i].name)))
continue;
+ get_random = trusted_key_sources[i].ops->get_random ?: kernel_get_random;
+
static_call_update(trusted_key_init,
trusted_key_sources[i].ops->init);
static_call_update(trusted_key_seal,
@@ -327,7 +336,7 @@ static int __init init_trusted(void)
static_call_update(trusted_key_unseal,
trusted_key_sources[i].ops->unseal);
static_call_update(trusted_key_get_random,
- trusted_key_sources[i].ops->get_random);
+ get_random);
static_call_update(trusted_key_exit,
trusted_key_sources[i].ops->exit);
migratable = trusted_key_sources[i].ops->migratable;
--
git-series 0.9.1
next prev parent reply other threads:[~2021-03-16 17:03 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 17:01 [PATCH v1 0/3] KEYS: trusted: Introduce support for NXP CAAM-based trusted keys Ahmad Fatoum
2021-03-16 17:01 ` [PATCH v1 1/3] crypto: caam - add in-kernel interface for blob generator Ahmad Fatoum
2021-03-21 20:46 ` Horia Geantă
2021-03-23 16:41 ` Ahmad Fatoum
2021-03-16 17:01 ` Ahmad Fatoum [this message]
2021-03-16 17:01 ` [PATCH v1 3/3] KEYS: trusted: Introduce support for NXP CAAM-based trusted keys Ahmad Fatoum
2021-03-16 19:22 ` Jarkko Sakkinen
2021-03-17 13:58 ` Ahmad Fatoum
2021-03-16 23:14 ` Richard Weinberger
2021-03-17 7:39 ` Sumit Garg
2021-03-17 8:07 ` Richard Weinberger
2021-03-17 14:02 ` Ahmad Fatoum
2021-03-30 21:28 ` Richard Weinberger
2021-03-21 20:48 ` Horia Geantă
2021-03-23 16:35 ` Ahmad Fatoum
2021-03-23 18:07 ` Mimi Zohar
2021-03-24 9:26 ` Ahmad Fatoum
2021-03-24 10:47 ` Sumit Garg
2021-03-24 14:07 ` Ahmad Fatoum
2021-03-25 5:26 ` Sumit Garg
2021-03-27 12:41 ` David Gstir
2021-03-28 20:37 ` Jarkko Sakkinen
2021-03-29 10:11 ` Ahmad Fatoum
2021-03-31 23:29 ` Jarkko Sakkinen
2021-03-30 7:26 ` Sumit Garg
2021-03-31 23:30 ` Jarkko Sakkinen
2021-04-01 7:41 ` Ahmad Fatoum
2021-03-30 21:47 ` Eric Biggers
2021-03-31 23:31 ` Jarkko Sakkinen
2021-03-31 23:34 ` Eric Biggers
2021-04-01 1:11 ` Herbert Xu
2021-04-01 5:50 ` Jarkko Sakkinen
2021-04-01 6:03 ` Eric Biggers
2021-04-01 5:46 ` Jarkko Sakkinen
2021-03-24 16:14 ` James Bottomley
2021-03-24 20:49 ` Mimi Zohar
2021-03-24 21:58 ` James Bottomley
2021-04-02 1:49 ` Serge E. Hallyn
2021-03-31 18:35 ` Richard Weinberger
2021-04-01 10:15 ` Ahmad Fatoum
2021-04-01 10:23 ` Richard Weinberger
2021-03-16 23:10 ` [PATCH v1 0/3] " Richard Weinberger
2021-03-17 14:08 ` Ahmad Fatoum
2021-03-30 21:50 ` Richard Weinberger
2021-04-01 10:04 ` Ahmad Fatoum
2021-04-01 10:20 ` Richard Weinberger
2021-04-01 10:28 ` Ahmad Fatoum
2021-04-01 10:53 ` Richard Weinberger
2021-04-01 10:57 ` Ahmad Fatoum
2021-04-01 11:05 ` Richard Weinberger
2021-04-01 11:13 ` Ahmad Fatoum
2021-04-01 11:16 ` Richard Weinberger
2021-03-30 22:04 ` Richard Weinberger
2021-03-30 22:16 ` James Bottomley
2021-03-31 18:36 ` Richard Weinberger
2021-03-31 18:49 ` James Bottomley
2021-03-31 19:36 ` Richard Weinberger
2021-04-01 10:06 ` Ahmad Fatoum
2021-04-01 13:20 ` Sumit Garg
2021-04-01 18:26 ` James Bottomley
2021-04-01 12:55 ` Sumit Garg
2021-04-01 13:17 ` Richard Weinberger
2021-04-01 13:30 ` Ahmad Fatoum
2021-04-01 13:52 ` Sumit Garg
2021-04-01 13:59 ` Richard Weinberger
2021-04-01 14:12 ` Sumit Garg
2021-04-01 11:11 ` David Howells
2021-03-21 20:01 ` Horia Geantă
2021-03-23 16:34 ` Ahmad Fatoum
2021-03-24 6:23 ` Sumit Garg
2021-03-23 16:37 ` Ahmad Fatoum
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=a5c2a1507cf2bd1b5b6531ce2c0d9d496b8d3d7e.1615914058.git-series.a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=aymen.sghaier@nxp.com \
--cc=davem@davemloft.net \
--cc=david@sigma-star.at \
--cc=dhowells@redhat.com \
--cc=franck.lenormand@nxp.com \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=j.luebbe@penutronix.de \
--cc=jarkko@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=jmorris@namei.org \
--cc=kernel@pengutronix.de \
--cc=keyrings@vger.kernel.org \
--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=serge@hallyn.com \
--cc=sumit.garg@linaro.org \
--cc=udit.agarwal@nxp.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).