[3.14] gh-128605: Add branch protections for x86_64 in asm_trampoline.S (#128606)#135077
Merged
vstinner merged 1 commit intopython:3.14from Jun 3, 2025
Merged
Conversation
…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
requested review from
brandtbucher and
savannahostrowski
as code owners
This was referenced Jun 3, 2025
|
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 request
Jun 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 commit 899cca6) Co-authored-by: stratakis <cstratak@redhat.com>
|
GH-135083 is a backport of this pull request to the 3.13 branch. |
|
Thanks @stratakis for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12. |
|
Sorry, @stratakis and @vstinner, I could not cleanly backport this to |
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 request
Jun 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 commit 899cca6) Co-authored-by: stratakis <cstratak@redhat.com>
encukou
added a commit
to encukou/cpython
that referenced
this pull request
Jun 5, 2025
…asm_trampoline.S (python#128606) (python#135077)" This reverts commit 899cca6, which broke buildbots.
|
GH-135175 is a backport of this pull request to the 3.14 branch. |
encukou
added a commit
that referenced
this pull request
Jun 6, 2025
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jun 6, 2025
…asm_tr…ampoline.S (pythonGH-128606) (pythonGH-135077)" (pythonGH-135175) This reverts commit 899cca6, which broke buildbots. (cherry picked from commit b477e21) Co-authored-by: Petr Viktorin <encukou@gmail.com>
encukou
added a commit
that referenced
this pull request
Jun 6, 2025
……ampoline.S (GH-128606) (GH-135077)" (GH-135175) (GH-135203) [3.14] gh-128605: Revert "Add branch protections for x86_64 in asm_tr…ampoline.S (GH-128606) (GH-135077)" (GH-135175) This reverts commit 899cca6, which broke buildbots. (cherry picked from commit b477e21) Co-authored-by: Petr Viktorin <encukou@gmail.com>
Member
|
This was backported to 3.12 in #135094. |
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
3 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.
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