Subject: Re: linux-next: manual merge of the tpmdd tree with Linus' tree

From: James Bottomley <[email-masked]>
Date: Thu, 22 Apr 2021 22:16:29 -0700

On Fri, 2021-04-23 at 12:39 +1000, Stephen Rothwell wrote:
> diff --cc security/keys/trusted-keys/trusted_tpm2.c
> index c87c4df8703d,d225ad140960..000000000000
> --- a/security/keys/trusted-keys/trusted_tpm2.c
> +++ b/security/keys/trusted-keys/trusted_tpm2.c
> @@@ -79,7 -245,10 +245,10 @@@ int tpm2_seal_trusted(struct tpm_chip *
>         if (i == ARRAY_SIZE(tpm2_hash_map))
>                 return -EINVAL;
>   
> +       if (!options->keyhandle)
> +               return -EINVAL;
> + 
>  -      rc = tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE);
>  +      rc = tpm_try_get_ops(chip);
>         if (rc)
>                 return rc;

Yes, that's the right fix, but it should be the one at the top of my
tpmdd-for-next branch.

Thanks,

James