From 9e549f8843837fe3c43e2e77791aa06402aaab5f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 9 Oct 2017 14:29:04 +0100 Subject: [PATCH] Enable KASLR on aarch64 --- baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE | 2 +- baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL | 1 + baseconfig/arm/arm64/CONFIG_RELOCATABLE | 2 +- kernel-aarch64-debug.config | 4 ++-- kernel-aarch64.config | 4 ++-- kernel.spec | 3 +++ 6 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL diff --git a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE b/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE index 097a2d3e7..20610a95a 100644 --- a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE +++ b/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE @@ -1 +1 @@ -# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_BASE=y diff --git a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL b/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL new file mode 100644 index 000000000..7645a371e --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL @@ -0,0 +1 @@ +CONFIG_RANDOMIZE_MODULE_REGION_FULL=y diff --git a/baseconfig/arm/arm64/CONFIG_RELOCATABLE b/baseconfig/arm/arm64/CONFIG_RELOCATABLE index ff7e13901..36808edb3 100644 --- a/baseconfig/arm/arm64/CONFIG_RELOCATABLE +++ b/baseconfig/arm/arm64/CONFIG_RELOCATABLE @@ -1 +1 @@ -# CONFIG_RELOCATABLE is not set +CONFIG_RELOCATABLE=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index f4219bf3c..d11e635c5 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4303,7 +4303,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RADIO_ZOLTRIX=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set -# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y CONFIG_RAS_CEC=y CONFIG_RASPBERRYPI_FIRMWARE=y @@ -4406,8 +4406,8 @@ CONFIG_REISERFS_FS_SECURITY=y CONFIG_REISERFS_FS_XATTR=y CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y -# CONFIG_RELOCATABLE is not set # CONFIG_RELOCATABLE_TEST is not set +CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RESET_ATTACK_MITIGATION=y CONFIG_RESET_CONTROLLER=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 27db50b0c..de5e41da7 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4281,7 +4281,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RADIO_ZOLTRIX=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set -# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y CONFIG_RAS_CEC=y CONFIG_RASPBERRYPI_FIRMWARE=y @@ -4384,8 +4384,8 @@ CONFIG_REISERFS_FS_SECURITY=y CONFIG_REISERFS_FS_XATTR=y CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y -# CONFIG_RELOCATABLE is not set # CONFIG_RELOCATABLE_TEST is not set +CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RESET_ATTACK_MITIGATION=y CONFIG_RESET_CONTROLLER=y diff --git a/kernel.spec b/kernel.spec index c0bf1f311..1623fb76f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2197,6 +2197,9 @@ fi # # %changelog +* Mon Oct 9 2017 Peter Robinson +- Enable KASLR on aarch64 + * Fri Oct 06 2017 Justin M. Forbes - 4.14.0-0.rc3.git4.1 - Linux v4.14-rc3-394-gbf2db0b9f580