From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCAEBC433DB for ; Wed, 10 Mar 2021 19:45:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD28B64FB5 for ; Wed, 10 Mar 2021 19:45:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233534AbhCJToj (ORCPT ); Wed, 10 Mar 2021 14:44:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:50712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233480AbhCJTob (ORCPT ); Wed, 10 Mar 2021 14:44:31 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B037964EB2; Wed, 10 Mar 2021 19:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615405471; bh=Kr4AvmrvpWyhKOon2akvbgDQH7QZA8lefwNVS4PkchY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Kuc2e/6xeSlblPQyJE9u9MzInNCZyuPFfWl/escgGhyblzfjhiHzZDK2dBnV7/GXa QqiuIt3FmN+E0IiZ96ns8hTXSHxxnVsY+0VLh2SmBuoFqATNMIgkf1DowOfr5UpytM +LUB7S0zFsCIRMEKnpmYhkr8oltWSuheyaz9dQ6K0Ipiba0uER+gZG2ojQpgoiehuB hfyYZF/TRgwpu9OUTZofeKtcEYXEFENuEezSBmLh0tDUanhIDTmOsi4FSofi0LJjc2 2ksnbQ41PN6hvVd/i+Ac6H1s15QeB3Noo0gIbOJDm41GV8Xfn/ic2gziYJZK8YzagH uMtPVJsWUN4DA== Date: Wed, 10 Mar 2021 21:44:07 +0200 From: Jarkko Sakkinen To: Eric Snowberg Cc: rdunlap@infradead.org, dhowells@redhat.com, nathan@kernel.org, dwmw2@infradead.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] certs: Fix wrong kconfig option used for x509_revocation_list Message-ID: References: <20210304175030.184131-1-eric.snowberg@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org On Wed, Mar 10, 2021 at 09:43:33PM +0200, Jarkko Sakkinen wrote: > On Thu, Mar 04, 2021 at 12:50:30PM -0500, Eric Snowberg wrote: > > Fix a build issue when x509_revocation_list is not defined. > > > > $ make ARCH=x86_64 O=build64 all > > > > EXTRACT_CERTS ../ > > At main.c:154: > > - SSL error:0909006C:PEM routines:get_name:no start line: crypto/pem/pem_lib.c:745 > > extract-cert: ../: Is a directory > > make[2]: [../certs/Makefile:119: certs/x509_revocation_list] Error 1 (ignored) > > > > When the new CONFIG_SYSTEM_REVOCATION_LIST was added [1], it was not carried > > into the code for preloading the revocation certificates [2]. Change from > > using the original CONFIG_SYSTEM_BLACKLIST_KEYRING to the new > > CONFIG_SYSTEM_REVOCATION_LIST. > > > > [1] https://lore.kernel.org/keyrings/EDA280F9-F72D-4181-93C7-CDBE95976FF7@oracle.com/T/#m562c1b27bf402190e7bb573ad20eff5b6310d08f > > [2] https://lore.kernel.org/keyrings/EDA280F9-F72D-4181-93C7-CDBE95976FF7@oracle.com/T/#m07e258bf019ccbac23820fad5192ceffa74fc6ab > > > > Reported-by: Randy Dunlap > > Signed-off-by: Eric Snowberg > > Got my first ever chance to try out b4: > > $ b4 am 20210304175030.184131-1-eric.snowberg@oracle.com > Looking up https://lore.kernel.org/r/20210304175030.184131-1-eric.snowberg%40oracle.com > Grabbing thread from lore.kernel.org/keyrings > Analyzing 5 messages in the thread > --- > Writing ./v2_20210304_eric_snowberg_certs_fix_wrong_kconfig_option_used_for_x509_revocation_list.mbx > ✓ [PATCH v2] certs: Fix wrong kconfig option used for x509_revocation_list > + Tested-by: Nathan Chancellor (✓ DKIM/kernel.org) > --- > ✓ Attestation-by: DKIM/oracle.com (From: eric.snowberg@oracle.com) > --- > Total patches: 1 > --- > Link: https://lore.kernel.org/r/20210304175030.184131-1-eric.snowberg@oracle.com > Base: not found > git am ./v2_20210304_eric_snowberg_certs_fix_wrong_kconfig_option_used_for_x509_revocation_list.mbx > > Wondering tho, what "Base: not found" means? > > > --- > > v2 changes: > > Use the new config option for extract-cert > > Use the new config option when building revocation_certificates.o > > --- > > certs/Makefile | 5 +++-- > > certs/blacklist.c | 4 ++++ > > scripts/Makefile | 2 +- > > 3 files changed, 8 insertions(+), 3 deletions(-) > > > > diff --git a/certs/Makefile b/certs/Makefile > > index e3f4926fd21e..b6db52ebf0be 100644 > > --- a/certs/Makefile > > +++ b/certs/Makefile > > @@ -4,7 +4,8 @@ > > # > > > > obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o > > -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o revocation_certificates.o common.o > > +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o > > +obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o > > ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),"") > > obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o > > else > > @@ -105,7 +106,7 @@ $(obj)/signing_key.x509: scripts/extract-cert $(X509_DEP) FORCE > > $(call if_changed,extract_certs,$(MODULE_SIG_KEY_SRCPREFIX)$(CONFIG_MODULE_SIG_KEY)) > > endif # CONFIG_MODULE_SIG > > > > -ifeq ($(CONFIG_SYSTEM_BLACKLIST_KEYRING),y) > > +ifeq ($(CONFIG_SYSTEM_REVOCATION_LIST),y) > > > > $(eval $(call config_filename,SYSTEM_REVOCATION_KEYS)) > > > > diff --git a/certs/blacklist.c b/certs/blacklist.c > > index 723b19c96256..c9a435b15af4 100644 > > --- a/certs/blacklist.c > > +++ b/certs/blacklist.c > > @@ -21,8 +21,10 @@ > > > > static struct key *blacklist_keyring; > > > > +#ifdef CONFIG_SYSTEM_REVOCATION_LIST > > extern __initconst const u8 revocation_certificate_list[]; > > extern __initconst const unsigned long revocation_certificate_list_size; > > +#endif > > > > /* > > * The description must be a type prefix, a colon and then an even number of > > @@ -225,6 +227,7 @@ static int __init blacklist_init(void) > > */ > > device_initcall(blacklist_init); > > > > +#ifdef CONFIG_SYSTEM_REVOCATION_LIST > > /* > > * Load the compiled-in list of revocation X.509 certificates. > > */ > > @@ -237,3 +240,4 @@ static __init int load_revocation_certificate_list(void) > > blacklist_keyring); > > } > > late_initcall(load_revocation_certificate_list); > > +#endif > > diff --git a/scripts/Makefile b/scripts/Makefile > > index 983b785f13cb..bd0718f7c493 100644 > > --- a/scripts/Makefile > > +++ b/scripts/Makefile > > @@ -11,7 +11,7 @@ hostprogs-always-$(CONFIG_ASN1) += asn1_compiler > > hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file > > hostprogs-always-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert > > hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert > > - hostprogs-always-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += extract-cert > > +hostprogs-always-$(CONFIG_SYSTEM_REVOCATION_LIST) += extract-cert > > > > HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include > > HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include > > -- > > 2.18.4 > > > > > The patch does not apply: > > $ git am -3 v2_20210304_eric_snowberg_certs_fix_wrong_kconfig_option_used_for_x509_revocation_list.mbx > Applying: certs: Fix wrong kconfig option used for x509_revocation_list > error: sha1 information is lacking or useless (certs/Makefile). > error: could not build fake ancestor > Patch failed at 0001 certs: Fix wrong kconfig option used for x509_revocation_list > hint: Use 'git am --show-current-patch=diff' to see the failed 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". Tried to apply to Linus' tree 9b1ea29bc0d7b94d420f96a0f4121403efc3dd85 /Jarkko