summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJames Morris <jamorris@linux.microsoft.com>2019-05-07 06:24:51 +0300
committerJames Morris <jamorris@linux.microsoft.com>2019-05-07 06:24:51 +0300
commit8d31a5c35ed179825a2145881ad7cd8f9907d94b (patch)
treeea6089431d457b190daa6ea8cf0d6aca9d74653e /security
parent5f9b4992b722d31226607d611658408cd2c50fd1 (diff)
parent619ae03e922b65a1a5d4269ceae1e9e13a058d6b (diff)
downloadlinux-8d31a5c35ed179825a2145881ad7cd8f9907d94b.tar.xz
Merge branch 'smack-for-5.2-b' of https://github.com/cschaufler/next-smack into next-smack
Smack: Fix kbuild reported build error
Diffstat (limited to 'security')
-rw-r--r--security/smack/smack_lsm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index b5b333d72637..0de725f88bed 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3693,6 +3693,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
return -EINVAL;
rc = smack_netlabel_send(sock->sk, sip);
break;
+#if IS_ENABLED(CONFIG_IPV6)
case AF_INET6:
if (msg->msg_namelen < SIN6_LEN_RFC2133 ||
sap->sin6_family != AF_INET6)
@@ -3706,6 +3707,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
#ifdef SMACK_IPV6_PORT_LABELING
rc = smk_ipv6_port_check(sock->sk, sap, SMK_SENDING);
#endif
+#endif /* IS_ENABLED(CONFIG_IPV6) */
break;
}
return rc;