From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: David Woodhouse <dwmw2@infradead.org>, linux-integrity@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.ibm.com>,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Subject: Re: [PATCH 5/8] security: keys: trusted: Make sealed key properly interoperable
Date: Mon, 09 Dec 2019 09:23:41 -0800 [thread overview]
Message-ID: <1575912221.31378.2.camel@HansenPartnership.com> (raw)
In-Reply-To: <6fa42aee37f8207c7dcb037615b87cc02b708ec4.camel@infradead.org>
On Mon, 2019-12-09 at 10:09 +0000, David Woodhouse wrote:
> On Sat, 2019-12-07 at 21:11 -0800, James Bottomley wrote:
[...]
> > @@ -330,13 +332,16 @@ static int tpm2_load_cmd(struct tpm_chip
> > *chip,
> > unsigned int private_len;
> > unsigned int public_len;
> > unsigned int blob_len;
> > - u8 *blob;
> > + u8 *blob, *pub;
> > int rc;
> > + u32 attrs;
> >
> > rc = tpm2_key_decode(payload, options, &blob);
> > - if (rc)
> > + if (rc) {
> > /* old form */
> > blob = payload->blob;
> > + payload->old_format = 1;
> > + }
> >
> > /* new format carries keyhandle but old format doesn't */
> > if (!options->keyhandle)
> > @@ -347,6 +352,16 @@ static int tpm2_load_cmd(struct tpm_chip
> > *chip,
> > return -E2BIG;
> >
> > public_len = be16_to_cpup((__be16 *) &blob[2 +
> > private_len]);
> > +
> > + pub = blob + 2 + private_len + 2;
> > + /* key attributes are always at offset 4 */
> > + attrs = get_unaligned_be32(pub + 4);
>
>
> At this point I don't believe you've checked yet that payload-
> >blob_len is sufficient to know that these bytes exist.
Check added.
> I think you're reading 'private_len' from non-existent bytes too, if
> payload->blob_len is zero or one? Which I think was there before you
> started, but you touched it last...
Well, I started this because of bugs in the current code, so this is
just one more bug I have to fix.
James
next prev parent reply other threads:[~2019-12-09 17:23 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-08 5:06 [PATCH 0/8] Fix TPM 2.0 trusted keys James Bottomley
2019-12-08 5:07 ` [PATCH 1/8] security: keys: trusted: flush the key handle after use James Bottomley
2019-12-09 8:31 ` David Woodhouse
2019-12-09 15:38 ` James Bottomley
2019-12-08 5:08 ` [PATCH 2/8] lib: add asn.1 encoder James Bottomley
2019-12-09 8:50 ` David Woodhouse
2019-12-09 15:46 ` James Bottomley
2019-12-09 22:05 ` Matthew Garrett
2019-12-09 22:43 ` James Bottomley
2019-12-08 5:09 ` [PATCH 3/8] oid_registry: Add TCG defined OIDS for TPM keys James Bottomley
2019-12-09 8:55 ` David Woodhouse
2019-12-09 16:21 ` James Bottomley
2020-06-19 20:45 ` Wiseman, Monty (GE Research, US)
2020-06-19 22:50 ` Jerry Snitselaar
2020-06-20 15:36 ` James Bottomley
2020-06-23 1:17 ` Jarkko Sakkinen
2019-12-08 5:10 ` [PATCH 4/8] security: keys: trusted: use ASN.1 tpm2 key format for the blobs James Bottomley
2019-12-09 10:04 ` David Woodhouse
2019-12-09 16:31 ` James Bottomley
2019-12-08 5:11 ` [PATCH 5/8] security: keys: trusted: Make sealed key properly interoperable James Bottomley
2019-12-09 10:09 ` David Woodhouse
2019-12-09 17:23 ` James Bottomley [this message]
2019-12-08 5:12 ` [PATCH 6/8] security: keys: trusted: add PCR policy to TPM2 keys James Bottomley
2019-12-09 10:18 ` David Woodhouse
2019-12-09 18:03 ` James Bottomley
2019-12-09 18:44 ` David Woodhouse
2019-12-09 19:11 ` James Bottomley
2019-12-25 17:08 ` Ken Goldman
2019-12-08 5:13 ` [PATCH 7/8] security: keys: trusted: add ability to specify arbitrary policy James Bottomley
2019-12-08 5:14 ` [PATCH 8/8] security: keys: trusted: implement counter/timer policy James Bottomley
2019-12-09 20:20 ` [PATCH 0/8] Fix TPM 2.0 trusted keys Jarkko Sakkinen
2019-12-09 20:57 ` James Bottomley
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=1575912221.31378.2.camel@HansenPartnership.com \
--to=james.bottomley@hansenpartnership.com \
--cc=dwmw2@infradead.org \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-integrity@vger.kernel.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).