svn commit: r364584 - stable/12/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Sun Aug 23 22:52:48 UTC 2020
Author: tuexen
Date: Sun Aug 23 22:52:47 2020
New Revision: 364584
URL: https://svnweb.freebsd.org/changeset/base/364584
Log:
MFC r360885:
Ensure that the SCTP iterator runs with an stcb and inp, which belong to
each other.
Modified:
stable/12/sys/netinet/sctputil.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/netinet/sctputil.c
==============================================================================
--- stable/12/sys/netinet/sctputil.c Sun Aug 23 22:50:59 2020 (r364583)
+++ stable/12/sys/netinet/sctputil.c Sun Aug 23 22:52:47 2020 (r364584)
@@ -1486,6 +1486,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;
@@ -1555,6 +1556,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);
@@ -1587,6 +1591,7 @@ no_stcb:
} else {
it->inp = LIST_NEXT(it->inp, sctp_list);
}
+ it->stcb = NULL;
if (it->inp == NULL) {
goto done_with_iterator;
}
More information about the svn-src-all
mailing list