xnu-1228.0.2.tar.gz

[apple/xnu.git] / bsd / kern / uipc_usrreq.c

diff --git a/bsd/kern/uipc_usrreq.c b/bsd/kern/uipc_usrreq.c
index 262197e4743346826a4f441e2eb68e56b1982e5b..9b568d24c65b22e5b8dadf849b64e5902ba2789e 100644 (file)
--- a/bsd/kern/uipc_usrreq.c
+++ b/bsd/kern/uipc_usrreq.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -59,6 +59,12 @@
  *
  *     From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94
  */
  *
  *     From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94
  */

+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */

 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>


@@ -86,21 +92,25 @@
 #include <kern/zalloc.h>
 #include <kern/locks.h>
 
 #include <kern/zalloc.h>
 #include <kern/locks.h>
 

-#define f_msgcount f_fglob->fg_msgcount
-#define f_cred f_fglob->fg_cred
-#define f_ops f_fglob->fg_ops
-#define f_offset f_fglob->fg_offset
-#define f_data f_fglob->fg_data
+#if CONFIG_MACF_SOCKET
+#include <security/mac_framework.h>
+#endif /* MAC_SOCKET */
+
+#define        f_msgcount f_fglob->fg_msgcount
+#define        f_cred f_fglob->fg_cred
+#define        f_ops f_fglob->fg_ops
+#define        f_offset f_fglob->fg_offset
+#define        f_data f_fglob->fg_data

 struct zone *unp_zone;
 static unp_gen_t unp_gencnt;
 static u_int unp_count;
 
 struct zone *unp_zone;
 static unp_gen_t unp_gencnt;
 static u_int unp_count;
 

-static lck_attr_t              *unp_mtx_attr;
-static lck_grp_t               *unp_mtx_grp;
-static lck_grp_attr_t          *unp_mtx_grp_attr;
-static lck_rw_t                *unp_list_mtx;
+static lck_attr_t              *unp_mtx_attr;
+static lck_grp_t               *unp_mtx_grp;
+static lck_grp_attr_t          *unp_mtx_grp_attr;
+static lck_rw_t                *unp_list_mtx;

 
 

-extern lck_mtx_t * uipc_lock;
+extern lck_mtx_t *uipc_lock;

 static struct unp_head unp_shead, unp_dhead;
 
 /*
 static struct unp_head unp_shead, unp_dhead;
 
 /*


@@ -112,24 +122,26 @@ static    struct unp_head unp_shead, unp_dhead;
  *     need a proper out-of-band
  *     lock pushdown
  */
  *     need a proper out-of-band
  *     lock pushdown
  */

-static struct  sockaddr sun_noname = { sizeof(sun_noname), AF_LOCAL, { 0 } };
+static struct  sockaddr sun_noname = { sizeof (sun_noname), AF_LOCAL, { 0 } };

 static ino_t   unp_ino;                /* prototype for fake inode numbers */
 
 static ino_t   unp_ino;                /* prototype for fake inode numbers */
 

-static int     unp_attach(struct socket *);
-static void    unp_detach(struct unpcb *);
-static int     unp_bind(struct unpcb *,struct sockaddr *, struct proc *);
-static int     unp_connect(struct socket *,struct sockaddr *, struct proc *);
-static void    unp_disconnect(struct unpcb *);
-static void    unp_shutdown(struct unpcb *);
-static void    unp_drop(struct unpcb *, int);
-static void    unp_gc(void);
-static void    unp_scan(struct mbuf *, void (*)(struct fileglob *));
-static void    unp_mark(struct fileglob *);
-static void    unp_discard(struct fileglob *);
-static void    unp_discard_fdlocked(struct fileglob *, struct proc *);
-static int     unp_internalize(struct mbuf *, struct proc *);
-static int     unp_listen(struct unpcb *, struct proc *);
-
+static int     unp_attach(struct socket *);
+static void    unp_detach(struct unpcb *);
+static int     unp_bind(struct unpcb *, struct sockaddr *, proc_t);
+static int     unp_connect(struct socket *, struct sockaddr *, proc_t);
+static void    unp_disconnect(struct unpcb *);
+static void    unp_shutdown(struct unpcb *);
+static void    unp_drop(struct unpcb *, int);
+static void    unp_gc(void);
+static void    unp_scan(struct mbuf *, void (*)(struct fileglob *));
+static void    unp_mark(struct fileglob *);
+static void    unp_discard(struct fileglob *);
+static void    unp_discard_fdlocked(struct fileglob *, proc_t);
+static int     unp_internalize(struct mbuf *, proc_t);
+static int     unp_listen(struct unpcb *, proc_t);
+
+/* TODO: this should be in header file */
+extern int fdgetf_noref(proc_t, int, struct fileproc **);

 
 static int
 uipc_abort(struct socket *so)
 
 static int
 uipc_abort(struct socket *so)


@@ -137,11 +149,11 @@ uipc_abort(struct socket *so)
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)

-               return EINVAL;
+               return (EINVAL);

        unp_drop(unp, ECONNABORTED);
        unp_detach(unp);
        sofree(so);
        unp_drop(unp, ECONNABORTED);
        unp_detach(unp);
        sofree(so);

-       return 0;
+       return (0);

 }
 
 static int
 }
 
 static int


@@ -150,7 +162,7 @@ uipc_accept(struct socket *so, struct sockaddr **nam)
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)

-               return EINVAL;
+               return (EINVAL);

 
        /*
         * Pass back name of connected socket,
 
        /*
         * Pass back name of connected socket,


@@ -158,54 +170,70 @@ uipc_accept(struct socket *so, struct sockaddr **nam)
         * (our peer may have closed already!).
         */
        if (unp->unp_conn && unp->unp_conn->unp_addr) {
         * (our peer may have closed already!).
         */
        if (unp->unp_conn && unp->unp_conn->unp_addr) {

-               *nam = dup_sockaddr((struct sockaddr *)unp->unp_conn->unp_addr,
-                                   1);
+               *nam = dup_sockaddr((struct sockaddr *)
+                   unp->unp_conn->unp_addr, 1);

        } else {
                *nam = dup_sockaddr((struct sockaddr *)&sun_noname, 1);
        }
        } else {
                *nam = dup_sockaddr((struct sockaddr *)&sun_noname, 1);
        }

-       return 0;
+       return (0);

 }
 
 }
 

+/*
+ * Returns:    0                       Success
+ *             EISCONN
+ *     unp_attach:
+ */

 static int
 static int

-uipc_attach(struct socket *so, __unused int proto, __unused struct proc *p)
+uipc_attach(struct socket *so, __unused int proto, __unused proc_t p)

 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp != 0)
 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp != 0)

-               return EISCONN;
-       return unp_attach(so);
+               return (EISCONN);
+       return (unp_attach(so));

 }
 
 static int
 }
 
 static int

-uipc_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
+uipc_bind(struct socket *so, struct sockaddr *nam, proc_t p)

 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)
 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)

-               return EINVAL;
+               return (EINVAL);

 
 

-       return unp_bind(unp, nam, p);
+       return (unp_bind(unp, nam, p));

 }
 
 }
 

+/*
+ * Returns:    0                       Success
+ *             EINVAL
+ *     unp_connect:???                 [See elsewhere in this file]
+ */

 static int
 static int

-uipc_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
+uipc_connect(struct socket *so, struct sockaddr *nam, proc_t p)

 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)
 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)

-               return EINVAL;
-       return unp_connect(so, nam, p);
+               return (EINVAL);
+       return (unp_connect(so, nam, p));

 }
 
 }
 

+/*
+ * Returns:    0                       Success
+ *             EINVAL
+ *     unp_connect2:EPROTOTYPE         Protocol wrong type for socket
+ *     unp_connect2:EINVAL             Invalid argument
+ */

 static int
 uipc_connect2(struct socket *so1, struct socket *so2)
 {
        struct unpcb *unp = sotounpcb(so1);
 
        if (unp == 0)
 static int
 uipc_connect2(struct socket *so1, struct socket *so2)
 {
        struct unpcb *unp = sotounpcb(so1);
 
        if (unp == 0)

-               return EINVAL;
+               return (EINVAL);

 
 

-       return unp_connect2(so1, so2);
+       return (unp_connect2(so1, so2));

 }
 
 /* control is EOPNOTSUPP */
 }
 
 /* control is EOPNOTSUPP */


@@ -216,10 +244,10 @@ uipc_detach(struct socket *so)
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)

-               return EINVAL;
+               return (EINVAL);

 
        unp_detach(unp);
 
        unp_detach(unp);

-       return 0;
+       return (0);

 }
 
 static int
 }
 
 static int


@@ -228,19 +256,23 @@ uipc_disconnect(struct socket *so)
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)

-               return EINVAL;
+               return (EINVAL);

        unp_disconnect(unp);
        unp_disconnect(unp);

-       return 0;
+       return (0);

 }
 
 }
 

+/*
+ * Returns:    0                       Success
+ *             EINVAL
+ */

 static int
 static int

-uipc_listen(struct socket *so, __unused struct proc *p)
+uipc_listen(struct socket *so, __unused proc_t p)

 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0 || unp->unp_vnode == 0)
 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0 || unp->unp_vnode == 0)

-               return EINVAL;
-       return unp_listen(unp, p);
+               return (EINVAL);
+       return (unp_listen(unp, p));

 }
 
 static int
 }
 
 static int


@@ -248,12 +280,15 @@ uipc_peeraddr(struct socket *so, struct sockaddr **nam)
 {
        struct unpcb *unp = sotounpcb(so);
 
 {
        struct unpcb *unp = sotounpcb(so);
 

-       if (unp == 0)
-               return EINVAL;
-       if (unp->unp_conn && unp->unp_conn->unp_addr)
-               *nam = dup_sockaddr((struct sockaddr *)unp->unp_conn->unp_addr,
-                                   1);
-       return 0;
+       if (unp == NULL)
+               return (EINVAL);
+       if (unp->unp_conn != NULL && unp->unp_conn->unp_addr != NULL) {
+               *nam = dup_sockaddr((struct sockaddr *)
+                   unp->unp_conn->unp_addr, 1);
+       } else {
+               *nam = dup_sockaddr((struct sockaddr *)&sun_noname, 1);
+       }
+       return (0);

 }
 
 static int
 }
 
 static int


@@ -263,7 +298,7 @@ uipc_rcvd(struct socket *so, __unused int flags)
        struct socket *so2;
 
        if (unp == 0)
        struct socket *so2;
 
        if (unp == 0)

-               return EINVAL;
+               return (EINVAL);

        switch (so->so_type) {
        case SOCK_DGRAM:
                panic("uipc_rcvd DGRAM?");
        switch (so->so_type) {
        case SOCK_DGRAM:
                panic("uipc_rcvd DGRAM?");


@@ -271,7 +306,7 @@ uipc_rcvd(struct socket *so, __unused int flags)
 
        case SOCK_STREAM:
 #define        rcv (&so->so_rcv)
 
        case SOCK_STREAM:
 #define        rcv (&so->so_rcv)

-#define snd (&so2->so_snd)
+#define        snd (&so2->so_snd)

                if (unp->unp_conn == 0)
                        break;
                so2 = unp->unp_conn->unp_socket;
                if (unp->unp_conn == 0)
                        break;
                so2 = unp->unp_conn->unp_socket;


@@ -291,14 +326,33 @@ uipc_rcvd(struct socket *so, __unused int flags)
        default:
                panic("uipc_rcvd unknown socktype");
        }
        default:
                panic("uipc_rcvd unknown socktype");
        }

-       return 0;
+       return (0);

 }
 
 /* pru_rcvoob is EOPNOTSUPP */
 
 }
 
 /* pru_rcvoob is EOPNOTSUPP */
 

+/*
+ * Returns:    0                       Success
+ *             EINVAL
+ *             EOPNOTSUPP
+ *             EPIPE
+ *             ENOTCONN
+ *             EISCONN
+ *     unp_internalize:EINVAL
+ *     unp_internalize:EBADF
+ *     unp_connect:EAFNOSUPPORT        Address family not supported
+ *     unp_connect:EINVAL              Invalid argument
+ *     unp_connect:ENOTSOCK            Not a socket
+ *     unp_connect:ECONNREFUSED        Connection refused
+ *     unp_connect:EISCONN             Socket is connected
+ *     unp_connect:EPROTOTYPE          Protocol wrong type for socket
+ *     unp_connect:???
+ *     sbappendaddr:ENOBUFS            [5th argument, contents modified]
+ *     sbappendaddr:???                [whatever a filter author chooses]
+ */

 static int
 uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
 static int
 uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,

-         struct mbuf *control, struct proc *p)
+    struct mbuf *control, proc_t p)

 {
        int error = 0;
        struct unpcb *unp = sotounpcb(so);
 {
        int error = 0;
        struct unpcb *unp = sotounpcb(so);


@@ -314,7 +368,8 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
        }
 
        if (control) {
        }
 
        if (control) {

-               socket_unlock(so, 0); /* release global lock to avoid deadlock (4436174) */ 
+               /* release global lock to avoid deadlock (4436174) */
+               socket_unlock(so, 0);

                error = unp_internalize(control, p);
                socket_lock(so, 0);
                if (error)
                error = unp_internalize(control, p);
                socket_lock(so, 0);
                if (error)


@@ -322,7 +377,7 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
        }
 
        switch (so->so_type) {
        }
 
        switch (so->so_type) {

-       case SOCK_DGRAM: 
+       case SOCK_DGRAM:

        {
                struct sockaddr *from;
 
        {
                struct sockaddr *from;
 


@@ -345,11 +400,22 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
                        from = (struct sockaddr *)unp->unp_addr;
                else
                        from = &sun_noname;
                        from = (struct sockaddr *)unp->unp_addr;
                else
                        from = &sun_noname;

+               /*
+                * sbappendaddr() will fail when the receiver runs out of
+                * space; in contrast to SOCK_STREAM, we will lose messages
+                * for the SOCK_DGRAM case when the receiver's queue overflows.
+                * SB_UNIX on the socket buffer implies that the callee will
+                * not free the control message, if any, because we would need
+                * to call unp_dispose() on it.
+                */

                if (sbappendaddr(&so2->so_rcv, from, m, control, &error)) {
                if (sbappendaddr(&so2->so_rcv, from, m, control, &error)) {

+                       control = NULL;

                        sorwakeup(so2);
                        sorwakeup(so2);

+               } else if (control != NULL && error == 0) {
+                       /* A socket filter took control; don't touch it */
+                       control = NULL;

                }
                }

-               m = 0;
-               control = 0;
+               m = NULL;

                if (nam)
                        unp_disconnect(unp);
                break;
                if (nam)
                        unp_disconnect(unp);
                break;


@@ -383,23 +449,29 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
                        panic("uipc_send connected but no connection?");
                so2 = unp->unp_conn->unp_socket;
                /*
                        panic("uipc_send connected but no connection?");
                so2 = unp->unp_conn->unp_socket;
                /*

-                * Send to paired receive port, and then reduce
-                * send buffer hiwater marks to maintain backpressure.
-                * Wake up readers.
+                * Send to paired receive port, and then reduce send buffer
+                * hiwater marks to maintain backpressure.  Wake up readers.
+                * SB_UNIX flag will allow new record to be appended to the
+                * receiver's queue even when it is already full.  It is
+                * possible, however, that append might fail.  In that case,
+                * we will need to call unp_dispose() on the control message;
+                * the callee will not free it since SB_UNIX is set.

                 */
                 */

-               if ((control && sbappendcontrol(rcv, m, control, NULL)) ||
-                       sbappend(rcv, m)) {
-                       didreceive = 1;
-               }
-               snd->sb_mbmax -=
-                       rcv->sb_mbcnt - unp->unp_conn->unp_mbcnt;
+               didreceive = control ?
+                   sbappendcontrol(rcv, m, control, &error) : sbappend(rcv, m);
+
+               snd->sb_mbmax -= rcv->sb_mbcnt - unp->unp_conn->unp_mbcnt;

                unp->unp_conn->unp_mbcnt = rcv->sb_mbcnt;
                snd->sb_hiwat -= rcv->sb_cc - unp->unp_conn->unp_cc;
                unp->unp_conn->unp_cc = rcv->sb_cc;
                unp->unp_conn->unp_mbcnt = rcv->sb_mbcnt;
                snd->sb_hiwat -= rcv->sb_cc - unp->unp_conn->unp_cc;
                unp->unp_conn->unp_cc = rcv->sb_cc;

-               if (didreceive)
+               if (didreceive) {
+                       control = NULL;

                        sorwakeup(so2);
                        sorwakeup(so2);

-               m = 0;
-               control = 0;
+               } else if (control != NULL && error == 0) {
+                       /* A socket filter took control; don't touch it */
+                       control = NULL;
+               }
+               m = NULL;

 #undef snd
 #undef rcv
                }
 #undef snd
 #undef rcv
                }


@@ -418,59 +490,95 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
                unp_shutdown(unp);
        }
 
                unp_shutdown(unp);
        }
 

-       if (control && error != 0)
+       if (control && error != 0) {
+               socket_unlock(so, 0);

                unp_dispose(control);
                unp_dispose(control);

+               socket_lock(so, 0);
+       }

 
 release:
        if (control)
                m_freem(control);
        if (m)
                m_freem(m);
 
 release:
        if (control)
                m_freem(control);
        if (m)
                m_freem(m);

-       return error;
+       return (error);

 }
 
 static int
 }
 
 static int

-uipc_sense(struct socket *so, struct stat *sb)
+uipc_sense(struct socket *so, void *ub, int isstat64)

 {
        struct unpcb *unp = sotounpcb(so);
        struct socket *so2;
 {
        struct unpcb *unp = sotounpcb(so);
        struct socket *so2;

+       blksize_t blksize;

 
        if (unp == 0)
 
        if (unp == 0)

-               return EINVAL;
-       sb->st_blksize = so->so_snd.sb_hiwat;
+               return (EINVAL);
+
+       blksize = so->so_snd.sb_hiwat;

        if (so->so_type == SOCK_STREAM && unp->unp_conn != 0) {
                so2 = unp->unp_conn->unp_socket;
        if (so->so_type == SOCK_STREAM && unp->unp_conn != 0) {
                so2 = unp->unp_conn->unp_socket;

-               sb->st_blksize += so2->so_rcv.sb_cc;
+               blksize += so2->so_rcv.sb_cc;

        }
        }

-       sb->st_dev = NODEV;

        if (unp->unp_ino == 0)
                unp->unp_ino = unp_ino++;
        if (unp->unp_ino == 0)
                unp->unp_ino = unp_ino++;

-       sb->st_ino = unp->unp_ino;
+
+       if (isstat64 != 0) {
+               struct stat64  *sb64;
+
+               sb64 = (struct stat64 *)ub;
+               sb64->st_blksize = blksize;
+               sb64->st_dev = NODEV;
+               sb64->st_ino = (ino64_t)unp->unp_ino;
+       } else {
+               struct stat *sb;
+
+               sb = (struct stat *)ub;
+               sb->st_blksize = blksize;
+               sb->st_dev = NODEV;
+               sb->st_ino = (ino_t)unp->unp_ino;
+       }
+

        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Returns:    0               Success
+ *             EINVAL
+ *
+ * Notes:      This is not strictly correct, as unp_shutdown() also calls
+ *             socantrcvmore().  These should maybe both be conditionalized
+ *             on the 'how' argument in soshutdown() as called from the
+ *             shutdown() system call.
+ */

 static int
 uipc_shutdown(struct socket *so)
 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)
 static int
 uipc_shutdown(struct socket *so)
 {
        struct unpcb *unp = sotounpcb(so);
 
        if (unp == 0)

-               return EINVAL;
+               return (EINVAL);

        socantsendmore(so);
        unp_shutdown(unp);
        socantsendmore(so);
        unp_shutdown(unp);

-       return 0;
+       return (0);

 }
 
 }
 

+/*
+ * Returns:    0                       Success
+ *             EINVAL                  Invalid argument
+ */

 static int
 uipc_sockaddr(struct socket *so, struct sockaddr **nam)
 {
        struct unpcb *unp = sotounpcb(so);
 
 static int
 uipc_sockaddr(struct socket *so, struct sockaddr **nam)
 {
        struct unpcb *unp = sotounpcb(so);
 

-       if (unp == 0)
-               return EINVAL;
-       if (unp->unp_addr)
+       if (unp == NULL)
+               return (EINVAL);
+       if (unp->unp_addr != NULL) {

                *nam = dup_sockaddr((struct sockaddr *)unp->unp_addr, 1);
                *nam = dup_sockaddr((struct sockaddr *)unp->unp_addr, 1);

-       return 0;
+       } else {
+               *nam = dup_sockaddr((struct sockaddr *)&sun_noname, 1);
+       }
+       return (0);

 }
 
 struct pr_usrreqs uipc_usrreqs = {
 }
 
 struct pr_usrreqs uipc_usrreqs = {


@@ -482,9 +590,7 @@ struct pr_usrreqs uipc_usrreqs = {
 };
 
 int
 };
 
 int

-uipc_ctloutput(
-       struct socket *so,
-       struct sockopt *sopt)
+uipc_ctloutput(struct socket *so, struct sockopt *sopt)

 {
        struct unpcb *unp = sotounpcb(so);
        int error;
 {
        struct unpcb *unp = sotounpcb(so);
        int error;


@@ -493,10 +599,10 @@ uipc_ctloutput(
        case SOPT_GET:
                switch (sopt->sopt_name) {
                case LOCAL_PEERCRED:
        case SOPT_GET:
                switch (sopt->sopt_name) {
                case LOCAL_PEERCRED:

-                       if (unp->unp_flags & UNP_HAVEPC)
+                       if (unp->unp_flags & UNP_HAVEPC) {

                                error = sooptcopyout(sopt, &unp->unp_peercred,
                                error = sooptcopyout(sopt, &unp->unp_peercred,

-                                   sizeof(unp->unp_peercred));
-                       else {
+                                   sizeof (unp->unp_peercred));
+                       } else {

                                if (so->so_type == SOCK_STREAM)
                                        error = ENOTCONN;
                                else
                                if (so->so_type == SOCK_STREAM)
                                        error = ENOTCONN;
                                else


@@ -515,7 +621,7 @@ uipc_ctloutput(
        }
        return (error);
 }
        }
        return (error);
 }

-       
+

 /*
  * Both send and receive buffers are allocated PIPSIZ bytes of buffering
  * for stream sockets, although the total for sender and receiver is
 /*
  * Both send and receive buffers are allocated PIPSIZ bytes of buffering
  * for stream sockets, although the total for sender and receiver is


@@ -533,20 +639,26 @@ static u_long     unpdg_sendspace = 2*1024;       /* really max datagram size */
 static u_long  unpdg_recvspace = 4*1024;
 
 static int     unp_rights;                     /* file descriptors in flight */
 static u_long  unpdg_recvspace = 4*1024;
 
 static int     unp_rights;                     /* file descriptors in flight */

+static int     unp_disposed;                   /* discarded file descriptors */

 
 SYSCTL_DECL(_net_local_stream);
 
 SYSCTL_DECL(_net_local_stream);

-SYSCTL_INT(_net_local_stream, OID_AUTO, sendspace, CTLFLAG_RW, 
-          &unpst_sendspace, 0, "");
+SYSCTL_INT(_net_local_stream, OID_AUTO, sendspace, CTLFLAG_RW,
+   &unpst_sendspace, 0, "");

 SYSCTL_INT(_net_local_stream, OID_AUTO, recvspace, CTLFLAG_RW,
 SYSCTL_INT(_net_local_stream, OID_AUTO, recvspace, CTLFLAG_RW,

-          &unpst_recvspace, 0, "");
+   &unpst_recvspace, 0, "");

 SYSCTL_DECL(_net_local_dgram);
 SYSCTL_INT(_net_local_dgram, OID_AUTO, maxdgram, CTLFLAG_RW,
 SYSCTL_DECL(_net_local_dgram);
 SYSCTL_INT(_net_local_dgram, OID_AUTO, maxdgram, CTLFLAG_RW,

-          &unpdg_sendspace, 0, "");
+   &unpdg_sendspace, 0, "");

 SYSCTL_INT(_net_local_dgram, OID_AUTO, recvspace, CTLFLAG_RW,
 SYSCTL_INT(_net_local_dgram, OID_AUTO, recvspace, CTLFLAG_RW,

-          &unpdg_recvspace, 0, "");
+   &unpdg_recvspace, 0, "");

 SYSCTL_DECL(_net_local);
 SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, "");
 
 SYSCTL_DECL(_net_local);
 SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, "");
 

+/*
+ * Returns:    0                       Success
+ *             ENOBUFS
+ *     soreserve:ENOBUFS
+ */

 static int
 unp_attach(struct socket *so)
 {
 static int
 unp_attach(struct socket *so)
 {


@@ -570,18 +682,38 @@ unp_attach(struct socket *so)
                if (error)
                        return (error);
        }
                if (error)
                        return (error);
        }

-       unp = (struct unpcb*)zalloc(unp_zone);
+       unp = (struct unpcb *)zalloc(unp_zone);

        if (unp == NULL)
                return (ENOBUFS);
        if (unp == NULL)
                return (ENOBUFS);

-       bzero(unp, sizeof *unp);
+       bzero(unp, sizeof (*unp));

        lck_rw_lock_exclusive(unp_list_mtx);
        LIST_INIT(&unp->unp_refs);
        unp->unp_socket = so;
        unp->unp_gencnt = ++unp_gencnt;
        unp_count++;
        lck_rw_lock_exclusive(unp_list_mtx);
        LIST_INIT(&unp->unp_refs);
        unp->unp_socket = so;
        unp->unp_gencnt = ++unp_gencnt;
        unp_count++;

-       LIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ? &unp_dhead
-                        : &unp_shead, unp, unp_link);
+       LIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ?
+           &unp_dhead : &unp_shead, unp, unp_link);

        so->so_pcb = (caddr_t)unp;
        so->so_pcb = (caddr_t)unp;

+       /*
+        * Mark AF_UNIX socket buffers accordingly so that:
+        *
+        * a. In the SOCK_STREAM case, socket buffer append won't fail due to
+        *    the lack of space; this essentially loosens the sbspace() check,
+        *    since there is disconnect between sosend() and uipc_send() with
+        *    respect to flow control that might result in our dropping the
+        *    data in uipc_send().  By setting this, we allow for slightly
+        *    more records to be appended to the receiving socket to avoid
+        *    losing data (which we can't afford in the SOCK_STREAM case).
+        *    Flow control still takes place since we adjust the sender's
+        *    hiwat during each send.  This doesn't affect the SOCK_DGRAM
+        *    case and append would still fail when the queue overflows.
+        *
+        * b. In the presence of control messages containing internalized
+        *    file descriptors, the append routines will not free them since
+        *    we'd need to undo the work first via unp_dispose().
+        */
+       so->so_rcv.sb_flags |= SB_UNIX;
+       so->so_snd.sb_flags |= SB_UNIX;

        lck_rw_done(unp_list_mtx);
        return (0);
 }
        lck_rw_done(unp_list_mtx);
        return (0);
 }


@@ -596,8 +728,8 @@ unp_detach(struct unpcb *unp)
        --unp_count;
        if (unp->unp_vnode) {
                struct vnode *tvp = unp->unp_vnode;
        --unp_count;
        if (unp->unp_vnode) {
                struct vnode *tvp = unp->unp_vnode;

-               unp->unp_vnode->v_socket = 0;
-               unp->unp_vnode = 0;
+               unp->unp_vnode->v_socket = NULL;
+               unp->unp_vnode = NULL;

                vnode_rele(tvp);                /* drop the usecount */
        }
        if (unp->unp_conn)
                vnode_rele(tvp);                /* drop the usecount */
        }
        if (unp->unp_conn)


@@ -605,8 +737,9 @@ unp_detach(struct unpcb *unp)
        while (unp->unp_refs.lh_first)
                unp_drop(unp->unp_refs.lh_first, ECONNRESET);
        soisdisconnected(unp->unp_socket);
        while (unp->unp_refs.lh_first)
                unp_drop(unp->unp_refs.lh_first, ECONNRESET);
        soisdisconnected(unp->unp_socket);

-       unp->unp_socket->so_flags |= SOF_PCBCLEARING; /* makes sure we're getting dealloced */
-       unp->unp_socket->so_pcb = 0;
+       /* makes sure we're getting dealloced */
+       unp->unp_socket->so_flags |= SOF_PCBCLEARING;
+       unp->unp_socket->so_pcb = NULL;

        if (unp_rights) {
                /*
                 * Normally the receive buffer is flushed later,
        if (unp_rights) {
                /*
                 * Normally the receive buffer is flushed later,


@@ -623,47 +756,54 @@ unp_detach(struct unpcb *unp)
        zfree(unp_zone, unp);
 }
 
        zfree(unp_zone, unp);
 }
 

+/*
+ * Returns:    0                       Success
+ *             EAFNOSUPPORT
+ *             EINVAL
+ *             EADDRINUSE
+ *             namei:???               [anything namei can return]
+ *             vnode_authorize:???     [anything vnode_authorize can return]
+ *
+ * Notes:      p at this point is the current process, as this function is
+ *             only called by sobind().
+ */

 static int
 unp_bind(
        struct unpcb *unp,
        struct sockaddr *nam,
 static int
 unp_bind(
        struct unpcb *unp,
        struct sockaddr *nam,

-       struct proc *p)
+       proc_t p)

 {
        struct sockaddr_un *soun = (struct sockaddr_un *)nam;
        struct vnode *vp, *dvp;
        struct vnode_attr va;
 {
        struct sockaddr_un *soun = (struct sockaddr_un *)nam;
        struct vnode *vp, *dvp;
        struct vnode_attr va;

-       struct vfs_context context;
+       vfs_context_t ctx = vfs_context_current();

        int error, namelen;
        struct nameidata nd;
        char buf[SOCK_MAXADDRLEN];
 
        int error, namelen;
        struct nameidata nd;
        char buf[SOCK_MAXADDRLEN];
 

-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_proc_ref(p);      /* XXX kauth_cred_get() ??? proxy */
+       if (nam->sa_family != 0 && nam->sa_family != AF_UNIX) {
+               return (EAFNOSUPPORT);
+       }

 
 

-       if (unp->unp_vnode != NULL) {
-               kauth_cred_unref(&context.vc_ucred);
+       if (unp->unp_vnode != NULL)

                return (EINVAL);
                return (EINVAL);

-       }

        namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
        namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);

-       if (namelen <= 0) {
-               kauth_cred_unref(&context.vc_ucred);
-               return EINVAL;
-       }
-       strncpy(buf, soun->sun_path, namelen);
-       buf[namelen] = 0;       /* null-terminate the string */
+       if (namelen <= 0)
+               return (EINVAL);
+
+       strlcpy(buf, soun->sun_path, namelen+1);

        NDINIT(&nd, CREATE, FOLLOW | LOCKPARENT, UIO_SYSSPACE32,
        NDINIT(&nd, CREATE, FOLLOW | LOCKPARENT, UIO_SYSSPACE32,

-           CAST_USER_ADDR_T(buf), &context);
-/* SHOULD BE ABLE TO ADOPT EXISTING AND wakeup() ALA FIFO's */
+           CAST_USER_ADDR_T(buf), ctx);
+       /* SHOULD BE ABLE TO ADOPT EXISTING AND wakeup() ALA FIFO's */

        error = namei(&nd);
        if (error) {
        error = namei(&nd);
        if (error) {

-               kauth_cred_unref(&context.vc_ucred);

                return (error);
        }
        dvp = nd.ni_dvp;
        vp = nd.ni_vp;
 
        if (vp != NULL) {
                return (error);
        }
        dvp = nd.ni_dvp;
        vp = nd.ni_vp;
 
        if (vp != NULL) {

-               /*
+               /*

                 * need to do this before the vnode_put of dvp
                 * since we may have to release an fs_nodelock
                 */
                 * need to do this before the vnode_put of dvp
                 * since we may have to release an fs_nodelock
                 */


@@ -672,27 +812,35 @@ unp_bind(
                vnode_put(dvp);
                vnode_put(vp);
 
                vnode_put(dvp);
                vnode_put(vp);
 

-               kauth_cred_unref(&context.vc_ucred);

                return (EADDRINUSE);
        }
 
                return (EADDRINUSE);
        }
 

+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_type, VSOCK);
+       VATTR_SET(&va, va_mode, (ACCESSPERMS & ~p->p_fd->fd_cmask));
+
+#if CONFIG_MACF_SOCKET
+       /*
+        * This is #if MAC_SOCKET, because it affects the connection rate
+        * of Unix domain dockets that is critical for server performance
+        */
+       error = mac_vnode_check_create(ctx,
+           nd.ni_dvp, &nd.ni_cnd, &va);
+
+       if (error == 0)
+#endif /* MAC_SOCKET */

        /* authorize before creating */
        /* authorize before creating */

-       error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, &context);
+       error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, ctx);

 
        if (!error) {
 
        if (!error) {

-               VATTR_INIT(&va);
-               VATTR_SET(&va, va_type, VSOCK);
-               VATTR_SET(&va, va_mode, (ACCESSPERMS & ~p->p_fd->fd_cmask));
-

                /* create the socket */
                /* create the socket */

-               error = vn_create(dvp, &vp, &nd.ni_cnd, &va, 0, &context);
+               error = vn_create(dvp, &vp, &nd.ni_cnd, &va, 0, ctx);

        }
        }

-       
+

        nameidone(&nd);
        vnode_put(dvp);
 
        if (error) {
        nameidone(&nd);
        vnode_put(dvp);
 
        if (error) {

-               kauth_cred_unref(&context.vc_ucred);

                return (error);
        }
        vnode_ref(vp);  /* gain a longterm reference */
                return (error);
        }
        vnode_ref(vp);  /* gain a longterm reference */


@@ -701,41 +849,54 @@ unp_bind(
        unp->unp_addr = (struct sockaddr_un *)dup_sockaddr(nam, 1);
        vnode_put(vp);          /* drop the iocount */
 
        unp->unp_addr = (struct sockaddr_un *)dup_sockaddr(nam, 1);
        vnode_put(vp);          /* drop the iocount */
 

-       kauth_cred_unref(&context.vc_ucred);

        return (0);
 }
 
        return (0);
 }
 

+
+/*
+ * Returns:    0                       Success
+ *             EAFNOSUPPORT            Address family not supported
+ *             EINVAL                  Invalid argument
+ *             ENOTSOCK                Not a socket
+ *             ECONNREFUSED            Connection refused
+ *             EPROTOTYPE              Protocol wrong type for socket
+ *             EISCONN                 Socket is connected
+ *     unp_connect2:EPROTOTYPE         Protocol wrong type for socket
+ *     unp_connect2:EINVAL             Invalid argument
+ *     namei:???                       [anything namei can return]
+ *     vnode_authorize:????            [anything vnode_authorize can return]
+ *
+ * Notes:      p at this point is the current process, as this function is
+ *             only called by sosend(), sendfile(), and soconnectlock().
+ */

 static int
 static int

-unp_connect(
-       struct socket *so,
-       struct sockaddr *nam,
-       struct proc *p)
+unp_connect(struct socket *so, struct sockaddr *nam, __unused proc_t p)

 {
        struct sockaddr_un *soun = (struct sockaddr_un *)nam;
        struct vnode *vp;
        struct socket *so2, *so3;
        struct unpcb *unp, *unp2, *unp3;
 {
        struct sockaddr_un *soun = (struct sockaddr_un *)nam;
        struct vnode *vp;
        struct socket *so2, *so3;
        struct unpcb *unp, *unp2, *unp3;

-       struct vfs_context context;
+       vfs_context_t ctx = vfs_context_current();

        int error, len;
        struct nameidata nd;
        char buf[SOCK_MAXADDRLEN];
 
        int error, len;
        struct nameidata nd;
        char buf[SOCK_MAXADDRLEN];
 

-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_proc_ref(p);      /* XXX kauth_cred_get() ??? proxy */
+       if (nam->sa_family != 0 && nam->sa_family != AF_UNIX) {
+               return (EAFNOSUPPORT);
+       }
+

        so2 = so3 = NULL;
 
        len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
        so2 = so3 = NULL;
 
        len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);

-       if (len <= 0) {
-               kauth_cred_unref(&context.vc_ucred);
-               return EINVAL;
-       }
-       strncpy(buf, soun->sun_path, len);
-       buf[len] = 0;
+       if (len <= 0)
+               return (EINVAL);

 
 

-       NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE32, CAST_USER_ADDR_T(buf), &context);
+       strlcpy(buf, soun->sun_path, len+1);
+
+       NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE32,
+           CAST_USER_ADDR_T(buf), ctx);

        error = namei(&nd);
        if (error) {
        error = namei(&nd);
        if (error) {

-               kauth_cred_unref(&context.vc_ucred);

                return (error);
        }
        nameidone(&nd);
                return (error);
        }
        nameidone(&nd);


@@ -745,11 +906,11 @@ unp_connect(
                goto bad;
        }
 
                goto bad;
        }
 

-       error = vnode_authorize(vp, NULL, KAUTH_VNODE_WRITE_DATA, &context);
+       error = vnode_authorize(vp, NULL, KAUTH_VNODE_WRITE_DATA, ctx);

        if (error)
                goto bad;
        so2 = vp->v_socket;
        if (error)
                goto bad;
        so2 = vp->v_socket;

-       if (so2 == 0 || so2->so_pcb == NULL ) {
+       if (so2 == 0 || so2->so_pcb == NULL) {

                error = ECONNREFUSED;
                goto bad;
        }
                error = ECONNREFUSED;
                goto bad;
        }


@@ -761,7 +922,7 @@ unp_connect(
                error = EPROTOTYPE;
                goto bad;
        }
                error = EPROTOTYPE;
                goto bad;
        }

-       
+

        /*
         * Check if socket was connected while we were trying to
         * acquire the funnel.
        /*
         * Check if socket was connected while we were trying to
         * acquire the funnel.


@@ -771,7 +932,7 @@ unp_connect(
                error = EISCONN;
                goto bad;
        }
                error = EISCONN;
                goto bad;
        }

-       
+

        if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
                if ((so2->so_options & SO_ACCEPTCONN) == 0 ||
                    (so3 = sonewconn(so2, 0, nam)) == 0) {
        if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
                if ((so2->so_options & SO_ACCEPTCONN) == 0 ||
                    (so3 = sonewconn(so2, 0, nam)) == 0) {


@@ -783,8 +944,7 @@ unp_connect(
                unp3 = sotounpcb(so3);
                if (unp2->unp_addr)
                        unp3->unp_addr = (struct sockaddr_un *)
                unp3 = sotounpcb(so3);
                if (unp2->unp_addr)
                        unp3->unp_addr = (struct sockaddr_un *)

-                               dup_sockaddr((struct sockaddr *)
-                                            unp2->unp_addr, 1);
+                           dup_sockaddr((struct sockaddr *)unp2->unp_addr, 1);

 
                /*
                 * unp_peercred management:
 
                /*
                 * unp_peercred management:


@@ -793,7 +953,7 @@ unp_connect(
                 * from its process structure at the time of connect()
                 * (which is now).
                 */
                 * from its process structure at the time of connect()
                 * (which is now).
                 */

-               cru2x(context.vc_ucred, &unp3->unp_peercred);
+               cru2x(vfs_context_ucred(ctx), &unp3->unp_peercred);

                unp3->unp_flags |= UNP_HAVEPC;
                /*
                 * The receiver's (server's) credentials are copied
                unp3->unp_flags |= UNP_HAVEPC;
                /*
                 * The receiver's (server's) credentials are copied


@@ -805,28 +965,34 @@ unp_connect(
                KASSERT(unp2->unp_flags & UNP_HAVEPCCACHED,
                    ("unp_connect: listener without cached peercred"));
                memcpy(&unp->unp_peercred, &unp2->unp_peercred,
                KASSERT(unp2->unp_flags & UNP_HAVEPCCACHED,
                    ("unp_connect: listener without cached peercred"));
                memcpy(&unp->unp_peercred, &unp2->unp_peercred,

-                   sizeof(unp->unp_peercred));
+                   sizeof (unp->unp_peercred));

                unp->unp_flags |= UNP_HAVEPC;
 
                unp->unp_flags |= UNP_HAVEPC;
 

+#if CONFIG_MACF_SOCKET
+               /* XXXMAC: recursive lock: SOCK_LOCK(so); */
+               mac_socketpeer_label_associate_socket(so, so3);
+               mac_socketpeer_label_associate_socket(so3, so);
+               /* XXXMAC: SOCK_UNLOCK(so); */
+#endif /* MAC_SOCKET */

                so2->so_usecount--; /* drop reference taken on so2 */
                so2 = so3;
                so3->so_usecount++; /* make sure we keep it around */
        }
        error = unp_connect2(so, so2);
 bad:
                so2->so_usecount--; /* drop reference taken on so2 */
                so2 = so3;
                so3->so_usecount++; /* make sure we keep it around */
        }
        error = unp_connect2(so, so2);
 bad:

-        
-       if (so2 != NULL) 
-                       so2->so_usecount--;     /* release count on socket */
-       
+       if (so2 != NULL)
+               so2->so_usecount--; /* release count on socket */

        vnode_put(vp);
        vnode_put(vp);

-       kauth_cred_unref(&context.vc_ucred);

        return (error);
 }
 
        return (error);
 }
 

+/*
+ * Returns:    0                       Success
+ *             EPROTOTYPE              Protocol wrong type for socket
+ *             EINVAL                  Invalid argument
+ */

 int
 int

-unp_connect2(
-       struct socket *so,
-       struct socket *so2)
+unp_connect2(struct socket *so, struct socket *so2)

 {
        struct unpcb *unp = sotounpcb(so);
        struct unpcb *unp2;
 {
        struct unpcb *unp = sotounpcb(so);
        struct unpcb *unp2;


@@ -848,14 +1014,15 @@ unp_connect2(
                break;
 
        case SOCK_STREAM:
                break;
 
        case SOCK_STREAM:

-                /* This takes care of socketpair */
-                if (!(unp->unp_flags & UNP_HAVEPC) && !(unp2->unp_flags & UNP_HAVEPC)) {
-                        cru2x(kauth_cred_get(), &unp->unp_peercred);
-                        unp->unp_flags |= UNP_HAVEPC;
-                        
-                        cru2x(kauth_cred_get(), &unp2->unp_peercred);
-                        unp2->unp_flags |= UNP_HAVEPC;
-                }
+               /* This takes care of socketpair */
+               if (!(unp->unp_flags & UNP_HAVEPC) &&
+                   !(unp2->unp_flags & UNP_HAVEPC)) {
+                       cru2x(kauth_cred_get(), &unp->unp_peercred);
+                       unp->unp_flags |= UNP_HAVEPC;
+
+                       cru2x(kauth_cred_get(), &unp2->unp_peercred);
+                       unp2->unp_flags |= UNP_HAVEPC;
+               }

                unp2->unp_conn = unp;
                soisconnected(so);
                soisconnected(so2);
                unp2->unp_conn = unp;
                soisconnected(so);
                soisconnected(so2);


@@ -874,7 +1041,7 @@ unp_disconnect(struct unpcb *unp)
 
        if (unp2 == 0)
                return;
 
        if (unp2 == 0)
                return;

-       unp->unp_conn = 0;
+       unp->unp_conn = NULL;

        switch (unp->unp_socket->so_type) {
 
        case SOCK_DGRAM:
        switch (unp->unp_socket->so_type) {
 
        case SOCK_DGRAM:


@@ -886,7 +1053,7 @@ unp_disconnect(struct unpcb *unp)
 
        case SOCK_STREAM:
                soisdisconnected(unp->unp_socket);
 
        case SOCK_STREAM:
                soisdisconnected(unp->unp_socket);

-               unp2->unp_conn = 0;
+               unp2->unp_conn = NULL;

                soisdisconnected(unp2->unp_socket);
                break;
        }
                soisdisconnected(unp2->unp_socket);
                break;
        }


@@ -904,6 +1071,7 @@ unp_abort(struct unpcb *unp)
 static int
 unp_pcblist SYSCTL_HANDLER_ARGS
 {
 static int
 unp_pcblist SYSCTL_HANDLER_ARGS
 {

+#pragma unused(oidp,arg2)

        int error, i, n;
        struct unpcb *unp, **unp_list;
        unp_gen_t gencnt;
        int error, i, n;
        struct unpcb *unp, **unp_list;
        unp_gen_t gencnt;


@@ -919,15 +1087,15 @@ unp_pcblist SYSCTL_HANDLER_ARGS
         */
        if (req->oldptr == USER_ADDR_NULL) {
                n = unp_count;
         */
        if (req->oldptr == USER_ADDR_NULL) {
                n = unp_count;

-               req->oldidx = 2 * (sizeof xug)
-                       + (n + n/8) * sizeof(struct xunpcb);
+               req->oldidx = 2 * sizeof (xug) + (n + n / 8) *
+                   sizeof (struct xunpcb);

                lck_rw_done(unp_list_mtx);
                lck_rw_done(unp_list_mtx);

-               return 0;
+               return (0);

        }
 
        if (req->newptr != USER_ADDR_NULL) {
                lck_rw_done(unp_list_mtx);
        }
 
        if (req->newptr != USER_ADDR_NULL) {
                lck_rw_done(unp_list_mtx);

-               return EPERM;
+               return (EPERM);

        }
 
        /*
        }
 
        /*


@@ -936,33 +1104,34 @@ unp_pcblist SYSCTL_HANDLER_ARGS
        gencnt = unp_gencnt;
        n = unp_count;
 
        gencnt = unp_gencnt;
        n = unp_count;
 

-       bzero(&xug, sizeof(xug));
-       xug.xug_len = sizeof xug;
+       bzero(&xug, sizeof (xug));
+       xug.xug_len = sizeof (xug);

        xug.xug_count = n;
        xug.xug_gen = gencnt;
        xug.xug_sogen = so_gencnt;
        xug.xug_count = n;
        xug.xug_gen = gencnt;
        xug.xug_sogen = so_gencnt;

-       error = SYSCTL_OUT(req, &xug, sizeof xug);
+       error = SYSCTL_OUT(req, &xug, sizeof (xug));

        if (error) {
                lck_rw_done(unp_list_mtx);
        if (error) {
                lck_rw_done(unp_list_mtx);

-               return error;
+               return (error);

        }
 
        /*
         * We are done if there is no pcb
         */
        if (n == 0)  {
        }
 
        /*
         * We are done if there is no pcb
         */
        if (n == 0)  {

-           lck_rw_done(unp_list_mtx);
-           return 0;
+               lck_rw_done(unp_list_mtx);
+               return (0);

        }
 
        }
 

-       MALLOC(unp_list, struct unpcb **, n * sizeof *unp_list, M_TEMP, M_WAITOK);
+       MALLOC(unp_list, struct unpcb **, n * sizeof (*unp_list),
+           M_TEMP, M_WAITOK);

        if (unp_list == 0) {
                lck_rw_done(unp_list_mtx);
        if (unp_list == 0) {
                lck_rw_done(unp_list_mtx);

-               return ENOMEM;
+               return (ENOMEM);

        }
        }

-       
+

        for (unp = head->lh_first, i = 0; unp && i < n;
        for (unp = head->lh_first, i = 0; unp && i < n;

-            unp = unp->unp_link.le_next) {
+           unp = unp->unp_link.le_next) {

                if (unp->unp_gencnt <= gencnt)
                        unp_list[i++] = unp;
        }
                if (unp->unp_gencnt <= gencnt)
                        unp_list[i++] = unp;
        }


@@ -974,23 +1143,23 @@ unp_pcblist SYSCTL_HANDLER_ARGS
                if (unp->unp_gencnt <= gencnt) {
                        struct xunpcb xu;
 
                if (unp->unp_gencnt <= gencnt) {
                        struct xunpcb xu;
 

-                       bzero(&xu, sizeof(xu));
-                       xu.xu_len = sizeof xu;
+                       bzero(&xu, sizeof (xu));
+                       xu.xu_len = sizeof (xu);

                        xu.xu_unpp = (struct  unpcb_compat *)unp;
                        /*
                         * XXX - need more locking here to protect against
                         * connect/disconnect races for SMP.
                         */
                        if (unp->unp_addr)
                        xu.xu_unpp = (struct  unpcb_compat *)unp;
                        /*
                         * XXX - need more locking here to protect against
                         * connect/disconnect races for SMP.
                         */
                        if (unp->unp_addr)

-                               bcopy(unp->unp_addr, &xu.xu_addr, 
-                                     unp->unp_addr->sun_len);
+                               bcopy(unp->unp_addr, &xu.xu_addr,
+                                   unp->unp_addr->sun_len);

                        if (unp->unp_conn && unp->unp_conn->unp_addr)
                                bcopy(unp->unp_conn->unp_addr,
                        if (unp->unp_conn && unp->unp_conn->unp_addr)
                                bcopy(unp->unp_conn->unp_addr,

-                                     &xu.xu_caddr,
-                                     unp->unp_conn->unp_addr->sun_len);
-                       bcopy(unp, &xu.xu_unp, sizeof(xu.xu_unp));
+                                   &xu.xu_caddr,
+                                   unp->unp_conn->unp_addr->sun_len);
+                       bcopy(unp, &xu.xu_unp, sizeof (xu.xu_unp));

                        sotoxsocket(unp->unp_socket, &xu.xu_socket);
                        sotoxsocket(unp->unp_socket, &xu.xu_socket);

-                       error = SYSCTL_OUT(req, &xu, sizeof xu);
+                       error = SYSCTL_OUT(req, &xu, sizeof (xu));

                }
        }
        if (!error) {
                }
        }
        if (!error) {


@@ -1001,22 +1170,22 @@ unp_pcblist SYSCTL_HANDLER_ARGS
                 * while we were processing this request, and it
                 * might be necessary to retry.
                 */
                 * while we were processing this request, and it
                 * might be necessary to retry.
                 */

-               bzero(&xug, sizeof(xug));
-               xug.xug_len = sizeof xug;
+               bzero(&xug, sizeof (xug));
+               xug.xug_len = sizeof (xug);

                xug.xug_gen = unp_gencnt;
                xug.xug_sogen = so_gencnt;
                xug.xug_count = unp_count;
                xug.xug_gen = unp_gencnt;
                xug.xug_sogen = so_gencnt;
                xug.xug_count = unp_count;

-               error = SYSCTL_OUT(req, &xug, sizeof xug);
+               error = SYSCTL_OUT(req, &xug, sizeof (xug));

        }
        FREE(unp_list, M_TEMP);
        lck_rw_done(unp_list_mtx);
        }
        FREE(unp_list, M_TEMP);
        lck_rw_done(unp_list_mtx);

-       return error;
+       return (error);

 }
 
 }
 

-SYSCTL_PROC(_net_local_dgram, OID_AUTO, pcblist, CTLFLAG_RD, 
+SYSCTL_PROC(_net_local_dgram, OID_AUTO, pcblist, CTLFLAG_RD,

            (caddr_t)(long)SOCK_DGRAM, 0, unp_pcblist, "S,xunpcb",
            "List of active local datagram sockets");
            (caddr_t)(long)SOCK_DGRAM, 0, unp_pcblist, "S,xunpcb",
            "List of active local datagram sockets");

-SYSCTL_PROC(_net_local_stream, OID_AUTO, pcblist, CTLFLAG_RD, 
+SYSCTL_PROC(_net_local_stream, OID_AUTO, pcblist, CTLFLAG_RD,

            (caddr_t)(long)SOCK_STREAM, 0, unp_pcblist, "S,xunpcb",
            "List of active local stream sockets");
 
            (caddr_t)(long)SOCK_STREAM, 0, unp_pcblist, "S,xunpcb",
            "List of active local stream sockets");
 


@@ -1031,9 +1200,7 @@ unp_shutdown(struct unpcb *unp)
 }
 
 static void
 }
 
 static void

-unp_drop(
-       struct unpcb *unp,
-       int errno)
+unp_drop(struct unpcb *unp, int errno)

 {
        struct socket *so = unp->unp_socket;
 
 {
        struct socket *so = unp->unp_socket;
 


@@ -1049,16 +1216,21 @@ unp_drain()
 }
 #endif
 
 }
 #endif
 

+/*
+ * Returns:    0                       Success
+ *             EMSGSIZE                The new fd's will not fit
+ *             ENOBUFS                 Cannot alloc struct fileproc
+ */

 int
 unp_externalize(struct mbuf *rights)
 {
 int
 unp_externalize(struct mbuf *rights)
 {

-       struct proc *p = current_proc();                /* XXX */
+       proc_t p = current_proc();              /* XXX */

        int i;
        struct cmsghdr *cm = mtod(rights, struct cmsghdr *);
        struct fileglob **rp = (struct fileglob **)(cm + 1);
        struct fileproc *fp;
        struct fileglob *fg;
        int i;
        struct cmsghdr *cm = mtod(rights, struct cmsghdr *);
        struct fileglob **rp = (struct fileglob **)(cm + 1);
        struct fileproc *fp;
        struct fileglob *fg;

-       int newfds = (cm->cmsg_len - sizeof(*cm)) / sizeof (int);
+       int newfds = (cm->cmsg_len - sizeof (*cm)) / sizeof (int);

        int f;
 
        proc_fdlock(p);
        int f;
 
        proc_fdlock(p);


@@ -1070,30 +1242,45 @@ unp_externalize(struct mbuf *rights)
                for (i = 0; i < newfds; i++) {
                        fg = *rp;
                        unp_discard_fdlocked(fg, p);
                for (i = 0; i < newfds; i++) {
                        fg = *rp;
                        unp_discard_fdlocked(fg, p);

-                       *rp++ = 0;
+                       *rp++ = NULL;

                }
                proc_fdunlock(p);
 
                return (EMSGSIZE);
        }
        /*
                }
                proc_fdunlock(p);
 
                return (EMSGSIZE);
        }
        /*

-        * now change each pointer to an fd in the global table to 
+        * now change each pointer to an fd in the global table to

         * an integer that is the index to the local fd table entry
         * that we set up to point to the global one we are transferring.
         * an integer that is the index to the local fd table entry
         * that we set up to point to the global one we are transferring.

-        * XXX this assumes a pointer and int are the same size...!
+        * XXX (1) this assumes a pointer and int are the same size...!
+        * XXX (2) allocation failures should be non-fatal

         */
        for (i = 0; i < newfds; i++) {
         */
        for (i = 0; i < newfds; i++) {

+#if CONFIG_MACF_SOCKET
+               /*
+                * If receive access is denied, don't pass along
+                * and error message, just discard the descriptor.
+                */
+               if (mac_file_check_receive(kauth_cred_get(), *rp)) {
+                       fg = *rp;
+                       *rp++ = 0;
+                       unp_discard_fdlocked(fg, p);
+                       continue;
+               }
+#endif

                if (fdalloc(p, 0, &f))
                if (fdalloc(p, 0, &f))

-                       panic("unp_externalize");
+                       panic("unp_externalize:fdalloc");

                fg = *rp;
                fg = *rp;

-               MALLOC_ZONE(fp, struct fileproc *, sizeof(struct fileproc), M_FILEPROC, M_WAITOK);
-               bzero(fp, sizeof(struct fileproc));
+               MALLOC_ZONE(fp, struct fileproc *, sizeof (struct fileproc),
+                   M_FILEPROC, M_WAITOK);
+               if (fp == NULL)
+                       panic("unp_externalize: MALLOC_ZONE");
+               bzero(fp, sizeof (struct fileproc));

                fp->f_iocount = 0;
                fp->f_fglob = fg;
                fp->f_iocount = 0;
                fp->f_fglob = fg;

-               p->p_fd->fd_ofiles[f] = fp;

                fg_removeuipc(fg);
                fg_removeuipc(fg);

-               *fdflags(p, f) &= ~UF_RESERVED;
-               unp_rights--;
+               procfdtbl_releasefd(p, f, fp);
+               (void) OSAddAtomic(-1, (volatile SInt32 *)&unp_rights);

                *(int *)rp++ = f;
        }
        proc_fdunlock(p);
                *(int *)rp++ = f;
        }
        proc_fdunlock(p);


@@ -1104,47 +1291,51 @@ unp_externalize(struct mbuf *rights)
 void
 unp_init(void)
 {
 void
 unp_init(void)
 {

-       unp_zone = zinit(sizeof(struct unpcb), 
-                        (nmbclusters * sizeof(struct unpcb)), 
-                         4096, "unpzone");
+       unp_zone = zinit(sizeof (struct unpcb),
+           (nmbclusters * sizeof (struct unpcb)), 4096, "unpzone");
+

        if (unp_zone == 0)
                panic("unp_init");
        LIST_INIT(&unp_dhead);
        LIST_INIT(&unp_shead);
        if (unp_zone == 0)
                panic("unp_init");
        LIST_INIT(&unp_dhead);
        LIST_INIT(&unp_shead);

-       
+

        /*
         * allocate lock group attribute and group for udp pcb mutexes
         */
        unp_mtx_grp_attr = lck_grp_attr_alloc_init();
 
        unp_mtx_grp = lck_grp_alloc_init("unp_list", unp_mtx_grp_attr);
        /*
         * allocate lock group attribute and group for udp pcb mutexes
         */
        unp_mtx_grp_attr = lck_grp_attr_alloc_init();
 
        unp_mtx_grp = lck_grp_alloc_init("unp_list", unp_mtx_grp_attr);

-               
+

        unp_mtx_attr = lck_attr_alloc_init();
 
        unp_mtx_attr = lck_attr_alloc_init();
 

-       if ((unp_list_mtx = lck_rw_alloc_init(unp_mtx_grp, unp_mtx_attr)) == NULL)
+       if ((unp_list_mtx = lck_rw_alloc_init(unp_mtx_grp,
+           unp_mtx_attr)) == NULL)

                return; /* pretty much dead if this fails... */
 
 }
 
 #ifndef MIN
                return; /* pretty much dead if this fails... */
 
 }
 
 #ifndef MIN

-#define        MIN(a,b) (((a)<(b))?(a):(b))
+#define        MIN(a, b) (((a) < (b)) ? (a) : (b))

 #endif
 
 #endif
 

+/*
+ * Returns:    0                       Success
+ *             EINVAL
+ *     fdgetf_noref:EBADF
+ */

 static int
 static int

-unp_internalize(
-       struct mbuf *control,
-       struct proc *p)
+unp_internalize(struct mbuf *control, proc_t p)

 {
        struct cmsghdr *cm = mtod(control, struct cmsghdr *);
        struct fileglob **rp;
        struct fileproc *fp;
 {
        struct cmsghdr *cm = mtod(control, struct cmsghdr *);
        struct fileglob **rp;
        struct fileproc *fp;

-       register int i, error;
+       int i, error;

        int oldfds;
        int oldfds;

-       int fdgetf_noref(proc_t, struct fileglob **, struct fileproc **);

 
 

+       /* 64bit: cmsg_len is 'uint32_t', m_len is 'long' */

        if (cm->cmsg_type != SCM_RIGHTS || cm->cmsg_level != SOL_SOCKET ||
        if (cm->cmsg_type != SCM_RIGHTS || cm->cmsg_level != SOL_SOCKET ||

-           cm->cmsg_len != control->m_len) {
-            return (EINVAL);
+           (unsigned long)cm->cmsg_len != (unsigned long)control->m_len) {
+               return (EINVAL);

        }
        oldfds = (cm->cmsg_len - sizeof (*cm)) / sizeof (int);
 
        }
        oldfds = (cm->cmsg_len - sizeof (*cm)) / sizeof (int);
 


@@ -1152,10 +1343,10 @@ unp_internalize(
        rp = (struct fileglob **)(cm + 1);
 
        for (i = 0; i < oldfds; i++) {
        rp = (struct fileglob **)(cm + 1);
 
        for (i = 0; i < oldfds; i++) {

-            if (error = fdgetf_noref(p, *(int *)rp++, (struct fileglob **)0)) {
-                    proc_fdunlock(p);
-                    return (error);
-            }
+               if ((error = fdgetf_noref(p, *(int *)rp++, NULL)) != 0) {
+                       proc_fdunlock(p);
+                       return (error);
+               }

        }
        rp = (struct fileglob **)(cm + 1);
 
        }
        rp = (struct fileglob **)(cm + 1);
 


@@ -1163,22 +1354,34 @@ unp_internalize(
                (void) fdgetf_noref(p, *(int *)rp, &fp);
                fg_insertuipc(fp->f_fglob);
                *rp++ = fp->f_fglob;
                (void) fdgetf_noref(p, *(int *)rp, &fp);
                fg_insertuipc(fp->f_fglob);
                *rp++ = fp->f_fglob;

-               unp_rights++;
+               (void) OSAddAtomic(1, (volatile SInt32 *)&unp_rights);

        }
        proc_fdunlock(p);
 
        return (0);
 }
 
        }
        proc_fdunlock(p);
 
        return (0);
 }
 

-static int     unp_defer, unp_gcing;
+static int     unp_defer, unp_gcing, unp_gcwait;
+
+/* always called under uipc_lock */
+void
+unp_gc_wait(void)
+{
+       while (unp_gcing != 0) {
+               unp_gcwait = 1;
+               msleep(&unp_gcing, uipc_lock, 0 , "unp_gc_wait", NULL);
+       }
+}
+

 
 static void
 
 static void

-unp_gc()
+unp_gc(void)

 {
 {

-       register struct fileglob *fg, *nextfg;
-       register struct socket *so;
+       struct fileglob *fg, *nextfg;
+       struct socket *so;

        struct fileglob **extra_ref, **fpp;
        int nunref, i;
        struct fileglob **extra_ref, **fpp;
        int nunref, i;

+       int need_gcwakeup = 0;

 
        lck_mtx_lock(uipc_lock);
        if (unp_gcing) {
 
        lck_mtx_lock(uipc_lock);
        if (unp_gcing) {


@@ -1188,8 +1391,8 @@ unp_gc()
        unp_gcing = 1;
        unp_defer = 0;
        lck_mtx_unlock(uipc_lock);
        unp_gcing = 1;
        unp_defer = 0;
        lck_mtx_unlock(uipc_lock);

-       /* 
-        * before going through all this, set all FDs to 
+       /*
+        * before going through all this, set all FDs to

         * be NOT defered and NOT externally accessible
         */
        for (fg = fmsghead.lh_first; fg != 0; fg = fg->f_msglist.le_next) {
         * be NOT defered and NOT externally accessible
         */
        for (fg = fmsghead.lh_first; fg != 0; fg = fg->f_msglist.le_next) {


@@ -1198,7 +1401,8 @@ unp_gc()
                lck_mtx_unlock(&fg->fg_lock);
        }
        do {
                lck_mtx_unlock(&fg->fg_lock);
        }
        do {

-               for (fg = fmsghead.lh_first; fg != 0; fg = fg->f_msglist.le_next) {
+               for (fg = fmsghead.lh_first; fg != 0;
+                   fg = fg->f_msglist.le_next) {

                        lck_mtx_lock(&fg->fg_lock);
                        /*
                         * If the file is not open, skip it
                        lck_mtx_lock(&fg->fg_lock);
                        /*
                         * If the file is not open, skip it


@@ -1220,30 +1424,30 @@ unp_gc()
                                 * if it's not defered, then check if it's
                                 * already marked.. if so skip it
                                 */
                                 * if it's not defered, then check if it's
                                 * already marked.. if so skip it
                                 */

-                               if (fg->fg_flag & FMARK){
+                               if (fg->fg_flag & FMARK) {

                                        lck_mtx_unlock(&fg->fg_lock);
                                        continue;
                                }
                                        lck_mtx_unlock(&fg->fg_lock);
                                        continue;
                                }

-                               /* 
+                               /*

                                 * If all references are from messages
                                 * If all references are from messages

-                                * in transit, then skip it. it's not 
+                                * in transit, then skip it. it's not

                                 * externally accessible.
                                 * externally accessible.

-                                */ 
+                                */

                                if (fg->fg_count == fg->fg_msgcount) {
                                        lck_mtx_unlock(&fg->fg_lock);
                                        continue;
                                }
                                if (fg->fg_count == fg->fg_msgcount) {
                                        lck_mtx_unlock(&fg->fg_lock);
                                        continue;
                                }

-                               /* 
+                               /*

                                 * If it got this far then it must be
                                 * externally accessible.
                                 */
                                fg->fg_flag |= FMARK;
                        }
                        /*
                                 * If it got this far then it must be
                                 * externally accessible.
                                 */
                                fg->fg_flag |= FMARK;
                        }
                        /*

-                        * either it was defered, or it is externally 
+                        * either it was defered, or it is externally

                         * accessible and not already marked so.
                         * Now check if it is possibly one of OUR sockets.
                         * accessible and not already marked so.
                         * Now check if it is possibly one of OUR sockets.

-                        */ 
+                        */

                        if (fg->fg_type != DTYPE_SOCKET ||
                            (so = (struct socket *)fg->fg_data) == 0) {
                                lck_mtx_unlock(&fg->fg_lock);
                        if (fg->fg_type != DTYPE_SOCKET ||
                            (so = (struct socket *)fg->fg_data) == 0) {
                                lck_mtx_unlock(&fg->fg_lock);


@@ -1255,7 +1459,10 @@ unp_gc()
                                continue;
                        }
 #ifdef notdef
                                continue;
                        }
 #ifdef notdef

-                       /* if this code is enabled need to run under network funnel */
+                       /*
+                        * if this code is enabled need to run
+                        * under network funnel
+                        */

                        if (so->so_rcv.sb_flags & SB_LOCK) {
                                /*
                                 * This is problematical; it's not clear
                        if (so->so_rcv.sb_flags & SB_LOCK) {
                                /*
                                 * This is problematical; it's not clear


@@ -1275,7 +1482,7 @@ unp_gc()
                         * So, Ok, it's one of our sockets and it IS externally
                         * accessible (or was defered). Now we look
                         * to see if we hold any file descriptors in its
                         * So, Ok, it's one of our sockets and it IS externally
                         * accessible (or was defered). Now we look
                         * to see if we hold any file descriptors in its

-                        * message buffers. Follow those links and mark them 
+                        * message buffers. Follow those links and mark them

                         * as accessible too.
                         */
                        unp_scan(so->so_rcv.sb_mb, unp_mark);
                         * as accessible too.
                         */
                        unp_scan(so->so_rcv.sb_mb, unp_mark);


@@ -1321,20 +1528,21 @@ unp_gc()
         *
         * 91/09/19, bsy@cs.cmu.edu
         */
         *
         * 91/09/19, bsy@cs.cmu.edu
         */

-       extra_ref = _MALLOC(nfiles * sizeof(struct fileglob *), M_FILEGLOB, M_WAITOK);
+       extra_ref = _MALLOC(nfiles * sizeof (struct fileglob *),
+           M_FILEGLOB, M_WAITOK);

        for (nunref = 0, fg = fmsghead.lh_first, fpp = extra_ref; fg != 0;
            fg = nextfg) {
                lck_mtx_lock(&fg->fg_lock);
 
                nextfg = fg->f_msglist.le_next;
        for (nunref = 0, fg = fmsghead.lh_first, fpp = extra_ref; fg != 0;
            fg = nextfg) {
                lck_mtx_lock(&fg->fg_lock);
 
                nextfg = fg->f_msglist.le_next;

-               /* 
+               /*

                 * If it's not open, skip it
                 */
                if (fg->fg_count == 0) {
                        lck_mtx_unlock(&fg->fg_lock);
                        continue;
                }
                 * If it's not open, skip it
                 */
                if (fg->fg_count == 0) {
                        lck_mtx_unlock(&fg->fg_lock);
                        continue;
                }

-               /* 
+               /*

                 * If all refs are from msgs, and it's not marked accessible
                 * then it must be referenced from some unreachable cycle
                 * of (shut-down) FDs, so include it in our
                 * If all refs are from msgs, and it's not marked accessible
                 * then it must be referenced from some unreachable cycle
                 * of (shut-down) FDs, so include it in our


@@ -1347,7 +1555,7 @@ unp_gc()
                }
                lck_mtx_unlock(&fg->fg_lock);
        }
                }
                lck_mtx_unlock(&fg->fg_lock);
        }

-       /* 
+       /*

         * for each FD on our hit list, do the following two things
         */
        for (i = nunref, fpp = extra_ref; --i >= 0; ++fpp) {
         * for each FD on our hit list, do the following two things
         */
        for (i = nunref, fpp = extra_ref; --i >= 0; ++fpp) {


@@ -1356,29 +1564,52 @@ unp_gc()
                tfg = *fpp;
 
                if (tfg->fg_type == DTYPE_SOCKET && tfg->fg_data != NULL) {
                tfg = *fpp;
 
                if (tfg->fg_type == DTYPE_SOCKET && tfg->fg_data != NULL) {

-                       sorflush((struct socket *)(tfg->fg_data));
+                       int locked = 0;
+
+                       so = (struct socket *)(tfg->fg_data);
+
+                       /* XXXX */
+                       /* Assume local sockets use a global lock */
+                       if (so->so_proto->pr_domain->dom_family != PF_LOCAL) {
+                               socket_lock(so, 0);
+                               locked = 1;
+                       }
+                       sorflush(so);
+
+                       if (locked)
+                               socket_unlock(so, 0);

                }
        }
        for (i = nunref, fpp = extra_ref; --i >= 0; ++fpp)
                }
        }
        for (i = nunref, fpp = extra_ref; --i >= 0; ++fpp)

-               closef_locked((struct fileproc *)0, *fpp, (struct proc *) NULL);
+               closef_locked((struct fileproc *)0, *fpp, (proc_t)NULL);
+
+        lck_mtx_lock(uipc_lock);

        unp_gcing = 0;
        unp_gcing = 0;

-       FREE((caddr_t)extra_ref, M_FILEGLOB);

 
 

+       if (unp_gcwait != 0) {
+               unp_gcwait = 0;
+               need_gcwakeup = 1;
+       }
+       lck_mtx_unlock(uipc_lock);
+
+       if (need_gcwakeup != 0)
+               wakeup(&unp_gcing);
+       FREE((caddr_t)extra_ref, M_FILEGLOB);

 }
 
 void
 unp_dispose(struct mbuf *m)
 {
 }
 
 void
 unp_dispose(struct mbuf *m)
 {

-

        if (m) {
                unp_scan(m, unp_discard);
        }
 }
 
        if (m) {
                unp_scan(m, unp_discard);
        }
 }
 

+/*
+ * Returns:    0                       Success
+ */

 static int
 static int

-unp_listen(
-       struct unpcb *unp,
-       struct proc *p)
+unp_listen(struct unpcb *unp, proc_t p)

 {
        kauth_cred_t safecred = kauth_cred_proc_ref(p);
        cru2x(safecred, &unp->unp_peercred);
 {
        kauth_cred_t safecred = kauth_cred_proc_ref(p);
        cru2x(safecred, &unp->unp_peercred);


@@ -1387,11 +1618,9 @@ unp_listen(
        return (0);
 }
 
        return (0);
 }
 

-/* should run under kernel funnel */ 
+/* should run under kernel funnel */

 static void
 static void

-unp_scan(
-       struct mbuf *m0,
-       void (*op)(struct fileglob *))
+unp_scan(struct mbuf *m0, void (*op)(struct fileglob *))

 {
        struct mbuf *m;
        struct fileglob **rp;
 {
        struct mbuf *m;
        struct fileglob **rp;


@@ -1402,13 +1631,13 @@ unp_scan(
        while (m0) {
                for (m = m0; m; m = m->m_next)
                        if (m->m_type == MT_CONTROL &&
        while (m0) {
                for (m = m0; m; m = m->m_next)
                        if (m->m_type == MT_CONTROL &&

-                           (size_t) m->m_len >= sizeof(*cm)) {
+                           (size_t)m->m_len >= sizeof (*cm)) {

                                cm = mtod(m, struct cmsghdr *);
                                if (cm->cmsg_level != SOL_SOCKET ||
                                    cm->cmsg_type != SCM_RIGHTS)
                                        continue;
                                cm = mtod(m, struct cmsghdr *);
                                if (cm->cmsg_level != SOL_SOCKET ||
                                    cm->cmsg_type != SCM_RIGHTS)
                                        continue;

-                               qfds = (cm->cmsg_len - sizeof *cm)
-                                               / sizeof (struct fileglob *);
+                               qfds = (cm->cmsg_len - sizeof (*cm)) /
+                                   sizeof (struct fileglob *);

                                rp = (struct fileglob **)(cm + 1);
                                for (i = 0; i < qfds; i++)
                                        (*op)(*rp++);
                                rp = (struct fileglob **)(cm + 1);
                                for (i = 0; i < qfds; i++)
                                        (*op)(*rp++);


@@ -1422,38 +1651,36 @@ unp_scan(
 static void
 unp_mark(struct fileglob *fg)
 {
 static void
 unp_mark(struct fileglob *fg)
 {

-        lck_mtx_lock(&fg->fg_lock);
+       lck_mtx_lock(&fg->fg_lock);

 
        if (fg->fg_flag & FMARK) {
 
        if (fg->fg_flag & FMARK) {

-               lck_mtx_unlock(&fg->fg_lock);
+               lck_mtx_unlock(&fg->fg_lock);

                return;
        }
        fg->fg_flag |= (FMARK|FDEFER);
 
                return;
        }
        fg->fg_flag |= (FMARK|FDEFER);
 

-        lck_mtx_unlock(&fg->fg_lock);
+       lck_mtx_unlock(&fg->fg_lock);

 
        unp_defer++;
 }
 
 /* should run under kernel funnel */
 static void
 
        unp_defer++;
 }
 
 /* should run under kernel funnel */
 static void

-unp_discard(fg)
-       struct fileglob *fg;
+unp_discard(struct fileglob *fg)

 {
 {

-       struct proc *p = current_proc();                /* XXX */
+       proc_t p = current_proc();              /* XXX */
+
+       (void) OSAddAtomic(1, (volatile SInt32 *)&unp_disposed);

 
        proc_fdlock(p);
        unp_discard_fdlocked(fg, p);
        proc_fdunlock(p);
 }
 static void
 
        proc_fdlock(p);
        unp_discard_fdlocked(fg, p);
        proc_fdunlock(p);
 }
 static void

-unp_discard_fdlocked(fg, p)
-       struct fileglob *fg;
-       struct proc *p;
+unp_discard_fdlocked(struct fileglob *fg, proc_t p)

 {
 {

-

        fg_removeuipc(fg);
 
        fg_removeuipc(fg);
 

-       unp_rights--;
+       (void) OSAddAtomic(-1, (volatile SInt32 *)&unp_rights);

        (void) closef_locked((struct fileproc *)0, fg, p);
 }
        (void) closef_locked((struct fileproc *)0, fg, p);
 }