From: Roberto Sassu <roberto.sassu@huawei.com>
To: <jarkko.sakkinen@linux.intel.com>, <jejb@linux.ibm.com>,
<zohar@linux.ibm.com>, <jgg@ziepe.ca>
Cc: <linux-integrity@vger.kernel.org>,
<linux-security-module@vger.kernel.org>,
<keyrings@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<crazyt2019+lml@gmail.com>, <tyhicks@canonical.com>,
<nayna@linux.vnet.ibm.com>, <silviu.vlasceanu@huawei.com>,
Roberto Sassu <roberto.sassu@huawei.com>
Subject: [PATCH] KEYS: trusted: allow module init if TPM is inactive or deactivated
Date: Fri, 5 Jul 2019 18:37:35 +0200 [thread overview]
Message-ID: <20190705163735.11539-1-roberto.sassu@huawei.com> (raw)
Commit c78719203fc6 ("KEYS: trusted: allow trusted.ko to initialize w/o a
TPM") allows the trusted module to be loaded even a TPM is not found to
avoid module dependency problems.
Unfortunately, this does not completely solve the issue, as there could be
a case where a TPM is found but is not functional (the TPM commands return
an error). Specifically, after the tpm_chip structure is returned by
tpm_default_chip() in init_trusted(), the execution terminates after
init_digests() returns -EFAULT (due to the fact that tpm_get_random()
returns a positive value, but less than TPM_MAX_DIGEST_SIZE).
This patch fixes the issue by ignoring the TPM_ERR_DEACTIVATED and
TPM_ERR_DISABLED errors.
Fixes: 240730437deb ("KEYS: trusted: explicitly use tpm_chip structure...")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
---
drivers/char/tpm/tpm.h | 2 --
include/linux/tpm.h | 3 +++
security/keys/trusted.c | 6 +++++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index e503ffc3aa39..a216ac396711 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -54,8 +54,6 @@ enum tpm_addr {
#define TPM_WARN_RETRY 0x800
#define TPM_WARN_DOING_SELFTEST 0x802
-#define TPM_ERR_DEACTIVATED 0x6
-#define TPM_ERR_DISABLED 0x7
#define TPM_ERR_INVALID_POSTINIT 38
#define TPM_HEADER_SIZE 10
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index 53c0ea9ec9df..efd3ccbb6aee 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -26,6 +26,9 @@
#define TPM_DIGEST_SIZE 20 /* Max TPM v1.2 PCR size */
#define TPM_MAX_DIGEST_SIZE SHA512_DIGEST_SIZE
+#define TPM_ERR_DEACTIVATED 0x6
+#define TPM_ERR_DISABLED 0x7
+
struct tpm_chip;
struct trusted_key_payload;
struct trusted_key_options;
diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index 9a94672e7adc..430d85090b3b 100644
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -389,6 +389,10 @@ static int pcrlock(const int pcrnum)
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
+ /* This can happen if the TPM is inactive. */
+ if (!digests)
+ return -EINVAL;
+
return tpm_pcr_extend(chip, pcrnum, digests) ? -EINVAL : 0;
}
@@ -1233,7 +1237,7 @@ static int __init init_digests(void)
int i;
ret = tpm_get_random(chip, digest, TPM_MAX_DIGEST_SIZE);
- if (ret < 0)
+ if (ret < 0 || ret == TPM_ERR_DEACTIVATED || ret == TPM_ERR_DISABLED)
return ret;
if (ret < TPM_MAX_DIGEST_SIZE)
return -EFAULT;
--
2.17.1
next reply other threads:[~2019-07-05 16:41 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 16:37 Roberto Sassu [this message]
2019-07-08 19:55 ` [PATCH] KEYS: trusted: allow module init if TPM is inactive or deactivated Tyler Hicks
2019-07-08 20:34 ` James Bottomley
2019-07-09 16:24 ` Jarkko Sakkinen
2019-07-09 16:31 ` Mimi Zohar
2019-08-02 21:18 ` Tyler Hicks
2019-07-11 19:48 ` Jarkko Sakkinen
2019-07-15 16:44 ` Roberto Sassu
2019-08-01 16:32 ` Jarkko Sakkinen
2019-08-02 8:21 ` Roberto Sassu
2019-08-02 14:27 ` Tyler Hicks
2019-08-02 19:42 ` Jarkko Sakkinen
2019-08-02 20:23 ` Tyler Hicks
2019-08-02 20:35 ` Tyler Hicks
2019-08-03 14:44 ` Jarkko Sakkinen
2019-08-04 1:46 ` Mimi Zohar
2019-08-05 14:50 ` Roberto Sassu
2019-08-05 15:54 ` Mimi Zohar
2019-08-05 16:04 ` Roberto Sassu
2019-08-05 16:04 ` Tyler Hicks
2019-08-05 16:51 ` Roberto Sassu
2019-08-05 16:53 ` Tyler Hicks
2019-08-05 22:11 ` Jarkko Sakkinen
2019-08-02 19:40 ` 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=20190705163735.11539-1-roberto.sassu@huawei.com \
--to=roberto.sassu@huawei.com \
--cc=crazyt2019+lml@gmail.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jejb@linux.ibm.com \
--cc=jgg@ziepe.ca \
--cc=keyrings@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=nayna@linux.vnet.ibm.com \
--cc=silviu.vlasceanu@huawei.com \
--cc=tyhicks@canonical.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).