summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-07-16 21:05:51 +0400
committerJames Morris <james.l.morris@oracle.com>2014-07-16 21:05:51 +0400
commitb6b8a371f5541c2b839caba84fede693f3fcc43d (patch)
tree8bee0d6e115133436a2a1781814cbc2e9f72629e /security
parentbd89bb78f35fd175db7a9cfc504d789b6ca0f7b0 (diff)
parent4da6daf4d3df5a977e4623963f141a627fd2efce (diff)
downloadlinux-b6b8a371f5541c2b839caba84fede693f3fcc43d.tar.xz
Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 83d06db34d03..a1ac1c5c729b 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4499,9 +4499,18 @@ 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;
- if (sk->sk_family == PF_INET || sk->sk_family == PF_INET6 ||
- sk->sk_family == PF_UNIX)
+ switch (sk->sk_family) {
+ case PF_INET:
+ case PF_INET6:
+ case 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;
}