Skip to content

[TySan] Intercept malloc_size on Apple platforms. #122133

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 5 commits into from
Jan 9, 2025
Merged

[TySan] Intercept malloc_size on Apple platforms. #122133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6eb5550
[TySan] Intercept malloc_size on Apple platforms.
fhahn Jan 8, 2025
d130709
!fixup fix formatting
fhahn Jan 8, 2025
17e8291
!fixup also check PointerIsMine
fhahn Jan 8, 2025
5688643
!fixup only use PointerIsMine
fhahn Jan 9, 2025
3240cb2
!fixup Size -> GetSize()
fhahn Jan 9, 2025
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
14 changes: 8 additions & 6 deletions compiler-rt/lib/sanitizer_common/sanitizer_allocator_dlsym.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,19 @@ struct DlSymAllocator {
static void *Allocate(uptr size_in_bytes, uptr align = kWordSize) {
void *ptr = InternalAlloc(size_in_bytes, nullptr, align);
CHECK(internal_allocator()->FromPrimary(ptr));
Details::OnAllocate(ptr,
internal_allocator()->GetActuallyAllocatedSize(ptr));
Details::OnAllocate(ptr, GetSize(ptr));
return ptr;
}

static void *Callocate(usize nmemb, usize size) {
void *ptr = InternalCalloc(nmemb, size);
CHECK(internal_allocator()->FromPrimary(ptr));
Details::OnAllocate(ptr,
internal_allocator()->GetActuallyAllocatedSize(ptr));
Details::OnAllocate(ptr, GetSize(ptr));
return ptr;
}

static void Free(void *ptr) {
uptr size = internal_allocator()->GetActuallyAllocatedSize(ptr);
uptr size = GetSize(ptr);
Details::OnFree(ptr, size);
InternalFree(ptr);
}
Expand All @@ -63,7 +61,7 @@ struct DlSymAllocator {
Free(ptr);
return nullptr;
}
uptr size = internal_allocator()->GetActuallyAllocatedSize(ptr);
uptr size = GetSize(ptr);
uptr memcpy_size = Min(new_size, size);
void *new_ptr = Allocate(new_size);
if (new_ptr)
Expand All @@ -77,6 +75,10 @@ struct DlSymAllocator {
return Realloc(ptr, count * size);
}

static uptr GetSize(void *ptr) {
return internal_allocator()->GetActuallyAllocatedSize(ptr);
}

static void OnAllocate(const void *ptr, uptr size) {}
static void OnFree(const void *ptr, uptr size) {}
};
Expand Down
8 changes: 8 additions & 0 deletions compiler-rt/lib/tysan/tysan_interceptors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ INTERCEPTOR(void *, malloc, uptr size) {
return res;
}

#if SANITIZER_APPLE
Copy link
Contributor

@fmayer fmayer Jan 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drive by question: how do we decide between TYSAN_INTERCEPT___STRDUP and SANITIZER_APPLE style conditions?

INTERCEPTOR(uptr, malloc_size, void *ptr) {
if (DlsymAlloc::PointerIsMine(ptr))
return DlsymAlloc::GetSize(ptr);
return REAL(malloc_size)(ptr);
}
#endif

INTERCEPTOR(void *, realloc, void *ptr, uptr size) {
if (DlsymAlloc::Use() || DlsymAlloc::PointerIsMine(ptr))
return DlsymAlloc::Realloc(ptr, size);
Expand Down
Loading