RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:38:11 +00:00
Code Issues Activity Actions

Kernel: Fix ASSERTION failed in join_thread syscall

Browse source 
set_interrupted_by_death was never called whenever a thread that had
a joiner died, so the joiner remained with the joinee pointer there,
resulting in an assertion fail in JoinBlocker: m_joinee pointed to
a freed task, filled with garbage.

Thread::current->m_joinee may not be valid after the unblock

Properly return the joinee exit value to the joiner thread.
This commit is contained in:
Cristian-Bogdan SIRB 2020-02-27 08:40:40 +02:00 • committed by Andreas Kling
parent d28fa89346
commit 05ce8586ea
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Kernel/Thread.cpp
View file

@ -300,6 +300,7 @@ void Thread::finalize()
if (m_joiner) {
ASSERT(m_joiner->m_joinee == this);
static_cast<JoinBlocker*>(m_joiner->m_blocker)->set_joinee_exit_value(m_exit_value);
static_cast<JoinBlocker*>(m_joiner->m_blocker)->set_interrupted_by_death();
m_joiner->m_joinee = nullptr;
// NOTE: We clear the joiner pointer here as well, to be tidy.
m_joiner = nullptr;