diff options
| author | Marco Elver <elver@google.com> | 2019-11-19 19:57:42 +0100 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2020-01-07 16:47:23 +0100 |
| commit | d47715f50e833f12c5e829ce9dcc4a65104fa74f (patch) | |
| tree | 847891d16f42b0ee9839cccc54143e27dd0a65ec | |
| parent | kcsan: Improve various small stylistic details (diff) | |
| download | linux-d47715f50e833f12c5e829ce9dcc4a65104fa74f.tar.xz linux-d47715f50e833f12c5e829ce9dcc4a65104fa74f.zip | |
kcsan, ubsan: Make KCSAN+UBSAN work together
Context:
http://lkml.kernel.org/r/fb7e25d8-aba4-3dcf-7761-cb7ecb3ebb71@infradead.org
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Marco Elver <elver@google.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
| -rw-r--r-- | kernel/kcsan/Makefile | 1 | ||||
| -rw-r--r-- | lib/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/kernel/kcsan/Makefile b/kernel/kcsan/Makefile index dd15b62ec0b5..df6b7799e492 100644 --- a/kernel/kcsan/Makefile +++ b/kernel/kcsan/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 KCSAN_SANITIZE := n KCOV_INSTRUMENT := n +UBSAN_SANITIZE := n CFLAGS_REMOVE_core.o = $(CC_FLAGS_FTRACE) diff --git a/lib/Makefile b/lib/Makefile index 778ab704e3ad..9d5bda950f5f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -279,6 +279,7 @@ obj-$(CONFIG_UBSAN) += ubsan.o UBSAN_SANITIZE_ubsan.o := n KASAN_SANITIZE_ubsan.o := n +KCSAN_SANITIZE_ubsan.o := n CFLAGS_ubsan.o := $(call cc-option, -fno-stack-protector) $(DISABLE_STACKLEAK_PLUGIN) obj-$(CONFIG_SBITMAP) += sbitmap.o |