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

Commit 404f6aac authored by Kees Cook's avatar Kees Cook Committed by Ingo Molnar
Browse files

x86: Apply more __ro_after_init and const 



Guided by grsecurity's analogous __read_only markings in arch/x86,
this applies several uses of __ro_after_init to structures that are
only updated during __init, and const for some structures that are
never updated.  Additionally extends __init markings to some functions
that are only used during __init, and cleans up some missing C99 style
static initializers.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brad Spengler <spender@grsecurity.net>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David Brown <david.brown@linaro.org>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Emese Revfy <re.emese@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathias Krause <minipli@googlemail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: PaX Team <pageexec@freemail.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kernel-hardening@lists.openwall.com
Link: http://lkml.kernel.org/r/20160808232906.GA29731@www.outflux.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fb754f95

arch/x86/include/asm/desc.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in 


extern struct desc_ptr idt_descr;

extern gate_desc idt_table[];

extern struct desc_ptr debug_idt_descr;

extern const struct desc_ptr debug_idt_descr;

extern gate_desc debug_idt_table[];



struct gdt_page {

arch/x86/include/asm/fpu/xstate.h

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
extern u64 xfeatures_mask;

extern u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];



extern void update_regset_xstate_info(unsigned int size, u64 xstate_mask);

extern void __init update_regset_xstate_info(unsigned int size,

					     u64 xstate_mask);



void fpu__xstate_clear_all_cpu_caps(void);

void *get_xsave_addr(struct xregs_state *xsave, int xstate);

arch/x86/kernel/apic/apic_flat_64.c

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
static struct apic apic_physflat;

static struct apic apic_flat;



struct apic __read_mostly *apic = &apic_flat;

struct apic *apic __ro_after_init = &apic_flat;

EXPORT_SYMBOL_GPL(apic);



static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
@@ -154,7 +154,7 @@ static int flat_probe(void) 
	return 1;

}



static struct apic apic_flat =  {

static struct apic apic_flat __ro_after_init = {

	.name				= "flat",

	.probe				= flat_probe,

	.acpi_madt_oem_check		= flat_acpi_madt_oem_check,
@@ -248,7 +248,7 @@ static int physflat_probe(void) 
	return 0;

}



static struct apic apic_physflat =  {

static struct apic apic_physflat __ro_after_init = {



	.name				= "physical flat",

	.probe				= physflat_probe,

arch/x86/kernel/apic/apic_noop.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v) 
	WARN_ON_ONCE(boot_cpu_has(X86_FEATURE_APIC) && !disable_apic);

}



struct apic apic_noop = {

struct apic apic_noop __ro_after_init = {

	.name				= "noop",

	.probe				= noop_probe,

	.acpi_madt_oem_check		= NULL,

arch/x86/kernel/apic/bigsmp_32.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int probe_bigsmp(void) 
	return dmi_bigsmp;

}



static struct apic apic_bigsmp = {

static struct apic apic_bigsmp __ro_after_init = {



	.name				= "bigsmp",

	.probe				= probe_bigsmp,