mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next

This commit is contained in:
James Morris 2014-07-30 01:31:46 +10:00
parent b64cc5fb85 2873ead7e4
commit 167225b775
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/security.h
View File

@ -996,10 +996,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
* Retrieve the LSM-specific secid for the sock to enable caching of network
* authorizations.
* @sock_graft:
* This hook is called in response to a newly created sock struct being
* grafted onto an existing socket and allows the security module to
* perform whatever security attribute management is necessary for both
* the sock and socket.
* Sets the socket's isec sid to the sock's sid.
* @inet_conn_request:
* Sets the openreq's sid to socket's sid with MLS portion taken from peer sid.
* @inet_csk_clone:

13
security/selinux/hooks.c
View File

@ -4510,18 +4510,9 @@ static void selinux_sock_graft(struct sock *sk, struct socket *parent)
struct inode_security_struct *isec = SOCK_INODE(parent)->i_security;
struct sk_security_struct *sksec = sk->sk_security;
switch (sk->sk_family) {
case PF_INET:
case PF_INET6:
case PF_UNIX:
if (sk->sk_family == PF_INET || sk->sk_family == PF_INET6 ||
sk->sk_family == PF_UNIX)
isec->sid = sksec->sid;
break;
default:
/* by default there is no special labeling mechanism for the
* sksec label so inherit the label from the parent socket */
BUG_ON(sksec->sid != SECINITSID_UNLABELED);
sksec->sid = isec->sid;
}
sksec->sclass = isec->sclass;
}