From 079f74d960a87dfbf52418e9c0f812f694fc3a31 Mon Sep 17 00:00:00 2001 From: liankong Date: Mon, 31 Mar 2025 19:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/core_hook.c | 5 +-- kernel/kpm/kpm.c | 88 ++++++++++++++++++++++++---------------------- kernel/kpm/kpm.h | 2 +- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/kernel/core_hook.c b/kernel/core_hook.c index 2f2c090c..86b73f52 100644 --- a/kernel/core_hook.c +++ b/kernel/core_hook.c @@ -419,10 +419,7 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3, pr_info("KPM: calling before arg2=%d\n", (int) arg2); - res = sukisu_handle_kpm(arg2, arg3, arg4); - copy_to_user(result, &res, sizeof(res)); - - pr_info("KPM: calling before arg2=%d res=%d\n", (int) arg2, (int) res); + res = sukisu_handle_kpm(arg2, arg3, arg4, arg5); return 0; } diff --git a/kernel/kpm/kpm.c b/kernel/kpm/kpm.c index 87ec9bec..8dd28d1e 100644 --- a/kernel/kpm/kpm.c +++ b/kernel/kpm/kpm.c @@ -58,64 +58,69 @@ noinline 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. + int res = -1; printk("KPM: Stub function called (sukisu_kpm_load_module_path). path=%s args=%s ptr=%p\n", path, args, ptr); __asm__ volatile("nop"); // 精确控制循环不被优化 - return -1; + copy_to_user(result, &res, sizeof(res)); } noinline 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. + int res = -1; printk("KPM: Stub function called (sukisu_kpm_unload_module). name=%s ptr=%p\n", name, ptr); __asm__ volatile("nop"); // 精确控制循环不被优化 - return -1; + copy_to_user(result, &res, sizeof(res)); } noinline NO_OPTIMIZE -int sukisu_kpm_num(void) { +void sukisu_kpm_num(void __user* result) { // This is a KPM module stub. + int res = 0; printk("KPM: Stub function called (sukisu_kpm_num).\n"); __asm__ volatile("nop"); // 精确控制循环不被优化 - return 0; + copy_to_user(result, &res, sizeof(res)); } noinline 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. + int res = -1; printk("KPM: Stub function called (sukisu_kpm_info). name=%s buffer=%p\n", name, out); __asm__ volatile("nop"); // 精确控制循环不被优化 - return -1; + copy_to_user(result, &res, sizeof(res)); } noinline 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. + int res = -1; 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 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. + int res = -1; printk("KPM: Stub function called (sukisu_kpm_control). name=%p args=%p\n", name, args); __asm__ volatile("nop"); // 精确控制循环不被优化 - return -1; + copy_to_user(result, &res, sizeof(res)); } noinline NO_OPTIMIZE -int sukisu_kpm_version(void __user* out, unsigned int bufferSize) { - // This is a KPM module stub. +void sukisu_kpm_version(void __user* out, unsigned int bufferSize, void __user* result) { + int res = -1; printk("KPM: Stub function called (sukisu_kpm_version). buffer=%p size=%d\n", out, bufferSize); - __asm__ volatile("nop"); // 精确控制循环不被优化 - return -1; + copy_to_user(result, &res, sizeof(res)); } EXPORT_SYMBOL(sukisu_kpm_load_module_path); @@ -127,55 +132,52 @@ EXPORT_SYMBOL(sukisu_kpm_version); EXPORT_SYMBOL(sukisu_kpm_control); noinline -NO_OPTIMIZE -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) { - __asm__ volatile("nop"); // 精确控制循环不被优化 - if(arg3 == SUKISU_KPM_LOAD) { + if(arg2 == SUKISU_KPM_LOAD) { char kernel_load_path[256] = { 0 }; char kernel_args_buffer[256] = { 0 }; - if(arg4 == 0) { + if(arg3 == 0) { return -1; } - strncpy_from_user((char*)&kernel_load_path, (const char __user *)arg4, 255); - if(arg5 != 0) { - strncpy_from_user((char*)&kernel_args_buffer, (const char __user *)arg5, 255); + strncpy_from_user((char*)&kernel_load_path, (const char __user *)arg3, 255); + if(arg4 != 0) { + 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); - } else if(arg3 == SUKISU_KPM_UNLOAD) { + sukisu_kpm_load_module_path((const char*)&kernel_load_path, (const char*) &kernel_args_buffer, NULL, (void __user*) arg5); + } else if(arg2 == SUKISU_KPM_UNLOAD) { char kernel_name_buffer[256] = { 0 }; - if(arg4 == 0) { + if(arg3 == 0) { return -1; } - strncpy_from_user((char*)&kernel_name_buffer, (const char __user *)arg4, 255); - return sukisu_kpm_unload_module((const char*) &kernel_name_buffer, NULL); - } else if(arg3 == SUKISU_KPM_NUM) { - return sukisu_kpm_num(); - } else if(arg3 == SUKISU_KPM_INFO) { + strncpy_from_user((char*)&kernel_name_buffer, (const char __user *)arg3, 255); + sukisu_kpm_unload_module((const char*) &kernel_name_buffer, NULL, (void __user*) arg5); + } else if(arg2 == SUKISU_KPM_NUM) { + sukisu_kpm_num((void __user*) arg5); + } else if(arg2 == SUKISU_KPM_INFO) { char kernel_name_buffer[256] = { 0 }; - if(arg4 == 0 || arg5 == 0) { + if(arg3 == 0 || arg4 == 0) { return -1; } - strncpy_from_user((char*)&kernel_name_buffer, (const char __user *)arg4, 255); - return sukisu_kpm_info((const char*) &kernel_name_buffer, (char __user*) arg5); - } else if(arg3 == SUKISU_KPM_LIST) { - return sukisu_kpm_list((char __user*) arg4, (unsigned int) arg5); - } else if(arg3 == SUKISU_KPM_VERSION) { - return sukisu_kpm_version((char __user*) arg4, (unsigned int) arg5); - } else if(arg3 == SUKISU_KPM_CONTROL) { - return sukisu_kpm_control((char __user*) arg4, (char __user*) arg5); + strncpy_from_user((char*)&kernel_name_buffer, (const char __user *)arg3, 255); + sukisu_kpm_info((const char*) &kernel_name_buffer, (char __user*) arg4, (void __user*) arg5); + } else if(arg2 == SUKISU_KPM_LIST) { + sukisu_kpm_list((char __user*) arg3, (unsigned int) arg4, (void __user*) arg5); + } else if(arg2 == SUKISU_KPM_VERSION) { + sukisu_kpm_version((char __user*) arg3, (unsigned int) arg4, (void __user*) arg5); + } else if(arg2 == SUKISU_KPM_CONTROL) { + sukisu_kpm_control((char __user*) arg3, (char __user*) arg4, (void __user*) arg5); } - __asm__ volatile("nop"); // 精确控制循环不被优化 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; } diff --git a/kernel/kpm/kpm.h b/kernel/kpm/kpm.h index 83145f97..f9f98848 100644 --- a/kernel/kpm/kpm.h +++ b/kernel/kpm/kpm.h @@ -1,7 +1,7 @@ #ifndef ___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); // KPM控制代码