X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..eb6b6ca394357805f2bdba989abae309f718b4d8:/bsd/net/raw_cb.c?ds=sidebyside

diff --git a/bsd/net/raw_cb.c b/bsd/net/raw_cb.c
index b844434ff..9fbbd01ce 100644
--- a/bsd/net/raw_cb.c
+++ b/bsd/net/raw_cb.c
@@ -1,17 +1,20 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -19,8 +22,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -63,6 +66,7 @@
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
+#include <kern/locks.h>
 
 #include <net/raw_cb.h>
 
@@ -77,19 +81,18 @@
 
 struct rawcb_list_head rawcb_list;
 
-static u_long	raw_sendspace = RAWSNDQ;
-static u_long	raw_recvspace = RAWRCVQ;
+static uint32_t raw_sendspace = RAWSNDQ;
+static uint32_t raw_recvspace = RAWRCVQ;
+extern lck_mtx_t        *raw_mtx;       /*### global raw cb mutex for now */
 
 /*
  * Allocate a control block and a nominal amount
  * of buffer space for the socket.
  */
 int
-raw_attach(so, proto)
-	register struct socket *so;
-	int proto;
+raw_attach(struct socket *so, int proto)
 {
-	register struct rawcb *rp = sotorawcb(so);
+	struct rawcb *rp = sotorawcb(so);
 	int error;
 
 	/*
@@ -97,16 +100,20 @@ raw_attach(so, proto)
 	 * after space has been allocated for the
 	 * rawcb.
 	 */
-	if (rp == 0)
-		return (ENOBUFS);
+	if (rp == 0) {
+		return ENOBUFS;
+	}
 	error = soreserve(so, raw_sendspace, raw_recvspace);
-	if (error)
-		return (error);
+	if (error) {
+		return error;
+	}
 	rp->rcb_socket = so;
-	rp->rcb_proto.sp_family = so->so_proto->pr_domain->dom_family;
+	rp->rcb_proto.sp_family = SOCK_DOM(so);
 	rp->rcb_proto.sp_protocol = proto;
+	lck_mtx_lock(raw_mtx);
 	LIST_INSERT_HEAD(&rawcb_list, rp, list);
-	return (0);
+	lck_mtx_unlock(raw_mtx);
+	return 0;
 }
 
 /*
@@ -114,55 +121,72 @@ raw_attach(so, proto)
  * socket resources.
  */
 void
-raw_detach(rp)
-	register struct rawcb *rp;
+raw_detach(struct rawcb *rp)
 {
 	struct socket *so = rp->rcb_socket;
 
 	so->so_pcb = 0;
+	so->so_flags |= SOF_PCBCLEARING;
 	sofree(so);
+	if (!lck_mtx_try_lock(raw_mtx)) {
+		socket_unlock(so, 0);
+		lck_mtx_lock(raw_mtx);
+		socket_lock(so, 0);
+	}
 	LIST_REMOVE(rp, list);
+	lck_mtx_unlock(raw_mtx);
 #ifdef notdef
-	if (rp->rcb_laddr)
+	if (rp->rcb_laddr) {
 		m_freem(dtom(rp->rcb_laddr));
+	}
 	rp->rcb_laddr = 0;
 #endif
-	FREE((caddr_t)(rp), M_PCB);
+	rp->rcb_socket = NULL;
+	FREE(rp, M_PCB);
 }
 
 /*
  * Disconnect and possibly release resources.
  */
 void
-raw_disconnect(rp)
-	struct rawcb *rp;
+raw_disconnect(struct rawcb *rp)
 {
+	struct socket *so = rp->rcb_socket;
 
 #ifdef notdef
-	if (rp->rcb_faddr)
+	if (rp->rcb_faddr) {
 		m_freem(dtom(rp->rcb_faddr));
+	}
 	rp->rcb_faddr = 0;
 #endif
-	if (rp->rcb_socket->so_state & SS_NOFDREF)
+	/*
+	 * A multipath subflow socket would have its SS_NOFDREF set by default,
+	 * so check for SOF_MP_SUBFLOW socket flag before detaching the PCB;
+	 * when the socket is closed for real, SOF_MP_SUBFLOW would be cleared.
+	 */
+	if (!(so->so_flags & SOF_MP_SUBFLOW) && (so->so_state & SS_NOFDREF)) {
 		raw_detach(rp);
+	}
 }
 
 #ifdef notdef
 #include <sys/mbuf.h>
 
 int
-raw_bind(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
+raw_bind(struct socket *so, struct mbuf *nam)
 {
 	struct sockaddr *addr = mtod(nam, struct sockaddr *);
-	register struct rawcb *rp;
+	struct rawcb *rp;
 
-	if (ifnet == 0)
-		return (EADDRNOTAVAIL);
+	if (ifnet == 0) {
+		return EADDRNOTAVAIL;
+	}
 	rp = sotorawcb(so);
 	nam = m_copym(nam, 0, M_COPYALL, M_WAITOK);
+	if (nam == NULL) {
+		return ENOBUFS;
+	}
 	rp->rcb_laddr = mtod(nam, struct sockaddr *);
-	return (0);
+	return 0;
 }
 #endif