X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/9bccf70c0258c7cac2dcb80011b2a964d884c552..5eebf7385fedb1517b66b53c28e5aa6bb0a2be50:/bsd/kern/uipc_usrreq.c

diff --git a/bsd/kern/uipc_usrreq.c b/bsd/kern/uipc_usrreq.c
index 905652bee..dda829231 100644
--- a/bsd/kern/uipc_usrreq.c
+++ b/bsd/kern/uipc_usrreq.c
@@ -660,6 +660,18 @@ unp_connect(so, nam, p)
 		goto bad;
 	}
 	thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);
+	
+	/*
+	 * Check if socket was connected while we were trying to
+	 * acquire the funnel.
+	 * XXX - probably shouldn't return an error for SOCK_DGRAM
+	 */
+	if ((so->so_state & SS_ISCONNECTED) != 0) {
+		error = EISCONN;
+		thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);
+		goto bad;
+	}
+	
 	if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
 		if ((so2->so_options & SO_ACCEPTCONN) == 0 ||
 		    (so3 = sonewconn(so2, 0)) == 0) {