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 /include/linux/module.h | |
| 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 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 5cddadff2c25..f4f542ed3d92 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -763,7 +763,7 @@ extern int module_sysfs_initialized; | |||
| 763 | 763 | ||
| 764 | #define __MODULE_STRING(x) __stringify(x) | 764 | #define __MODULE_STRING(x) __stringify(x) |
| 765 | 765 | ||
| 766 | #ifdef CONFIG_DEBUG_SET_MODULE_RONX | 766 | #ifdef CONFIG_STRICT_MODULE_RWX |
| 767 | extern void set_all_modules_text_rw(void); | 767 | extern void set_all_modules_text_rw(void); |
| 768 | extern void set_all_modules_text_ro(void); | 768 | extern void set_all_modules_text_ro(void); |
| 769 | extern void module_enable_ro(const struct module *mod, bool after_init); | 769 | extern void module_enable_ro(const struct module *mod, bool after_init); |