[v10,11/15] x86/boot: allow FG-KASLR to be selected

Commit Message

Alexander Lobakin Feb. 9, 2022, 6:57 p.m. UTC

Now that the kernel has full support of FG-KASLR from both core and
x86 code, allow FG-KASLR to be enabled for x86_64 if the "regular"
KASLR is also turned on.

Signed-off-by: Alexander Lobakin <[e-mail]>
---
 arch/x86/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f6bb48d41349..d5442107a915 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -105,6 +105,7 @@  config X86
 	select ARCH_SUPPORTS_ASM_FUNCTION_SECTIONS
 	select ARCH_SUPPORTS_ATOMIC_RMW
 	select ARCH_SUPPORTS_DEBUG_PAGEALLOC
+	select ARCH_SUPPORTS_FG_KASLR		if X86_64 && RANDOMIZE_BASE
 	select ARCH_SUPPORTS_PAGE_TABLE_CHECK	if X86_64
 	select ARCH_SUPPORTS_NUMA_BALANCING	if X86_64
 	select ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP	if NR_CPUS <= 4096