From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753551Ab2LEHjP (ORCPT ); Wed, 5 Dec 2012 02:39:15 -0500 Received: from cantor2.suse.de ([195.135.220.15]:55335 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751599Ab2LEHjO (ORCPT ); Wed, 5 Dec 2012 02:39:14 -0500 Date: Wed, 05 Dec 2012 08:39:11 +0100 Message-ID: From: Takashi Iwai To: Rusty Russell Cc: David Howells , Michal Marek , linux-kernel@vger.kernel.org, James Hogan Subject: Re: [PATCH 2/3] MODSIGN: Avoid using .incbin in C source In-Reply-To: <87hao1gyiv.fsf@rustcorp.com.au> References: <1354616321-13520-2-git-send-email-mmarek@suse.cz> <1354616321-13520-1-git-send-email-mmarek@suse.cz> <22396.1354645048@warthog.procyon.org.uk> <87hao1gyiv.fsf@rustcorp.com.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Wed, 05 Dec 2012 10:28:48 +1030, Rusty Russell wrote: > > David Howells writes: > > > Michal Marek wrote: > > > >> Using the asm .incbin statement in C sources breaks any gcc wrapper which > >> assumes that preprocessed C source is self-contained. Use a separate .S > >> file to include the siging key and certificate. > > > > I was trying to avoid that as .S files generally don't crop up in generic > > code and the format of the assembly varies with the arch. However, you don't > > seem to have anything that should cause a problem - so: > > > > Acked-by: David Howells > > GLOBAL() is defined in x86 only, AFAICT. > > Plus, we now have a patch from James (CC:d) to prepend > CONFIG_SYMBOL_PREFIX to these as requird. Yes, I noticed both things yesterday. > > I think this will have to be done more carefully... How about the revised patch below? thanks, Takashi --- From: Takashi Iwai Subject: [PATCH v2] MODSIGN: Avoid using .incbin in C source Using the asm .incbin statement in C sources breaks any gcc wrapper which assumes that preprocessed C source is self-contained. Use a separate .S file to include the siging key and certificate. Tested-by: Michal Marek Signed-off-by: Takashi Iwai --- kernel/Makefile | 4 ++-- kernel/modsign_certificate.S | 18 ++++++++++++++++++ kernel/modsign_pubkey.c | 6 ------ 3 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 kernel/modsign_certificate.S diff --git a/kernel/Makefile b/kernel/Makefile index 86e3285..0bd9d43 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -54,7 +54,7 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o obj-$(CONFIG_PROVE_LOCKING) += spinlock.o obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o +obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o modsign_certificate.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o obj-$(CONFIG_KEXEC) += kexec.o @@ -139,7 +139,7 @@ ifeq ($(CONFIG_MODULE_SIG),y) extra_certificates: touch $@ -kernel/modsign_pubkey.o: signing_key.x509 extra_certificates +kernel/modsign_certificate.o: signing_key.x509 extra_certificates ############################################################################### # diff --git a/kernel/modsign_certificate.S b/kernel/modsign_certificate.S new file mode 100644 index 0000000..695d4e3 --- /dev/null +++ b/kernel/modsign_certificate.S @@ -0,0 +1,18 @@ +#ifndef SYMBOL_PREFIX +#define ASM_SYMBOL(sym) sym +#else +#define PASTE2(x,y) x##y +#define PASTE(x,y) PASTE2(x,y) +#define ASM_SYMBOL(sym) PASTE(SYMBOL_PREFIX, sym) +#endif + +#define GLOBAL(name) \ + .globl ASM_SYMBOL(name); \ + ASM_SYMBOL(name): + + .section ".init.data","aw" + +GLOBAL(modsign_certificate_list) + .incbin "signing_key.x509" + .incbin "extra_certificates" +GLOBAL(modsign_certificate_list_end) diff --git a/kernel/modsign_pubkey.c b/kernel/modsign_pubkey.c index 767e559..045504f 100644 --- a/kernel/modsign_pubkey.c +++ b/kernel/modsign_pubkey.c @@ -20,12 +20,6 @@ struct key *modsign_keyring; extern __initdata const u8 modsign_certificate_list[]; extern __initdata const u8 modsign_certificate_list_end[]; -asm(".section .init.data,\"aw\"\n" - SYMBOL_PREFIX "modsign_certificate_list:\n" - ".incbin \"signing_key.x509\"\n" - ".incbin \"extra_certificates\"\n" - SYMBOL_PREFIX "modsign_certificate_list_end:" - ); /* * We need to make sure ccache doesn't cache the .o file as it doesn't notice -- 1.8.0.1