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
Date: Fri, 23 Apr 2021 15:22:36 +1000 [thread overview]
Message-ID: <20210423152236.59609c97@canb.auug.org.au> (raw)
In-Reply-To: <adc46f08f50e4bdc27776beceeafd6c67cf3843f.camel@HansenPartnership.com>
[-- Attachment #1: Type: text/plain, Size: 983 bytes --]
Hi James,
On Thu, 22 Apr 2021 22:16:29 -0700 James Bottomley <James.Bottomley@HansenPartnership.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 == 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.
Yeah, I haven't merged that yet.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-04-23 5:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 2:39 linux-next: manual merge of the tpmdd tree with Linus' tree Stephen Rothwell
2021-04-23 5:16 ` James Bottomley
2021-04-23 5:22 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-05 0:55 Stephen Rothwell
2017-12-08 2:25 Stephen Rothwell
2017-12-08 10:46 ` Jarkko Sakkinen
2017-10-11 15:01 Mark Brown
2017-10-13 20:15 ` Jarkko Sakkinen
2016-06-20 3:13 Stephen Rothwell
2016-06-20 14:33 ` Jarkko Sakkinen
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=20210423152236.59609c97@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jarkko@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).