From f49ee5bd17d1cd98f887cb9822ce19d420b4db80 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Wed, 2 May 2018 11:05:53 -0700 Subject: [PATCH] BACKPORT: FROMLIST: arm64: vdso: disable Shadow Call Stack Shadow stacks are only available in the kernel, so disable SCS instrumentation for the vDSO. Bug: 145210207 Change-Id: I6e01b2c7788ba52d3b754b1fbd5bfb908b45741b (am from https://lore.kernel.org/patchwork/patch/1149061/) Reviewed-by: Nick Desaulniers Reviewed-by: Kees Cook Reviewed-by: Mark Rutland Signed-off-by: Sami Tolvanen --- arch/arm64/kernel/vdso/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index ef3f9d9d4062..f7620d315bc5 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -17,6 +17,8 @@ ccflags-y += -nostdlib -Wl,-soname=linux-vdso.so.1 \ $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) ccflags-y += $(DISABLE_LTO) +CFLAGS_REMOVE_vgettimeofday.o += $(CC_FLAGS_SCS) + # Disable gcov profiling for VDSO code GCOV_PROFILE := n