diff options
| author | Laura Abbott <labbott@redhat.com> | 2017-02-07 01:31:58 +0100 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-02-07 21:32:52 +0100 |
| commit | 0f5bf6d0afe4be6e1391908ff2d6dc9730e91550 (patch) | |
| tree | 12c10057175483fe3f3720b37b7ffb5b73241b2a /arch/parisc | |
| parent | arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common (diff) | |
| download | linux-0f5bf6d0afe4be6e1391908ff2d6dc9730e91550.tar.xz linux-0f5bf6d0afe4be6e1391908ff2d6dc9730e91550.zip | |
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/parisc')
| -rw-r--r-- | arch/parisc/configs/712_defconfig | 1 | ||||
| -rw-r--r-- | arch/parisc/configs/c3000_defconfig | 1 | ||||
| -rw-r--r-- | arch/parisc/mm/init.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig index db8f56bf3883..143d02652792 100644 --- a/arch/parisc/configs/712_defconfig +++ b/arch/parisc/configs/712_defconfig @@ -182,7 +182,6 @@ CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_MUTEXES=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_RODATA=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_HMAC=y diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index fb92b8920785..8e8f0e34f817 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig @@ -166,7 +166,6 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_RODATA=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_MD5=m diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index e02ada312be8..a055e5b6b380 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -545,7 +545,7 @@ void free_initmem(void) } -#ifdef CONFIG_DEBUG_RODATA +#ifdef CONFIG_STRICT_KERNEL_RWX void mark_rodata_ro(void) { /* rodata memory was already mapped with KERNEL_RO access rights by |