Rename mac_check_socket_receive() to mac_check_socket_deliver() so that

we can use the names _receive() and _send() for the receive() and send()
checks.  Rename related constants, policy implementations, etc.

PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, NAI Labs
MFC after:

8 files changed, 80 insertions, 80 deletions

diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 23c6a7c..66e16e9 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -693,12 +693,12 @@ mac_policy_register(struct mac_policy_conf *mpc)
 			mpc->mpc_ops->mpo_check_socket_connect =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_LISTEN:
-			mpc->mpc_ops->mpo_check_socket_listen =
+		case MAC_CHECK_SOCKET_DELIVER:
+			mpc->mpc_ops->mpo_check_socket_deliver =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_RECEIVE:
-			mpc->mpc_ops->mpo_check_socket_receive =
+		case MAC_CHECK_SOCKET_LISTEN:
+			mpc->mpc_ops->mpo_check_socket_listen =
 			    mpe->mpe_function;
 			break;
 		case MAC_CHECK_SOCKET_RELABEL:
@@ -2534,28 +2534,28 @@ mac_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 int
-mac_check_socket_listen(struct ucred *cred, struct socket *socket)
+mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
+	MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf,
+	    &mbuf->m_pkthdr.label);
+
 	return (error);
 }
 
 int
-mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf)
+mac_check_socket_listen(struct ucred *cred, struct socket *socket)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf,
-	    &mbuf->m_pkthdr.label);
-
+	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
 	return (error);
 }
 
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 23c6a7c..66e16e9 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -693,12 +693,12 @@ mac_policy_register(struct mac_policy_conf *mpc)
 			mpc->mpc_ops->mpo_check_socket_connect =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_LISTEN:
-			mpc->mpc_ops->mpo_check_socket_listen =
+		case MAC_CHECK_SOCKET_DELIVER:
+			mpc->mpc_ops->mpo_check_socket_deliver =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_RECEIVE:
-			mpc->mpc_ops->mpo_check_socket_receive =
+		case MAC_CHECK_SOCKET_LISTEN:
+			mpc->mpc_ops->mpo_check_socket_listen =
 			    mpe->mpe_function;
 			break;
 		case MAC_CHECK_SOCKET_RELABEL:
@@ -2534,28 +2534,28 @@ mac_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 int
-mac_check_socket_listen(struct ucred *cred, struct socket *socket)
+mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
+	MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf,
+	    &mbuf->m_pkthdr.label);
+
 	return (error);
 }
 
 int
-mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf)
+mac_check_socket_listen(struct ucred *cred, struct socket *socket)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf,
-	    &mbuf->m_pkthdr.label);
-
+	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
 	return (error);
 }
 
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 23c6a7c..66e16e9 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -693,12 +693,12 @@ mac_policy_register(struct mac_policy_conf *mpc)
 			mpc->mpc_ops->mpo_check_socket_connect =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_LISTEN:
-			mpc->mpc_ops->mpo_check_socket_listen =
+		case MAC_CHECK_SOCKET_DELIVER:
+			mpc->mpc_ops->mpo_check_socket_deliver =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_RECEIVE:
-			mpc->mpc_ops->mpo_check_socket_receive =
+		case MAC_CHECK_SOCKET_LISTEN:
+			mpc->mpc_ops->mpo_check_socket_listen =
 			    mpe->mpe_function;
 			break;
 		case MAC_CHECK_SOCKET_RELABEL:
@@ -2534,28 +2534,28 @@ mac_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 int
-mac_check_socket_listen(struct ucred *cred, struct socket *socket)
+mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
+	MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf,
+	    &mbuf->m_pkthdr.label);
+
 	return (error);
 }
 
 int
-mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf)
+mac_check_socket_listen(struct ucred *cred, struct socket *socket)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf,
-	    &mbuf->m_pkthdr.label);
-
+	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
 	return (error);
 }
 
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 23c6a7c..66e16e9 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -693,12 +693,12 @@ mac_policy_register(struct mac_policy_conf *mpc)
 			mpc->mpc_ops->mpo_check_socket_connect =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_LISTEN:
-			mpc->mpc_ops->mpo_check_socket_listen =
+		case MAC_CHECK_SOCKET_DELIVER:
+			mpc->mpc_ops->mpo_check_socket_deliver =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_RECEIVE:
-			mpc->mpc_ops->mpo_check_socket_receive =
+		case MAC_CHECK_SOCKET_LISTEN:
+			mpc->mpc_ops->mpo_check_socket_listen =
 			    mpe->mpe_function;
 			break;
 		case MAC_CHECK_SOCKET_RELABEL:
@@ -2534,28 +2534,28 @@ mac_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 int
-mac_check_socket_listen(struct ucred *cred, struct socket *socket)
+mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
+	MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf,
+	    &mbuf->m_pkthdr.label);
+
 	return (error);
 }
 
 int
-mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf)
+mac_check_socket_listen(struct ucred *cred, struct socket *socket)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf,
-	    &mbuf->m_pkthdr.label);
-
+	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
 	return (error);
 }
 
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 23c6a7c..66e16e9 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -693,12 +693,12 @@ mac_policy_register(struct mac_policy_conf *mpc)
 			mpc->mpc_ops->mpo_check_socket_connect =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_LISTEN:
-			mpc->mpc_ops->mpo_check_socket_listen =
+		case MAC_CHECK_SOCKET_DELIVER:
+			mpc->mpc_ops->mpo_check_socket_deliver =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_RECEIVE:
-			mpc->mpc_ops->mpo_check_socket_receive =
+		case MAC_CHECK_SOCKET_LISTEN:
+			mpc->mpc_ops->mpo_check_socket_listen =
 			    mpe->mpe_function;
 			break;
 		case MAC_CHECK_SOCKET_RELABEL:
@@ -2534,28 +2534,28 @@ mac_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 int
-mac_check_socket_listen(struct ucred *cred, struct socket *socket)
+mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
+	MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf,
+	    &mbuf->m_pkthdr.label);
+
 	return (error);
 }
 
 int
-mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf)
+mac_check_socket_listen(struct ucred *cred, struct socket *socket)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf,
-	    &mbuf->m_pkthdr.label);
-
+	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
 	return (error);
 }
 
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index 23c6a7c..66e16e9 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -693,12 +693,12 @@ mac_policy_register(struct mac_policy_conf *mpc)
 			mpc->mpc_ops->mpo_check_socket_connect =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_LISTEN:
-			mpc->mpc_ops->mpo_check_socket_listen =
+		case MAC_CHECK_SOCKET_DELIVER:
+			mpc->mpc_ops->mpo_check_socket_deliver =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_RECEIVE:
-			mpc->mpc_ops->mpo_check_socket_receive =
+		case MAC_CHECK_SOCKET_LISTEN:
+			mpc->mpc_ops->mpo_check_socket_listen =
 			    mpe->mpe_function;
 			break;
 		case MAC_CHECK_SOCKET_RELABEL:
@@ -2534,28 +2534,28 @@ mac_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 int
-mac_check_socket_listen(struct ucred *cred, struct socket *socket)
+mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
+	MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf,
+	    &mbuf->m_pkthdr.label);
+
 	return (error);
 }
 
 int
-mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf)
+mac_check_socket_listen(struct ucred *cred, struct socket *socket)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf,
-	    &mbuf->m_pkthdr.label);
-
+	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
 	return (error);
 }
 
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 23c6a7c..66e16e9 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -693,12 +693,12 @@ mac_policy_register(struct mac_policy_conf *mpc)
 			mpc->mpc_ops->mpo_check_socket_connect =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_LISTEN:
-			mpc->mpc_ops->mpo_check_socket_listen =
+		case MAC_CHECK_SOCKET_DELIVER:
+			mpc->mpc_ops->mpo_check_socket_deliver =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_RECEIVE:
-			mpc->mpc_ops->mpo_check_socket_receive =
+		case MAC_CHECK_SOCKET_LISTEN:
+			mpc->mpc_ops->mpo_check_socket_listen =
 			    mpe->mpe_function;
 			break;
 		case MAC_CHECK_SOCKET_RELABEL:
@@ -2534,28 +2534,28 @@ mac_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 int
-mac_check_socket_listen(struct ucred *cred, struct socket *socket)
+mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
+	MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf,
+	    &mbuf->m_pkthdr.label);
+
 	return (error);
 }
 
 int
-mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf)
+mac_check_socket_listen(struct ucred *cred, struct socket *socket)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf,
-	    &mbuf->m_pkthdr.label);
-
+	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
 	return (error);
 }
 
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 23c6a7c..66e16e9 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -693,12 +693,12 @@ mac_policy_register(struct mac_policy_conf *mpc)
 			mpc->mpc_ops->mpo_check_socket_connect =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_LISTEN:
-			mpc->mpc_ops->mpo_check_socket_listen =
+		case MAC_CHECK_SOCKET_DELIVER:
+			mpc->mpc_ops->mpo_check_socket_deliver =
 			    mpe->mpe_function;
 			break;
-		case MAC_CHECK_SOCKET_RECEIVE:
-			mpc->mpc_ops->mpo_check_socket_receive =
+		case MAC_CHECK_SOCKET_LISTEN:
+			mpc->mpc_ops->mpo_check_socket_listen =
 			    mpe->mpe_function;
 			break;
 		case MAC_CHECK_SOCKET_RELABEL:
@@ -2534,28 +2534,28 @@ mac_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 int
-mac_check_socket_listen(struct ucred *cred, struct socket *socket)
+mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
+	MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf,
+	    &mbuf->m_pkthdr.label);
+
 	return (error);
 }
 
 int
-mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf)
+mac_check_socket_listen(struct ucred *cred, struct socket *socket)
 {
 	int error;
 
 	if (!mac_enforce_socket)
 		return (0);
 
-	MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf,
-	    &mbuf->m_pkthdr.label);
-
+	MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label);
 	return (error);
 }