xnu-792.12.6.tar.gz

[apple/xnu.git] / bsd / netinet6 / in6_pcb.c

diff --git a/bsd/netinet6/in6_pcb.c b/bsd/netinet6/in6_pcb.c
index e2e04cd23acd0b241243163f74f4e597a2349e05..2c04734c6e5c4a893169d6d902ddcae8be71895e 100644 (file)
--- a/bsd/netinet6/in6_pcb.c
+++ b/bsd/netinet6/in6_pcb.c
@@ -1,3 +1,32 @@
+/*
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * 
+ * 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.
+ *
+ * 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, 
+ * 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_OSREFERENCE_HEADER_END@
+ */

 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.


@@ -91,6 +120,9 @@
 #include <netinet6/in6_pcb.h>
 #include <net/if_types.h>
 
 #include <netinet6/in6_pcb.h>
 #include <net/if_types.h>
 

+#include <kern/kern_types.h>
+#include <kern/zalloc.h>
+

 #include "faith.h"
 #if defined(NFAITH) && NFAITH > 0
 #include <net/if_faith.h>
 #include "faith.h"
 #if defined(NFAITH) && NFAITH > 0
 #include <net/if_faith.h>


@@ -106,15 +138,16 @@
 #include <netinet6/ah6.h>
 #endif
 #include <netkey/key.h>
 #include <netinet6/ah6.h>
 #endif
 #include <netkey/key.h>

+extern lck_mtx_t *sadb_mutex;

 #endif /* IPSEC */
 
 struct in6_addr zeroin6_addr;
 
 int
 #endif /* IPSEC */
 
 struct in6_addr zeroin6_addr;
 
 int

-in6_pcbbind(inp, nam, p)
-       register struct inpcb *inp;
-       struct sockaddr *nam;
-       struct proc *p;
+in6_pcbbind(
+       struct inpcb *inp,
+       struct sockaddr *nam,
+       struct proc *p)

 {
        struct socket *so = inp->inp_socket;
        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)NULL;
 {
        struct socket *so = inp->inp_socket;
        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)NULL;


@@ -122,25 +155,36 @@ in6_pcbbind(inp, nam, p)
        u_short lport = 0;
        int wild = 0, reuseport = (so->so_options & SO_REUSEPORT);
 
        u_short lport = 0;
        int wild = 0, reuseport = (so->so_options & SO_REUSEPORT);
 

-       if (!in6_ifaddr) /* XXX broken! */
+       if (!in6_ifaddrs) /* XXX broken! */

                return (EADDRNOTAVAIL);
        if (inp->inp_lport || !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr))
                return(EINVAL);
        if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) == 0)
                wild = 1;
                return (EADDRNOTAVAIL);
        if (inp->inp_lport || !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr))
                return(EINVAL);
        if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) == 0)
                wild = 1;

+       socket_unlock(so, 0); /* keep reference */
+       lck_rw_lock_exclusive(pcbinfo->mtx);

        if (nam) {
                sin6 = (struct sockaddr_in6 *)nam;
        if (nam) {
                sin6 = (struct sockaddr_in6 *)nam;

-               if (nam->sa_len != sizeof(*sin6))
+               if (nam->sa_len != sizeof(*sin6)) {
+                       lck_rw_done(pcbinfo->mtx);
+                       socket_lock(so, 0);

                        return(EINVAL);
                        return(EINVAL);

+               }

                /*
                 * family check.
                 */
                /*
                 * family check.
                 */

-               if (nam->sa_family != AF_INET6)
+               if (nam->sa_family != AF_INET6) {
+                       lck_rw_done(pcbinfo->mtx);
+                       socket_lock(so, 0);

                        return(EAFNOSUPPORT);
                        return(EAFNOSUPPORT);

+               }

 
                /* KAME hack: embed scopeid */
 
                /* KAME hack: embed scopeid */

-               if (in6_embedscope(&sin6->sin6_addr, sin6, inp, NULL) != 0)
+               if (in6_embedscope(&sin6->sin6_addr, sin6, inp, NULL) != 0) {
+                       lck_rw_done(pcbinfo->mtx);
+                       socket_lock(so, 0);

                        return EINVAL;
                        return EINVAL;

+               }

                /* this must be cleared for ifa_ifwithaddr() */
                sin6->sin6_scope_id = 0;
 
                /* this must be cleared for ifa_ifwithaddr() */
                sin6->sin6_scope_id = 0;
 


@@ -159,8 +203,11 @@ in6_pcbbind(inp, nam, p)
                        struct ifaddr *ia = NULL;
 
                        sin6->sin6_port = 0;            /* yech... */
                        struct ifaddr *ia = NULL;
 
                        sin6->sin6_port = 0;            /* yech... */

-                       if ((ia = ifa_ifwithaddr((struct sockaddr *)sin6)) == 0)
+                       if ((ia = ifa_ifwithaddr((struct sockaddr *)sin6)) == 0) {
+                               lck_rw_done(pcbinfo->mtx);
+                               socket_lock(so, 0);

                                return(EADDRNOTAVAIL);
                                return(EADDRNOTAVAIL);

+                       }

 
                        /*
                         * XXX: bind to an anycast address might accidentally
 
                        /*
                         * XXX: bind to an anycast address might accidentally


@@ -171,20 +218,24 @@ in6_pcbbind(inp, nam, p)
                        if (ia &&
                            ((struct in6_ifaddr *)ia)->ia6_flags &
                            (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED)) {
                        if (ia &&
                            ((struct in6_ifaddr *)ia)->ia6_flags &
                            (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED)) {

+                               ifafree(ia);
+                               lck_rw_done(pcbinfo->mtx);
+                               socket_lock(so, 0);

                                return(EADDRNOTAVAIL);
                        }
                                return(EADDRNOTAVAIL);
                        }

+                       ifafree(ia);
+                       ia = NULL;

                }
                if (lport) {
                        struct inpcb *t;
 
                        /* GROSS */
                        if (ntohs(lport) < IPV6PORT_RESERVED && p &&
                }
                if (lport) {
                        struct inpcb *t;
 
                        /* GROSS */
                        if (ntohs(lport) < IPV6PORT_RESERVED && p &&

-#if 0
-                           suser(p->p_ucred, &p->p_acflag))
-#else
-                            ((so->so_state & SS_PRIV) == 0))
-#endif
+                            ((so->so_state & SS_PRIV) == 0)) {
+                               lck_rw_done(pcbinfo->mtx);
+                               socket_lock(so, 0);

                                return(EACCES);
                                return(EACCES);

+                       }

 
                        if (so->so_uid &&
                            !IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) {
 
                        if (so->so_uid &&
                            !IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) {


@@ -196,8 +247,11 @@ in6_pcbbind(inp, nam, p)
                                     !IN6_IS_ADDR_UNSPECIFIED(&t->in6p_laddr) ||
                                     (t->inp_socket->so_options &
                                      SO_REUSEPORT) == 0) &&
                                     !IN6_IS_ADDR_UNSPECIFIED(&t->in6p_laddr) ||
                                     (t->inp_socket->so_options &
                                      SO_REUSEPORT) == 0) &&

-                                   so->so_uid != t->inp_socket->so_uid)
+                                   so->so_uid != t->inp_socket->so_uid) {
+                                       lck_rw_done(pcbinfo->mtx);
+                                       socket_lock(so, 0);

                                        return (EADDRINUSE);
                                        return (EADDRINUSE);

+                               }

                                if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 &&
                                    IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
                                        struct sockaddr_in sin;
                                if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 &&
                                    IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
                                        struct sockaddr_in sin;


@@ -212,14 +266,21 @@ in6_pcbbind(inp, nam, p)
                                            (ntohl(t->inp_laddr.s_addr) !=
                                             INADDR_ANY ||
                                             INP_SOCKAF(so) ==
                                            (ntohl(t->inp_laddr.s_addr) !=
                                             INADDR_ANY ||
                                             INP_SOCKAF(so) ==

-                                            INP_SOCKAF(t->inp_socket)))
+                                            INP_SOCKAF(t->inp_socket))) {
+
+                                               lck_rw_done(pcbinfo->mtx);
+                                               socket_lock(so, 0);

                                                return (EADDRINUSE);
                                                return (EADDRINUSE);

+                                       }

                                }
                        }
                        t = in6_pcblookup_local(pcbinfo, &sin6->sin6_addr,
                                                lport, wild);
                                }
                        }
                        t = in6_pcblookup_local(pcbinfo, &sin6->sin6_addr,
                                                lport, wild);

-                       if (t && (reuseport & t->inp_socket->so_options) == 0)
+                       if (t && (reuseport & t->inp_socket->so_options) == 0) {
+                               lck_rw_done(pcbinfo->mtx);
+                               socket_lock(so, 0);

                                return(EADDRINUSE);
                                return(EADDRINUSE);

+                       }

                        if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 &&
                            IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
                                struct sockaddr_in sin;
                        if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 &&
                            IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
                                struct sockaddr_in sin;


@@ -233,25 +294,33 @@ in6_pcbbind(inp, nam, p)
                                    (ntohl(t->inp_laddr.s_addr)
                                     != INADDR_ANY ||
                                     INP_SOCKAF(so) ==
                                    (ntohl(t->inp_laddr.s_addr)
                                     != INADDR_ANY ||
                                     INP_SOCKAF(so) ==

-                                    INP_SOCKAF(t->inp_socket)))
+                                    INP_SOCKAF(t->inp_socket))) {
+                                       lck_rw_done(pcbinfo->mtx);
+                                       socket_lock(so, 0);

                                        return (EADDRINUSE);
                                        return (EADDRINUSE);

+                               }

                        }
                }
                inp->in6p_laddr = sin6->sin6_addr;
        }
                        }
                }
                inp->in6p_laddr = sin6->sin6_addr;
        }

+       socket_lock(so, 0);

        if (lport == 0) {
                int e;
        if (lport == 0) {
                int e;

-               if ((e = in6_pcbsetport(&inp->in6p_laddr, inp, p)) != 0)
+               if ((e = in6_pcbsetport(&inp->in6p_laddr, inp, p, 1)) != 0) {
+                       lck_rw_done(pcbinfo->mtx);

                        return(e);
                        return(e);

+               }

        }
        else {
                inp->inp_lport = lport;
        }
        else {
                inp->inp_lport = lport;

-               if (in_pcbinshash(inp) != 0) {
+               if (in_pcbinshash(inp, 1) != 0) {

                        inp->in6p_laddr = in6addr_any;
                        inp->inp_lport = 0;
                        inp->in6p_laddr = in6addr_any;
                        inp->inp_lport = 0;

+                       lck_rw_done(pcbinfo->mtx);

                        return (EAGAIN);
                }
                        return (EAGAIN);
                }

-       }
+       }       
+       lck_rw_done(pcbinfo->mtx);

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


@@ -268,12 +337,15 @@ in6_pcbbind(inp, nam, p)
  */
 
 int
  */
 
 int

-in6_pcbladdr(inp, nam, plocal_addr6)
-       register struct inpcb *inp;
-       struct sockaddr *nam;
-       struct in6_addr **plocal_addr6;
+in6_pcbladdr(
+       struct inpcb *inp,
+       struct sockaddr *nam,
+       struct in6_addr *plocal_addr6)

 {
 {

-       register struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)nam;
+       struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)nam;
+       struct in6_addr *addr6 = NULL;
+       struct in6_addr src_storage;
+       

        struct ifnet *ifp = NULL;
        int error = 0;
 
        struct ifnet *ifp = NULL;
        int error = 0;
 


@@ -288,7 +360,7 @@ in6_pcbladdr(inp, nam, plocal_addr6)
        if (in6_embedscope(&sin6->sin6_addr, sin6, inp, &ifp) != 0)
                return EINVAL;
 
        if (in6_embedscope(&sin6->sin6_addr, sin6, inp, &ifp) != 0)
                return EINVAL;
 

-       if (in6_ifaddr) {
+       if (in6_ifaddrs) {

                /*
                 * If the destination address is UNSPECIFIED addr,
                 * use the loopback addr, e.g ::1.
                /*
                 * If the destination address is UNSPECIFIED addr,
                 * use the loopback addr, e.g ::1.


@@ -302,15 +374,16 @@ in6_pcbladdr(inp, nam, plocal_addr6)
                 * with the address specified by setsockopt(IPV6_PKTINFO).
                 * Is it the intended behavior?
                 */
                 * with the address specified by setsockopt(IPV6_PKTINFO).
                 * Is it the intended behavior?
                 */

-               *plocal_addr6 = in6_selectsrc(sin6, inp->in6p_outputopts,
+               addr6 = in6_selectsrc(sin6, inp->in6p_outputopts,

                                              inp->in6p_moptions,
                                              &inp->in6p_route,
                                              inp->in6p_moptions,
                                              &inp->in6p_route,

-                                             &inp->in6p_laddr, &error);
-               if (*plocal_addr6 == 0) {
+                                             &inp->in6p_laddr, &src_storage, &error);
+               if (addr6 == 0) {

                        if (error == 0)
                                error = EADDRNOTAVAIL;
                        return(error);
                }
                        if (error == 0)
                                error = EADDRNOTAVAIL;
                        return(error);
                }

+               *plocal_addr6 = *addr6;

                /*
                 * Don't do pcblookup call here; return interface in
                 * plocal_addr6
                /*
                 * Don't do pcblookup call here; return interface in
                 * plocal_addr6


@@ -333,25 +406,30 @@ in6_pcbladdr(inp, nam, plocal_addr6)
  */
 int
 in6_pcbconnect(inp, nam, p)
  */
 int
 in6_pcbconnect(inp, nam, p)

-       register struct inpcb *inp;
+       struct inpcb *inp;

        struct sockaddr *nam;
        struct proc *p;
 {
        struct sockaddr *nam;
        struct proc *p;
 {

-       struct in6_addr *addr6;
-       register struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)nam;
+       struct in6_addr addr6;
+       struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)nam;
+       struct inpcb *pcb;

        int error;
 
        /*
        int error;
 
        /*

-        *   Call inner routine, to assign local interface address.
+        * Call inner routine, to assign local interface address.
+        * in6_pcbladdr() may automatically fill in sin6_scope_id.

         */
        if ((error = in6_pcbladdr(inp, nam, &addr6)) != 0)
                return(error);
         */
        if ((error = in6_pcbladdr(inp, nam, &addr6)) != 0)
                return(error);

-
-       if (in6_pcblookup_hash(inp->inp_pcbinfo, &sin6->sin6_addr,
+       socket_unlock(inp->inp_socket, 0);
+       pcb = in6_pcblookup_hash(inp->inp_pcbinfo, &sin6->sin6_addr,

                               sin6->sin6_port,
                              IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)
                               sin6->sin6_port,
                              IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)

-                             ? addr6 : &inp->in6p_laddr,
-                             inp->inp_lport, 0, NULL) != NULL) {
+                             ? &addr6 : &inp->in6p_laddr,
+                             inp->inp_lport, 0, NULL);
+       socket_lock(inp->inp_socket, 0);
+       if (pcb != NULL) {
+               in_pcb_checkstate(pcb, WNT_RELEASE, 0);

                return (EADDRINUSE);
        }
        if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) {
                return (EADDRINUSE);
        }
        if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) {


@@ -360,7 +438,13 @@ in6_pcbconnect(inp, nam, p)
                        if (error)
                                return (error);
                }
                        if (error)
                                return (error);
                }

-               inp->in6p_laddr = *addr6;
+               inp->in6p_laddr = addr6;
+       }
+       if (!lck_rw_try_lock_exclusive(inp->inp_pcbinfo->mtx)) {
+               /*lock inversion issue, mostly with udp multicast packets */
+               socket_unlock(inp->inp_socket, 0);
+               lck_rw_lock_exclusive(inp->inp_pcbinfo->mtx);
+               socket_lock(inp->inp_socket, 0);

        }
        inp->in6p_faddr = sin6->sin6_addr;
        inp->inp_fport = sin6->sin6_port;
        }
        inp->in6p_faddr = sin6->sin6_addr;
        inp->inp_fport = sin6->sin6_port;


@@ -371,6 +455,7 @@ in6_pcbconnect(inp, nam, p)
                    (htonl(ip6_flow_seq++) & IPV6_FLOWLABEL_MASK);
 
        in_pcbrehash(inp);
                    (htonl(ip6_flow_seq++) & IPV6_FLOWLABEL_MASK);
 
        in_pcbrehash(inp);

+       lck_rw_done(inp->inp_pcbinfo->mtx);

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


@@ -382,13 +467,14 @@ in6_pcbconnect(inp, nam, p)
  * an entry to the caller for later use.
  */
 struct in6_addr *
  * an entry to the caller for later use.
  */
 struct in6_addr *

-in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
-       struct sockaddr_in6 *dstsock;
-       struct ip6_pktopts *opts;
-       struct ip6_moptions *mopts;
-       struct route_in6 *ro;
-       struct in6_addr *laddr;
-       int *errorp;
+in6_selectsrc(
+       struct sockaddr_in6 *dstsock,
+       struct ip6_pktopts *opts,
+       struct ip6_moptions *mopts,
+       struct route_in6 *ro,
+       struct in6_addr *laddr,
+       struct in6_addr *src_storage,
+       int *errorp)

 {
        struct in6_addr *dst;
        struct in6_ifaddr *ia6 = 0;
 {
        struct in6_addr *dst;
        struct in6_ifaddr *ia6 = 0;


@@ -425,7 +511,9 @@ in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
                        *errorp = EADDRNOTAVAIL;
                        return(0);
                }
                        *errorp = EADDRNOTAVAIL;
                        return(0);
                }

-               return(&satosin6(&ia6->ia_addr)->sin6_addr);
+               *src_storage = satosin6(&ia6->ia_addr)->sin6_addr;
+               ifafree(&ia6->ia_ifa);
+               return(src_storage);

        }
 
        /*
        }
 
        /*


@@ -454,7 +542,9 @@ in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
                        *errorp = EADDRNOTAVAIL;
                        return(0);
                }
                        *errorp = EADDRNOTAVAIL;
                        return(0);
                }

-               return(&satosin6(&ia6->ia_addr)->sin6_addr);
+               *src_storage = satosin6(&ia6->ia_addr)->sin6_addr;
+               ifafree(&ia6->ia_ifa);
+               return(src_storage);

        }
 
        /*
        }
 
        /*


@@ -479,7 +569,9 @@ in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
                                *errorp = EADDRNOTAVAIL;
                                return(0);
                        }
                                *errorp = EADDRNOTAVAIL;
                                return(0);
                        }

-                       return(&ia6->ia_addr.sin6_addr);
+                       *src_storage = ia6->ia_addr.sin6_addr;
+                       ifafree(&ia6->ia_ifa);
+                       return(src_storage);

                }
        }
 
                }
        }
 


@@ -494,17 +586,21 @@ in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
 
                if (opts && opts->ip6po_nexthop) {
                        sin6_next = satosin6(opts->ip6po_nexthop);
 
                if (opts && opts->ip6po_nexthop) {
                        sin6_next = satosin6(opts->ip6po_nexthop);

-                       rt = nd6_lookup(&sin6_next->sin6_addr, 1, NULL);
+                       rt = nd6_lookup(&sin6_next->sin6_addr, 1, NULL, 0);

                        if (rt) {
                                ia6 = in6_ifawithscope(rt->rt_ifp, dst);
                        if (rt) {
                                ia6 = in6_ifawithscope(rt->rt_ifp, dst);

-                               if (ia6 == 0)
+                               if (ia6 == 0) {
+                                       ifaref(&rt->rt_ifa);

                                        ia6 = ifatoia6(rt->rt_ifa);
                                        ia6 = ifatoia6(rt->rt_ifa);

+                               }

                        }
                        if (ia6 == 0) {
                                *errorp = EADDRNOTAVAIL;
                                return(0);
                        }
                        }
                        if (ia6 == 0) {
                                *errorp = EADDRNOTAVAIL;
                                return(0);
                        }

-                       return(&satosin6(&ia6->ia_addr)->sin6_addr);
+                       *src_storage = satosin6(&ia6->ia_addr)->sin6_addr;
+                       ifaref(&rt->rt_ifa);
+                       return(src_storage);

                }
        }
 
                }
        }
 


@@ -545,14 +641,18 @@ in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
 
                if (ro->ro_rt) {
                        ia6 = in6_ifawithscope(ro->ro_rt->rt_ifa->ifa_ifp, dst);
 
                if (ro->ro_rt) {
                        ia6 = in6_ifawithscope(ro->ro_rt->rt_ifa->ifa_ifp, dst);

-                       if (ia6 == 0) /* xxx scope error ?*/
+                       if (ia6 == 0) { /* xxx scope error ?*/
+                               ifaref(ro->ro_rt->rt_ifa);

                                ia6 = ifatoia6(ro->ro_rt->rt_ifa);
                                ia6 = ifatoia6(ro->ro_rt->rt_ifa);

+                       }

                }
                if (ia6 == 0) {
                        *errorp = EHOSTUNREACH; /* no route */
                        return(0);
                }
                }
                if (ia6 == 0) {
                        *errorp = EHOSTUNREACH; /* no route */
                        return(0);
                }

-               return(&satosin6(&ia6->ia_addr)->sin6_addr);
+               *src_storage = satosin6(&ia6->ia_addr)->sin6_addr;
+               ifaref(&rt->rt_ifa);
+               return(src_storage);

        }
 
        *errorp = EADDRNOTAVAIL;
        }
 
        *errorp = EADDRNOTAVAIL;


@@ -567,9 +667,9 @@ in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
  * 3. The system default hoplimit.
 */
 int
  * 3. The system default hoplimit.
 */
 int

-in6_selecthlim(in6p, ifp)
-       struct in6pcb *in6p;
-       struct ifnet *ifp;
+in6_selecthlim(
+       struct in6pcb *in6p,
+       struct ifnet *ifp)

 {
        if (in6p && in6p->in6p_hops >= 0)
                return(in6p->in6p_hops);
 {
        if (in6p && in6p->in6p_hops >= 0)
                return(in6p->in6p_hops);


@@ -584,11 +684,18 @@ void
 in6_pcbdisconnect(inp)
        struct inpcb *inp;
 {
 in6_pcbdisconnect(inp)
        struct inpcb *inp;
 {

+       if (!lck_rw_try_lock_exclusive(inp->inp_pcbinfo->mtx)) {
+               /*lock inversion issue, mostly with udp multicast packets */
+               socket_unlock(inp->inp_socket, 0);
+               lck_rw_lock_exclusive(inp->inp_pcbinfo->mtx);
+               socket_lock(inp->inp_socket, 0);
+       }

        bzero((caddr_t)&inp->in6p_faddr, sizeof(inp->in6p_faddr));
        inp->inp_fport = 0;
        /* clear flowinfo - draft-itojun-ipv6-flowlabel-api-00 */
        inp->in6p_flowinfo &= ~IPV6_FLOWLABEL_MASK;
        in_pcbrehash(inp);
        bzero((caddr_t)&inp->in6p_faddr, sizeof(inp->in6p_faddr));
        inp->inp_fport = 0;
        /* clear flowinfo - draft-itojun-ipv6-flowlabel-api-00 */
        inp->in6p_flowinfo &= ~IPV6_FLOWLABEL_MASK;
        in_pcbrehash(inp);

+       lck_rw_done(inp->inp_pcbinfo->mtx);

        if (inp->inp_socket->so_state & SS_NOFDREF)
                in6_pcbdetach(inp);
 }
        if (inp->inp_socket->so_state & SS_NOFDREF)
                in6_pcbdetach(inp);
 }


@@ -601,27 +708,79 @@ in6_pcbdetach(inp)
        struct inpcbinfo *ipi = inp->inp_pcbinfo;
 
 #if IPSEC
        struct inpcbinfo *ipi = inp->inp_pcbinfo;
 
 #if IPSEC

-       if (inp->in6p_sp != NULL)
+       if (inp->in6p_sp != NULL) {
+               lck_mtx_lock(sadb_mutex);

                ipsec6_delete_pcbpolicy(inp);
                ipsec6_delete_pcbpolicy(inp);

+               lck_mtx_unlock(sadb_mutex);
+       }

 #endif /* IPSEC */
 #endif /* IPSEC */

-       inp->inp_gencnt = ++ipi->ipi_gencnt;
-       in_pcbremlists(inp);
-       sotoinpcb(so) = 0;
-       sofree(so);
-
-       if (inp->in6p_options)
-               m_freem(inp->in6p_options);
-       ip6_freepcbopts(inp->in6p_outputopts);
-       ip6_freemoptions(inp->in6p_moptions);
-       if (inp->in6p_route.ro_rt)
-               rtfree(inp->in6p_route.ro_rt);
-       /* Check and free IPv4 related resources in case of mapped addr */
-       if (inp->inp_options)
-               (void)m_free(inp->inp_options);
-       ip_freemoptions(inp->inp_moptions);

 
 

-       inp->inp_vflag = 0;
-       zfree(ipi->ipi_zone, inp);
+       if (in_pcb_checkstate(inp, WNT_STOPUSING, 1) != WNT_STOPUSING)
+               printf("in6_pcbdetach so=%x can't be marked dead ok\n", so);
+
+       inp->inp_state = INPCB_STATE_DEAD;
+
+       if ((so->so_flags & SOF_PCBCLEARING) == 0) {
+               inp->inp_vflag = 0;
+               so->so_flags |= SOF_PCBCLEARING;
+               inp->inp_gencnt = ++ipi->ipi_gencnt;
+               if (inp->in6p_options)
+                       m_freem(inp->in6p_options);
+               ip6_freepcbopts(inp->in6p_outputopts);
+               ip6_freemoptions(inp->in6p_moptions);
+               if (inp->in6p_route.ro_rt)
+                       rtfree(inp->in6p_route.ro_rt);
+               /* Check and free IPv4 related resources in case of mapped addr */
+               if (inp->inp_options)
+                       (void)m_free(inp->inp_options);
+               ip_freemoptions(inp->inp_moptions);
+               inp->inp_moptions = NULL;
+       
+       }
+}
+
+struct sockaddr *
+in6_sockaddr(port, addr_p)
+       in_port_t port;
+       struct in6_addr *addr_p;
+{
+       struct sockaddr_in6 *sin6;
+
+       MALLOC(sin6, struct sockaddr_in6 *, sizeof *sin6, M_SONAME, M_WAITOK);
+       bzero(sin6, sizeof *sin6);
+       sin6->sin6_family = AF_INET6;
+       sin6->sin6_len = sizeof(*sin6);
+       sin6->sin6_port = port;
+       sin6->sin6_addr = *addr_p;
+       if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr))
+               sin6->sin6_scope_id = ntohs(sin6->sin6_addr.s6_addr16[1]);
+       else
+               sin6->sin6_scope_id = 0;        /*XXX*/
+       if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr))
+               sin6->sin6_addr.s6_addr16[1] = 0;
+
+       return (struct sockaddr *)sin6;
+}
+
+struct sockaddr *
+in6_v4mapsin6_sockaddr(port, addr_p)
+       in_port_t port;
+       struct in_addr *addr_p;
+{
+       struct sockaddr_in sin;
+       struct sockaddr_in6 *sin6_p;
+
+       bzero(&sin, sizeof sin);
+       sin.sin_family = AF_INET;
+       sin.sin_len = sizeof(sin);
+       sin.sin_port = port;
+       sin.sin_addr = *addr_p;
+
+       MALLOC(sin6_p, struct sockaddr_in6 *, sizeof *sin6_p, M_SONAME,
+               M_WAITOK);
+       in6_sin_2_v4mapsin6(&sin, sin6_p);
+
+       return (struct sockaddr *)sin6_p;

 }
 
 /*
 }
 
 /*


@@ -639,36 +798,18 @@ in6_setsockaddr(so, nam)
        struct socket *so;
        struct sockaddr **nam;
 {
        struct socket *so;
        struct sockaddr **nam;
 {

-       int s;
-       register struct inpcb *inp;
-       register struct sockaddr_in6 *sin6;
-
-       /*
-        * Do the malloc first in case it blocks.
-        */
-       MALLOC(sin6, struct sockaddr_in6 *, sizeof *sin6, M_SONAME, M_WAITOK);
-       bzero(sin6, sizeof *sin6);
-       sin6->sin6_family = AF_INET6;
-       sin6->sin6_len = sizeof(*sin6);
+       struct inpcb *inp;
+       struct in6_addr addr;
+       in_port_t port;

 
 

-       s = splnet();

        inp = sotoinpcb(so);
        if (!inp) {
        inp = sotoinpcb(so);
        if (!inp) {

-               splx(s);
-               _FREE(sin6, M_SONAME);

                return EINVAL;
        }
                return EINVAL;
        }

-       sin6->sin6_port = inp->inp_lport;
-       sin6->sin6_addr = inp->in6p_laddr;
-       splx(s);
-       if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr))
-               sin6->sin6_scope_id = ntohs(sin6->sin6_addr.s6_addr16[1]);
-       else
-               sin6->sin6_scope_id = 0;        /*XXX*/
-       if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr))
-               sin6->sin6_addr.s6_addr16[1] = 0;
+       port = inp->inp_lport;
+       addr = inp->in6p_laddr;

 
 

-       *nam = (struct sockaddr *)sin6;
+       *nam = in6_sockaddr(port, &addr);

        return 0;
 }
 
        return 0;
 }
 


@@ -677,36 +818,18 @@ in6_setpeeraddr(so, nam)
        struct socket *so;
        struct sockaddr **nam;
 {
        struct socket *so;
        struct sockaddr **nam;
 {

-       int s;

        struct inpcb *inp;
        struct inpcb *inp;

-       register struct sockaddr_in6 *sin6;
+       struct in6_addr addr;
+       in_port_t port;

 
 

-       /*
-        * Do the malloc first in case it blocks.
-        */
-       MALLOC(sin6, struct sockaddr_in6 *, sizeof(*sin6), M_SONAME, M_WAITOK);
-       bzero((caddr_t)sin6, sizeof (*sin6));
-       sin6->sin6_family = AF_INET6;
-       sin6->sin6_len = sizeof(struct sockaddr_in6);
-
-       s = splnet();

        inp = sotoinpcb(so);
        if (!inp) {
        inp = sotoinpcb(so);
        if (!inp) {

-               splx(s);
-               _FREE(sin6, M_SONAME);

                return EINVAL;
        }
                return EINVAL;
        }

-       sin6->sin6_port = inp->inp_fport;
-       sin6->sin6_addr = inp->in6p_faddr;
-       splx(s);
-       if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr))
-               sin6->sin6_scope_id = ntohs(sin6->sin6_addr.s6_addr16[1]);
-       else
-               sin6->sin6_scope_id = 0;        /*XXX*/
-       if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr))
-               sin6->sin6_addr.s6_addr16[1] = 0;
+       port = inp->inp_fport;
+       addr = inp->in6p_faddr;

 
 

-       *nam = (struct sockaddr *)sin6;
+       *nam = in6_sockaddr(port, &addr);

        return 0;
 }
 
        return 0;
 }
 


@@ -723,6 +846,7 @@ in6_mapped_sockaddr(struct socket *so, struct sockaddr **nam)
                if (error == 0)
                        in6_sin_2_v4mapsin6_in_sock(nam);
        } else
                if (error == 0)
                        in6_sin_2_v4mapsin6_in_sock(nam);
        } else

+       /* scope issues will be handled in in6_setsockaddr(). */

        error = in6_setsockaddr(so, nam);
 
        return error;
        error = in6_setsockaddr(so, nam);
 
        return error;


@@ -741,6 +865,7 @@ in6_mapped_peeraddr(struct socket *so, struct sockaddr **nam)
                if (error == 0)
                        in6_sin_2_v4mapsin6_in_sock(nam);
        } else
                if (error == 0)
                        in6_sin_2_v4mapsin6_in_sock(nam);
        } else

+       /* scope issues will be handled in in6_setpeeraddr(). */

        error = in6_setpeeraddr(so, nam);
 
        return error;
        error = in6_setpeeraddr(so, nam);
 
        return error;


@@ -758,18 +883,21 @@ in6_mapped_peeraddr(struct socket *so, struct sockaddr **nam)
  * Must be called at splnet.
  */
 void
  * Must be called at splnet.
  */
 void

-in6_pcbnotify(head, dst, fport_arg, src, lport_arg, cmd, notify)
-       struct inpcbhead *head;
-       struct sockaddr *dst, *src;
+in6_pcbnotify(pcbinfo, dst, fport_arg, src, lport_arg, cmd, notify)
+       struct inpcbinfo *pcbinfo;
+       struct sockaddr *dst;
+       const struct sockaddr *src;

        u_int fport_arg, lport_arg;
        int cmd;
        u_int fport_arg, lport_arg;
        int cmd;

-       void (*notify) __P((struct inpcb *, int));
+//     struct inpcb *(*notify)(struct inpcb *, int);
+       void (*notify)(struct inpcb *, int);

 {
        struct inpcb *inp, *ninp;
        struct sockaddr_in6 sa6_src, *sa6_dst;
        u_short fport = fport_arg, lport = lport_arg;
        u_int32_t flowinfo;
 {
        struct inpcb *inp, *ninp;
        struct sockaddr_in6 sa6_src, *sa6_dst;
        u_short fport = fport_arg, lport = lport_arg;
        u_int32_t flowinfo;

-       int errno, s;
+       int errno;
+       struct inpcbhead *head = pcbinfo->listhead;

 
        if ((unsigned)cmd > PRC_NCMDS || dst->sa_family != AF_INET6)
                return;
 
        if ((unsigned)cmd > PRC_NCMDS || dst->sa_family != AF_INET6)
                return;


@@ -781,7 +909,7 @@ in6_pcbnotify(head, dst, fport_arg, src, lport_arg, cmd, notify)
        /*
         * note that src can be NULL when we get notify by local fragmentation.
         */
        /*
         * note that src can be NULL when we get notify by local fragmentation.
         */

-       sa6_src = (src == NULL) ? sa6_any : *(struct sockaddr_in6 *)src;
+       sa6_src = (src == NULL) ? sa6_any : *(const struct sockaddr_in6 *)src;

        flowinfo = sa6_src.sin6_flowinfo;
 
        /*
        flowinfo = sa6_src.sin6_flowinfo;
 
        /*


@@ -801,7 +929,7 @@ in6_pcbnotify(head, dst, fport_arg, src, lport_arg, cmd, notify)
                        notify = in6_rtchange;
        }
        errno = inet6ctlerrmap[cmd];
                        notify = in6_rtchange;
        }
        errno = inet6ctlerrmap[cmd];

-       s = splnet();
+       lck_rw_lock_shared(pcbinfo->mtx);

        for (inp = LIST_FIRST(head); inp != NULL; inp = ninp) {
                ninp = LIST_NEXT(inp, inp_list);
 
        for (inp = LIST_FIRST(head); inp != NULL; inp = ninp) {
                ninp = LIST_NEXT(inp, inp_list);
 


@@ -828,14 +956,21 @@ in6_pcbnotify(head, dst, fport_arg, src, lport_arg, cmd, notify)
                         (!IN6_IS_ADDR_UNSPECIFIED(&sa6_src.sin6_addr) &&
                          !IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr,
                                              &sa6_src.sin6_addr)) ||
                         (!IN6_IS_ADDR_UNSPECIFIED(&sa6_src.sin6_addr) &&
                          !IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr,
                                              &sa6_src.sin6_addr)) ||

-                        (fport && inp->inp_fport != fport))
+                        (fport && inp->inp_fport != fport)) 

                        continue;
                        continue;

+                    

 
          do_notify:
 
          do_notify:

-               if (notify)
+               if (notify) {
+                       if (in_pcb_checkstate(inp, WNT_ACQUIRE, 0) == WNT_STOPUSING)
+                               continue;
+                       socket_lock(inp->inp_socket, 1);

                        (*notify)(inp, errno);
                        (*notify)(inp, errno);

+                       (void)in_pcb_checkstate(inp, WNT_RELEASE, 1);
+                       socket_unlock(inp->inp_socket, 1);
+               }

        }
        }

-       splx(s);
+       lck_rw_done(pcbinfo->mtx);

 }
 
 /*
 }
 
 /*


@@ -848,7 +983,7 @@ in6_pcblookup_local(pcbinfo, laddr, lport_arg, wild_okay)
        u_int lport_arg;
        int wild_okay;
 {
        u_int lport_arg;
        int wild_okay;
 {

-       register struct inpcb *inp;
+       struct inpcb *inp;

        int matchwild = 3, wildcard;
        u_short lport = lport_arg;
 
        int matchwild = 3, wildcard;
        u_short lport = lport_arg;
 


@@ -926,11 +1061,12 @@ in6_pcblookup_local(pcbinfo, laddr, lport_arg, wild_okay)
                return (match);
        }
 }
                return (match);
        }
 }

-
+#ifndef APPLE
+/* this is not used in Darwin */

 void
 void

-in6_pcbpurgeif0(head, ifp)
-       struct in6pcb *head;
-       struct ifnet *ifp;
+in6_pcbpurgeif0(
+       struct in6pcb *head,
+       struct ifnet *ifp)

 {
        struct in6pcb *in6p;
        struct ip6_moptions *im6o;
 {
        struct in6pcb *in6p;
        struct ip6_moptions *im6o;


@@ -965,6 +1101,7 @@ in6_pcbpurgeif0(head, ifp)
                }
        }
 }
                }
        }
 }

+#endif

 
 /*
  * Check for alternatives when higher level complains
 
 /*
  * Check for alternatives when higher level complains


@@ -986,9 +1123,10 @@ in6_losing(in6p)
                        (struct sockaddr *)&in6p->in6p_route.ro_dst;
                info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
                info.rti_info[RTAX_NETMASK] = rt_mask(rt);
                        (struct sockaddr *)&in6p->in6p_route.ro_dst;
                info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
                info.rti_info[RTAX_NETMASK] = rt_mask(rt);

+               lck_mtx_lock(rt_mtx);

                rt_missmsg(RTM_LOSING, &info, rt->rt_flags, 0);
                if (rt->rt_flags & RTF_DYNAMIC)
                rt_missmsg(RTM_LOSING, &info, rt->rt_flags, 0);
                if (rt->rt_flags & RTF_DYNAMIC)

-                       (void)rtrequest(RTM_DELETE, rt_key(rt),
+                       (void)rtrequest_locked(RTM_DELETE, rt_key(rt),

                                        rt->rt_gateway, rt_mask(rt), rt->rt_flags,
                                        (struct rtentry **)0);
                else
                                        rt->rt_gateway, rt_mask(rt), rt->rt_flags,
                                        (struct rtentry **)0);
                else


@@ -996,7 +1134,8 @@ in6_losing(in6p)
                 * A new route can be allocated
                 * the next time output is attempted.
                 */
                 * A new route can be allocated
                 * the next time output is attempted.
                 */

-                       rtfree(rt);
+                       rtfree_locked(rt);
+               lck_mtx_unlock(rt_mtx);

        }
 }
 
        }
 }
 


@@ -1005,9 +1144,9 @@ in6_losing(in6p)
  * and allocate a (hopefully) better one.
  */
 void
  * and allocate a (hopefully) better one.
  */
 void

-in6_rtchange(inp, errno)
-       struct inpcb *inp;
-       int errno;
+in6_rtchange(
+       struct inpcb *inp,
+       int errno)

 {
        if (inp->in6p_route.ro_rt) {
                rtfree(inp->in6p_route.ro_rt);
 {
        if (inp->in6p_route.ro_rt) {
                rtfree(inp->in6p_route.ro_rt);


@@ -1023,15 +1162,17 @@ in6_rtchange(inp, errno)
  * Lookup PCB in hash list.
  */
 struct inpcb *
  * Lookup PCB in hash list.
  */
 struct inpcb *

-in6_pcblookup_hash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard, ifp)
-       struct inpcbinfo *pcbinfo;
-       struct in6_addr *faddr, *laddr;
-       u_int fport_arg, lport_arg;
-       int wildcard;
-       struct ifnet *ifp;
+in6_pcblookup_hash(
+       struct inpcbinfo *pcbinfo,
+       struct in6_addr *faddr,
+       u_int fport_arg,
+       struct in6_addr *laddr,
+       u_int lport_arg,
+       int wildcard,
+       struct ifnet *ifp)

 {
        struct inpcbhead *head;
 {
        struct inpcbhead *head;

-       register struct inpcb *inp;
+       struct inpcb *inp;

        u_short fport = fport_arg, lport = lport_arg;
        int faith;
 
        u_short fport = fport_arg, lport = lport_arg;
        int faith;
 


@@ -1041,6 +1182,8 @@ in6_pcblookup_hash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard, ifp)
        faith = 0;
 #endif
 
        faith = 0;
 #endif
 

+       lck_rw_lock_shared(pcbinfo->mtx);
+

        /*
         * First look for an exact match.
         */
        /*
         * First look for an exact match.
         */


@@ -1055,9 +1198,16 @@ in6_pcblookup_hash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard, ifp)
                    inp->inp_fport == fport &&
                    inp->inp_lport == lport) {
                        /*
                    inp->inp_fport == fport &&
                    inp->inp_lport == lport) {
                        /*

-                        * Found.
-                        */
-                       return (inp);
+                       * Found. Check if pcb is still valid
+                       */
+                       if (in_pcb_checkstate(inp, WNT_ACQUIRE, 0) != WNT_STOPUSING) {
+                               lck_rw_done(pcbinfo->mtx);
+                               return (inp);
+                       }
+                       else {  /* it's there but dead, say it isn't found */
+                               lck_rw_done(pcbinfo->mtx);      
+                               return(NULL);
+                       }

                }
        }
        if (wildcard) {
                }
        }
        if (wildcard) {


@@ -1073,18 +1223,34 @@ in6_pcblookup_hash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard, ifp)
                                if (faith && (inp->inp_flags & INP_FAITH) == 0)
                                        continue;
                                if (IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr,
                                if (faith && (inp->inp_flags & INP_FAITH) == 0)
                                        continue;
                                if (IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr,

-                                                      laddr))
-                                       return (inp);
+                                                      laddr)) {
+                                       if (in_pcb_checkstate(inp, WNT_ACQUIRE, 0) != WNT_STOPUSING) {
+                                               lck_rw_done(pcbinfo->mtx);
+                                               return (inp);
+                                       }
+                                       else {  /* it's there but dead, say it isn't found */
+                                               lck_rw_done(pcbinfo->mtx);      
+                                               return(NULL);
+                                       }
+                               }

                                else if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr))
                                        local_wild = inp;
                        }
                }
                                else if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr))
                                        local_wild = inp;
                        }
                }

-               return (local_wild);
+               if (local_wild && in_pcb_checkstate(local_wild, WNT_ACQUIRE, 0) != WNT_STOPUSING) {
+                       lck_rw_done(pcbinfo->mtx);
+                       return (local_wild);
+               }
+               else {
+                       lck_rw_done(pcbinfo->mtx);
+                       return (NULL);
+               }

        }
 
        /*
         * Not found.
         */
        }
 
        /*
         * Not found.
         */

+       lck_rw_done(pcbinfo->mtx);

        return (NULL);
 }
 
        return (NULL);
 }