mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-25 13:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

nptl: Fix tst-cancel7 and tst-cancelx7 pidfile race

Browse Source 
The check for waiting for the pidfile to be created looks wrong.  At the
point when ACCESS is run the pid file will always be created and
accessible as it is created during DO_PREPARE.  This means that thread
cancellation may be performed before the pid is written to the pidfile.

This was found to be flaky when testing on my OpenRISC platform.

Fix this by using the semaphore to wait for pidfile pid write
completion.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Stafford Horne 2021-10-17 07:41:54 +09:00 committed by Adhemerval Zanella
parent 5118dcac68
commit 06acd6d1d6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nptl/tst-cancel7.c
View File

@ -115,16 +115,13 @@ do_test (void)
{
pthread_t th = xpthread_create (NULL, tf, NULL);
do
nanosleep (&(struct timespec) { .tv_sec = 0, .tv_nsec = 100000000 }, NULL);
while (access (pidfilename, R_OK) != 0);
/* Wait to cancel until after the pid is written. */
if (sem_wait (sem) != 0)
FAIL_EXIT1 ("sem_wait: %m");
xpthread_cancel (th);
void *r = xpthread_join (th);
if (sem_wait (sem) != 0)
FAIL_EXIT1 ("sem_wait: %m");
FILE *f = xfopen (pidfilename, "r+");
long long ll;