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

ldso: initialize ELF object before relocating

Browse Source 
This fixes a regression on Ubuntu 16.04 (resp. Linux systems with recent
kernel versions) and address-space randomization originating from an
uninitialized relocation base of 0.
This commit is contained in:
Christian Helmuth
2016-11-09 17:10:34 +01:00
parent 82107bef9b
commit f75f199947
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,13 @@ class Linker::Elf_object : public Object, public Fifo<Elf_object>::Element
*/ */
Lazy_volatile_object<Elf_file> _elf_file; Lazy_volatile_object<Elf_file> _elf_file;
bool _object_init(Object::Name const &name, Elf::Addr reloc_base)
{
Object::init(name, reloc_base);
return true;
}
bool _init_elf_file(Env &env, Allocator &md_alloc, char const *path) bool _init_elf_file(Env &env, Allocator &md_alloc, char const *path)
{ {
_elf_file.construct(env, md_alloc, Linker::file(path), true); _elf_file.construct(env, md_alloc, Linker::file(path), true);
@ -98,7 +105,7 @@ class Linker::Elf_object : public Object, public Fifo<Elf_object>::Element
return true; return true;
} }
bool const _elf_file_initialized; bool const _elf_object_initialized;
Dynamic _dyn; Dynamic _dyn;
@ -107,16 +114,15 @@ class Linker::Elf_object : public Object, public Fifo<Elf_object>::Element
Elf_object(Dependency const &dep, Object::Name const &name, Elf_object(Dependency const &dep, Object::Name const &name,
Elf::Addr reloc_base) Elf::Addr reloc_base)
: :
_elf_file_initialized(false), _dyn(dep) _elf_object_initialized(_object_init(name, reloc_base)),
{ _dyn(dep)
Object::init(name, reloc_base); { }
}
Elf_object(Env &env, Allocator &md_alloc, char const *path, Elf_object(Env &env, Allocator &md_alloc, char const *path,
Dependency const &dep, Keep keep) Dependency const &dep, Keep keep)
: :
_keep(keep), _keep(keep),
_elf_file_initialized(_init_elf_file(env, md_alloc, path)), _elf_object_initialized(_init_elf_file(env, md_alloc, path)),
_dyn(md_alloc, dep, *this, &_elf_file->phdr) _dyn(md_alloc, dep, *this, &_elf_file->phdr)
{ {
/* register for static construction and relocation */ /* register for static construction and relocation */