From nobody Sat Aug 03 22:25:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wby1x0lT9z5RRwM; Sat, 03 Aug 2024 22:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wby1w6r5rz4FrJ; Sat, 3 Aug 2024 22:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722723909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3G0aF+WucEAqPYKQYIUl9wiKh9NN1o9lw7kHIh7fyO4=; b=Fog3xMeEgTJ77ZSHQIyu2i8rFg4vvpZh5vBivCcXf/QvUJ3lUdMXkdKEbcv4vSW77RToCT n5veBL+FDHILiKix1qnvoxSH70EbT47XtJHaHw9ovkrcs1SxIiabWPafxIRWpDLiJ5Ts58 HWrbDZt3JhQpfChDyxJfCcIQTUL5xvBd3IZKPVnTxDQ1NaAMTS7/89+E1MTh6bqpzQm3nR KhkVZVdly+4JLrTN4HOjx2sf3NInsVpgZTYLU13XnI9zAHkX5/coRk/eyf4Oae0xtNOldh nnMaEPGRfSlTGqGnMQnLsOz4JhA6tWxZFopZ4oU8aK3rbql7otjWrgB5butOpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722723909; a=rsa-sha256; cv=none; b=oNwoDoA5ddtPvrX2py4SSF2Cg9rWbGWd3zszXynNriv5yLz8en+yfvwkIQ0+v2oVQ0Z/OR 4g0qSpfnGk1Y3IezsL4sVGbTru+JpnrnflxjTjQcRr0DVLyS7NI/rn/MNwxHNAJ3hru+a8 ducASdwUVFPiEQJxz6S2kv6au0tOJAkwaJi3F75jLwoz7g3MCJXPSqwqXwjaGx8slwqoQG DbkX6DOfMGz38dghn5GtbPKzQ3eLRvCuoMRc9j23gweS3vHc7lGjSekmORP2Zh3xUQFw87 ro7A7gVAO/76QyuFctRSo1+GxW1TixBqk3bxm19ibUWm4CDJEgovHxQ0RtXnxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722723909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3G0aF+WucEAqPYKQYIUl9wiKh9NN1o9lw7kHIh7fyO4=; b=pOpoqt1MF8kkZsXa6PPKdt4V78bTVpkSBcugdTtiqHAy9w7W5lCYLaIsQqe5AbX/r3qYlU MEfATyVlkA/pz+N+02OMtp0XnVdgPDrB3ZXtMy4VKmG3IkWJm8ghN7FWaoBB9iUCPYYSqM P91wohPfn4J2Egxi8DEexk7XkjdjPbs2484TA8ih3r2DJL39GzXiG9OAyWrrNuh/y/73XJ Tg6lFr4QOIswyme7jnwH4nATYkhK59UiB6fPnOYkcYiguo8THkbRDSrRPBSto6DB5zRlMq J95suKer5RBA+wo0MIQb4zG4yJTpixOoVJ5EZ9kk219yzto9LPb2ZY7oRNkGdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wby1w5vmkzSyh; Sat, 3 Aug 2024 22:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 473MP8o0026025; Sat, 3 Aug 2024 22:25:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473MP8Y4026022; Sat, 3 Aug 2024 22:25:08 GMT (envelope-from git) Date: Sat, 3 Aug 2024 22:25:08 GMT Message-Id: <202408032225.473MP8Y4026022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: df07f0ce9195 - stable/14 - sctp: minor cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df07f0ce9195ed044374e48dcfe7a21b875ed742 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=df07f0ce9195ed044374e48dcfe7a21b875ed742 commit df07f0ce9195ed044374e48dcfe7a21b875ed742 Author: Michael Tuexen AuthorDate: 2024-05-08 22:51:09 +0000 Commit: Michael Tuexen CommitDate: 2024-08-03 22:24:54 +0000 sctp: minor cleanup No functional chnage intended. (cherry picked from commit 0d15140d6d3470db45d823e4f3a5ec05693b097d) --- sys/netinet/sctp_indata.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index a30fd95fef30..4c40e0de4326 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -5241,6 +5241,10 @@ sctp_kick_prsctp_reorder_queue(struct sctp_tcb *stcb, uint32_t mid; int need_reasm_check = 0; + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + asoc = &stcb->asoc; mid = strmin->last_mid_delivered; /* @@ -5278,11 +5282,9 @@ sctp_kick_prsctp_reorder_queue(struct sctp_tcb *stcb, /* deliver it to at least the delivery-q */ if (stcb->sctp_socket) { sctp_mark_non_revokable(asoc, control->sinfo_tsn); - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, - 1, SCTP_READ_LOCK_HELD, - SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_HELD, SCTP_SO_NOT_LOCKED); } } else { /* Its a fragmented message */ @@ -5352,8 +5354,7 @@ sctp_kick_prsctp_reorder_queue(struct sctp_tcb *stcb, strmin->last_mid_delivered = control->mid; if (stcb->sctp_socket) { sctp_mark_non_revokable(asoc, control->sinfo_tsn); - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_HELD, SCTP_SO_NOT_LOCKED); } @@ -5394,6 +5395,11 @@ sctp_flush_reassm_for_str_seq(struct sctp_tcb *stcb, * it can be delivered... But for now we just dump everything on the * queue. */ + + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + if (!asoc->idata_supported && !ordered && control->first_frag_seen && SCTP_TSN_GT(control->fsn_included, cumtsn)) {