gh-148660: Fix use-after-free in OrderedDict.copy() on reentrant mutation#151573
Merged
Conversation
…t mutation OrderedDict.copy() walks the internal linked list while building the new dict. The loop body can run arbitrary Python (a key's __eq__/__hash__, or a subclass __getitem__/__setitem__) which can clear the source dict and free the nodes being iterated. Detect this the same way OrderedDict.__eq__ already does (pythongh-119004): snapshot od_state before the loop, hold a strong reference to the key and read the hash before any reentrant call, and raise RuntimeError if the state changed before advancing to the next node.
gpshead
added
needs backport to 3.13
|
Thanks @gpshead for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14, 3.15. |
|
GH-152540 is a backport of this pull request to the 3.15 branch. |
bedevere-app
Bot
removed
the
needs backport to 3.15
|
Sorry, @gpshead, I could not cleanly backport this to |
|
GH-152541 is a backport of this pull request to the 3.14 branch. |
|
GH-152542 is a backport of this pull request to the 3.13 branch. |
gpshead
added a commit
that referenced
this pull request
Jun 29, 2026
…nt mutation (GH-151573) (#152541) gh-148660: Fix use-after-free in OrderedDict.copy() on reentrant mutation (GH-151573) * gh-148660: Fix use-after-free in OrderedDict.copy() on reentrant mutation OrderedDict.copy() walks the internal linked list while building the new dict. The loop body can run arbitrary Python (a key's __eq__/__hash__, or a subclass __getitem__/__setitem__) which can clear the source dict and free the nodes being iterated. Detect this the same way OrderedDict.__eq__ already does (gh-119004): snapshot od_state before the loop, hold a strong reference to the key and read the hash before any reentrant call, and raise RuntimeError if the state changed before advancing to the next node. * gh-148660: fix NEWS nit, suppress undocumented OrderedDict.copy xref (cherry picked from commit 7d128e3) Co-authored-by: Gregory P. Smith <68491+gpshead@users.noreply.github.com>
gpshead
added a commit
that referenced
this pull request
Jun 29, 2026
…nt mutation (GH-151573) (#152540) gh-148660: Fix use-after-free in OrderedDict.copy() on reentrant mutation (GH-151573) * gh-148660: Fix use-after-free in OrderedDict.copy() on reentrant mutation OrderedDict.copy() walks the internal linked list while building the new dict. The loop body can run arbitrary Python (a key's __eq__/__hash__, or a subclass __getitem__/__setitem__) which can clear the source dict and free the nodes being iterated. Detect this the same way OrderedDict.__eq__ already does (gh-119004): snapshot od_state before the loop, hold a strong reference to the key and read the hash before any reentrant call, and raise RuntimeError if the state changed before advancing to the next node. * gh-148660: fix NEWS nit, suppress undocumented OrderedDict.copy xref (cherry picked from commit 7d128e3) Co-authored-by: Gregory P. Smith <68491+gpshead@users.noreply.github.com>
gpshead
added a commit
that referenced
this pull request
Jun 29, 2026
…nt mutation (GH-151573) (#152542) OrderedDict.copy() walks the internal linked list while building the new dict. The loop body can run arbitrary Python (a key's __eq__/__hash__, or a subclass __getitem__/__setitem__) which can clear the source dict and free the nodes being iterated. Detect this the same way OrderedDict.__eq__ already does (gh-119004): snapshot od_state before the loop, hold a strong reference to the key and read the hash before any reentrant call, and raise RuntimeError if the state changed before advancing to the next node. (cherry picked from commit 7d128e3)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
OrderedDict.copy() walks the internal linked list while building the new dict. The loop body can run arbitrary Python (a key's
__eq__/__hash__, or a subclass__getitem__/__setitem__) which can clear the source dict and free the nodes being iterated.Detect this the same way OrderedDict.
__eq__already does (gh-119004): snapshot od_state before the loop, hold a strong reference to the key and read the hash before any reentrant call, and raise RuntimeError if the state changed before advancing to the next node.