fix send_sigurg mediation
Subsystems (6)
PATCH 1/2 fix send_sigurg mediation
Stephen Smalley notes that send_sigurg isn't mediated by LSM in the same manner as send_sigio. Patch below is a slight modification of Stephen's original patch. It moves the security_file_send_sigiotask() hook into the sigio_perm(). The hook's fd and reason arguments are replaced with the signum. sigio_perm() and it's callers are updated to pass the signum through to the hook. In send_sigio case, the signum is simply fown->signum or SIGIO when signum is 0, however in send_sigurg the kernel doesn't use fown->signum, it always sends SIGURG.
From: Stephen Smalley <[email protected]>
===== fs/fcntl.c 1.43 vs edited =====
fs/fcntl.c +7 -9
@@ -431,11 +431,12 @@ };static inline int sigio_perm (struct task_struct *p, -struct fown_struct *fown) +struct fown_struct *fown,int sig) { -return ((fown->euid ==0 ) || - (fown->euid == p->suid) || (fown->euid == p->uid) || - (fown->uid == p->suid) || (fown->uid == p->uid)); +return (((fown->euid ==0 ) || + (fown->euid == p->suid) || (fown->euid == p->uid) || + (fown->uid == p->suid) || (fown->uid == p->uid)) && + !security_file_send_sigiotask (p, fown, sig)); } static void send_sigio_to_task(struct task_struct *p,
@@ -443,10 +444,7 @@ int fd, int reason) { -if (!sigio_perm (p, fown)) -return ; - -if (security_file_send_sigiotask (p, fown, fd, reason)) +if (!sigio_perm (p, fown, fown->signum))return ;switch (fown->signum) {
@@ -508,7 +506,7 @@static void send_sigurg_to_task (struct task_struct *p,struct fown_struct *fown) { -if (sigio_perm (p, fown)) +if (sigio_perm (p, fown,SIGURG ))send_group_sig_info (SIGURG ,SEND_SIG_PRIV , p); }
===== include/linux/security.h 1.42 vs edited =====
include/linux/security.h +10 -12
@@ -488,16 +488,15 @@* @file contains the file structure to update. * Return 0 on success. * @file_send_sigiotask: -* Check permission for the file owner @fown to send SIGIO to the process -* @tsk. Note that this hook is always called from interrupt. Note that -* the fown_struct, @fown, is never outside the context of a struct file, -* so the file structure (and associated security information) can always -* be obtained: +* Check permission for the file owner @fown to send SIGIO or SIGURG to the +* process @tsk. Note that this hook is sometimes called from interrupt. +* Note that the fown_struct, @fown, is never outside the context of a +* struct file, so the file structure (and associated security information) +* can always be obtained: * (struct file *)((long)fown - offsetof(struct file,f_owner)); * @tsk contains the structure of task receiving signal. * @fown contains the file owner information. -* @fd contains the file descriptor. -* @reason contains the operational flags. +* @sig is the signal that will be sent. When 0, kernel sends SIGIO. * Return 0 if permission is granted. * @file_receive: * This hook allows security modules to control the ability of a process
@@ -1135,8 +1134,7 @@ unsigned long arg);int (*file_set_fowner) (struct file * file);int (*file_send_sigiotask) (struct task_struct * tsk, -struct fown_struct * fown, -int fd,int reason); +struct fown_struct * fown,int sig);int (*file_receive) (struct file * file);int (*task_create) (unsigned long clone_flags);
@@ -1657,9 +1655,9 @@static inline int security_file_send_sigiotask (struct task_struct *tsk,struct fown_struct *fown, -int fd,int reason) +int sig) { -return security_ops->file_send_sigiotask (tsk, fown, fd, reason); +return security_ops->file_send_sigiotask (tsk, fown, sig); }static inline int security_file_receive (struct file *file)
@@ -2299,7 +2297,7 @@static inline int security_file_send_sigiotask (struct task_struct *tsk,struct fown_struct *fown, -int fd,int reason) +int sig) {return 0 ; }
===== security/dummy.c 1.46 vs edited =====
security/dummy.c +1 -2
@@ -518,8 +518,7 @@ }static int dummy_file_send_sigiotask (struct task_struct *tsk, -struct fown_struct *fown,int fd, -int reason) +struct fown_struct *fown,int sig) {return 0 ; }
===== security/selinux/hooks.c 1.67 vs edited =====
security/selinux/hooks.c +3 -4
@@ -2562,8 +2562,7 @@ }static int selinux_file_send_sigiotask (struct task_struct *tsk, -struct fown_struct *fown, -int fd,int reason) +struct fown_struct *fown,int signum) {struct file *file;u32 perm;
@@ -2576,10 +2575,10 @@ tsec = tsk->security; fsec = file->f_security; -if (!fown->signum) +if (!signum) perm =signal_to_av (SIGIO );/* as per send_sigio_to_task */ else - perm =signal_to_av (fown->signum); + perm =signal_to_av (signum);return avc_has_perm (fsec->fown_sid, tsec->sid,SECCLASS_PROCESS , perm,NULL ,NULL );
PATCH 2/2 remove net related includes from security.h
With this we're back to the times when changing skbuff.h only triggers rebuild of _net_ related stuff 8)
This uncovered a bug in rmap.h, that was not including mm.h to get the definition of struct vm_area_struct, working by luck.
include/linux/security.h renamed from include/linux/security.h~uninline +7 -18
@@ -30,8 +30,6 @@#include <linux/shm.h> #include <linux/msg.h> #include <linux/sched.h> -#include <linux/skbuff.h> -#include <linux/netlink.h> struct ctl_table ;
@@ -55,18 +53,14 @@extern int cap_syslog (int type);extern int cap_vm_enough_memory (long pages); -static inline int cap_netlink_send (struct sock *sk,struct sk_buff *skb) -{ -NETLINK_CB (skb).eff_cap = current->cap_effective; -return 0 ; -} +struct msghdr ; +struct sk_buff ; +struct sock ; +struct sockaddr ; +struct socket ; -static inline int cap_netlink_recv (struct sk_buff *skb) -{ -if (!cap_raised (NETLINK_CB (skb).eff_cap,CAP_NET_ADMIN )) -return -EPERM ; -return 0 ; -} +extern int cap_netlink_send (struct sock *sk,struct sk_buff *skb); +extern int cap_netlink_recv (struct sk_buff *skb);/* * Values used in the task_security_ops calls
@@ -2518,11 +2512,6 @@return -EINVAL ; } -/* -* The netlink capability defaults need to be used inline by default -* (rather than hooking into the capability module) to reduce overhead -* in the networking code. -*/ static inline int security_netlink_send (struct sock *sk,struct sk_buff *skb) {return cap_netlink_send (sk, skb);
include/linux/rmap.h renamed from include/linux/rmap.h~uninline +1 -0
@@ -7,6 +7,7 @@#include <linux/config.h> #include <linux/list.h> #include <linux/slab.h> +#include <linux/mm.h> #include <linux/spinlock.h> /*
security/commoncap.c renamed from security/commoncap.c~uninline +17 -0
@@ -24,6 +24,23 @@#include <linux/xattr.h> #include <linux/hugetlb.h> +int cap_netlink_send (struct sock *sk,struct sk_buff *skb) +{ +NETLINK_CB (skb).eff_cap = current->cap_effective; +return 0 ; +} + +EXPORT_SYMBOL (cap_netlink_send); + +int cap_netlink_recv (struct sk_buff *skb) +{ +if (!cap_raised (NETLINK_CB (skb).eff_cap,CAP_NET_ADMIN )) +return -EPERM ; +return 0 ; +} + +EXPORT_SYMBOL (cap_netlink_recv); +int cap_capable (struct task_struct *tsk,int cap) {/* Derived from include/linux/sched.h:capable. */