From 1a10e7c4af60670201c0063abaee9c32a8e95309 Mon Sep 17 00:00:00 2001 From: JoyElliot <72300219+JoyElliot@users.noreply.github.com> Date: Sun, 15 Nov 2026 17:50:23 +0800 Subject: [PATCH 1/3] kernel: fix raw find_user callsite patching Resolve the hook body for both internal callsite scans. With Clang CFI, the function pointer can instead refer to a jump table entry. Call find_user through an assembly stub in modules so the compiler preserves its return value across the runtime patch. Built-in builds can call find_user directly. --- kernel/routine_raw.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/kernel/routine_raw.c b/kernel/routine_raw.c index 1de95f4..371b1be 100644 --- a/kernel/routine_raw.c +++ b/kernel/routine_raw.c @@ -7,36 +7,37 @@ * published by the Free Software Foundation. * */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpragmas" -#pragma GCC diagnostic ignored "-Winfinite-recursion" - #if defined(__GNUC__) && !defined(__clang__) #define KEEP_SYMBOL_NO_TAIL __attribute__((used)) noinline __attribute__((optimize("no-optimize-sibling-calls"))) #else #define KEEP_SYMBOL_NO_TAIL __attribute__((used)) noinline __attribute__((disable_tail_calls)) #endif -#ifdef MODULE /* stub for free_uid() */ +#ifdef MODULE +// Keep the calls opaque to the compiler until the stubs are patched. __asm__ ( "\n .text " "\n .p2align 2 " + "\n .global gp_find_user " + "\n gp_find_user: " + "\n brk #1 " "\n .global gp_free_uid " "\n gp_free_uid: " "\n brk #1 " ); +KEEP_SYMBOL_NO_TAIL struct user_struct *gp_find_user(kuid_t uid); KEEP_SYMBOL_NO_TAIL void gp_free_uid(struct user_struct *up); #else /* ! MODULE */ +extern struct user_struct *find_user(kuid_t uid); extern void free_uid(struct user_struct *); +#define gp_find_user find_user #define gp_free_uid free_uid #endif /* ! MODULE */ KEEP_SYMBOL_NO_TAIL struct user_struct *gphook_find_user(kuid_t uid) { - // we can actually return early if we want to - // but, this makes sure everything does the same work. - struct user_struct *ret = gphook_find_user(uid); + struct user_struct *ret = gp_find_user(uid); if (getpriority_should_swap(*(int *)&uid)) { gp_free_uid(ret); return nullptr; @@ -45,7 +46,6 @@ KEEP_SYMBOL_NO_TAIL struct user_struct *gphook_find_user(kuid_t uid) return ret; } -#pragma GCC diagnostic pop #undef KEEP_SYMBOL_NO_TAIL #define estimate_sz (256 * 4) @@ -59,13 +59,6 @@ KEEP_SYMBOL_NO_TAIL struct user_struct *gphook_find_user(kuid_t uid) }) #endif -#define self_patch_hook(hook_fn, tgt) ({ \ - uintptr_t hook_p = kernel_function_lookup(hook_fn); \ - int ret = arm64_b_or_bl_patch(hook_p, get_ksym_size(hook_p, estimate_sz), hook_p, tgt); \ - pr_info("patch_hook: %s ret: %d \n", #hook_fn, ret); \ - ret; \ -}) - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) #define syscall_lookup(name) kallsyms_lookup_name("__arm64_" name) #else @@ -78,16 +71,21 @@ static __init int getpriority_hook_init(void) if (!symbol_addr) return -ENOENT; - int ret = self_patch_hook(gphook_find_user, symbol_addr); + int ret; +#ifdef MODULE + // With CFI, the function pointer can point to a jump table entry. + uintptr_t hook_body = kernel_function_lookup(gphook_find_user); + size_t hook_size = get_ksym_size(hook_body, estimate_sz); + ret = arm64_b_or_bl_patch(hook_body, hook_size, kernel_function_lookup(gp_find_user), symbol_addr); + pr_info("patch_hook: gphook_find_user ret: %d\n", ret); if (ret) return ret; -#ifdef MODULE uintptr_t symbol_addr2 = kallsyms_lookup_name("free_uid"); if (!symbol_addr2) return -ENOENT; - ret = arm64_b_or_bl_patch(gphook_find_user, get_ksym_size(gphook_find_user, estimate_sz), kernel_function_lookup(gp_free_uid), (uintptr_t)symbol_addr2); + ret = arm64_b_or_bl_patch(hook_body, hook_size, kernel_function_lookup(gp_free_uid), symbol_addr2); if (ret) return ret; #endif From 2c39c41aba0df9143c4f00247f519507877abf82 Mon Sep 17 00:00:00 2001 From: backslashxx <118538522+backslashxx@users.noreply.github.com> Date: Mon, 16 Nov 2026 00:04:25 +0800 Subject: [PATCH 2/3] Revert "kernel: fix raw find_user callsite patching" This reverts commit 1a10e7c4af60670201c0063abaee9c32a8e95309. --- kernel/routine_raw.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/kernel/routine_raw.c b/kernel/routine_raw.c index 371b1be..1de95f4 100644 --- a/kernel/routine_raw.c +++ b/kernel/routine_raw.c @@ -7,37 +7,36 @@ * published by the Free Software Foundation. * */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" +#pragma GCC diagnostic ignored "-Winfinite-recursion" + #if defined(__GNUC__) && !defined(__clang__) #define KEEP_SYMBOL_NO_TAIL __attribute__((used)) noinline __attribute__((optimize("no-optimize-sibling-calls"))) #else #define KEEP_SYMBOL_NO_TAIL __attribute__((used)) noinline __attribute__((disable_tail_calls)) #endif -#ifdef MODULE -// Keep the calls opaque to the compiler until the stubs are patched. +#ifdef MODULE /* stub for free_uid() */ __asm__ ( "\n .text " "\n .p2align 2 " - "\n .global gp_find_user " - "\n gp_find_user: " - "\n brk #1 " "\n .global gp_free_uid " "\n gp_free_uid: " "\n brk #1 " ); -KEEP_SYMBOL_NO_TAIL struct user_struct *gp_find_user(kuid_t uid); KEEP_SYMBOL_NO_TAIL void gp_free_uid(struct user_struct *up); #else /* ! MODULE */ -extern struct user_struct *find_user(kuid_t uid); extern void free_uid(struct user_struct *); -#define gp_find_user find_user #define gp_free_uid free_uid #endif /* ! MODULE */ KEEP_SYMBOL_NO_TAIL struct user_struct *gphook_find_user(kuid_t uid) { - struct user_struct *ret = gp_find_user(uid); + // we can actually return early if we want to + // but, this makes sure everything does the same work. + struct user_struct *ret = gphook_find_user(uid); if (getpriority_should_swap(*(int *)&uid)) { gp_free_uid(ret); return nullptr; @@ -46,6 +45,7 @@ KEEP_SYMBOL_NO_TAIL struct user_struct *gphook_find_user(kuid_t uid) return ret; } +#pragma GCC diagnostic pop #undef KEEP_SYMBOL_NO_TAIL #define estimate_sz (256 * 4) @@ -59,6 +59,13 @@ KEEP_SYMBOL_NO_TAIL struct user_struct *gphook_find_user(kuid_t uid) }) #endif +#define self_patch_hook(hook_fn, tgt) ({ \ + uintptr_t hook_p = kernel_function_lookup(hook_fn); \ + int ret = arm64_b_or_bl_patch(hook_p, get_ksym_size(hook_p, estimate_sz), hook_p, tgt); \ + pr_info("patch_hook: %s ret: %d \n", #hook_fn, ret); \ + ret; \ +}) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) #define syscall_lookup(name) kallsyms_lookup_name("__arm64_" name) #else @@ -71,21 +78,16 @@ static __init int getpriority_hook_init(void) if (!symbol_addr) return -ENOENT; - int ret; -#ifdef MODULE - // With CFI, the function pointer can point to a jump table entry. - uintptr_t hook_body = kernel_function_lookup(gphook_find_user); - size_t hook_size = get_ksym_size(hook_body, estimate_sz); - ret = arm64_b_or_bl_patch(hook_body, hook_size, kernel_function_lookup(gp_find_user), symbol_addr); - pr_info("patch_hook: gphook_find_user ret: %d\n", ret); + int ret = self_patch_hook(gphook_find_user, symbol_addr); if (ret) return ret; +#ifdef MODULE uintptr_t symbol_addr2 = kallsyms_lookup_name("free_uid"); if (!symbol_addr2) return -ENOENT; - ret = arm64_b_or_bl_patch(hook_body, hook_size, kernel_function_lookup(gp_free_uid), symbol_addr2); + ret = arm64_b_or_bl_patch(gphook_find_user, get_ksym_size(gphook_find_user, estimate_sz), kernel_function_lookup(gp_free_uid), (uintptr_t)symbol_addr2); if (ret) return ret; #endif From 98abc85c24b976202448e05ff1ec6bd3d809d8d1 Mon Sep 17 00:00:00 2001 From: backslashxx <118538522+backslashxx@users.noreply.github.com> Date: Mon, 16 Nov 2026 00:04:36 +0800 Subject: [PATCH 3/3] Update routine_raw.c --- kernel/routine_raw.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/routine_raw.c b/kernel/routine_raw.c index 1de95f4..4abab00 100644 --- a/kernel/routine_raw.c +++ b/kernel/routine_raw.c @@ -87,7 +87,11 @@ static __init int getpriority_hook_init(void) if (!symbol_addr2) return -ENOENT; - ret = arm64_b_or_bl_patch(gphook_find_user, get_ksym_size(gphook_find_user, estimate_sz), kernel_function_lookup(gp_free_uid), (uintptr_t)symbol_addr2); + uintptr_t gphook_find_user_p = kallsyms_lookup_name("gphook_find_user"); + if (!gphook_find_user_p) + return -ENOENT; + + ret = arm64_b_or_bl_patch(gphook_find_user_p, get_ksym_size(gphook_find_user_p, estimate_sz), kernel_function_lookup(gp_free_uid), (uintptr_t)symbol_addr2); if (ret) return ret; #endif