From: Dan Williams <dan.j.williams@intel.com>
To: jarkko.sakkinen@linux.intel.com
Cc: Roberto Sassu <roberto.sassu@huawei.com>,
James Bottomley <jejb@linux.ibm.com>,
Mimi Zohar <zohar@linux.ibm.com>,
David Howells <dhowells@redhat.com>,
keyrings@vger.kernel.org, linux-nvdimm@lists.01.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] security/keys/trusted: Allow operation without hardware TPM
Date: Mon, 18 Mar 2019 16:45:13 -0700 [thread overview]
Message-ID: <155295271345.1945351.6465460744078693578.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)
Rather than fail initialization of the trusted.ko module, arrange for
the module to load, but rely on trusted_instantiate() to fail
trusted-key operations.
Fixes: 240730437deb ("KEYS: trusted: explicitly use tpm_chip structure...")
Cc: Roberto Sassu <roberto.sassu@huawei.com>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Mimi Zohar <zohar@linux.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
security/keys/trusted.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index bcc9c6ead7fd..d959597a688e 100644
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -45,6 +45,13 @@ struct sdesc {
static struct crypto_shash *hashalg;
static struct crypto_shash *hmacalg;
+static struct device *chip_dev(struct tpm_chip *chip)
+{
+ if (chip)
+ return &chip->dev;
+ return NULL;
+}
+
static struct sdesc *init_sdesc(struct crypto_shash *alg)
{
struct sdesc *sdesc;
@@ -1224,6 +1231,14 @@ static int __init init_digests(void)
int ret;
int i;
+ /*
+ * Hardware tpm operations are disabled, but allow the software
+ * module to initialize, and depend on trusted_instantiate() to
+ * fail any attempts to access the missing hardware.
+ */
+ if (!chip)
+ return 0;
+
ret = tpm_get_random(chip, digest, TPM_MAX_DIGEST_SIZE);
if (ret < 0)
return ret;
@@ -1246,8 +1261,6 @@ static int __init init_trusted(void)
int ret;
chip = tpm_default_chip();
- if (!chip)
- return -ENOENT;
ret = init_digests();
if (ret < 0)
goto err_put;
@@ -1263,13 +1276,13 @@ static int __init init_trusted(void)
err_free:
kfree(digests);
err_put:
- put_device(&chip->dev);
+ put_device(chip_dev(chip));
return ret;
}
static void __exit cleanup_trusted(void)
{
- put_device(&chip->dev);
+ put_device(chip_dev(chip));
kfree(digests);
trusted_shash_release();
unregister_key_type(&key_type_trusted);
next reply other threads:[~2019-03-18 23:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 23:45 Dan Williams [this message]
2019-03-19 0:24 ` [PATCH] security/keys/trusted: Allow operation without hardware TPM James Bottomley
2019-03-19 0:30 ` Dan Williams
2019-03-19 0:56 ` James Bottomley
2019-03-19 1:34 ` Dan Williams
2019-03-20 1:55 ` Dan Williams
2019-03-20 2:19 ` James Bottomley
2019-03-19 22:56 ` Mimi Zohar
2019-03-19 23:01 ` Dan Williams
2019-03-21 13:54 ` Jarkko Sakkinen
2019-03-21 14:26 ` Roberto Sassu
2019-03-21 16:30 ` Dan Williams
2019-03-21 17:45 ` Roberto Sassu
2019-03-22 10:12 ` Jarkko Sakkinen
2019-03-22 15:24 ` Dan Williams
2019-03-25 14:12 ` Jarkko Sakkinen
2019-03-25 14:50 ` Jarkko Sakkinen
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=155295271345.1945351.6465460744078693578.stgit@dwillia2-desk3.amr.corp.intel.com \
--to=dan.j.williams@intel.com \
--cc=dhowells@redhat.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jejb@linux.ibm.com \
--cc=keyrings@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=roberto.sassu@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).