From nobody Tue Aug 25 16:01:20 2026 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 4hTsw04wlDz6pbyk for ; Tue, 25 Aug 2026 16:01:20 +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 4hTsw01VZKz44Hf for ; Tue, 25 Aug 2026 16:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673680; 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=AINrb6OiolO0T1Fm24ylNPuW32eg5/ctG8jObxRaRLY=; b=ySWHdAOwFyPGV+xt29CIadTCq9ObQnekBVvNMckzAdjF77Kz0DUKaOxxziaHj6lbrgGgIr 78alLNJ63PPqWNcdLLFArQhV8TIC+H9Rlf8BxUHqXCxX9khRTnrsRzQ3H+IZMQUi2CQvXi 9znjMF2fGtA/NxXEwzw8uhm0IgvMF09mp30yFfK+64ClftoNqUbFiTK7WUSnCh1fcj4f/k JeV8hEMF3SEpB7K5VmLHOpRdP4nksi/sthuB/O8cqjdtUn+qyWSW0xoVLXflix89PwYJa/ /cuzMmUoYbJuZmUvlIBa5UGY74gu2sxS/MYf1e8jxExY2uGXJdsStErYeypwbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673680; a=rsa-sha256; cv=none; b=emzDr78FRBlIrUMzyDwbFWPwg+uNhJdKKCYuiEUOJNZvUbLte0WQcatPTqCpKaeXEVQSBH qOG6cd+j3KjTpC+jAotgQuuGpO5AyhJm5OtTaNViVC71rotuwQHZ5ZIJo7FKoeI+q5zRMe M5zwg5esa5Yv5s2qMxdc/VmFEj6IQXbtjSgKwfPZmZ4nFk1YtQ+/z/+G8FTf+nzpmIoeaL Z2QRjhzW1x55/HDXPQW9bQ9jdb92MGCVOucd3KzugOa3jP+F7sKcSQ2iqAPCHjZcuzPCMr KjKzLSVqpL06pjZkQhyTOdGRwiBeZ+qjS7GO1egLi9tVuIpVKL5DoDFCLieNAQ== 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=1787673680; 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=AINrb6OiolO0T1Fm24ylNPuW32eg5/ctG8jObxRaRLY=; b=ugZTfcVbm9NS7JdxFh17S26VoFDUh/L+JbqF2CefMa176PuxhEw9v24bb5vwCgqXYkRkpg V5VkupgzVJrGOLfy0wcWc4kCcgsIg6ll76TXgIC4rZZcKa1HRd2k4mnUPINkVMzhHufVWd s24RHgT9mpcy9Hp5Cf+bSErYnC4/dZa32KHtIi7VpAY5BQPHEX+StxJFfyw2oxDoQQhjjx 2l+N6lzrJFoIDmw8QZUslqUUZ02arfAirrA/9JRjnWt/M5p4YGmwhajbXccEkfWuaYEkgx dWOhBTsWURWVU6tzJGFIbiCQhs5fARXIURcnboto0h/J1hdMwOX0BsIffo1hGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsw00MmVzyB6 for ; Tue, 25 Aug 2026 16:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 321ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:01:20 +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: 2af6611275b0 - releng/15.1 - unix/stream: fix instant panic w/o INVARIANTS 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 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.1 X-Git-Reftype: branch X-Git-Commit: 2af6611275b005b484c277bf4c7961b5a7c718e3 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:01:20 +0000 Message-Id: <6a8dbc50.321ec.b2275d0@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2af6611275b005b484c277bf4c7961b5a7c718e3 commit 2af6611275b005b484c277bf4c7961b5a7c718e3 Author: Gleb Smirnoff AuthorDate: 2025-11-14 16:01:47 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 19:33:35 +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 97ebb72a927f..cd1795304b43 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1509,11 +1509,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;