jmb/hardened_malloc
1
0
Fork 0
mirror of https://github.com/GrapheneOS/hardened_malloc.git synced 2025-11-03 01:06:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

android: restore the default SIGABRT handler in fatal_error()

Browse source 
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.
This commit is contained in:
Dmitry Muhomor 2023-12-31 15:37:32 +02:00
parent 7093fdc482
commit 0cd5d941a7
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
util.c
View file

@ -6,6 +6,8 @@
#ifdef __ANDROID__ #ifdef __ANDROID__
#include <async_safe/log.h> #include <async_safe/log.h>
int mallopt(int param, int value);
#define M_BIONIC_RESTORE_DEFAULT_SIGABRT_HANDLER (-1003)
#endif #endif
#include "util.h" #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) { COLD noreturn void fatal_error(const char *s) {
#ifdef __ANDROID__ #ifdef __ANDROID__
mallopt(M_BIONIC_RESTORE_DEFAULT_SIGABRT_HANDLER, 0);
async_safe_fatal("hardened_malloc: fatal allocator error: %s", s); async_safe_fatal("hardened_malloc: fatal allocator error: %s", s);
#else #else
const char *prefix = "fatal allocator error: "; const char *prefix = "fatal allocator error: ";