Skip to content

[cherry-pick stable/20230725][Sanitizers] Don't inline unpoisoning of small stacks when inlining d… #7894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2023
Merged

[cherry-pick stable/20230725][Sanitizers] Don't inline unpoisoning of small stacks when inlining d… #7894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3503,7 +3503,7 @@ void FunctionStackPoisoner::processStaticAllocas() {
SplitBlockAndInsertIfThenElse(Cmp, Ret, &ThenTerm, &ElseTerm);

IRBuilder<> IRBPoison(ThenTerm);
if (StackMallocIdx <= 4) {
if (ASan.MaxInlinePoisoningSize != 0 && StackMallocIdx <= 4) {
int ClassSize = kMinStackMallocSize << StackMallocIdx;
ShadowAfterReturn.resize(ClassSize / L.Granularity,
kAsanStackUseAfterReturnMagic);
Expand Down
28 changes: 28 additions & 0 deletions llvm/test/Instrumentation/AddressSanitizer/calls-only-smallfn.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
; RUN: opt < %s -passes=asan -asan-max-inline-poisoning-size=0 -asan-stack-dynamic-alloca=0 -S | FileCheck --check-prefix=OUTLINE %s
; RUN: opt < %s -passes=asan -asan-max-inline-poisoning-size=999 -asan-stack-dynamic-alloca=0 -S | FileCheck --check-prefix=INLINE %s

target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
target triple = "arm64-apple-macosx13.0.0"

; Function Attrs: noinline nounwind optnone sanitize_address ssp uwtable(sync)
define void @foo() #0 {
entry:
%array01 = alloca [1 x i8], align 1
%array02 = alloca [2 x i8], align 1
; OUTLINE: call void @__asan_set_shadow_f1(i64 %23, i64 4)
; OUTLINE: call void @__asan_set_shadow_01(i64 %24, i64 1)
; OUTLINE: call void @__asan_set_shadow_f2(i64 %25, i64 1)
; OUTLINE: call void @__asan_set_shadow_02(i64 %26, i64 1)
; OUTLINE: call void @__asan_set_shadow_f3(i64 %27, i64 1)
; OUTLINE: call void @__asan_stack_free_0(i64 %7, i64 64)
; OUTLINE: call void @__asan_set_shadow_00(i64 %55, i64 8)
; INLINE: store i64 -935919682371587599, ptr %24, align 1
; INLINE: store i64 -723401728380766731, ptr %52, align 1
%arrayidx = getelementptr inbounds [1 x i8], ptr %array01, i64 0, i64 1
store i8 1, ptr %arrayidx, align 1
%arrayidx1 = getelementptr inbounds [2 x i8], ptr %array02, i64 0, i64 2
store i8 2, ptr %arrayidx1, align 1
ret void
}
attributes #0 = { noinline nounwind optnone sanitize_address ssp uwtable(sync) "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.1a,+v8.2a,+v8.3a,+v8.4a,+v8.5a,+v8a,+zcm,+zcz" }

4 changes: 2 additions & 2 deletions llvm/test/Instrumentation/AddressSanitizer/calls-only.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ entry:
; OUTLINE: call void @__asan_set_shadow_f2(i64 %45, i64 3)
; OUTLINE: call void @__asan_set_shadow_07(i64 %46, i64 1)
; OUTLINE: call void @__asan_set_shadow_f3(i64 %47, i64 3)
; OUTLINE: call void @__asan_set_shadow_f5(i64 %134, i64 32)
; OUTLINE: call void @__asan_set_shadow_00(i64 %140, i64 24)
; OUTLINE: call void @__asan_stack_free_2(i64 %7, i64 192)
; OUTLINE: call void @__asan_set_shadow_00(i64 %135, i64 24)
; INLINE: store i64 -1007977276409515535, ptr %34, align 1
; INLINE: store i64 -940423264817843709, ptr %36, align 1
; INLINE: store i64 -868083087686045178, ptr %38, align 1
Expand Down