Skip to content

Resolve OEM inline hook veneers to prevent infinite recursion #579

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

Open
JingMatrix wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −0
Open

Resolve OEM inline hook veneers to prevent infinite recursion #579

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
30 changes: 30 additions & 0 deletions native/include/core/native_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,38 @@ bool InstallNativeAPI(const lsplant::HookHandler &handler);
*/
void RegisterNativeLib(const std::string &library_name);

#if defined(__aarch64__)
inline void *ResolveOEMVeneer(void *target) {
if (!target) return nullptr;

auto *insn = static_cast<uint32_t *>(target);

// Check for 'ldr x17, pc+8' (0x58000051) followed by 'br x17' (0xd61f0220)
if (insn[0] == 0x58000051 && insn[1] == 0xd61f0220) {
void *real_target = *reinterpret_cast<void **>(insn + 2);
LOGW("OEM veneer (x17) detected at {}, resolving to {}", target, real_target);
return real_target;
}

// Check for 'ldr x16, pc+8' (0x58000050) followed by 'br x16' (0xd61f0200)
if (insn[0] == 0x58000050 && insn[1] == 0xd61f0200) {
void *real_target = *reinterpret_cast<void **>(insn + 2);
LOGW("OEM veneer (x16) detected at {}, resolving to {}", target, real_target);
return real_target;
}

return target;
}
#else
inline void *ResolveOEMVeneer(void *target) { return target; }
#endif

/**
* @brief A wrapper around DobbyHook.
*/
inline int HookInline(void *original, void *replace, void **backup) {
original = ResolveOEMVeneer(original);

if constexpr (kIsDebugBuild) {
Dl_info info;
if (dladdr(original, &info)) {
Expand All @@ -132,6 +160,8 @@ inline int HookInline(void *original, void *replace, void **backup) {
* @brief A wrapper around DobbyDestroy.
*/
inline int UnhookInline(void *original) {
original = ResolveOEMVeneer(original);

if constexpr (kIsDebugBuild) {
Dl_info info;
if (dladdr(original, &info)) {
Expand Down
Loading