From 4756bebcd2875c68105882d0f5bfc01fea021b04 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Fri, 16 Aug 2019 13:09:54 -0700 Subject: [PATCH] FROMLIST: arm64: disable SCS for hypervisor code Filter out CC_FLAGS_SCS for code that runs at a different exception level. Bug: 145210207 Change-Id: I834424fba7aa18598b618891814327ecc2841c6e (am from https://lore.kernel.org/patchwork/patch/1149062/) Suggested-by: Steven Rostedt (VMware) Reviewed-by: Kees Cook Reviewed-by: Mark Rutland Signed-off-by: Sami Tolvanen --- arch/arm64/kvm/hyp/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index ea710f674cb6..17ea3da325e9 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -28,3 +28,6 @@ GCOV_PROFILE := n KASAN_SANITIZE := n UBSAN_SANITIZE := n KCOV_INSTRUMENT := n + +# remove the SCS flags from all objects in this directory +KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS))