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

Fix KPM control code logic, adjust prctl call parameters to handle return values correctly

Browse Source
This commit is contained in:
ShirkNeko
2025-03-29 16:57:14 +08:00
parent 03c97d2720
commit c2395d48f2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
userspace/kpmmgr/jni/kpmmgr.c
View File

@@ -20,7 +20,7 @@
#define SUKISU_KPM_CONTROL 6 #define SUKISU_KPM_CONTROL 6
#define SUKISU_KPM_PRINT 7 #define SUKISU_KPM_PRINT 7
#define CONTROL_CODE(n) (CMD_KPM_CONTROL + n) #define CONTROL_CODE(n) (CMD_KPM_CONTROL + n - 1)
void print_usage(const char *prog) { void print_usage(const char *prog) {
printf("Usage: %s <command> [args]\n", prog); printf("Usage: %s <command> [args]\n", prog);
@@ -41,17 +41,19 @@ int main(int argc, char *argv[]) {
} }
int ret = -1; int ret = -1;
int out = 0; // 存储返回值 int out = -1; // 存储返回值
if (strcmp(argv[1], "load") == 0 && argc >= 3) { if (strcmp(argv[1], "load") == 0 && argc >= 3) {
// 加载 KPM 模块 // 加载 KPM 模块
ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_LOAD), argv[2], (argc > 3 ? argv[3] : NULL), &out); ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_LOAD), argv[2], (argc > 3 ? argv[3] : NULL), &out);
} else if (strcmp(argv[1], "unload") == 0 && argc >= 3) { } else if (strcmp(argv[1], "unload") == 0 && argc >= 3) {
// 卸载 KPM 模块 // 卸载 KPM 模块
ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_UNLOAD), argv[2], &out); ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_UNLOAD), argv[2], NULL, &out);
} else if (strcmp(argv[1], "num") == 0) { } else if (strcmp(argv[1], "num") == 0) {
// 获取加载的 KPM 数量 // 获取加载的 KPM 数量
ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_NUM), &out); ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_NUM), NULL, NULL, &out);
printf("%d", out);
return 0;
} else if (strcmp(argv[1], "list") == 0) { } else if (strcmp(argv[1], "list") == 0) {
// 获取模块列表 // 获取模块列表
char buffer[1024] = {0}; char buffer[1024] = {0};
@@ -71,14 +73,14 @@ int main(int argc, char *argv[]) {
ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_CONTROL), argv[2], argv[3], &out); ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_CONTROL), argv[2], argv[3], &out);
} else if (strcmp(argv[1], "print") == 0) { } else if (strcmp(argv[1], "print") == 0) {
// 在 stdout 输出 KPM 列表 // 在 stdout 输出 KPM 列表
ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_PRINT), &out); ret = prctl(KSU_OPTIONS, CONTROL_CODE(SUKISU_KPM_PRINT), NULL, NULL, &out);
} else { } else {
print_usage(argv[0]); print_usage(argv[0]);
return 1; return 1;
} }
if (ret < 0) { if (out < 0) {
printf("Error: %s\n", strerror(errno)); printf("Error: %s\n", strerror(-out));
return -1; return -1;
} }