AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-11 13:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

nptl: Fix __libc_cleanup_pop_restore asynchronous restore (BZ#29214)

Browse Source 
This was due a wrong revert done on 404656009b.

Checked on x86_64-linux-gnu.

(cherry picked from commit c7d36dcecc)
This commit is contained in:
Adhemerval Zanella 2022-05-31 17:13:35 -03:00
parent 4c92a10412
commit a7ec6363a3
4 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -109,6 +109,7 @@ The following bugs are resolved with this release:
[29210] network: ruserpass is not y2038 aware
[29211] libc: __open_catalog is not y2038 aware
[29213] libc: gconv_parseconfdir is not y2038 aware
[29214] nptl: pthread_setcanceltype fails to set type
Version 2.34

3
nptl/libc-cleanup.c
View File

@ -58,7 +58,8 @@ __libc_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer)
THREAD_SETMEM (self, cleanup, buffer->__prev);
int cancelhandling = atomic_load_relaxed (&self->cancelhandling);
if (cancelhandling & CANCELTYPE_BITMASK)
if (buffer->__canceltype != PTHREAD_CANCEL_DEFERRED
&& (cancelhandling & CANCELTYPE_BITMASK) == 0)
{
int newval;
do

1
sysdeps/pthread/Makefile
View File

@ -126,6 +126,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
tst-pthread-raise-blocked-self \
tst-pthread_kill-exited \
tst-pthread_kill-exiting \
tst-cancel30 \
# tests
tests-time64 := \

82
sysdeps/pthread/tst-cancel30.c Normal file
View File

@ -0,0 +1,82 @@
/* Check if printf like functions does not disable asynchronous cancellation
mode (BZ#29214).
Copyright (C) 2022 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <support/check.h>
#include <support/xstdio.h>
#include <support/xthread.h>
#include <sys/syscall.h>
#include <unistd.h>
static pthread_barrier_t b;
static void *
tf (void *arg)
{
int old;
TEST_COMPARE (pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, NULL), 0);
TEST_COMPARE (pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &old), 0);
TEST_COMPARE (old, PTHREAD_CANCEL_ASYNCHRONOUS);
/* Check if internal lock cleanup routines restore the cancellation type
correctly. */
printf ("...\n");
TEST_COMPARE (pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &old), 0);
TEST_COMPARE (old, PTHREAD_CANCEL_ASYNCHRONOUS);
xpthread_barrier_wait (&b);
/* Wait indefinitely for cancellation, which only works if asynchronous
cancellation is enabled. */
#ifdef SYS_pause
syscall (SYS_pause);
#elif defined SYS_ppoll || defined SYS_ppoll_time64
# ifndef SYS_ppoll_time64
# define SYS_ppoll_time64 SYS_ppoll
# endif
syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
#else
for (;;);
#endif
return 0;
}
static int
do_test (void)
{
xpthread_barrier_init (&b, NULL, 2);
pthread_t th = xpthread_create (NULL, tf, NULL);
xpthread_barrier_wait (&b);
xpthread_cancel (th);
void *status = xpthread_join (th);
TEST_VERIFY (status == PTHREAD_CANCELED);
return 0;
}
/* There is no need to wait full TIMEOUT if asynchronous is not working. */
#define TIMEOUT 3
#include <support/test-driver.c>