Author: Sami Tolvanen Date: 2022-11-22T18:20:04Z New Revision: 5a3d6ce956c44384920557b455b4db2bb0ab2fad
URL: https://github.com/llvm/llvm-project/commit/5a3d6ce956c44384920557b455b4db2bb0ab2fad DIFF: https://github.com/llvm/llvm-project/commit/5a3d6ce956c44384920557b455b4db2bb0ab2fad.diff LOG: [Clang][Driver] Add KCFI to SupportsCoverage Allow `-fsanitize=kcfi` to be enabled with `-fsanitize-coverage=` modes such as `trace-{pc,cmp}`. Link: https://github.com/ClangBuiltLinux/linux/issues/1743 Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D138458 Added: Modified: clang/lib/Driver/SanitizerArgs.cpp clang/test/CodeGen/sanitize-coverage.c clang/test/Driver/fsanitize-coverage.c Removed: ################################################################################ diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index e88cfaed1c4e8..af27dbc92c8e6 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -53,7 +53,7 @@ static const SanitizerMask SupportsCoverage = SanitizerKind::DataFlow | SanitizerKind::Fuzzer | SanitizerKind::FuzzerNoLink | SanitizerKind::FloatDivideByZero | SanitizerKind::SafeStack | SanitizerKind::ShadowCallStack | - SanitizerKind::Thread | SanitizerKind::ObjCCast; + SanitizerKind::Thread | SanitizerKind::ObjCCast | SanitizerKind::KCFI; static const SanitizerMask RecoverableByDefault = SanitizerKind::Undefined | SanitizerKind::Integer | SanitizerKind::ImplicitConversion | SanitizerKind::Nullability | diff --git a/clang/test/CodeGen/sanitize-coverage.c b/clang/test/CodeGen/sanitize-coverage.c index 984076fed0ce4..cb1ed939d4a93 100644 --- a/clang/test/CodeGen/sanitize-coverage.c +++ b/clang/test/CodeGen/sanitize-coverage.c @@ -4,8 +4,10 @@ // RUN: %clang %s -target x86_64-unknown-linux-gnu -emit-llvm -S -fsanitize=memory -fsanitize-coverage=trace-pc,trace-cmp -o - | FileCheck %s --check-prefixes=CHECK,MSAN // RUN: %clang %s -target x86_64-unknown-linux-gnu -emit-llvm -S -fsanitize=thread -fsanitize-coverage=trace-pc,trace-cmp -o - | FileCheck %s --check-prefixes=CHECK,TSAN // RUN: %clang %s -target x86_64-unknown-linux-gnu -emit-llvm -S -fsanitize=undefined -fsanitize-coverage=trace-pc,trace-cmp -o - | FileCheck %s --check-prefixes=CHECK,UBSAN +// RUN: %clang %s -target x86_64-unknown-linux-gnu -emit-llvm -S -fsanitize=kcfi -fsanitize-coverage=trace-pc,trace-cmp -o - | FileCheck %s --check-prefixes=CHECK,KCFI int x[10]; +extern void (*f)(void); // CHECK-LABEL: define dso_local void @foo( void foo(int n) { @@ -18,6 +20,8 @@ void foo(int n) { // UBSAN-DAG: call void @__ubsan_handle if (n) x[n] = 42; + // KCFI-DAG: call void %[[#]]() [ "kcfi"(i32 {{.*}}) ] + f(); } static inline __attribute__((__always_inline__)) void always_inlined_fn(int n) { @@ -42,6 +46,8 @@ __attribute__((no_sanitize("coverage"))) void test_no_sanitize_coverage(int n) { // UBSAN-DAG: call void @__ubsan_handle if (n) x[n] = 42; + // KCFI-DAG: call void %[[#]]() [ "kcfi"(i32 {{.*}}) ] + f(); } @@ -80,6 +86,14 @@ void test_no_sanitize_separate(int n) { x[n] = 42; } +// CHECK-LABEL: define dso_local void @test_no_sanitize_kcfi( +__attribute__((no_sanitize("kcfi", "coverage"))) +void test_no_sanitize_kcfi(void) { + // CHECK-NOT: call void @__sanitizer_cov_trace + // KCFI-NOT: call void %[[#]]() [ "kcfi"(i32 {{.*}}) ] + f(); +} + // CHECK-LABEL: define dso_local void @test_no_sanitize_always_inline( __attribute__((no_sanitize("coverage"))) void test_no_sanitize_always_inline(int n) { diff --git a/clang/test/Driver/fsanitize-coverage.c b/clang/test/Driver/fsanitize-coverage.c index d18321d77d55f..16853ed7d04aa 100644 --- a/clang/test/Driver/fsanitize-coverage.c +++ b/clang/test/Driver/fsanitize-coverage.c @@ -16,6 +16,7 @@ // RUN: %clang -target x86_64-linux-gnu -fsanitize=bool -fsanitize-coverage=func,trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-FUNC // RUN: %clang -target x86_64-linux-gnu -fsanitize=dataflow -fsanitize-coverage=func,trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-FUNC // RUN: %clang -target x86_64-linux-gnu -fsanitize=thread -fsanitize-coverage=func,trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-FUNC +// RUN: %clang -target x86_64-linux-gnu -fsanitize=kcfi -fsanitize-coverage=func,trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-FUNC // RUN: %clang -target %itanium_abi_triple -fsanitize=float-divide-by-zero -fsanitize-coverage=func,trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-FUNC // RUN: %clang -target x86_64-linux-gnu -fsanitize-coverage=func,trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-FUNC // CHECK-SANITIZE-COVERAGE-FUNC: fsanitize-coverage-type=1 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
