From: Sumit Garg <sumit.garg@linaro.org>
To: keyrings@vger.kernel.org, linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org
Cc: jens.wiklander@linaro.org, corbet@lwn.net, dhowells@redhat.com,
jejb@linux.ibm.com, jarkko.sakkinen@linux.intel.com,
zohar@linux.ibm.com, jmorris@namei.org, serge@hallyn.com,
ard.biesheuvel@linaro.org, daniel.thompson@linaro.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
tee-dev@lists.linaro.org, Sumit Garg <sumit.garg@linaro.org>
Subject: [RFC 5/7] KEYS: encrypted: Allow TEE based trusted master keys
Date: Thu, 13 Jun 2019 16:00:31 +0530 [thread overview]
Message-ID: <1560421833-27414-6-git-send-email-sumit.garg@linaro.org> (raw)
In-Reply-To: <1560421833-27414-1-git-send-email-sumit.garg@linaro.org>
Allow search for TEE based trusted keys to act as master keys in case
TPM device is not present.
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
---
security/keys/encrypted-keys/masterkey_trusted.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/security/keys/encrypted-keys/masterkey_trusted.c b/security/keys/encrypted-keys/masterkey_trusted.c
index c68528a..cfac27f 100644
--- a/security/keys/encrypted-keys/masterkey_trusted.c
+++ b/security/keys/encrypted-keys/masterkey_trusted.c
@@ -23,6 +23,9 @@
* Trusted keys are sealed to PCRs and other metadata. Although userspace
* manages both trusted/encrypted key-types, like the encrypted key type
* data, trusted key type data is not visible decrypted from userspace.
+ *
+ * Also, check for alternate trusted keys provided via TEE in case there
+ * is no TPM available.
*/
struct key *request_trusted_key(const char *trusted_desc,
const u8 **master_key, size_t *master_keylen)
@@ -31,8 +34,11 @@ struct key *request_trusted_key(const char *trusted_desc,
struct key *tkey;
tkey = request_key(&key_type_trusted, trusted_desc, NULL);
- if (IS_ERR(tkey))
- goto error;
+ if (IS_ERR(tkey)) {
+ tkey = request_key(&key_type_tee_trusted, trusted_desc, NULL);
+ if (IS_ERR(tkey))
+ goto error;
+ }
down_read(&tkey->sem);
tpayload = tkey->payload.data[0];
--
2.7.4
next prev parent reply other threads:[~2019-06-13 15:34 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 10:30 [RFC 0/7] Introduce TEE based Trusted Keys support Sumit Garg
2019-06-13 10:30 ` [RFC 1/7] tee: optee: allow kernel pages to register as shm Sumit Garg
2019-06-13 15:12 ` Jarkko Sakkinen
2019-06-13 15:17 ` Jarkko Sakkinen
2019-06-13 15:17 ` Jarkko Sakkinen
2019-06-14 5:12 ` Sumit Garg
2019-06-14 8:15 ` Jens Wiklander
2019-06-13 10:30 ` [RFC 2/7] tee: enable support to register kernel memory Sumit Garg
2019-06-13 15:20 ` Jarkko Sakkinen
2019-06-14 5:13 ` Sumit Garg
2019-06-14 8:16 ` Jens Wiklander
2019-06-13 10:30 ` [RFC 3/7] tee: add private login method for kernel clients Sumit Garg
2019-07-08 15:39 ` Jens Wiklander
2019-07-09 5:56 ` Sumit Garg
2019-07-09 7:03 ` Jens Wiklander
2019-07-09 9:36 ` Sumit Garg
2019-07-29 7:08 ` Jens Wiklander
2019-07-29 13:13 ` Sumit Garg
2019-06-13 10:30 ` [RFC 4/7] KEYS: trusted: Introduce TEE based Trusted Keys Sumit Garg
2019-06-13 15:32 ` Jarkko Sakkinen
2019-06-14 5:43 ` Sumit Garg
2019-06-13 10:30 ` Sumit Garg [this message]
2019-06-13 10:30 ` [RFC 6/7] doc: keys: Document usage of " Sumit Garg
2019-06-13 15:34 ` Jarkko Sakkinen
2019-06-14 5:37 ` Sumit Garg
2019-06-14 15:36 ` Jarkko Sakkinen
2019-06-13 10:30 ` [RFC 7/7] MAINTAINERS: Add entry for " Sumit Garg
2019-06-13 16:40 ` [RFC 0/7] Introduce TEE based Trusted Keys support Casey Schaufler
2019-06-14 0:03 ` Mimi Zohar
2019-06-14 8:17 ` Sumit Garg
2019-06-14 5:58 ` Sumit Garg
2019-07-08 12:41 ` Sumit Garg
2019-07-08 16:31 ` Jens Wiklander
2019-07-09 5:58 ` Sumit Garg
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=1560421833-27414-6-git-send-email-sumit.garg@linaro.org \
--to=sumit.garg@linaro.org \
--cc=ard.biesheuvel@linaro.org \
--cc=corbet@lwn.net \
--cc=daniel.thompson@linaro.org \
--cc=dhowells@redhat.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jejb@linux.ibm.com \
--cc=jens.wiklander@linaro.org \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-doc@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=tee-dev@lists.linaro.org \
--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).