From: Sami Tolvanen <samitolvanen@google.com>
Date: Mon, 27 Apr 2020 16:00:11 +0000 (-0700)
Subject: arm64: Reserve register x18 from general allocation with SCS
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=da64e9d1f8c3dad6898dac6edb39a68d3aa9ce93;p=linux.git

arm64: Reserve register x18 from general allocation with SCS

Reserve the x18 register from general allocation when SCS is enabled,
because the compiler uses the register to store the current task's
shadow stack pointer. Note that all external kernel modules must also be
compiled with -ffixed-x18 if the kernel has SCS enabled.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
---

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 85e4149cc5d5c..409a6c1be8cc9 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -81,6 +81,10 @@ endif
 
 KBUILD_CFLAGS += $(branch-prot-flags-y)
 
+ifeq ($(CONFIG_SHADOW_CALL_STACK), y)
+KBUILD_CFLAGS	+= -ffixed-x18
+endif
+
 ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)
 KBUILD_CPPFLAGS	+= -mbig-endian
 CHECKFLAGS	+= -D__AARCH64EB__