diff --git a/kernel/core_hook.c b/kernel/core_hook.c index ebe6ce5c..2f8f9e78 100644 --- a/kernel/core_hook.c +++ b/kernel/core_hook.c @@ -826,6 +826,22 @@ int ksu_key_permission(key_ref_t key_ref, const struct cred *cred, } #endif +#ifndef DEVPTS_SUPER_MAGIC +#define DEVPTS_SUPER_MAGIC 0x1cd1 +#endif + +extern int __ksu_handle_devpts(struct inode *inode); // sucompat.c + +int ksu_inode_permission(struct inode *inode, int mask) +{ + if (inode && inode->i_sb + && unlikely(inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC)) { + //pr_info("%s: handling devpts for: %s \n", __func__, current->comm); + __ksu_handle_devpts(inode); + } + return 0; +} + #ifdef CONFIG_COMPAT bool ksu_is_compat __read_mostly = false; #endif @@ -880,12 +896,13 @@ static struct security_hook_list ksu_hooks[] = { LSM_HOOK_INIT(task_prctl, ksu_task_prctl), LSM_HOOK_INIT(inode_rename, ksu_inode_rename), LSM_HOOK_INIT(task_fix_setuid, ksu_task_fix_setuid), -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) || \ - defined(CONFIG_IS_HW_HISI) || defined(CONFIG_KSU_ALLOWLIST_WORKAROUND) - LSM_HOOK_INIT(key_permission, ksu_key_permission) + LSM_HOOK_INIT(inode_permission, ksu_inode_permission), #ifndef CONFIG_KSU_KPROBES_HOOK LSM_HOOK_INIT(bprm_check_security, ksu_bprm_check), #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) || \ + defined(CONFIG_IS_HW_HISI) || defined(CONFIG_KSU_ALLOWLIST_WORKAROUND) + LSM_HOOK_INIT(key_permission, ksu_key_permission) }; void __init ksu_lsm_hook_init(void) diff --git a/kernel/sucompat.c b/kernel/sucompat.c index 59b1bc50..3c90175e 100644 --- a/kernel/sucompat.c +++ b/kernel/sucompat.c @@ -143,7 +143,13 @@ int ksu_handle_execveat_sucompat(int *fd, struct filename **filename_ptr, return 0; } +// dummified int ksu_handle_devpts(struct inode *inode) +{ + return 0; +} + +int __ksu_handle_devpts(struct inode *inode) { #ifndef CONFIG_KSU_KPROBES_HOOK if (!ksu_sucompat_hook_state) @@ -160,20 +166,17 @@ int ksu_handle_devpts(struct inode *inode) return 0; } - if (!ksu_is_allow_uid(uid)) + if (likely(!ksu_is_allow_uid(uid))) return 0; - if (ksu_devpts_sid) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(KSU_OPTIONAL_SELINUX_INODE) struct inode_security_struct *sec = selinux_inode(inode); #else struct inode_security_struct *sec = (struct inode_security_struct *)inode->i_security; #endif - if (sec) { - sec->sid = ksu_devpts_sid; - } - } + if (ksu_devpts_sid && sec) + sec->sid = ksu_devpts_sid; return 0; }