Commit 398ec3e9 authored by Christophe Leroy's avatar Christophe Leroy Committed by Luis Chamberlain
Browse files

init: Declare rodata_enabled and mark_rodata_ro() at all time 



Declaring rodata_enabled and mark_rodata_ro() at all time
helps removing related #ifdefery in C files.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 3559ad39

include/linux/init.h

+0 −4
Original line number Diff line number Diff line
@@ -168,12 +168,8 @@ extern initcall_entry_t __initcall_end[]; 


extern struct file_system_type rootfs_fs_type;



#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX)

extern bool rodata_enabled;

#endif

#ifdef CONFIG_STRICT_KERNEL_RWX

void mark_rodata_ro(void);

#endif



extern void (*late_time_init)(void);

init/main.c

+7 −14
Original line number Diff line number Diff line
@@ -1396,10 +1396,9 @@ static int __init set_debug_rodata(char *str) 
early_param("rodata", set_debug_rodata);

#endif



#ifdef CONFIG_STRICT_KERNEL_RWX

static void mark_readonly(void)

{

	if (rodata_enabled) {

	if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) && rodata_enabled) {

		/*

		 * load_module() results in W+X mappings, which are cleaned

		 * up with call_rcu().  Let's make sure that queued work is
@@ -1409,20 +1408,14 @@ static void mark_readonly(void) 
		rcu_barrier();

		mark_rodata_ro();

		rodata_test();

	} else

	} else if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX)) {

		pr_info("Kernel memory protection disabled.\n");

}

#elif defined(CONFIG_ARCH_HAS_STRICT_KERNEL_RWX)

static inline void mark_readonly(void)

{

	} else if (IS_ENABLED(CONFIG_ARCH_HAS_STRICT_KERNEL_RWX)) {

		pr_warn("Kernel memory protection not selected by kernel config.\n");

}

#else

static inline void mark_readonly(void)

{

	} else {

		pr_warn("This architecture does not have kernel memory protection.\n");

	}

#endif

}



void __weak free_initmem(void)

{