From: John Haxby <john.haxby@oracle.com>
Date: Tue, 5 Feb 2019 17:44:54 +0000 (+0000)
Subject: Enable RANDOMIZE_BASE
X-Git-Tag: v4.1.12-124.31.3~280
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=84e0abceac3ef924f67657f4423521485f306474;p=users%2Fjedix%2Flinux-maple.git

Enable RANDOMIZE_BASE

UEK4 needs at least some degree of KASLR; to that end enable
RANDOMIZE_BASE and set RANDOMIZE_BASE_MAX_OFFSET to its default value
(0x40000000).

Orabug: 29305587

Signed-off-by: John Haxby <john.haxby@oracle.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/uek-rpm/ol6/config-x86_64 b/uek-rpm/ol6/config-x86_64
index 9de2f6efbb861..94213d64ca2ec 100644
--- a/uek-rpm/ol6/config-x86_64
+++ b/uek-rpm/ol6/config-x86_64
@@ -595,7 +595,8 @@ CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
-# CONFIG_RANDOMIZE_BASE is not set
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
diff --git a/uek-rpm/ol6/config-x86_64-debug b/uek-rpm/ol6/config-x86_64-debug
index 3e2d2457392f8..70143276b6cce 100644
--- a/uek-rpm/ol6/config-x86_64-debug
+++ b/uek-rpm/ol6/config-x86_64-debug
@@ -578,7 +578,8 @@ CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
-# CONFIG_RANDOMIZE_BASE is not set
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
diff --git a/uek-rpm/ol7/config-x86_64 b/uek-rpm/ol7/config-x86_64
index 3b74ee20bae39..c09ad8a1f4e94 100644
--- a/uek-rpm/ol7/config-x86_64
+++ b/uek-rpm/ol7/config-x86_64
@@ -595,7 +595,8 @@ CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
-# CONFIG_RANDOMIZE_BASE is not set
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_BOOTPARAM_HOTPLUG_CPU0=y
diff --git a/uek-rpm/ol7/config-x86_64-debug b/uek-rpm/ol7/config-x86_64-debug
index 2cd9691102d4a..877aa3cf302e2 100644
--- a/uek-rpm/ol7/config-x86_64-debug
+++ b/uek-rpm/ol7/config-x86_64-debug
@@ -579,7 +579,8 @@ CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
-# CONFIG_RANDOMIZE_BASE is not set
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_BOOTPARAM_HOTPLUG_CPU0=y