summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2019-08-16 13:09:54 -0700
committerSami Tolvanen <samitolvanen@google.com>2019-12-13 07:14:21 -0800
commit06304418de5d9b355b7ed31b698a20cb3fe0d5bc (patch)
treeb7954e33fcb1da40fb48aa18301215f1a2f9874f /arch
parentfb7982c4f4b6825290309953c05de85db42950ae (diff)
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: Ic93a7333920830f0934c8dd5530082f0ca941777 (am from https://lore.kernel.org/patchwork/patch/1149062/) Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kvm/hyp/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index bfa00a9e161d..e41392ce3808 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -31,3 +31,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))