svn commit: r347677 - stable/11/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Thu May 16 09:27:13 2019
New Revision: 347677
URL: https://svnweb.freebsd.org/changeset/base/347677

Log:
  MFC r345494:
  
  Fix the handling of fragmented unordered messages when using DATA chunks
  and FORWARD-TSN.
  
  This bug was reported in https://github.com/sctplab/usrsctp/issues/286
  for the userland stack.
  
  This is joint work with rrs at .

Modified:
  stable/11/sys/netinet/sctp_indata.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/sctp_indata.c
==============================================================================
--- stable/11/sys/netinet/sctp_indata.c	Thu May 16 09:25:49 2019	(r347676)
+++ stable/11/sys/netinet/sctp_indata.c	Thu May 16 09:27:13 2019	(r347677)
@@ -945,6 +945,15 @@ sctp_inject_old_unordered_data(struct sctp_tcb *stcb,
 		SCTPDBG(SCTP_DEBUG_XXX,
 		    "chunk is a first fsn: %u becomes fsn_included\n",
 		    chk->rec.data.fsn);
+		at = TAILQ_FIRST(&control->reasm);
+		if (at && SCTP_TSN_GT(chk->rec.data.fsn, at->rec.data.fsn)) {
+			/*
+			 * The first chunk in the reassembly is a smaller
+			 * TSN than this one, even though this has a first,
+			 * it must be from a subsequent msg.
+			 */
+			goto place_chunk;
+		}
 		if (control->first_frag_seen) {
 			/*
 			 * In old un-ordered we can reassembly on one