aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/vdso/Makefile
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2020-04-27 09:00:14 -0700
committerWill Deacon <will@kernel.org>2020-05-15 16:35:50 +0100
commitcde5dec89e5dee5a6de12cd99fdb24651ee03146 (patch)
treebd463b1048140c61361194e6914a7a60156ece85 /arch/arm64/kernel/vdso/Makefile
parentarm64: efi: Restore register x18 if it was corrupted (diff)
downloadlinux-dev-cde5dec89e5dee5a6de12cd99fdb24651ee03146.tar.xz
linux-dev-cde5dec89e5dee5a6de12cd99fdb24651ee03146.zip
arm64: vdso: Disable Shadow Call Stack
Shadow stacks are only available in the kernel, so disable SCS instrumentation for the vDSO. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/vdso/Makefile')
-rw-r--r--arch/arm64/kernel/vdso/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
index dd2514bb1511..a87a4f11724e 100644
--- a/arch/arm64/kernel/vdso/Makefile
+++ b/arch/arm64/kernel/vdso/Makefile
@@ -25,7 +25,7 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING
VDSO_LDFLAGS := -Bsymbolic
-CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os
+CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS)
KBUILD_CFLAGS += $(DISABLE_LTO)
KASAN_SANITIZE := n
UBSAN_SANITIZE := n