From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 21 Jul 2025 21:01:14 +0000 (+0200)
Subject: [3.14] gh-136870: fix data race in `PyThreadState_Clear` on `sys_tracing_threads... 
X-Git-Tag: v3.14.0rc1~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=718fc5b1393d9ce52fc0353fb361818e865e3e45;p=thirdparty%2FPython%2Fcpython.git

[3.14] gh-136870: fix data race in `PyThreadState_Clear` on `sys_tracing_threads` (GH-136951) (#136953)

gh-136870: fix data race in `PyThreadState_Clear` on `sys_tracing_threads` (GH-136951)

In free-threading, multiple threads can be cleared concurrently as such the modifications on `sys_tracing_threads` should be done while holding the profile lock, otherwise it can race with other threads setting up profiling.
(cherry picked from commit f183996eb77fd2d5662c62667298c292c943ebf5)

Co-authored-by: Kumar Aditya <kumaraditya@python.org>
---

diff --git a/Python/pystate.c b/Python/pystate.c
index 015e9f8725c1..aa2c4bd51814 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -1793,6 +1793,10 @@ PyThreadState_Clear(PyThreadState *tstate)
           "PyThreadState_Clear: warning: thread still has a generator\n");
     }
 
+#ifdef Py_GIL_DISABLED
+    PyMutex_Lock(&_PyRuntime.ceval.sys_trace_profile_mutex);
+#endif
+
     if (tstate->c_profilefunc != NULL) {
         tstate->interp->sys_profiling_threads--;
         tstate->c_profilefunc = NULL;
@@ -1801,6 +1805,11 @@ PyThreadState_Clear(PyThreadState *tstate)
         tstate->interp->sys_tracing_threads--;
         tstate->c_tracefunc = NULL;
     }
+
+#ifdef Py_GIL_DISABLED
+    PyMutex_Unlock(&_PyRuntime.ceval.sys_trace_profile_mutex);
+#endif
+
     Py_CLEAR(tstate->c_profileobj);
     Py_CLEAR(tstate->c_traceobj);