Skip to content
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

Jump to bottom

Initial support for arm64e PAC #90

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Initial support for arm64e PAC #90

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
13 changes: 13 additions & 0 deletions fishhook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
#include <mach-o/loader.h>
#include <mach-o/nlist.h>

#if __has_include(<ptrauth.h>)
#include <ptrauth.h>
#endif

#ifdef __LP64__
typedef struct mach_header_64 mach_header_t;
typedef struct segment_command_64 segment_command_t;
Expand Down Expand Up @@ -153,7 +157,16 @@ static void perform_rebinding_with_section(struct rebindings_entry *rebindings,
* iOS 15 has corrected the const segments prot.
* -- Lionfore Hao Jun 11th, 2021
**/
#if !__has_feature(ptrauth_calls)
indirect_symbol_bindings[i] = cur->rebindings[j].replacement;
#else
void *replacement = cur->rebindings[j].replacement;
if (!strcmp(section->sectname, "__auth_got")) {
void *stripped = ptrauth_strip(replacement, ptrauth_key_process_independent_code);
replacement = ptrauth_sign_unauthenticated(stripped, ptrauth_key_process_independent_code, &indirect_symbol_bindings[i]);
}
indirect_symbol_bindings[i] = replacement;
#endif
}
goto symbol_loop;
}
Expand Down