From nobody Mon Aug 14 06:55:28 2023 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 4RPQC465Qwz4mX5J; Mon, 14 Aug 2023 06:55:28 +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 4RPQC459hFz3bCl; Mon, 14 Aug 2023 06:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691996128; 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=br/gX7EkQvJTA6MtT3coAZyAdpcsGFHiI8GQ64mi8LI=; b=GYl+I5AuwK9MHECEmQlYGmzoCDJd8oT6f+v1s1sWDqxxVt2YSvH6WablGKp+rNzDFZle7P iRbGXxKlh4ALdmNMBe4o0piXzaBoSVFELPmzAF4K7STba8jswnoOZiTTq2dKqqSAUFszA0 kz62K5vpH0I2gWnxjiyNi2gnR4GJFQFG7yy+sKRNtKejfnw3QAGGTZpaJRaGCd57D8pUhy DLwqc2R4BjGvq8QPjmJ2dlyGzTXKw0kD/pvw0T8nXLUUOni9y8BytfgqeOyxFQMuDe3Z8A RXfek6WhNxNqa8Y+mvsmwRFTruLOcYnm3R90pGZ0EOE0oysZ37Hh+hzspOvCYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691996128; 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=br/gX7EkQvJTA6MtT3coAZyAdpcsGFHiI8GQ64mi8LI=; b=U79+unJ20Sqju/G+8v+u+RXMuqKorkrCj1YuUSjE8KFiTbxjxPDeDlmkhz86YMK8hzqbor GOyGFrzb4+bX6SzRZrI4nySqbf7ibkLKfCX7QeucI/wsstojsageQklPTHZ6zzTrt6qU0N zpTiEIjQVlxpGGMUVme0usMHPqIVFrMyYeXE48jeYjDEmz6VAJ63uasOIxLXbkrK6SE13v c1kFyUeoAb/CjqOG+M8nEt5dXbUUa2B9XhRIWDCLUGK4h9aw48MKCNugx+bBQUgD1E/72d E9I5bOhI3GvZBGrR5xxhl1AwWnheTMGjM+3M8/QK6vTiuXttagwhfqi9s0XMVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691996128; a=rsa-sha256; cv=none; b=IzWn++oGt5jBfG09PCB+/Ejcp2WgqjZFLq64S6ph/hAo3u3Bfulkwymz8+BD0l++Jqxtb5 Y5MyBAkhD52JB9/bDCLsY5YKOFuGI+1Ln/BIpL3wkSEySObflbu0kLzuL2urpAAyLIkdkA 4UEHvVnwr8TSaCE1z0NbD96R2auPV6Q2kXA0bpn7eqIIqiZoirNE1/bhiNOjGfdm+THoHQ PS/XCq9n9nV9qYH8SlKUlrjzsastdqMOEP9vhfJSdkrgv+xxgnhQBLeUbM0dswsxDsxIdV ehIsj+l3y4hSCNRczmXrGRr1Z83MlJxpir8W2NI0ubndRyiRlVDT0ZgBZoGa3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RPQC44Cygz43N; Mon, 14 Aug 2023 06:55:28 +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 37E6tS6F061760; Mon, 14 Aug 2023 06:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37E6tS4C061757; Mon, 14 Aug 2023 06:55:28 GMT (envelope-from git) Date: Mon, 14 Aug 2023 06:55:28 GMT Message-Id: <202308140655.37E6tS4C061757@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: e8eb0b713426 - main - 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/main X-Git-Reftype: branch X-Git-Commit: e8eb0b713426fe9edbf56719351850fa9469286a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e8eb0b713426fe9edbf56719351850fa9469286a commit e8eb0b713426fe9edbf56719351850fa9469286a Author: Michael Tuexen AuthorDate: 2023-08-13 20:47:43 +0000 Commit: Michael Tuexen CommitDate: 2023-08-13 20:47:43 +0000 sctp: add an assert This enforces a condition mentioned in a comment. MFC after: 1 week --- 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 136a2285c6d7..f85cf99a43fe 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3640,7 +3640,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) @@ -3656,6 +3655,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 */