xnu-3789.70.16.tar.gz

[apple/xnu.git] / bsd / net / raw_cb.c

diff --git a/bsd/net/raw_cb.c b/bsd/net/raw_cb.c
index dee6205f052eaa72e0cf3520818993aece469d9a..2aaaeeb4b3074de6731c757cdd11915886e1c0e7 100644 (file)
--- a/bsd/net/raw_cb.c
+++ b/bsd/net/raw_cb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -81,8 +81,8 @@
 
 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 */
 
 /*
@@ -106,7 +106,7 @@ raw_attach(struct socket *so, int proto)
        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);
@@ -148,12 +148,19 @@ raw_detach(struct rawcb *rp)
 void
 raw_disconnect(struct rawcb *rp)
 {
+       struct socket *so = rp->rcb_socket;
+
 #ifdef notdef
        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);
 }
 
@@ -170,6 +177,8 @@ raw_bind(struct socket *so, struct mbuf *nam)
                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);
 }