maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Asan] Unpoison red zones even if use-after-scope was disabled with runtime flag 

Summary: PR27453

Reviewers: eugenis

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D23481

llvm-svn: 278818
This commit is contained in:
Vitaly Buka 2016-08-16 16:24:10 +00:00
parent 1e5b2d1611
commit 1ce73ef11c
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
View File

@ -2186,12 +2186,13 @@ void FunctionStackPoisoner::poisonStack() {
poisonRedZones(L.ShadowBytes, IRB, ShadowBase, true);
auto UnpoisonStack = [&](IRBuilder<> &IRB) {
// Do this always as poisonAlloca can be disabled with
// detect_stack_use_after_scope=0.
poisonRedZones(L.ShadowBytes, IRB, ShadowBase, false);
if (HavePoisonedStaticAllocas) {
// If we poisoned some allocas in llvm.lifetime analysis,
// unpoison whole stack frame now.
poisonAlloca(LocalStackBase, LocalStackSize, IRB, false);
} else {
poisonRedZones(L.ShadowBytes, IRB, ShadowBase, false);
}
};

6
llvm/test/Instrumentation/AddressSanitizer/lifetime-uar-uas.ll
View File

@ -28,9 +28,9 @@ entry:
; CHECK-UAS: call void @__asan_poison_stack_memory(i64 %{{[^ ]+}}, i64 1)
; Unpoison memory at function exit in UAS mode.
; CHECK-UAS: call void @__asan_unpoison_stack_memory(i64 %{{[^ ]+}}, i64 64)
; CHECK-UAS: ret void
; CHECK-UAS: store i64 0
; CHECK-UAS-NEXT: call void @__asan_unpoison_stack_memory(i64 %{{[^ ]+}}, i64 64)
; CHECK-UAS: ret i32 0
ret i32 0
}

6
llvm/test/Instrumentation/AddressSanitizer/lifetime.ll
View File

@ -108,7 +108,11 @@ entry:
; CHECK: __asan_poison_stack_memory
ret void
; CHECK: __asan_unpoison_stack_memory
; CHECK: store i64 0
; CHECK: store i64 0
; CHECK: store i64 0
; CHECK: store i32 0
; CHECK-NEXT: __asan_unpoison_stack_memory
}
define void @zero_sized(i64 %a) #0 {