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-03-31 20:10:32 +08:00
parent 2fc0935f58
commit 6c4b73a38e
3 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/core_hook.c
View File

@@ -513,10 +513,7 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
pr_info("KPM: calling before arg2=%d\n", (int) arg2); pr_info("KPM: calling before arg2=%d\n", (int) arg2);
res = sukisu_handle_kpm(arg2, arg3, arg4); res = sukisu_handle_kpm(arg2, arg3, arg4, arg5);
copy_to_user(result, &res, sizeof(res));
pr_info("KPM: calling before arg2=%d res=%d\n", (int) arg2, (int) res);
return 0; return 0;
} }

88
kernel/kpm/kpm.c
View File

@@ -58,64 +58,69 @@
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
int sukisu_kpm_load_module_path(const char* path, const char* args, void* ptr) { 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;
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"); // 精确控制循环不被优化
return -1; copy_to_user(result, &res, sizeof(res));
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
int sukisu_kpm_unload_module(const char* name, void* ptr) { 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;
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"); // 精确控制循环不被优化
return -1; copy_to_user(result, &res, sizeof(res));
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
int sukisu_kpm_num(void) { void sukisu_kpm_num(void __user* result) {
// This is a KPM module stub. // This is a KPM module stub.
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"); // 精确控制循环不被优化
return 0; copy_to_user(result, &res, sizeof(res));
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
int sukisu_kpm_info(const char* name, void __user* out) { 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;
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"); // 精确控制循环不被优化
return -1; copy_to_user(result, &res, sizeof(res));
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
int sukisu_kpm_list(void __user* out, unsigned int bufferSize) { 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;
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);
return -1; copy_to_user(result, &res, sizeof(res));
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
int sukisu_kpm_control(void __user* name, void __user* args) { 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;
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"); // 精确控制循环不被优化
return -1; copy_to_user(result, &res, sizeof(res));
} }
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
int sukisu_kpm_version(void __user* out, unsigned int bufferSize) { void sukisu_kpm_version(void __user* out, unsigned int bufferSize, void __user* result) {
// This is a KPM module stub. 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);
__asm__ volatile("nop"); // 精确控制循环不被优化 copy_to_user(result, &res, sizeof(res));
return -1;
} }
EXPORT_SYMBOL(sukisu_kpm_load_module_path); EXPORT_SYMBOL(sukisu_kpm_load_module_path);
@@ -127,55 +132,52 @@ EXPORT_SYMBOL(sukisu_kpm_version);
EXPORT_SYMBOL(sukisu_kpm_control); EXPORT_SYMBOL(sukisu_kpm_control);
noinline noinline
NO_OPTIMIZE int sukisu_handle_kpm(unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
int sukisu_handle_kpm(unsigned long arg3, unsigned long arg4, unsigned long arg5)
{ {
__asm__ volatile("nop"); // 精确控制循环不被优化 if(arg2 == SUKISU_KPM_LOAD) {
if(arg3 == SUKISU_KPM_LOAD) {
char kernel_load_path[256] = { 0 }; char kernel_load_path[256] = { 0 };
char kernel_args_buffer[256] = { 0 }; char kernel_args_buffer[256] = { 0 };
if(arg4 == 0) { if(arg3 == 0) {
return -1; return -1;
} }
strncpy_from_user((char*)&kernel_load_path, (const char __user *)arg4, 255); strncpy_from_user((char*)&kernel_load_path, (const char __user *)arg3, 255);
if(arg5 != 0) { if(arg4 != 0) {
strncpy_from_user((char*)&kernel_args_buffer, (const char __user *)arg5, 255); strncpy_from_user((char*)&kernel_args_buffer, (const char __user *)arg4, 255);
} }
return sukisu_kpm_load_module_path((const char*)&kernel_load_path, (const char*) &kernel_args_buffer, NULL); sukisu_kpm_load_module_path((const char*)&kernel_load_path, (const char*) &kernel_args_buffer, NULL, (void __user*) arg5);
} else if(arg3 == SUKISU_KPM_UNLOAD) { } else if(arg2 == SUKISU_KPM_UNLOAD) {
char kernel_name_buffer[256] = { 0 }; char kernel_name_buffer[256] = { 0 };
if(arg4 == 0) { if(arg3 == 0) {
return -1; return -1;
} }
strncpy_from_user((char*)&kernel_name_buffer, (const char __user *)arg4, 255); strncpy_from_user((char*)&kernel_name_buffer, (const char __user *)arg3, 255);
return sukisu_kpm_unload_module((const char*) &kernel_name_buffer, NULL); sukisu_kpm_unload_module((const char*) &kernel_name_buffer, NULL, (void __user*) arg5);
} else if(arg3 == SUKISU_KPM_NUM) { } else if(arg2 == SUKISU_KPM_NUM) {
return sukisu_kpm_num(); sukisu_kpm_num((void __user*) arg5);
} else if(arg3 == SUKISU_KPM_INFO) { } else if(arg2 == SUKISU_KPM_INFO) {
char kernel_name_buffer[256] = { 0 }; char kernel_name_buffer[256] = { 0 };
if(arg4 == 0 || arg5 == 0) { if(arg3 == 0 || arg4 == 0) {
return -1; return -1;
} }
strncpy_from_user((char*)&kernel_name_buffer, (const char __user *)arg4, 255); strncpy_from_user((char*)&kernel_name_buffer, (const char __user *)arg3, 255);
return sukisu_kpm_info((const char*) &kernel_name_buffer, (char __user*) arg5); sukisu_kpm_info((const char*) &kernel_name_buffer, (char __user*) arg4, (void __user*) arg5);
} else if(arg3 == SUKISU_KPM_LIST) { } else if(arg2 == SUKISU_KPM_LIST) {
return sukisu_kpm_list((char __user*) arg4, (unsigned int) arg5); sukisu_kpm_list((char __user*) arg3, (unsigned int) arg4, (void __user*) arg5);
} else if(arg3 == SUKISU_KPM_VERSION) { } else if(arg2 == SUKISU_KPM_VERSION) {
return sukisu_kpm_version((char __user*) arg4, (unsigned int) arg5); sukisu_kpm_version((char __user*) arg3, (unsigned int) arg4, (void __user*) arg5);
} else if(arg3 == SUKISU_KPM_CONTROL) { } else if(arg2 == SUKISU_KPM_CONTROL) {
return sukisu_kpm_control((char __user*) arg4, (char __user*) arg5); sukisu_kpm_control((char __user*) arg3, (char __user*) arg4, (void __user*) arg5);
} }
__asm__ volatile("nop"); // 精确控制循环不被优化
return 0; return 0;
} }
int sukisu_is_kpm_control_code(unsigned long arg2) { void 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;
} }

2
kernel/kpm/kpm.h
View File

@@ -1,7 +1,7 @@
#ifndef ___SUKISU_KPM_H #ifndef ___SUKISU_KPM_H
#define ___SUKISU_KPM_H #define ___SUKISU_KPM_H
int sukisu_handle_kpm(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);
int sukisu_is_kpm_control_code(unsigned long arg2); int sukisu_is_kpm_control_code(unsigned long arg2);
// KPM控制代码 // KPM控制代码