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

kernel: use rename lsm hook

Browse Source
This commit is contained in:
weishu
2023-01-19 16:34:21 +07:00
parent da377a9fa9
commit 2844df865b
4 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
kernel/kprobe_hook.c
View File

@@ -21,26 +21,50 @@ static int handler_pre(struct kprobe *p, struct pt_regs *regs)
return ksu_handle_prctl(option, arg2, arg3, arg4, arg5); return ksu_handle_prctl(option, arg2, arg3, arg4, arg5);
} }
static struct kprobe kp = { static struct kprobe prctl_kp = {
.symbol_name = PRCTL_SYMBOL, .symbol_name = PRCTL_SYMBOL,
.pre_handler = handler_pre, .pre_handler = handler_pre,
}; };
static int renameat_handler_pre(struct kprobe *p, struct pt_regs *regs)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
// https://elixir.bootlin.com/linux/v5.12-rc1/source/include/linux/fs.h
struct renamedata *rd = PT_REGS_PARM1(regs);
struct dentry *old_entry = rd->old_dentry;
struct dentry *new_entry = rd->new_dentry;
#else
struct dentry *old_entry = PT_REGS_PARM2(regs);
struct dentry *new_entry = PT_REGS_PARM4(regs);
#endif
return ksu_handle_rename(old_entry, new_entry);
}
static struct kprobe renameat_kp = {
.symbol_name = "vfs_rename",
.pre_handler = renameat_handler_pre,
};
__maybe_unused int ksu_kprobe_init() __maybe_unused int ksu_kprobe_init()
{ {
int rc = 0; int rc = 0;
rc = register_kprobe(&kp); rc = register_kprobe(&prctl_kp);
if (rc) { if (rc) {
pr_info("prctl kprobe failed: %d, please check your kernel config.\n", pr_info("prctl kprobe failed: %d.\n", rc);
rc);
return rc; return rc;
} }
return rc; rc = register_kprobe(&renameat_kp);
pr_info("renameat kp: %d\n", rc);
return rc;
} }
__maybe_unused int ksu_kprobe_exit() { __maybe_unused int ksu_kprobe_exit()
unregister_kprobe(&kp); {
return 0; unregister_kprobe(&prctl_kp);
unregister_kprobe(&renameat_kp);
return 0;
} }

3
kernel/ksu.h
View File

@@ -1,6 +1,7 @@
#ifndef __KSU_H_KSU #ifndef __KSU_H_KSU
#define __KSU_H_KSU #define __KSU_H_KSU
#include <linux/dcache.h>
#include <linux/uidgid.h> #include <linux/uidgid.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
@@ -52,4 +53,6 @@ int ksu_kprobe_exit(void);
int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3, int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5); unsigned long arg4, unsigned long arg5);
int ksu_handle_rename(struct dentry *old_dentry, struct dentry *new_dentry);
#endif #endif

12
kernel/lsm_hook.c
View File

@@ -1,5 +1,6 @@
#include "asm-generic/errno.h" #include <linux/err.h>
#include "linux/kernel.h" #include <linux/cred.h>
#include <linux/kernel.h>
#include <linux/printk.h> #include <linux/printk.h>
#include <linux/security.h> #include <linux/security.h>
#include <linux/lsm_hooks.h> #include <linux/lsm_hooks.h>
@@ -16,8 +17,15 @@ static int ksu_task_prctl(int option, unsigned long arg2, unsigned long arg3,
return -ENOSYS; return -ENOSYS;
} }
static int ksu_inode_rename(struct inode *old_inode, struct dentry *old_dentry,
struct inode *new_inode, struct dentry *new_dentry)
{
return ksu_handle_rename(old_dentry, new_dentry);
}
static struct security_hook_list ksu_hooks[] = { static struct security_hook_list ksu_hooks[] = {
LSM_HOOK_INIT(task_prctl, ksu_task_prctl), LSM_HOOK_INIT(task_prctl, ksu_task_prctl),
LSM_HOOK_INIT(inode_rename, ksu_inode_rename),
}; };
void ksu_lsm_hook_init(void) void ksu_lsm_hook_init(void)

33
kernel/uid_observer.c
View File

@@ -126,7 +126,7 @@ static void update_uid()
ksu_queue_work(&ksu_update_uid_work); ksu_queue_work(&ksu_update_uid_work);
} }
static int renameat_handler_pre(struct kprobe *p, struct pt_regs *regs) int ksu_handle_rename(struct dentry *old_dentry, struct dentry *new_dentry)
{ {
if (!current->mm) { if (!current->mm) {
// skip kernel threads // skip kernel threads
@@ -138,27 +138,17 @@ static int renameat_handler_pre(struct kprobe *p, struct pt_regs *regs)
return 0; return 0;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0) if (!old_dentry || !new_dentry) {
// https://elixir.bootlin.com/linux/v5.12-rc1/source/include/linux/fs.h
struct renamedata *rd = PT_REGS_PARM1(regs);
struct dentry *old_entry = rd->old_dentry;
struct dentry *new_entry = rd->new_dentry;
#else
struct dentry *old_entry = PT_REGS_PARM2(regs);
struct dentry *new_entry = PT_REGS_PARM4(regs);
#endif
if (!old_entry || !new_entry) {
return 0; return 0;
} }
// /data/system/packages.list.tmp -> /data/system/packages.list // /data/system/packages.list.tmp -> /data/system/packages.list
if (strcmp(new_entry->d_iname, "packages.list")) { if (strcmp(new_dentry->d_iname, "packages.list")) {
return 0; return 0;
} }
char path[128]; char path[128];
char *buf = dentry_path_raw(new_entry, path, sizeof(path)); char *buf = dentry_path_raw(new_dentry, path, sizeof(path));
if (IS_ERR(buf)) { if (IS_ERR(buf)) {
pr_err("dentry_path_raw failed.\n"); pr_err("dentry_path_raw failed.\n");
return 0; return 0;
@@ -167,30 +157,21 @@ static int renameat_handler_pre(struct kprobe *p, struct pt_regs *regs)
if (strcmp(buf, "/system/packages.list")) { if (strcmp(buf, "/system/packages.list")) {
return 0; return 0;
} }
pr_info("renameat: %s -> %s\n, new path: %s", old_entry->d_iname, pr_info("renameat: %s -> %s\n, new path: %s", old_dentry->d_iname,
new_entry->d_iname, buf); new_dentry->d_iname, buf);
update_uid(); update_uid();
return 0; return 0;
} }
static struct kprobe renameat_kp = {
.symbol_name = "vfs_rename",
.pre_handler = renameat_handler_pre,
};
int ksu_uid_observer_init() int ksu_uid_observer_init()
{ {
INIT_WORK(&ksu_update_uid_work, do_update_uid); INIT_WORK(&ksu_update_uid_work, do_update_uid);
return 0;
int rc = register_kprobe(&renameat_kp);
pr_info("renameat kp: %d\n", rc);
return rc;
} }
int ksu_uid_observer_exit() int ksu_uid_observer_exit()
{ {
unregister_kprobe(&renameat_kp);
return 0; return 0;
} }