Skip to content

Commit

Permalink
Merge branch 'smack-for-5.2-b' of https://github.com/cschaufler/next-…
Browse files Browse the repository at this point in the history
…smack into next-smack

Smack: Fix kbuild reported build error
  • Loading branch information
James Morris committed May 7, 2019
2 parents 5f9b499 + 619ae03 commit 8d31a5c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions security/smack/smack_lsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
Expand Down

0 comments on commit 8d31a5c

Please sign in to comment.