| From c291c0ceffc429ef363362d4ed0449d1dfb2c003 Mon Sep 17 00:00:00 2001 |
| From: Peter Zijlstra <peterz@infradead.org> |
| Date: Thu, 7 Mar 2019 19:54:25 +0100 |
| Subject: [PATCH] x86/uaccess, kcov: Disable stack protector |
| |
| commit 40ea97290b08be2e038b31cbb33097d1145e8169 upstream. |
| |
| New tooling noticed this mishap: |
| |
| kernel/kcov.o: warning: objtool: write_comp_data()+0x138: call to __stack_chk_fail() with UACCESS enabled |
| kernel/kcov.o: warning: objtool: __sanitizer_cov_trace_pc()+0xd9: call to __stack_chk_fail() with UACCESS enabled |
| |
| All the other instrumentation (KASAN,UBSAN) also have stack protector |
| disabled. |
| |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Cc: Borislav Petkov <bp@alien8.de> |
| Cc: Josh Poimboeuf <jpoimboe@redhat.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/kernel/Makefile b/kernel/Makefile |
| index 04bc07c2b42a..88461007bace 100644 |
| --- a/kernel/Makefile |
| +++ b/kernel/Makefile |
| @@ -30,6 +30,7 @@ KCOV_INSTRUMENT_extable.o := n |
| # Don't self-instrument. |
| KCOV_INSTRUMENT_kcov.o := n |
| KASAN_SANITIZE_kcov.o := n |
| +CFLAGS_kcov.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) |
| |
| # cond_syscall is currently not LTO compatible |
| CFLAGS_sys_ni.o = $(DISABLE_LTO) |
| -- |
| 2.7.4 |
| |