On Tue, Aug 2, 2022 at 4:00 PM Eric Biggers <ebiggers@xxxxxxxxxx> wrote:
>
> On Wed, May 04, 2022 at 04:20:56PM -0700, Evan Green wrote:
> > diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c
> > index aa108bea6739b3..2975827c01bec0 100644
> > --- a/security/keys/trusted-keys/trusted_tpm1.c
> > +++ b/security/keys/trusted-keys/trusted_tpm1.c
> > @@ -713,6 +713,7 @@ enum {
> > Opt_hash,
> > Opt_policydigest,
> > Opt_policyhandle,
> > + Opt_creationpcrs,
> > };
> >
> > static const match_table_t key_tokens = {
> > @@ -725,6 +726,7 @@ static const match_table_t key_tokens = {
> > {Opt_hash, "hash=%s"},
> > {Opt_policydigest, "policydigest=%s"},
> > {Opt_policyhandle, "policyhandle=%s"},
> > + {Opt_creationpcrs, "creationpcrs=%s"},
> > {Opt_err, NULL}
> > };
> >
> > @@ -858,6 +860,13 @@ static int getoptions(char *c, struct trusted_key_payload *pay,
> > return -EINVAL;
> > opt->policyhandle = handle;
> > break;
> > + case Opt_creationpcrs:
> > + if (!tpm2)
> > + return -EINVAL;
> > + res = kstrtoint(args[0].from, 16, &opt->creation_pcrs);
> > + if (res < 0)
> > + return -EINVAL;
> > + break;
>
> I thought that TPM1 is deprecated. Are you sure you need more TPM1 features?
It seems that trusted_tpm1.c is not just TPM1 functions, but also
common functions that call TPM2 primitives. A few of these functions
(like this getoptions()) seem to even error out if !tpm_is_tpm2(chip).
-Evan
