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

zooba · web-flow · commit 4e4b13e8f621 · 2022-11-14T21:39:18.000Z
diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py
@@ -450,6 +450,17 @@ def hook(event, args):
     syslog.closelog()
 
 
+def test_not_in_gc():
+    import gc
+
+    hook = lambda *a: None
+    sys.addaudithook(hook)
+
+    for o in gc.get_objects():
+        if isinstance(o, list):
+            assert hook not in o
+
+
 if __name__ == "__main__":
     from test.support import suppress_msvcrt_asserts
 
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
@@ -222,6 +222,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()
diff --git a/Misc/NEWS.d/next/Security/2022-11-11-12-50-28.gh-issue-87604.OtwH5L.rst b/Misc/NEWS.d/next/Security/2022-11-11-12-50-28.gh-issue-87604.OtwH5L.rst
@@ -0,0 +1,2 @@
+Avoid publishing list of active per-interpreter audit hooks via the
+:mod:`gc` module
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -431,6 +431,8 @@ sys_addaudithook_impl(PyObject *module, PyObject *hook)
         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);
     }
 
     if (PyList_Append(interp->audit_hooks, hook) < 0) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Avoid publishing list of active per-interpreter audit hooks via the`
	`2`	+:mod:`gc` module
Original file line number	Diff line number	Diff line change
`@@ -431,6 +431,8 @@ sys_addaudithook_impl(PyObject module, PyObject hook)`
`431`	`431`	`if (interp->audit_hooks == NULL) {`
`432`	`432`	`return NULL;`
`433`	`433`	`}`
	`434`	`+ /* Avoid having our list of hooks show up in the GC module */`
	`435`	`+ PyObject_GC_UnTrack(interp->audit_hooks);`
`434`	`436`	`}`
`435`	`437`
`436`	`438`	`if (PyList_Append(interp->audit_hooks, hook) < 0) {`