android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use cap_task_fix_setuid hook to avoid inline issue

Browse Source
This commit is contained in:
Ylarod
2025-11-02 21:38:51 +08:00
committed by ShirkNeko
parent a6b86a4f99
commit d89eab2c34
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/core_hook.c
View File

@@ -577,6 +577,7 @@ 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;
pr_info("handle_setuid from %d to %d\n", old_uid.val, new_uid.val);
if (0 != old_uid.val) { if (0 != old_uid.val) {
// old process is not root, ignore it. // old process is not root, ignore it.
@@ -584,7 +585,7 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
} }
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);
return 0; return 0;
} }
@@ -693,8 +694,8 @@ static struct kprobe reboot_kp = {
.pre_handler = reboot_handler_pre, .pre_handler = reboot_handler_pre,
}; };
// 2. security_task_fix_setuid hook for handling setuid // 2. cap_task_fix_setuid hook for handling setuid
static int security_task_fix_setuid_handler_pre(struct kprobe *p, struct pt_regs *regs) static int cap_task_fix_setuid_handler_pre(struct kprobe *p, struct pt_regs *regs)
{ {
struct cred *new = (struct cred *)PT_REGS_PARM1(regs); struct cred *new = (struct cred *)PT_REGS_PARM1(regs);
const struct cred *old = (const struct cred *)PT_REGS_PARM2(regs); const struct cred *old = (const struct cred *)PT_REGS_PARM2(regs);
@@ -704,9 +705,9 @@ static int security_task_fix_setuid_handler_pre(struct kprobe *p, struct pt_regs
return 0; return 0;
} }
static struct kprobe security_task_fix_setuid_kp = { static struct kprobe cap_task_fix_setuid_kp = {
.symbol_name = "security_task_fix_setuid", .symbol_name = "cap_task_fix_setuid",
.pre_handler = security_task_fix_setuid_handler_pre, .pre_handler = cap_task_fix_setuid_handler_pre,
}; };
// 3. prctl hook for handling ksu prctl commands // 3. prctl hook for handling ksu prctl commands
@@ -810,12 +811,12 @@ __maybe_unused int ksu_kprobe_init(void)
pr_info("reboot kprobe registered successfully\n"); pr_info("reboot kprobe registered successfully\n");
} }
rc = register_kprobe(&security_task_fix_setuid_kp); rc = register_kprobe(&cap_task_fix_setuid_kp);
if (rc) { if (rc) {
pr_err("security_task_fix_setuid kprobe failed: %d\n", rc); pr_err("cap_task_fix_setuid kprobe failed: %d\n", rc);
unregister_kprobe(&reboot_kp); unregister_kprobe(&reboot_kp);
} else { } else {
pr_info("security_task_fix_setuid kprobe registered successfully\n"); pr_info("cap_task_fix_setuid_kp kprobe registered successfully\n");
} }
@@ -859,7 +860,7 @@ __maybe_unused int ksu_kprobe_init(void)
__maybe_unused int ksu_kprobe_exit(void) __maybe_unused int ksu_kprobe_exit(void)
{ {
unregister_kprobe(&reboot_kp); unregister_kprobe(&reboot_kp);
unregister_kprobe(&security_task_fix_setuid_kp); unregister_kprobe(&cap_task_fix_setuid_kp);
unregister_kprobe(&prctl_kp); unregister_kprobe(&prctl_kp);
unregister_kprobe(&ksu_inode_permission_kp); unregister_kprobe(&ksu_inode_permission_kp);
unregister_kprobe(&ksu_bprm_check_kp); unregister_kprobe(&ksu_bprm_check_kp);