From: Roberto Sassu <roberto.sassu@huawei.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: <zohar@linux.ibm.com>, <linux-integrity@vger.kernel.org>,
<linux-security-module@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <silviu.vlasceanu@huawei.com>
Subject: Re: [PATCH v4 6/6] tpm: ensure that the output of PCR read contains the correct digest size
Date: Thu, 8 Nov 2018 15:47:39 +0100 [thread overview]
Message-ID: <353ac2d0-591f-f950-f3ad-18e6a4f6085c@huawei.com> (raw)
In-Reply-To: <20181108140814.GF8922@linux.intel.com>
On 11/8/2018 3:08 PM, Jarkko Sakkinen wrote:
> On Tue, Nov 06, 2018 at 04:01:59PM +0100, Roberto Sassu wrote:
>> This patch protects against data corruption that could happen in the bus,
>> by checking that that the digest size returned by the TPM during a PCR read
>> matches the size of the algorithm passed as argument to tpm2_pcr_read().
>>
>> This check is performed after information about the PCR banks has been
>> retrieved.
>>
>> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
>> ---
>> drivers/char/tpm/tpm2-cmd.c | 16 +++++++++++++++-
>> 1 file changed, 15 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
>> index e2d5b84286a7..3b0b5b032901 100644
>> --- a/drivers/char/tpm/tpm2-cmd.c
>> +++ b/drivers/char/tpm/tpm2-cmd.c
>> @@ -187,15 +187,28 @@ struct tpm2_pcr_read_out {
>> int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx,
>> struct tpm_digest *digest_struct, u16 *digest_size_ptr)
>> {
>> + int i;
>> int rc;
>> struct tpm_buf buf;
>> struct tpm2_pcr_read_out *out;
>> u8 pcr_select[TPM2_PCR_SELECT_MIN] = {0};
>> u16 digest_size;
>> + u16 expected_digest_size = 0;
>>
>> if (pcr_idx >= TPM2_PLATFORM_PCR)
>> return -EINVAL;
>>
>> + if (!digest_size_ptr) {
>> + for (i = 0; i < chip->nr_active_banks &&
>> + chip->active_banks[i].alg_id != digest_struct->alg_id; i++)
>> + ;
>
> Not sure if the semicolon should be in its own line.
scripts/Lindent suggests:
for (i = 0; i < chip->nr_active_banks &&
chip->active_banks[i].alg_id != digest_struct->alg_id;
i++) ;
but this is not accepted by scripts/checkpatch.pl (there are no
warnings/errors on the patch I sent).
>> +
>> + if (i == chip->nr_active_banks)
>> + return -EINVAL;
>> +
>> + expected_digest_size = chip->active_banks[i].digest_size;
>> + }
>> +
>> rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_PCR_READ);
>> if (rc)
>> return rc;
>> @@ -215,7 +228,8 @@ int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx,
>>
>> out = (struct tpm2_pcr_read_out *)&buf.data[TPM_HEADER_SIZE];
>> digest_size = be16_to_cpu(out->digest_size);
>> - if (digest_size > sizeof(digest_struct->digest)) {
>> + if (digest_size > sizeof(digest_struct->digest) ||
>> + (!digest_size_ptr && digest_size != expected_digest_size)) {
>> rc = -EINVAL;
>> goto out;
>> }
>> --
>> 2.17.1
>>
>
> Please add
>
> Cc: stable@vger.kernel.org.
>
> /Jarkko
>
--
HUAWEI TECHNOLOGIES Duesseldorf GmbH, HRB 56063
Managing Director: Bo PENG, Jian LI, Yanli SHI
next prev parent reply other threads:[~2018-11-08 14:47 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 15:01 [PATCH v4 0/6] tpm: retrieve digest size of unknown algorithms from TPM Roberto Sassu
2018-11-06 15:01 ` [PATCH v4 1/6] tpm: dynamically allocate active_banks array Roberto Sassu
2018-11-07 6:14 ` Nayna Jain
2018-11-07 9:41 ` Roberto Sassu
2018-11-08 13:50 ` Nayna Jain
2018-11-08 14:40 ` Roberto Sassu
2018-11-08 15:21 ` Jarkko Sakkinen
2018-11-08 15:29 ` Mimi Zohar
2018-11-08 18:57 ` Jarkko Sakkinen
2018-11-07 11:10 ` Mimi Zohar
2018-11-08 13:46 ` Jarkko Sakkinen
2018-11-08 14:24 ` Roberto Sassu
2018-11-08 15:22 ` Jarkko Sakkinen
2018-11-13 13:34 ` Roberto Sassu
2018-11-13 17:04 ` Jarkko Sakkinen
2018-11-13 13:53 ` Roberto Sassu
2018-11-06 15:01 ` [PATCH v4 2/6] tpm: remove definition of TPM2_ACTIVE_PCR_BANKS Roberto Sassu
2018-11-08 14:02 ` Jarkko Sakkinen
2018-11-08 14:03 ` Jarkko Sakkinen
2018-11-08 14:52 ` Roberto Sassu
2018-11-08 19:05 ` Jarkko Sakkinen
2018-11-06 15:01 ` [PATCH v4 3/6] tpm: rename and export tpm2_digest and tpm2_algorithms Roberto Sassu
2018-11-06 15:01 ` [PATCH v4 4/6] tpm: modify tpm_pcr_read() definition to pass a TPM hash algorithm Roberto Sassu
2018-11-08 14:04 ` Jarkko Sakkinen
2018-11-08 14:16 ` Roberto Sassu
2018-11-08 15:15 ` Jarkko Sakkinen
2018-11-08 15:19 ` Peter Huewe
2018-11-08 19:08 ` Jarkko Sakkinen
2018-11-13 12:34 ` Jarkko Sakkinen
2018-11-13 12:39 ` Roberto Sassu
2018-11-13 16:56 ` Jarkko Sakkinen
2018-11-06 15:01 ` [PATCH v4 5/6] tpm: retrieve digest size of unknown algorithms with PCR read Roberto Sassu
2018-11-06 15:01 ` [PATCH v4 6/6] tpm: ensure that the output of PCR read contains the correct digest size Roberto Sassu
2018-11-08 14:08 ` Jarkko Sakkinen
2018-11-08 14:47 ` Roberto Sassu [this message]
2018-11-08 18:52 ` Jarkko Sakkinen
2018-11-13 13:08 ` Roberto Sassu
2018-11-13 16:59 ` Jarkko Sakkinen
2018-11-08 13:51 ` [PATCH v4 0/6] tpm: retrieve digest size of unknown algorithms from TPM 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=353ac2d0-591f-f950-f3ad-18e6a4f6085c@huawei.com \
--to=roberto.sassu@huawei.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--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).