GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2025-01-30 08:07:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix WaitForAddress timeout signal race

Browse Source 
A race could occur from the timeout path in `WaitForAddress` taking place at the same time as `SignalToAddress` has been caused, this causes a deadlock due to double-insertion.
This commit is contained in:
PixelyIon 2022-11-26 00:13:01 +05:30 committed by Mark Collins
parent 0f1d97fe2c
commit e8a1bd1aad
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/cpp/skyline/kernel/types/KProcess.cpp
View File

@ -320,13 +320,18 @@ namespace skyline::kernel::type {
std::scoped_lock lock{syncWaiterMutex}; std::scoped_lock lock{syncWaiterMutex};
auto queue{syncWaiters.equal_range(address)}; auto queue{syncWaiters.equal_range(address)};
auto iterator{std::find(queue.first, queue.second, SyncWaiters::value_type{address, state.thread})}; auto iterator{std::find(queue.first, queue.second, SyncWaiters::value_type{address, state.thread})};
if (iterator != queue.second) if (iterator != queue.second) {
if (syncWaiters.erase(iterator) == queue.second) if (syncWaiters.erase(iterator) == queue.second)
// We need to update the boolean flag denoting that there are no more threads waiting on this address
__atomic_store_n(address, false, __ATOMIC_SEQ_CST); __atomic_store_n(address, false, __ATOMIC_SEQ_CST);
} else {
state.scheduler->WaitSchedule(false);
return {};
}
} }
state.scheduler->InsertThread(state.thread); state.scheduler->InsertThread(state.thread);
state.scheduler->WaitSchedule(); state.scheduler->WaitSchedule(false);
return result::TimedOut; return result::TimedOut;
} else { } else {