mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
Merge branch 'smack-for-5.2-b' of https://github.com/cschaufler/next-smack into next-smack
Smack: Fix kbuild reported build error
This commit is contained in:
commit
8d31a5c35e
1 changed files with 2 additions and 0 deletions
|
@ -3693,6 +3693,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
rc = smack_netlabel_send(sock->sk, sip);
|
rc = smack_netlabel_send(sock->sk, sip);
|
||||||
break;
|
break;
|
||||||
|
#if IS_ENABLED(CONFIG_IPV6)
|
||||||
case AF_INET6:
|
case AF_INET6:
|
||||||
if (msg->msg_namelen < SIN6_LEN_RFC2133 ||
|
if (msg->msg_namelen < SIN6_LEN_RFC2133 ||
|
||||||
sap->sin6_family != AF_INET6)
|
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
|
#ifdef SMACK_IPV6_PORT_LABELING
|
||||||
rc = smk_ipv6_port_check(sock->sk, sap, SMK_SENDING);
|
rc = smk_ipv6_port_check(sock->sk, sap, SMK_SENDING);
|
||||||
#endif
|
#endif
|
||||||
|
#endif /* IS_ENABLED(CONFIG_IPV6) */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return rc;
|
return rc;
|
||||||
|
|
Loading…
Reference in a new issue