xnu-1228.tar.gz

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

diff --git a/bsd/net/raw_usrreq.c b/bsd/net/raw_usrreq.c
index 5e8a246a9268f72c897e10ac869eb4738e343f1b..4128af9f5b246bd2de1d99cb0845ce64bfb9b42a 100644 (file)
--- a/bsd/net/raw_usrreq.c
+++ b/bsd/net/raw_usrreq.c
@@ -1,23 +1,29 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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
  */
 /*
  * Copyright (c) 1980, 1986, 1993


@@ -59,18 +65,34 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>

+#include <sys/domain.h>

 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>

+#include <kern/locks.h>

 
 #include <net/raw_cb.h>
 
 
 #include <net/raw_cb.h>
 

+lck_mtx_t      *raw_mtx;       /*### global raw cb mutex for now */
+lck_attr_t     *raw_mtx_attr;
+lck_grp_t      *raw_mtx_grp;
+lck_grp_attr_t         *raw_mtx_grp_attr;

 /*
  * Initialize raw connection block q.
  */
 void
 /*
  * Initialize raw connection block q.
  */
 void

-raw_init()
+raw_init(void)

 {
 {

+       raw_mtx_grp_attr = lck_grp_attr_alloc_init();
+
+       raw_mtx_grp = lck_grp_alloc_init("rawcb", raw_mtx_grp_attr);
+
+       raw_mtx_attr = lck_attr_alloc_init();
+
+       if ((raw_mtx = lck_mtx_alloc_init(raw_mtx_grp, raw_mtx_attr)) == NULL) {
+               printf("raw_init: can't alloc raw_mtx\n");
+               return;
+       }

        LIST_INIT(&rawcb_list);
 }
 
        LIST_INIT(&rawcb_list);
 }
 


@@ -84,17 +106,21 @@ raw_init()
  * Raw protocol interface.
  */
 void
  * Raw protocol interface.
  */
 void

-raw_input(m0, proto, src, dst)
-       struct mbuf *m0;
-       register struct sockproto *proto;
-       struct sockaddr *src, *dst;
+raw_input(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src,
+         struct sockaddr *dst)

 {
 {

-       register struct rawcb *rp;
-       register struct mbuf *m = m0;
-       register int sockets = 0;
+       struct rawcb *rp;
+       struct mbuf *m = m0;
+       int sockets = 0;

        struct socket *last;
        struct socket *last;

+       int error;

 
 

-       last = 0;
+//####LD raw_input is called from many places, input & output path. We have to assume the 
+//####LD socket we'll find and need to append to is unlocked.
+//####LD calls from the output (locked) path need to make sure the socket is not locked when
+//####LD we call in raw_input
+       last = NULL;
+       lck_mtx_lock(raw_mtx);

        LIST_FOREACH(rp, &rawcb_list, list) {
                if (rp->rcb_proto.sp_family != proto->sp_family)
                        continue;
        LIST_FOREACH(rp, &rawcb_list, list) {
                if (rp->rcb_proto.sp_family != proto->sp_family)
                        continue;


@@ -119,36 +145,33 @@ raw_input(m0, proto, src, dst)
                        struct mbuf *n;
                        n = m_copy(m, 0, (int)M_COPYALL);
                        if (n) {
                        struct mbuf *n;
                        n = m_copy(m, 0, (int)M_COPYALL);
                        if (n) {

+                               socket_lock(last, 1);

                                if (sbappendaddr(&last->so_rcv, src,
                                if (sbappendaddr(&last->so_rcv, src,

-                                   n, (struct mbuf *)0) == 0)
-                                       /* should notify about lost packet */
-                                       m_freem(n);
-                               else {
+                                   n, (struct mbuf *)0, &error) != 0) {

                                        sorwakeup(last);
                                        sockets++;
                                }
                                        sorwakeup(last);
                                        sockets++;
                                }

+                               socket_unlock(last, 1);

                        }
                }
                last = rp->rcb_socket;
        }
        if (last) {
                        }
                }
                last = rp->rcb_socket;
        }
        if (last) {

+               socket_lock(last, 1);

                if (sbappendaddr(&last->so_rcv, src,
                if (sbappendaddr(&last->so_rcv, src,

-                   m, (struct mbuf *)0) == 0)
-                       m_freem(m);
-               else {
+                   m, (struct mbuf *)0, &error) != 0) {

                        sorwakeup(last);
                        sockets++;
                }
                        sorwakeup(last);
                        sockets++;
                }

+               socket_unlock(last, 1);

        } else
                m_freem(m);
        } else
                m_freem(m);

+       lck_mtx_unlock(raw_mtx);

 }
 
 /*ARGSUSED*/
 void
 }
 
 /*ARGSUSED*/
 void

-raw_ctlinput(cmd, arg, dummy)
-       int cmd;
-       struct sockaddr *arg;
-       void *dummy;
+raw_ctlinput(int cmd, __unused struct sockaddr *arg, __unused void *dummy)

 {
 
        if (cmd < 0 || cmd > PRC_NCMDS)
 {
 
        if (cmd < 0 || cmd > PRC_NCMDS)


@@ -161,6 +184,13 @@ raw_uabort(struct socket *so)
 {
        struct rawcb *rp = sotorawcb(so);
 
 {
        struct rawcb *rp = sotorawcb(so);
 

+       lck_mtx_t * mutex_held;
+       if (so->so_proto->pr_getlock != NULL)
+               mutex_held = (*so->so_proto->pr_getlock)(so, 0);
+       else
+               mutex_held = so->so_proto->pr_domain->dom_mtx;
+       lck_mtx_assert(mutex_held, LCK_MTX_ASSERT_OWNED);
+

        if (rp == 0)
                return EINVAL;
        raw_disconnect(rp);
        if (rp == 0)
                return EINVAL;
        raw_disconnect(rp);


@@ -172,31 +202,25 @@ raw_uabort(struct socket *so)
 /* pru_accept is EOPNOTSUPP */
 
 static int
 /* pru_accept is EOPNOTSUPP */
 
 static int

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

 {
        struct rawcb *rp = sotorawcb(so);
 {
        struct rawcb *rp = sotorawcb(so);

-       int error;

 
        if (rp == 0)
                return EINVAL;
 
        if (rp == 0)
                return EINVAL;

-#ifdef __APPLE__

                if ((so->so_state & SS_PRIV) == 0)
                        return (EPERM);
                if ((so->so_state & SS_PRIV) == 0)
                        return (EPERM);

-#else
-       if (p && (error = suser(p)) != 0)
-               return error;
-#endif

        return raw_attach(so, proto);
 }
 
 static int
        return raw_attach(so, proto);
 }
 
 static int

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

 {
        return EINVAL;
 }
 
 static int
 {
        return EINVAL;
 }
 
 static int

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

 {
        return EINVAL;
 }
 {
        return EINVAL;
 }


@@ -209,6 +233,12 @@ raw_udetach(struct socket *so)
 {
        struct rawcb *rp = sotorawcb(so);
 
 {
        struct rawcb *rp = sotorawcb(so);
 

+       lck_mtx_t * mutex_held;
+       if (so->so_proto->pr_getlock != NULL)
+               mutex_held = (*so->so_proto->pr_getlock)(so, 0);
+       else
+               mutex_held = so->so_proto->pr_domain->dom_mtx;
+       lck_mtx_assert(mutex_held, LCK_MTX_ASSERT_OWNED);

        if (rp == 0)
                return EINVAL;
 
        if (rp == 0)
                return EINVAL;
 


@@ -252,11 +282,18 @@ raw_upeeraddr(struct socket *so, struct sockaddr **nam)
 
 static int
 raw_usend(struct socket *so, int flags, struct mbuf *m,
 
 static int
 raw_usend(struct socket *so, int flags, struct mbuf *m,

-         struct sockaddr *nam, struct mbuf *control, struct proc *p)
+         struct sockaddr *nam, struct mbuf *control, __unused struct proc *p)

 {
        int error;
        struct rawcb *rp = sotorawcb(so);
 
 {
        int error;
        struct rawcb *rp = sotorawcb(so);
 

+       lck_mtx_t * mutex_held;
+       if (so->so_proto->pr_getlock != NULL)
+               mutex_held = (*so->so_proto->pr_getlock)(so, 0);
+       else
+               mutex_held = so->so_proto->pr_domain->dom_mtx;
+       lck_mtx_assert(mutex_held, LCK_MTX_ASSERT_OWNED);
+

        if (rp == 0) {
                error = EINVAL;
                goto release;
        if (rp == 0) {
                error = EINVAL;
                goto release;


@@ -284,7 +321,7 @@ raw_usend(struct socket *so, int flags, struct mbuf *m,
        error = (*so->so_proto->pr_output)(m, so);
        m = NULL;
        if (nam)
        error = (*so->so_proto->pr_output)(m, so);
        m = NULL;
        if (nam)

-               rp->rcb_faddr = 0;
+               rp->rcb_faddr = NULL;

 release:
        if (m != NULL)
                m_freem(m);
 release:
        if (m != NULL)
                m_freem(m);


@@ -297,6 +334,12 @@ static int
 raw_ushutdown(struct socket *so)
 {
        struct rawcb *rp = sotorawcb(so);
 raw_ushutdown(struct socket *so)
 {
        struct rawcb *rp = sotorawcb(so);

+       lck_mtx_t * mutex_held;
+       if (so->so_proto->pr_getlock != NULL)
+               mutex_held = (*so->so_proto->pr_getlock)(so, 0);
+       else
+               mutex_held = so->so_proto->pr_domain->dom_mtx;
+       lck_mtx_assert(mutex_held, LCK_MTX_ASSERT_OWNED);

 
        if (rp == 0)
                return EINVAL;
 
        if (rp == 0)
                return EINVAL;


@@ -322,5 +365,5 @@ struct pr_usrreqs raw_usrreqs = {
        pru_connect2_notsupp, pru_control_notsupp, raw_udetach, 
        raw_udisconnect, pru_listen_notsupp, raw_upeeraddr, pru_rcvd_notsupp,
        pru_rcvoob_notsupp, raw_usend, pru_sense_null, raw_ushutdown,
        pru_connect2_notsupp, pru_control_notsupp, raw_udetach, 
        raw_udisconnect, pru_listen_notsupp, raw_upeeraddr, pru_rcvd_notsupp,
        pru_rcvoob_notsupp, raw_usend, pru_sense_null, raw_ushutdown,

-       raw_usockaddr, sosend, soreceive, sopoll
+       raw_usockaddr, sosend, soreceive, pru_sopoll_notsupp

 };
 };