iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init: Declare rodata_enabled and mark_rodata_ro() at all time

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

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
Christophe Leroy 2023-12-21 10:02:46 +01:00 committed by Luis Chamberlain
parent 3559ad395b
commit 398ec3e925
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/init.h
View File

@ -168,12 +168,8 @@ extern initcall_entry_t __initcall_end[];
extern struct file_system_type rootfs_fs_type; extern struct file_system_type rootfs_fs_type;
#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX)
extern bool rodata_enabled; extern bool rodata_enabled;
#endif
#ifdef CONFIG_STRICT_KERNEL_RWX
void mark_rodata_ro(void); void mark_rodata_ro(void);
#endif
extern void (*late_time_init)(void); extern void (*late_time_init)(void);

21
init/main.c
View File

@ -1396,10 +1396,9 @@ static int __init set_debug_rodata(char *str)
early_param("rodata", set_debug_rodata); early_param("rodata", set_debug_rodata);
#endif #endif
#ifdef CONFIG_STRICT_KERNEL_RWX
static void mark_readonly(void) 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 * load_module() results in W+X mappings, which are cleaned
* up with call_rcu(). Let's make sure that queued work is * up with call_rcu(). Let's make sure that queued work is
@ -1409,20 +1408,14 @@ static void mark_readonly(void)
rcu_barrier(); rcu_barrier();
mark_rodata_ro(); mark_rodata_ro();
rodata_test(); rodata_test();
} else } else if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX)) {
pr_info("Kernel memory protection disabled.\n"); pr_info("Kernel memory protection disabled.\n");
} else if (IS_ENABLED(CONFIG_ARCH_HAS_STRICT_KERNEL_RWX)) {
pr_warn("Kernel memory protection not selected by kernel config.\n");
} else {
pr_warn("This architecture does not have kernel memory protection.\n");
}
} }
#elif defined(CONFIG_ARCH_HAS_STRICT_KERNEL_RWX)
static inline void mark_readonly(void)
{
pr_warn("Kernel memory protection not selected by kernel config.\n");
}
#else
static inline void mark_readonly(void)
{
pr_warn("This architecture does not have kernel memory protection.\n");
}
#endif
void __weak free_initmem(void) void __weak free_initmem(void)
{ {