diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-29 17:31:46 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-29 17:31:46 +0200 |
| commit | 167225b775d47954d702db4743f9d918aabab0a8 (patch) | |
| tree | e03a05550c87c702fe4c746dd156a8bd38de3651 /security/selinux | |
| parent | KEYS: revert encrypted key change (diff) | |
| parent | Revert "selinux: fix the default socket labeling in sock_graft()" (diff) | |
| download | linux-167225b775d47954d702db4743f9d918aabab0a8.tar.xz linux-167225b775d47954d702db4743f9d918aabab0a8.zip | |
Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/hooks.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 7740f61588d6..b0e940497e23 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -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; } |