diff --git a/kernel/allowlist.c b/kernel/allowlist.c index fcf8c062..3a0135e9 100644 --- a/kernel/allowlist.c +++ b/kernel/allowlist.c @@ -2,11 +2,10 @@ #include "linux/fs.h" #include "linux/kernel.h" #include "linux/list.h" -#include "linux/printk.h" #include "linux/slab.h" #include "selinux/selinux.h" - +#include "klog.h" // IWYU pragma: keep #define FILE_MAGIC 0x7f4b5355 // ' KSU', u32 #define FILE_FORMAT_VERSION 1 // u32 diff --git a/kernel/apk_sign.c b/kernel/apk_sign.c index c32ece76..6002ef58 100644 --- a/kernel/apk_sign.c +++ b/kernel/apk_sign.c @@ -2,6 +2,7 @@ #include "linux/moduleparam.h" #include "apk_sign.h" +#include "klog.h" // IWYU pragma: keep static __always_inline int check_v2_signature(char *path, unsigned expected_size, unsigned expected_hash) diff --git a/kernel/core_hook.c b/kernel/core_hook.c index dbddc180..3e3819d2 100644 --- a/kernel/core_hook.c +++ b/kernel/core_hook.c @@ -4,7 +4,6 @@ #include "linux/kernel.h" #include "linux/kprobes.h" #include "linux/lsm_hooks.h" -#include "linux/printk.h" #include "linux/uaccess.h" #include "linux/uidgid.h" #include "linux/version.h" @@ -20,6 +19,7 @@ #include "manager.h" #include "selinux/selinux.h" #include "uid_observer.h" +#include "klog.h" // IWYU pragma: keep static inline bool is_allow_su() { diff --git a/kernel/klog.h b/kernel/klog.h index a84341a2..bda4f9cb 100644 --- a/kernel/klog.h +++ b/kernel/klog.h @@ -1,6 +1,8 @@ #ifndef __KSU_H_KLOG #define __KSU_H_KLOG +#include + #ifdef pr_fmt #undef pr_fmt #define pr_fmt(fmt) "KernelSU: " fmt diff --git a/kernel/ksu.c b/kernel/ksu.c index f94d9555..5016d37f 100644 --- a/kernel/ksu.c +++ b/kernel/ksu.c @@ -7,6 +7,7 @@ #include "core_hook.h" #include "ksu.h" #include "uid_observer.h" +#include "klog.h" // IWYU pragma: keep static struct workqueue_struct *ksu_workqueue; diff --git a/kernel/ksud.c b/kernel/ksud.c index 54a524e6..92f8f6b7 100644 --- a/kernel/ksud.c +++ b/kernel/ksud.c @@ -4,7 +4,6 @@ #include "linux/err.h" #include "linux/fs.h" #include "linux/kprobes.h" -#include "linux/printk.h" #include "linux/types.h" #include "linux/uaccess.h" #include "linux/version.h" @@ -13,6 +12,7 @@ #include "allowlist.h" #include "arch.h" #include "selinux/selinux.h" +#include "klog.h" // IWYU pragma: keep static const char KERNEL_SU_RC[] = "\n" diff --git a/kernel/manager.c b/kernel/manager.c index 627d2c71..93978328 100644 --- a/kernel/manager.c +++ b/kernel/manager.c @@ -1,6 +1,5 @@ #include "linux/cred.h" #include "linux/gfp.h" -#include "linux/printk.h" #include "linux/slab.h" #include "linux/uidgid.h" #include "linux/version.h" @@ -12,6 +11,7 @@ #include "apk_sign.h" #include "ksu.h" #include "manager.h" +#include "klog.h" // IWYU pragma: keep uid_t ksu_manager_uid = INVALID_UID; diff --git a/kernel/selinux/rules.c b/kernel/selinux/rules.c index df46ca21..e43af38d 100644 --- a/kernel/selinux/rules.c +++ b/kernel/selinux/rules.c @@ -3,6 +3,7 @@ #include "selinux.h" #include "sepolicy.h" #include "ss/services.h" +#include "../klog.h" // IWYU pragma: keep #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) #define SELINUX_POLICY_INSTEAD_SELINUX_SS diff --git a/kernel/selinux/selinux.c b/kernel/selinux/selinux.c index 196f4d05..586eb3a5 100644 --- a/kernel/selinux/selinux.c +++ b/kernel/selinux/selinux.c @@ -1,8 +1,8 @@ -#include "linux/printk.h" - #include "objsec.h" #include "selinux.h" +#include "../klog.h" // IWYU pragma: keep + #define KERNEL_SU_DOMAIN "u:r:su:s0" static u32 ksu_sid; diff --git a/kernel/selinux/sepolicy.c b/kernel/selinux/sepolicy.c index de26caa3..cd179eeb 100644 --- a/kernel/selinux/sepolicy.c +++ b/kernel/selinux/sepolicy.c @@ -1,9 +1,10 @@ #include "sepolicy.h" #include "linux/gfp.h" -#include "linux/printk.h" #include "linux/slab.h" #include "linux/version.h" +#include "../klog.h" // IWYU pragma: keep + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) // TODO: backport to lower kernel #define KSU_SUPPORT_ADD_TYPE diff --git a/kernel/sucompat.c b/kernel/sucompat.c index 3cd82a9e..b6a65f2d 100644 --- a/kernel/sucompat.c +++ b/kernel/sucompat.c @@ -3,7 +3,6 @@ #include "linux/err.h" #include "linux/fs.h" #include "linux/kprobes.h" -#include "linux/printk.h" #include "linux/types.h" #include "linux/uaccess.h" #include "linux/version.h" @@ -15,6 +14,7 @@ #include "allowlist.h" #include "arch.h" +#include "klog.h" // IWYU pragma: keep #define SU_PATH "/system/bin/su" #define SH_PATH "/system/bin/sh" diff --git a/kernel/uid_observer.c b/kernel/uid_observer.c index ab88f3b6..4f909e70 100644 --- a/kernel/uid_observer.c +++ b/kernel/uid_observer.c @@ -11,6 +11,7 @@ #include "ksu.h" #include "manager.h" #include "uid_observer.h" +#include "klog.h" // IWYU pragma: keep #define SYSTEM_PACKAGES_LIST_PATH "/data/system/packages.list" static struct work_struct ksu_update_uid_work;