ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-24 19:24:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nova: re-add server object IPC cleanup call

Browse Source 
Accidentally removed by #1658. We need to make the cleanup call for server
objects - otherwise we may get in capability identifier re-use trouble.

Issue #1778
This commit is contained in:
Alexander Boettcher 2015-11-12 15:21:23 +01:00 committed by Christian Helmuth
parent 8c060d6622
commit eb236a1a10
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
repos/base-nova/src/base/server/server.cc
View File

@ -90,8 +90,38 @@ void Rpc_entrypoint::_dissolve(Rpc_object_base *obj)
/* make sure nobody is able to find this object */ /* make sure nobody is able to find this object */
remove(obj); remove(obj);
/*
* The activation may execute a blocking operation in a dispatch function.
* Before resolving the corresponding object, we need to ensure that it is
* no longer used by an activation. Therefore, we to need cancel an
* eventually blocking operation and let the activation leave the context
* of the object.
*/
using namespace Nova;
Utcb *utcb = reinterpret_cast<Utcb *>(Thread_base::myself()->utcb());
/* don't call ourself */
if (utcb == reinterpret_cast<Utcb *>(this->utcb()))
return;
/*
* Required outside of core. E.g. launchpad needs it to forcefully kill
* a client which blocks on a session opening request where the service
* is not up yet.
*/
cancel_blocking();
/* make a IPC to ensure that cap() identifier is not used anymore */
utcb->msg[0] = 0xdead;
utcb->set_msg_word(1);
if (uint8_t res = call(_cap.local_name()))
PERR("%8p - could not clean up entry point of thread 0x%p - res %u",
utcb, this->utcb(), res);
} }
void Rpc_entrypoint::_activation_entry() void Rpc_entrypoint::_activation_entry()
{ {
/* retrieve portal id from eax/rdi */ /* retrieve portal id from eax/rdi */