RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:07:35 +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

12
Kernel/Process.cpp
View file

@ -3844,10 +3844,14 @@ int Process::sys$join_thread(int tid, void** exit_value)
if (result == Thread::BlockResult::InterruptedByDeath) { if (result == Thread::BlockResult::InterruptedByDeath) {
// NOTE: This cleans things up so that Thread::finalize() won't // NOTE: This cleans things up so that Thread::finalize() won't
// get confused about a missing joiner when finalizing the joinee. // get confused about a missing joiner when finalizing the joinee.
InterruptDisabler disabler; InterruptDisabler disabler_t;
Thread::current->m_joinee->m_joiner = nullptr;
Thread::current->m_joinee = nullptr; if (Thread::current->m_joinee) {
return 0; Thread::current->m_joinee->m_joiner = nullptr;
Thread::current->m_joinee = nullptr;
}
break;
} }
} }

1
Kernel/Thread.cpp
View file

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