diff options
| author | Laura Abbott <labbott@redhat.com> | 2017-02-06 16:31:58 -0800 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-02-07 12:32:52 -0800 |
| commit | 0f5bf6d0afe4be6e1391908ff2d6dc9730e91550 (patch) | |
| tree | 12c10057175483fe3f3720b37b7ffb5b73241b2a /arch/arm/kernel/patch.c | |
| parent | ad21fc4faa2a1f919bac1073b885df9310dbc581 (diff) | |
| download | op-kernel-dev-0f5bf6d0afe4be6e1391908ff2d6dc9730e91550.zip op-kernel-dev-0f5bf6d0afe4be6e1391908ff2d6dc9730e91550.tar.gz | |
arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX
Both of these options are poorly named. The features they provide are
necessary for system security and should not be considered debug only.
Change the names to CONFIG_STRICT_KERNEL_RWX and
CONFIG_STRICT_MODULE_RWX to better describe what these options do.
Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Jessica Yu <jeyu@redhat.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'arch/arm/kernel/patch.c')
| -rw-r--r-- | arch/arm/kernel/patch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c index 69bda1a..020560b 100644 --- a/arch/arm/kernel/patch.c +++ b/arch/arm/kernel/patch.c @@ -24,9 +24,9 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags) bool module = !core_kernel_text(uintaddr); struct page *page; - if (module && IS_ENABLED(CONFIG_DEBUG_SET_MODULE_RONX)) + if (module && IS_ENABLED(CONFIG_STRICT_MODULE_RWX)) page = vmalloc_to_page(addr); - else if (!module && IS_ENABLED(CONFIG_DEBUG_RODATA)) + else if (!module && IS_ENABLED(CONFIG_STRICT_KERNEL_RWX)) page = virt_to_page(addr); else return addr; |
