Date: Tue, 13 Jul 2021 18:30:41 GMT From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 9e8d5ea2b557 - stable/13 - sctp: provide consistent stream information in case of early errors Message-ID: <202107131830.16DIUfK1059871@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8d5ea2b5579eee381375bb10a40b6c7197f1d6 commit 9e8d5ea2b5579eee381375bb10a40b6c7197f1d6 Author: Michael Tuexen <tuexen@FreeBSD.org> AuthorDate: 2021-07-09 12:15:22 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> CommitDate: 2021-07-13 18:30:21 +0000 sctp: provide consistent stream information in case of early errors While there, make sure the function is called correctly. (cherry picked from commit ce64352a702db1fef8c0e33f3a6f13a3e5d92736) --- sys/netinet/sctputil.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 1f909fa1d8d4..21e49bdfcb23 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3163,6 +3163,8 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, uint16_t abort_len; unsigned int i; + KASSERT((abort == NULL) || (from_peer != 0), + ("sctp_notify_assoc_change: ABORT chunk provided for local termination")); if (stcb == NULL) { return; } @@ -3202,9 +3204,13 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, sac->sac_length = sizeof(struct sctp_assoc_change); sac->sac_state = state; sac->sac_error = error; - /* XXX verify these stream counts */ - sac->sac_outbound_streams = stcb->asoc.streamoutcnt; - sac->sac_inbound_streams = stcb->asoc.streamincnt; + if (state == SCTP_CANT_STR_ASSOC) { + sac->sac_outbound_streams = 0; + sac->sac_inbound_streams = 0; + } else { + sac->sac_outbound_streams = stcb->asoc.streamoutcnt; + sac->sac_inbound_streams = stcb->asoc.streamincnt; + } sac->sac_assoc_id = sctp_get_associd(stcb); if (notif_len > sizeof(struct sctp_assoc_change)) { if ((state == SCTP_COMM_UP) || (state == SCTP_RESTART)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107131830.16DIUfK1059871>