diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | stdlib/abort.c | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -9,7 +9,7 @@ Version 2.42.1 The following bugs were resolved with this release: - [insert bugs here] + [32994] stdlib: resolve a double lock init issue after fork Version 2.42 diff --git a/stdlib/abort.c b/stdlib/abort.c index caa9e6dc04..904244a2fb 100644 --- a/stdlib/abort.c +++ b/stdlib/abort.c @@ -19,6 +19,7 @@ #include <internal-signals.h> #include <libc-lock.h> #include <pthreadP.h> +#include <string.h> #include <unistd.h> /* Try to get a machine dependent instruction which will make the @@ -42,7 +43,10 @@ __libc_rwlock_define_initialized (static, lock); void __abort_fork_reset_child (void) { - __libc_rwlock_init (lock); + /* Reinitialize lock without calling pthread_rwlock_init, to + avoid a valgrind DRD false positive. */ + __libc_rwlock_define_initialized (, reset_lock); + memcpy (&lock, &reset_lock, sizeof (lock)); } void |