fix: mark tif (#2871)

kernel/allowlist.c

@@ -261,11 +261,6 @@ bool __ksu_is_allow_uid(uid_t uid)
 {
     int i;
 
-    if (unlikely(uid == 0)) {
-        // already root, but only allow our domain.
-        return is_ksu_domain();
-    }
-
     if (forbid_system_uid(uid)) {
         // do not bother going through the list if it's system
         return false;
@@ -288,6 +283,15 @@ bool __ksu_is_allow_uid(uid_t uid)
     return false;
 }
 
+bool __ksu_is_allow_uid_for_current(uid_t uid)
+{
+    if (unlikely(uid == 0)) {
+        // already root, but only allow our domain.
+        return is_ksu_domain();
+    }
+    return __ksu_is_allow_uid(uid);
+}
+
 bool ksu_uid_should_umount(uid_t uid)
 {
     struct app_profile profile = { .current_uid = uid };

kernel/allowlist.h

@@ -12,9 +12,14 @@ void ksu_load_allow_list(void);
 
 void ksu_show_allow_list(void);
 
+// Check if the uid is in allow list
 bool __ksu_is_allow_uid(uid_t uid);
 #define ksu_is_allow_uid(uid) unlikely(__ksu_is_allow_uid(uid))
 
+// Check if the uid is in allow list, or current is ksu domain root
+bool __ksu_is_allow_uid_for_current(uid_t uid);
+#define ksu_is_allow_uid_for_current(uid) unlikely(__ksu_is_allow_uid_for_current(uid))
+
 bool ksu_get_allow_list(int *array, int *length, bool allow);
 
 void ksu_prune_allowlist(bool (*is_uid_exist)(uid_t, char *, void *), void *data);

kernel/core_hook.c

@@ -1208,7 +1208,7 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
         return 0;
     }
 
-    if (ksu_is_allow_uid(new_uid.val)) {
+    if (ksu_is_allow_uid_for_current(new_uid.val)) {
         if (current->seccomp.mode == SECCOMP_MODE_FILTER &&
             current->seccomp.filter) {
             spin_lock_irq(&current->sighand->siglock);

kernel/kpm/compact.c

@@ -31,7 +31,7 @@
 
 static int sukisu_is_su_allow_uid(uid_t uid)
 {
-    return ksu_is_allow_uid(uid) ? 1 : 0;
+    return ksu_is_allow_uid_for_current(uid) ? 1 : 0;
 }
 
 static int sukisu_get_ap_mod_exclude(uid_t uid)

kernel/manual_su.c

@@ -228,7 +228,7 @@ static int handle_escalation_request(struct manual_su_request *request)
     }
     rcu_read_unlock();
     
-    if (current_uid().val == 0 || is_manager() || ksu_is_allow_uid(current_uid().val))
+    if (current_uid().val == 0 || is_manager() || ksu_is_allow_uid_for_current(current_uid().val))
         goto allowed;
 
     char *env_token = get_token_from_envp();

kernel/sucompat.c

@@ -112,7 +112,7 @@ int ksu_handle_faccessat(int *dfd, const char __user **filename_user, int *mode,
 #endif
 
 #ifndef CONFIG_KSU_SUSFS_SUS_SU
-    if (!ksu_is_allow_uid(current_uid().val)) {
+    if (!ksu_is_allow_uid_for_current(current_uid().val)) {
         return 0;
     }
 #endif
@@ -168,7 +168,7 @@ int ksu_handle_stat(int *dfd, const char __user **filename_user, int *flags)
 #endif
 
 #ifndef CONFIG_KSU_SUSFS_SUS_SU
-    if (!ksu_is_allow_uid(current_uid().val)) {
+    if (!ksu_is_allow_uid_for_current(current_uid().val)) {
         return 0;
     }
 #endif
@@ -238,7 +238,7 @@ int ksu_handle_execveat_sucompat(int *fd, struct filename **filename_ptr,
 #if __SULOG_GATE
     ksu_sulog_report_syscall(current_uid().val, NULL, "execve", filename->name);
 #ifndef CONFIG_KSU_SUSFS_SUS_SU
-    bool is_allowed = ksu_is_allow_uid(current_uid().val);
+    bool is_allowed = ksu_is_allow_uid_for_current(current_uid().val);
 #endif
 #endif
 
@@ -250,7 +250,7 @@ int ksu_handle_execveat_sucompat(int *fd, struct filename **filename_ptr,
     
     ksu_sulog_report_su_attempt(current_uid().val, NULL, filename->name, is_allowed);
 #else
-    if (!ksu_is_allow_uid(current_uid().val)) {
+    if (!ksu_is_allow_uid_for_current(current_uid().val)) {
         return 0;
     }
 #endif
@@ -304,13 +304,13 @@ int ksu_handle_execve_sucompat(int *fd, const char __user **filename_user,
 
 #if __SULOG_GATE
     ksu_sulog_report_syscall(current_uid().val, NULL, "execve", path);
-    bool is_allowed = ksu_is_allow_uid(current_uid().val);
+    bool is_allowed = ksu_is_allow_uid_for_current(current_uid().val);
     if (!is_allowed)
         return 0;
     
     ksu_sulog_report_su_attempt(current_uid().val, NULL, path, is_allowed);
 #else
-    if (!ksu_is_allow_uid(current_uid().val)) {
+    if (!ksu_is_allow_uid_for_current(current_uid().val)) {
         return 0;
     }
 #endif
@@ -347,7 +347,7 @@ int __ksu_handle_devpts(struct inode *inode)
         return 0;
     }
 
-    if (likely(!ksu_is_allow_uid(uid)))
+    if (likely(!ksu_is_allow_uid_for_current(uid)))
         return 0;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(KSU_OPTIONAL_SELINUX_INODE)

kernel/supercalls.c

@@ -58,7 +58,7 @@ bool always_allow(void)
 
 bool allowed_for_su(void)
 {
-    bool is_allowed = is_manager() || ksu_is_allow_uid(current_uid().val);
+    bool is_allowed = is_manager() || ksu_is_allow_uid_for_current(current_uid().val);
 #if __SULOG_GATE
 	ksu_sulog_report_permission_check(current_uid().val, current->comm, is_allowed);
 #endif
@@ -233,7 +233,7 @@ static int do_uid_granted_root(void __user *arg)
         return -EFAULT;
     }
 
-    cmd.granted = ksu_is_allow_uid(cmd.uid);
+    cmd.granted = ksu_is_allow_uid_for_current(cmd.uid);
 
     if (copy_to_user(arg, &cmd, sizeof(cmd))) {
         pr_err("uid_granted_root: copy_to_user failed\n");