Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

[3.14] gh-128605: Add branch protections for x86_64 in asm_trampoline.S (#128606)#135077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged

Conversation

stratakis
Copy link
Contributor

@stratakisstratakis commentedJun 3, 2025
edited by bedevere-appbot
Loading

Apply Intel Control-flow Technology for x86-64 on asm_trampoline.S.

Required for mitigation against return-oriented programming (ROP) and Call or Jump Oriented Programming (COP/JOP) attacks.

Manual application is required for the assembly files.

See also:https://sourceware.org/annobin/annobin.html/Test-cf-protection.html

…poline.S (python#128606)Apply Intel Control-flow Technology for x86-64 on asm_trampoline.S.Required for mitigation against return-oriented programming (ROP)and Call or Jump Oriented Programming (COP/JOP) attacks.Manual application is required for the assembly files.See also:https://sourceware.org/annobin/annobin.html/Test-cf-protection.html
@miss-islington-app
Copy link

Thanks@stratakis for the PR, and@vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull requestJun 3, 2025
…poline.S (pythonGH-128606) (pythonGH-135077)Apply Intel Control-flow Technology for x86-64 on asm_trampoline.S.Required for mitigation against return-oriented programming (ROP)and Call or Jump Oriented Programming (COP/JOP) attacks.Manual application is required for the assembly files.See also:https://sourceware.org/annobin/annobin.html/Test-cf-protection.html(cherry picked from commit899cca6)Co-authored-by: stratakis <cstratak@redhat.com>
@bedevere-app
Copy link

GH-135083 is a backport of this pull request to the3.13 branch.

@bedevere-appbedevere-appbot removed the needs backport to 3.13bugs and security fixes labelJun 3, 2025
@vstinnervstinner added the needs backport to 3.12only security fixes labelJun 3, 2025
@miss-islington-app
Copy link

Thanks@stratakis for the PR, and@vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry,@stratakis and@vstinner, I could not cleanly backport this to3.12 due to a conflict.
Please backport usingcherry_picker on command line.

cherry_picker 899cca6dbf76bf3e06a99f60a5f996ad6ba0761f 3.12

@vstinner
Copy link
Member

@stratakis: It seems like Python 3.12 branch also requires special care. Can you try to backport the change manually?

vstinner pushed a commit that referenced this pull requestJun 3, 2025
….S (GH-128606) (GH-135077) (#135083)[3.14]gh-128605: Add branch protections for x86_64 in asm_trampoline.S (GH-128606) (GH-135077)Apply Intel Control-flow Technology for x86-64 on asm_trampoline.S.Required for mitigation against return-oriented programming (ROP)and Call or Jump Oriented Programming (COP/JOP) attacks.Manual application is required for the assembly files.See also:https://sourceware.org/annobin/annobin.html/Test-cf-protection.html(cherry picked from commit899cca6)Co-authored-by: stratakis <cstratak@redhat.com>
encukou added a commit to encukou/cpython that referenced this pull requestJun 5, 2025
@bedevere-app
Copy link

GH-135175 is a backport of this pull request to the3.14 branch.

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@brandtbucherbrandtbucherAwaiting requested review from brandtbucherbrandtbucher is a code owner

@savannahostrowskisavannahostrowskiAwaiting requested review from savannahostrowskisavannahostrowski is a code owner

Assignees

@vstinnervstinner

Labels
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

2 participants
@stratakis@vstinner

[8]ページ先頭

©2009-2025 Movatter.jp