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

nptl: Fix pthread_cancel cancelhandling atomic operations

Browse Source 
The 404656009b reversion did not setup the atomic loop to set the
cancel bits correctly.  The fix is essentially what pthread_cancel
did prior 26cfbb7162.

Checked on x86_64-linux-gnu and aarch64-linux-gnu.

(cherry picked from commit 62be968167)
This commit is contained in:
Adhemerval Zanella 2022-04-20 12:01:43 -03:00
parent b87b697f15
commit 71326f1f2f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nptl/pthread_cancel.c
View File

@ -122,6 +122,7 @@ __pthread_cancel (pthread_t th)
int newval; int newval;
do do
{ {
again:
newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK; newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK;
if (oldval == newval) if (oldval == newval)
break; break;
@ -135,7 +136,7 @@ __pthread_cancel (pthread_t th)
int newval2 = oldval | CANCELING_BITMASK; int newval2 = oldval | CANCELING_BITMASK;
if (!atomic_compare_exchange_weak_acquire (&pd->cancelhandling, if (!atomic_compare_exchange_weak_acquire (&pd->cancelhandling,
&oldval, newval2)) &oldval, newval2))
continue; goto again;
if (pd == THREAD_SELF) if (pd == THREAD_SELF)
/* This is not merely an optimization: An application may /* This is not merely an optimization: An application may