RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 03:58:12 +00:00
Code Issues Activity Actions

Kernel: Set TLS-related members of Process after loading static program

Browse source 
We previously ignored these values in the return value of
load_elf_object, which causes us to not allocate a TLS region for
statically-linked programs.
This commit is contained in:
Itamar 2021-03-15 21:56:13 +02:00 • committed by Andreas Kling
parent 4cb38f6dd8
commit 2365e06b12
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Syscalls/execve.cpp
View file

@ -310,6 +310,7 @@ static KResultOr<LoadResult> load_elf_object(NonnullOwnPtr<Space> new_space, Fil
ph_load_result = region_or_error.error(); ph_load_result = region_or_error.error();
return IterationDecision::Break; return IterationDecision::Break;
} }
master_tls_region = region_or_error.value(); master_tls_region = region_or_error.value();
master_tls_size = program_header.size_in_memory(); master_tls_size = program_header.size_in_memory();
master_tls_alignment = program_header.alignment(); master_tls_alignment = program_header.alignment();
@ -444,6 +445,11 @@ KResultOr<LoadResult> Process::load(NonnullRefPtr<FileDescription> main_program_
auto result = load_elf_object(new_space.release_nonnull(), main_program_description, FlatPtr { 0 }, ShouldAllocateTls::Yes); auto result = load_elf_object(new_space.release_nonnull(), main_program_description, FlatPtr { 0 }, ShouldAllocateTls::Yes);
if (result.is_error()) if (result.is_error())
return result.error(); return result.error();
m_master_tls_region = result.value().tls_region;
m_master_tls_size = result.value().tls_size;
m_master_tls_alignment = result.value().tls_alignment;
return result; return result;
} }

4
Kernel/Thread.cpp
View file

@ -1005,7 +1005,7 @@ size_t Thread::thread_specific_region_size() const
KResult Thread::make_thread_specific_region(Badge<Process>) KResult Thread::make_thread_specific_region(Badge<Process>)
{ {
// The process may not require a TLS region // The process may not require a TLS region, or allocate TLS later with sys$allocate_tls (which is what dynamically loaded programs do)
if (!process().m_master_tls_region) if (!process().m_master_tls_region)
return KSuccess; return KSuccess;
@ -1022,8 +1022,10 @@ KResult Thread::make_thread_specific_region(Badge<Process>)
auto* thread_local_storage = (u8*)((u8*)thread_specific_data) - align_up_to(process().m_master_tls_size, process().m_master_tls_alignment); auto* thread_local_storage = (u8*)((u8*)thread_specific_data) - align_up_to(process().m_master_tls_size, process().m_master_tls_alignment);
m_thread_specific_data = VirtualAddress(thread_specific_data); m_thread_specific_data = VirtualAddress(thread_specific_data);
thread_specific_data->self = thread_specific_data; thread_specific_data->self = thread_specific_data;
if (process().m_master_tls_size) if (process().m_master_tls_size)
memcpy(thread_local_storage, process().m_master_tls_region.unsafe_ptr()->vaddr().as_ptr(), process().m_master_tls_size); memcpy(thread_local_storage, process().m_master_tls_region.unsafe_ptr()->vaddr().as_ptr(), process().m_master_tls_size);
return KSuccess; return KSuccess;
} }