svn commit: r299744 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat May 14 13:44:49 2016
New Revision: 299744
URL: https://svnweb.freebsd.org/changeset/base/299744

Log:
  Fix a locking bug which only shows up on Mac OS X.
  
  MFC after: 1 week

Modified:
  head/sys/netinet/sctp_indata.c

Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c	Sat May 14 10:39:57 2016	(r299743)
+++ head/sys/netinet/sctp_indata.c	Sat May 14 13:44:49 2016	(r299744)
@@ -559,7 +559,7 @@ protocol_error:
 		sctp_add_to_readq(stcb->sctp_ep, stcb,
 		    control,
 		    &stcb->sctp_socket->so_rcv, 1,
-		    SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED);
+		    SCTP_READ_LOCK_NOT_HELD, SCTP_SO_LOCKED);
 		TAILQ_FOREACH_SAFE(control, &strm->inqueue, next_instrm, at) {
 			/* all delivered */
 			nxt_todel = strm->last_sequence_delivered + 1;
@@ -592,7 +592,7 @@ protocol_error:
 				    control,
 				    &stcb->sctp_socket->so_rcv, 1,
 				    SCTP_READ_LOCK_NOT_HELD,
-				    SCTP_SO_NOT_LOCKED);
+				    SCTP_SO_LOCKED);
 				continue;
 			} else if (nxt_todel == control->sinfo_ssn) {
 				*need_reasm = 1;