Skip to content

[3.11] gh-87604: Avoid publishing list of active per-interpreter audit hooks via the gc module (GH-99373)#99491

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

Merged
miss-islington merged 1 commit into from
Nov 15, 2022
Merged

[3.11] gh-87604: Avoid publishing list of active per-interpreter audit hooks via the gc module (GH-99373) #99491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions Lib/test/audit-tests.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -440,6 +440,17 @@ def hook(event, args):
syslog.closelog()


deftest_not_in_gc():
importgc

hook=lambda*a: None
sys.addaudithook(hook)

foroingc.get_objects():
ifisinstance(o, list):
asserthooknotino


if__name__=="__main__":
fromtest.supportimportsuppress_msvcrt_asserts

Expand Down
5 changes: 5 additions & 0 deletions Lib/test/test_audit.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,6 +209,11 @@ def test_syslog(self):
('syslog.closelog', '', '')]
)

def test_not_in_gc(self):
returncode, _, stderr = self.run_python("test_not_in_gc")
if returncode:
self.fail(stderr)


if __name__ == "__main__":
unittest.main()
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Security/2022-11-11-12-50-28.gh-issue-87604.OtwH5L.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
Avoid publishing list of active per-interpreter audit hooks via the
:mod:`gc` module
2 changes: 2 additions & 0 deletions Python/sysmodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -440,6 +440,8 @@ sys_addaudithook_impl(PyObject *module, PyObject *hook)
if (interp->audit_hooks==NULL){
returnNULL;
}
/* Avoid having our list of hooks show up in the GC module */
PyObject_GC_UnTrack(interp->audit_hooks);
}

if (PyList_Append(interp->audit_hooks, hook) <0){
Expand Down