summaryrefslogtreecommitdiffstats
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2019-03-07 19:54:25 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-19 08:20:56 +0200
commit8f6f2ee1d75c48c7e30f7771cfb2e4bdc2f30f44 (patch)
tree0265cc3f07da613e1ed1ccfb98cd0b3d5c37181e /kernel/Makefile
parentc3b6d988a2f7bda1bcd18d84f1a57e4a16f16656 (diff)
downloadlinux-stable-8f6f2ee1d75c48c7e30f7771cfb2e4bdc2f30f44.tar.gz
linux-stable-8f6f2ee1d75c48c7e30f7771cfb2e4bdc2f30f44.tar.bz2
linux-stable-8f6f2ee1d75c48c7e30f7771cfb2e4bdc2f30f44.zip
x86/uaccess, kcov: Disable stack protector
[ Upstream commit 40ea97290b08be2e038b31cbb33097d1145e8169 ] 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: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 172d151d429c..3085141c055c 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)