Skip to content

Fix tls leak for non-primary thread (2) #4151

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

Open
rosenkolev1 wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −2
Open

Fix tls leak for non-primary thread (2) #4151

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
5 changes: 3 additions & 2 deletions src/core/libraries/kernel/threads/tcb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,17 @@ void TcbDtor(Core::Tcb* oldtls) {
ASSERT_MSG(num_dtvs <= max_tls_index, "Out of bounds DTV access");

const u32 static_tls_size = linker->StaticTlsSize();
const u8* tls_base = (const u8*)oldtls - static_tls_size;
u8* tls_base = (u8*)oldtls - static_tls_size;

for (int i = 1; i < num_dtvs; i++) {
u8* dtv_ptr = dtv_table[i + 1].pointer;
if (dtv_ptr && (dtv_ptr < tls_base || (const u8*)oldtls < dtv_ptr)) {
linker->FreeTlsForNonPrimaryThread(dtv_ptr);
}
}

delete[] dtv_table;

linker->FreeTlsForNonPrimaryThread(tls_base);
}

struct TlsIndex {
Expand Down