From: Nadeshiko Manju <me@manjusaka.me>
Date: Wed, 1 Oct 2025 11:34:47 +0000 (+0800)
Subject: gh-123828: Fix data race in `_interpchannels._waiting_release` (GH-124107)
X-Git-Tag: v3.15.0a1~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f39dea3baeb9f9b7a0199d06508d722494db0145;p=thirdparty%2FPython%2Fcpython.git

gh-123828: Fix data race in `_interpchannels._waiting_release` (GH-124107)
---

diff --git a/Lib/test/test__interpchannels.py b/Lib/test/test__interpchannels.py
index 858d31a73cf4..d7cf77368ef9 100644
--- a/Lib/test/test__interpchannels.py
+++ b/Lib/test/test__interpchannels.py
@@ -6,7 +6,7 @@ import threading
 import time
 import unittest
 
-from test.support import import_helper, skip_if_sanitizer
+from test.support import import_helper
 
 _channels = import_helper.import_module('_interpchannels')
 from concurrent.interpreters import _crossinterp
@@ -365,7 +365,6 @@ class ChannelIDTests(TestBase):
         #self.assertIsNot(got, obj)
 
 
-@skip_if_sanitizer('gh-129824: race on _waiting_release', thread=True)
 class ChannelTests(TestBase):
 
     def test_create_cid(self):
diff --git a/Modules/_interpchannelsmodule.c b/Modules/_interpchannelsmodule.c
index 9c1f86151612..274bfacfed87 100644
--- a/Modules/_interpchannelsmodule.c
+++ b/Modules/_interpchannelsmodule.c
@@ -511,12 +511,12 @@ _waiting_release(_waiting_t *waiting, int received)
     assert(!waiting->received);
 
     waiting->status = WAITING_RELEASING;
-    PyThread_release_lock(waiting->mutex);
     if (waiting->received != received) {
         assert(received == 1);
         waiting->received = received;
     }
     waiting->status = WAITING_RELEASED;
+    PyThread_release_lock(waiting->mutex);
 }
 
 static void