kernel: Remove CONFIG_KSU_MANUAL_SU protection

kernel/core_hook.c

@@ -40,10 +40,7 @@
 #include "kernel_compat.h"
 #include "supercalls.h"
 #include "sulog.h"
-
-#ifdef CONFIG_KSU_MANUAL_SU
 #include "manual_su.h"
-#endif
 
 bool ksu_module_mounted = false;
 
@@ -57,7 +54,6 @@ bool ksu_is_compat __read_mostly = false;
 
 extern int __ksu_handle_devpts(struct inode *inode); // sucompat.c
 
-#ifdef CONFIG_KSU_MANUAL_SU
 static void ksu_try_escalate_for_uid(uid_t uid)
 {
     if (!is_pending_root(uid))
@@ -66,7 +62,6 @@ static void ksu_try_escalate_for_uid(uid_t uid)
     pr_info("pending_root: UID=%d temporarily allowed\n", uid);
     remove_pending_root(uid);
 }
-#endif
 
 static struct workqueue_struct *ksu_workqueue;
 
@@ -241,8 +236,6 @@ void escape_to_root(void)
 #endif
 }
 
-#ifdef CONFIG_KSU_MANUAL_SU
-
 static void disable_seccomp_for_task(struct task_struct *tsk)
 {
     if (!tsk->seccomp.filter && tsk->seccomp.mode == SECCOMP_MODE_DISABLED)
@@ -265,7 +258,6 @@ static void disable_seccomp_for_task(struct task_struct *tsk)
         tsk->seccomp.filter = NULL;
 #endif
     }
-#endif
 }
 
 void escape_to_root_for_cmd_su(uid_t target_uid, pid_t target_pid)
@@ -401,11 +393,7 @@ static void sulog_prctl_cmd(uid_t uid, unsigned long cmd)
     const char *name = NULL;
 
     switch (cmd) {
-
-#ifdef CONFIG_KSU_MANUAL_SU
     case CMD_MANUAL_SU_REQUEST:             name = "prctl_manual_su_request"; break;
-#endif
-
     default:                                name = "prctl_unknown"; break;
     }
 
@@ -438,7 +426,6 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
     pr_info("option: 0x%x, cmd: %ld\n", option, arg2);
 #endif
 
-#ifdef CONFIG_KSU_MANUAL_SU
     if (arg2 == CMD_MANUAL_SU_REQUEST) {
         struct manual_su_request request;
         int su_option = (int)arg3;
@@ -465,7 +452,6 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
         }
         return 0;
     }
-#endif
 
     return 0;
 }
@@ -779,9 +765,7 @@ static int ksu_bprm_check_handler_pre(struct kprobe *p, struct pt_regs *regs)
 
     ksu_handle_pre_ksud(filename);
 
-#ifdef CONFIG_KSU_MANUAL_SU
     ksu_try_escalate_for_uid(current_uid().val);
-#endif
 
     return 0;
 }
@@ -791,7 +775,6 @@ static struct kprobe ksu_bprm_check_kp = {
     .pre_handler = ksu_bprm_check_handler_pre,
 };
 
-#ifdef CONFIG_KSU_MANUAL_SU
 // 6. task_alloc hook for handling manual su escalation
 static int ksu_task_alloc_handler_pre(struct kprobe *p, struct pt_regs *regs)
 {
@@ -805,7 +788,6 @@ static struct kprobe ksu_task_alloc_kp = {
     .symbol_name = "security_task_alloc",
     .pre_handler = ksu_task_alloc_handler_pre,
 };
-#endif
 
 __maybe_unused int ksu_kprobe_init(void)
 {
@@ -852,7 +834,6 @@ __maybe_unused int ksu_kprobe_init(void)
         pr_info("bprm_check_security kprobe registered successfully\n");
     }
 
-#ifdef CONFIG_KSU_MANUAL_SU
     // Register task_alloc kprobe
     rc = register_kprobe(&ksu_task_alloc_kp);
     if (rc) {
@@ -860,7 +841,6 @@ __maybe_unused int ksu_kprobe_init(void)
     } else {
         pr_info("task_alloc kprobe registered successfully\n");
     }
-#endif
 
     return 0;
 }
@@ -872,9 +852,7 @@ __maybe_unused int ksu_kprobe_exit(void)
     unregister_kprobe(&prctl_kp);
     unregister_kprobe(&ksu_inode_permission_kp);
     unregister_kprobe(&ksu_bprm_check_kp);
-#ifdef CONFIG_KSU_MANUAL_SU
     unregister_kprobe(&ksu_task_alloc_kp);
-#endif
     return 0;
 }