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

[Michael Tuexen]

Author: tuexen
Date: Mon May 25 20:09:18 2020
New Revision: 361472
URL: https://svnweb.freebsd.org/changeset/base/361472

Log:
  MFC 360885: Improve SCTP iterator
  
  Ensure that the SCTP iterator runs with an stcb and inp, which belong to
  each other.

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

Modified: stable/11/sys/netinet/sctputil.c
==============================================================================
--- stable/11/sys/netinet/sctputil.c	Mon May 25 20:07:23 2020	(r361471)
+++ stable/11/sys/netinet/sctputil.c	Mon May 25 20:09:18 2020	(r361472)
@@ -1409,6 +1409,7 @@ select_a_new_ep:
 		}
 		tinp = it->inp;
 		it->inp = LIST_NEXT(it->inp, sctp_list);
+		it->stcb = NULL;
 		SCTP_INP_RUNLOCK(tinp);
 		if (it->inp == NULL) {
 			goto done_with_iterator;
@@ -1478,6 +1479,9 @@ select_a_new_ep:
 			atomic_add_int(&it->stcb->asoc.refcnt, -1);
 			iteration_count = 0;
 		}
+		KASSERT(it->inp == it->stcb->sctp_ep,
+		        ("%s: stcb %p does not belong to inp %p, but inp %p",
+		         __func__, it->stcb, it->inp, it->stcb->sctp_ep));
 
 		/* run function on this one */
 		(*it->function_assoc) (it->inp, it->stcb, it->pointer, it->val);
@@ -1510,6 +1514,7 @@ no_stcb:
 	} else {
 		it->inp = LIST_NEXT(it->inp, sctp_list);
 	}
+	it->stcb = NULL;
 	if (it->inp == NULL) {
 		goto done_with_iterator;
 	}