diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/Makefile | 1 | ||||
| -rw-r--r-- | stdlib/abort.c | 6 | ||||
| -rw-r--r-- | stdlib/tst-secure-getenv.c | 9 |
3 files changed, 7 insertions, 9 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile index 1c80e49..25f777e 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -666,7 +666,6 @@ $(objpfx)tst-setcontext3.out: tst-setcontext3.sh $(objpfx)tst-setcontext3 $(common-objpfx)stdlib/; \ $(evaluate-test) -$(objpfx)tst-qsort5: $(libm) $(objpfx)tst-concurrent-exit: $(shared-thread-library) $(objpfx)tst-concurrent-quick_exit: $(shared-thread-library) $(objpfx)tst-getrandom2: $(shared-thread-library) diff --git a/stdlib/abort.c b/stdlib/abort.c index caa9e6d..904244a 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 diff --git a/stdlib/tst-secure-getenv.c b/stdlib/tst-secure-getenv.c index 3fd1d23..c12c63a 100644 --- a/stdlib/tst-secure-getenv.c +++ b/stdlib/tst-secure-getenv.c @@ -57,13 +57,7 @@ do_test (void) exit (1); } - int status = support_capture_subprogram_self_sgid (MAGIC_ARGUMENT); - - if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) - return EXIT_UNSUPPORTED; - - if (!WIFEXITED (status)) - FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status); + support_capture_subprogram_self_sgid (MAGIC_ARGUMENT); return 0; } @@ -82,6 +76,7 @@ alternative_main (int argc, char **argv) if (secure_getenv ("PATH") != NULL) FAIL_EXIT (4, "PATH variable not filtered out\n"); + support_record_failure_barrier (); exit (EXIT_SUCCESS); } } |