Skip to content

[sanitizer] Change GetDTLSRange #108345

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 2 commits into from
Sep 12, 2024
Merged

[sanitizer] Change GetDTLSRange #108345

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb612f2
[𝘀𝗽𝗿] initial version
vitalybuka Sep 12, 2024
257b25e
format
vitalybuka Sep 12, 2024
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
20 changes: 11 additions & 9 deletions compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ SANITIZER_WEAK_ATTRIBUTE
const void *__sanitizer_get_allocated_begin(const void *p);
}

static bool GetDTLSRange(uptr &tls_beg, uptr &tls_size) {
static uptr GetDTLSRange(uptr tls_beg) {
const void *start = __sanitizer_get_allocated_begin((void *)tls_beg);
if (!start)
return false;
tls_beg = (uptr)start;
tls_size = __sanitizer_get_allocated_size(start);
return 0;
CHECK_EQ(start, (void *)tls_beg);
uptr tls_size = __sanitizer_get_allocated_size(start);
VReport(2, "__tls_get_addr: glibc DTLS suspected; tls={%p,0x%zx}\n",
(void *)tls_beg, tls_size);
return true;
return tls_size;
}

DTLS::DTV *DTLS_on_tls_get_addr(void *arg_void, void *res,
Expand All @@ -142,10 +142,12 @@ DTLS::DTV *DTLS_on_tls_get_addr(void *arg_void, void *res,
// creation.
VReport(2, "__tls_get_addr: static tls: %p\n", (void *)tls_beg);
tls_size = 0;
} else if (!GetDTLSRange(tls_beg, tls_size)) {
VReport(2, "__tls_get_addr: Can't guess glibc version\n");
// This may happen inside the DTOR of main thread, so just ignore it.
tls_size = 0;
} else {
tls_size = GetDTLSRange(tls_beg);
if (tls_size) {
VReport(2, "__tls_get_addr: Can't guess glibc version\n");
// This may happen inside the DTOR of main thread, so just ignore it.
}
}
dtv->beg = tls_beg;
dtv->size = tls_size;
Expand Down
Loading