summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Beutner <gunnar@beutner.name>2021-04-17 18:35:14 +0200
committerAndreas Kling <kling@serenityos.org>2021-04-18 10:52:05 +0200
commitebca6aabc0bbf137276b9fbe18740f0fc238c667 (patch)
tree4b7ea09d799e2a5faf7259b2af786c30c01dda51
parent4075b306f8d56787e717c671f3bf4b9d3285180b (diff)
downloadserenity-ebca6aabc0bbf137276b9fbe18740f0fc238c667.zip
LibC: Make atexit handlers thread-safe
-rw-r--r--Userland/Libraries/LibC/cxxabi.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/Userland/Libraries/LibC/cxxabi.cpp b/Userland/Libraries/LibC/cxxabi.cpp
index f6819d40ea..7a7815cf32 100644
--- a/Userland/Libraries/LibC/cxxabi.cpp
+++ b/Userland/Libraries/LibC/cxxabi.cpp
@@ -26,6 +26,7 @@
#include <AK/Debug.h>
#include <AK/Format.h>
+#include <LibC/bits/pthread_integration.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
@@ -46,6 +47,7 @@ static constexpr size_t max_atexit_entry_count = PAGE_SIZE / sizeof(AtExitEntry)
static AtExitEntry* atexit_entries;
static size_t atexit_entry_count = 0;
+static pthread_mutex_t atexit_mutex = __PTHREAD_MUTEX_INITIALIZER;
static void lock_atexit_handlers()
{
@@ -65,12 +67,17 @@ static void unlock_atexit_handlers()
int __cxa_atexit(AtExitFunction exit_function, void* parameter, void* dso_handle)
{
- if (atexit_entry_count >= max_atexit_entry_count)
+ __pthread_mutex_lock(&atexit_mutex);
+
+ if (atexit_entry_count >= max_atexit_entry_count) {
+ __pthread_mutex_unlock(&atexit_mutex);
return -1;
+ }
if (!atexit_entries) {
atexit_entries = (AtExitEntry*)mmap(nullptr, PAGE_SIZE, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
if (atexit_entries == MAP_FAILED) {
+ __pthread_mutex_unlock(&atexit_mutex);
perror("__cxa_atexit mmap");
_exit(1);
}
@@ -80,6 +87,8 @@ int __cxa_atexit(AtExitFunction exit_function, void* parameter, void* dso_handle
atexit_entries[atexit_entry_count++] = { exit_function, parameter, dso_handle, false };
lock_atexit_handlers();
+ __pthread_mutex_unlock(&atexit_mutex);
+
return 0;
}
@@ -92,6 +101,8 @@ void __cxa_finalize(void* dso_handle)
// Multiple calls to __cxa_finalize shall not result in calling termination function entries multiple times;
// the implementation may either remove entries or mark them finished.
+ __pthread_mutex_lock(&atexit_mutex);
+
ssize_t entry_index = atexit_entry_count;
dbgln_if(GLOBAL_DTORS_DEBUG, "__cxa_finalize: {} entries in the finalizer list", entry_index);
@@ -104,9 +115,13 @@ void __cxa_finalize(void* dso_handle)
unlock_atexit_handlers();
exit_entry.has_been_called = true;
lock_atexit_handlers();
+ __pthread_mutex_unlock(&atexit_mutex);
exit_entry.method(exit_entry.parameter);
+ __pthread_mutex_lock(&atexit_mutex);
}
}
+
+ __pthread_mutex_unlock(&atexit_mutex);
}
[[noreturn]] void __cxa_pure_virtual()