[skip ci]: kernel: simplify KPM enabled check in ksu_handle_prctl
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user