From 1f04f13e44744b03679d2825a1a56860459d793b Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Sun, 9 Nov 2025 16:41:54 +0800 Subject: [PATCH] kernel: Remove redundant checks --- kernel/kernel_umount.c | 26 ++++---------------------- kernel/setuid_hook.c | 6 ------ 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/kernel/kernel_umount.c b/kernel/kernel_umount.c index ad3db5e4..cce74584 100644 --- a/kernel/kernel_umount.c +++ b/kernel/kernel_umount.c @@ -18,6 +18,7 @@ #include "ksud.h" #include "umount_manager.h" +#include "sulog.h" static bool ksu_kernel_umount_enabled = true; @@ -119,23 +120,6 @@ static void umount_tw_func(struct callback_head *cb) kfree(tw); } -static inline bool is_appuid(uid_t uid) -{ -#define PER_USER_RANGE 100000 -#define FIRST_APPLICATION_UID 10000 -#define LAST_APPLICATION_UID 19999 - - uid_t appid = uid % PER_USER_RANGE; - return appid >= FIRST_APPLICATION_UID && appid <= LAST_APPLICATION_UID; -} - -static inline bool is_unsupported_uid(uid_t uid) -{ -#define LAST_APPLICATION_UID 19999 - uid_t appid = uid % 100000; - return appid > LAST_APPLICATION_UID; -} - int ksu_handle_umount(uid_t old_uid, uid_t new_uid) { struct umount_tw *tw; @@ -149,11 +133,6 @@ int ksu_handle_umount(uid_t old_uid, uid_t new_uid) return 0; } - if (!is_appuid(new_uid) || is_unsupported_uid(new_uid)) { - pr_info("handle setuid ignore non application or isolated uid: %d\n", new_uid); - return 0; - } - if (!ksu_uid_should_umount(new_uid)) { return 0; } else { @@ -168,6 +147,9 @@ int ksu_handle_umount(uid_t old_uid, uid_t new_uid) pr_info("handle umount ignore non zygote child: %d\n", current->pid); return 0; } +#if __SULOG_GATE + ksu_sulog_report_syscall(new_uid, NULL, "setuid", NULL); +#endif // umount the target mnt pr_info("handle umount for uid: %d, pid: %d\n", new_uid, current->pid); diff --git a/kernel/setuid_hook.c b/kernel/setuid_hook.c index 874867df..fddc1313 100644 --- a/kernel/setuid_hook.c +++ b/kernel/setuid_hook.c @@ -43,8 +43,6 @@ #include "kernel_umount.h" #include "app_profile.h" -#include "sulog.h" - static bool ksu_enhanced_security_enabled = false; static int enhanced_security_feature_get(u64 *value) @@ -178,10 +176,6 @@ int ksu_handle_setresuid(uid_t ruid, uid_t euid, uid_t suid) // Handle kernel umount ksu_handle_umount(old_uid, new_uid); - -#if __SULOG_GATE - ksu_sulog_report_syscall(new_uid, NULL, "setuid", NULL); -#endif return 0; }