Skip to content

gh-154431: Eagerly initialize the audit hooks list #154554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZeroIntensity wants to merge 3 commits into
base: main
Choose a base branch
from
+18 −13
Open

gh-154431: Eagerly initialize the audit hooks list #154554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b7c1b0
Eagerly initialize audit hooks.
ZeroIntensity Jul 23, 2026
97fe202
Merge branch 'main' into issues/gh-154431-sys-addaudithook-race
ZeroIntensity Jul 27, 2026
e90adbb
Fix test failures.
ZeroIntensity Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,8 +857,6 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
*/
// XXX Make sure we properly deal with problematic finalizers.

Py_CLEAR(interp->audit_hooks);

// gh-140257: Threads have already been cleared, but daemon threads may
// still access eval_breaker atomically via take_gil() right before they
// hang. Use an atomic store to prevent data races during finalization.
Expand Down
29 changes: 18 additions & 11 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,12 @@ should_audit(PyInterpreterState *interp)
if (!interp) {
return 0;
}
// interp->audit_hooks can only ever be NULL very early during initialization
// or very late during finalization.
int interp_has_audit_hooks = (interp->audit_hooks != NULL
&& PyList_GET_SIZE(interp->audit_hooks) > 0);
return (interp->runtime->audit_hooks.head
|| interp->audit_hooks
|| interp_has_audit_hooks
|| PyDTrace_AUDIT_ENABLED());
}

Expand Down Expand Up @@ -306,7 +310,9 @@ sys_audit_tstate(PyThreadState *ts, const char *event,
}

/* Call interpreter hooks */
if (is->audit_hooks) {
PyObject *audit_hooks = is->audit_hooks;
assert(audit_hooks != NULL);
if (PyList_GET_SIZE(audit_hooks) > 0) {
eventName = PyUnicode_FromString(event);
if (!eventName) {
goto exit;
Expand Down Expand Up @@ -447,6 +453,8 @@ _PySys_ClearAuditHooks(PyThreadState *ts)
PyMem_RawFree(e);
e = n;
}

Py_CLEAR(ts->interp->audit_hooks);
}

static void
Expand Down Expand Up @@ -536,15 +544,7 @@ sys_addaudithook_impl(PyObject *module, PyObject *hook)
}

PyInterpreterState *interp = tstate->interp;
if (interp->audit_hooks == NULL) {
interp->audit_hooks = PyList_New(0);
if (interp->audit_hooks == NULL) {
return NULL;
}
/* Avoid having our list of hooks show up in the GC module */
PyObject_GC_UnTrack(interp->audit_hooks);
}

assert(interp->audit_hooks != NULL);
if (PyList_Append(interp->audit_hooks, hook) < 0) {
return NULL;
}
Expand Down Expand Up @@ -4313,6 +4313,13 @@ _PySys_Create(PyThreadState *tstate, PyObject **sysmod_p)

PyInterpreterState *interp = tstate->interp;

PyObject *audit_hooks = PyList_New(0);
if (audit_hooks == NULL) {
goto error;
}
_PyObject_GC_UNTRACK(audit_hooks);
interp->audit_hooks = audit_hooks;

PyObject *modules = _PyImport_InitModules(interp);
if (modules == NULL) {
goto error;
Expand Down
Loading