diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 20:56:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 20:56:45 -0500 |
commit | 7bb033829ef3ecfc491c0ed0197966e8f197fbdc (patch) | |
tree | 9bf410d9726a351970e83bf5f189b5f10035d6f6 /init/main.c | |
parent | 4a0853bf88c8f56e1c01eda02e6625aed09d55d9 (diff) | |
parent | 0f5bf6d0afe4be6e1391908ff2d6dc9730e91550 (diff) |
Merge tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull rodata updates from Kees Cook:
"This renames the (now inaccurate) DEBUG_RODATA and related
SET_MODULE_RONX configs to the more sensible STRICT_KERNEL_RWX and
STRICT_MODULE_RWX"
* tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX
arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 6d98664e843b..c8a00f0f10ff 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -924,7 +924,7 @@ static int try_to_run_init_process(const char *init_filename) | |||
924 | 924 | ||
925 | static noinline void __init kernel_init_freeable(void); | 925 | static noinline void __init kernel_init_freeable(void); |
926 | 926 | ||
927 | #if defined(CONFIG_DEBUG_RODATA) || defined(CONFIG_DEBUG_SET_MODULE_RONX) | 927 | #if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX) |
928 | bool rodata_enabled __ro_after_init = true; | 928 | bool rodata_enabled __ro_after_init = true; |
929 | static int __init set_debug_rodata(char *str) | 929 | static int __init set_debug_rodata(char *str) |
930 | { | 930 | { |
@@ -933,7 +933,7 @@ static int __init set_debug_rodata(char *str) | |||
933 | __setup("rodata=", set_debug_rodata); | 933 | __setup("rodata=", set_debug_rodata); |
934 | #endif | 934 | #endif |
935 | 935 | ||
936 | #ifdef CONFIG_DEBUG_RODATA | 936 | #ifdef CONFIG_STRICT_KERNEL_RWX |
937 | static void mark_readonly(void) | 937 | static void mark_readonly(void) |
938 | { | 938 | { |
939 | if (rodata_enabled) | 939 | if (rodata_enabled) |