From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752040AbdJDKvS (ORCPT ); Wed, 4 Oct 2017 06:51:18 -0400 Received: from mga11.intel.com ([192.55.52.93]:49508 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495AbdJDKvQ (ORCPT ); Wed, 4 Oct 2017 06:51:16 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,477,1500966000"; d="scan'208";a="135057736" Date: Wed, 4 Oct 2017 13:51:13 +0300 From: Jarkko Sakkinen To: Thiebaud Weksteen Cc: linux-efi@vger.kernel.org, linux-integrity@vger.kernel.org, tpmdd-devel@lists.sourceforge.net, Ard Biesheuvel , Matt Fleming , linux-kernel@vger.kernel.org, Matthew Garrett , peterhuewe@gmx.de, Jason Gunthorpe , tpmdd@selhorst.net Subject: Re: [PATCH v3 4/5] efi: call get_event_log before ExitBootServices Message-ID: <20171004105113.mcho3rlytaxfruyf@linux.intel.com> References: <20170920081340.7413-1-tweek@google.com> <20170920081340.7413-5-tweek@google.com> <20170926114538.r5hsyc5osodpaals@linux.intel.com> <20170929171617.yq4dvn66czvnebns@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170929171617.yq4dvn66czvnebns@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > 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 > > > > > > 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