Skip to content

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

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2025

Conversation

stratakis
Copy link
Contributor

@stratakis stratakis commented Jun 10, 2025

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
@stratakis
Copy link
Contributor Author

Ideally it should be tested with the !buildbot AMD64.Fedora.Stable

@vstinner
Copy link
Member

!buildbot AMD64 Fedora Stable

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @vstinner for commit be2c6ac 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F135353%2Fmerge

The command will test the builders whose names match following regular expression: AMD64 Fedora Stable

The builders matched are:

  • AMD64 Fedora Stable Refleaks PR
  • AMD64 Fedora Stable Clang Installed PR
  • AMD64 Fedora Stable LTO PR
  • AMD64 Fedora Stable PR
  • AMD64 Fedora Stable LTO + PGO PR
  • AMD64 Fedora Stable Clang PR

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM. I tested the change locally on my Fedora 42 (x86-64): test_perf_profiler pass.

Let's see if the test pass on buildbots as well.

@vstinner
Copy link
Member

The test passed on Fedora Stable buildbot workers. Ok, let's merge this change again.

@vstinner vstinner merged commit 6519257 into python:3.13 Jun 11, 2025
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants