From nobody Thu Jan 11 12:41:24 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 4T9kn110Wrz55dWn; Thu, 11 Jan 2024 12:41:25 +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 4T9kn10Rrxz46Rc; Thu, 11 Jan 2024 12:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704976885; 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=vKmv9v4iCPYvdHl1QzSy/sONMP+Un45yIlLtzehRqZ4=; b=d9i0p/+siH6ueUO2SGaEOe/9jCTMcDkl+VjdnI9joepsgjByrCuhv9vZjRGXnkcr1Gv2lB 7ivk7Jp2+cSTLfVZLKOhTsAjIyfWSv44sm4ccWDjREwTJAF61ti2BevKHwzUaw+9TCpjJn 16ICSO09kMk8w0CeLZ98SOdkmKKddRfEnxghh74r5AQ1vUADg6c2w1uaYSXTu+2PMUlyKK 7e26a5wvglvBfrZ7d8ss5fEazNKN+BjaFLjURAmUyVC89fOkwT54RN6DQ+byfA+QaTv/Xt jWvvuv+dVSwpjnXB9ax3SC+/Uis5XM7zZ7r2FrojZlk5ETVCLgQjHKlBo1B62w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704976885; 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=vKmv9v4iCPYvdHl1QzSy/sONMP+Un45yIlLtzehRqZ4=; b=dM1F627AspEJaTPzTq76bNhT3RIpagdT3VcNQaRduZpabM1nUdKZRy/K1gjphpTOr6bfhD 9tE33TZC3yBHUu4yVG1Vj+FUDCQ/sUSmpbCBbKmlK8X14/R4AnWUOxeTk4wobhYCHQJyC/ kpdFWn7kLqqgw7fU8DK+8Q5an25L2FIyhatTEUEmQ5bdmn6W6qlHs6k1AbEyiOd5E4Q8vh +OmjGNqfGdJ5TDXMhZfjM9H0KEvxwVajQkdMt1nIvBd/h+AiHUe+IgWt9qKYLxk8ypNuLC E23LRsTeJPr9wmA/M9/aLvaCWpwZ56wRL0PJAGRjA4AEe7F6LbN6iohoeJhxSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704976885; a=rsa-sha256; cv=none; b=m1bMgKyQYj4AV2i4UbiWNyFahSB3xCib9uocRIKQsr8zyJeTZB+5PuXvVPqSnVhRrDBPsi /5vrvGGwXaUxKKqEG3OdzynyrMH5xnPM9l8/MQyjwkMEMZ56Mc9KcEoFBdxw2pPZaPL2LX ZIHQCRsayMLzSQT1eLdblJ5LKykl8z8OkwpBWeaRYUuxJrf8pXhwrDL6Q89adX6TvYq4/X fCutChejGhHRTHdNHXSQIQDm0RvbY+2YDo4xrlRtJMDMi0JwcGLrsS8WobpuO1Q9anHOv+ tJUu3CMFU4LaylAmS4dfZjkOoijQnZOT4JlqqMG1G9+mAVxZkon7CO1H+Bqs/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 4T9kn06c77zJqd; Thu, 11 Jan 2024 12:41:24 +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 40BCfOBQ030922; Thu, 11 Jan 2024 12:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCfO3T030919; Thu, 11 Jan 2024 12:41:24 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:41:24 GMT Message-Id: <202401111241.40BCfO3T030919@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: ecfe48f28a40 - stable/13 - sctp: add an assert 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: ecfe48f28a40700f4950c2e5bd21ebc49b942bf4 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ecfe48f28a40700f4950c2e5bd21ebc49b942bf4 commit ecfe48f28a40700f4950c2e5bd21ebc49b942bf4 Author: Michael Tuexen AuthorDate: 2023-08-13 20:47:43 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:40:56 +0000 sctp: add an assert This enforces a condition mentioned in a comment. (cherry picked from commit e8eb0b713426fe9edbf56719351850fa9469286a) --- sys/netinet/sctputil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 72edf4dd66c9..e21fbe041291 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3636,7 +3636,6 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb) &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); } -/* This always must be called with the read-queue LOCKED in the INP */ static void sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, uint32_t val, int so_locked) @@ -3652,6 +3651,8 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, return; } + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) /* no space left */