mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2025-02-23 18:33:22 +03:00
Code Issues Projects Releases Wiki Activity

musl: allocator: Avoid deadlock in pthread_atfork

Browse Source 
Musl 1.2.3 and before call malloc() in pthread_atfork(),
which may result in a deadlock.
This commit is contained in:
klzgrad 2025-02-08 19:57:01 +08:00
parent c087e6f6d5
commit ce8c22e607
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
View File

@ -59,7 +59,9 @@ thread_local bool g_is_main_thread = true;
class InitAtFork { class InitAtFork {
public: public:
InitAtFork() { InitAtFork() {
#if !defined(__MUSL__)
pthread_atfork(nullptr, nullptr, internal::InvalidateTidCache); pthread_atfork(nullptr, nullptr, internal::InvalidateTidCache);
#endif
} }
}; };

6
src/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
View File

@ -297,7 +297,11 @@ void PartitionAllocMallocInitOnce() {
return; return;
} }
#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) #if defined(__MUSL__)
static_cast<void>(BeforeForkInParent);
static_cast<void>(AfterForkInParent);
static_cast<void>(AfterForkInChild);
#elif PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
// When fork() is called, only the current thread continues to execute in the // When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is // child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock. // called, we have a deadlock.