ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-07 11:27:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw: prevent potential dead-lock in signal destruction

Browse Source 
Fix #3063
This commit is contained in:
Stefan Kalkowski 2018-11-29 15:49:24 +01:00 committed by Norman Feske
parent 8a3b0ebea9
commit aeb7ab4774
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
repos/base-hw/src/lib/base/signal_receiver.cc
View File

@ -77,6 +77,13 @@ void Signal_receiver::_platform_destructor()
void Signal_receiver::_platform_begin_dissolve(Signal_context * const c)
{
/**
* Mark the Signal_context as already pending to prevent the receiver
* from taking the lock, and set an invalid context to prevent further
* processing
*/
c->_pending = true;
c->_curr_signal = Signal::Data(nullptr, 0);
Kernel::kill_signal_context(Capability_space::capid(c->_cap));
}
@ -123,7 +130,12 @@ void Signal_receiver::block_for_signal()
const void * const utcb = Thread::myself()->utcb()->data();
Signal::Data * const data = (Signal::Data *)utcb;
Signal_context * const context = data->context;
{
/**
* Check for the signal being pending already to prevent a dead-lock
* when the context is in destruction, and its lock is held
*/
if (!context->_pending) {
/* update signal context */
Lock::Guard lock_guard(context->_lock);
unsigned const num = context->_curr_signal.num + data->num;