You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.2 KiB
35 lines
1.2 KiB
commit 71326f1f2fd09dafb9c34404765fb88129e94237 |
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> |
|
Date: Wed Apr 20 12:01:43 2022 -0300 |
|
|
|
nptl: Fix pthread_cancel cancelhandling atomic operations |
|
|
|
The 404656009b reversion did not setup the atomic loop to set the |
|
cancel bits correctly. The fix is essentially what pthread_cancel |
|
did prior 26cfbb7162ad. |
|
|
|
Checked on x86_64-linux-gnu and aarch64-linux-gnu. |
|
|
|
(cherry picked from commit 62be9681677e7ce820db721c126909979382d379) |
|
|
|
diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c |
|
index 2680b55586e035fe..64fd183fde59907b 100644 |
|
--- a/nptl/pthread_cancel.c |
|
+++ b/nptl/pthread_cancel.c |
|
@@ -122,6 +122,7 @@ __pthread_cancel (pthread_t th) |
|
int newval; |
|
do |
|
{ |
|
+ again: |
|
newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK; |
|
if (oldval == newval) |
|
break; |
|
@@ -135,7 +136,7 @@ __pthread_cancel (pthread_t th) |
|
int newval2 = oldval | CANCELING_BITMASK; |
|
if (!atomic_compare_exchange_weak_acquire (&pd->cancelhandling, |
|
&oldval, newval2)) |
|
- continue; |
|
+ goto again; |
|
|
|
if (pd == THREAD_SELF) |
|
/* This is not merely an optimization: An application may
|
|
|