| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Sami Tolvanen <samitolvanen@google.com> |
| Date: Wed, 2 May 2018 11:05:53 -0700 |
| Subject: 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: Id894b77112801c00a44bcc539cc3882b5f72b251 |
| (am from https://lore.kernel.org/patchwork/patch/1149061/) |
| Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> |
| Reviewed-by: Kees Cook <keescook@chromium.org> |
| Reviewed-by: Mark Rutland <mark.rutland@arm.com> |
| Signed-off-by: Sami Tolvanen <samitolvanen@google.com> |
| --- |
| arch/arm64/kernel/vdso/Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| 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 |
