From nobody Thu May 09 15:55:34 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 4VZxS641XDz5Jybn; Thu, 09 May 2024 15:55:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VZxS63WRsz4H7G; Thu, 9 May 2024 15:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715270134; 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=umtrogU33L1AfPuudF5feyJ5DaG8P6t5ixC64fvzM9Q=; b=mpIgPllODOy/UCwHPNRr+sp2bDUdfXZirlwZA1Oa5/kbwbwwi94i3wO3nIOTE9rWalMB7z A4MyhSlG92dTu8gjax0PyQOdKqn3uZdkiAm7Ui0RZfmJ1TKhuQX91am0eu9cWlQMNkpHfd d98am+/F12fWxbFKUWPIz+QB4tlwO8Wr66rh7DlaEvOA0dZKjsWY2spUgj5YPi81P7qYcP a9d+w9LaNGbtijaSPXbYGCmWSvw2tVmMuDV2lcUs9mhD/mOFgi2433sHA/yRVfHImjoqLy Bszsx7dRwuQHyop+XnFSOVEk+XOXWTh76MGjY34yJ4RoLiAELNfaTfGtyJc83Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715270134; a=rsa-sha256; cv=none; b=l9dx+xYZHLrlVmmtUTkg4h+GDzMuqd5/zjsN9ZSKVfY0vOba+cBcIR+NkA6pQ71t1WQnfM kySQrupYu4fnzIq7IZiokBVEmQVc1AUhMPPri6zcmakEh6A/fRCVQLONTiKTmAyr4zsrqP kL4pjH2W7Um78945jk9BWHmrw+4WkG1Vfn/ZkDn6SnoaEClgoarSGILoZeSki5nBHKtbRc CpxWUeFYj0uqH1hR/yLgvqZ+tvlf2ltIRlMUD4xCfYKSIZ3G6lBeJ5d/0G8oyR0tc3YV94 WEi83s3SSU90kI42wirvbnhakQhjnZ5VSdudMClcB6QFogbSPMkCceE2gNC4GQ== 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=1715270134; 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=umtrogU33L1AfPuudF5feyJ5DaG8P6t5ixC64fvzM9Q=; b=WYiEkHXAzdYdOvRlm9Txxi6GkX9y+hqYiBPXQv2toj5Inw+F+jBXggzAnUDG+udeh3j93G M3YDyWym92ZE+/lAc61c8Lq3m/f97TjTHokXGrme8LMfCGu7VM20BvpE5e7WSoQEyHv3ij XQw7H4kIgMifDT+ikqW4d1UUShcL1cPHGV72V5Z8SOr9p1fcxbf9dlJal+MdYLkcCuFLLj YQ8xH/M2pV2umQ3GJTpiQFJ0Ru75NKhQkuskxZHuOT8awzOdgYoVmzUAluHCB2g3kpvLW/ 8Gp1aXR9bp+HwGIg7caG7KB1rnyzCUfb7SaCiFGlQM2R5U50DXdzw/uVIHSkAQ== 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 4VZxS636qQz1DhJ; Thu, 9 May 2024 15:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 449FtYhA002304; Thu, 9 May 2024 15:55:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 449FtYPh002301; Thu, 9 May 2024 15:55:34 GMT (envelope-from git) Date: Thu, 9 May 2024 15:55:34 GMT Message-Id: <202405091555.449FtYPh002301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 0d15140d6d34 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0d15140d6d3470db45d823e4f3a5ec05693b097d Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0d15140d6d3470db45d823e4f3a5ec05693b097d commit 0d15140d6d3470db45d823e4f3a5ec05693b097d Author: Michael Tuexen AuthorDate: 2024-05-08 22:51:09 +0000 Commit: Michael Tuexen CommitDate: 2024-05-08 22:51:09 +0000 sctp: minor cleanup No functional chnage intended. MFC after: 3 days --- 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)) {