br0kenpixel/KernelSU-Next
1
0
Fork 0
mirror of https://github.com/KernelSU-Next/KernelSU-Next.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

kernel: Adapt to CONFIG_UIDGID_STRICT_TYPE_CHECKS=n

Browse Source 
Co-Authored-By: backslashxx <118538522+backslashxx@users.noreply.github.com>
This commit is contained in:
Trijal Saha
2025-05-18 13:59:31 -04:00
committed by Rifat Azad
parent 519f86c47e
commit 19dd8a1d40
3 changed files with 106 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
kernel/core_hook.c
View File

@@ -65,7 +65,11 @@ static inline bool is_allow_su()
// we are manager, allow! // we are manager, allow!
return true; return true;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
return ksu_is_allow_uid(current_uid().val); return ksu_is_allow_uid(current_uid().val);
#else
return ksu_is_allow_uid(current_uid());
#endif
} }
static inline bool is_unsupported_uid(uid_t uid) static inline bool is_unsupported_uid(uid_t uid)
@@ -150,7 +154,11 @@ void escape_to_root(void)
BUG_ON(!cred); BUG_ON(!cred);
} while (!get_cred_rcu(cred)); } while (!get_cred_rcu(cred));
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (cred->euid.val == 0) { if (cred->euid.val == 0) {
#else
if (cred->euid == 0) {
#endif
pr_warn("Already root, don't escape!\n"); pr_warn("Already root, don't escape!\n");
rcu_read_unlock(); rcu_read_unlock();
return; return;
@@ -158,23 +166,45 @@ void escape_to_root(void)
#else #else
cred = (struct cred *)__task_cred(current); cred = (struct cred *)__task_cred(current);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (cred->euid.val == 0) { if (cred->euid.val == 0) {
#else
if (cred->euid == 0) {
#endif
pr_warn("Already root, don't escape!\n"); pr_warn("Already root, don't escape!\n");
return; return;
} }
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
struct root_profile *profile = ksu_get_root_profile(cred->uid.val); struct root_profile *profile = ksu_get_root_profile(cred->uid.val);
#else
struct root_profile *profile = ksu_get_root_profile(cred->uid);
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
cred->uid.val = profile->uid; cred->uid.val = profile->uid;
cred->suid.val = profile->uid; cred->suid.val = profile->uid;
cred->euid.val = profile->uid; cred->euid.val = profile->uid;
cred->fsuid.val = profile->uid; cred->fsuid.val = profile->uid;
#else
cred->uid = profile->uid;
cred->suid = profile->uid;
cred->euid = profile->uid;
cred->fsuid = profile->uid;
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
cred->gid.val = profile->gid; cred->gid.val = profile->gid;
cred->fsgid.val = profile->gid; cred->fsgid.val = profile->gid;
cred->sgid.val = profile->gid; cred->sgid.val = profile->gid;
cred->egid.val = profile->gid; cred->egid.val = profile->gid;
#else
cred->gid = profile->gid;
cred->fsgid = profile->gid;
cred->sgid = profile->gid;
cred->egid = profile->gid;
#endif
cred->securebits = 0; cred->securebits = 0;
BUILD_BUG_ON(sizeof(profile->capabilities.effective) != BUILD_BUG_ON(sizeof(profile->capabilities.effective) !=
@@ -218,7 +248,11 @@ int ksu_handle_rename(struct dentry *old_dentry, struct dentry *new_dentry)
return 0; return 0;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (current_uid().val != 1000) { if (current_uid().val != 1000) {
#else
if (current_uid() != 1000) {
#endif
// skip non system uid // skip non system uid
return 0; return 0;
} }
@@ -282,14 +316,22 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
} }
// TODO: find it in throne tracker! // TODO: find it in throne tracker!
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
uid_t current_uid_val = current_uid().val; uid_t current_uid_val = current_uid().val;
#else
uid_t current_uid_val = current_uid();
#endif
uid_t manager_uid = ksu_get_manager_uid(); uid_t manager_uid = ksu_get_manager_uid();
if (current_uid_val != manager_uid && if (current_uid_val != manager_uid &&
current_uid_val % 100000 == manager_uid) { current_uid_val % 100000 == manager_uid) {
ksu_set_manager_uid(current_uid_val); ksu_set_manager_uid(current_uid_val);
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
bool from_root = 0 == current_uid().val; bool from_root = 0 == current_uid().val;
#else
bool from_root = 0 == current_uid();
#endif
bool from_manager = is_manager(); bool from_manager = is_manager();
if (!from_root && !from_manager) { if (!from_root && !from_manager) {
@@ -313,7 +355,11 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
if (arg2 == CMD_GRANT_ROOT) { if (arg2 == CMD_GRANT_ROOT) {
if (is_allow_su()) { if (is_allow_su()) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
pr_info("allow root for: %d\n", current_uid().val); pr_info("allow root for: %d\n", current_uid().val);
#else
pr_info("allow root for: %d\n", current_uid());
#endif
escape_to_root(); escape_to_root();
if (copy_to_user(result, &reply_ok, sizeof(reply_ok))) { if (copy_to_user(result, &reply_ok, sizeof(reply_ok))) {
pr_err("grant_root: prctl reply error\n"); pr_err("grant_root: prctl reply error\n");
@@ -525,7 +571,11 @@ static bool is_appuid(kuid_t uid)
#define FIRST_APPLICATION_UID 10000 #define FIRST_APPLICATION_UID 10000
#define LAST_APPLICATION_UID 19999 #define LAST_APPLICATION_UID 19999
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
uid_t appid = uid.val % PER_USER_RANGE; uid_t appid = uid.val % PER_USER_RANGE;
#else
uid_t appid = uid % PER_USER_RANGE;
#endif
return appid >= FIRST_APPLICATION_UID && appid <= LAST_APPLICATION_UID; return appid >= FIRST_APPLICATION_UID && appid <= LAST_APPLICATION_UID;
} }
@@ -537,7 +587,11 @@ static bool should_umount(struct path *path)
if (current->nsproxy->mnt_ns == init_nsproxy.mnt_ns) { if (current->nsproxy->mnt_ns == init_nsproxy.mnt_ns) {
pr_info("ignore global mnt namespace process: %d\n", pr_info("ignore global mnt namespace process: %d\n",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
current_uid().val); current_uid().val);
#else
current_uid());
#endif
return false; return false;
} }
@@ -596,27 +650,49 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
kuid_t new_uid = new->uid; kuid_t new_uid = new->uid;
kuid_t old_uid = old->uid; kuid_t old_uid = old->uid;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (0 != old_uid.val) { if (0 != old_uid.val) {
#else
if (0 != old_uid) {
#endif
// old process is not root, ignore it. // old process is not root, ignore it.
return 0; return 0;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (!is_appuid(new_uid) || is_unsupported_uid(new_uid.val)) { 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); // pr_info("handle setuid ignore non application or isolated uid: %d\n", new_uid.val);
#else
if (!is_appuid(new_uid) || is_unsupported_uid(new_uid)) {
// pr_info("handle setuid ignore non application or isolated uid: %d\n", new_uid);
#endif
return 0; return 0;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (ksu_is_allow_uid(new_uid.val)) { if (ksu_is_allow_uid(new_uid.val)) {
// pr_info("handle setuid ignore allowed application: %d\n", new_uid.val); // pr_info("handle setuid ignore allowed application: %d\n", new_uid.val);
#else
if (ksu_is_allow_uid(new_uid)) {
// pr_info("handle setuid ignore allowed application: %d\n", new_uid);
#endif
return 0; return 0;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (!ksu_uid_should_umount(new_uid.val)) { if (!ksu_uid_should_umount(new_uid.val)) {
#else
if (!ksu_uid_should_umount(new_uid)) {
#endif
return 0; return 0;
} else { } else {
#ifdef CONFIG_KSU_DEBUG #ifdef CONFIG_KSU_DEBUG
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
pr_info("uid: %d should not umount!\n", current_uid().val); pr_info("uid: %d should not umount!\n", current_uid().val);
#endif #else // #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
pr_info("uid: %d should not umount!\n", current_uid());
#endif // #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
#endif // #ifdef CONFIG_KSU_DEBUG
} }
// check old process's selinux context, if it is not zygote, ignore it! // check old process's selinux context, if it is not zygote, ignore it!
@@ -630,9 +706,13 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
} }
#ifdef CONFIG_KSU_DEBUG #ifdef CONFIG_KSU_DEBUG
// umount the target mnt // umount the target mnt
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
pr_info("handle umount for uid: %d, pid: %d\n", new_uid.val, pr_info("handle umount for uid: %d, pid: %d\n", new_uid.val,
#else // #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
pr_info("handle umount for uid: %d, pid: %d\n", new_uid,
#endif // #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
current->pid); current->pid);
#endif #endif // #ifdef CONFIG_KSU_DEBUG
// fixme: use `collect_mounts` and `iterate_mount` to iterate all mountpoint and // fixme: use `collect_mounts` and `iterate_mount` to iterate all mountpoint and
// filter the mountpoint whose target is `/data/adb` // filter the mountpoint whose target is `/data/adb`

4
kernel/manager.h
View File

@@ -15,7 +15,11 @@ static inline bool ksu_is_manager_uid_valid()
static inline bool is_manager() static inline bool is_manager()
{ {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
return unlikely(ksu_manager_uid == current_uid().val); return unlikely(ksu_manager_uid == current_uid().val);
#else
return unlikely(ksu_manager_uid == current_uid());
#endif
} }
static inline uid_t ksu_get_manager_uid() static inline uid_t ksu_get_manager_uid()

20
kernel/sucompat.c
View File

@@ -64,7 +64,11 @@ int ksu_handle_faccessat(int *dfd, const char __user **filename_user, int *mode,
} }
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (!ksu_is_allow_uid(current_uid().val)) { if (!ksu_is_allow_uid(current_uid().val)) {
#else
if (!ksu_is_allow_uid(current_uid())) {
#endif
return 0; return 0;
} }
@@ -91,7 +95,11 @@ int ksu_handle_stat(int *dfd, const char __user **filename_user, int *flags)
} }
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (!ksu_is_allow_uid(current_uid().val)) { if (!ksu_is_allow_uid(current_uid().val)) {
#else
if (!ksu_is_allow_uid(current_uid())) {
#endif
return 0; return 0;
} }
@@ -152,7 +160,11 @@ int ksu_handle_execveat_sucompat(int *fd, struct filename **filename_ptr,
if (likely(memcmp(filename->name, su, sizeof(su)))) if (likely(memcmp(filename->name, su, sizeof(su))))
return 0; return 0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (!ksu_is_allow_uid(current_uid().val)) if (!ksu_is_allow_uid(current_uid().val))
#else
if (!ksu_is_allow_uid(current_uid()))
#endif
return 0; return 0;
pr_info("do_execveat_common su found\n"); pr_info("do_execveat_common su found\n");
@@ -185,7 +197,11 @@ int ksu_handle_execve_sucompat(int *fd, const char __user **filename_user,
if (likely(memcmp(path, su, sizeof(su)))) if (likely(memcmp(path, su, sizeof(su))))
return 0; return 0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
if (!ksu_is_allow_uid(current_uid().val)) if (!ksu_is_allow_uid(current_uid().val))
#else
if (!ksu_is_allow_uid(current_uid()))
#endif
return 0; return 0;
pr_info("sys_execve su found\n"); pr_info("sys_execve su found\n");
@@ -208,7 +224,11 @@ int ksu_handle_devpts(struct inode *inode)
return 0; return 0;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) || defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS)
uid_t uid = current_uid().val; uid_t uid = current_uid().val;
#else
uid_t uid = current_uid();
#endif
if (uid % 100000 < 10000) { if (uid % 100000 < 10000) {
// not untrusted_app, ignore it // not untrusted_app, ignore it
return 0; return 0;