From nobody Fri Nov 14 16:04:48 2025 X-Original-To: dev-commits-src-main@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 4d7MR51dTZz6Gg1C; Fri, 14 Nov 2025 16:04:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d7MR50tJYz3lJS; Fri, 14 Nov 2025 16:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763136289; 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=COI76GZNmNGUHgrtt+zz+UP9zsVXsnM+qYOO94w3JP4=; b=d68tpY2oEcEyHK3tFqz+TDQc3Nu9CdZh2GKLUkS1z4CJcyr/zzWy7pnMVIW+X23/N6vGG5 0WEeUAw1nCc7nwITlpr5G6mYoY1fWhxsREn/kLEpcXz2a9iFw0VPfOicP8eDqsLvR+OLPK qBhstJvkr9GhvCVc80aJBdL6H4bp7w0ym5SZQu9zsEUJeNvV1yFqZlg0jREjLlSnvhV8FB s1RTsI3QBrQcMTTsUnoE3DfvZQ5AJayckyeNQQ492nzRDnHpKrbFFG/cOwUV6Il87LiEOg PDnxzgW/k4ZYmuglAh8Graw+grJwN5bszlJTYuC1sJY1Sh9mc33bDYSo49j9sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763136289; 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=COI76GZNmNGUHgrtt+zz+UP9zsVXsnM+qYOO94w3JP4=; b=clg35h9YDEAjZr4bfWBRiMNXrJOjYz3eUqeIulrM11RFX7m3IYgKDkunpDhzPzhvvTixg6 wM0Y+VSvcIK8gKhoefPJtKkX/XsxHYnW/PlAKUwmH1jTLCMSe+VlwjiaF9XMHfFthVy1Yz 9B5H6Wk9umPKeYb7cqw4oEF+QgjPqOFCQ5vvO5LuS2UbfK573lsdM3KYqGO0E+dul7CHmz 2qa64MwJFGEwTIHbjm3QVoEs7yo961X2QM1HqliNq4pBaPeAHoYFn2W3e66A9gjMMpBXJy hdskAfUO9j2I2SG0xMGjHokxiQqzJB0IAw9cs1Aaz8HUNIDbjoHOU6z9X+GLCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763136289; a=rsa-sha256; cv=none; b=oq1mljtxoxPM3M565tG+xyuUIR6M874cJ5WadVXEyQe1u1UjkuIx0pe64X7XvrVAmCo2Zi dOptg/A00IxA35smbXonb1Vx6W/vu19fQ/wxEF33gTzQ0Xdwd09xxHtD0BzUYJ7fsRO7MW BhqCN0danYA7YQBRLU/si+8RSUCrnUaGu8+GzezdGUKkklsgM1zq3yc/3VqoTegFSlWfEf ojH6ylmmCduXYsb2MXwEkpB1dqJcRE8YaxR5Cau0fzMbWdpIovIbQzFYNzFeFwGFLm9Ruo DYkpOK41WIPkEIsPV1SYM4wdDIb5CYp7fDYwlV8S9RfsgmqrKox3wDsz41kCHw== 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 4d7MR508ypz1CFs; Fri, 14 Nov 2025 16:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AEG4mUe027365; Fri, 14 Nov 2025 16:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEG4mNt027362; Fri, 14 Nov 2025 16:04:48 GMT (envelope-from git) Date: Fri, 14 Nov 2025 16:04:48 GMT Message-Id: <202511141604.5AEG4mNt027362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 82d8a5029a80 - main - unix/stream: fix instant panic w/o INVARIANTS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82d8a5029a80a77166dca098b8fedb10d84e4e38 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=82d8a5029a80a77166dca098b8fedb10d84e4e38 commit 82d8a5029a80a77166dca098b8fedb10d84e4e38 Author: Gleb Smirnoff AuthorDate: 2025-11-14 16:01:47 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-14 16:01:47 +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. Pointy hat to: glebius Fixes: 69f61cee2efb1eec0640ca7de9b2d51599569a5d --- 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 b1cb6de98b5b..6996f3d447bd 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;