a8db42ba53
Upstream commit: 71326f1f2fd09dafb9c34404765fb88129e94237 - nptl: Fix pthread_cancel cancelhandling atomic operations - mips: Fix mips64n32 64 bit time_t stat support (BZ#29069) - hurd: Fix arbitrary error code - nptl: Handle spurious EINTR when thread cancellation is disabled (BZ#29029) - S390: Add new s390 platform z16. - NEWS: Update fixed bug list for LD_AUDIT backports. - hppa: Fix bind-now audit (BZ #28857) - elf: Replace tst-audit24bmod2.so with tst-audit24bmod2 - Fix elf/tst-audit25a with default bind now toolchains - elf: Fix runtime linker auditing on aarch64 (BZ #26643) - elf: Issue la_symbind for bind-now (BZ #23734) - elf: Fix initial-exec TLS access on audit modules (BZ #28096) - elf: Add la_activity during application exit - elf: Do not fail for failed dlmopen on audit modules (BZ #28061) - elf: Issue audit la_objopen for vDSO - elf: Add audit tests for modules with TLSDESC - elf: Avoid unnecessary slowdown from profiling with audit (BZ#15533) - elf: Add _dl_audit_pltexit - elf: Add _dl_audit_pltenter - elf: Add _dl_audit_preinit - elf: Add _dl_audit_symbind_alt and _dl_audit_symbind - elf: Add _dl_audit_objclose - elf: Add _dl_audit_objsearch - elf: Add _dl_audit_activity_map and _dl_audit_activity_nsid - elf: Add _dl_audit_objopen - elf: Move la_activity (LA_ACT_ADD) after _dl_add_to_namespace_list() (BZ #28062) - elf: Move LAV_CURRENT to link_lavcurrent.h - elf: Fix elf_get_dynamic_info() for bootstrap - elf: Fix dynamic-link.h usage on rtld.c - elf: Fix elf_get_dynamic_info definition - elf: Avoid nested functions in the loader [BZ #27220] - powerpc: Delete unneeded ELF_MACHINE_BEFORE_RTLD_RELOC - hppa: Use END instead of PSEUDO_END in swapcontext.S - hppa: Implement swapcontext in assembler (bug 28960) Reviewed-by: Florian Weimer <fweimer at redhat.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
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
|