Skip to content

fix(arm64): unwind past PAC-signed return addresses #10

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.

Sign up for GitHub

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

Closed
jpnurmi wants to merge 1 commit into from
Closed

fix(arm64): unwind past PAC-signed return addresses #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions RegsArm64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ static uint64_t strip_pac(uint64_t pc, uint64_t mask) {
pc = __bionic_clear_pac_bits(pc);
#endif
#endif // SENTRY_REMOVED
#ifndef SENTRY_ADDED
#if defined(__aarch64__)
// __bionic_clear_pac_bits() is not in the NDK. Use xpaclri like it does,
// spelled as hint #7 for assemblers without Armv8.3-A support.
register uint64_t x30 __asm("x30") = pc;
asm("hint #7" : "+r"(x30));
pc = x30;
#endif
#endif // SENTRY_ADDED
}
return pc;
}
Expand Down
Loading