From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Thiebaud Weksteen <tweek@google.com>, jmorris@namei.org
Cc: linux-efi@vger.kernel.org, linux-integrity@vger.kernel.org,
tpmdd-devel@lists.sourceforge.net,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Matt Fleming <matt@codeblueprint.co.uk>,
linux-kernel@vger.kernel.org, Matthew Garrett <mjg59@google.com>,
peterhuewe@gmx.de,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
tpmdd@selhorst.net
Subject: Re: [PATCH v3 4/5] efi: call get_event_log before ExitBootServices
Date: Tue, 10 Oct 2017 17:14:19 +0300 [thread overview]
Message-ID: <20171010141419.e4uv4fkmcmpc7sdc@linux.intel.com> (raw)
In-Reply-To: <CA+zpnLdg4km1vMUUZaYfRg6M68+nSdC+vASULmH-aKu4vYyy4Q@mail.gmail.com>
On Wed, Oct 04, 2017 at 01:12:27PM +0200, Thiebaud Weksteen wrote:
> On Wed, Oct 4, 2017 at 12:51 PM, Jarkko Sakkinen
> <jarkko.sakkinen@linux.intel.com> wrote:
> > On Fri, Sep 29, 2017 at 08:16:17PM +0300, Jarkko Sakkinen wrote:
> >> On Tue, Sep 26, 2017 at 02:49:31PM +0200, Thiebaud Weksteen wrote:
> >> > On Tue, Sep 26, 2017 at 1:45 PM, Jarkko Sakkinen
> >> > <jarkko.sakkinen@linux.intel.com> wrote:
> >> > > On Wed, Sep 20, 2017 at 10:13:39AM +0200, Thiebaud Weksteen wrote:
> >> > >> With TPM 2.0 specification, the event logs may only be accessible by
> >> > >> calling an EFI Boot Service. Modify the EFI stub to copy the log area to
> >> > >> a new Linux-specific EFI configuration table so it remains accessible
> >> > >> once booted.
> >> > >>
> >> > >> When calling this service, it is possible to specify the expected format
> >> > >> of the logs: TPM 1.2 (SHA1) or TPM 2.0 ("Crypto Agile"). For now, only the
> >> > >> first format is retrieved.
> >> > >>
> >> > >> Signed-off-by: Thiebaud Weksteen <tweek@google.com>
> >> > >
> >> > > Does not apply:
> >> > >
> >> > > Applying: tpm: move tpm_eventlog.h outside of drivers folder
> >> > > Applying: tpm: rename event log provider files
> >> > > Applying: tpm: add event log format version
> >> > > Applying: efi: call get_event_log before ExitBootServices
> >> > > error: sha1 information is lacking or useless (drivers/firmware/efi/efi.c).
> >> > > error: could not build fake ancestor
> >> > > Patch failed at 0004 efi: call get_event_log before ExitBootServices
> >> > > The copy of the patch that failed is found in: .git/rebase-apply/patch
> >> > > When you have resolved this problem, run "git am --continue".
> >> > > If you prefer to skip this patch, run "git am --skip" instead.
> >> > > To restore the original branch and stop patching, run "git am --abort".
> >> > >
> >> > > Just rebased my tree to the latest security-next.
> >> >
> >> > It applies fine on security/next-general which is more up-to-date.
> >> > (security/next does not include
> >> > ccc829ba3624beb9a703fc995d016b836d9eead8 on which this patch set is
> >> > based)
> >>
> >> Thanks, my bad, I though that I had it updated.
> >>
> >> I'll update my tree and retry.
> >>
> >> /Jarkko
> >
> > My master is up to date with security/next.
> >
> > Still get the same result:
> >
> > $ git am -3 ~/Downloads/v3-4-5-efi-call-get_event_log-before-ExitBootServices.patch
> > Applying: efi: call get_event_log before ExitBootServices
> > error: sha1 information is lacking or useless (drivers/firmware/efi/efi.c).
> > error: could not build fake ancestor
> > Patch failed at 0001 efi: call get_event_log before ExitBootServices
> > The copy of the patch that failed is found in: .git/rebase-apply/patch
> > When you have resolved this problem, run "git am --continue".
> > If you prefer to skip this patch, run "git am --skip" instead.
> > To restore the original branch and stop patching, run "git am --abort".
> >
> > Maybe you have some other trees fetched in your local GIT so that it
> > finds the ancestors? Anyway, cannot test this at this point.
> >
> > /Jarkko
>
> The security/next branch still does not contain the commit I mentioned
> (ccc829ba3624beb9a703fc995d016b836d9eead8), which is already part of
> torvalds/master now.
>
> $ git branch -a --contains ccc829ba3624beb9a703fc995d016b836d9eead8
> efi_tpm2_eventlog
> master
> remotes/linux-next/akpm
> remotes/linux-next/akpm-base
> remotes/linux-next/master
> remotes/linux-next/stable
> remotes/security/fixes-v4.14-rc3
> remotes/security/fixes-v4.14-rc4
> remotes/security/next-general
> remotes/security/next-testing
> remotes/torvalds/master
>
> Is there any reason why you are trying to merge on that specific
> branch and not next-general or next-testing? Would you know the
> purpose of all these next-* branches?
>
> Thanks,
> Thiebaud
The way I've agreed with James Morris to have my tree is to be rooted to
security trees next branch.
James, what actions should we take?
/Jarkko
next prev parent reply other threads:[~2017-10-10 14:14 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-20 8:13 [PATCH v3 0/5] Call GetEventLog before ExitBootServices Thiebaud Weksteen
[not found] ` <20170920081340.7413-1-tweek-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2017-09-20 8:13 ` [PATCH v3 1/5] tpm: move tpm_eventlog.h outside of drivers folder Thiebaud Weksteen
2017-09-20 8:13 ` [PATCH v3 2/5] tpm: rename event log provider files Thiebaud Weksteen via tpmdd-devel
2017-09-26 11:10 ` Jarkko Sakkinen
2017-09-20 8:13 ` [PATCH v3 3/5] tpm: add event log format version Thiebaud Weksteen via tpmdd-devel
2017-09-20 8:13 ` [PATCH v3 4/5] efi: call get_event_log before ExitBootServices Thiebaud Weksteen via tpmdd-devel
[not found] ` <20170920081340.7413-5-tweek-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2017-09-26 11:45 ` Jarkko Sakkinen
2017-09-26 12:49 ` Thiebaud Weksteen
2017-09-29 17:16 ` Jarkko Sakkinen
[not found] ` <20170929171617.yq4dvn66czvnebns-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-04 10:51 ` Jarkko Sakkinen
2017-10-04 11:12 ` Thiebaud Weksteen
2017-10-10 14:14 ` Jarkko Sakkinen [this message]
[not found] ` <20171010141419.e4uv4fkmcmpc7sdc-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-11 1:54 ` James Morris
2017-10-11 11:52 ` Jarkko Sakkinen
[not found] ` <20171011115254.2n4zs77ixyl2mdgm-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-11 11:53 ` Jarkko Sakkinen
2017-10-12 11:38 ` Jarkko Sakkinen
[not found] ` <20171012113844.ptfynppgx3tkwe7g-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-12 15:03 ` Javier Martinez Canillas
[not found] ` <CABxcv=neJZjA407pbmNesNbGY9k3VRbhawut6ewofw_UB5U1_w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-10-13 19:47 ` Jarkko Sakkinen
2017-10-16 11:34 ` Jarkko Sakkinen
2017-10-16 11:28 ` Jarkko Sakkinen
2017-10-16 11:49 ` Jarkko Sakkinen
[not found] ` <20171016114946.phj3n6vyjdbpj2sj-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-17 8:00 ` Thiebaud Weksteen
[not found] ` <CA+zpnLc038dv-WAE7fdD8i6DpGV3zCLEieg-KPTAvaW7yt-tLA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-10-18 15:11 ` Jarkko Sakkinen
2017-10-26 18:58 ` Jarkko Sakkinen
[not found] ` <20171004105113.mcho3rlytaxfruyf-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-04 11:20 ` Jarkko Sakkinen
2018-03-05 15:40 ` Marc-André Lureau
2018-03-06 10:15 ` Thiebaud Weksteen
2017-09-21 15:13 ` [PATCH v3 0/5] Call GetEventLog " Jarkko Sakkinen
2017-09-26 11:17 ` [tpmdd-devel] " Javier Martinez Canillas
2017-09-20 8:13 ` [PATCH v3 5/5] tpm: parse TPM event logs based on EFI table Thiebaud Weksteen
[not found] ` <20170920081340.7413-6-tweek-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2017-09-20 16:40 ` Jason Gunthorpe
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=20171010141419.e4uv4fkmcmpc7sdc@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=ard.biesheuvel@linaro.org \
--cc=jgunthorpe@obsidianresearch.com \
--cc=jmorris@namei.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mjg59@google.com \
--cc=peterhuewe@gmx.de \
--cc=tpmdd-devel@lists.sourceforge.net \
--cc=tpmdd@selhorst.net \
--cc=tweek@google.com \
/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).