From nobody Tue Aug 25 16:00:59 2026 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 4hTsvc28vxz6pbRw for ; Tue, 25 Aug 2026 16:01:00 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTsvb4zH4z43vM for ; Tue, 25 Aug 2026 16:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KQ/aRTYlBYdvRxLUp7ac+1Iyg5ADskT8VnGN3AxrOWg=; b=h1vtn2lQHHIRGxRD4nLYcECkdm1h2ww/+prYtvuuNedMEVaQYtzLm7ID2Xu7ZTvZwGVAV1 srZDItSzLi9dQMgsyuJ9sf+mhmjQhbYm5ZynM8MnisOA2O4FcuPfnh2NIeCIKW0DBNzkEh 7sb2HqwB2jll8wujFycpJQ0LWRw5Aic3dxRKFU+qUVO9MNXCC4IVWp0FlgOhXNw3E/cv8Q ELP8KG/zNiGeSQqqqSN1sYnPO3Z66oduK6w9B/ISH16Mgqjik1WkWAd98V16Wqy6WYzP/9 iaB8MfB2aHWZqDrGy8QNqreYBFWqUcEYVzS2Ek3VR36JyuhUjZpQLbZjGeU7Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673659; a=rsa-sha256; cv=none; b=B1m3i44FR/+8BeH1QPpZZTei6tIqj7U0vlvyhPgTezmxMeyuiKo60wQysERP/WJvbe5Xd4 ermNAsurueGymbBzvw0bq4ZE2rJa4WrvoZq/MWYEpfHM1spnqmwm6Q2iJUP36BOP8hyNgL 2+HDo/amEiDlS2KcvfCuMuT0Nnhv+XJW83koqxJRzwsbWT/+GACK49ohiyXZcaMhsCb/dC CDmqsjr9+Lb2u/Onez/dw8VLwkzWdNgCl2myFmkpJjRwAFWy84U+/VOLFHU22G0Ghpt404 4UqvaiuEiW6+8PmcNoM83S2x3pJQAJXAYKeZKC0qgGJTey0PSHKH2SSgBRtmeA== 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=1787673659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KQ/aRTYlBYdvRxLUp7ac+1Iyg5ADskT8VnGN3AxrOWg=; b=yMYe6kH/Bq/NTbs3Jkdg6NDjr5jFGWt2wtik/OXyD00u6CmDHtL9ZcXs7m62vkqT5lC/UB mE2fvehPshCTfPmXzvZTYB0Xdf8kGRuEyX5bYx7Hg9Pfo1bzq2e/HUa29EZIxxu/axGXhz i5WJJ3GnBUsyv9aNor/pfRprZ6QDQ/iRRqatg+SdiW8s7aOU/jCmOpoFxpLLv8iTmscXfI WQaaAMUcu0NEJv9FbDgDNkdYKf79pY+zhaz5bXV0oRAbvZ9TNtaeFsGA9FRr4YioDlZ+d5 CFilPFs4n0/paBbU+kKaZDJEYWmO7E8Aswzf1LFFQSsfmd1hezpIdIBBCfsiAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsvb3xNwzxbv for ; Tue, 25 Aug 2026 16:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 334b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:00:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Mark Johnston Subject: git: 986bc26c4e73 - releng/15.0 - unix/stream: fix instant panic w/o INVARIANTS 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 986bc26c4e734af9f24d16fdc771ab2346c8e188 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:00:59 +0000 Message-Id: <6a8dbc3b.334b9.6943b1e@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=986bc26c4e734af9f24d16fdc771ab2346c8e188 commit 986bc26c4e734af9f24d16fdc771ab2346c8e188 Author: Gleb Smirnoff AuthorDate: 2025-11-14 16:01:47 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 19:29:46 +0000 unix/stream: fix instant panic w/o INVARIANTS A stupid microoptimization I made leaving empty STAILQ inconsistent is a brainfart that is related to much earlier version of this code, where it was safe to do so. Approved by: so Security: FreeBSD-SA-26:57.unix Pointy hat to: glebius Fixes: 69f61cee2efb1eec0640ca7de9b2d51599569a5d (cherry picked from commit 82d8a5029a80a77166dca098b8fedb10d84e4e38) (cherry picked from commit 0f9fda8fb7b7f8c0fb7619a076a6c4b0dda0b67b) --- sys/kern/uipc_usrreq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index c9ba998a0777..ecf7218f2ca3 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1492,11 +1492,10 @@ restart: } if (!peek) { - STAILQ_FIRST(&sb->uxst_mbq) = next; -#ifdef INVARIANTS if (next == NULL) STAILQ_INIT(&sb->uxst_mbq); -#endif + else + STAILQ_FIRST(&sb->uxst_mbq) = next; MPASS(sb->sb_acc >= datalen); sb->sb_acc -= datalen; sb->sb_ccc -= datalen;