xnu-201.14.tar.gz

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

diff --git a/bsd/kern/uipc_socket.c b/bsd/kern/uipc_socket.c
index 669d3487467e0fbb1cd704f7457afcbc33f9c0b7..f8fbf313db763867d15f8d2beab64d5dd1416eb6 100644 (file)
--- a/bsd/kern/uipc_socket.c
+++ b/bsd/kern/uipc_socket.c
@@ -461,7 +461,7 @@ solisten(so, backlog)
                splx(s);
                return (error);
        }
                splx(s);
                return (error);
        }

-       if (so->so_comp.tqh_first == NULL)
+        if (TAILQ_EMPTY(&so->so_comp))

                so->so_options |= SO_ACCEPTCONN;
        if (backlog < 0 || backlog > somaxconn)
                backlog = somaxconn;
                so->so_options |= SO_ACCEPTCONN;
        if (backlog < 0 || backlog > somaxconn)
                backlog = somaxconn;


@@ -497,28 +497,43 @@ sofree(so)
        while (kp)
        {       if (kp->e_soif && kp->e_soif->sf_sofree)
                {       error = (*kp->e_soif->sf_sofree)(so, kp);
        while (kp)
        {       if (kp->e_soif && kp->e_soif->sf_sofree)
                {       error = (*kp->e_soif->sf_sofree)(so, kp);

-                       if (error)
+                       if (error) {
+                               selthreadclear(&so->so_snd.sb_sel);
+                               selthreadclear(&so->so_rcv.sb_sel);

                                return; /* void fn */
                                return; /* void fn */

+                       }

                }
                kp = kp->e_next;
        }
 
                }
                kp = kp->e_next;
        }
 

-       if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
+       if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) {
+               selthreadclear(&so->so_snd.sb_sel);
+               selthreadclear(&so->so_rcv.sb_sel);

                return;
                return;

-       if (head != NULL) {
-               if (so->so_state & SS_INCOMP) {
-                       TAILQ_REMOVE(&head->so_incomp, so, so_list);
-                       head->so_incqlen--;
-               } else if (so->so_state & SS_COMP) {
-                       TAILQ_REMOVE(&head->so_comp, so, so_list);
-               } else {
-                       panic("sofree: not queued");
-               }
+       }
+        if (head != NULL) {
+                if (so->so_state & SS_INCOMP) {  
+                        TAILQ_REMOVE(&head->so_incomp, so, so_list);
+                        head->so_incqlen--;
+                } else if (so->so_state & SS_COMP) {
+                        /*
+                         * We must not decommission a socket that's   
+                         * on the accept(2) queue.  If we do, then
+                         * accept(2) may hang after select(2) indicated
+                         * that the listening socket was ready.
+                         */
+                                               selthreadclear(&so->so_snd.sb_sel);
+                                               selthreadclear(&so->so_rcv.sb_sel);
+                        return;
+                } else {
+                        panic("sofree: not queued");
+                }

                head->so_qlen--;
                so->so_state &= ~(SS_INCOMP|SS_COMP);
                so->so_head = NULL;
        }
 
                head->so_qlen--;
                so->so_state &= ~(SS_INCOMP|SS_COMP);
                so->so_head = NULL;
        }
 

+       selthreadclear(&so->so_snd.sb_sel);

        sbrelease(&so->so_snd);
        sorflush(so);
        sfilter_term(so);
        sbrelease(&so->so_snd);
        sorflush(so);
        sfilter_term(so);


@@ -556,14 +571,21 @@ soclose(so)
        if (so->so_options & SO_ACCEPTCONN) {
                struct socket *sp, *sonext;
 
        if (so->so_options & SO_ACCEPTCONN) {
                struct socket *sp, *sonext;
 

-               for (sp = so->so_incomp.tqh_first; sp != NULL; sp = sonext) {
-                       sonext = sp->so_list.tqe_next;
-                       (void) soabort(sp);
-               }
-               for (sp = so->so_comp.tqh_first; sp != NULL; sp = sonext) {
-                       sonext = sp->so_list.tqe_next;
-                       (void) soabort(sp);
-               }
+                sp = TAILQ_FIRST(&so->so_incomp);
+                for (; sp != NULL; sp = sonext) {
+                        sonext = TAILQ_NEXT(sp, so_list);
+                        (void) soabort(sp);
+                }
+                for (sp = TAILQ_FIRST(&so->so_comp); sp != NULL; sp = sonext) {
+                        sonext = TAILQ_NEXT(sp, so_list);
+                        /* Dequeue from so_comp since sofree() won't do it */
+                        TAILQ_REMOVE(&so->so_comp, sp, so_list);
+                        so->so_qlen--;
+                        sp->so_state &= ~SS_COMP;
+                        sp->so_head = NULL;
+                        (void) soabort(sp);
+                }
+

        }
        if (so->so_pcb == 0)
                goto discard;
        }
        if (so->so_pcb == 0)
                goto discard;


@@ -592,7 +614,7 @@ drop:
                        error = error2;
        }
 discard:
                        error = error2;
        }
 discard:

-       if (so->so_state & SS_NOFDREF)
+       if (so->so_pcb && so->so_state & SS_NOFDREF)

                panic("soclose: NOFDREF");
        so->so_state |= SS_NOFDREF;
        so->so_proto->pr_domain->dom_refs--;
                panic("soclose: NOFDREF");
        so->so_state |= SS_NOFDREF;
        so->so_proto->pr_domain->dom_refs--;


@@ -1493,6 +1515,7 @@ sorflush(so)
        s = splimp();
        socantrcvmore(so);
        sbunlock(sb);
        s = splimp();
        socantrcvmore(so);
        sbunlock(sb);

+       selthreadclear(&sb->sb_sel);

        asb = *sb;
        bzero((caddr_t)sb, sizeof (*sb));
        splx(s);
        asb = *sb;
        bzero((caddr_t)sb, sizeof (*sb));
        splx(s);


@@ -1868,9 +1891,7 @@ sohasoutofband(so)
                gsignal(-so->so_pgid, SIGURG);
        else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0)
                psignal(p, SIGURG);
                gsignal(-so->so_pgid, SIGURG);
        else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0)
                psignal(p, SIGURG);

-       thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);

        selwakeup(&so->so_rcv.sb_sel);
        selwakeup(&so->so_rcv.sb_sel);

-       thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);

 }
 
 /*
 }
 
 /*


@@ -1934,7 +1955,7 @@ sfilter_term(struct socket *so)
 
 
 int
 
 
 int

-sopoll(struct socket *so, int events, struct ucred *cred)
+sopoll(struct socket *so, int events, struct ucred *cred, void * wql)

 {
        struct proc *p = current_proc();
        int revents = 0;
 {
        struct proc *p = current_proc();
        int revents = 0;


@@ -1954,13 +1975,13 @@ sopoll(struct socket *so, int events, struct ucred *cred)
 
        if (revents == 0) {
                if (events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
 
        if (revents == 0) {
                if (events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {

-                       selrecord(p, &so->so_rcv.sb_sel);

                        so->so_rcv.sb_flags |= SB_SEL;
                        so->so_rcv.sb_flags |= SB_SEL;

+                       selrecord(p, &so->so_rcv.sb_sel, wql);

                }
 
                if (events & (POLLOUT | POLLWRNORM)) {
                }
 
                if (events & (POLLOUT | POLLWRNORM)) {

-                       selrecord(p, &so->so_snd.sb_sel);

                        so->so_snd.sb_flags |= SB_SEL;
                        so->so_snd.sb_flags |= SB_SEL;

+                       selrecord(p, &so->so_snd.sb_sel, wql);

                }
        }
 
                }
        }