linux-kernel - [PATCH] arm64: kaslr: Fix build failure with CONFIG_ARCH

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20200213042457.17842-1-samuel@sholland.org>
Date:   Wed, 12 Feb 2020 22:24:57 -0600
From:   Samuel Holland <samuel@...lland.org>
To:     Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will@...nel.org>, Mark Brown <broonie@...nel.org>
Cc:     linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
        Samuel Holland <samuel@...lland.org>
Subject: [PATCH] arm64: kaslr: Fix build failure with CONFIG_ARCH_RANDOM=n

Commit 2e8e1ea88cbc ("arm64: Use v8.5-RNG entropy for KASLR seed")
introduced unconditional use of arm64-specific functions exported by
asm/archrandom.h. With CONFIG_ARCH_RANDOM=y, this header is transitively
included through linux/random.h. However, with CONFIG_ARCH_RANDOM=n,
this header is not included, and the kernel fails to build.

Explicitly include asm/archrandom.h so __early_cpu_has_rndr() and
__arm64_rndr() are always available, even when they are just stubs.

Fixes: 2e8e1ea88cbc ("arm64: Use v8.5-RNG entropy for KASLR seed")
Signed-off-by: Samuel Holland <samuel@...lland.org>
---
 arch/arm64/kernel/kaslr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c
index 53b8a4ee64ff..91a83104c6e8 100644
--- a/arch/arm64/kernel/kaslr.c
+++ b/arch/arm64/kernel/kaslr.c
@@ -11,6 +11,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>

+#include <asm/archrandom.h>
 #include <asm/cacheflush.h>
 #include <asm/fixmap.h>
 #include <asm/kernel-pgtable.h>
-- 
2.24.1