From 365ee6900d2ae0cc9ad9e03d48f6747f58deb69d Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Sun, 31 Dec 2023 15:37:32 +0200 Subject: [PATCH] android: restore the default SIGABRT handler in fatal_error() async_safe_fatal() calls abort() at the end, which can be intercepted by a custom SIGABRT handler. In particular, crashlytics installs such a handler and tries to fork() after catching SIGABRT. hardened_malloc uses pthread_atfork() to register fork handlers. These handlers try to lock internal hardened_malloc mutexes. If at least one of those mutexes is already locked, which is usually the case, thread that called fatai_error() gets deadlocked, while the other threads (if there are any) continue to run. --- util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util.c b/util.c index a3d6f0c..a43679c 100644 --- a/util.c +++ b/util.c @@ -6,6 +6,8 @@ #ifdef __ANDROID__ #include +int mallopt(int param, int value); +#define M_BIONIC_RESTORE_DEFAULT_SIGABRT_HANDLER (-1003) #endif #include "util.h" @@ -30,6 +32,7 @@ static int write_full(int fd, const char *buf, size_t length) { COLD noreturn void fatal_error(const char *s) { #ifdef __ANDROID__ + mallopt(M_BIONIC_RESTORE_DEFAULT_SIGABRT_HANDLER, 0); async_safe_fatal("hardened_malloc: fatal allocator error: %s", s); #else const char *prefix = "fatal allocator error: ";