Commit 8d31a5c3 authored by James Morris's avatar James Morris
Browse files

Merge branch 'smack-for-5.2-b' of https://github.com/cschaufler/next-smack into next-smack 

Smack: Fix kbuild reported build error
parents 5f9b4992 619ae03e

security/smack/smack_lsm.c

+2 −0
Original line number Diff line number Diff line
@@ -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;