xnu-792.tar.gz

[apple/xnu.git] / bsd / netinet / tcp_subr.c

diff --git a/bsd/netinet/tcp_subr.c b/bsd/netinet/tcp_subr.c
index cb7bda6538acd562dccfb2219e89779aa3036d9d..0d8a168671fbc441aeac73865b65d95ed277c365 100644 (file)
--- a/bsd/netinet/tcp_subr.c
+++ b/bsd/netinet/tcp_subr.c
@@ -67,11 +67,13 @@
 #include <sys/domain.h>
 #endif
 #include <sys/proc.h>
 #include <sys/domain.h>
 #endif
 #include <sys/proc.h>

+#include <sys/kauth.h>

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

+#include <kern/locks.h>

 
 
 
 
 
 


@@ -120,10 +122,12 @@
 
 #define DBG_FNC_TCP_CLOSE      NETDBG_CODE(DBG_NETTCP, ((5 << 8) | 2))
 
 
 #define DBG_FNC_TCP_CLOSE      NETDBG_CODE(DBG_NETTCP, ((5 << 8) | 2))
 

+extern int tcp_lq_overflow;

 
 /* temporary: for testing */
 #if IPSEC
 extern int ipsec_bypass;
 
 /* temporary: for testing */
 #if IPSEC
 extern int ipsec_bypass;

+extern lck_mtx_t *sadb_mutex;

 #endif
 
 int    tcp_mssdflt = TCP_MSS;
 #endif
 
 int    tcp_mssdflt = TCP_MSS;


@@ -149,6 +153,23 @@ int        tcp_minmss = TCP_MINMSS;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, minmss, CTLFLAG_RW,
     &tcp_minmss , 0, "Minmum TCP Maximum Segment Size");
 
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, minmss, CTLFLAG_RW,
     &tcp_minmss , 0, "Minmum TCP Maximum Segment Size");
 

+/*
+ * Number of TCP segments per second we accept from remote host
+ * before we start to calculate average segment size. If average
+ * segment size drops below the minimum TCP MSS we assume a DoS
+ * attack and reset+drop the connection. Care has to be taken not to
+ * set this value too small to not kill interactive type connections
+ * (telnet, SSH) which send many small packets.
+ */
+#ifdef FIX_WORKAROUND_FOR_3894301
+__private_extern__ int     tcp_minmssoverload = TCP_MINMSSOVERLOAD;
+#else
+__private_extern__ int     tcp_minmssoverload = 0;
+#endif
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, minmssoverload, CTLFLAG_RW,
+    &tcp_minmssoverload , 0, "Number of TCP Segments per Second allowed to"
+    "be under the MINMSS Size");
+

 static int     tcp_do_rfc1323 = 1;
 SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1323, rfc1323, CTLFLAG_RW, 
     &tcp_do_rfc1323 , 0, "Enable rfc1323 (high performance TCP) extensions");
 static int     tcp_do_rfc1323 = 1;
 SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1323, rfc1323, CTLFLAG_RW, 
     &tcp_do_rfc1323 , 0, "Enable rfc1323 (high performance TCP) extensions");


@@ -161,7 +182,7 @@ static int  tcp_tcbhashsize = 0;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RD,
      &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable");
 
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RD,
      &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable");
 

-static int     do_tcpdrain = 1;
+static int     do_tcpdrain = 0;

 SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_tcpdrain, CTLFLAG_RW, &do_tcpdrain, 0,
      "Enable tcp_drain routine for extra help when low on mbufs");
 
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_tcpdrain, CTLFLAG_RW, &do_tcpdrain, 0,
      "Enable tcp_drain routine for extra help when low on mbufs");
 


@@ -180,8 +201,8 @@ static int  tcp_isn_reseed_interval = 0;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW,
     &tcp_isn_reseed_interval, 0, "Seconds between reseeding of ISN secret");
 
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW,
     &tcp_isn_reseed_interval, 0, "Seconds between reseeding of ISN secret");
 

-static void    tcp_cleartaocache __P((void));
-static void    tcp_notify __P((struct inpcb *, int));
+static void    tcp_cleartaocache(void);
+static void    tcp_notify(struct inpcb *, int);

 
 /*
  * Target size of TCP PCB hash tables. Must be a power of two.
 
 /*
  * Target size of TCP PCB hash tables. Must be a power of two.


@@ -237,7 +258,7 @@ int  get_tcp_str_size()
        return sizeof(struct tcpcb);
 }
 
        return sizeof(struct tcpcb);
 }
 

-int    tcp_freeq __P((struct tcpcb *tp));
+int    tcp_freeq(struct tcpcb *tp);

 
 
 /*
 
 
 /*


@@ -249,6 +270,7 @@ tcp_init()
        int hashsize = TCBHASHSIZE;
        vm_size_t       str_size;
        int i;
        int hashsize = TCBHASHSIZE;
        vm_size_t       str_size;
        int i;

+       struct inpcbinfo *pcbinfo;

        
        tcp_ccgen = 1;
        tcp_cleartaocache();
        
        tcp_ccgen = 1;
        tcp_cleartaocache();


@@ -260,11 +282,12 @@ tcp_init()
        tcp_maxpersistidle = TCPTV_KEEP_IDLE;
        tcp_msl = TCPTV_MSL;
        read_random(&tcp_now, sizeof(tcp_now));
        tcp_maxpersistidle = TCPTV_KEEP_IDLE;
        tcp_msl = TCPTV_MSL;
        read_random(&tcp_now, sizeof(tcp_now));

-       tcp_now  = tcp_now & 0x7fffffffffffffff; /* Starts tcp internal 500ms clock at a random value */
+       tcp_now  = tcp_now & 0x7fffffff; /* Starts tcp internal 500ms clock at a random value */

 
 
        LIST_INIT(&tcb);
        tcbinfo.listhead = &tcb;
 
 
        LIST_INIT(&tcb);
        tcbinfo.listhead = &tcb;

+       pcbinfo = &tcbinfo;

 #ifndef __APPLE__
        TUNABLE_INT_FETCH("net.inet.tcp.tcbhashsize", &hashsize);
 #endif
 #ifndef __APPLE__
        TUNABLE_INT_FETCH("net.inet.tcp.tcbhashsize", &hashsize);
 #endif


@@ -301,10 +324,29 @@ tcp_init()
        if (max_linkhdr + TCP_MINPROTOHDR > MHLEN)
                panic("tcp_init");
 #undef TCP_MINPROTOHDR
        if (max_linkhdr + TCP_MINPROTOHDR > MHLEN)
                panic("tcp_init");
 #undef TCP_MINPROTOHDR

-       tcbinfo.last_pcb = 0;

        dummy_tcb.t_state = TCP_NSTATES;
        dummy_tcb.t_flags = 0;
        tcbinfo.dummy_cb = (caddr_t) &dummy_tcb;
        dummy_tcb.t_state = TCP_NSTATES;
        dummy_tcb.t_flags = 0;
        tcbinfo.dummy_cb = (caddr_t) &dummy_tcb;

+
+        /*
+        * allocate lock group attribute and group for tcp pcb mutexes
+        */
+     pcbinfo->mtx_grp_attr = lck_grp_attr_alloc_init();
+       lck_grp_attr_setdefault(pcbinfo->mtx_grp_attr);
+       pcbinfo->mtx_grp = lck_grp_alloc_init("tcppcb", pcbinfo->mtx_grp_attr);
+               
+       /*
+        * allocate the lock attribute for tcp pcb mutexes
+        */
+       pcbinfo->mtx_attr = lck_attr_alloc_init();
+       lck_attr_setdefault(pcbinfo->mtx_attr);
+
+       if ((pcbinfo->mtx = lck_rw_alloc_init(pcbinfo->mtx_grp, pcbinfo->mtx_attr)) == NULL) {
+               printf("tcp_init: mutex not alloced!\n");
+               return; /* pretty much dead if this fails... */
+       }
+
+

        in_pcb_nat_init(&tcbinfo, AF_INET, IPPROTO_TCP, SOCK_STREAM);
 
        delack_bitmask = _MALLOC((4 * hashsize)/32, M_PCB, M_WAITOK);
        in_pcb_nat_init(&tcbinfo, AF_INET, IPPROTO_TCP, SOCK_STREAM);
 
        delack_bitmask = _MALLOC((4 * hashsize)/32, M_PCB, M_WAITOK);


@@ -530,7 +572,7 @@ tcp_respond(tp, ipgen, th, m, ack, seq, flags)
       }
        m->m_len = tlen;
        m->m_pkthdr.len = tlen;
       }
        m->m_len = tlen;
        m->m_pkthdr.len = tlen;

-       m->m_pkthdr.rcvif = (struct ifnet *) 0;
+       m->m_pkthdr.rcvif = 0;

        nth->th_seq = htonl(seq);
        nth->th_ack = htonl(ack);
        nth->th_x2 = 0;
        nth->th_seq = htonl(seq);
        nth->th_ack = htonl(ack);
        nth->th_x2 = 0;


@@ -571,7 +613,7 @@ tcp_respond(tp, ipgen, th, m, ack, seq, flags)
 #endif
 #if INET6
        if (isipv6) {
 #endif
 #if INET6
        if (isipv6) {

-               (void)ip6_output(m, NULL, ro6, ipflags, NULL, NULL);
+               (void)ip6_output(m, NULL, ro6, ipflags, NULL, NULL, 0);

                if (ro6 == &sro6 && ro6->ro_rt) {
                        rtfree(ro6->ro_rt);
                        ro6->ro_rt = NULL;
                if (ro6 == &sro6 && ro6->ro_rt) {
                        rtfree(ro6->ro_rt);
                        ro6->ro_rt = NULL;


@@ -579,7 +621,7 @@ tcp_respond(tp, ipgen, th, m, ack, seq, flags)
        } else
 #endif /* INET6 */
        {
        } else
 #endif /* INET6 */
        {

-               (void) ip_output(m, NULL, ro, ipflags, NULL);
+               (void) ip_output_list(m, 0, NULL, ro, ipflags, NULL);

                if (ro == &sro && ro->ro_rt) {
                        rtfree(ro->ro_rt);
                        ro->ro_rt = NULL;
                if (ro == &sro && ro->ro_rt) {
                        rtfree(ro->ro_rt);
                        ro->ro_rt = NULL;


@@ -731,7 +773,6 @@ tcp_close(tp)
                }
        }
 #endif
                }
        }
 #endif

-       

 
        KERNEL_DEBUG(DBG_FNC_TCP_CLOSE | DBG_FUNC_START, tp,0,0,0,0);
        switch (tp->t_state) 
 
        KERNEL_DEBUG(DBG_FNC_TCP_CLOSE | DBG_FUNC_START, tp,0,0,0,0);
        switch (tp->t_state) 


@@ -859,7 +900,7 @@ tcp_close(tp)
                 * mark route for deletion if no information is
                 * cached.
                 */
                 * mark route for deletion if no information is
                 * cached.
                 */

-               if ((tp->t_flags & TF_LQ_OVERFLOW) &&
+               if ((tp->t_flags & TF_LQ_OVERFLOW) && tcp_lq_overflow && 

                    ((rt->rt_rmx.rmx_locks & RTV_RTT) == 0)){
                        if (rt->rt_rmx.rmx_rtt == 0)
                                rt->rt_flags |= RTF_DELCLONE;
                    ((rt->rt_rmx.rmx_locks & RTV_RTT) == 0)){
                        if (rt->rt_rmx.rmx_rtt == 0)
                                rt->rt_flags |= RTF_DELCLONE;


@@ -874,7 +915,6 @@ tcp_close(tp)
            inp->inp_saved_ppcb = (caddr_t) tp;
 #endif
 
            inp->inp_saved_ppcb = (caddr_t) tp;
 #endif
 

-       inp->inp_ppcb = NULL;

        soisdisconnected(so);
 #if INET6
        if (INP_CHECK_SOCKAF(so, AF_INET6))
        soisdisconnected(so);
 #if INET6
        if (INP_CHECK_SOCKAF(so, AF_INET6))


@@ -908,6 +948,9 @@ tcp_freeq(tp)
 void
 tcp_drain()
 {
 void
 tcp_drain()
 {

+/*
+ * ###LD 05/19/04 locking issue, tcpdrain is disabled, deadlock situation with tcbinfo.mtx
+ */

        if (do_tcpdrain)
        {
                struct inpcb *inpb;
        if (do_tcpdrain)
        {
                struct inpcb *inpb;


@@ -922,6 +965,7 @@ tcp_drain()
         *      where we're really low on mbufs, this is potentially
         *      usefull.        
         */
         *      where we're really low on mbufs, this is potentially
         *      usefull.        
         */

+               lck_rw_lock_exclusive(tcbinfo.mtx);

                for (inpb = LIST_FIRST(tcbinfo.listhead); inpb;
                        inpb = LIST_NEXT(inpb, inp_list)) {
                                if ((tcpb = intotcpcb(inpb))) {
                for (inpb = LIST_FIRST(tcbinfo.listhead); inpb;
                        inpb = LIST_NEXT(inpb, inp_list)) {
                                if ((tcpb = intotcpcb(inpb))) {


@@ -934,6 +978,7 @@ tcp_drain()
                                }
                        }
                }
                                }
                        }
                }

+               lck_rw_done(tcbinfo.mtx);

 
        }
 }
 
        }
 }


@@ -953,7 +998,7 @@ tcp_notify(inp, error)
 {
        struct tcpcb *tp;
 
 {
        struct tcpcb *tp;
 

-       if (inp == NULL)
+       if (inp == NULL || (inp->inp_state == INPCB_STATE_DEAD)) 

                return; /* pcb is gone already */
 
        tp = (struct tcpcb *)inp->inp_ppcb;
                return; /* pcb is gone already */
 
        tp = (struct tcpcb *)inp->inp_ppcb;


@@ -993,66 +1038,73 @@ tcp_pcblist SYSCTL_HANDLER_ARGS
         * The process of preparing the TCB list is too time-consuming and
         * resource-intensive to repeat twice on every request.
         */
         * The process of preparing the TCB list is too time-consuming and
         * resource-intensive to repeat twice on every request.
         */

-       if (req->oldptr == 0) {
+       lck_rw_lock_shared(tcbinfo.mtx);
+       if (req->oldptr == USER_ADDR_NULL) {

                n = tcbinfo.ipi_count;
                req->oldidx = 2 * (sizeof xig)
                        + (n + n/8) * sizeof(struct xtcpcb);
                n = tcbinfo.ipi_count;
                req->oldidx = 2 * (sizeof xig)
                        + (n + n/8) * sizeof(struct xtcpcb);

+               lck_rw_done(tcbinfo.mtx);

                return 0;
        }
 
                return 0;
        }
 

-       if (req->newptr != 0)
+       if (req->newptr != USER_ADDR_NULL) {
+               lck_rw_done(tcbinfo.mtx);

                return EPERM;
                return EPERM;

+       }

 
        /*
         * OK, now we're committed to doing something.
         */
 
        /*
         * OK, now we're committed to doing something.
         */

-       s = splnet();

        gencnt = tcbinfo.ipi_gencnt;
        n = tcbinfo.ipi_count;
        gencnt = tcbinfo.ipi_gencnt;
        n = tcbinfo.ipi_count;

-       splx(s);

 
        xig.xig_len = sizeof xig;
        xig.xig_count = n;
        xig.xig_gen = gencnt;
        xig.xig_sogen = so_gencnt;
        error = SYSCTL_OUT(req, &xig, sizeof xig);
 
        xig.xig_len = sizeof xig;
        xig.xig_count = n;
        xig.xig_gen = gencnt;
        xig.xig_sogen = so_gencnt;
        error = SYSCTL_OUT(req, &xig, sizeof xig);

-       if (error)
+       if (error) {
+               lck_rw_done(tcbinfo.mtx);

                return error;
                return error;

+       }

         /*
          * We are done if there is no pcb
          */
         /*
          * We are done if there is no pcb
          */

-        if (n == 0)  
+        if (n == 0) {
+           lck_rw_done(tcbinfo.mtx);

             return 0; 
             return 0; 

+       }

 
        inp_list = _MALLOC(n * sizeof *inp_list, M_TEMP, M_WAITOK);
 
        inp_list = _MALLOC(n * sizeof *inp_list, M_TEMP, M_WAITOK);

-       if (inp_list == 0)
+       if (inp_list == 0) {
+               lck_rw_done(tcbinfo.mtx);

                return ENOMEM;
                return ENOMEM;

+       }

        
        

-       s = splnet();

        for (inp = LIST_FIRST(tcbinfo.listhead), i = 0; inp && i < n;
             inp = LIST_NEXT(inp, inp_list)) {
 #ifdef __APPLE__
        for (inp = LIST_FIRST(tcbinfo.listhead), i = 0; inp && i < n;
             inp = LIST_NEXT(inp, inp_list)) {
 #ifdef __APPLE__

-               if (inp->inp_gencnt <= gencnt)
+               if (inp->inp_gencnt <= gencnt && inp->inp_state != INPCB_STATE_DEAD)

 #else
                if (inp->inp_gencnt <= gencnt && !prison_xinpcb(req->p, inp))
 #endif
                        inp_list[i++] = inp;
        }
 #else
                if (inp->inp_gencnt <= gencnt && !prison_xinpcb(req->p, inp))
 #endif
                        inp_list[i++] = inp;
        }

-       splx(s);

        n = i;
 
        error = 0;
        for (i = 0; i < n; i++) {
                inp = inp_list[i];
        n = i;
 
        error = 0;
        for (i = 0; i < n; i++) {
                inp = inp_list[i];

-               if (inp->inp_gencnt <= gencnt) {
+               if (inp->inp_gencnt <= gencnt && inp->inp_state != INPCB_STATE_DEAD) {

                        struct xtcpcb xt;
                        caddr_t inp_ppcb;
                        xt.xt_len = sizeof xt;
                        /* XXX should avoid extra copy */
                        struct xtcpcb xt;
                        caddr_t inp_ppcb;
                        xt.xt_len = sizeof xt;
                        /* XXX should avoid extra copy */

-                       bcopy(inp, &xt.xt_inp, sizeof *inp);
+                       inpcb_to_compat(inp, &xt.xt_inp);

                        inp_ppcb = inp->inp_ppcb;
                        inp_ppcb = inp->inp_ppcb;

-                       if (inp_ppcb != NULL)
+                       if (inp_ppcb != NULL) {

                                bcopy(inp_ppcb, &xt.xt_tp, sizeof xt.xt_tp);
                                bcopy(inp_ppcb, &xt.xt_tp, sizeof xt.xt_tp);

+                       }

                        else
                                bzero((char *) &xt.xt_tp, sizeof xt.xt_tp);
                        if (inp->inp_socket)
                        else
                                bzero((char *) &xt.xt_tp, sizeof xt.xt_tp);
                        if (inp->inp_socket)


@@ -1068,14 +1120,13 @@ tcp_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.
                 */

-               s = splnet();

                xig.xig_gen = tcbinfo.ipi_gencnt;
                xig.xig_sogen = so_gencnt;
                xig.xig_count = tcbinfo.ipi_count;
                xig.xig_gen = tcbinfo.ipi_gencnt;
                xig.xig_sogen = so_gencnt;
                xig.xig_count = tcbinfo.ipi_count;

-               splx(s);

                error = SYSCTL_OUT(req, &xig, sizeof xig);
        }
        FREE(inp_list, M_TEMP);
                error = SYSCTL_OUT(req, &xig, sizeof xig);
        }
        FREE(inp_list, M_TEMP);

+       lck_rw_done(tcbinfo.mtx);

        return error;
 }
 
        return error;
 }
 


@@ -1103,7 +1154,7 @@ tcp_getcred(SYSCTL_HANDLER_ARGS)
                error = ENOENT;
                goto out;
        }
                error = ENOENT;
                goto out;
        }

-       error = SYSCTL_OUT(req, inp->inp_socket->so_cred, sizeof(struct ucred));
+       error = SYSCTL_OUT(req, inp->inp_socket->so_cred, sizeof(*(kauth_cred_t)0);

 out:
        splx(s);
        return (error);
 out:
        splx(s);
        return (error);


@@ -1150,7 +1201,7 @@ tcp6_getcred(SYSCTL_HANDLER_ARGS)
                goto out;
        }
        error = SYSCTL_OUT(req, inp->inp_socket->so_cred, 
                goto out;
        }
        error = SYSCTL_OUT(req, inp->inp_socket->so_cred, 

-                          sizeof(struct ucred));
+                          sizeof(*(kauth_cred_t)0);

 out:
        splx(s);
        return (error);
 out:
        splx(s);
        return (error);


@@ -1173,7 +1224,7 @@ tcp_ctlinput(cmd, sa, vip)
        struct in_addr faddr;
        struct inpcb *inp;
        struct tcpcb *tp;
        struct in_addr faddr;
        struct inpcb *inp;
        struct tcpcb *tp;

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

        tcp_seq icmp_seq;
        int s;
 
        tcp_seq icmp_seq;
        int s;
 


@@ -1196,21 +1247,25 @@ tcp_ctlinput(cmd, sa, vip)
        else if ((unsigned)cmd > PRC_NCMDS || inetctlerrmap[cmd] == 0)
                return;
        if (ip) {
        else if ((unsigned)cmd > PRC_NCMDS || inetctlerrmap[cmd] == 0)
                return;
        if (ip) {

-               s = splnet();

                th = (struct tcphdr *)((caddr_t)ip 
                                       + (IP_VHL_HL(ip->ip_vhl) << 2));
                inp = in_pcblookup_hash(&tcbinfo, faddr, th->th_dport,
                    ip->ip_src, th->th_sport, 0, NULL);
                if (inp != NULL && inp->inp_socket != NULL) {
                th = (struct tcphdr *)((caddr_t)ip 
                                       + (IP_VHL_HL(ip->ip_vhl) << 2));
                inp = in_pcblookup_hash(&tcbinfo, faddr, th->th_dport,
                    ip->ip_src, th->th_sport, 0, NULL);
                if (inp != NULL && inp->inp_socket != NULL) {

+                       tcp_lock(inp->inp_socket, 1, 0);
+                       if (in_pcb_checkstate(inp, WNT_RELEASE, 1) == WNT_STOPUSING) {
+                               tcp_unlock(inp->inp_socket, 1, 0);
+                               return;
+                       }

                        icmp_seq = htonl(th->th_seq);
                        tp = intotcpcb(inp);
                        if (SEQ_GEQ(icmp_seq, tp->snd_una) &&
                            SEQ_LT(icmp_seq, tp->snd_max))
                                (*notify)(inp, inetctlerrmap[cmd]);
                        icmp_seq = htonl(th->th_seq);
                        tp = intotcpcb(inp);
                        if (SEQ_GEQ(icmp_seq, tp->snd_una) &&
                            SEQ_LT(icmp_seq, tp->snd_max))
                                (*notify)(inp, inetctlerrmap[cmd]);

+                       tcp_unlock(inp->inp_socket, 1, 0);

                }
                }

-               splx(s);

        } else
        } else

-               in_pcbnotifyall(&tcb, faddr, inetctlerrmap[cmd], notify);
+               in_pcbnotifyall(&tcbinfo, faddr, inetctlerrmap[cmd], notify);

 }
 
 #if INET6
 }
 
 #if INET6


@@ -1221,7 +1276,7 @@ tcp6_ctlinput(cmd, sa, d)
        void *d;
 {
        struct tcphdr th;
        void *d;
 {
        struct tcphdr th;

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

        struct ip6_hdr *ip6;
        struct mbuf *m;
        struct ip6ctlparam *ip6cp = NULL;
        struct ip6_hdr *ip6;
        struct mbuf *m;
        struct ip6ctlparam *ip6cp = NULL;


@@ -1271,11 +1326,11 @@ tcp6_ctlinput(cmd, sa, d)
                bzero(&th, sizeof(th));
                m_copydata(m, off, sizeof(*thp), (caddr_t)&th);
 
                bzero(&th, sizeof(th));
                m_copydata(m, off, sizeof(*thp), (caddr_t)&th);
 

-               in6_pcbnotify(&tcb, sa, th.th_dport,
+               in6_pcbnotify(&tcbinfo, sa, th.th_dport,

                    (struct sockaddr *)ip6cp->ip6c_src,
                    th.th_sport, cmd, notify);
        } else
                    (struct sockaddr *)ip6cp->ip6c_src,
                    th.th_sport, cmd, notify);
        } else

-               in6_pcbnotify(&tcb, sa, 0, (struct sockaddr *)sa6_src,
+               in6_pcbnotify(&tcbinfo, sa, 0, (struct sockaddr *)sa6_src,

                              0, cmd, notify);
 }
 #endif /* INET6 */
                              0, cmd, notify);
 }
 #endif /* INET6 */


@@ -1586,6 +1641,7 @@ ipsec_hdrsiz_tcp(tp)
        if (!m)
                return 0;
 
        if (!m)
                return 0;
 

+       lck_mtx_lock(sadb_mutex);

 #if INET6
        if ((inp->inp_vflag & INP_IPV6) != 0) {
                ip6 = mtod(m, struct ip6_hdr *);
 #if INET6
        if ((inp->inp_vflag & INP_IPV6) != 0) {
                ip6 = mtod(m, struct ip6_hdr *);


@@ -1603,7 +1659,7 @@ ipsec_hdrsiz_tcp(tp)
        tcp_fillheaders(tp, ip, th);
        hdrsiz = ipsec4_hdrsiz(m, IPSEC_DIR_OUTBOUND, inp);
       }
        tcp_fillheaders(tp, ip, th);
        hdrsiz = ipsec4_hdrsiz(m, IPSEC_DIR_OUTBOUND, inp);
       }

-
+       lck_mtx_unlock(sadb_mutex);

        m_free(m);
        return hdrsiz;
 }
        m_free(m);
        return hdrsiz;
 }


@@ -1647,3 +1703,88 @@ static void
 tcp_cleartaocache()
 {
 }
 tcp_cleartaocache()
 {
 }

+
+int
+tcp_lock(so, refcount, lr)
+       struct socket *so;
+       int refcount;
+       int lr;
+{
+       int lr_saved;
+#ifdef __ppc__
+       if (lr == 0) {
+               __asm__ volatile("mflr %0" : "=r" (lr_saved));
+       }
+       else lr_saved = lr;
+#endif
+
+       if (so->so_pcb) {
+               lck_mtx_lock(((struct inpcb *)so->so_pcb)->inpcb_mtx);
+       }
+       else  {
+               panic("tcp_lock: so=%x NO PCB! lr=%x\n", so, lr_saved);
+               lck_mtx_lock(so->so_proto->pr_domain->dom_mtx);
+       }
+
+       if (so->so_usecount < 0)
+               panic("tcp_lock: so=%x so_pcb=%x lr=%x ref=%x\n",
+               so, so->so_pcb, lr_saved, so->so_usecount);
+
+       if (refcount)
+               so->so_usecount++;
+       so->reserved3 = (void *)lr_saved;
+       return (0);
+}
+
+int
+tcp_unlock(so, refcount, lr)
+       struct socket *so;
+       int refcount;
+       int lr;
+{
+       int lr_saved;
+#ifdef __ppc__
+       if (lr == 0) {
+               __asm__ volatile("mflr %0" : "=r" (lr_saved));
+       }
+       else lr_saved = lr;
+#endif
+
+#ifdef MORE_TCPLOCK_DEBUG
+       printf("tcp_unlock: so=%x sopcb=%x lock=%x ref=%x lr=%x\n", 
+               so, so->so_pcb, ((struct inpcb *)so->so_pcb)->inpcb_mtx, so->so_usecount, lr_saved);
+#endif
+       if (refcount)
+               so->so_usecount--;
+
+       if (so->so_usecount < 0)
+               panic("tcp_unlock: so=%x usecount=%x\n", so, so->so_usecount);  
+       if (so->so_pcb == NULL) {
+               panic("tcp_unlock: so=%x NO PCB usecount=%x lr=%x\n", so, so->so_usecount, lr_saved);
+               lck_mtx_unlock(so->so_proto->pr_domain->dom_mtx);
+       }
+       else {
+               lck_mtx_assert(((struct inpcb *)so->so_pcb)->inpcb_mtx, LCK_MTX_ASSERT_OWNED);
+               lck_mtx_unlock(((struct inpcb *)so->so_pcb)->inpcb_mtx);
+       }
+       so->reserved4 = (void *)lr_saved;
+       return (0);
+}
+
+lck_mtx_t *
+tcp_getlock(so, locktype)
+       struct socket *so;
+       int locktype;
+{
+       struct inpcb *inp = sotoinpcb(so);
+
+       if (so->so_pcb)  {
+               if (so->so_usecount < 0)
+                       panic("tcp_getlock: so=%x usecount=%x\n", so, so->so_usecount); 
+               return(inp->inpcb_mtx);
+       }
+       else {
+               panic("tcp_getlock: so=%x NULL so_pcb\n", so);
+               return (so->so_proto->pr_domain->dom_mtx);
+       }
+}