Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 919aa45e authored by Takashi Iwai's avatar Takashi Iwai Committed by Rusty Russell
Browse files

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.

[ This means we no longer need SYMBOL_PREFIX which is defined in kernel.h
  from cbdbf2ab, so I removed it -- RR ]

Tested-by: default avatarMichal Marek <mmarek@suse.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarJames Hogan <james.hogan@imgtec.com>
parent 82fab442

kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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



###############################################################################

#

kernel/modsign_certificate.S

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* SYMBOL_PREFIX defined on commandline from CONFIG_SYMBOL_PREFIX */

#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)

kernel/modsign_pubkey.c

+0 −6
Original line number Diff line number Diff line
@@ -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