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

ldso: shared-object lock and ctor test

Browse Source 
This has to be used during shared object creation and destruction because global
lists are manipulated. We cannot use the 'Elf_object::lock' here because there
may be jump-slot relocations during object initialization.

Fixes #1350
This commit is contained in:
Sebastian Sumpf
2015-01-08 12:31:36 +01:00
committed by Christian Helmuth
parent e5b509cabb
commit 1a26f33469
4 changed files with 77 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
repos/base/src/lib/ldso/main.cc
View File

@ -1100,6 +1100,17 @@ static Root_object *to_root(void *h)
}
/**
* Needed during shared object creation and destruction, since global lists are
* manipulated
*/
static Genode::Lock & shared_object_lock()
{
static Genode::Lock _lock;
return _lock;
}
Genode::Shared_object::Shared_object(char const *file, unsigned flags)
{
using namespace Linker;
@ -1108,7 +1119,7 @@ Genode::Shared_object::Shared_object(char const *file, unsigned flags)
PDBG("open '%s'", file ? file : "binary");
try {
Genode::Lock::Guard guard(Elf_object::lock());
Genode::Lock::Guard guard(shared_object_lock());
/* update bind now variable */
bind_now = (flags & Shared_object::NOW) ? true : false;
@ -1150,7 +1161,7 @@ Genode::Shared_object::~Shared_object()
if (verbose_shared)
PDBG("close");
Genode::Lock::Guard guard(Elf_object::lock());
Genode::Lock::Guard guard(shared_object_lock());
destroy(Genode::env()->heap(), to_root(_handle));
}