diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-13 20:40:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-13 20:40:58 +0100 |
| commit | ce0c1c92656e3ea3840c4a5c748aa352285cae9c (patch) | |
| tree | 8e8c141c94ecc99d3bcaa38b21b0241a201ea9f5 /init | |
| parent | Merge tag 'efi-next-for-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | module: Don't ignore errors from set_memory_XX() (diff) | |
| download | linux-ce0c1c92656e3ea3840c4a5c748aa352285cae9c.tar.xz linux-ce0c1c92656e3ea3840c4a5c748aa352285cae9c.zip | |
Merge tag 'modules-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
Pull modules updates from Luis Chamberlain:
"Christophe Leroy did most of the work on this release, first with a
few cleanups on CONFIG_STRICT_KERNEL_RWX and ending with error
handling for when set_memory_XX() can fail.
This is part of a larger effort to clean up all these callers which
can fail, modules is just part of it"
* tag 'modules-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
module: Don't ignore errors from set_memory_XX()
lib/test_kmod: fix kernel-doc warnings
powerpc: Simplify strict_kernel_rwx_enabled()
modules: Remove #ifdef CONFIG_STRICT_MODULE_RWX around rodata_enabled
init: Declare rodata_enabled and mark_rodata_ro() at all time
module: Change module_enable_{nx/x/ro}() to more explicit names
module: Use set_memory_rox()
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/init/main.c b/init/main.c index 7dce08198b13..d002f30f7f24 100644 --- a/init/main.c +++ b/init/main.c @@ -1401,10 +1401,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 @@ -1414,20 +1413,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"); + } 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) { |