kcov: don't instrument with UBSAN
PATCH 1/1 kcov: don't instrument with UBSAN
Both KCOV and UBSAN use compiler instrumentation. If UBSAN detects a bug in KCOV, it may cause infinite recursion via printk and other common functions. We already don't instrument KCOV with KASAN/KCSAN for this reason, don't instrument it with UBSAN as well.
As a side effect this also resolves the following gcc warning:
conflicting types for built-in function '__sanitizer_cov_trace_switch'; expected 'void(long unsigned int, void *)' [-Wbuiltin-declaration-mismatch]
It's only reported when kcov.c is compiled with any of the sanitizers enabled. Size of the arguments is correct, it's just that gcc uses 'long' on 64-bit arches and 'long long' on 32-bit arches, while kernel type is always 'long long'.
--- kernel/Makefile | 3 +++ 1 file changed, 3 insertions(+)
kernel/Makefile +3 -0
@@ -34,8 +34,11 @@ KCOV_INSTRUMENT_extable.o := n KCOV_INSTRUMENT_stacktrace.o := n # Don't self-instrument. KCOV_INSTRUMENT_kcov.o := n +# If sanitizers detect any issues in kcov, it may lead to recursion +# via printk, etc. KASAN_SANITIZE_kcov.o := n KCSAN_SANITIZE_kcov.o := n +UBSAN_SANITIZE_kcov.o := n CFLAGS_kcov.o := $(call cc-option, -fno-conserve-stack) -fno-stack-protector obj-y += sched/
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
Quoted 11 lines · Dmitry Vyukov
Both KCOV and UBSAN use compiler instrumentation. If UBSAN detects a bug in KCOV, it may cause infinite recursion via printk and other common functions. We already don't instrument KCOV with KASAN/KCSAN for this reason, don't instrument it with UBSAN as well.
As a side effect this also resolves the following gcc warning:
conflicting types for built-in function '
__sanitizer_cov_trace_switch'; expected 'void(long unsigned int, void *)' [-Wbuiltin-declaration-mismatch]
Quoted 8 lines
It's only reported when
kcov.cis compiled with any of the sanitizers enabled. Size of the arguments is correct, it's just that gcc uses 'long' on 64-bit arches and 'long long' on 32-bit arches, while kernel type is always 'long long'.Reported-by Stephen Rothwell <[email protected]>Suggested-by Marco Elver <[email protected]>Signed-off-by Dmitry Vyukov <[email protected]>
Quoted 23 lines
--- kernel/Makefile | 3 +++ 1 file changed, 3 insertions(+)kernel/Makefile +3
-1@@ -34,8 +34,11 @@ KCOV_INSTRUMENT_extable.o := n KCOV_INSTRUMENT_stacktrace.o := n # Don't self-instrument. KCOV_INSTRUMENT_kcov.o := n +# If sanitizers detect any issues in kcov, it may lead to recursion +# via printk, etc. KASAN_SANITIZE_kcov.o := n KCSAN_SANITIZE_kcov.o := n +UBSAN_SANITIZE_kcov.o := n CFLAGS_kcov.o := $(call cc-option, -fno-conserve-stack) -fno-stack-protector obj-y += sched/ --2.29.2.576.ga3fc446d84-goog
Quoted 40 lines · Dmitry Vyukov
Both KCOV and UBSAN use compiler instrumentation. If UBSAN detects a bug in KCOV, it may cause infinite recursion via printk and other common functions. We already don't instrument KCOV with KASAN/KCSAN for this reason, don't instrument it with UBSAN as well.
As a side effect this also resolves the following gcc warning:
conflicting types for built-in function '
__sanitizer_cov_trace_switch'; expected 'void(long unsigned int, void *)' [-Wbuiltin-declaration-mismatch]It's only reported when
kcov.cis compiled with any of the sanitizers enabled. Size of the arguments is correct, it's just that gcc uses 'long' on 64-bit arches and 'long long' on 32-bit arches, while kernel type is always 'long long'.Reported-by Stephen Rothwell <[email protected]>Suggested-by Marco Elver <[email protected]>Signed-off-by Dmitry Vyukov <[email protected]>--- kernel/Makefile | 3 +++ 1 file changed, 3 insertions(+)kernel/Makefile +3
-1@@ -34,8 +34,11 @@ KCOV_INSTRUMENT_extable.o := n KCOV_INSTRUMENT_stacktrace.o := n # Don't self-instrument. KCOV_INSTRUMENT_kcov.o := n +# If sanitizers detect any issues in kcov, it may lead to recursion +# via printk, etc. KASAN_SANITIZE_kcov.o := n KCSAN_SANITIZE_kcov.o := n +UBSAN_SANITIZE_kcov.o := n CFLAGS_kcov.o := $(call cc-option, -fno-conserve-stack) -fno-stack-protector obj-y += sched/ --
Quoted 2 lines
2.29.2.576.ga3fc446d84-goog
Quoted 10 lines · Dmitry Vyukov
Both KCOV and UBSAN use compiler instrumentation. If UBSAN detects a bug in KCOV, it may cause infinite recursion via printk and other common functions. We already don't instrument KCOV with KASAN/KCSAN for this reason, don't instrument it with UBSAN as well.
As a side effect this also resolves the following gcc warning:
conflicting types for built-in function '
__sanitizer_cov_trace_switch'; expected 'void(long unsigned int, void *)' [-Wbuiltin-declaration-mismatch]
Quoted 8 lines
It's only reported when
kcov.cis compiled with any of the sanitizers enabled. Size of the arguments is correct, it's just that gcc uses 'long' on 64-bit arches and 'long long' on 32-bit arches, while kernel type is always 'long long'.Reported-by Stephen Rothwell <[email protected]>Suggested-by Marco Elver <[email protected]>Signed-off-by Dmitry Vyukov <[email protected]>
Thanks for chasing this down!
Andrew, can you add this to the stack of ubsan patches you're carrying, please?
Signature · 1 line
Kees Cook
Hi all,
Quoted 21 lines · On Wed, 9 Dec 2020 10:54:39 -0800 Kees Cook <[email protected]> wrote:
Quoted 10 lines · Dmitry Vyukov
Both KCOV and UBSAN use compiler instrumentation. If UBSAN detects a bug in KCOV, it may cause infinite recursion via printk and other common functions. We already don't instrument KCOV with KASAN/KCSAN for this reason, don't instrument it with UBSAN as well.
As a side effect this also resolves the following gcc warning:
conflicting types for built-in function '
__sanitizer_cov_trace_switch'; expected 'void(long unsigned int, void *)' [-Wbuiltin-declaration-mismatch]Quoted 8 lines
It's only reported when
kcov.cis compiled with any of the sanitizers enabled. Size of the arguments is correct, it's just that gcc uses 'long' on 64-bit arches and 'long long' on 32-bit arches, while kernel type is always 'long long'.Reported-by Stephen Rothwell <[email protected]>Suggested-by Marco Elver <[email protected]>Signed-off-by Dmitry Vyukov <[email protected]>
Quoted 6 lines
Reviewed-by Kees Cook <[email protected]>Thanks for chasing this down!
Andrew, can you add this to the stack of ubsan patches you're carrying, please?
Added to linux-next today.
Signature · 2 lines
Cheers, Stephen Rothwell