android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

移除 KPM 模块中函数的可见性修饰符，简化代码结构

Browse Source
This commit is contained in:
ShirkNeko
2025-04-01 12:38:06 +08:00
parent aa7fd2fe2b
commit f17e106464
3 changed files with 18 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/kpm/Makefile
View File

@@ -1,4 +1,2 @@
obj-y += kpm.o obj-y += kpm.o
obj-y += compact.o obj-y += compact.o
ccflags-y += -flto=thin

5
kernel/kpm/compact.c
View File

@@ -36,14 +36,13 @@ struct CompactAddressSymbol {
void* addr; void* addr;
}; };
__section(".data") static struct CompactAddressSymbol address_symbol [] = { static struct CompactAddressSymbol address_symbol [] = {
{ "kallsyms_lookup_name", &kallsyms_lookup_name }, { "kallsyms_lookup_name", &kallsyms_lookup_name },
{ "compact_find_symbol", &sukisu_compact_find_symbol }, { "compact_find_symbol", &sukisu_compact_find_symbol },
{ "is_run_in_sukisu_ultra", (void*)1 } { "is_run_in_sukisu_ultra", (void*)1 }
}; };
unsigned long sukisu_compact_find_symbol(const char* name) {
__section(".text") unsigned long sukisu_compact_find_symbol(const char* name) {
int i; int i;
unsigned long addr; unsigned long addr;

72
kernel/kpm/kpm.c
View File

@@ -54,113 +54,73 @@
#endif #endif
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,6,0)
#define USE_DIRECT_PRINT
#endif
// ============================================================================================ // ============================================================================================
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
__section(".text") void sukisu_kpm_load_module_path(const char* path, const char* args, void* ptr, void __user* result) { void sukisu_kpm_load_module_path(const char* path, const char* args, void* ptr, void __user* result) {
// This is a KPM module stub. // This is a KPM module stub.
int res = -1; int res = -1;
printk("KPM: Stub function called (sukisu_kpm_load_module_path). path=%s args=%s ptr=%p\n", path, args, ptr); printk("KPM: Stub function called (sukisu_kpm_load_module_path). path=%s args=%s ptr=%p\n", path, args, ptr);
__asm__ volatile("nop"); // 精确控制循环不被优化 __asm__ volatile("nop"); // 精确控制循环不被优化
#ifndef USE_DIRECT_PRINT if(copy_to_user(result, &res, sizeof(res)) < 1) printk("KPM: Copy to user faild.");
if(copy_to_user(result, &res, sizeof(res)) < 1)
printk("KPM: Copy to user failed.");
#else
printk("KPM: Kernel version >= 6.6, unknown return");
#endif
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
__section(".text") void sukisu_kpm_unload_module(const char* name, void* ptr, void __user* result) { void sukisu_kpm_unload_module(const char* name, void* ptr, void __user* result) {
// This is a KPM module stub. // This is a KPM module stub.
int res = -1; int res = -1;
printk("KPM: Stub function called (sukisu_kpm_unload_module). name=%s ptr=%p\n", name, ptr); printk("KPM: Stub function called (sukisu_kpm_unload_module). name=%s ptr=%p\n", name, ptr);
__asm__ volatile("nop"); // 精确控制循环不被优化 __asm__ volatile("nop"); // 精确控制循环不被优化
#ifndef USE_DIRECT_PRINT if(copy_to_user(result, &res, sizeof(res)) < 1) printk("KPM: Copy to user faild.");
if(copy_to_user(result, &res, sizeof(res)) < 1)
printk("KPM: Copy to user failed.");
#else
printk("KPM: Kernel version >= 6.6, unknown return");
#endif
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
__section(".text") void sukisu_kpm_num(void __user* result) { void sukisu_kpm_num(void __user* result) {
// This is a KPM module stub. // This is a KPM module stub.
int res = 0; int res = 0;
printk("KPM: Stub function called (sukisu_kpm_num).\n"); printk("KPM: Stub function called (sukisu_kpm_num).\n");
__asm__ volatile("nop"); // 精确控制循环不被优化 __asm__ volatile("nop"); // 精确控制循环不被优化
#ifndef USE_DIRECT_PRINT if(copy_to_user(result, &res, sizeof(res)) < 1) printk("KPM: Copy to user faild.");
if(copy_to_user(result, &res, sizeof(res)) < 1)
printk("KPM: Copy to user failed.");
#else
printk("KPM: Kernel version >= 6.6, unknown return");
#endif
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
__section(".text") void sukisu_kpm_info(const char* name, void __user* out, void __user* result) { void sukisu_kpm_info(const char* name, void __user* out, void __user* result) {
// This is a KPM module stub. // This is a KPM module stub.
int res = -1; int res = -1;
printk("KPM: Stub function called (sukisu_kpm_info). name=%s buffer=%p\n", name, out); printk("KPM: Stub function called (sukisu_kpm_info). name=%s buffer=%p\n", name, out);
__asm__ volatile("nop"); // 精确控制循环不被优化 __asm__ volatile("nop"); // 精确控制循环不被优化
#ifndef USE_DIRECT_PRINT if(copy_to_user(result, &res, sizeof(res)) < 1) printk("KPM: Copy to user faild.");
if(copy_to_user(result, &res, sizeof(res)) < 1)
printk("KPM: Copy to user failed.");
#else
printk("KPM: Kernel version >= 6.6, unknown return");
#endif
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
__section(".text") void sukisu_kpm_list(void __user* out, unsigned int bufferSize, void __user* result) { void sukisu_kpm_list(void __user* out, unsigned int bufferSize, void __user* result) {
// This is a KPM module stub. // This is a KPM module stub.
int res = -1; int res = -1;
printk("KPM: Stub function called (sukisu_kpm_list). buffer=%p size=%d\n", out, bufferSize); printk("KPM: Stub function called (sukisu_kpm_list). buffer=%p size=%d\n", out, bufferSize);
#ifndef USE_DIRECT_PRINT if(copy_to_user(result, &res, sizeof(res)) < 1) printk("KPM: Copy to user faild.");
if(copy_to_user(result, &res, sizeof(res)) < 1)
printk("KPM: Copy to user failed.");
#else
printk("KPM: Kernel version >= 6.6, unknown return");
#endif
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
__section(".text") void sukisu_kpm_control(void __user* name, void __user* args, void __user* result) { void sukisu_kpm_control(void __user* name, void __user* args, void __user* result) {
// This is a KPM module stub. // This is a KPM module stub.
int res = -1; int res = -1;
printk("KPM: Stub function called (sukisu_kpm_control). name=%p args=%p\n", name, args); printk("KPM: Stub function called (sukisu_kpm_control). name=%p args=%p\n", name, args);
__asm__ volatile("nop"); // 精确控制循环不被优化 __asm__ volatile("nop"); // 精确控制循环不被优化
#ifndef USE_DIRECT_PRINT if(copy_to_user(result, &res, sizeof(res)) < 1) printk("KPM: Copy to user faild.");
if(copy_to_user(result, &res, sizeof(res)) < 1)
printk("KPM: Copy to user failed.");
#else
printk("KPM: Kernel version >= 6.6, unknown return");
#endif
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
__section(".text") void sukisu_kpm_version(void __user* out, unsigned int bufferSize, void __user* result) { void sukisu_kpm_version(void __user* out, unsigned int bufferSize, void __user* result) {
int res = -1; int res = -1;
printk("KPM: Stub function called (sukisu_kpm_version). buffer=%p size=%d\n", out, bufferSize); printk("KPM: Stub function called (sukisu_kpm_version). buffer=%p size=%d\n", out, bufferSize);
#ifndef USE_DIRECT_PRINT if(copy_to_user(result, &res, sizeof(res)) < 1) printk("KPM: Copy to user faild.");
if(copy_to_user(result, &res, sizeof(res)) < 1)
printk("KPM: Copy to user failed.");
#else
printk("KPM: Kernel version >= 6.6, unknown return");
#endif
} }
EXPORT_SYMBOL(sukisu_kpm_load_module_path); EXPORT_SYMBOL(sukisu_kpm_load_module_path);
@@ -172,7 +132,7 @@ EXPORT_SYMBOL(sukisu_kpm_version);
EXPORT_SYMBOL(sukisu_kpm_control); EXPORT_SYMBOL(sukisu_kpm_control);
noinline noinline
__section(".text") int sukisu_handle_kpm(unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) int sukisu_handle_kpm(unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
{ {
if(arg2 == SUKISU_KPM_LOAD) { if(arg2 == SUKISU_KPM_LOAD) {
char kernel_load_path[256] = { 0 }; char kernel_load_path[256] = { 0 };
@@ -217,7 +177,7 @@ __section(".text") int sukisu_handle_kpm(unsigned long arg2, unsigned long arg3,
return 0; return 0;
} }
__section(".text") int sukisu_is_kpm_control_code(unsigned long arg2) { int sukisu_is_kpm_control_code(unsigned long arg2) {
return (arg2 >= CMD_KPM_CONTROL && arg2 <= CMD_KPM_CONTROL_MAX) ? 1 : 0; return (arg2 >= CMD_KPM_CONTROL && arg2 <= CMD_KPM_CONTROL_MAX) ? 1 : 0;
} }