From 8f4c58c4c367323524af85a60f242aa9d202acc3 Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Sat, 24 May 2025 15:25:54 +0800
Subject: [PATCH] [skip ci]: kernel: simplify KPM enabled check in
 ksu_handle_prctl

---
 kernel/core_hook.c              | 9 ++-------
 manager/app/src/main/cpp/jni.cc | 7 +++----
 manager/app/src/main/cpp/ksu.cc | 3 +--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/kernel/core_hook.c b/kernel/core_hook.c
index d0f6973a..193f34e2 100644
--- a/kernel/core_hook.c
+++ b/kernel/core_hook.c
@@ -430,14 +430,9 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
 	#endif
 
 	if (arg2 == CMD_ENABLE_KPM) {
-    #ifdef CONFIG_KPM
-    bool KPM_Enabled = true;
-    #else
-    bool KPM_Enabled = false;
-    #endif
-    	if (copy_to_user((void __user *)arg3, &KPM_Enabled, sizeof(KPM_Enabled))) {
+    	bool KPM_Enabled = IS_ENABLED(CONFIG_KPM);
+    	if (copy_to_user((void __user *)arg3, &KPM_Enabled, sizeof(KPM_Enabled)))
         	pr_info("KPM: copy_to_user() failed\n");
-    	}
     	return 0;
 	}
 
diff --git a/manager/app/src/main/cpp/jni.cc b/manager/app/src/main/cpp/jni.cc
index 846031c0..8cddea69 100644
--- a/manager/app/src/main/cpp/jni.cc
+++ b/manager/app/src/main/cpp/jni.cc
@@ -307,8 +307,7 @@ Java_com_sukisu_ultra_Natives_setSuEnabled(JNIEnv *env, jobject thiz, jboolean e
     return set_su_enabled(enabled);
 }
 
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_sukisu_ultra_Natives_isKPMEnabled(JNIEnv *env, jclass clazz) {
-    return (jboolean)is_KPM_enable();
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_sukisu_ultra_Natives_isKPMEnabled(JNIEnv *env, jobject) {
+    return is_KPM_enable();
 }
\ No newline at end of file
diff --git a/manager/app/src/main/cpp/ksu.cc b/manager/app/src/main/cpp/ksu.cc
index 78680c4f..5dab0a76 100644
--- a/manager/app/src/main/cpp/ksu.cc
+++ b/manager/app/src/main/cpp/ksu.cc
@@ -101,6 +101,5 @@ bool is_su_enabled() {
 
 bool is_KPM_enable() {
     bool enabled = false;
-    ksuctl(CMD_ENABLE_KPM, &enabled, nullptr);
-    return enabled;
+    return ksuctl(CMD_ENABLE_KPM, &enabled, nullptr), enabled;
 }
\ No newline at end of file