Merge branch 'main' into multi-module-impl

Author: Ylarod

kernel/core_hook.c

@@ -62,7 +62,7 @@ static inline bool is_allow_su()
 	return ksu_is_allow_uid(current_uid().val);
 }
 
-static inline bool is_unsupported_uid(uid_t uid)
+static inline bool is_unsupported_app_uid(uid_t uid)
 {
 #define LAST_APPLICATION_UID 19999
 	uid_t appid = uid % 100000;
@@ -506,14 +506,13 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
 	return 0;
 }
 
-static bool is_appuid(kuid_t uid)
+static bool is_non_appuid(kuid_t uid)
 {
 #define PER_USER_RANGE 100000
 #define FIRST_APPLICATION_UID 10000
-#define LAST_APPLICATION_UID 19999
 
 	uid_t appid = uid.val % PER_USER_RANGE;
-	return appid >= FIRST_APPLICATION_UID && appid <= LAST_APPLICATION_UID;
+	return appid < FIRST_APPLICATION_UID;
 }
 
 static bool should_umount(struct path *path)
@@ -585,13 +584,25 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
 		return 0;
 	}
 
-	if (!is_appuid(new_uid) || is_unsupported_uid(new_uid.val)) {
-		// pr_info("handle setuid ignore non application or isolated uid: %d\n", new_uid.val);
+	if (is_non_appuid(new_uid)) {
+#ifdef CONFIG_KSU_DEBUG
+		pr_info("handle setuid ignore non application uid: %d\n", new_uid.val);
+#endif
 		return 0;
 	}
 
+	// isolated process may be directly forked from zygote, always unmount
+	if (is_unsupported_app_uid(new_uid.val)) {
+#ifdef CONFIG_KSU_DEBUG
+		pr_info("handle umount for unsupported application uid: %d\n", new_uid.val);
+#endif
+		goto do_umount;
+	}
+
 	if (ksu_is_allow_uid(new_uid.val)) {
-		// pr_info("handle setuid ignore allowed application: %d\n", new_uid.val);
+#ifdef CONFIG_KSU_DEBUG
+		pr_info("handle setuid ignore allowed application: %d\n", new_uid.val);
+#endif
 		return 0;
 	}
 
@@ -603,11 +614,11 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
 #endif
 	}
 
+do_umount:
 	// check old process's selinux context, if it is not zygote, ignore it!
 	// because some su apps may setuid to untrusted_app but they are in global mount namespace
 	// when we umount for such process, that is a disaster!
-	bool is_zygote_child = is_zygote(old->security);
-	if (!is_zygote_child) {
+	if (!is_zygote(old->security)) {
 		pr_info("handle umount ignore non zygote child: %d\n",
 			current->pid);
 		return 0;

kernel/sucompat.c

@@ -279,7 +279,8 @@ void ksu_sucompat_init()
 void ksu_sucompat_exit()
 {
 #ifdef CONFIG_KPROBES
-	for (int i = 0; i < ARRAY_SIZE(su_kps); i++) {
+	int i;
+	for (i = 0; i < ARRAY_SIZE(su_kps); i++) {
 		destroy_kprobe(&su_kps[i]);
 	}
 #endif

manager/app/src/main/cpp/jni.cc

@@ -8,7 +8,11 @@
 #include "ksu.h"
 
 #define LOG_TAG "KernelSU"
+#ifdef NDEBUG
+#define LOGD(...) (void)0
+#else
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#endif
 
 extern "C"
 JNIEXPORT jboolean JNICALL
@@ -305,4 +309,4 @@ extern "C"
 JNIEXPORT jboolean JNICALL
 Java_me_weishu_kernelsu_Natives_setSuEnabled(JNIEnv *env, jobject thiz, jboolean enabled) {
     return set_su_enabled(enabled);
-}
+}

manager/app/src/main/java/me/weishu/kernelsu/ui/component/Dialog.kt

@@ -420,6 +420,7 @@ private fun ConfirmDialog(
         show = showDialog,
         title = visuals.title,
         onDismissRequest = {
+            dismiss()
             showDialog.value = false
         },
         content = {

manager/app/src/main/java/me/weishu/kernelsu/ui/component/UninstallDialog.kt

@@ -6,6 +6,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -43,6 +45,9 @@ fun UninstallDialog(
     val showTodo = {
         Toast.makeText(context, "TODO", Toast.LENGTH_SHORT).show()
     }
+    val showConfirmDialog = remember(showDialog.value) { mutableStateOf(false) }
+    val runType = remember(showDialog.value) { mutableStateOf<UninstallType?>(null) }
+
     val run = { type: UninstallType ->
         when (type) {
             PERMANENT -> navigator.navigate(FlashScreenDestination(FlashIt.FlashUninstall)) {
@@ -84,11 +89,10 @@ fun UninstallDialog(
             options.forEachIndexed { index, type ->
                 SuperArrow(
                     onClick = {
-                        showDialog.value = false
-                        run(type)
+                        showConfirmDialog.value = true
+                        runType.value = type
                     },
                     title = stringResource(type.title),
-                    summary = if (type.message != 0) stringResource(type.message) else null,
                     leftAction = {
                         Icon(
                             imageVector = type.icon,
@@ -112,4 +116,25 @@ fun UninstallDialog(
             )
         }
     )
+    val confirmDialog = rememberConfirmDialog(
+        onConfirm = {
+            showConfirmDialog.value = false
+            showDialog.value = false
+            runType.value?.let { type ->
+                run(type)
+            }
+        },
+        onDismiss = {
+            showConfirmDialog.value = false
+        }
+    )
+    val dialogTitle = runType.value?.let { type ->
+        options.find { it == type }?.let { stringResource(it.title) }
+    } ?: ""
+    val dialogContent = runType.value?.let { type ->
+        options.find { it == type }?.let { stringResource(it.message) }
+    }
+    if (showConfirmDialog.value) {
+        confirmDialog.showConfirm(title = dialogTitle, content = dialogContent)
+    }
 }

manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Install.kt

@@ -259,8 +259,7 @@ private fun SelectInstallMethod(onSelected: (InstallMethod) -> Unit = {}) {
         onConfirm = {
             selectedOption = InstallMethod.DirectInstallToInactiveSlot
             onSelected(InstallMethod.DirectInstallToInactiveSlot)
-        },
-        onDismiss = null
+        }
     )
     val dialogTitle = stringResource(id = android.R.string.dialog_alert_title)
     val dialogContent = stringResource(id = R.string.install_inactive_slot_warning)