mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-27 14:06:07 +00:00
Code Issues Projects Releases Wiki Activity

[HWASAN] Implemented LSAN SetLsanTag and IgnoreObjectLocked

Browse Source 
Reviewed By: vitalybuka

Differential Revision: https://reviews.llvm.org/D141642
This commit is contained in:
Kirill Stoimenov 2023-01-17 16:50:48 -08:00 committed by Vitaly Buka
parent e329715209
commit e022ca8b6e
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/asan/asan_allocator.cpp
View File

@ -1094,6 +1094,8 @@ uptr PointsIntoChunk(void *p) {
}
uptr GetUserBegin(uptr chunk) {
// FIXME: All usecases provide chunk address, GetAsanChunkByAddrFastLocked is
// not needed.
__asan::AsanChunk *m = __asan::instance.GetAsanChunkByAddrFastLocked(chunk);
return m ? m->Beg() : 0;
}

2
compiler-rt/lib/hwasan/CMakeLists.txt
View File

@ -164,6 +164,7 @@ function(add_hwasan_runtimes arch use_aliases)
RTSanitizerCommonLibc
RTSanitizerCommonCoverage
RTSanitizerCommonSymbolizer
RTLSanCommon
RTUbsan
CFLAGS ${hwasan_rtl_flags}
PARENT_TARGET hwasan)
@ -200,6 +201,7 @@ function(add_hwasan_runtimes arch use_aliases)
RTSanitizerCommonLibc
RTSanitizerCommonCoverage
RTSanitizerCommonSymbolizer
RTLSanCommon
RTUbsan
RTUbsan_cxx
# The only purpose of RTHWAsan_dynamic_version_script_dummy is to

41
compiler-rt/lib/hwasan/hwasan_allocator.cpp
View File

@ -236,6 +236,10 @@ static void *HwasanAllocate(StackTrace *stack, uptr orig_size, uptr alignment,
Metadata *meta =
reinterpret_cast<Metadata *>(allocator.GetMetaData(allocated));
#if CAN_SANITIZE_LEAKS
meta->SetLsanTag(__lsan::DisabledInThisThread() ? __lsan::kIgnored
: __lsan::kDirectlyLeaked);
#endif
meta->SetAllocated(StackDepotPut(*stack), orig_size);
RunMallocHooks(user_ptr, size);
return user_ptr;
@ -386,6 +390,16 @@ HwasanChunkView FindHeapChunkByAddress(uptr address) {
return HwasanChunkView(reinterpret_cast<uptr>(block), metadata);
}
static inline HwasanChunkView FindHeapChunkByAddressFastLocked(uptr address) {
void *block =
allocator.GetBlockBeginFastLocked(reinterpret_cast<void *>(address));
if (!block)
return HwasanChunkView();
Metadata *metadata =
reinterpret_cast<Metadata *>(allocator.GetMetaData(block));
return HwasanChunkView(reinterpret_cast<uptr>(block), metadata);
}
static uptr AllocationSize(const void *tagged_ptr) {
const void *untagged_ptr = UntagPtr(tagged_ptr);
if (!untagged_ptr) return 0;
@ -501,8 +515,9 @@ void GetAllocatorGlobalRange(uptr *begin, uptr *end) {
uptr PointsIntoChunk(void *p) {
uptr addr = reinterpret_cast<uptr>(p);
__hwasan::HwasanChunkView view = __hwasan::FindHeapChunkByAddress(addr);
if (!view.IsAllocated())
__hwasan::HwasanChunkView view =
__hwasan::FindHeapChunkByAddressFastLocked(addr);
if (!view.IsAllocated())
return 0;
uptr chunk = view.Beg();
if (view.AddrIsInside(addr))
@ -513,7 +528,9 @@ uptr PointsIntoChunk(void *p) {
}
uptr GetUserBegin(uptr chunk) {
return __hwasan::FindHeapChunkByAddress(chunk).Beg();
// FIXME: All usecases provide chunk address, FindHeapChunkByAddressFastLocked
// is not needed.
return __hwasan::FindHeapChunkByAddressFastLocked(chunk).Beg();
}
LsanMetadata::LsanMetadata(uptr chunk) {
@ -553,6 +570,24 @@ void ForEachChunk(ForEachChunkCallback callback, void *arg) {
__hwasan::allocator.ForEachChunk(callback, arg);
}
IgnoreObjectResult IgnoreObjectLocked(const void *p) {
void *block =
__hwasan::allocator.GetBlockBeginFastLocked(const_cast<void *>(p));
if (!block)
return kIgnoreObjectInvalid;
__hwasan::Metadata *metadata = reinterpret_cast<__hwasan::Metadata *>(
__hwasan::allocator.GetMetaData(block));
uptr addr = reinterpret_cast<uptr>(p);
__hwasan::HwasanChunkView view(reinterpret_cast<uptr>(block), metadata);
if (!view.IsAllocated() || !view.AddrIsInside(addr)) {
return kIgnoreObjectInvalid;
}
if (metadata->GetLsanTag() == kIgnored)
return kIgnoreObjectAlreadyIgnored;
metadata->SetLsanTag(kIgnored);
return kIgnoreObjectSuccess;
}
} // namespace __lsan
using namespace __hwasan;