From 97d789c75b1f8be3da33e267dec990bb3a47073b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 11 Dec 2020 22:58:42 +0100 Subject: [PATCH] Kernel: Fix null dereference when execve'ing ELF without PT_TLS header Fixes #4387. --- Kernel/Syscalls/execve.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kernel/Syscalls/execve.cpp b/Kernel/Syscalls/execve.cpp index a1c16ab84e..8d2b5af041 100644 --- a/Kernel/Syscalls/execve.cpp +++ b/Kernel/Syscalls/execve.cpp @@ -224,7 +224,7 @@ int Process::do_exec(NonnullRefPtr main_program_description, Ve // Copy of the master TLS region that we will clone for new threads // FIXME: Handle this in userspace - m_master_tls_region = master_tls_region->make_weak_ptr(); + m_master_tls_region = master_tls_region ? master_tls_region->make_weak_ptr() : nullptr; auto main_program_metadata = main_program_description->metadata();