-
Notifications
You must be signed in to change notification settings - Fork 12.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[LLVM] Make sanitizers respect the disable_santizer_instrumentation a…
…ttribute. (#91732) `disable_sanitizer_instrumetation` is attached to functions that shall not be instrumented e.g. ifunc resolver because those run before everything is initialised. Some sanitizer already handles this attribute, this patch adds it to DataFLow and Coverage too.
- Loading branch information
1 parent
d6ee7e8
commit 45726c1
Showing
4 changed files
with
97 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
llvm/test/Instrumentation/DataFlowSanitizer/dataflow-disable-sanitizer-instrumentation.ll
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
|
||
; This test checks that we are not instrumenting sanitizer code. | ||
; RUN: opt < %s -passes='module(msan)' -S | FileCheck %s | ||
|
||
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" | ||
target triple = "x86_64-unknown-linux-gnu" | ||
|
||
; Function with sanitize_memory is instrumented. | ||
; Function Attrs: nounwind uwtable | ||
define void @instr_sa(ptr %a) sanitize_memory { | ||
entry: | ||
%tmp1 = load i32, ptr %a, align 4 | ||
%tmp2 = add i32 %tmp1, 1 | ||
store i32 %tmp2, ptr %a, align 4 | ||
ret void | ||
} | ||
|
||
; CHECK-LABEL: @instr_sa | ||
; CHECK: %0 = load i64, ptr @__msan_param_tls | ||
|
||
|
||
; Function with disable_sanitizer_instrumentation is not instrumented. | ||
; Function Attrs: nounwind uwtable | ||
define void @noinstr_dsi(ptr %a) disable_sanitizer_instrumentation { | ||
entry: | ||
%tmp1 = load i32, ptr %a, align 4 | ||
%tmp2 = add i32 %tmp1, 1 | ||
store i32 %tmp2, ptr %a, align 4 | ||
ret void | ||
} | ||
|
||
; CHECK-LABEL: @noinstr_dsi | ||
; CHECK-NOT: %0 = load i64, ptr @__msan_param_tls | ||
|
||
|
||
; disable_sanitizer_instrumentation takes precedence over sanitize_memory. | ||
; Function Attrs: nounwind uwtable | ||
define void @noinstr_dsi_sa(ptr %a) disable_sanitizer_instrumentation sanitize_memory { | ||
entry: | ||
%tmp1 = load i32, ptr %a, align 4 | ||
%tmp2 = add i32 %tmp1, 1 | ||
store i32 %tmp2, ptr %a, align 4 | ||
ret void | ||
} | ||
|
||
; CHECK-LABEL: @noinstr_dsi_sa | ||
; CHECK-NOT: %0 = load i64, ptr @__msan_param_tls |
46 changes: 46 additions & 0 deletions
46
llvm/test/Instrumentation/SanitizerCoverage/coverage-disable-sanitizer-instrumentation.ll
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
; This test checks that we are not instrumenting sanitizer code. | ||
; RUN: opt < %s -passes='module(sancov-module)' -sanitizer-coverage-level=3 -sanitizer-coverage-control-flow -S | FileCheck %s | ||
|
||
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" | ||
target triple = "x86_64-unknown-linux-gnu" | ||
|
||
; Function with sanitize_address is instrumented. | ||
; Function Attrs: nounwind uwtable | ||
define void @instr_sa(ptr %a) sanitize_address { | ||
entry: | ||
%tmp1 = load i32, ptr %a, align 4 | ||
%tmp2 = add i32 %tmp1, 1 | ||
store i32 %tmp2, ptr %a, align 4 | ||
ret void | ||
} | ||
|
||
; CHECK-LABEL: @instr_sa | ||
; CHECK: call void @__sanitizer_cov_trace_pc_guard( | ||
|
||
|
||
; Function with disable_sanitizer_instrumentation is not instrumented. | ||
; Function Attrs: nounwind uwtable | ||
define void @noinstr_dsi(ptr %a) disable_sanitizer_instrumentation { | ||
entry: | ||
%tmp1 = load i32, ptr %a, align 4 | ||
%tmp2 = add i32 %tmp1, 1 | ||
store i32 %tmp2, ptr %a, align 4 | ||
ret void | ||
} | ||
|
||
; CHECK-LABEL: @noinstr_dsi | ||
; CHECK-NOT: call void @__sanitizer_cov_trace_pc_guard( | ||
|
||
|
||
; disable_sanitizer_instrumentation takes precedence over sanitize_address. | ||
; Function Attrs: nounwind uwtable | ||
define void @noinstr_dsi_sa(ptr %a) disable_sanitizer_instrumentation sanitize_address { | ||
entry: | ||
%tmp1 = load i32, ptr %a, align 4 | ||
%tmp2 = add i32 %tmp1, 1 | ||
store i32 %tmp2, ptr %a, align 4 | ||
ret void | ||
} | ||
|
||
; CHECK-LABEL: @noinstr_dsi_sa | ||
; CHECK-NOT: call void @__sanitizer_cov_trace_pc_guard( |