diff options
author | Timo Teräs <timo.teras@iki.fi> | 2011-03-26 20:23:09 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-23 15:49:01 +0100 |
commit | 1bdf3d74afad552ff99182af70536f23549a434f (patch) | |
tree | 3b95b09cea2cc8e68eb87746d0849afee14de638 | |
parent | e3f3de389e28f2585d1a1e57989440ffea67e689 (diff) | |
download | uClibc-alpine-1bdf3d74afad552ff99182af70536f23549a434f.tar.bz2 uClibc-alpine-1bdf3d74afad552ff99182af70536f23549a434f.tar.xz |
malloc-standard: synchronize on fork
Otherwise other threads can leave malloc state locked, and the child
will hang indefinitely if it tries to malloc something.
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
-rw-r--r-- | libc/stdlib/malloc-standard/free.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libc/stdlib/malloc-standard/free.c b/libc/stdlib/malloc-standard/free.c index 39e54d635..df512cc52 100644 --- a/libc/stdlib/malloc-standard/free.c +++ b/libc/stdlib/malloc-standard/free.c @@ -118,6 +118,21 @@ int malloc_trim(size_t pad) to inline it at all call points, which turns out not to be an optimization at all. (Inlining it in __malloc_consolidate is fine though.) */ +static void _malloc_lock(void) +{ + __UCLIBC_MUTEX_LOCK_CANCEL_UNSAFE(__malloc_lock); +} + +static void _malloc_unlock(void) +{ + __UCLIBC_MUTEX_UNLOCK_CANCEL_UNSAFE(__malloc_lock); +} + +static void _malloc_reset(void) +{ + __UCLIBC_MUTEX_INIT_VAR(__malloc_lock); +} + static void malloc_init_state(mstate av) { int i; @@ -145,6 +160,8 @@ static void malloc_init_state(mstate av) av->top = initial_top(av); av->pagesize = malloc_getpagesize; + + __libc_atfork(_malloc_lock, _malloc_unlock, _malloc_reset); } |