Repository navigation
Backport #87 to 6.18-lts: x86: fault: emulate trampolines that start with endbr - #91
Open
edera-rebase-app[bot] wants to merge 1 commit into
Open
edera-rebase-app[bot] wants to merge 1 commit into
edera-rebase-app[bot] wants to merge 1 commit into
Conversation
gcc built with -fcf-protection, the default on Ubuntu and Fedora, starts its nested-function trampolines with endbr64, or endbr32 for 32-bit code. The EMUTRAMP matchers compare the bytes at the faulting address against trampolines that start with a mov, so none of these match and the task is killed with SIGSEGV. Skip a leading endbr before matching. The only relative target, the 32-bit jmp, is computed from the address after it. Signed-off-by: Kavi <kavi@edera.dev> (cherry picked from commit 779605c)
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
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.
Backport of #87 from
edera/mainlinetoedera/6.18-lts(aab8db4df0e4), prepared by Claude. Run log.Merge with Rebase and merge, so
edera/6.18-ltsstays linear.Independent checks
Builds: success (x86_64 and arm64 vmlinux with the Edera features built in).
aab8db4df0e4e57c1d66ff79Claude's report
Summary
One commit requested, one backported unchanged:
779605ce32cf"x86: fault: emulate trampolines that start with endbr" cherry-picked cleanly ontoedera/6.18-ltswith-x. The OpenPaX EMUTRAMP matchers it touches (openpax_emulate_trampoline_32/64inarch/x86/mm/fault.c) are identical on 6.18-lts and mainline, and the patch only usesget_user()and local variables, so it needs nothing from upstream or from any other pending Edera commit.verify-backport.shpasses locally (fast-forward, linear, same subject, identical +/- lines), and I expect the workflow's checker to pass as well.Needs a decision
None.
Adapted commits
None.
Left out
None.
Builds
BUILD_RESULTS