Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <adc46f08f50e4bdc27776beceeafd6c67cf3843f.camel@HansenPartnership.com>
Subject: Re: linux-next: manual merge of the tpmdd tree with Linus' tree
From:   James Bottomley <James.Bottomley@HansenPartnership.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc:     Jarkko Sakkinen <jarkko@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Date:   Thu, 22 Apr 2021 22:16:29 -0700
In-Reply-To: <20210423123921.181bbb3a@canb.auug.org.au>
References: <20210423123921.181bbb3a@canb.auug.org.au>
Content-Type: multipart/signed; micalg="pgp-sha256";
        protocol="application/pgp-signature"; boundary="=-yt427yNM8skr60d6Si3l"
User-Agent: Evolution 3.34.4 
MIME-Version: 1.0
Precedence: bulk


--=-yt427yNM8skr60d6Si3l
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

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 =3D=3D ARRAY_SIZE(tpm2_hash_map))
>                 return -EINVAL;
>  =20
> +       if (!options->keyhandle)
> +               return -EINVAL;
> +=20
>  -      rc =3D tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE);
>  +      rc =3D 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


--=-yt427yNM8skr60d6Si3l
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----

iHUEABMIAB0WIQTnYEDbdso9F2cI+arnQslM7pishQUCYIJYLgAKCRDnQslM7pis
hbBOAP4+5HNcZqyqS6cGmXeLznEyvm2bDkblLkKbEvMGxSUBeAD7Bgy6SmGUUYkH
JllLWKv7odHn3gwN0+s5xtSNMdV3Sr0=
=iZ16
-----END PGP SIGNATURE-----

--=-yt427yNM8skr60d6Si3l--