forked from pool/glibc
Andreas Schwab
0432c11393
- nptl-cleanup-async-restore-2.patch: nptl: Fix ___pthread_unregister_cancel_restore asynchronous restore (bsc#1200093, BZ #29214) OBS-URL: https://build.opensuse.org/request/show/989181 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=621
32 lines
966 B
Diff
32 lines
966 B
Diff
From 51e2d3b53bd08a21e5a9a4ed095abd2c61f622bc Mon Sep 17 00:00:00 2001
|
|
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
Date: Wed, 13 Jul 2022 10:37:32 -0300
|
|
Subject: [PATCH] nptl: Fix ___pthread_unregister_cancel_restore asynchronous
|
|
restore
|
|
|
|
This was due a wrong revert done on 404656009b459658.
|
|
|
|
Checked on x86_64-linux-gnu and i686-linux-gnu.
|
|
|
|
(cherry picked from commit f27e5e21787abc9f719879af47687221aa1027b3)
|
|
---
|
|
nptl/cleanup_defer.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/nptl/cleanup_defer.c b/nptl/cleanup_defer.c
|
|
index eb0bc77740..4e864ead32 100644
|
|
--- a/nptl/cleanup_defer.c
|
|
+++ b/nptl/cleanup_defer.c
|
|
@@ -71,7 +71,7 @@ ___pthread_unregister_cancel_restore (__pthread_unwind_buf_t *buf)
|
|
return;
|
|
|
|
int cancelhandling = atomic_load_relaxed (&self->cancelhandling);
|
|
- if (cancelhandling & CANCELTYPE_BITMASK)
|
|
+ if ((cancelhandling & CANCELTYPE_BITMASK) == 0)
|
|
{
|
|
int newval;
|
|
do
|
|
--
|
|
2.37.1
|
|
|