From: Sam Gross <colesbury@gmail.com>
Date: Fri, 21 Mar 2025 18:22:37 +0000 (-0400)
Subject: gh-117657: Fix TSAN data race in _PyEval_SetTrace assertion (gh-131561)
X-Git-Tag: v3.14.0a7~255
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0de5e0c5442abddbe17481ef450e4abc992058f5;p=thirdparty%2FPython%2Fcpython.git

gh-117657: Fix TSAN data race in _PyEval_SetTrace assertion (gh-131561)

The `sys_tracing_threads` variable should be read inside `LOCK_SETUP()`.
---

diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c
index bafc2356280b..d308a2a40992 100644
--- a/Python/legacy_tracing.c
+++ b/Python/legacy_tracing.c
@@ -594,10 +594,10 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     if (_PySys_Audit(current_tstate, "sys.settrace", NULL) < 0) {
         return -1;
     }
-    assert(tstate->interp->sys_tracing_threads >= 0);
     // needs to be decref'd outside of the lock
     PyObject *old_traceobj;
     LOCK_SETUP();
+    assert(tstate->interp->sys_tracing_threads >= 0);
     Py_ssize_t tracing_threads = setup_tracing(tstate, func, arg, &old_traceobj);
     UNLOCK_SETUP();
     Py_XDECREF(old_traceobj);