summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-10-07 16:14:04 -0700
committerGitHub <noreply@github.com>2021-10-07 16:14:04 -0700
commit87f0156a229e4cda92ad8e50645c5a71030caf7c (patch)
tree4cd352db3200ac3dd9c1959d54c243fa1a6a41dd
parent06935bd68e3d89a4cc3f08c1d15eaa651b79a523 (diff)
downloadcpython-git-87f0156a229e4cda92ad8e50645c5a71030caf7c.tar.gz
bpo-45262, asyncio: Fix cache of the running loop holder (GH-28796)
Prevent use-after-free of running loop holder via cache. (cherry picked from commit 392a89835371baa0fc4bf79ae479abb80661f57d) Co-authored-by: Matthias Reichl <github@hias.horus.com>
-rw-r--r--Misc/NEWS.d/next/Library/2021-10-07-14-04-10.bpo-45262.HqF71Z.rst1
-rw-r--r--Modules/_asynciomodule.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Library/2021-10-07-14-04-10.bpo-45262.HqF71Z.rst b/Misc/NEWS.d/next/Library/2021-10-07-14-04-10.bpo-45262.HqF71Z.rst
new file mode 100644
index 0000000000..4cd949fe1e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-10-07-14-04-10.bpo-45262.HqF71Z.rst
@@ -0,0 +1 @@
+Prevent use-after-free in asyncio. Make sure the cached running loop holder gets cleared on dealloc to prevent use-after-free in get_running_loop \ No newline at end of file
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index b615c48c43..4457d7bd49 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -3258,6 +3258,9 @@ new_running_loop_holder(PyObject *loop)
static void
PyRunningLoopHolder_tp_dealloc(PyRunningLoopHolder *rl)
{
+ if (cached_running_holder == (PyObject *)rl) {
+ cached_running_holder = NULL;
+ }
Py_CLEAR(rl->rl_loop);
PyObject_Free(rl);
}