GH-97002: Prevent _PyInterpreterFrames from backing more than one PyFrameObject - #97996
Merged
markshannon merged 4 commits intoOct 6, 2022
Merged
GH-97002: Prevent _PyInterpreterFrames from backing more than one PyFrameObject#97996markshannon merged 4 commits into
markshannon merged 4 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
Thanks @brandtbucher for the PR, and @markshannon for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11. |
Sorry, something went wrong.
Copy link
Copy Markdown
|
GH-98002 is a backport of this pull request to the 3.11 branch. |
Sorry, something went wrong.
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Oct 6, 2022
… one `PyFrameObject` (pythonGH-97996) (cherry picked from commit 21a2d9f) Co-authored-by: Brandt Bucher <brandtbucher@microsoft.com>
carljm
added a commit
to carljm/cpython
that referenced
this pull request
Oct 8, 2022
* main: pythonGH-97002: Prevent `_PyInterpreterFrame`s from backing more than one `PyFrameObject` (pythonGH-97996) pythongh-97973: Return all necessary information from the tokenizer (pythonGH-97984) fixes pythongh-96078: os.sched_yield release the GIL while calling sched_yield(2). (pythongh-97965) pythongh-65961: Do not rely solely on `__cached__` (pythonGH-97990) pythongh-97850: Remove the open issues section from the import reference (python#97935) Docs: pin sphinx-lint (pythonGH-97992) pythongh-94590: add signatures to operator itemgetter, attrgetter, methodcaller (python#94591) Add Pynche's move to the What's new in 3.11 (python#97974) pythongh-97781: Apply changes from importlib_metadata 5. (pythonGH-97785) pythongh-86482: Document assignment expression need for ()s (python#23291) pythongh-97943: PyFunction_GetAnnotations should return a borrowed reference. (python#97949)
mpage
pushed a commit
to mpage/cpython
that referenced
this pull request
Oct 11, 2022
… one `PyFrameObject` (pythonGH-97996)
andersk
reviewed
Jun 26, 2023
Comment thread
Python/frame.c
| // Just pretend that we have an owned, cleared frame so frame_dealloc | ||
| // doesn't make the situation worse: | ||
| f->f_frame = (_PyInterpreterFrame *)f->_f_frame_data; | ||
| f->f_frame->owner = FRAME_CLEARED; |
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
FRAME_CLEARED is a value of enum _framestate. Shouldn’t ->owner be a value of enum _frameowner instead?
Sorry, something went wrong.
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
Reviewers
Assignees
5 participants
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.
There is a nasty situation where a GC collection during PyFrameObject allocation could create multiple PyFrameObjects for the same _PyInterpreterFrame, which breaks our ownership rules and creates all sorts of opportunities for accessing corrupted memory.
If this happens, we just keep the PyFrameObject that has already been exposed to user code, and throw away the duplicate.