diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-17 03:05:51 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-17 03:05:51 +1000 |
| commit | b6b8a371f5541c2b839caba84fede693f3fcc43d (patch) | |
| tree | 8bee0d6e115133436a2a1781814cbc2e9f72629e /security | |
| parent | bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0 (diff) | |
| parent | 4da6daf4d3df5a977e4623963f141a627fd2efce (diff) | |
| download | linux-stable-b6b8a371f5541c2b839caba84fede693f3fcc43d.tar.gz linux-stable-b6b8a371f5541c2b839caba84fede693f3fcc43d.tar.bz2 linux-stable-b6b8a371f5541c2b839caba84fede693f3fcc43d.zip | |
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.c | 13 |
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; } |