GeezerVison

Fidget-Spinner added skip issue skip news labels

vstinner marked this pull request as draft

June 7, 2024 07:11

bedevere-app Bot removed the awaiting core review label

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.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

Fidget-Spinner mentioned this pull request

Read and write of __class__ in two threads causes crash #120198

Closed


          Remove heap type flags

b1dc75b

Fidget-Spinner changed the title ~~[FOR CI, DO NOT MERGE]~~ gh-120198: Fix crash from concurrent setting of __class__


          Revert "Remove heap type flags"

5523a9e

This reverts commit b1dc75b.

Fidget-Spinner changed the title ~~gh-120198: Fix crash from concurrent setting of __class__~~ [FOR TESTING ONLY] crasher

Fidget-Spinner added the DO-NOT-MERGE label


          fix bug

02a5587

Co-Authored-By: Nadeshiko Manju <[email protected]>

Fidget-Spinner changed the title ~~[FOR TESTING ONLY] crasher~~ gh-120198: Fix crash when two thread edit __class__

Fidget-Spinner removed skip issue skip news DO-NOT-MERGE labels


          📜🤖 Added by blurb_it.

70523eb

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

Fidget-Spinner requested a review from markshannon as a code owner

June 10, 2024 15:07

bedevere-app Bot added the awaiting core review label

zooba reviewed

View reviewed changes

Comment thread

Lib/test/test_free_threading/test_type.py Resolved

Uh oh!

There was an error while loading. Please reload this page.

zooba added the needs backport to 3.12 only security fixes label

zooba added the needs backport to 3.13 only security fixes label


          Move test like Steve suggested

1fc5c01

Co-Authored-By: Steve Dower <[email protected]>

Zheaoli approved these changes

View reviewed changes

Zheaoli left a comment

Copy link

Copy Markdown

Contributor

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

LGTM

BTW should we backport this to 3.11?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions


          Merge branch 'hello' of github.com:Fidget-Spinner/cpython into hello

a80f876

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.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.


          skip test if no threads

b70dc07

Fidget-Spinner requested review from serhiy-storchaka and zooba

June 11, 2024 09:35

zooba merged commit 203565b into python:main

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.
🐍🍒⛏🤖

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

bedevere-app Bot removed the awaiting core review label

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          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 <[email protected]>

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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

miss-islington-app Bot assigned zooba

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.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

bedevere-app Bot removed the needs backport to 3.13 only security fixes label

zooba assigned Fidget-Spinner and unassigned zooba

zooba commented Jun 11, 2024

Copy link

Copy Markdown

Member

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

Fidget-Spinner reacted with thumbs up emoji

All reactions

👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

zooba pushed a commit that referenced this pull request