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;
Date:   Fri, 23 Apr 2021 15:22:36 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     James Bottomley <James.Bottomley@HansenPartnership.com>
Cc:     Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
        Jarkko Sakkinen <jarkko@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tpmdd tree with Linus' tree
Message-ID: <20210423152236.59609c97@canb.auug.org.au>
In-Reply-To: <adc46f08f50e4bdc27776beceeafd6c67cf3843f.camel@HansenPartnership.com>
References: <20210423123921.181bbb3a@canb.auug.org.au>
        <adc46f08f50e4bdc27776beceeafd6c67cf3843f.camel@HansenPartnership.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Zrn519jVXONxS9ZqIkOQnyk";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Zrn519jVXONxS9ZqIkOQnyk
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi James,

On Thu, 22 Apr 2021 22:16:29 -0700 James Bottomley <James.Bottomley@HansenP=
artnership.com> wrote:
>
> 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; =20
>=20
> Yes, that's the right fix, but it should be the one at the top of my
> tpmdd-for-next branch.

Yeah, I haven't merged that yet.

--=20
Cheers,
Stephen Rothwell

--Sig_/Zrn519jVXONxS9ZqIkOQnyk
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmCCWZwACgkQAVBC80lX
0Gxwowf/QHNXsoX6lxLH3z69+yeDRhaUfRWv6LphCH7T1psqCPBDvVFNW+QBYzG0
i9b5g78s9i7/ar6eOCsQGFTwy6auPWcRQuw9EkRPPjMqOpfsqCYhYPbR3gST6AJv
syF+IL+TIrPyzEbjvvRHxJJJp6sD1epoPQk1ZqSrNzoLLAr7SLYhwJNeB6qSKCHF
+o2Ku8Lqd/6gWMI+sznY0jzUds+hVH5YOZBqYH1JST87J3HvI0JUFVtY8Mll8kV4
FlLcfOeX/4UeYbZvZvUqeRXWogRfAFkorsrNCZ8lsinsgpXU8zcvFc8sYRLoWn9m
4pQOSHRk1B++2MduWZ22SIZAjVTuIA==
=V8Yf
-----END PGP SIGNATURE-----

--Sig_/Zrn519jVXONxS9ZqIkOQnyk--