FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-120198: Fix crash when two thread edit __class__ by Fidget-Spinner · Pull Request #120195 · python/cpython · GitHub

/ cpython Public

gh-120198: Fix crash when two thread edit __class__ - #120195

Merged
zooba merged 12 commits into
python:mainfrom
Fidget-Spinner:hello
Jun 11, 2024
ConversationCommits (12)ChecksFiles changed
Merged

gh-120198: Fix crash when two thread edit __class__#120195
zooba merged 12 commits into
python:mainfrom
Fidget-Spinner:hello

Conversation

Fidget-Spinner commented Jun 7, 2024 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

bedevere-app Bot added tests Tests in the Lib/test dir awaiting core review labels Jun 7, 2024
vstinner marked this pull request as draft June 7, 2024 07:11

vstinner commented Jun 7, 2024

Copy link
Copy Markdown
Member

[FOR CI, DO NOT MERGE]

I marked your PR as a draft in this case.

Fidget-Spinner mentioned this pull request Jun 7, 2024
Closed
Fidget-Spinner changed the title [FOR CI, DO NOT MERGE] gh-120198: Fix crash from concurrent setting of __class__ Jun 7, 2024
Fidget-Spinner changed the title gh-120198: Fix crash from concurrent setting of __class__ [FOR TESTING ONLY] crasher Jun 7, 2024
fix bug
02a5587 
Co-Authored-By: Nadeshiko Manju <me@manjusaka.me>
Fidget-Spinner changed the title [FOR TESTING ONLY] crasher gh-120198: Fix crash when two thread edit __class__ Jun 10, 2024
Fidget-Spinner requested a review from zooba June 10, 2024 15:07
Fidget-Spinner marked this pull request as ready for review June 10, 2024 15:07
zooba reviewed Jun 10, 2024
View reviewed changes
Comment thread Lib/test/test_free_threading/test_type.py Outdated
zooba added the needs backport to 3.12 only security fixes label Jun 10, 2024
Move test like Steve suggested
1fc5c01 
Co-Authored-By: Steve Dower <steve.dower@microsoft.com>
Zheaoli approved these changes Jun 10, 2024
View reviewed changes

Zheaoli left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

BTW should we backport this to 3.11?

zooba commented Jun 10, 2024

Copy link
Copy Markdown
Member

If we go to 3.11 then we go to 3.8 (unless the audit event was added later). Technically we should, because crashers are technically eligible for security fix releases, but this one really requires deliberate exploitation and it's very unlikely to be achievable without arbitrary code. And the test is likely to destabilise earlier releases more than the fix is worth.

If someone wants to prepare a PR against 3.11 without the test, we can let the RMs decide.

zooba merged commit 203565b into python:main Jun 11, 2024

miss-islington-app Bot commented Jun 11, 2024

Copy link
Copy Markdown

Thanks @Fidget-Spinner for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 11, 2024
pythongh-120198: Fix race condition when editing __class__ with an au…
2a5692a 
…dit hook active (pythonGH-120195)

(cherry picked from commit 203565b)

Co-authored-by: Ken Jin <kenjin@python.org>

miss-islington-app Bot commented Jun 11, 2024

Copy link
Copy Markdown

Sorry, @Fidget-Spinner and @zooba, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 203565b2f9c74656ba519780049b46d4e5afcba1 3.12

bedevere-app Bot commented Jun 11, 2024

Copy link
Copy Markdown

GH-120366 is a backport of this pull request to the 3.13 branch.

bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label Jun 11, 2024
zooba assigned Fidget-Spinner and unassigned zooba Jun 11, 2024

zooba commented Jun 11, 2024

Copy link
Copy Markdown
Member

@Fidget-Spinner Could you handle the backport, please?

zooba pushed a commit that referenced this pull request Jun 11, 2024
gh-120198: Fix race condition when editing __class__ with an audit ho…
a6c4080 
…ok active (GH-120195)

(cherry picked from commit 203565b)

Co-authored-by: Ken Jin <kenjin@python.org>

Fidget-Spinner commented Jun 12, 2024

Copy link
Copy Markdown
Member Author

@zooba sure!

Fidget-Spinner commented Jun 12, 2024

Copy link
Copy Markdown
Member Author

@Zheaoli so sorry I had planned to add you as co-author when merging but was asleep when this merged.

Fidget-Spinner mentioned this pull request Jun 12, 2024
Merged

bedevere-app Bot commented Jun 12, 2024

Copy link
Copy Markdown

GH-120393 is a backport of this pull request to the 3.12 branch.

bedevere-app Bot removed the needs backport to 3.12 only security fixes label Jun 12, 2024
Fidget-Spinner deleted the hello branch June 12, 2024 11:32
zooba pushed a commit that referenced this pull request Jun 12, 2024
gh-120198: Fix race condition when editing __class__ with an audit ho…
e8a9f0c 
…ok active (GH-120195)

Co-authored-by: Nadeshiko Manju <me@manjusaka.me>

Zheaoli commented Jun 12, 2024

Copy link
Copy Markdown
Contributor

@Fidget-Spinner No problem sir! Thanks very much. I'm so happy to see we solve this issue

mrahtz pushed a commit to mrahtz/cpython that referenced this pull request Jun 30, 2024
pythongh-120198: Fix race condition when editing __class__ with an au…
a9a5889 
…dit hook active (pythonGH-120195)
noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024
pythongh-120198: Fix race condition when editing __class__ with an au…
7a06f46 
…dit hook active (pythonGH-120195)
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
pythongh-120198: Fix race condition when editing __class__ with an au…
7346d61 
…dit hook active (pythonGH-120195)
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

markshannon Awaiting requested review from markshannon markshannon is a code owner
serhiy-storchaka Awaiting requested review from serhiy-storchaka
zooba Awaiting requested review from zooba
1 more reviewer
Zheaoli Zheaoli approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

Fidget-Spinner

Labels

tests Tests in the Lib/test dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

Back | FazBrowse Home | New Git URL