Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / security / selinux / hooks.c

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 7740f61588d6493b7c1e2da18f6562ff9317a529..b0e940497e23bb47a0460e57a65952f2b4dc7e03 100644 (file)
--- 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;
 }