From nobody Thu Aug 01 21:05:33 2024 X-Original-To: dev-commits-src-branches@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 4WZhM130cFz5RS2H; Thu, 01 Aug 2024 21:05:33 +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 4WZhM128ZBz4Q7Q; Thu, 1 Aug 2024 21:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722546333; 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=v7DXbapQQs5fVltH4+rxX4UKSwxbGVShnK+jxlMrur0=; b=gzyk3OsNJbxta2hDJMJlniBjEpmkxYzU/HDFSBIl2mRlB+gSR5xoaK50FNpW2VSPARZi2z UHjuZf1citSU3t0WK8IRhjP5j/aCoNHbBTcWDjE1AKBaO8UIBo2dp7aWPessjDQ6jEE9in DsVCl00ImxHbDsPymjY0HNVkiM/PgIZo5QddC7zk+yMqFEy+mwdJVlHYVQ9WxtwHm1TOqQ 6CypShCED9Ke2dvCZAxqGbhVj9/rDVJu/bq2Lcxo/L6Sqy5vINnEpqDc9eHBqVW2KFChdt ff8ULQCgHwiqrv/EJ8j98V59QI6A8R5qTQpy3Inex8TOeI6oNOKpRUYkP7vfqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722546333; a=rsa-sha256; cv=none; b=l6800jdZB+dqmRUUYDc0enLc7+nhh1UklYvl7AVZCjTl2DDdiJKaqNazu5HZmcyJn7AmUh Ai3CAZXHjBq3x6hgiKpi1riWG2RYgeVWYgOIFpxsJUX80FUOsQdkJtHQ+uiSv6MKSWDHll i9AkIDIRM3+eGQJ5hWKS51uQ8kYMT72cFrm0m/XkpZXAvOo54cTCUPaLS83s8vTCnyyK6h M0aKe0MNkHDP1l+0/KYaEuP9Jd0si4rOCPmh0ucR3dvHZ8xpR18RqkIW5K4wnvIUC9cmaa ZE4n7CV8OHl08hCwkukWA00EbM1DBlBtSg0AIX4aiPf2kaFDGUdpmsFwkws3ug== 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=1722546333; 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=v7DXbapQQs5fVltH4+rxX4UKSwxbGVShnK+jxlMrur0=; b=Gq1MckTc/3JywGB+m7LtW1J7GIAWkNUklhh2CcF2z6vPJhDs9ioYn1/NvxNomQvCA4ZL15 xl3NbJTq76+cfwL73eJ++9eBDilLZM9bX6jtME1AM3NRp4UiytzwpJSDei85a+XiEKU6Dp N8Jrv1ialRYNQLQc0Z98e9NqfpCxKYnTWvcjqqkbW+8UF818N5GHqMLHex63UMf5VXkEFo zcOByYEI5/foTpWGxQp374T5Gc3jRUZrhtkAvaE/LZRqw9qFOIXXWk5y6QYgRBFMbpweSx eVOljPnIlbEIi668e7jhl5cFUagoBheTdv/g1E+2M56fr/bCtYNJidxYaJKM+Q== 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 4WZhM11kmbz10pp; Thu, 1 Aug 2024 21:05:33 +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 471L5XQn090569; Thu, 1 Aug 2024 21:05:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471L5Xfq090566; Thu, 1 Aug 2024 21:05:33 GMT (envelope-from git) Date: Thu, 1 Aug 2024 21:05:33 GMT Message-Id: <202408012105.471L5Xfq090566@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: 8dca32bcccaa - stable/13 - sctp: minor cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 8dca32bcccaa02f1dceb20944a74c7bf1623241b Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8dca32bcccaa02f1dceb20944a74c7bf1623241b commit 8dca32bcccaa02f1dceb20944a74c7bf1623241b Author: Michael Tuexen AuthorDate: 2024-05-08 22:51:09 +0000 Commit: Michael Tuexen CommitDate: 2024-08-01 21:04:57 +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)) {