From: Tyler Hicks <tyhicks@canonical.com>
To: Roberto Sassu <roberto.sassu@huawei.com>
Cc: jarkko.sakkinen@linux.intel.com, jejb@linux.ibm.com,
zohar@linux.ibm.com, jgg@ziepe.ca,
linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org, keyrings@vger.kernel.org,
linux-kernel@vger.kernel.org, crazyt2019+lml@gmail.com,
nayna@linux.vnet.ibm.com, silviu.vlasceanu@huawei.com
Subject: Re: [PATCH v2] KEYS: trusted: allow module init if TPM is inactive or deactivated
Date: Fri, 2 Aug 2019 10:30:30 -0500 [thread overview]
Message-ID: <20190802153030.GB26616@elm> (raw)
In-Reply-To: <20190802150733.1972-1-roberto.sassu@huawei.com>
On 2019-08-02 17:07:33, Roberto Sassu wrote:
> 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
^ if
> avoid module dependency problems.
>
> However, trusted module initialization can still fail if the TPM is
> inactive or deactivated. This patch ignores tpm_get_random() errors in
> init_digests() and returns -EFAULT in pcrlock() if the TPM didn't return
> random data.
>
> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
The code changes look correct to me.
Reviewed-by: Tyler Hicks <tyhicks@canonical.com>
For whoever takes this patch through their tree, I think that adding the
following Fixes tag would be useful (as well as cc'ing stable):
Fixes: 240730437deb ("KEYS: trusted: explicitly use tpm_chip structure...")
I think it is also worth leaving a short note, in the commit message,
for backporters that commit 782779b60faa ("tpm: Actually fail on TPM
errors during "get random"") should be included with any backports of
this patch.
Thanks!
Tyler
> ---
> security/keys/trusted.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/security/keys/trusted.c b/security/keys/trusted.c
> index 9a94672e7adc..34f04ffcf2e5 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 happens if the TPM didn't return random data */
> + if (!digests)
> + return -EFAULT;
> +
> return tpm_pcr_extend(chip, pcrnum, digests) ? -EINVAL : 0;
> }
>
> @@ -1233,10 +1237,8 @@ static int __init init_digests(void)
> int i;
>
> ret = tpm_get_random(chip, digest, TPM_MAX_DIGEST_SIZE);
> - if (ret < 0)
> - return ret;
> - if (ret < TPM_MAX_DIGEST_SIZE)
> - return -EFAULT;
> + if (ret < 0 || ret < TPM_MAX_DIGEST_SIZE)
> + return 0;
>
> digests = kcalloc(chip->nr_allocated_banks, sizeof(*digests),
> GFP_KERNEL);
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-08-02 15:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-02 15:07 [PATCH v2] KEYS: trusted: allow module init if TPM is inactive or deactivated Roberto Sassu
2019-08-02 15:30 ` Tyler Hicks [this message]
2019-08-02 15:34 ` Roberto Sassu
2019-08-02 16:11 ` Roberto Sassu
2019-08-02 16:15 ` Tyler Hicks
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=20190802153030.GB26616@elm \
--to=tyhicks@canonical.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=roberto.sassu@huawei.com \
--cc=silviu.vlasceanu@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).