Author: tuexen
Date: Wed Feb 27 19:51:47 2013
New Revision: 247412
URL: http://svnweb.freebsd.org/changeset/base/247412

Log:
  Fix a potential race in returning setting errno when an
  association goes down.
  Reported by Mozilla in
  https://bugzilla.mozilla.org/show_bug.cgi?id=845513
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Wed Feb 27 19:50:46 2013        (r247411)
+++ head/sys/netinet/sctputil.c Wed Feb 27 19:51:47 2013        (r247412)
@@ -2678,6 +2678,7 @@ set_error:
        if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
            (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) &&
            ((state == SCTP_COMM_LOST) || (state == SCTP_CANT_STR_ASSOC))) {
+               SOCK_LOCK(stcb->sctp_socket);
                if (from_peer) {
                        if (SCTP_GET_STATE(&stcb->asoc) == 
SCTP_STATE_COOKIE_WAIT) {
                                SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, 
SCTP_FROM_SCTPUTIL, ECONNREFUSED);
@@ -2709,7 +2710,7 @@ set_error:
        if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
            (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) &&
            ((state == SCTP_COMM_LOST) || (state == SCTP_CANT_STR_ASSOC))) {
-               socantrcvmore(stcb->sctp_socket);
+               socantrcvmore_locked(stcb->sctp_socket);
        }
        sorwakeup(stcb->sctp_socket);
        sowwakeup(stcb->sctp_socket);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to