Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 713a04ae authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by James Morris
Browse files

SELinux: setup new inode/ipc getsecid hooks 



Setup the new inode_getsecid and ipc_getsecid() LSM hooks
for SELinux.

Signed-off-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Signed-off-by: default avatarAhmed S. Darwish <darwish.07@gmail.com>
Acked-by: default avatarJames Morris <jmorris@namei.org>
Reviewed-by: default avatarPaul Moore <paul.moore@hp.com>
parent 8a076191

security/selinux/hooks.c

+17 −2
Original line number Original line Diff line number Diff line
@@ -2792,6 +2792,12 @@ static int selinux_inode_killpriv(struct dentry *dentry) 
	return secondary_ops->inode_killpriv(dentry);

	return secondary_ops->inode_killpriv(dentry);

}

}





static void selinux_inode_getsecid(const struct inode *inode, u32 *secid)

{

	struct inode_security_struct *isec = inode->i_security;

	*secid = isec->sid;

}



/* file security operations */

/* file security operations */





static int selinux_revalidate_file_permission(struct file *file, int mask)

static int selinux_revalidate_file_permission(struct file *file, int mask)
@@ -3183,7 +3189,8 @@ static int selinux_task_getsid(struct task_struct *p) 




static void selinux_task_getsecid(struct task_struct *p, u32 *secid)

static void selinux_task_getsecid(struct task_struct *p, u32 *secid)

{

{

	selinux_get_task_sid(p, secid);

	struct task_security_struct *tsec = p->security;

	*secid = tsec->sid;

}

}





static int selinux_task_setgroups(struct group_info *group_info)

static int selinux_task_setgroups(struct group_info *group_info)
@@ -4149,7 +4156,7 @@ static int selinux_socket_getpeersec_dgram(struct socket *sock, struct sk_buff * 
		goto out;

		goto out;





	if (sock && family == PF_UNIX)

	if (sock && family == PF_UNIX)

		selinux_get_inode_sid(SOCK_INODE(sock), &peer_secid);

		selinux_inode_getsecid(SOCK_INODE(sock), &peer_secid);

	else if (skb)

	else if (skb)

		selinux_skb_peerlbl_sid(skb, family, &peer_secid);

		selinux_skb_peerlbl_sid(skb, family, &peer_secid);
@@ -5026,6 +5033,12 @@ static int selinux_ipc_permission(struct kern_ipc_perm *ipcp, short flag) 
	return ipc_has_perm(ipcp, av);

	return ipc_has_perm(ipcp, av);

}

}





static void selinux_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)

{

	struct ipc_security_struct *isec = ipcp->security;

	*secid = isec->sid;

}



/* module stacking operations */

/* module stacking operations */

static int selinux_register_security (const char *name, struct security_operations *ops)

static int selinux_register_security (const char *name, struct security_operations *ops)

{

{
@@ -5342,6 +5355,7 @@ static struct security_operations selinux_ops = { 
	.inode_listsecurity =           selinux_inode_listsecurity,

	.inode_listsecurity =           selinux_inode_listsecurity,

	.inode_need_killpriv =		selinux_inode_need_killpriv,

	.inode_need_killpriv =		selinux_inode_need_killpriv,

	.inode_killpriv =		selinux_inode_killpriv,

	.inode_killpriv =		selinux_inode_killpriv,

	.inode_getsecid =               selinux_inode_getsecid,





	.file_permission =		selinux_file_permission,

	.file_permission =		selinux_file_permission,

	.file_alloc_security =		selinux_file_alloc_security,

	.file_alloc_security =		selinux_file_alloc_security,
@@ -5382,6 +5396,7 @@ static struct security_operations selinux_ops = { 
	.task_to_inode =                selinux_task_to_inode,

	.task_to_inode =                selinux_task_to_inode,





	.ipc_permission =		selinux_ipc_permission,

	.ipc_permission =		selinux_ipc_permission,

	.ipc_getsecid =                 selinux_ipc_getsecid,





	.msg_msg_alloc_security =	selinux_msg_msg_alloc_security,

	.msg_msg_alloc_security =	selinux_msg_msg_alloc_security,

	.msg_msg_free_security =	selinux_msg_msg_free_security,

	.msg_msg_free_security =	selinux_msg_msg_free_security,