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

更新 KPM 模块，添加函数节区标记以优化内存布局，并在 Makefile 中调整编译选项以消除类型不匹配警告

Browse Source
This commit is contained in:
ShirkNeko
2025-04-01 10:35:02 +08:00
parent 9b9d72f200
commit f8e456dfcf
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/kpm/Makefile
View File

@@ -1,4 +1,4 @@
obj-y += kpm.o obj-y += kpm.o
obj-y += compact.o obj-y += compact.o
ccflags-y += -flto=thin ccflags-y += -flto=thin -Wno-lto-type-mismatch

4
kernel/kpm/compact.c
View File

@@ -36,13 +36,13 @@ struct CompactAddressSymbol {
void* addr; void* addr;
}; };
static struct CompactAddressSymbol address_symbol [] = { __visible __section(".data") 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) { __visible unsigned long sukisu_compact_find_symbol(const char* name) {
int i; int i;
unsigned long addr; unsigned long addr;

14
kernel/kpm/kpm.c
View File

@@ -58,7 +58,7 @@
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
void sukisu_kpm_load_module_path(const char* path, const char* args, void* ptr, void __user* result) { __section(".text") 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);
@@ -68,7 +68,7 @@ void sukisu_kpm_load_module_path(const char* path, const char* args, void* ptr,
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
void sukisu_kpm_unload_module(const char* name, void* ptr, void __user* result) { __section(".text") 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);
@@ -78,7 +78,7 @@ void sukisu_kpm_unload_module(const char* name, void* ptr, void __user* result)
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
void sukisu_kpm_num(void __user* result) { __section(".text") 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");
@@ -88,7 +88,7 @@ void sukisu_kpm_num(void __user* result) {
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
void sukisu_kpm_info(const char* name, void __user* out, void __user* result) { __section(".text") 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);
@@ -98,7 +98,7 @@ void sukisu_kpm_info(const char* name, void __user* out, void __user* result) {
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
void sukisu_kpm_list(void __user* out, unsigned int bufferSize, void __user* result) { __section(".text") 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);
@@ -107,7 +107,7 @@ void sukisu_kpm_list(void __user* out, unsigned int bufferSize, void __user* res
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
void sukisu_kpm_control(void __user* name, void __user* args, void __user* result) { __section(".text") 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);
@@ -117,7 +117,7 @@ void sukisu_kpm_control(void __user* name, void __user* args, void __user* resul
noinline noinline
NO_OPTIMIZE NO_OPTIMIZE
void sukisu_kpm_version(void __user* out, unsigned int bufferSize, void __user* result) { __section(".text") 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);
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 faild.");