From nobody Mon Jun 22 12:51:44 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 4gkSkm2bsyz6h7kr for ; Mon, 22 Jun 2026 12:51:44 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkSkm20vjz3hMM for ; Mon, 22 Jun 2026 12:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782132704; 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=NzPJnIjU3+zqiCormXHZh6d00jiIjgXMfvuGFpJtI5o=; b=ln2+k3jUA8B3NRiPxBS2T9MteQoLQ/v0ZDyf7Emh7Wx2Eg942HyzXb+B3nxN5M4ZNSrTgZ hvCbM6cf3sEgDJrYcNb6/Ody0s+1oLDhwGNwHNZ49m02lzf23feX4g/qBzamyT/m72yGiD KNWvCuRs/sdlhdOjPfhgw58IspALgWtPfvx+M9qYv2c6+voLO5Og5HCrNgmss6n6Vy84UH NnmJN/dgWBVNcg/NHK+VWG9SKO5sbpJ4vpWrmEa1L24Ynu+QW2LHpGP39efVxTjJx6R77s ht2DTvUW1uaFiDmZXMz4J2fxOZWUTO6PAm90dCBHNnTZZ6PA82CNrgmxQzqHlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782132704; a=rsa-sha256; cv=none; b=P9iGyrp3RUYHZFM8dDPngGxyPaTqsiNJ3K2nuktr9v4D58jVGP1GMeCjh3AZFILkCksGcw W2RuyO5+eZWi4P/uhgOsKmCOck5qqWAXpwPfLC7DLxjglZ+c3kiOHg2nn/PDr1bzVnbKCo oyCSHu1K8P9lQmxOmKSaa7BpP02Jxx5zbIN9VJ5Zq+v5hYdQIDsE0yeUC9zlbPh92ricsT DJoQ9BGLRU8kyPR7AAqCrB4mDyqqbrYiTQA7hh3JGkYBOVWtj25HFCenn5ebDg7vo00fcq +Yh6HrlsMYDkSPDb5WuZxo5lMViK/n9Hta/0Fe5ACr1kjHrzmVxVwUM8UyBW1Q== 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=1782132704; 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=NzPJnIjU3+zqiCormXHZh6d00jiIjgXMfvuGFpJtI5o=; b=tQDJO995DQiAwLLX/04SKiDr9a+4im9To0CzUsDHSgckd4/RBWQcPnZJpFqOZKXdWK6sda S6/AQlG0lxog2sP8DM3oa8KFUPb5arpZ3uBwyxJ58mlsszn33BOHNHnq2bcC1izeNIKzFz S8pfNjf858FAqEB34/RoJgqAOHS+HfTcifsEhfHaMthO/a3R5xK43wVL5wjJgV1/ot82wm C7orpzJHifU6h40KZwSLVfXROVgwHF8gDsxSwGAO/U71XLl2kg9bk4zYcRzf2PmaYAKY+s y2qjciNLeg8vnvZEBd5Sc9DL9M0xjgdLbljpJ8+6v2cX8KhuUz+MV/90MH7yqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkSkm0p1GznlT for ; Mon, 22 Jun 2026 12:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37422 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 12:51:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 93e22eb18e2a - stable/15 - pwd.1: Fix a typo in the .dD 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 93e22eb18e2a417610377da15859a298cbcc1149 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 12:51:44 +0000 Message-Id: <6a392fe0.37422.20056561@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=93e22eb18e2a417610377da15859a298cbcc1149 commit 93e22eb18e2a417610377da15859a298cbcc1149 Author: Gordon Bergling AuthorDate: 2026-06-15 13:40:05 +0000 Commit: Gordon Bergling CommitDate: 2026-06-22 12:49:27 +0000 pwd.1: Fix a typo in the .dD - s/Februrary/February/ (cherry picked from commit 586a5bc03541397c432ce98a1551ebeee7c04ef2) --- bin/pwd/pwd.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1 index 8b03d060bc8e..f27b4aa1bff0 100644 --- a/bin/pwd/pwd.1 +++ b/bin/pwd/pwd.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Februrary 6, 2026 +.Dd February 6, 2026 .Dt PWD 1 .Os .Sh NAME From nobody Mon Jun 22 12:51:45 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 4gkSkn3s2Hz6h7R9 for ; Mon, 22 Jun 2026 12:51:45 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkSkn37Zcz3hF2 for ; Mon, 22 Jun 2026 12:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782132705; 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=QU9LYL2nsNZbzlR3JJwCWref/v4qB7fixUtDqxi6+go=; b=etR8fmxTTjlRlFTGGtQnWWY+5H5ig7Kpz1J6BfmQrllu4JyRWENtu8/Ke9imr/nXuFV1pR IidABQMvRo0p3t6OR67P4XMfvUDjGtLw5PvVxwB09Sq5SqBgL/gJgLbuPLhK4u+GosNWF8 R9+2pKfZzY6epKyCVYFiLs+5jDyRU0gIzUXXOoWsu6WKTdo81tE4rUYEjdTGzVh1VojdMl hJX8ywraWxy4hlxB0/pJfms3REE0MQ1NUWav0DWguV0a4Ai+m7bqTRRnmqmosh+B+aywvU oLL3klaCMJUWZtc0o1m5sIiW7p7fj/7Y0eOdkxbPKdjass3V5wpA+UaY+R/qEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782132705; a=rsa-sha256; cv=none; b=u18VvsYtdzbWcESoaRgtcVkIoj6CJIlF5BEf2wAY2rxEb2vYIY1AFoSHqdCmINzOv/VW6D mZqvAH9gOLm6Rl5cNRa0S6Ws2PhpP+4Z9xqW0QA3CNY8BYGrLSgzWYGFbDct3W7qW9s10t 19Un09vbm8oUnclfHVDfctXAYvL0Bo+NuTw8GjEqne+RuTEIUTZJZ4/I5Oah9HATdVL3QK qLsOB9mDR7DZA74Rzo8fUVIej3pD12/toMX/zd0dtdV2vGyxFeGOHqO50KykpOmDGts+7Z VrHdUDY3LtZq2XLXEEsaUbhQfnKSqb0gBAq2H2jYINUVcA05rHH987+Ph9jBzg== 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=1782132705; 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=QU9LYL2nsNZbzlR3JJwCWref/v4qB7fixUtDqxi6+go=; b=sYqhiwVDifcV4Ouo99kdLNd/p2YSpr+wiIlBXFe8ZNs0oF3TFiStJMiHfq7Ve9SrEVrlN/ M5KV2Mjh/sc+LP/Dc9Cbn9p2cgLgFh59VWpobgGQlB6l+9jtjfrRQp3yDuSmSGzzEjsN0d vRvQZ9kkv8Z69wIl0PB6P1Z8tdd8Xh5TxSXCTLcidOu4KBW7C29CiKQ76f8ehYpI8dobSB ROfQHfDGYRCuzS2vE7t4aIZPKpvS0fgoxwnSfXpG2BZKwT5SRDbShMfauETFcCJrTPdbRR AXjXXO1wQOz81WcjCYrdYOfcuERQw0moG+CbTZ9xnThSIIrmm65ozLsyG/Ud5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkSkn1XhczpY6 for ; Mon, 22 Jun 2026 12:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 370a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 12:51:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 864d3da66fc6 - stable/15 - pnfs.4: Fix a typo in the manual page 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 864d3da66fc6d4c1de0891ba2323a3cdc979d29d Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 12:51:45 +0000 Message-Id: <6a392fe1.370a6.923d1dd@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=864d3da66fc6d4c1de0891ba2323a3cdc979d29d commit 864d3da66fc6d4c1de0891ba2323a3cdc979d29d Author: Gordon Bergling AuthorDate: 2026-06-15 09:14:20 +0000 Commit: Gordon Bergling CommitDate: 2026-06-22 12:49:47 +0000 pnfs.4: Fix a typo in the manual page - s/Wihout/Without/ (cherry picked from commit f930d8a6540648423288567ff473123ff5647484) --- usr.sbin/nfsd/pnfs.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/nfsd/pnfs.4 b/usr.sbin/nfsd/pnfs.4 index babd221a6d5a..d9818c051df4 100644 --- a/usr.sbin/nfsd/pnfs.4 +++ b/usr.sbin/nfsd/pnfs.4 @@ -215,7 +215,7 @@ set the sysctl .Dq vfs.nfsd.flexlinuxhack to one so that it works around the Linux client driver's limitations. -Wihout this sysctl being set, there will be access errors, since the Linux +Without this sysctl being set, there will be access errors, since the Linux client will use the authenticator in the layout (uid=999, gid=999) and not the authenticator specified in the RPC header. .Pp From nobody Mon Jun 22 12:51:46 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 4gkSkp5tTQz6h7XH for ; Mon, 22 Jun 2026 12:51:46 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkSkp3NvVz3hKV for ; Mon, 22 Jun 2026 12:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782132706; 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=sqqbuWnCXfDNJL3P1tas7YonEhiZz2ZcG9VIU+mc3F4=; b=LxOw6L3Xsl2vrjsXdmZHrSp4+DoC0VI0MFvxL7zOdEEqM1lDXfiUq85SmOKK30i8XzdCK6 KkPOhcKsq/datxK2gBwsBvLbqW58FlDPpxw93Rm8PK9qqPf0TKQLOo/ohFMjdFIaVrCOwE FZ+G+U+MMdA/ml2uAp0qI44FS0fTPZ6g+PiqRW+4ZvLajZq/AGi32HPjDMGFhp5+iGuJmt G87QoWyn+V/3Rh7IbPXpuD5CszHVi7pH74n2AOkuH3dHxCOO/xorsKAKjwPssxaI+gbtKG VK5VO9iBBbbg4jndta1U5kTQWhMCFg60HPATb/NVLNlHH+B7PvfAuLwKwuHU+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782132706; a=rsa-sha256; cv=none; b=EdxU9uuLGf4JsKHJFMkeE6Ot50ErKjxNoYD/+xltX4BeZcegSOxtzzpOxtAWKoupI1DBqK 4BNDN82cPIxDecCdO1JWt1685IKVl237QSH80Lff9OYrrUWrX6PiC0p7vnMkRlLDaSQVwV tFe3A8N+PxtQtwR/r7dXwjyiHg7XNPQFBnDXLqm+1eFpM0p9AiOqSlHef8Dx1XQO+uQ9gH rNjz1C2CkBAQWteqxBO/6yhI45rVmi1k6eBfwZ/blNDhHv8HF7N7XqTEPc2Qqcjbsx/rv5 YzhI7i/iyP3uvoRF/LfaJoDqLPlr2Y5yWzN0j1C9+lSuZpAv2ueLvxNBeN2r0w== 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=1782132706; 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=sqqbuWnCXfDNJL3P1tas7YonEhiZz2ZcG9VIU+mc3F4=; b=oPpIjs9cfUKsw0Ogn33GqqTJ9W9/qhZFeoGC5iHZhoWW5t4IbDdH9WvRoD8TOdAbzhorJX E/2LVC1+PDnQqgco2PqwzdwRTiQ+76f3bjY13F+KdmDuyiQHlCDuqHBc1NoK/mLncRV8yI +Du3R+Oosnrzj8eyGIJRw+WOFRYUFzWAzFq11OgpXOk0ambcSMnnTK9q0JCGy/9CB2WQIG uV3GVJamEICF8fkUJcPzjkkkp2b1NO7a1jYNXS8QpuNHZlfQM4rAS/rZDFU0sDQEFOkFGl vKn2+EPamnuOdJDRBnzPHnMVRPNd9Lr7nDSICT0eJasE8uPIyEytsMYkZz2VvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkSkp2KtpznxQ for ; Mon, 22 Jun 2026 12:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37572 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 12:51:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d69c80b7c4cf - stable/15 - jail.8: Fix two typos in the manual page 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d69c80b7c4cfd5771c211bbd9218b2b07dd3f67d Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 12:51:46 +0000 Message-Id: <6a392fe2.37572.1eabae64@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d69c80b7c4cfd5771c211bbd9218b2b07dd3f67d commit d69c80b7c4cfd5771c211bbd9218b2b07dd3f67d Author: Gordon Bergling AuthorDate: 2026-06-15 09:07:24 +0000 Commit: Gordon Bergling CommitDate: 2026-06-22 12:50:03 +0000 jail.8: Fix two typos in the manual page - s/Similarily/Similarly/ - s/passtrough/passthrough/ (cherry picked from commit d9e0452f0c8af6b0c03b0bb2e3b824095021e168) --- usr.sbin/jail/jail.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index aab3f9003f3f..a174ace98d7b 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -674,7 +674,7 @@ to in the .Xr rc.conf 5 file outside of the jails. -Similarily, if the +Similarly, if the .Xr gssd 8 is to be run in a jail, either the kernel .Sy KGSSAPI @@ -825,7 +825,7 @@ This flag is only available when the .Xr vmm 4 kernel module is loaded. .It Va allow.vmm_ppt -The jail may configure PCI passtrough devices for use by +The jail may configure PCI passthrough devices for use by .Xr vmm 4 virtual machine guests. This allows privileged users inside the jail to manipulate physical devices From nobody Mon Jun 22 12:51:47 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 4gkSkr1462z6h7RD for ; Mon, 22 Jun 2026 12:51:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkSkq4hbfz3hHt for ; Mon, 22 Jun 2026 12:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782132707; 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=44ScwvdNC4OUvlVjQEDisT8XUJ3YY6s80V8d6HvJm7M=; b=s1lLFcIW/r/iff/SO7XTeZoBh0MrkO1DMraX18PAedEN2w3R9/XIbqUa9WpUOEwIFW/VDp DxnuYMS7l7IznS/h/rv3HJCO81qmS2gBJApIUSwKP+bIU8Pn7lpia8uf1KpqNSXxIjEBOw aXKBET6gOB+GOsLYvhnqGQv2j7TrcW6IDxDzF94ene47x4e0S7ROcqwtPNO2J/jYCjv/2E NV9ihzinGmdai9WepjBJaftyxczX7Q0iWGOU75api77uZop43a3OjfeVIVkjCBOfhO7Apl ydraTHoNXqkK0pVbhMIxTGNC0RlTdhqwgMTlfpjokM3UQWclMYTt9eNTyxpDXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782132707; a=rsa-sha256; cv=none; b=bbv4Ix/rBQeCIKie6nhqYqe9IP2YGSlHuQBEPvk1I2Ha4lsWudlHLNDhWums8E7RSXU60f ICI7rEsKYI7P3doWP9eL9pz6qB8CaUG3j0v4WqS5oldg5qskWABz8CsaSBZNYSYs55pBsD 2dd/hiv4b6FAbWM1iHzvc9S+S90eyMq8HG+sS2QE6j6aNpav/ulUwY1LO+XjlXbOXM9xZb guavDyWcCHEeb2ilBdnALGXCfO0ZXbrJGZwVnMINROhq4EA6QO8DO96Fn95Rp3AA4K1DXM Up+PQ1+Vy16o4WWnwPGMR/HRlgaDDPAYDLd0NQTHtBQ/1VcL5E30RWdfmSiM9g== 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=1782132707; 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=44ScwvdNC4OUvlVjQEDisT8XUJ3YY6s80V8d6HvJm7M=; b=LZNPIQ1jgVKyzut6ELnVBgTOp5P52eJMdzx0NkQaBxWeMA5ivl9FbHOzIwMEwWriGRE0qp oydS4lv1ditI6qD7DD0ttzGtRLPg0n75M3DxAR0IGwgHitFMCmOtg6ey29ZbWVpQ7hA1+J Azj8CMiKw5KSumIXhrFobb0khz4VddWKhLOTh78uF7Kp7Fhe3DlCDVaJZ9hQDiIXcO+4Bq TAACEN3CilR2LifeDwm0Bs41j/yU0ayiIp+lJ9hGI9ArEVOallPP5wnHe05RieLarYUSLT RdUzX8CnG8QM4zz8ZTgD3EhWHMX0qI881MMgM+MITyp5F5aD1vnojfQW6lygiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkSkq36Nzzndq for ; Mon, 22 Jun 2026 12:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 342e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 12:51:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 254d0a0ae908 - stable/15 - mixer.8: Fix a typo in the manual page 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 254d0a0ae90867697827b7e48cbbbdaae930b886 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 12:51:47 +0000 Message-Id: <6a392fe3.342e9.515ee411@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=254d0a0ae90867697827b7e48cbbbdaae930b886 commit 254d0a0ae90867697827b7e48cbbbdaae930b886 Author: Gordon Bergling AuthorDate: 2026-06-15 09:10:52 +0000 Commit: Gordon Bergling CommitDate: 2026-06-22 12:50:19 +0000 mixer.8: Fix a typo in the manual page - s/thet/the/ (cherry picked from commit 10b1a35d11866462b5e776015a1b79f4f8f704a6) --- usr.sbin/mixer/mixer.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index 2d12e6057797..2ba6cf031eb0 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -140,7 +140,7 @@ current settings by the amount specified. Note that relative percentages are still relative to 1.0, not to the current value. If the volume is currently 0.40 and an adjustment of +20% is specified, then -thet final volume will be set to 0.60. +the final volume will be set to 0.60. .Pp Volume can also be set using the shorthand .Ar dev Ns Cm =value . From nobody Mon Jun 22 12:55:07 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 4gkSph3Qflz6h7XZ for ; Mon, 22 Jun 2026 12:55:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkSph0TDNz3kQ9 for ; Mon, 22 Jun 2026 12:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782132908; 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=IhkjKPexE8Y8UyCkh/MG7MtbN7YrsphZc1F/kFAwwXY=; b=A9wA1d/8OCPNsynWPUPak1cIl/1P/5BgC8rBe/nP7ivsYHGJxDRBjd7ChE4MT2whDJSKsX Pv8x7DT6N3JQpncoTvHA0/xtbKuW7by6ZIIQ2x39TpiqMBUrvBizDPW3KdgymD8154IZJD QQEe0P5+U0eiXAei0iXNdwbRCPGIVpmeummdDb7VMvwKWeFK0p4TSEseBrfymavgW/wgej g/Bwoap0Eqzzkzw0nBHoXJfJzNg26FZUbfcGTC0vCDwlryhEsm8WBPv485mvbJGW1xJaWv AoKAIym7AhCJLoXiyWirooqvZghCHcWk+zPG+tHQ9LzaM8ksqzp8VrA6/VpAWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782132908; a=rsa-sha256; cv=none; b=u7mhrYbRy65TRwPx4Awidk2+72h95IPN/5Q6Y22QR2ot/89StceCH2mXrfgbGIXcpQ/HB+ aVNjgTUFsvan5NREVbJcsfx5pWaiJ35+rv5BkPqubHCYDCMRGsNrmMLUlvee5qGPzQqSV8 3l/1jDv/+ayo27nvFPq4MVJwiwEhvZBWy9/MSn4hcJiXbazougHtqIVgAP/N4afvEEx3E7 6clqOmTw2SLkMGzIzAqS22xnpAPYNU6qneHOhlHhSeu08XA1lDdq0TrcTq6yXMp0JzRTKh UtqHYicAQp3cJUM1M7VcZfMmpbPr9E2iWQdc/QG9RDVzYbuXmmXNzGIvbNFn0A== 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=1782132908; 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=IhkjKPexE8Y8UyCkh/MG7MtbN7YrsphZc1F/kFAwwXY=; b=MZN2D1XanA9+KQ6oxPbyLaR8KIZoG+RgQLzYYr+0vYDDyn4uX3/fVyc6jBgPal7oxBsQMz SPj62VKAUiYEButA1YwWq2nkm0/yIMHpRpn3Q/Hu+vElXeyoBK3Hr/dUlfHYhR52y1+OIq AdyT2xZ6Ag0MbL9Fx5xmhH05CTsNSS77LZzWI/PdUP5ld2oRtumkoJygoJz9Jql2esrMDx uNr7TLli6/9mWS+iXM7BpEa4emiSBI5nfISNoHAweEBNRRMW56/AWjbFhu8VMZICzmrA7W m+/8UXxUEbH9uQvObWSLDifNf49avKO+jwGu9aO2Q9r/e7yRtf5/PffptJPxNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkSpg5Q02zpYK for ; Mon, 22 Jun 2026 12:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36a34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 12:55:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 65324bdd2c7e - stable/14 - mixer.8: Fix a typo in the manual page 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 65324bdd2c7e3fe16e7e347e810fc9a0b827fddb Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 12:55:07 +0000 Message-Id: <6a3930ab.36a34.7462c43a@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=65324bdd2c7e3fe16e7e347e810fc9a0b827fddb commit 65324bdd2c7e3fe16e7e347e810fc9a0b827fddb Author: Gordon Bergling AuthorDate: 2026-06-15 09:10:52 +0000 Commit: Gordon Bergling CommitDate: 2026-06-22 12:53:44 +0000 mixer.8: Fix a typo in the manual page - s/thet/the/ (cherry picked from commit 10b1a35d11866462b5e776015a1b79f4f8f704a6) --- usr.sbin/mixer/mixer.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index 819d8ae73ab1..cae0dc25fc79 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -193,7 +193,7 @@ current settings by the amount specified. Note that relative percentages are still relative to 1.0, not to the current value. If the volume is currently 0.40 and an adjustment of +20% is specified, then -thet final volume will be set to 0.60. +the final volume will be set to 0.60. .Pp Volume can also be set using the shorthand .Ar dev Ns Cm =value . From nobody Mon Jun 22 12:55:06 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 4gkSpg5FDLz6h7Gb for ; Mon, 22 Jun 2026 12:55:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkSpg3ZVJz3kN0 for ; Mon, 22 Jun 2026 12:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782132907; 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=Y++t9GBojhCDm6wNkW2Z/QfjYrSsrzjYdwcDyMrZZIU=; b=nHEzWZg9wgYEcOQ62dNWim9zfBaOWz9nG5JIYKo5gHul6TAsRUCky64U8NR8y8Y/lBwO7T k/lZIOTPLo00z/mn/WWL+D+28tcCa4QYk0l8ze8U80Bs8ob9BR8IE31nAhbJivcaBamKij 5xuFUJPraeHZD/vVuei/JClsvtUwdjCkQZDr5ExecvQouZ3MTDqHavoSc4jhg8hSMNgupX QS3Be4c/qhHvqwLhBemQTRLtf9YxhfuHCop4GEEqEEk2iHNaz1rnPlU/KYRFmnjzE+IPjp Y9nuW1Hs9jt2Pn1sXxKwGR3zh13T+/eJIvfRoH8KaSQKjM4O2MU2F9ByoEqlSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782132907; a=rsa-sha256; cv=none; b=ZsmDY8Wz+afBuRLhB4xfNMkl47Z0FCepJHfGudIJ5WSetDx3es9JqjyGetYGjg85MX44ea F619PgNG+O8X1zmzwsBtYEhh0kMatUSjxhzbA7nkXi+cOFjxo4A34sCJ7vRiT3fNnzEsQC aC+Kqv/HpCbKiWu5U3ik9YZYN4rsgWzWL6UEPkcSiL+nIKCRR6Gbe99ExInSI6gzuySugA dIw4UTkxzL0NNNp/EzleDxNUpJpeJFZ8MdMhWBFi3KgsOijsduv5YeIdn4K79tPV7v9Duc PcOH5vr8sqiN5G30tmHRfO3cBR8boWmAVntz8ASpZR8rDhjRH5rkF9F9EO60RA== 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=1782132907; 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=Y++t9GBojhCDm6wNkW2Z/QfjYrSsrzjYdwcDyMrZZIU=; b=bCl0COMWo/TgXZX/t5+3ujxK1BrBobnCkDXI6YeIc1mF0tjjW4SdeTPVBS79aK4pM0QDXX Io3g3du8yoEE4UO0BeeDkaOeItgu14aMZiyYte0DP2ovFqQJqnE5F+V7BpRUaBaMlANUI8 qV7Qf+O9XgtipSzKmZ2J4fHh3qU3SA+aHXJFeCpGBQNSz9VLYMTp3mGAhEWit+XyKRAOkv 6qVFu+jXLD4WzaFgJZuoHY1m1A3YPilEel9uOxNCJk8O80s92Kith9UsA4Ti92c/Gp6qXB /De7hPsS3ia3R6wvYt7M5ORPIwHFSLa+M940qwXnqJQ0xZIcrv7gLYIhAcOTzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkSpf5gyqzpKW for ; Mon, 22 Jun 2026 12:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38002 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 12:55:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5e050ef3a138 - stable/14 - pnfs.4: Fix a typo in the manual page 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e050ef3a1381ffe0b489998d2be960174554ce1 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 12:55:06 +0000 Message-Id: <6a3930aa.38002.106d9cd@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5e050ef3a1381ffe0b489998d2be960174554ce1 commit 5e050ef3a1381ffe0b489998d2be960174554ce1 Author: Gordon Bergling AuthorDate: 2026-06-15 09:14:20 +0000 Commit: Gordon Bergling CommitDate: 2026-06-22 12:52:40 +0000 pnfs.4: Fix a typo in the manual page - s/Wihout/Without/ (cherry picked from commit f930d8a6540648423288567ff473123ff5647484) --- usr.sbin/nfsd/pnfs.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/nfsd/pnfs.4 b/usr.sbin/nfsd/pnfs.4 index babd221a6d5a..d9818c051df4 100644 --- a/usr.sbin/nfsd/pnfs.4 +++ b/usr.sbin/nfsd/pnfs.4 @@ -215,7 +215,7 @@ set the sysctl .Dq vfs.nfsd.flexlinuxhack to one so that it works around the Linux client driver's limitations. -Wihout this sysctl being set, there will be access errors, since the Linux +Without this sysctl being set, there will be access errors, since the Linux client will use the authenticator in the layout (uid=999, gid=999) and not the authenticator specified in the RPC header. .Pp From nobody Mon Jun 22 13:26:21 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 4gkTVk5YJ2z6hBvs for ; Mon, 22 Jun 2026 13:26:22 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVk1ZfRz3r9x for ; Mon, 22 Jun 2026 13:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134782; 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=7XRpdgSNmHOOqICIj8nJciziHIwRpd+GEq46hjqJ9xY=; b=jWGNZ9mKNqG61SvHgtEgJX0TkgYyWyge3liCunKdyYySE1efbGwQI164qVvj0Ey5wSXgtS lXWbJwHLy1IrOCzCiwSrQeDdoN5ZAiMLBt2NPBaSUwWePkYBCMKzsRoF/Ey7N2YTwYFQla L4s1nHd8ek9+BaewdRgy5xtr9ScP1EbS71dlhDJzyK6VZsZ6FNtNYNmiimuBJomoostfke 3vKY9Q+njXMVTknQJ3dpFCfEP0ezI4PMAGuqlBspd0sVTSt0pX90u/N4WCI2zEalPA15Kd ZPk6mOb29xMBt5lTnKT6xqHT1KR5UOkUTamUPMwvJhjj45jdoLbK7aOV4fYtDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134782; a=rsa-sha256; cv=none; b=CcxsDZBTqDCbn24zCoi+/FhBEGQuD8SgdUmeK4YnrkVHJNRIoD0vTfwwS/kmmtVBmNdbd0 FcvqQkWWnkozC9404PegYn9SxWbG99+Y0Qtm+v0yh8vrT0hcARTQfcW6lUNUaYtFVG2Z0P jHgAWmM7/blqzH1dzaEqLol1Woa9RC3EE4HJylvE7AXetv0aGHoKh9eSFFDib/JVZ3vU1l QCLLsirEunYLP5XL5x9c2jsmWQd4K/DLXVo8y4twSxZXudTs6EXwmLSzIc2FFGoa9M8vKS V1PSem1UwNlCTlUA8+RaYHuwOvGj4Tl5X3TfTSkiDk9dQp0bnFjHJnWmAyJwUA== 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=1782134782; 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=7XRpdgSNmHOOqICIj8nJciziHIwRpd+GEq46hjqJ9xY=; b=Os98VSaqcFWHCaJX9XG+0fNfN4iL7CxObZWihHDHSdKvRIa8aCwlIpSSvJLbL5aTKb/s1S FlHBDg/1uQK86P1r91An0SD3LjOIt8br4+lWIfhxjlmo4GroWyhTB56yWp9Pbm4loVwxcM xVhW0AP35EVfQz9GW18U9ygvTEc8WDxPZDCLaX+bLe9FBTBpE7QrhBmAjQaXpYAJbvN+tw GvijYBMMvsz6o6gUIyIAG7m+MzF8LZh1Mxk38HFe7iF+2ooZ3flOgSSQYwyYcecMSu43V0 gWGk6PgN3X4mi8lpiW44DlWjXv+kEEKPHsQbM9cnS0T53+7HJah6FHA+qd5RAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVj6VfKzqPD for ; Mon, 22 Jun 2026 13:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a971 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 03920772145a - stable/15 - tests.7: Remove an unused configuration variable 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 03920772145a6127ce0b45008615213c048f978d Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:21 +0000 Message-Id: <6a3937fd.3a971.3aceb6f6@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=03920772145a6127ce0b45008615213c048f978d commit 03920772145a6127ce0b45008615213c048f978d Author: Mark Johnston AuthorDate: 2026-06-09 21:00:23 +0000 Commit: Mark Johnston CommitDate: 2026-06-22 13:26:09 +0000 tests.7: Remove an unused configuration variable No existing tests require it, and I cannot understand what kinds of test scenarios are supposed to require it. Just remove it. While here, improve the documentation of test variables a bit. Reviewed by: ngie MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56604 (cherry picked from commit 6bd97b5f3778aa36bcf89ff870bb1483b301a9be) --- share/man/man7/tests.7 | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/share/man/man7/tests.7 b/share/man/man7/tests.7 index 97cc6beba4dc..4cea1470adb2 100644 --- a/share/man/man7/tests.7 +++ b/share/man/man7/tests.7 @@ -219,23 +219,16 @@ skipped. .Pp Test suites are configured by defining their configuration variables in -.Pa /etc/kyua/kyua.conf . -The format of this file is detailed in +.Pa /etc/kyua/kyua.conf +or on the command line. +The format of the configuration file is detailed in .Xr kyua.conf 5 . .Pp The following configuration variables are available in the .Fx -Test Suite: +Test Suite; all of the variable names are prefixed with +.Va test_suites.FreeBSD. . .Bl -tag -width "allow_sysctl_side_effects" -.It Va allow_devfs_side_effects -If defined, enables tests that may destroy and recreate semipermanent device -nodes, like disk devices. -Without this variable, tests may still create and destroy devices nodes that -are normally transient, like /dev/tap* and /dev/pts*, as long as they clean -them up afterwards. -However, tests that require this variable have a relaxed cleanup requirement; -they must recreate any devices that they destroyed, but not necessarily with -the same devnames. .It Va allow_sysctl_side_effects Enables tests that change globally significant .Xr sysctl 8 From nobody Mon Jun 22 13:26:23 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 4gkTVl5YYrz6hBbn for ; Mon, 22 Jun 2026 13:26:23 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVl1ZJ9z3qw3 for ; Mon, 22 Jun 2026 13:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134783; 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=71IYo3ro9czXjxW1zOv3eU6hlnbWR5khVT1gHb5/xio=; b=hv6C8FJUky3AzTI8aresGmmmOko/C7/scp1lKSkP/CrBH/Vfy/RWbwAmsiYHHKz7HMZpwR wRXeioPZCFr0J0qMxrKHxNnASGDGmzkJ/uEG/CaurQUP8H+lqErVEeu6fMqalq7NaLVk5c MLwvBzSLU9TluED6GhXm3IfX1XsZ72G9nuORWA5SQCtuIaEHn5DO5ofpxUq6l8rVWE4kB5 QhrK/LogXZOMf1hQoibi2TzSVXvA0j7v553PSeXUkRuQcxnf3NtH4ko+PSn//9YW9W52KN G+bUyf+x2R1FHyzZ/eim8Rm4rL7d4B8mbFdeii33srB9XjfCThPpcZrd7gqhJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134783; a=rsa-sha256; cv=none; b=VUq9XsF9A5gKEhfZ0g4w9ylAzTyIqSlj/fCMiDNT4vTTIWuDQi1HA5kw8B4H6eNNC2V5Kh KYguEO2+5EnG5979TFWmjxekegLfQJKM/kx5inAXVEJTdce7oVzWYQGbiv0nNrhAQnLzNF 0l7jyzRp4nRCnD4+VlJaLwnUq/wu6rV6WzAAj9Lqpx1oaaUO9uW8qdGH6ogoyNtvrRiNhT 6xN8FDR8bnum64HIkNp86y1EIKTf9h40tgW8+q/MkN0H8PMgvpSWCu1nZ+k8bkBiFfgA7n NdnuIwsg1OH4pXgf6AtY0THNgRH9Sbi0QFWGuiNhlI4ETAndBeRH0WUIAQIMjA== 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=1782134783; 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=71IYo3ro9czXjxW1zOv3eU6hlnbWR5khVT1gHb5/xio=; b=kFevbgrMSE1PjOUIzry3tdz2ljfd7dWfc0B1oIWu5Zu/63wxQ1cUQ3AdV5Tj87j2h7U02Q 3o/4lnjLHtcYAiSH3FQ5O/JLoJ09pZHK4utK2O6xizdtN0Cy6XONcTCaBJ/8dfMFvBdSQZ E9i2TP5D8KCMijpRpsQWXqHpHadErb4oj9IJcbNcLR/sO6XjXSezCkTz0QuqU5ggFN0xZz dJV3y1m7NHas8/o/Tkq+RmTSZMgV/8WmGK698a71ww3aafjNPpovYDRh6sN+MnyoSQfbB/ Jy4fMmSICftZxQbUZZl0j/1rxAInZ52wBlbgtPRCQvTtv9cba5g2ByDpyXJTmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVl089wzqPF for ; Mon, 22 Jun 2026 13:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a6b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jim Brown From: Mark Johnston Subject: git: 37517d6d9166 - stable/15 - dhclient.conf.5: Correct crossreference 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 37517d6d91668611f15b95ba300d4934555cad44 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:23 +0000 Message-Id: <6a3937ff.3a6b8.6cbb88b6@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=37517d6d91668611f15b95ba300d4934555cad44 commit 37517d6d91668611f15b95ba300d4934555cad44 Author: Jim Brown AuthorDate: 2026-06-05 14:59:32 +0000 Commit: Mark Johnston CommitDate: 2026-06-22 13:26:09 +0000 dhclient.conf.5: Correct crossreference PR: 285614 Reviewed by: ziaee, michaelo, jrm MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49489 (cherry picked from commit f4424a2733867ec5f12ecd196011ce8df096f522) --- sbin/dhclient/dhclient.conf.5 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5 index b2190a8e076b..cf372617c4ce 100644 --- a/sbin/dhclient/dhclient.conf.5 +++ b/sbin/dhclient/dhclient.conf.5 @@ -349,16 +349,18 @@ predefined lease is used. .It Ic script Qq Ar script-name ; The .Ic script -statement is used to specify the pathname of the DHCP client configuration +statement is used to specify a pathname of a DHCP client configuration script. This script is used by the DHCP client to set each interface's initial configuration prior to requesting an address, to test the address once it has been offered, and to set the interface's final configuration once a lease has been acquired. -If no lease is acquired, the script is used to test predefined leases, if -any, and also called once if no valid lease can be identified. -For more information, see -.Xr dhclient.leases 5 . +If no lease is acquired, the script is used to test predefined +.Xr dhclient.leases 5 , +if any, and also called once if no valid lease can be identified. +Additional information on using DHCP client configuration scripts is +found in +.Xr dhclient-script 8 . .It Ic medium Qq Ar "media setup" ; The .Ic medium @@ -543,9 +545,8 @@ file - the defaults are usually fine. .Sh SEE ALSO .Xr dhclient.leases 5 , .Xr dhcp-options 5 , -.Xr dhcpd.conf 5 , .Xr dhclient 8 , -.Xr dhcpd 8 +.Xr dhclient-script 8 .Rs .%R "RFC 2132, RFC 2131" .Re From nobody Mon Jun 22 13:26:24 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 4gkTVm5lPGz6hBbp for ; Mon, 22 Jun 2026 13:26:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVm1QLZz3r8L for ; Mon, 22 Jun 2026 13:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134784; 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=wbAt1MjGbIgZO2zPPGZNEt+U9VPSThrMXjRS1XtLjZk=; b=W9hEVy/pDfsw0nmwKpgyWhXy9GJgGWSJQdzU5Raopv+9D9rEXIpzMGF45KWOdqqwO+znVA nIH6RjdfL6aO5nw7mZbmcbKUWlfIT9k6AoxOrwY63Xakzanhn0TwDDGr5v2zAu8KD/GksO 0pTJapdz8Oufh3FYeQLOBLVWF4iQpMyEuW4F5Hcg+3Q0LCnUmKObm+/YXGwFSFYQF9k7QQ xHWtSPq70iIhx+a3C4UR/Cyzfhyx92Xv0AbXR8lEN2CEJHF9gzFm/rLovDMmmtmRyfWSXd KET9Ib8y3h9MWyDH28DUXElhzPnMzyUAeBev6mQdoKrI6x7BZafmNvsqZ2h7rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134784; a=rsa-sha256; cv=none; b=debkkJ+3xPuBHGhw2xfz4RhaKDCrj2PtuhDmiTVg18rZ0nmcEjOfdO6hlQGPhmmQC5x+qz T66ff9q7aBdCxYmHgudo9vXX+dRMhEehH8xQQZ8WTKV/HDPQs3lxbQy+2j9yeE0MPir+/Q 8MQv0acnEO82ey1w2/uvTdldJ4iprLiQExnaT33IKWrqlaMOm9+XFnHwB3Lt9zal69EWEj bsnVrlCitp7P+SODhn+IF5T9oX8W/rp9XIf2AwqtC1zbB1CzIBBTvJbSGFQq3U7Pz4kLnC UhT2/efXYaq8F/UuDv1CnCtOME8XsgGOvJDHpFcuiPQ3sozTz70SGcNtL1lsGg== 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=1782134784; 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=wbAt1MjGbIgZO2zPPGZNEt+U9VPSThrMXjRS1XtLjZk=; b=bbs+c2mwGaWvEfJDrryQnXm3WnS7cHDtL6J5FlqaUjpv+FWPoejOshDKVGUQhBldamg/OO VI4c+HmzydYJZhaXaVV/1fXcRoEV0Ls5mj34XkR2/dZwNWf9PeNaxbutIe1DrhtVsvHJgM zvbabV+Ap/l5APpUWajHVWKmRVpruePi9GsbulRNhbApLXkdk/nRUftz5Fe8wsbOXCHdkb TKL1H2E1aOJRDkil7UtIeohl5/2GFt0WeB6G7HIrpsqOy5ygWQz0jtcO3qgqCaFX0pr8f7 enCd8v/QhVaeapSTdMeA4YwMlwYyMQ+VeGzibJhYeEy87Wk7/MIjte3bGEAedg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVm0VRFzqPG for ; Mon, 22 Jun 2026 13:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39434 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 94a47b35a475 - stable/15 - tests/jaildesc: Add some more test scenarios 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 94a47b35a4752739b73256024e80099321da7aed Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:24 +0000 Message-Id: <6a393800.39434.1ce94e00@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=94a47b35a4752739b73256024e80099321da7aed commit 94a47b35a4752739b73256024e80099321da7aed Author: Mark Johnston AuthorDate: 2026-06-12 14:58:19 +0000 Commit: Mark Johnston CommitDate: 2026-06-22 13:26:09 +0000 tests/jaildesc: Add some more test scenarios MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D57147 (cherry picked from commit fe03a78c5d5966992c8df482d984bae83dc92b45) --- tests/sys/kern/Makefile | 2 +- tests/sys/kern/jaildesc.c | 204 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 1 deletion(-) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 972e0aa0fb9d..b581d1e6ca30 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -95,7 +95,7 @@ PROGS+= sendfile_helper LIBADD.aslr+= util LIBADD.copy_file_range+= md LIBADD.jail_lookup_root+= jail util -LIBADD.jaildesc+= pthread +LIBADD.jaildesc+= kvm pthread CFLAGS.sys_getrandom+= -I${SRCTOP}/sys/contrib/zstd/lib LIBADD.sys_getrandom+= zstd LIBADD.sys_getrandom+= c diff --git a/tests/sys/kern/jaildesc.c b/tests/sys/kern/jaildesc.c index 11d751554887..cfdd1529fdfa 100644 --- a/tests/sys/kern/jaildesc.c +++ b/tests/sys/kern/jaildesc.c @@ -6,16 +6,56 @@ #include #include +#include +#include #include +#include #include #include +#include #include #include #include +#include #include #include +#include + +/* + * Block until a thread in the specified process is sleeping in the specified + * wait message. + */ +static void +wait_for_naptime(pid_t pid, const char *wmesg) +{ + kvm_t *kd; + int count; + + kd = kvm_openfiles(NULL, "/dev/null", NULL, O_RDONLY, NULL); + ATF_REQUIRE(kd != NULL); + for (;;) { + struct kinfo_proc *kip; + int i; + + usleep(1000); + kip = kvm_getprocs(kd, KERN_PROC_PID | KERN_PROC_INC_THREAD, + pid, &count); + ATF_REQUIRE(kip != NULL); + for (i = 0; i < count; i++) { + ATF_REQUIRE(kip[i].ki_stat != SZOMB); + if (kip[i].ki_stat == SSLEEP && + strcmp(kip[i].ki_wmesg, wmesg) == 0) + break; + } + if (i < count) + break; + } + + kvm_close(kd); +} + /* * Create a persistent jail and return an owning descriptor for it. * The jail is removed when the returned descriptor is closed. @@ -191,11 +231,175 @@ ATF_TC_BODY(poll_close_race_get_desc, tc) ATF_REQUIRE_MSG(close(owning_jd) == 0, "close: %s", strerror(errno)); } +/* + * Verify that a process inside a jail cannot obtain a jail descriptor for + * its own jail. + */ +ATF_TC(curjail_get); +ATF_TC_HEAD(curjail_get, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(curjail_get, tc) +{ + char namebuf[MAXHOSTNAMELEN]; + struct iovec iov[4]; + int desc, error, jid, n; + + (void)create_jail("jaildesc_get_desc_current_jail"); + + strlcpy(namebuf, "jaildesc_get_desc_current_jail", sizeof(namebuf)); + jid = -1; + n = 0; + iov[n].iov_base = __DECONST(void *, "name"); + iov[n++].iov_len = sizeof("name"); + iov[n].iov_base = namebuf; + iov[n++].iov_len = strlen(namebuf) + 1; + jid = jail_get(iov, n, 0); + ATF_REQUIRE_MSG(jid >= 0, "jail_get: %s", strerror(errno)); + + error = jail_attach(jid); + ATF_REQUIRE_MSG(error == 0, "jail_attach: %s", strerror(errno)); + + /* + * Now that we are inside the jail, verify that we cannot obtain a + * descriptor for it. + */ + strlcpy(namebuf, "jaildesc_get_desc_current_jail", sizeof(namebuf)); + desc = -1; + n = 0; + iov[n].iov_base = __DECONST(void *, "name"); + iov[n++].iov_len = sizeof("name"); + iov[n].iov_base = namebuf; + iov[n++].iov_len = strlen(namebuf) + 1; + iov[n].iov_base = __DECONST(void *, "desc"); + iov[n++].iov_len = sizeof("desc"); + iov[n].iov_base = &desc; + iov[n++].iov_len = sizeof(desc); + ATF_REQUIRE_MSG(jail_get(iov, n, JAIL_GET_DESC) == -1, + "jail_get succeeded unexpectedly"); + ATF_REQUIRE_MSG(jail_get(iov, n, JAIL_OWN_DESC) == -1, + "jail_get succeeded unexpectedly"); +} + +static void +nop(int signum __unused) +{ +} + +/* + * Close an owning descriptor while in the corresponding jail. + */ +ATF_TC(self_destruct); +ATF_TC_HEAD(self_destruct, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(self_destruct, tc) +{ + int error, jd, status; + pid_t pid; + + jd = create_jail("jaildesc_self_destruct"); + + pid = fork(); + ATF_REQUIRE_MSG(pid >= 0, "fork: %s", strerror(errno)); + if (pid == 0) { + struct sigaction sa; + + error = jail_attach_jd(jd); + if (error != 0) + _exit(1); + + sa.sa_handler = nop; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + error = sigaction(SIGALRM, &sa, NULL); + if (error != 0) + _exit(2); + + pause(); + close(jd); + /* NOTREACHED? */ + _exit(3); + } + + wait_for_naptime(pid, "sigsusp"); + + error = close(jd); + ATF_REQUIRE_MSG(error == 0, "close: %s", strerror(errno)); + + error = kill(pid, SIGALRM); + ATF_REQUIRE_MSG(error == 0, "kill: %s", strerror(errno)); + + pid = waitpid(pid, &status, 0); + ATF_REQUIRE_MSG(pid >= 0, "waitpid: %s", strerror(errno)); + ATF_REQUIRE(WIFSIGNALED(status)); + ATF_REQUIRE_EQ(WTERMSIG(status), SIGKILL); +} + +/* + * Try to get an fd for a non-existent jail. + */ +ATF_TC(at_desc_bad_fd); +ATF_TC_HEAD(at_desc_bad_fd, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(at_desc_bad_fd, tc) +{ + int jd, status; + pid_t pid; + + jd = create_jail("jaildesc_at_desc_bad_fd"); + + pid = fork(); + ATF_REQUIRE_MSG(pid >= 0, "fork: %s", strerror(errno)); + if (pid == 0) { + struct iovec iov[4]; + char namebuf[MAXHOSTNAMELEN]; + int desc, i, n; + + if (jail_attach_jd(jd) != 0) + _exit(1); + + /* Regression test: loop here to trigger a refcount leak. */ + for (i = 0; i < 100; i++) { + strlcpy(namebuf, "nonexistent", sizeof(namebuf)); + desc = STDIN_FILENO; + n = 0; + iov[n].iov_base = __DECONST(void *, "name"); + iov[n++].iov_len = strlen("name") + 1; + iov[n].iov_base = namebuf; + iov[n++].iov_len = sizeof(namebuf); + iov[n].iov_base = __DECONST(void *, "desc"); + iov[n++].iov_len = strlen("desc") + 1; + iov[n].iov_base = &desc; + iov[n++].iov_len = sizeof(desc); + if (jail_get(iov, n, JAIL_AT_DESC) != -1) + _exit(2); + if (errno != EINVAL) + _exit(3); + } + _exit(0); + } + + pid = waitpid(pid, &status, 0); + ATF_REQUIRE_MSG(pid >= 0, "waitpid: %s", strerror(errno)); + ATF_REQUIRE_MSG(WIFEXITED(status) && WEXITSTATUS(status) == 0, + "child failed with status %d", status); + + ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno)); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, poll_close_race); ATF_TP_ADD_TC(tp, poll_remove_wakeup); ATF_TP_ADD_TC(tp, poll_close_race_get_desc); + ATF_TP_ADD_TC(tp, curjail_get); + ATF_TP_ADD_TC(tp, self_destruct); + ATF_TP_ADD_TC(tp, at_desc_bad_fd); return (atf_no_error()); } From nobody Mon Jun 22 13:26:25 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 4gkTVp0Svvz6hBw3 for ; Mon, 22 Jun 2026 13:26:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVn2DTDz3r8V for ; Mon, 22 Jun 2026 13:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134785; 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=rKlllbJQSU7YWg6LrhKvOD/F64FJQawSI9wXMtCzzL4=; b=qXFTa6Gx3GnoQk4pjwzR9aHERbEA4BIl6riw7/ORffntdxNJ1CND0jvwGhXhngYZEyQqwK kH0R8Sz3nvlKstV9MLZaurYXtwOqhC2UZ1Hrja3U3YVbpVOhZrHuopZJAT1w+G+rUUHmCD JkLOH7uMv2ghWrvCuWJCYsw5O9QRmHu6XlmoQc+gQO4xKBEMA25+ieM6H87Pk8pdJD5I+P hsbm9VaBjnn8LzrZpm4SJeQvH8BAcIfjXkaENN+zFaKE15kKm1NBIgED4xiKMUr6n9l4gV JwTj89ZNGH/f62LP/AZoVGG5xoW8CQYs0aLy0+JbuBDobCKyCWbkFVc1A/Pb1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134785; a=rsa-sha256; cv=none; b=WJHPhKNggN4JB13dR1+EuF2sE6cu66V3cnZAniNpjGrK9WiXahvUCDOJZBSnkER1sQt4NT 9PyyPtw8rpmE5R+HOqs6tASbD87AyefTLQXJ+8h8ckYlxgrvidN4N0lXXxc1C5HiT33J8F XFy4P0FpKN7QRyDJdAUNrRyuKz8JyYk0nhzM7ZDjRca91NpUyb2zE2d8sAokVBGyeqFO0+ zu8iNoFsIvJItDBPRqLk81RrCMAmN0X8JakKVHKR7t8ynJV/K1wX3UAdEVHHg9vbADMirQ 2a4frbnGxgjZ6C6ux1QWYfv3bsPJluUsOQ16UeE8DjSNpjOZlumYtIBEGfX9jw== 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=1782134785; 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=rKlllbJQSU7YWg6LrhKvOD/F64FJQawSI9wXMtCzzL4=; b=WACASDZhsGkk/XWyxX5REYmuKZgaBLA4v3ertaHnJwoms1S3TeqKA54GGF3fDnFpnMWxmw eWKrulXJFuYddmF2CC6B0PITPTwWri1FsAcB8jWD0rxGRv03mwRpS+Jo/zX9kjU+xSr4Zf TFowb/8o5Zaq6n3Dqzs3wOlbwDPfOFE1P3mpLTzOWiPU6IIwhwJG3UGfuYU7Bp7ofa/XLt 9j8vUK3pHGI7CDv55GDebvIELeaYuhkaHUUrPqFmNQDDjY29uQSy0NZeBdOj+3nNYBMKrU d1QUstftLIH8qscASa4vMT1GLS5E99+kN1EN1j1FaoKwzJj2xAtZf9NBOHaDZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVn1JJFzq8g for ; Mon, 22 Jun 2026 13:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3976c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7c7725dd75e1 - stable/15 - tests/jaildesc: Use a more efficient mechanism to block 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c7725dd75e185f8c4026a382d9831b9a7df6b0b Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:25 +0000 Message-Id: <6a393801.3976c.6db045f5@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c7725dd75e185f8c4026a382d9831b9a7df6b0b commit 7c7725dd75e185f8c4026a382d9831b9a7df6b0b Author: Mark Johnston AuthorDate: 2026-06-12 14:58:43 +0000 Commit: Mark Johnston CommitDate: 2026-06-22 13:26:09 +0000 tests/jaildesc: Use a more efficient mechanism to block MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D57148 (cherry picked from commit 75b23c102e8d797654025affdfada0b6771a95ba) --- tests/sys/kern/jaildesc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/sys/kern/jaildesc.c b/tests/sys/kern/jaildesc.c index cfdd1529fdfa..6c7993cfc1d3 100644 --- a/tests/sys/kern/jaildesc.c +++ b/tests/sys/kern/jaildesc.c @@ -120,8 +120,7 @@ ATF_TC_BODY(poll_close_race, tc) error = pthread_create(&thr, NULL, poll_jaildesc, &jd); ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error)); - /* Wait for the thread to block in poll(2). */ - usleep(250000); + wait_for_naptime(getpid(), "select"); ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno)); @@ -150,8 +149,7 @@ ATF_TC_BODY(poll_remove_wakeup, tc) error = pthread_create(&thr, NULL, poll_jaildesc, &jd); ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error)); - /* Wait for the thread to block in poll(2). */ - usleep(250000); + wait_for_naptime(getpid(), "select"); ATF_REQUIRE_MSG(jail_remove_jd(jd) == 0, "jail_remove_jd: %s", strerror(errno)); @@ -219,8 +217,7 @@ ATF_TC_BODY(poll_close_race_get_desc, tc) error = pthread_create(&thr, NULL, poll_jaildesc, &jd); ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error)); - /* Wait for the thread to block in poll(2). */ - usleep(250000); + wait_for_naptime(getpid(), "select"); ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno)); From nobody Mon Jun 22 13:26:26 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 4gkTVp6GW6z6hBl2 for ; Mon, 22 Jun 2026 13:26:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVp3BBwz3rH1 for ; Mon, 22 Jun 2026 13:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134786; 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=0l6h8ER7oD1AwshkOPLQ1V9oB/aXhE8TS1vMc9SU4Gs=; b=QwDj51b+RAtBSHgdf1kfnhJuZcrrfccXZDzbgp5SpK7OrppC/g58QqCOpmCtJxZGZq/dGh qr8DCk8UvFun45MW1JQCX/zTqvjByxgcgSvq7kcZRNA/7gpYjExJ1uKsjo38t7UPCk6mkf vcL37cgWxS2pN2Fdtuqp5HYtApNZ4aNlP4omBIv819imQsmgNfFGWAGicb2rBxjzQvBsCM GshWkNL/H+N8wY4t1aFfdoYexZA7UU+aDegxQb6pdWvwwNySLfGiCSS9puwr7YKe1rCTxZ 5/5qp6IUV/PS9irfYAmneG0+8Od1NUbx5DiigaWMixNpACBz9oWokBoNs//ccQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134786; a=rsa-sha256; cv=none; b=aO4zDp1DRzjD/gwsyksmze1uX3aG4aHNsGCx2hhLINGKhbCxRwFW1RK2Uoog1MRIcRd1GO ihexyTCHkH8uStuUm6O4KRNmbQeqrfzuWiic8pxp0VD6T12Eve088ts7Fu3YLcfh40bMQm +ZxmioDU8i7OwoNPknfUEahGE/dpL1AaoEs+2uRmGb7kev80iHkpeBwrWoKegLQ/6VNdO1 var3RtTdMcis1N/xcxCaTharkM0GStmFvHEISl5AT+NXOntAczd+AZps6BFSg0U/WiGxCo fdDwxA7OIJnhtokdNUESrLMXxVHaUNsreU8cwp4nSxe7Jt5e/3sBIamGOe5fvA== 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=1782134786; 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=0l6h8ER7oD1AwshkOPLQ1V9oB/aXhE8TS1vMc9SU4Gs=; b=YOz/RFflaM5r8CSiWBzA7MKQ1hUBkdkiijMirgMdh9zSq18cQDccaI/XY3yuQxgttml6ce iXxQ8k+XqdpwOEy/1qEBncpJk/VeD1O9pFqSmeyFYxNNnVNXZFXEu8cZY8haqN/iF/i+8Y unxdO/ndWkUtBSVpPdWrNjvlAG0W+VE+1kj2a98U087mfyplTaHwG4akN+v5yyoXuTBR6u GkA63rY0nVwB4s7YJqnvZeupi5fT3yFEF/nAPQptS462YBKv95muUcgvMk7WNiDHnEiiUl hRLoRw7BHlUd9oAkaVxkiUZpy4R2PNvn44AdcWTMBgDIetA1cNNc5TYJ2S5gEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVp25NPzq6n for ; Mon, 22 Jun 2026 13:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39fd1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f3b14134dec1 - stable/15 - rpcsec_tls: Avoid a socket reference underflow in rpctls_server() 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f3b14134dec11c2f09980f25c4c60accbfea0f1e Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:26 +0000 Message-Id: <6a393802.39fd1.3492ec2d@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f3b14134dec11c2f09980f25c4c60accbfea0f1e commit f3b14134dec11c2f09980f25c4c60accbfea0f1e Author: Mark Johnston AuthorDate: 2026-06-15 15:52:24 +0000 Commit: Mark Johnston CommitDate: 2026-06-22 13:26:09 +0000 rpcsec_tls: Avoid a socket reference underflow in rpctls_server() The upcall_sockets tree owns a ref on any resident socket. When a socket is removed after a TLS handshake failure, rpctls_rpc_failed() thus calls soclose(). rpctls_server() does not acquire an extra ref to compensate for this. So, if the upcall fails, e.g., because rpc.tlsservd is not running, we'll call soclose() to drop the reference, but this effectively releases the xprt layer's reference. Fix the problem by explicitly acquiring a socket reference when adding a socket to the upcall tree. PR: 289734 Reviewed by: rmacklem, glebius MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57555 (cherry picked from commit fc7993cf2d6ddba9f94683565838bf8fabc0145c) --- sys/rpc/rpcsec_tls/rpctls_impl.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/sys/rpc/rpcsec_tls/rpctls_impl.c b/sys/rpc/rpcsec_tls/rpctls_impl.c index e1b80217263f..621f6bcac3e4 100644 --- a/sys/rpc/rpcsec_tls/rpctls_impl.c +++ b/sys/rpc/rpcsec_tls/rpctls_impl.c @@ -190,7 +190,6 @@ sys_rpctls_syscall(struct thread *td, struct rpctls_syscall_args *uap) CURVNET_RESTORE(); return (error); } - soref(ups.so); if (ups.server) { /* * Once this file descriptor is associated @@ -277,6 +276,7 @@ rpctls_connect(CLIENT *newclient, char *certname, struct socket *so, if (stat != RPC_SUCCESS) return (RPC_SYSTEMERROR); + soref(so); mtx_lock(&rpctls_lock); RB_INSERT(upsock_t, &upcall_sockets, &ups); mtx_unlock(&rpctls_lock); @@ -294,9 +294,16 @@ rpctls_connect(CLIENT *newclient, char *certname, struct socket *so, stat = rpctlscd_connect_2(&arg, &res, rpctls_connect_handle); if (stat == RPC_SUCCESS) *reterr = res.reterr; - else + else { rpctls_rpc_failed(&ups, so); + /* + * The socket was closed, make sure the krpc code doesn't close + * it a second time. + */ + CLNT_CONTROL(newclient, CLSET_TLS, &(int){RPCTLS_INHANDSHAKE}); + } + /* Unblock reception. */ CLNT_CONTROL(newclient, CLSET_BLOCKRCV, &(int){0}); @@ -388,6 +395,7 @@ rpctls_server(SVCXPRT *xprt, uint32_t *flags, uid_t *uid, int *ngrps, uint32_t *gidv; int i; + soref(xprt->xp_socket); mtx_lock(&rpctls_lock); RB_INSERT(upsock_t, &upcall_sockets, &ups); mtx_unlock(&rpctls_lock); @@ -407,9 +415,18 @@ rpctls_server(SVCXPRT *xprt, uint32_t *flags, uid_t *uid, int *ngrps, for (i = 0; i < *ngrps; i++) *gidp++ = *gidv++; } - } else + } else { rpctls_rpc_failed(&ups, xprt->xp_socket); + /* + * The socket was closed, make sure the krpc code doesn't close + * it a second time. + */ + sx_xlock(&ups.xp->xp_lock); + ups.xp->xp_tls = RPCTLS_FLAGS_HANDSHFAIL; + sx_xunlock(&ups.xp->xp_lock); + } + mem_free(res.gid.gid_val, 0); #ifdef INVARIANTS From nobody Mon Jun 22 13:26:27 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 4gkTVr22xLz6hBwC for ; Mon, 22 Jun 2026 13:26: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVq4xqHz3r1w for ; Mon, 22 Jun 2026 13:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134787; 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=mh5A5zBG1HuFgsD2zeBuLe+8mns+qVDlR1bUEYue88g=; b=IQkR6fpJp/wXNi1xNzpZIHG4FkYdKumaKsgCPQqLi5BHG8mNpM+aqcYR1lIKUKt8VC83qv ARUG6FhATJxPVReQPV4NCjn7nVG13O0xza+H01dmO3Cfr2rKuu+oKsi6rRQm1PCBQWkTIR XkmIvCPbNOBqkZh9dyQlDA8cmXhlJ/88UQ6P/UtZ0NsCgwSad6Xi7JN2z5Ua4gfM1QYmC4 DL8kruh4LtRt/TiWCAL8/QnMrC2rgshDNgpmOqVQXlZ/1VftbzpL2qhrnd9lsJZBsFAd3+ rfnLwCYKoPHStdVRaSA8/pJFFeOaqe6txIUUoHyoibvhGQ06divchfkLSN4QvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134787; a=rsa-sha256; cv=none; b=gW1VvhhxBNRc3d44+KSjEcw2oOsh/B9QzrK6nZiIDLIGyovsmU2Lj379b+qhlwL6UE7oEZ 9+XowIGjweUQMIgz916IllH8xLFuyjHye6X5F/TnoVgsXhAZyrUyFgbqiLycwVpH6ORLkP qPU/h1V5bo4M/cQ7OxNSs1/uRmRu2jZN1mpe2Bf80xHKr0Or0J8WBX+XfNiLWBEzul0Vhu XNXxfpzLcyHT4jAaRr9dSW2Uk+AYSj3eifY/9r148dACAQERbIstn5huIX6fY+7mUGSwRT ppvGIkjrYD7LSrEeuh3/bd3K2fhbh+91UgztY46x2Ns1YZyW/nBGaPFeKYGUTg== 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=1782134787; 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=mh5A5zBG1HuFgsD2zeBuLe+8mns+qVDlR1bUEYue88g=; b=DZ4qEGExJOvoCS5lJKXYjU3D3bA21Yal3nUcruz6z2BRTHSEOlSRtz0kDrag3pTWHzgAXg GeYiVFt2KlNXJoh4I4m2q8Wf3wFWOGGNwoXe0w2zoccciDoEjNi33h8m2d5KeyHAnAGUvJ ttDwMNQm+07dGyRrvditaz8cWxDGi7RbmDY+JUYB/uRguAr+ePEKZjFeL4E4vVQyKLXwQf xnURQTEIOanh+Neo1hlNHNvMgsGtoD23qHxJCYI5zrJx52SBS1yxRz62urnIDfGwIt7uj7 id2QOVzuC7CBx3cDP6hF+FQRa7huXy8+ysS1TO4DNNJlpg5S7JfLezE2O4z/Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVq2x49zqFM for ; Mon, 22 Jun 2026 13:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a6bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 349ba817ce8c - stable/15 - tests/ptrace: Validate PT_SC_REMOTE with some tricky syscalls 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 349ba817ce8c056da32aed0a6364a899ff54ee5e Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:27 +0000 Message-Id: <6a393803.3a6bd.3eb97ae4@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=349ba817ce8c056da32aed0a6364a899ff54ee5e commit 349ba817ce8c056da32aed0a6364a899ff54ee5e Author: Mark Johnston AuthorDate: 2026-06-08 22:45:54 +0000 Commit: Mark Johnston CommitDate: 2026-06-22 13:26:09 +0000 tests/ptrace: Validate PT_SC_REMOTE with some tricky syscalls Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57485 (cherry picked from commit 6cd8a1bf4f15ff8a9b646dc94ac90b3fe0926650) --- tests/sys/kern/ptrace_test.c | 215 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index c1a5d226e990..3827d2e8f41f 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -26,6 +26,8 @@ #include #include #include +#define _WANT_KERNEL_ERRNO +#include #include #include #include @@ -4464,6 +4466,215 @@ ATF_TC_BODY(ptrace__PT_SC_REMOTE_syscall_validation, tc) ATF_REQUIRE(ptrace(PT_DETACH, fpid, (caddr_t)1, 0) != -1); } +ATF_TC_WITHOUT_HEAD(ptrace__PT_SC_REMOTE_exit); +ATF_TC_BODY(ptrace__PT_SC_REMOTE_exit, tc) +{ + struct ptrace_sc_remote pscr; + syscallarg_t args[1]; + pid_t fpid, wpid; + int status; + + ATF_REQUIRE((fpid = fork()) != -1); + if (fpid == 0) { + trace_me(); + exit(0); + } + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + args[0] = 42; + pscr.pscr_syscall = SYS_exit; + pscr.pscr_nargs = 1; + pscr.pscr_args = args; + ATF_REQUIRE(ptrace(PT_SC_REMOTE, fpid, (caddr_t)&pscr, + sizeof(pscr)) != -1); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + ATF_REQUIRE(ptrace(PT_CONTINUE, fpid, (caddr_t)1, 0) != -1); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFEXITED(status)); + REQUIRE_EQ(WEXITSTATUS(status), 42); +} + +/* + * Trace a forking process with FOLLOW_FORK. Once the child stops in + * fork_return(), use PT_SC_REMOTE to force it to call exit(). + */ +ATF_TC_WITHOUT_HEAD(ptrace__PT_SC_REMOTE_exit_child); +ATF_TC_BODY(ptrace__PT_SC_REMOTE_exit_child, tc) +{ + struct ptrace_sc_remote pscr; + syscallarg_t args[1]; + pid_t child, fpid, wpid; + int status; + + ATF_REQUIRE((fpid = fork()) != -1); + if (fpid == 0) { + trace_me(); + follow_fork_parent(false); + } + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + ATF_REQUIRE(ptrace(PT_LWP_EVENTS, fpid, NULL, 1) != -1); + ATF_REQUIRE(ptrace(PT_FOLLOW_FORK, fpid, NULL, 1) != -1); + ATF_REQUIRE(ptrace(PT_CONTINUE, fpid, (caddr_t)1, 0) != -1); + + child = handle_fork_events(fpid, NULL); + ATF_REQUIRE(child > 0); + + args[0] = 42; + pscr.pscr_syscall = SYS_exit; + pscr.pscr_nargs = 1; + pscr.pscr_args = args; + + /* The child must be at the syscall boundary. */ + ATF_REQUIRE_ERRNO(EBUSY, + ptrace(PT_SC_REMOTE, child, (caddr_t)&pscr, sizeof(pscr)) == -1); + + /* Resume the child and ask it to stop during syscall exits. */ + ATF_REQUIRE(ptrace(PT_TO_SCX, child, (caddr_t)1, 0) != -1); + + wpid = waitpid(child, &status, 0); + REQUIRE_EQ(wpid, child); + ATF_REQUIRE(WIFSTOPPED(status)); + + ATF_REQUIRE(ptrace(PT_SC_REMOTE, child, (caddr_t)&pscr, sizeof(pscr)) != + -1); + + wpid = waitpid(child, &status, 0); + REQUIRE_EQ(wpid, child); + ATF_REQUIRE(WIFSTOPPED(status)); + ATF_REQUIRE(ptrace(PT_CONTINUE, child, (caddr_t)1, 0) != -1); + + wpid = waitpid(child, &status, 0); + REQUIRE_EQ(wpid, child); + ATF_REQUIRE(WIFEXITED(status)); + REQUIRE_EQ(WEXITSTATUS(status), 42); +} + +/* + * Use PT_SC_REMOTE to ask the tracee to exit, then send SIGKILL before + * continuing it. + */ +ATF_TC_WITHOUT_HEAD(ptrace__PT_SC_REMOTE_exit_sigkill); +ATF_TC_BODY(ptrace__PT_SC_REMOTE_exit_sigkill, tc) +{ + struct ptrace_sc_remote pscr; + syscallarg_t args[1]; + pid_t fpid, wpid; + int status; + + ATF_REQUIRE((fpid = fork()) != -1); + if (fpid == 0) { + trace_me(); + exit(0); + } + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + args[0] = 42; + pscr.pscr_syscall = SYS_exit; + pscr.pscr_nargs = 1; + pscr.pscr_args = args; + ATF_REQUIRE(ptrace(PT_SC_REMOTE, fpid, (caddr_t)&pscr, + sizeof(pscr)) != -1); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + + ATF_REQUIRE(ptrace(PT_CONTINUE, fpid, (caddr_t)1, SIGKILL) != -1); + + /* The child should honour the original exit() call. */ + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFEXITED(status)); + REQUIRE_EQ(WEXITSTATUS(status), 42); +} + +ATF_TC_WITHOUT_HEAD(ptrace__PT_SC_REMOTE_execve); +ATF_TC_BODY(ptrace__PT_SC_REMOTE_execve, tc) +{ + struct ptrace_sc_remote pscr; + syscallarg_t args[3]; + char *ping_path; + char *argv[5]; + char *envp[1]; + pid_t fpid, wpid; + int status; + + ping_path = __DECONST(char *, "/sbin/ping"); + argv[0] = ping_path; + argv[1] = __DECONST(char *, "-c"); + argv[2] = __DECONST(char *, "1"); + argv[3] = __DECONST(char *, "localhost"); + argv[4] = NULL; + envp[0] = NULL; + + ATF_REQUIRE((fpid = fork()) != -1); + if (fpid == 0) { + trace_me(); + exit(0); + } + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + args[0] = (syscallarg_t)ping_path; + args[1] = (syscallarg_t)argv; + args[2] = (syscallarg_t)envp; + pscr.pscr_syscall = SYS_execve; + pscr.pscr_nargs = 3; + pscr.pscr_args = args; + ATF_REQUIRE(ptrace(PT_SC_REMOTE, fpid, (caddr_t)&pscr, + sizeof(pscr)) != -1); + /* EJUSTRETURN here is an implementation detail. */ + REQUIRE_EQ(pscr.pscr_ret.sr_error, EJUSTRETURN); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + { + struct kinfo_proc kp; + size_t len; + int mib[4]; + + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PID; + mib[3] = fpid; + len = sizeof(kp); + ATF_REQUIRE(sysctl(mib, nitems(mib), &kp, &len, NULL, 0) == 0); + ATF_REQUIRE_STREQ(kp.ki_comm, "ping"); + } + + /* Let the child (now ping) run to completion. */ + ATF_REQUIRE(ptrace(PT_DETACH, fpid, (caddr_t)1, 0) != -1); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFEXITED(status)); + REQUIRE_EQ(WEXITSTATUS(status), 0); +} + /* * Ensure that procctl(PROC_REAP_KILL) won't block forever waiting for a target * process that stopped to report its status to a debugger. @@ -4704,6 +4915,10 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, ptrace__procdesc_reparent_wait_child); ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_getpid); ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_syscall_validation); + ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_exit); + ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_exit_child); + ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_exit_sigkill); + ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_execve); ATF_TP_ADD_TC(tp, ptrace__reap_kill_stopped); ATF_TP_ADD_TC(tp, ptrace__PT_ATTACH_no_EINTR); ATF_TP_ADD_TC(tp, ptrace__PT_DETACH_continued); From nobody Mon Jun 22 16:00:28 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 4gkXwd5S3Kz6hT5K for ; Mon, 22 Jun 2026 16:00:33 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkXwd4yRbz3Jx1 for ; Mon, 22 Jun 2026 16:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782144033; 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=qpHm5avlGVeo1J4P0RI/TWb3qANry62S4OnX5QlGCuE=; b=HFlBIqtGq5bTo+WCBxmr/8GJ8Qzz0mbn4NVu76Na98iSJ5Q+0/PDgcgAbz92VYnax4j+0C Hq0s94I9DohR8+HLA31VCRt6hc1yd2OQ5/vzXw+9pFj8HNvEt1x9gl/GOMlIV9CAuTWzM6 MgAc6PPSTSNF9yTP3RgMG9Moj0NJvwg3AlcdabyezknGZWwBjkTIM0cZDyNw1TFG/XWpr6 QeEGzndFgMOSFDsa4kk48EVSNa2pihBHZoyVmrodLpFHuNw1WhIitaeQ0krmP03OlUVscq 8qsBoeB4gjsXroQfGvcw+D+KOHcBNEM/LVoZjEeg9ubKaq6uaaJIuaJ77Bgy7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782144033; a=rsa-sha256; cv=none; b=fwXQy8R6lqc6hAcN6RIShtBdZtBxSkds241vQWC9kdGsTfcW53/UlmAme4py2DgYV1P2sp 0SDt98DwCaWR6haEBIUylFKx6qgywtLnxjztPTEoo6JxG5TGpIY/KK5fRJrOMKdRc10yUy q5rZga+WLNJDvLRHcTnIgttCfnG1Y+QSVBMolfl2daEEqNmNPeD/CfvDWMbZE0qkE+hjkt hHjFrtjJSehxdw3dbouAAi/BLLwDPWCNXE6NJsAxAyqxe4942poMb69zwnABnDPTjx1LcW k1EWqWpHsSapRh3Aki1UNLqj3/P357dOtao1Cmy1UkyxzqAy908R3q8K2YeMGA== 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=1782144033; 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=qpHm5avlGVeo1J4P0RI/TWb3qANry62S4OnX5QlGCuE=; b=Q6N1Tpyt+tG8QX02O2nKJRHfcWpshx/yoK5UWqiBc/wTIehHmrpmRixxUb4A6lZ6Pu8vDx tzkPs8QPDcB7hgKJpgshqltt7E/UsP8rgIo3eJOMuLUp592C+4XttXyb5y8Yn0O8omJ6Vk p7gbhok3nuzz7QEDDQEbDK5yo69Qa0tgSSAuncUEIbQCe50SozpGmO84NG4TgNrgXE5iK1 SmnhUNf/QRhv9pXRyTrg8WJH567KxjQLndrieNWZV3P/PGkaFWj4NCfAOAkC6tRlGPi1G5 3QNYSo4sZuqeUEN4NiyvE11YdBTWZ41s2VfcrWzszi+7XNFf/MGIoZ49QOCXXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkXwd3gKxztHX for ; Mon, 22 Jun 2026 16:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ec5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 16:00:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Konstantin Belousov Subject: git: 17c391c6a216 - stable/15 - i386: Fix build (of 'genassym.o') 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 17c391c6a2169f6a50644b6add63a98b7f7a707b Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 16:00:28 +0000 Message-Id: <6a395c1c.18ec5.2b9dfc56@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=17c391c6a2169f6a50644b6add63a98b7f7a707b commit 17c391c6a2169f6a50644b6add63a98b7f7a707b Author: Olivier Certner AuthorDate: 2026-06-03 13:11:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-22 15:59:37 +0000 i386: Fix build (of 'genassym.o') (cherry picked from commit ce243df20aa8ba94918cafdca2537c8cd18887c8) --- sys/conf/kern.post.mk | 5 ++++- sys/i386/i386/genassym.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 7cdfd17778db..575e92a8230e 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -260,7 +260,10 @@ genoffset_test.o: $S/kern/genoffset.c offset.inc assym.inc: $S/kern/genassym.sh genassym.o genoffset_test.o NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh genassym.o > ${.TARGET} -genassym.o: $S/$M/$M/genassym.c offset.inc +# vnode_if.h added for the sake of i386 only to fix commit 72ab129799a2 ("x86: +# remove sys/mount.h from genassym.c"). Can be removed as soon as i386 kernels +# are dropped, or if the -> dependency vanishes. +genassym.o: $S/$M/$M/genassym.c offset.inc vnode_if.h ${CC} -c ${NOSAN_CFLAGS:N-flto*:N-fno-common} \ -fcommon $S/$M/$M/genassym.c diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index 1a31f6b3428c..9f994b9ca9d8 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include From nobody Mon Jun 22 16:00:59 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 4gkXxQ5YGGz6hSvj; Mon, 22 Jun 2026 16:01:14 +0000 (UTC) (envelope-from kib@freebsd.org) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4gkXxP33DVz3KNL; Mon, 22 Jun 2026 16:01:13 +0000 (UTC) (envelope-from kib@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 65MG0x59063182; Mon, 22 Jun 2026 19:01:02 +0300 (EEST) (envelope-from kib@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 65MG0x59063182 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 65MG0xnF063181; Mon, 22 Jun 2026 19:00:59 +0300 (EEST) (envelope-from kib@freebsd.org) X-Authentication-Warning: tom.home: kostik set sender to kib@freebsd.org using -f Date: Mon, 22 Jun 2026 19:00:59 +0300 From: Konstantin Belousov To: Harry Schmalzbauer Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: c20d12958d45 - stable/15 - x86: remove sys/mount.h from genassym.c Message-ID: References: <6a37b9e3.1c727.210fed3a@gitrepo.freebsd.org> 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4gkXxP33DVz3KNL X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Mon, Jun 22, 2026 at 05:53:07PM +0200, Harry Schmalzbauer wrote: > On 2026-06-21 12:16, Konstantin Belousov wrote: > > The branch stable/15 has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=c20d12958d45b8a01b9d3dd99b85a195183190ec > > > > commit c20d12958d45b8a01b9d3dd99b85a195183190ec > > Author: Konstantin Belousov > > AuthorDate: 2026-05-16 19:27:40 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2026-06-21 10:05:30 +0000 > > > > x86: remove sys/mount.h from genassym.c > > (cherry picked from commit 72ab129799a231e322b119de3f9c1263e76527b8) > > > Hello, > > without reverting this commit I can't compile my custom kernel (i386): > > cc -target i386-unknown-freebsd15.1.0 > --sysroot=/usr/obj/freebsd-src_1501501/Haswell-AlderLake/i386.i386/tmp > -B/usr/obj/freebsd-src_1501501/Haswell-AlderLake/i386.i386/tmp/usr/bin -c > -O2 -pipe -fno-strict-aliasing -march=haswell -g -nostdinc -I. > -I/vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys > -I/vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/contrib/ck/include > -I/vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/contrib/libfdt > -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -MD > -MF.depend.genassym.o -MTgenassym.o -ffile-prefix-map=/vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys=/usr/src/sys -ffile-prefix-map=/usr/obj/freebsd-src_1501501/Haswell-AlderLake/i386.i386/sys/BHYVE-TELESTO=/usr/obj/usr/src/i386.i386/sys/BHYVE-telesto -ffile-prefix-map=/usr/obj/freebsd-src_1501501/Haswell-AlderLake/i386.i386/tmp=/sysroot > -fdebug-prefix-map=./machine=/usr/src/sys/i386/include > -fdebug-prefix-map=./x86=/usr/src/sys/x86/include -mno-mmx -mno-sse > -msoft-float -ffreestanding -fwrapv -fstack-protector-strong -gdwarf-4 -Wall > -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef > -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs > -fdiagnostics-show-option -Wno-unknown-pragmas -Wswitch > -Wno-error=tautological-compare -Wno-error=empty-body > -Wno-error=parentheses-equality -Wno-error=unused-function > -Wno-error=pointer-sign -Wno-error=shift-negative-value > -Wno-address-of-packed-member -Wno-format-zero-length -mno-aes -mno-avx > -std=gnu17  -fcommon > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/i386/i386/genassym.c > In file included from > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/i386/i386/genassym.c:63: > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfs/nfsproto.h:375:2: > error: unknown type name 'fhandle_t' >   375 |         fhandle_t       fh_generic; >       |         ^ > In file included from > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/i386/i386/genassym.c:64: > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfsclient/nfs.h:239:1: > error: unknown type name 'vfs_init_t' >   239 | vfs_init_t nfs_init; >       | ^ > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfsclient/nfs.h:240:1: > error: unknown type name 'vfs_uninit_t' >   240 | vfs_uninit_t nfs_uninit; >       | ^ > In file included from > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/i386/i386/genassym.c:65: > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfs/nfsdiskless.h:65:21: > error: use of undeclared identifier 'MNAMELEN' >    65 |         char            root_hostnam[MNAMELEN]; /* Host name for > mount pt */ >       |                                      ^~~~~~~~ > /vol/OmniLAN/git.worktrees/FreeBSD-src.cust_15.1/sys/nfs/nfsdiskless.h:99:21: > error: use of undeclared identifier 'MNAMELEN' >    99 |         char            root_hostnam[MNAMELEN]; /* Host name for > mount pt */ >       |                                      ^~~~~~~~ > 5 errors generated. > *** [genassym.o] Error code 1 > > After reverting c20d12958d45b8a01b9d3dd99b85a195183190ec locally I can > successfully build the custom kernel > Haven't had time to see if this is i386 specific, which I doubt it is.  I > guess it's related to my custom kernel config then... > > Any hints apprectiated. > Might be fixed by 17c391c6a2169f6a50644 From nobody Mon Jun 22 16:09:08 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 4gkY6Y1rygz6hTn5; Mon, 22 Jun 2026 16:09:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkY6Y1Jfhz3Lks; Mon, 22 Jun 2026 16:09:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782144549; 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: in-reply-to:in-reply-to:references:references; bh=BbhfsrtNgSZUc8oyi+JdSCwJ2umJ5KmsqKlzXjSP2A0=; b=tonTstYZpvYKtzSzB0iX/MvsHucz52hiljP8JlHsbOEOg3hnD6qHRBqwvMDD6PX+4kw6Ju h0S8WALyaQTW/SOQjXXz8ldoo+5DYMP2mZudYkM+VPSI8r/9TjqhiwIRIV7nRcQXAzcY/e TZjkHWXlTcn8Fy5NNTgonMYIz32kOoHddb8YTR0gthV+ISrBl24fymS7sI14THV8w54QMk 6TFj2XGmDu006bJPJLFl6621hHrkpdqs3GH1/6NTCWPi65ZXQ+d1uMaz4isVXkTBAWKI0j BLVKN0KCwDQc2wTflc+lelvmnaW3adMPvRXWTe6QY8OIvkSt69ygrsCcneFqcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782144549; a=rsa-sha256; cv=none; b=cewNCTP2WASnc0+DYmkskcatyoMAghzB9Pj/LCh/JqIdgXWrdWm6eEuyAyh7B2w7qU0/eC mYGrozrrJPlKZStGNBu3CT+iuaUnZ5nb0bGHgWIlz4r2swSA1mmNlp7c9jnT8aIqs1cbse QWjdRv0FDXZslVzRCZb73EilndntoQQPutetdw44+ysCLcGI6zP8KOLgy7x3O9V6N0jhDC xQAMAeBq8ZoTE+J2li8PcHmjD72x3S5qSzrtXeVZVeW2ZoaA/Ht3GlOkOVtFfH8SeHtmud N3TqNzTOAuyifeamVPmzP3Wd2fRzLFge5+6M1tIR4Nzf7Ssd3NvhGjiePtw76Q== 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=1782144549; 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: in-reply-to:in-reply-to:references:references; bh=BbhfsrtNgSZUc8oyi+JdSCwJ2umJ5KmsqKlzXjSP2A0=; b=dsAOgMcumrASlxnL3yCgS+ktVBaXDfQ+S+rIgx4Xr06GfAGSuSru8UJp+Kmx6Y+TRwGuKJ vEOoy+D8BX8V0zmPuAK4+gIpBm2qw1WSdDLCd9HFtMdzw3Cea1xs6KfQyvquUnaCcHRcn4 ehJ160J94dWac2rjA7jKDTGdmq+YRO22/FTS87SFhFTg1yiq8isVyBekt8z8WOkg1CIB7q 5AMM+CtQUbBbhntktTAUVIqoP9LmnqDjWTwZz+5rgxHfxOMs6O2kenl+DYHjNgcuKjD5lI 5Jp1lSkGdR7wk55BsLGYCI5x0Ok3NOCdqU7dr75h9Rmw+grRNt1MxzO8kdJAYA== Received: from [IPV6:2601:5c0:4202:5670:f155:cc19:eaea:f026] (unknown [IPv6:2601:5c0:4202:5670:f155:cc19:eaea:f026]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gkY6X65StzJnf; Mon, 22 Jun 2026 16:09:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <5ad1267a-e978-4da2-b4f9-e41e2594b605@FreeBSD.org> Date: Mon, 22 Jun 2026 12:09:08 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: c20d12958d45 - stable/15 - x86: remove sys/mount.h from genassym.c Content-Language: en-US To: Harry Schmalzbauer , Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <6a37b9e3.1c727.210fed3a@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 6/22/26 11:53, Harry Schmalzbauer wrote: > On 2026-06-21 12:16, Konstantin Belousov wrote: >> The branch stable/15 has been updated by kib: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=c20d12958d45b8a01b9d3dd99b85a195183190ec >> >> commit c20d12958d45b8a01b9d3dd99b85a195183190ec >> Author: Konstantin Belousov >> AuthorDate: 2026-05-16 19:27:40 +0000 >> Commit: Konstantin Belousov >> CommitDate: 2026-06-21 10:05:30 +0000 >> >> x86: remove sys/mount.h from genassym.c >> >> (cherry picked from commit 72ab129799a231e322b119de3f9c1263e76527b8) > > > Hello, > > without reverting this commit I can't compile my custom kernel (i386): FYI, do note that i386 kernels are not supported for 15+. They might happen to work currently, but at some point the code will be removed entirely (currently planned for "some time around the EOL of stable/14"). We probably will keep it (mostly) building for the near term, but that is for the purpose of keeping stable/14 working. -- John Baldwin From nobody Tue Jun 23 06:46:51 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 4gkwbJ196Qz6jTtK for ; Tue, 23 Jun 2026 06:46:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkwbH5lq8z4PtC for ; Tue, 23 Jun 2026 06:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782197211; 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=PZXAdsjmHX3gpj7HSeAfJM8V7/L4Zs8FBD7W7mUBsi4=; b=hxPDRgXy2eDOZS1MEV84CNbKXF0jljWv5toHCso9+d8gmJcr4Wjn2JeAaUhYyfV+1zNyMk 0NnE1eeFLmo/QIqRfCR4rzm8kS7wLooxf3eyfrrvC0a7GOqOXKJ6KnDJ3yzHSll9fAtJUr Vp7QVAZh+A5/nmnz5V3dx1WJQmPcIrUro5Z31mZrVSHcT2FqmgMpT3X0Mfk/ppGyJDaaU9 YaPhq7wBo5DiW58yTI205YpBQhxitAmQe89K1eWUCWp0mukRrY+8caFiWVku1zWw7M6pS/ bL9o4lP9KcZkTHuA75MYv+SYVt+rZpQFVbSd7rQ4xuLFg6Vm41NBmw456vhq6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782197211; a=rsa-sha256; cv=none; b=xpN0kVecOlVF/TgvuhTAkCCy66PIZjLvv3ajPe2YzdGCWjm+9Y2+pKhTyysn0OugikjM7N dgPNjhmrX9MklRPTN3XPa+xZU85ktz1oMb6r1ix7cRa9AS7N9bLbBupyKTVbiilZDabnFV HUzCkjTan75m5msVyxmH+7C/BdT8uAJpH8EULT9upvLdIxfBZz/7N3HLWo+d9ksnORMPn1 A69ZDz7yFWzBFdH/Bps4YrQkhH49gBT7KAnAAdW1y5YizChjrxO8NSfXIWBsjudeU3I5gS ywQW1vzWxA/gqDRLjWHGhvgWkME3dB9VolCjYFE2/5AJs1kW1jHPb1gbb7+xSA== 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=1782197211; 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=PZXAdsjmHX3gpj7HSeAfJM8V7/L4Zs8FBD7W7mUBsi4=; b=KhOmrVidsQKMrYwY5DddKUC7zvlxL9B+UfMUDEExxvQgAVxfV4kRuzH4l5hw3J/JLkTltn hqTSGBI+X1AfVNNkbEhLtCcSnDj8SCXOa9xr/PfQ87qCKYYyocNskS2uT+8PH4102aJWwi nOrdO10FnWJerYG8CfA1CFZxxS3Yugmc0MQY87WAwD76kkgrdtH5K7tt+DHJvtSvn03jZS qqJK62n0lNcNqttZmxTG5dhvgiaI0/3sa4KHkZf5mVagjzbEVBIQwqVFWttwy8UnRfDGr8 lzsvvy8kuQVD1CivcMvv0cZ87s60X2Cn9kWnqVkINT4r68d/lthHKdx/ndv5RA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkwbH3kM2z6p6 for ; Tue, 23 Jun 2026 06:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3900b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 06:46:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 26a94ad8fb31 - stable/15 - pfsync: remove invalid panic 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 26a94ad8fb317152ea9aaaba0760bbeb658d17dd Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 06:46:51 +0000 Message-Id: <6a3a2bdb.3900b.6655c9ff@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=26a94ad8fb317152ea9aaaba0760bbeb658d17dd commit 26a94ad8fb317152ea9aaaba0760bbeb658d17dd Author: Kristof Provost AuthorDate: 2026-06-06 13:44:17 +0000 Commit: Kristof Provost CommitDate: 2026-06-23 06:38:04 +0000 pfsync: remove invalid panic When we undefer a packet (when the peer acks the state) it's possible that we don't find a corresponding pfsync_deferral. We panic here, but that's actually something that can happen in normal operation: - if we have too many deferred packets already (in pfsync_defer()) - if the deferral timed out (in pfsync_defer_tmo()) Remove this panic and document the scenarios where it might occur. MFC after: 2 weeks Sponsored by: Orange Business Services (cherry picked from commit 035e87247f845500b4672e10efb8f47fd2c0f2a2) --- sys/netpfil/pf/if_pfsync.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index a5f377e84307..a64d0ef64a61 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2356,7 +2356,11 @@ pfsync_undefer_state_locked(struct pf_kstate *st, int drop) } } - panic("%s: unable to find deferred state", __func__); + /* + * If we don't find this state in b_deferrals that might be because we + * overflowed the list (see pfsync_defer()'s >= 128 check') or because + * the deferral timed out already (see pfsync_defer_tomo()). + */ } static void From nobody Tue Jun 23 06:46:50 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 4gkwbH18LNz6jTr4 for ; Tue, 23 Jun 2026 06:46:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkwbG5yxnz4Q7m for ; Tue, 23 Jun 2026 06:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782197210; 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=sUVmCUHtqMEWOhEODdI5tRVkT+d9MCwAYcv+N5BOMfI=; b=lrtOdNoBO3BH+DSSTJwPZ7znwVRPa6MvtWIkMKAmUJWHt2eehak9/xi2SMcLfYQbNS4kFn +Pk1cIBzLuZwmUwEWJNG4jq5m5TrpQbvcapwIuW9jWs6bYcMRDmftr528MtmbryA8ENs9H lPiRNKAy72kll7RvMk5wL2s4WI9t4lf4WlxdV+Z4rHqePg2mzcs2AOZpguXyX00v8ZSk7a 0tPIUeTBAZhGNaAavbFA0Nn6GvE2VgGnMqpEzHwRoOY3IuWwiG9oDZQDnxV7rDQmkzR7kF O3QJVqJzW8JM2zwAmw4bumaChn9nf+ZpZ+ihvbtxKcUdALko1STRopEk5lBS9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782197210; a=rsa-sha256; cv=none; b=GCg82yVCe5cUAOKPbNnLe507zTs19Y2QCArkJA32c2xHJ1gzOHZlsa75xTc3xE9CXU4mlx bTb6QSGt7nYvypEqyMHMIvYaYlA9B5CBexfOteXvI4ymCT2ndB0KBEDpRr5lDtF380hjpU +gGH4T6SkiRhJWMxbgHdaWl2oEEZ98yPcNrAXRTqkQhOgU4xhBZDT5yLz/lVh17zTnJIjW 4fU6fYS7b3AxX5q3RdHMWGpTWEMPRpcRWroWPZHaScFmoZIsgiqlI49LzAYHsajndazUQL h/FIYh1RSmAnazAdhpLb3wByDrACIxXuxOMnITVkORsEn2hp62HmRlTbN3YXSA== 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=1782197210; 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=sUVmCUHtqMEWOhEODdI5tRVkT+d9MCwAYcv+N5BOMfI=; b=QtNyPN/PddYBXZTd+7t2paAyulJ1LOpsO1nKzljXq/a7FpVAa4ueCaDJtMB8BZWpC3jWc5 iTAkF7V/4K+2n8RLq6jLWvL1MY8cySvTt+5/IDY6DdNcTLptT2jSveRxvXx1GtCFpvwhzz NlmFlsIe0cmQJYNA/42V9nek02VzasJ9t6CeLc8lIX7XweviL4ZwgrgTilAdOK6BKmwV4A HSiiaKBp6z0VEgB7sER0aGr+tXluUJ3F654Dg+x/v4H5LtfWIF+tMHkaotDscaC6mKmQUv PywdLmRKQbXRE1svRMZFsCBTa3FSoKXmeRNugist45FYBEjdKNQuOdea9LbliQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkwbG4KvLz7NK for ; Tue, 23 Jun 2026 06:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37dd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 06:46:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f4e2f07f0cbc - stable/14 - pfsync: remove invalid panic 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4e2f07f0cbc976e5a894ab4f3dbbccb15e06d46 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 06:46:50 +0000 Message-Id: <6a3a2bda.37dd7.7a1859a@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4e2f07f0cbc976e5a894ab4f3dbbccb15e06d46 commit f4e2f07f0cbc976e5a894ab4f3dbbccb15e06d46 Author: Kristof Provost AuthorDate: 2026-06-06 13:44:17 +0000 Commit: Kristof Provost CommitDate: 2026-06-23 06:37:59 +0000 pfsync: remove invalid panic When we undefer a packet (when the peer acks the state) it's possible that we don't find a corresponding pfsync_deferral. We panic here, but that's actually something that can happen in normal operation: - if we have too many deferred packets already (in pfsync_defer()) - if the deferral timed out (in pfsync_defer_tmo()) Remove this panic and document the scenarios where it might occur. MFC after: 2 weeks Sponsored by: Orange Business Services (cherry picked from commit 035e87247f845500b4672e10efb8f47fd2c0f2a2) --- sys/netpfil/pf/if_pfsync.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 10883e233b03..4d83962abc74 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2147,7 +2147,11 @@ pfsync_undefer_state_locked(struct pf_kstate *st, int drop) } } - panic("%s: unable to find deferred state", __func__); + /* + * If we don't find this state in b_deferrals that might be because we + * overflowed the list (see pfsync_defer()'s >= 128 check') or because + * the deferral timed out already (see pfsync_defer_tomo()). + */ } static void From nobody Tue Jun 23 15:56:51 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 4gl8nv3d92z6hf8d for ; Tue, 23 Jun 2026 15:56:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl8nv33mqz3HR2 for ; Tue, 23 Jun 2026 15:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230211; 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=Y1ivz6JKeL79Fw+kA21uTSboNUpiZziN9UVCfwIqoS0=; b=ZaHKyP2hMHtfnHPrOaRBQe+clFmgBePpz5gmVD6eWAhpxXLl0gdCDK4GYmDX56hhWvfC84 5Gh006KntXC1JirSMxsROK0AEGgP/i43llfHdvBA8CSyqiMwTu2YAYRitRKkdPQ4iyRy8R nHn24dFbBQF46XJ1xTagaLZ6+e4Qrr+9jSr0UtPiBEdfgBloLJxNf8QjfDxHHFR3/O7I9r grsaBeqTPgDVLRy2xmVauf8VrGh8p/fvgMIrhg7ehdwyttF71DXqGCiL5PQC48dF31q6hE Wbp9dQCI6qNaEar8xzLzVDWDLeEg8boTsbC8V1qXAL+cpXIxF1WvPhkFxp0VzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782230211; a=rsa-sha256; cv=none; b=u7tCyonUSVCgyVo2aUuyZIswnXNPgweLRlkUvrVikiYccSpChh+ww2SuXoE7DLgoxOxodM /TM7TO7vpDqaqfkwxTECkJaQzFmQp5aMfab1ZIidKstFU3uQd1TlopMQ7asCyqYaBnE5Mv JfR8eGBsRwamkow2/8n9aFGOqgzANbWZLYq8r/cFQ7o4ZBc6Ns+G6a/KZXRaqsTvhbvdeh U3H4xAppaCInZfhKHZunIfnrK522psfjDq9xEQ/IcRYRCVYMa6K4C79GN48bgDsoKGJocY oHEJz8McN5SsCd5hUg4OxOlKG0hLUaKEx8D+AsDDRBYcuDpx0g91IIetXlK+Lw== 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=1782230211; 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=Y1ivz6JKeL79Fw+kA21uTSboNUpiZziN9UVCfwIqoS0=; b=qPhlylmJ8AEMjrs1SNVJsEr1hGJHQCjRfYo6B5nD0ZCiNHxutFAPoE5I2BRzfSZ3X8Ygp6 Ve/6ecz1dIhyzFP6CCzCOMAUsljNiIAbQ5OK3EX4V7DjBakVNtvpuiHs4Yo8Ic1vilXN59 5FcUFp5Rw3PjCdC8lexCKoS/1CHA134SfaeIo8M/Li8a3+/S7JVx+2eYEDWB8VwNUlCuOy gq59JTWlozcqmoSASMnOknlZCo5837oFArVRAOrm3R/Pyygn9ULY4rPfyix4X0ImY1LQNU 3tRP1OqI3v/HiPXmKgYmQ0IY92VGWxz4J3YJUIcW5FuoFWEfFfRDp7BxTBxvHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl8nv1vDQzgYX for ; Tue, 23 Jun 2026 15:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21764 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:56:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 49c7ac23fa1d - stable/15 - Centralize definition of ZFSTOP 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 49c7ac23fa1dd4c883bc91bae4a854deff0cba54 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:56:51 +0000 Message-Id: <6a3aacc3.21764.5efdf54d@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=49c7ac23fa1dd4c883bc91bae4a854deff0cba54 commit 49c7ac23fa1dd4c883bc91bae4a854deff0cba54 Author: John Baldwin AuthorDate: 2025-11-24 15:46:56 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:20:55 +0000 Centralize definition of ZFSTOP Define this helper variable in one place and make it available while building the entire base system. Reviewed by: sjg Obtained from: CheriBSD (mostly) Differential Revision: https://reviews.freebsd.org/D53790 (cherry picked from commit 7980cf5d6f71adef3ca38825f4aa8aa38a59e43c) --- cddl/lib/libtpool/tests/Makefile | 2 -- cddl/lib/libzpool/Makefile | 2 -- cddl/sbin/zfs/Makefile | 2 -- cddl/sbin/zpool/Makefile | 2 -- cddl/share/zfs/compatibility.d/Makefile | 2 -- cddl/usr.bin/zinject/Makefile | 2 -- cddl/usr.bin/zstream/Makefile | 2 -- cddl/usr.bin/ztest/Makefile | 2 -- cddl/usr.libexec/zfs_prepare_disk/Makefile | 2 -- cddl/usr.libexec/zpool_influxdb/Makefile | 2 -- cddl/usr.sbin/zdb/Makefile | 2 -- cddl/usr.sbin/zhack/Makefile | 2 -- share/mk/src.sys.mk | 3 +++ 13 files changed, 3 insertions(+), 24 deletions(-) diff --git a/cddl/lib/libtpool/tests/Makefile b/cddl/lib/libtpool/tests/Makefile index 19e43cc18821..72a82b6afa59 100644 --- a/cddl/lib/libtpool/tests/Makefile +++ b/cddl/lib/libtpool/tests/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - ATF_TESTS_C+= libtpool_test TEST_METADATA+= timeout="10" diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 407159a85255..c4b9b31602f5 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/lib/libzpool # ZFS_COMMON_SRCS diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index 9a0a5198602e..3b9abe4446e8 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/cmd/zfs .PATH: ${ZFSTOP}/man/man7 .PATH: ${ZFSTOP}/man/man8 diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index ab7b852b4d9a..be498d730011 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/man/man4 .PATH: ${ZFSTOP}/man/man5 .PATH: ${ZFSTOP}/man/man7 diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile index 6d3663081ae6..4bc8da774168 100644 --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/cmd/zpool/compatibility.d PACKAGE= zfs diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index 921d4df7a651..6db4bf6a53cd 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/cmd/zinject .PATH: ${ZFSTOP}/man/man8 diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index b131901cb6a9..b9c45c25923e 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/cmd/zstream .PATH: ${ZFSTOP}/man/man8 diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index cb51b5110f03..dc80100ddcac 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -1,7 +1,5 @@ .include -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/cmd .PATH: ${ZFSTOP}/man/man1 diff --git a/cddl/usr.libexec/zfs_prepare_disk/Makefile b/cddl/usr.libexec/zfs_prepare_disk/Makefile index 0d3f9b56b28c..1a261c5684bc 100644 --- a/cddl/usr.libexec/zfs_prepare_disk/Makefile +++ b/cddl/usr.libexec/zfs_prepare_disk/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/scripts PACKAGE= zfs diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile index 064ac9b23e4a..3c271997fb3b 100644 --- a/cddl/usr.libexec/zpool_influxdb/Makefile +++ b/cddl/usr.libexec/zpool_influxdb/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/cmd/zpool_influxdb .PATH: ${ZFSTOP}/man/man8 diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index ad6e63f428a3..13d98b60d1fb 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/cmd/zdb .PATH: ${ZFSTOP}/man/man8 diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile index 69d561b3407b..a11abd6efe9d 100644 --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -1,5 +1,3 @@ -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - .PATH: ${ZFSTOP}/cmd .PATH: ${ZFSTOP}/man/man1 diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index ec035fb71e54..6d6523f24754 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -48,6 +48,9 @@ CFLAGS+= -fmacro-prefix-map=${SRCTOP}=/usr/src -fdebug-prefix-map=${SRCTOP}=/usr DEFAULTWARNS?= 6 +# ZFS source directory +ZFSTOP?= ${SRCTOP}/sys/contrib/openzfs + # tempting, but bsd.compiler.mk causes problems this early # probably need to remove dependence on bsd.own.mk #.include "src.opts.mk" From nobody Tue Jun 23 15:56:52 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 4gl8nw6NqGz6hdsw for ; Tue, 23 Jun 2026 15:56:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl8nw412Nz3HYm for ; Tue, 23 Jun 2026 15:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230212; 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=jiBRZNEZn/Z9K5bbiWfkVM44Ko2jxrSQilXNHnrTDMs=; b=jGtx0mjRFc8/YDl88W8R8KBG623PPPPMmZfThnXaTcgr4r8hzt5vbZhR30bAhIVUKEs2FS ecz2YGZNZ8Ugl+qOTDFDBx8xIQqxFAYq5Z059W8BRUxQQ3y1QVqiOTOtq4AkclmEeGBAyJ pRSRAvrRh+gYQYTLxCwXJbyUNEfKKigv6XVrLEvWRXoFh4OtjwzDmdj4ZtReVlDeVXuIiN K2jwXQX0yK5AB89awHDUicBI4/R1aJrFmzS/rXkGLOI/dceI83ciToii1A+Zmh1XlwompP 4knWMrnonnnghcUzRYBo4q4+fo8zxabsuUhwq0/meulzamlEAGOPdNoaNRvMZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782230212; a=rsa-sha256; cv=none; b=efhw26p8BGRT184S5TowzMbyRAYS6MIxQjOmyTSq77uacOrkS9cfbGBVQeIydw6JDhCFme 6AcjKXpyv/ye4ue1Fc5DpPEtU5tADJAQ2s3sz+4jWOis4BK6w7cForqH53ECWmemhVomlM F/01RNc5/Ak08CrLM6/BIxEnltysSCdiLruAo9oaN9+7oeQYPcqlaELoJGyqTfd3nrMGbW Gcg2V6FD9AHkDnJEOjXIX+tIe5QmQjPQTMTvowWVU1z9Ft16wTRqYiJCx7w3N3vXO6HxMD LU18xxz3v7PAGTthPg0efrJmjq14gI4dPwsHkXX/XCtuGOW0/kO0cgxpVysSYA== 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=1782230212; 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=jiBRZNEZn/Z9K5bbiWfkVM44Ko2jxrSQilXNHnrTDMs=; b=VcgAL3BTTbKbrXLoKGva5XE0EVYhx29zm+tlWVpu20BaXpPgLCgK4ydatvmyJsGGYecpCx l1o0FIV0/QaF7IcEwpAZylqqrJm9KRvJH7LMM186MlnWFg5ujcY7TtaDSO42JXvmMmWz0B spvhO3HBN4w9y7zK5FZ3sKr1la+ozGneRcDmVtYSGHtiKUq59jGTJwBdZrL+K7OM8gn1RY zb5t8jdmhw+NsQgwcfFL8g27MbKEkXL0CER37zLY12a/Yoh6+bD8LTKip0+jverc74USKf uQM1ggCmc3MXv57bOyUOi+/dXp5L8b6GPGHRl3zQNsumIJQzifZg5+qoTz53UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl8nw2kYvzhCM for ; Tue, 23 Jun 2026 15:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ed4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:56:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 84a3c47a0329 - stable/15 - Use ZFSTOP more broadly 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 84a3c47a03294f2dee83bf1c4dedc819c47e836f Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:56:52 +0000 Message-Id: <6a3aacc4.23ed4.655bdf9f@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=84a3c47a03294f2dee83bf1c4dedc819c47e836f commit 84a3c47a03294f2dee83bf1c4dedc819c47e836f Author: John Baldwin AuthorDate: 2025-11-24 15:47:10 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:28:40 +0000 Use ZFSTOP more broadly Reviewed by: brooks Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D53791 (cherry picked from commit e928afc531e68b7a142ee49d8f7e5c8426d54033) --- cddl/lib/drti/Makefile | 8 ++++---- cddl/lib/libavl/Makefile | 11 ++++++----- cddl/lib/libctf/Makefile | 8 ++++---- cddl/lib/libdtrace/Makefile | 8 ++++---- cddl/lib/libicp/Makefile | 16 ++++++++-------- cddl/lib/libicp_rescue/Makefile | 16 ++++++++-------- cddl/lib/libnvpair/Makefile | 14 +++++++------- cddl/lib/libspl/Makefile | 14 +++++++------- cddl/lib/libtpool/Makefile | 14 +++++++------- cddl/lib/libuutil/Makefile | 10 +++++----- cddl/lib/libzdb/Makefile | 18 +++++++++--------- cddl/lib/libzfs/Makefile | 32 ++++++++++++++++---------------- cddl/lib/libzfs_core/Makefile | 26 +++++++++++++------------- cddl/lib/libzfsbootenv/Makefile | 18 +++++++++--------- cddl/lib/libzpool/Makefile | 2 +- cddl/lib/libzutil/Makefile | 20 ++++++++++---------- cddl/lib/pam_zfs_key/Makefile | 20 ++++++++++---------- cddl/sbin/zpool/Makefile | 2 +- cddl/usr.bin/ctfconvert/Makefile | 6 +++--- cddl/usr.bin/ctfdump/Makefile | 6 +++--- cddl/usr.bin/ctfmerge/Makefile | 6 +++--- cddl/usr.bin/zinject/Makefile | 2 +- cddl/usr.bin/zstream/Makefile | 2 +- cddl/usr.bin/ztest/Makefile | 2 +- cddl/usr.sbin/dtrace/Makefile | 6 +++--- cddl/usr.sbin/lockstat/Makefile | 6 +++--- cddl/usr.sbin/plockstat/Makefile | 6 +++--- cddl/usr.sbin/zdb/Makefile | 2 +- cddl/usr.sbin/zfsd/Makefile.common | 10 +++++----- cddl/usr.sbin/zhack/Makefile | 12 ++++++------ include/Makefile | 2 +- lib/libbe/Makefile | 14 +++++++------- lib/libbe/tests/Makefile | 8 ++++---- lib/libproc/Makefile | 8 ++++---- lib/libprocstat/Makefile | 1 - sbin/bectl/Makefile | 10 +++++----- usr.sbin/fstyp/Makefile | 12 ++++++------ 37 files changed, 189 insertions(+), 189 deletions(-) diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile index 4a7a8350cac8..6a22c46eadea 100644 --- a/cddl/lib/drti/Makefile +++ b/cddl/lib/drti/Makefile @@ -11,11 +11,11 @@ CLEANFILES= ${FILES} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/cddl/compat/opensolaris/include \ diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index 4ce1de20a3d9..aef8c34c853c 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -1,4 +1,4 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl +.PATH: ${ZFSTOP}/module/avl PACKAGE= zfs LIB_PACKAGE= @@ -8,9 +8,10 @@ LIBADD= spl SRCS= avl.c WARNS?= 3 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h + .include diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile index 1c605182bc1d..b47f4a47551a 100644 --- a/cddl/lib/libctf/Makefile +++ b/cddl/lib/libctf/Makefile @@ -22,10 +22,10 @@ WARNS?= 2 CFLAGS+= -DCTF_OLD_VERSIONS CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index d086fffb07bc..2f4ffcd3596a 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -77,11 +77,11 @@ SYSINCS+= ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h WARNS?= 1 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 1a9a79103b50..a26e373a35a5 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -1,4 +1,4 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp +.PATH: ${ZFSTOP}/module/icp PACKAGE= zfs LIB_PACKAGE= @@ -91,7 +91,7 @@ KERNEL_C = \ core/kcf_prov_tabs.c \ $(ASM_SOURCES_C) -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs +.PATH: ${ZFSTOP}/module/zfs KERNEL_C+= zfs_impl.c SRCS= $(ASM_SOURCES_AS) $(KERNEL_C) @@ -100,14 +100,14 @@ WARNS?= 2 SHLIB_MAJOR= 3 CSTD= c99 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index 0a5a81f4ab7f..8dc8c396774c 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -1,4 +1,4 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp +.PATH: ${ZFSTOP}/module/icp PACKAGE= utilities LIB= icp_rescue @@ -86,7 +86,7 @@ KERNEL_C = \ core/kcf_prov_tabs.c \ $(ASM_SOURCES_C) -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs +.PATH: ${ZFSTOP}/module/zfs KERNEL_C+= zfs_impl.c SRCS= $(ASM_SOURCES_AS) $(KERNEL_C) @@ -95,14 +95,14 @@ WARNS?= 2 SHLIB_MAJOR= 3 CSTD= c99 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID -UHAVE_AVX -DRESCUE CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 8245b324688b..c66424cef219 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -1,6 +1,6 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair -.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${ZFSTOP}/module/nvpair +.PATH: ${ZFSTOP}/lib/libnvpair +.PATH: ${ZFSTOP}/include PACKAGE= zfs LIB_PACKAGE= @@ -20,12 +20,12 @@ SRCS+= nvpair_alloc_fixed.c \ WARNS?= 2 CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID -DHAVE_CONFIG_H -DHAVE_XDR_BYTESREC .include diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 26e14ea72b8a..3339f6d55362 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -1,8 +1,8 @@ .include .include -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl -.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${ZFSTOP}/lib/libspl +.PATH: ${ZFSTOP}/include PACKAGE= zfs LIB_PACKAGE= @@ -37,12 +37,12 @@ SRCS += \ WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h .if ${COMPILER_TYPE} == "clang" diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 3a50a21bf62c..1ebfc52f5be9 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool -.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${ZFSTOP}/lib/libtpool +.PATH: ${ZFSTOP}/include PACKAGE= zfs LIB_PACKAGE= @@ -14,13 +14,13 @@ SRCS= thread_pool.c WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 947e755d4aae..ca5a71d811f7 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -1,4 +1,4 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil +.PATH: ${ZFSTOP}/lib/libuutil PACKAGE= zfs LIB_PACKAGE= @@ -14,12 +14,12 @@ SRCS=\ WARNS?= 2 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h LIBADD= avl spl diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile index 040d7d2c63f9..f5a6a42d7aad 100644 --- a/cddl/lib/libzdb/Makefile +++ b/cddl/lib/libzdb/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb -.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${ZFSTOP}/lib/libzdb +.PATH: ${ZFSTOP}/include PACKAGE= zfs LIB_PACKAGE= @@ -13,15 +13,15 @@ SRCS = libzdb.c WARNS?= 2 CSTD= c99 -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/lib/libzutil CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 376e32fb893f..ed0c240b1113 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -1,11 +1,11 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare -.PATH: ${SRCTOP}/sys/contrib/openzfs/include -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib +.PATH: ${ZFSTOP}/module/icp +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/lib/libzfs +.PATH: ${ZFSTOP}/lib/libzfs/os/freebsd +.PATH: ${ZFSTOP}/lib/libshare +.PATH: ${ZFSTOP}/include +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib PACKAGE= zfs LIB_PACKAGE= @@ -89,17 +89,17 @@ WARNS?= 2 SHLIB_MAJOR= 4 CSTD= c99 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libspl/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libshare +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -DHAVE_EXECVPE CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index 10533c5de05b..72b0f519e21d 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -1,7 +1,7 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core -.PATH: ${SRCTOP}/sys/contrib/openzfs/include -.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs +.PATH: ${ZFSTOP}/lib/libzfs_core +.PATH: ${ZFSTOP}/include +.PATH: ${ZFSTOP}/include/os/freebsd/zfs +.PATH: ${ZFSTOP}/module/os/freebsd/zfs PACKAGE= zfs LIB_PACKAGE= @@ -17,17 +17,17 @@ SRCS= libzfs_core.c \ WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libzfs_core +CFLAGS+= -I${ZFSTOP}/lib/libzfs_core/common +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile index 22f5da1ee5b1..eba6a1d8bea8 100644 --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv -.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${ZFSTOP}/lib/libzfsbootenv +.PATH: ${ZFSTOP}/include PACKAGE= zfs LIB_PACKAGE= @@ -20,16 +20,16 @@ SRCS= $(USER_C) CSTD= c99 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs CFLAGS.lzbe_device.c= -Wno-cast-qual CFLAGS.lzbe_util.c= -Wno-cast-qual CFLAGS.lzbe_pair.c= -Wno-cast-qual diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index c4b9b31602f5..f6952f87fc63 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -261,7 +261,7 @@ CFLAGS+= \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ - -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ + -I${ZFSTOP}/lib/libzpool/include \ -I${SRCTOP}/sys \ -I${ZFSTOP}/include/os/freebsd/zfs \ -I${SRCTOP}/cddl/compat/opensolaris/include \ diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index 37e9e8dd5e63..952ebda889b2 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -1,6 +1,6 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs +.PATH: ${ZFSTOP}/lib/libzutil +.PATH: ${ZFSTOP}/lib/libzutil/os/freebsd +.PATH: ${ZFSTOP}/module/os/freebsd/zfs PACKAGE= zfs LIB_PACKAGE= @@ -27,15 +27,15 @@ SRCS += zfs_ioctl_compat.c WARNS?= 2 CSTD= c99 -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/lib/libzutil CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile index 517ca402d4da..345321b5926d 100644 --- a/cddl/lib/pam_zfs_key/Makefile +++ b/cddl/lib/pam_zfs_key/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/contrib/openzfs/contrib/pam_zfs_key -.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${ZFSTOP}/contrib/pam_zfs_key +.PATH: ${ZFSTOP}/include PACKAGE= zfs LIB= pam_zfs_key @@ -13,17 +13,17 @@ SRCS= pam_zfs_key.c WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP} +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs CFLAGS+= -DRUNSTATEDIR=\"/var/run\" .include "../../lib/libpam/modules/Makefile.inc" diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index be498d730011..e2d8bf61e75b 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -65,7 +65,7 @@ CFLAGS+= \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ - -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ + -I${ZFSTOP}/lib/libzpool/include \ -I${SRCTOP}/sys \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/cmd/zpool \ diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile index df53c46b7246..8ce1fce2a711 100644 --- a/cddl/usr.bin/ctfconvert/Makefile +++ b/cddl/usr.bin/ctfconvert/Makefile @@ -25,9 +25,9 @@ SRCS= alist.c \ util.c CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/cddl/compat/opensolaris/include \ diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile index 357598583ae7..03d4632603ba 100644 --- a/cddl/usr.bin/ctfdump/Makefile +++ b/cddl/usr.bin/ctfdump/Makefile @@ -8,9 +8,9 @@ SRCS= dump.c \ utils.c CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile index 81bccc047a25..73c929605414 100644 --- a/cddl/usr.bin/ctfmerge/Makefile +++ b/cddl/usr.bin/ctfmerge/Makefile @@ -25,9 +25,9 @@ WARNS?= 1 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/cddl/compat/opensolaris/include \ diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index 6db4bf6a53cd..b9d0f14b9d37 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -13,7 +13,7 @@ CFLAGS+= \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ - -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ + -I${ZFSTOP}/lib/libzpool/include \ -I${SRCTOP}/sys \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index b9c45c25923e..082d25c80e29 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -23,7 +23,7 @@ CFLAGS+= \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ - -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ + -I${ZFSTOP}/lib/libzpool/include \ -I${SRCTOP}/sys \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index dc80100ddcac..b35eea86bd75 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -13,7 +13,7 @@ CFLAGS+= \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ - -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ + -I${ZFSTOP}/lib/libzpool/include \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index c72b55cc4903..6ea4b511cbdf 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -10,9 +10,9 @@ BINDIR?= /usr/sbin WARNS?= 1 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index c87a37ef1504..acc0c2eb9064 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -10,9 +10,9 @@ BINDIR?= /usr/sbin WARNS?= 1 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile index 3e35c5c5b8f7..4c2535bf2748 100644 --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -10,9 +10,9 @@ BINDIR?= /usr/sbin WARNS?= 1 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index 13d98b60d1fb..01085503e726 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -16,7 +16,7 @@ CFLAGS+= \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${ZFSTOP}/lib/libspl/include/os/freebsd/spl \ - -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ + -I${ZFSTOP}/lib/libzpool/include \ -I${SRCTOP}/sys \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common index 487caf54a0ce..c610a3bf3e5b 100644 --- a/cddl/usr.sbin/zfsd/Makefile.common +++ b/cddl/usr.sbin/zfsd/Makefile.common @@ -14,12 +14,12 @@ WARNS?= 2 IGNORE_PRAGMA= YES CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -I${SRCTOP}/cddl/usr.sbin CFLAGS+= -DHAVE_ISSETUGID diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile index a11abd6efe9d..755624eac59c 100644 --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -10,14 +10,14 @@ CSTD= c99 WARNS?= 2 CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/include/Makefile b/include/Makefile index 04eb6bbcc6f6..80a776d89b12 100644 --- a/include/Makefile +++ b/include/Makefile @@ -233,7 +233,7 @@ RPCDIR= ${INCLUDEDIR}/rpc TEKEN= teken.h TEKENDIR= ${INCLUDEDIR}/teken -.PATH: ${SRCTOP}/sys/contrib/openzfs/include/sys +.PATH: ${ZFSTOP}/include/sys NVPAIR= nvpair.h NVPAIRDIR= ${INCLUDEDIR}/sys diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index 3ba456aee4b7..860a4aa1962a 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -53,15 +53,15 @@ LIBADD+= spl LIBADD+= zfsbootenv CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libspl/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libzfs +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY CFLAGS.be.c= -Wno-cast-qual CFLAGS.be_access.c= -Wno-cast-qual diff --git a/lib/libbe/tests/Makefile b/lib/libbe/tests/Makefile index ffd2d03c5ffd..72ba40f7d378 100644 --- a/lib/libbe/tests/Makefile +++ b/lib/libbe/tests/Makefile @@ -13,12 +13,12 @@ LIBADD+= zfs \ CFLAGS+= -I${SRCTOP}/lib/libbe CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY .include diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 785007188255..41643505f999 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -19,10 +19,10 @@ LIBADD+= cxxrt elf procstat rtld_db util z LIBADD+= ctf IGNORE_PRAGMA= YES CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID -DHAVE_BOOLEAN -DHAVE_STRLCAT -DHAVE_STRLCPY CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \ -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \ diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index e20518910ba3..38c3f60370ad 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -55,7 +55,6 @@ MLINKS+=libprocstat.3 procstat_close.3 \ .if ${MK_CDDL} != "no" CFLAGS+= -DLIBPROCSTAT_ZFS SRCS+= zfs.c -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs CFLAGS.zfs.c+= -DIN_BASE CFLAGS.zfs.c+= -DHAVE_ISSETUGID CFLAGS.zfs.c+= -DZFS_DEBUG diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile index c11426c57e45..7c5fee770763 100644 --- a/sbin/bectl/Makefile +++ b/sbin/bectl/Makefile @@ -14,13 +14,13 @@ LIBADD+= be \ zfsbootenv CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile index ae5bae2e4f9d..c43a29636015 100644 --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -26,12 +26,12 @@ IGNORE_PRAGMA= YES CFLAGS+= -DHAVE_ZFS CFLAGS.zfs.c+= -DIN_BASE -CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include -CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include -CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS.zfs.c+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS.zfs.c+= -I${ZFSTOP}/include +CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include +CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libzpool/include +CFLAGS.zfs.c+= -I${ZFSTOP}/module/icp/include +CFLAGS.zfs.c+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h CFLAGS.zfs.c+= -DHAVE_ISSETUGID CFLAGS.zfs.c+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h CFLAGS.zfs.c+= -Wno-cast-qual From nobody Tue Jun 23 15:56:53 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 4gl8nx6sJxz6hdyV for ; Tue, 23 Jun 2026 15:56:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl8nx4Nr1z3Hmc for ; Tue, 23 Jun 2026 15:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230213; 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=q/RY/5c1VEUePzGG4HUKMQmHj4yjd7B8HwICgfAv7v0=; b=Mmw62QRePWM5DkuqZOzH3+e7QN+9HSjwdzwcnL031O9j/ouy33KDanyFYSji2szkj1iaJ9 DF+Ir+fVBmxrhrBh2+rLpgQTQ6qM6QsS19uqtKYWl86UGGbvX71zbsrey7LW2O9NY7l5EY N/maNVUM2t8S4r5lHnuzXAHp5Y2ZMfvH7Wi5IPoq0FvGDj1XjPD2n8fiKU1o7okvgyU5eA X7HnQQ0OZRt90cJ2A5dE5rbsUr3gpq9uwJ+m/tf0qHyDC4H1JH6JM3qzUumK3DK+PoRt7G TAW9TV9RY5I4U1TCJyYwHlJ4ol0kCCPaciBzJ0PTzc8RKxNmkXi8Sv6/A5HohQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782230213; a=rsa-sha256; cv=none; b=XCsx7BHWibaJn3gO4N7fGW4oQ9dRbEpzZL4yFZha8gM/gai+URuCX/zDSgC2oInl9RMicU RnRwlQSZ9ko0saV4SdFdUhaIh2BJZCkoh3vKzot3/VLcyrMVkvQEGw3+Maqa3OfuD1NgKh nW5pWyM+kv5tS+GbXFOPKvw54yJYZ2c7bQ8/dZ2eRUV5/5v43PAWveDjwnLkKs4f1kUfCc KaWai/ZBUJPb9K9/WZIh+ginuOaOQPJpa5opPnfmh0AI4Tm9i2hyK1rp6TBEH/2rMEdI1x G2cjsHxVOfc3b6huel069DA1H7kgoJNefm332gyD426RqPOinhdU58aRB1rM+Q== 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=1782230213; 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=q/RY/5c1VEUePzGG4HUKMQmHj4yjd7B8HwICgfAv7v0=; b=aJfo4wtyG7sD+9mS3PSWzlctkl1zraflGeE0UNZN9OGmyazFTpyofASSspcSKPLXUlkIb/ 4gvqemL6xl2Z0FL1d8TYFroi3gnJ7obAvfGILEAKvpWpo99YIfPDOPVCWx3ZyHOSoVAqUW MDPyol907SnUleXhg9zgxjZSFFL89tocP+ji/aud35MfubP7hL6Jwc5RlYFEuDUWl/MZjh Yz6v04GL2sgpZ19CxWg5BzehmNHE423WWwvzO89U9xVAKXWzccNWMbgyCJnbs9Zp/xHAOr QI/Q2UoYTB9rHZkMTt3gNmn3xt4NbVDkczm3WQshEvsB0p3tQ5Cp73ACRmxTTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl8nx33hSzgc2 for ; Tue, 23 Jun 2026 15:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:56:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: John Baldwin Subject: git: b98ac603e47a - stable/15 - stand: Move from OZFS to ZFSTOP 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b98ac603e47a5cef1880db8a61a6875e13592e86 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:56:53 +0000 Message-Id: <6a3aacc5.21f72.5d99de27@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b98ac603e47a5cef1880db8a61a6875e13592e86 commit b98ac603e47a5cef1880db8a61a6875e13592e86 Author: Warner Losh AuthorDate: 2025-11-25 00:35:19 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:29:26 +0000 stand: Move from OZFS to ZFSTOP Use ZFSTOP instead of OZFS. They are the saame thing. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D53900 (cherry picked from commit 05346243dfa4ed85c4c3a31f2a32a861fd649c07) --- stand/defs.mk | 5 ++--- stand/libsa/zfs/Makefile.inc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/stand/defs.mk b/stand/defs.mk index 2cf1893a6159..469c95c9dbb9 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -59,9 +59,8 @@ SASRC= ${BOOTSRC}/libsa SYSDIR= ${SRCTOP}/sys UBOOTSRC= ${BOOTSRC}/uboot ZFSSRC= ${SASRC}/zfs -OZFS= ${SRCTOP}/sys/contrib/openzfs -ZFSOSSRC= ${OZFS}/module/os/freebsd/ -ZFSOSINC= ${OZFS}/include/os/freebsd +ZFSOSSRC= ${ZFSTOP}/module/os/freebsd/ +ZFSOSINC= ${ZFSTOP}/include/os/freebsd LIBCSRC= ${SRCTOP}/lib/libc BOOTOBJ= ${OBJTOP}/stand diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 2e9d5679f71f..5ecf68d3bc09 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -1,12 +1,12 @@ .PATH: ${ZFSSRC} .PATH: ${SYSDIR}/crypto/skein .PATH: ${ZFSOSSRC}/spl -.PATH: ${OZFS}/module/zstd -.PATH: ${OZFS}/module/zstd/lib/common -.PATH: ${OZFS}/module/zstd/lib/compress -.PATH: ${OZFS}/module/zstd/lib/decompress -.PATH: ${OZFS}/module/icp/asm-aarch64/blake3 -.PATH: ${OZFS}/module/icp/algs/blake3 +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib/common +.PATH: ${ZFSTOP}/module/zstd/lib/compress +.PATH: ${ZFSTOP}/module/zstd/lib/decompress +.PATH: ${ZFSTOP}/module/icp/asm-aarch64/blake3 +.PATH: ${ZFSTOP}/module/icp/algs/blake3 ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c ZFS_SRC+= zfs_zstd.c ZFS_SRC+= blake3.c blake3_generic.c blake3_impl.c @@ -41,7 +41,7 @@ ZFS_EARLY= -I${ZFSSRC}/spl \ # from FreeBSD. # .for i in ${ZFS_SRC} ${ZSTD_SRC} -CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${OZFS}/include \ +CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${ZFSTOP}/include \ -DNEED_SOLARIS_BOOLEAN .endfor @@ -76,7 +76,7 @@ CFLAGS.$i+= -U__BMI__ ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zfs_zstd.c+= -DIN_BASE -DIN_LIBSA -CFLAGS.blake3_impl.c+= -I${OZFS}/module/icp/algs/blake3 -I${OZFS}/module/icp/include -DIN_LIBSA +CFLAGS.blake3_impl.c+= -I${ZFSTOP}/module/icp/algs/blake3 -I${ZFSTOP}/module/icp/include -DIN_LIBSA # Do not unroll skein loops, reduce code size CFLAGS.skein_block.c+= -DSKEIN_LOOP=111 From nobody Tue Jun 23 15:56:54 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 4gl8nz0pXHz6hf8k for ; Tue, 23 Jun 2026 15:56:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl8ny4N4lz3HYr for ; Tue, 23 Jun 2026 15:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230214; 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=b+hVjSgcXjb9wvgcQ7gsEwSou3NR6UWgloPkNY1sjB4=; b=USdKVjcyKKxPWzv3J8gcGyjv8uDDYBrIZ4xAkJMJ/0Xe35zqZA+PBOjOM1gk5dZ/c0VFXg vqTDJSN2qIpC4Orfpl01mGAK4XYsGb+xS/RoVCWaijknSXk++/+D3FjHLI5XSqgKQum/fZ WIqCW4AmgkE0iJonDRA07yDDexGOhrdQ5sBrToXj0z+utpYECTOJIAPpLYQCSNyd5aq+j5 EpDNbpaBku/pZY9vTUvMZCdlNL84AxPK+jpxdPc63AOlVoXkPJonLOROmUvOzL7daodgvC r9lZFkVEQjuR6jCtyseTcLqrSeKfTs8ruTXW8YXAiUhw+yj7kCISoDKWKG+AFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782230214; a=rsa-sha256; cv=none; b=u4a2ldr3KHsIo0oOOqriy4Lhc6/jR1DwMGCWiDF+8MKJFMJSkJZ12rkzf2f6EM7OEGqWTR w0r2zbLMMjhzQQ/JsvPbZHXBZDGXgo9Eoyw8QNsxoHVuDk13SwTmw5NYB9EpS8H4XOwoCK nUrRTlzgZwJT7lFNQFZSbHvZ5GzUOx79exh4LuEReja1zo9MalON+gY82BMO8FBD/xsrpd r0GA5EZLhq2vKrOkcwwjxEac3pfOJkbchnpPGb8QYfDHX7Vs42WxYvsE5n1aLKBG7KqGnn 4+YP935nd7573x0O94F8CGcf24RxM5x2KtE7vfvFb3xB+pos/jkMIKlaWhfHxw== 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=1782230214; 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=b+hVjSgcXjb9wvgcQ7gsEwSou3NR6UWgloPkNY1sjB4=; b=BMkX6V9qZQLKC1MYsrw4E/q7MXlb3gNpOPnHa+lm384OGXYieWXDlDpdc0jyORxsZ8ldhy LDORKILMCNM4+kNVoyVEELA4S6Rf4k2kDVO+UlrPe7/dCHmGVnUTrWszzTTkp/kHs7kDEm IfZtdwv+BEvJoQfTKBDYfLx8wSxkN+VPXi0WNlTq2KXunL13rjstpZ+ydSWyfgzs9KB0KT uYpsC1e22wdwNImp8cxZuNJgdTwSua3yAaNf2WY1VricXGLXBq0N6w59/rJBlIj1QbrNZS o+YvIo3dUiM6LFvvtb0D0N1fK1vMgaUQ03Xn8waWMOPuFkY+d+zSVR9G2C+Lcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl8ny3NyRzhJD for ; Tue, 23 Jun 2026 15:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:56:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 848750b75756 - stable/15 - zfs: Reuse ZINCDIR variable from kmod.mk 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 848750b7575626b90b3ab007b19f0e4f4cf3db15 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:56:54 +0000 Message-Id: <6a3aacc6.21f77.4159e70f@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=848750b7575626b90b3ab007b19f0e4f4cf3db15 commit 848750b7575626b90b3ab007b19f0e4f4cf3db15 Author: John Baldwin AuthorDate: 2025-12-09 16:00:20 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:30:16 +0000 zfs: Reuse ZINCDIR variable from kmod.mk Reviewed by: brooks, imp Differential Revision: https://reviews.freebsd.org/D54147 (cherry picked from commit 701e4b36b4510c8cf26155ec3ab5aca9b7ba9406) --- sys/modules/zfs/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 7a4d0bb51376..2751bb465258 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -1,5 +1,4 @@ SRCDIR=${SRCTOP}/sys/contrib/openzfs/module -INCDIR=${SRCTOP}/sys/contrib/openzfs/include KMOD= zfs @@ -27,11 +26,11 @@ KMOD= zfs ${SRCDIR}/zstd/lib/compress \ ${SRCDIR}/zstd/lib/decompress -CFLAGS+= -I${INCDIR} +CFLAGS+= -I${ZINCDIR} CFLAGS+= -I${SRCDIR}/icp/include -CFLAGS+= -I${INCDIR}/os/freebsd -CFLAGS+= -I${INCDIR}/os/freebsd/spl -CFLAGS+= -I${INCDIR}/os/freebsd/zfs +CFLAGS+= -I${ZINCDIR}/os/freebsd +CFLAGS+= -I${ZINCDIR}/os/freebsd/spl +CFLAGS+= -I${ZINCDIR}/os/freebsd/zfs CFLAGS+= -I${SRCDIR}/zstd/include CFLAGS+= -I${.CURDIR} @@ -388,7 +387,7 @@ SRCS+= zfs_zstd.c \ .include CFLAGS+= -include ${SRCTOP}/sys/cddl/compat/opensolaris/sys/debug_compat.h -CFLAGS+= -include ${INCDIR}/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/static_ccompile.h CFLAGS.sysctl_os.c= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h From nobody Tue Jun 23 16:28:03 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 4gl9Tw125Nz6hhPd for ; Tue, 23 Jun 2026 16:28:04 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Tw05psz3MXP for ; Tue, 23 Jun 2026 16:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232084; 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=2BbuXWg3p7uuO1cj7AiYy1GafYG9K3Lh9QBV5Br0AJE=; b=mLJiMLPDLwUJYNcVqHdCRT2UICZApTv86O6CH4MPqFqhNR4IUDiCx7cWN1UOgfIG/NbFPD l6ajTRvNJe8KHfOekP70BxKI0w1aVz6bgFbG+OzU6xlFgXFXsqYpcmBIEcOSGBFtvt4H7F PkPTdDOCl0fo7cjrC5MPqFpvVBGqW6b3GdJTtKqAvNA/rBiWkuErjoAR5JnTg31m2JGiOC vMVL/pXmCMRa0DmrXEEbkD5JsDUYOGCRZD6WANy+8Io+m5fA3XeA/YLHoqiY9lh6R0oWgO d2GqJ3TxAtu9f0q9zXl71s9x7Lsrr90pPI92Xx6k6NpXY7t8PsEgEvlYvBlnSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232084; a=rsa-sha256; cv=none; b=PN4knwB3+rXfnkRNMl5zkHQXPWTdvztXCMagN4v55Tq2fa2LDoqcvxox2DkfO6rD+0AYUW 71RLkSuerhmf3TXpb35Pdu1/Xn4rDYA4kj40zDT0fK24yxfIaVSTTpSW/ITlQuyKKj52Sh YYX4vzvLRS8oJuIfVzn1YTgzq3XbMR1wRtFRR64UtQxM8hv5FD59s4klZ+yB1bdVOaK6yz x3KUd2xHJ+SXzfm3jvDXepM5NX58MEqeRRA9neI5CSnhQuJMXXjyvN35tY5EODOzm8wLTR MZrZYSwnnFyC5ymuQuxg3UkbgKK7cJTyd6jOsmQy/l2uHksRjBa30tUiRLxmWQ== 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=1782232084; 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=2BbuXWg3p7uuO1cj7AiYy1GafYG9K3Lh9QBV5Br0AJE=; b=vXiB71J+gbFnVcDwbZPFKIGZnLhvrU5qKdam9hopJEUUq1fzCwhpbGPt2zDivh5uTQewyn OHHW2ZvyuL0YB0Gf+a6SbipiD6SSJbLaOOnOdJWwcwTn36rmx/cTBAnXfrzTR9LZ2F6gHw OmWh+OZsvIIJihJtexPkaUn9fu+fcaGsMkSptPCD+cHAiFJe/7pOIwuR+MBou/nrYVqQBy iOlkskNoazWPWsDcg1sv+3+Pjk9p3aymevcs+cNnKFCLCE5BZ2owEXZCZhpGMeYOPNwl7g UX9Kkc4CBxMHohLhgbDmjS1xoLCwElKzXR4pAUP/4cGuKjfBMz1H0qB/Sh3ArA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Tv60v1zhHn for ; Tue, 23 Jun 2026 16:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24bd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ff44fba2e951 - stable/15 - acpidump: Extend the decoding of entries in the EINJ and ERST tables 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff44fba2e95147068e16e3de8d67bc838729d1a8 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:03 +0000 Message-Id: <6a3ab413.24bd8.12926285@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ff44fba2e95147068e16e3de8d67bc838729d1a8 commit ff44fba2e95147068e16e3de8d67bc838729d1a8 Author: John Baldwin AuthorDate: 2025-12-26 15:35:59 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:57:28 +0000 acpidump: Extend the decoding of entries in the EINJ and ERST tables - Decode the Action, Instruction, and Flags fields for these tables - Omit the Flags field if it is zero - Omit the Value field for instrunctions that do not use it Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54308 (cherry picked from commit 6b2e4da4430029b16591c64aaef78bcd1644cedc) --- usr.sbin/acpi/acpidump/acpi.c | 206 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 193 insertions(+), 13 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 026795118832..0b125b5591ba 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -623,16 +623,89 @@ acpi_handle_bert(ACPI_TABLE_HEADER *sdp) printf(END_COMMENT); } +static const char * +einj_action(UINT8 Action) +{ + static char buf[32]; + +#define ACTION(name) \ + case __CONCAT(ACPI_EINJ_, name): \ + return (__STRING(name)) +#define ACTIONV2(name) \ + case __CONCAT(ACPI_EINJV2_, name): \ + return (__XSTRING(__CONCAT(V2_, name))) + + switch (Action) { + ACTION(BEGIN_OPERATION); + ACTION(GET_TRIGGER_TABLE); + ACTION(SET_ERROR_TYPE); + ACTION(GET_ERROR_TYPE); + ACTION(END_OPERATION); + ACTION(EXECUTE_OPERATION); + ACTION(CHECK_BUSY_STATUS); + ACTION(GET_COMMAND_STATUS); + ACTION(SET_ERROR_TYPE_WITH_ADDRESS); + ACTION(GET_EXECUTE_TIMINGS); + ACTIONV2(GET_ERROR_TYPE); + ACTION(TRIGGER_ERROR); + default: + snprintf(buf, sizeof(buf), "UNKNOWN (%#x)", Action); + return (buf); + } + +#undef ACTION +#undef ACTIONV2 +} + +static const char * +einj_instruction(UINT8 Instruction) +{ + static char buf[32]; + +#define INSTRUCTION(name) \ + case __CONCAT(ACPI_EINJ_, name): \ + return (__STRING(name)) + + switch (Instruction) { + INSTRUCTION(READ_REGISTER); + INSTRUCTION(READ_REGISTER_VALUE); + INSTRUCTION(WRITE_REGISTER); + INSTRUCTION(WRITE_REGISTER_VALUE); + INSTRUCTION(NOOP); + INSTRUCTION(FLUSH_CACHELINE); + default: + snprintf(buf, sizeof(buf), "UNKNOWN (%#x)", Instruction); + return (buf); + } + +#undef INSTRUCTION +} + static void -acpi_print_whea(ACPI_WHEA_HEADER *w) +acpi_print_einj_entry(ACPI_EINJ_ENTRY *entry) { + ACPI_WHEA_HEADER *w = &entry->WheaHeader; - printf("\n\tAction=%d\n", w->Action); - printf("\tInstruction=%d\n", w->Instruction); - printf("\tFlags=%02x\n", w->Flags); + printf("\n\tAction=%s\n", einj_action(w->Action)); + printf("\tInstruction=%s\n", einj_instruction(w->Instruction)); + if (w->Flags != 0) { + printf("\tFlags=%02x", w->Flags); + if (w->Flags & 0x1) + printf(""); + printf("\n"); + } printf("\tRegisterRegion="); acpi_print_gas(&w->RegisterRegion); - printf("\n\tValue=0x%016jx\n", w->Value); + printf("\n"); + switch (w->Instruction) { + case ACPI_EINJ_READ_REGISTER: + case ACPI_EINJ_WRITE_REGISTER: + case ACPI_EINJ_NOOP: + case ACPI_EINJ_FLUSH_CACHELINE: + break; + default: + printf("\tValue=0x%016jx\n", w->Value); + } printf("\tMask=0x%016jx\n", w->Mask); } @@ -640,7 +713,7 @@ static void acpi_handle_einj(ACPI_TABLE_HEADER *sdp) { ACPI_TABLE_EINJ *einj; - ACPI_WHEA_HEADER *w; + ACPI_EINJ_ENTRY *w; u_int i; printf(BEGIN_COMMENT); @@ -649,18 +722,125 @@ acpi_handle_einj(ACPI_TABLE_HEADER *sdp) printf("\tHeaderLength=%d\n", einj->HeaderLength); printf("\tFlags=0x%02x\n", einj->Flags); printf("\tEntries=%d\n", einj->Entries); - w = (ACPI_WHEA_HEADER *)(einj + 1); + w = (ACPI_EINJ_ENTRY *)(einj + 1); for (i = 0; i < MIN(einj->Entries, (sdp->Length - - sizeof(ACPI_TABLE_EINJ)) / sizeof(ACPI_WHEA_HEADER)); i++) - acpi_print_whea(w + i); + sizeof(ACPI_TABLE_EINJ)) / sizeof(ACPI_EINJ_ENTRY)); i++) + acpi_print_einj_entry(w + i); printf(END_COMMENT); } +static const char * +erst_action(UINT8 Action) +{ + static char buf[32]; + +#define ACTION(name) \ + case __CONCAT(ACPI_ERST_, name): \ + return (__STRING(name)) + + switch (Action) { + ACTION(BEGIN_WRITE); + ACTION(BEGIN_READ); + ACTION(BEGIN_CLEAR); + ACTION(END); + ACTION(SET_RECORD_OFFSET); + ACTION(EXECUTE_OPERATION); + ACTION(CHECK_BUSY_STATUS); + ACTION(GET_COMMAND_STATUS); + ACTION(GET_RECORD_ID); + ACTION(SET_RECORD_ID); + ACTION(GET_RECORD_COUNT); + ACTION(BEGIN_DUMMY_WRIITE); + ACTION(GET_ERROR_RANGE); + ACTION(GET_ERROR_LENGTH); + ACTION(GET_ERROR_ATTRIBUTES); + ACTION(EXECUTE_TIMINGS); + default: + snprintf(buf, sizeof(buf), "UNKNOWN (%#x)", Action); + return (buf); + } + +#undef ACTION +} + +static const char * +erst_instruction(UINT8 Instruction) +{ + static char buf[32]; + +#define INSTRUCTION(name) \ + case __CONCAT(ACPI_ERST_, name): \ + return (__STRING(name)) + + switch (Instruction) { + INSTRUCTION(READ_REGISTER); + INSTRUCTION(READ_REGISTER_VALUE); + INSTRUCTION(WRITE_REGISTER); + INSTRUCTION(WRITE_REGISTER_VALUE); + INSTRUCTION(NOOP); + INSTRUCTION(LOAD_VAR1); + INSTRUCTION(LOAD_VAR2); + INSTRUCTION(STORE_VAR1); + INSTRUCTION(ADD); + INSTRUCTION(SUBTRACT); + INSTRUCTION(ADD_VALUE); + INSTRUCTION(SUBTRACT_VALUE); + INSTRUCTION(STALL); + INSTRUCTION(STALL_WHILE_TRUE); + INSTRUCTION(SKIP_NEXT_IF_TRUE); + INSTRUCTION(GOTO); + INSTRUCTION(SET_SRC_ADDRESS_BASE); + INSTRUCTION(SET_DST_ADDRESS_BASE); + INSTRUCTION(MOVE_DATA); + default: + snprintf(buf, sizeof(buf), "UNKNOWN (%#x)", Instruction); + return (buf); + } + +#undef INSTRUCTION +} + +static void +acpi_print_erst_entry(ACPI_ERST_ENTRY *entry) +{ + ACPI_WHEA_HEADER *w = &entry->WheaHeader; + + printf("\n\tAction=%s\n", erst_action(w->Action)); + printf("\tInstruction=%s\n", erst_instruction(w->Instruction)); + if (w->Flags != 0) { + printf("\tFlags=%02x", w->Flags); + if (w->Flags & 0x1) + printf(""); + printf("\n"); + } + printf("\tRegisterRegion="); + acpi_print_gas(&w->RegisterRegion); + printf("\n"); + switch (w->Instruction) { + case ACPI_ERST_READ_REGISTER: + case ACPI_ERST_WRITE_REGISTER: + case ACPI_ERST_NOOP: + case ACPI_ERST_LOAD_VAR1: + case ACPI_ERST_LOAD_VAR2: + case ACPI_ERST_STORE_VAR1: + case ACPI_ERST_ADD: + case ACPI_ERST_SUBTRACT: + case ACPI_ERST_SET_SRC_ADDRESS_BASE: + case ACPI_ERST_SET_DST_ADDRESS_BASE: + case ACPI_ERST_MOVE_DATA: + break; + default: + printf("\tValue=0x%016jx\n", w->Value); + break; + } + printf("\tMask=0x%016jx\n", w->Mask); +} + static void acpi_handle_erst(ACPI_TABLE_HEADER *sdp) { ACPI_TABLE_ERST *erst; - ACPI_WHEA_HEADER *w; + ACPI_ERST_ENTRY *w; u_int i; printf(BEGIN_COMMENT); @@ -668,10 +848,10 @@ acpi_handle_erst(ACPI_TABLE_HEADER *sdp) erst = (ACPI_TABLE_ERST *)sdp; printf("\tHeaderLength=%d\n", erst->HeaderLength); printf("\tEntries=%d\n", erst->Entries); - w = (ACPI_WHEA_HEADER *)(erst + 1); + w = (ACPI_ERST_ENTRY *)(erst + 1); for (i = 0; i < MIN(erst->Entries, (sdp->Length - - sizeof(ACPI_TABLE_ERST)) / sizeof(ACPI_WHEA_HEADER)); i++) - acpi_print_whea(w + i); + sizeof(ACPI_TABLE_ERST)) / sizeof(ACPI_ERST_ENTRY)); i++) + acpi_print_erst_entry(w + i); printf(END_COMMENT); } From nobody Tue Jun 23 16:28:04 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 4gl9Tx2V6gz6hhPq for ; Tue, 23 Jun 2026 16:28:05 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Tx1NKrz3M70 for ; Tue, 23 Jun 2026 16:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232085; 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=IKV89Pqm13J8TM14C85zNbwOFaD2NStESN/+kgjAICE=; b=GRDhTcKnP+JxorRe7W3J2BczwXhlW51iO99J97emilmJoQG5zwwGKisAbG9B1Ar8hn5dPA X1jenETc8jooBWqu+qA2W9SeddDytU1ZcYcvNide6I4LaWmjPed69/TSN2hhRJyREVl9Un TwHLsoqgj2gkNHYdQKTLSOvHL7vpfHlx4vlGQOeiSAsQTn8e27scsn7ag99LRWgxPMtKNj 5vdA5B2quo6GSs4Br3dNL1GqkhNj4cEwxaWb2XwPN7BabhXkkQ5AeCuMQc4AD55Kj0XAJC /meotWwqxANlWc1FGOC/GsgooF9gip5xwUQAe57NZdx6+7UZyvCxMOWPMEiIBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232085; a=rsa-sha256; cv=none; b=OBU9k9l8I0CTSDia3ISBS/eB/ie0xbprTVTx2M+LqT68zxJfABnZyP7evP8RZUj3QbCmH/ CecPR/Mr5J6gquQ6B4fpuTrkqak/vmrTpIJQ2f+msRpxwPGUF6nFP5yMSWU8vl8d2l6Qfx xJE5CV6BtBC29dRHW2P0+cUWieRisBaHl62c0ybV58QYoxQg1k8HLp+GspkbNGij4PCbdB Kxq2vnjOsjHo/M6eNJFmijuyL5vj2dhMVIlcn1v2BoA7LUWRigP4U60Z6U049AfGqboSsu wJzq9/lrzZYSatWuJpfy5C9aoTLUIzFQMoF1w1w8+Q4bbmPzq+yOVHt4PDMKvg== 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=1782232085; 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=IKV89Pqm13J8TM14C85zNbwOFaD2NStESN/+kgjAICE=; b=wiItFzjUs5Bv81UbfM2hk3MYOMlavcHsnyVT5H3cyTK+qDcPNTH1Rvdkt95uwAVLnSA8F6 LwZra7tH+J1uaXgyETJ38SoafxRUo0HYtyhSbHEGjZDr9eTfsS/SIrc+xa2NqpiyxaRlyc aZNHfBUdOdpflIm/mOfQZgyLZd0bfUN+d5iYGRH9hfFXWZAMujm1VPJtrsisxZHOME8t7F Tuz+Az3iX1If1nBdjjd2oTHsv3NMyW0U3AtI04mfA791S81JKBwKgOCjTsgP23xFauj3TX NlJhWrtT2rKnyg2f45BBZjRsPpm72LTFhfXon+yEsNC2yhsRYUuOvjyzclOSLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Tw6rXKzhNh for ; Tue, 23 Jun 2026 16:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 16211a5fbbaa - stable/15 - bus: Document special ranges of IVARs 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 16211a5fbbaa0af4618376b40c9870adad520270 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:04 +0000 Message-Id: <6a3ab414.26c57.dc9109@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=16211a5fbbaa0af4618376b40c9870adad520270 commit 16211a5fbbaa0af4618376b40c9870adad520270 Author: John Baldwin AuthorDate: 2026-02-17 20:45:13 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:59:13 +0000 bus: Document special ranges of IVARs Some IVAR indices are special in that they have global meaning across multiple buses where as other IVARs are always private to the local bus. Try to document this a bit and add constants for the various ranges to avoid future conflicts. This is a no-op, but IVAR indices are now generally defined as enums as that makes it easier to define them in terms of ranges. Reviewed by: imp, royger, andrew Differential Revision: https://reviews.freebsd.org/D54159 (cherry picked from commit 6cf4e30252fe48b230b9d76cac20576d5b3d2ffa) --- sys/arm/arm/gic_common.h | 10 ++++++---- sys/arm64/arm64/gic_v3_var.h | 10 ++++++---- sys/dev/acpica/acpivar.h | 12 +++++++----- sys/dev/atkbdc/atkbdcreg.h | 2 +- sys/dev/bhnd/bhnd.h | 2 +- sys/dev/fdc/fdcvar.h | 2 +- sys/dev/gpio/gpiobusvar.h | 2 +- sys/dev/hid/hidbus.h | 2 +- sys/dev/iicbus/iicbus.h | 2 +- sys/dev/mii/miivar.h | 2 +- sys/dev/mmc/mmcbrvar.h | 2 +- sys/dev/mmc/mmcvar.h | 2 +- sys/dev/nvdimm/nvdimm_var.h | 2 +- sys/dev/ow/ow.h | 2 +- sys/dev/pccard/pccardvar.h | 2 +- sys/dev/pci/pcivar.h | 4 ++-- sys/dev/ppbus/ppbconf.h | 12 ++++++++---- sys/dev/puc/puc_bus.h | 6 ++++-- sys/dev/pwm/pwmbus.h | 2 +- sys/dev/quicc/quicc_bus.h | 8 +++++--- sys/dev/scc/scc_bus.h | 14 ++++++++------ sys/dev/sdio/sdiob.h | 2 +- sys/dev/smbus/smbconf.h | 2 +- sys/dev/sound/pci/hda/hdac.h | 2 +- sys/dev/spibus/spibusvar.h | 2 +- sys/dev/superio/superio.h | 2 +- sys/dev/virtio/virtio.h | 16 +++++++++------- sys/isa/isavar.h | 2 +- sys/powerpc/ps3/ps3bus.h | 2 +- sys/powerpc/psim/iobusvar.h | 2 +- sys/sys/bus.h | 16 ++++++++++++++++ sys/sys/cpu.h | 10 ++++++---- sys/x86/include/legacyvar.h | 2 +- sys/xen/xenbus/xenbusvar.h | 2 +- 34 files changed, 100 insertions(+), 64 deletions(-) diff --git a/sys/arm/arm/gic_common.h b/sys/arm/arm/gic_common.h index c2d1b1340b9b..d2f422ab6536 100644 --- a/sys/arm/arm/gic_common.h +++ b/sys/arm/arm/gic_common.h @@ -35,10 +35,12 @@ struct arm_gic_range { uint64_t size; }; -#define GIC_IVAR_HW_REV 500 -#define GIC_IVAR_BUS 501 -#define GIC_IVAR_VGIC 502 -#define GIC_IVAR_SUPPORT_LPIS 503 +enum { + GIC_IVAR_HW_REV = BUS_IVARS_GIC, + GIC_IVAR_BUS, + GIC_IVAR_VGIC, + GIC_IVAR_SUPPORT_LPIS +}; /* GIC_IVAR_BUS values */ #define GIC_BUS_UNKNOWN 0 diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 8bc0f456d91e..23ee92466574 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -105,10 +105,12 @@ struct gic_v3_devinfo { MALLOC_DECLARE(M_GIC_V3); /* ivars */ -#define GICV3_IVAR_NIRQS 1000 -/* 1001 was GICV3_IVAR_REDIST_VADDR */ -#define GICV3_IVAR_REDIST 1002 -#define GICV3_IVAR_SUPPORT_LPIS 1003 +enum { + GICV3_IVAR_NIRQS = BUS_IVARS_GICV3, + _GICV3_IVAR_REDIST_VADDR, /* unused */ + GICV3_IVAR_REDIST, + GICV3_IVAR_SUPPORT_LPIS, +}; __BUS_ACCESSOR(gicv3, nirqs, GICV3, NIRQS, u_int); __BUS_ACCESSOR(gicv3, redist, GICV3, REDIST, void *); diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index ea416402f530..15738bbb1171 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -275,11 +275,13 @@ extern int acpi_override_isa_irq_polarity; * interface compatibility with ISA drivers which can also * attach to ACPI. */ -#define ACPI_IVAR_HANDLE 0x100 -#define ACPI_IVAR_UNUSED 0x101 /* Unused/reserved. */ -#define ACPI_IVAR_PRIVATE 0x102 -#define ACPI_IVAR_FLAGS 0x103 -#define ACPI_IVAR_DOMAIN 0x104 +enum { + ACPI_IVAR_HANDLE = BUS_IVARS_ACPI, + ACPI_IVAR_UNUSED, /* Unused/reserved. */ + ACPI_IVAR_PRIVATE, + ACPI_IVAR_FLAGS, + ACPI_IVAR_DOMAIN +}; /* * ad_domain NUMA domain special value. diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h index dc2194dc69c2..a731d33b8de2 100644 --- a/sys/dev/atkbdc/atkbdcreg.h +++ b/sys/dev/atkbdc/atkbdcreg.h @@ -215,7 +215,7 @@ typedef struct atkbdc_softc { } atkbdc_softc_t; enum kbdc_device_ivar { - KBDC_IVAR_VENDORID, + KBDC_IVAR_VENDORID = BUS_IVARS_PRIVATE, KBDC_IVAR_SERIAL, KBDC_IVAR_LOGICALID, KBDC_IVAR_COMPATID, diff --git a/sys/dev/bhnd/bhnd.h b/sys/dev/bhnd/bhnd.h index c21cca0f48dd..aac3e8494e16 100644 --- a/sys/dev/bhnd/bhnd.h +++ b/sys/dev/bhnd/bhnd.h @@ -60,7 +60,7 @@ * bhnd child instance variables */ enum bhnd_device_vars { - BHND_IVAR_VENDOR, /**< Designer's JEP-106 manufacturer ID. */ + BHND_IVAR_VENDOR = BUS_IVARS_PRIVATE, /**< Designer's JEP-106 manufacturer ID. */ BHND_IVAR_DEVICE, /**< Part number */ BHND_IVAR_HWREV, /**< Core revision */ BHND_IVAR_DEVICE_CLASS, /**< Core class (@sa bhnd_devclass_t) */ diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h index 881f6f9f898d..8b7081e0a6cc 100644 --- a/sys/dev/fdc/fdcvar.h +++ b/sys/dev/fdc/fdcvar.h @@ -69,7 +69,7 @@ struct fdc_data { }; enum fdc_device_ivars { - FDC_IVAR_FDUNIT, + FDC_IVAR_FDUNIT = BUS_IVARS_PRIVATE, FDC_IVAR_FDTYPE, }; diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h index 0528efe45525..3da6249d1de6 100644 --- a/sys/dev/gpio/gpiobusvar.h +++ b/sys/dev/gpio/gpiobusvar.h @@ -109,7 +109,7 @@ struct gpiobus_ivar }; enum gpiobus_ivars { - GPIOBUS_IVAR_NPINS = 10500, + GPIOBUS_IVAR_NPINS = BUS_IVARS_GPIOBUS, GPIOBUS_IVAR_PINS, }; diff --git a/sys/dev/hid/hidbus.h b/sys/dev/hid/hidbus.h index 3de4a6291511..50b680c41065 100644 --- a/sys/dev/hid/hidbus.h +++ b/sys/dev/hid/hidbus.h @@ -27,7 +27,7 @@ #define _HID_HIDBUS_H_ enum { - HIDBUS_IVAR_USAGE, + HIDBUS_IVAR_USAGE = BUS_IVARS_PRIVATE, HIDBUS_IVAR_INDEX, HIDBUS_IVAR_FLAGS, #define HIDBUS_FLAG_AUTOCHILD (0<<1) /* Child is autodiscovered */ diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h index 74503d3e54ec..a72b004fcc7f 100644 --- a/sys/dev/iicbus/iicbus.h +++ b/sys/dev/iicbus/iicbus.h @@ -57,7 +57,7 @@ struct iicbus_ivar /* Value of 0x100 is reserved for ACPI_IVAR_HANDLE used by acpi_iicbus */ enum { - IICBUS_IVAR_ADDR /* Address or base address */ + IICBUS_IVAR_ADDR = BUS_IVARS_PRIVATE /* Address or base address */ }; #define IICBUS_ACCESSOR(A, B, T) \ diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index 5b0782775359..ef82d9f66a5d 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -250,7 +250,7 @@ struct mii_phydesc { (*(p)->mii_funcs->pf_reset)(p) enum miibus_device_ivars { - MIIBUS_IVAR_FLAGS + MIIBUS_IVAR_FLAGS = BUS_IVARS_PRIVATE }; /* diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h index c47966793098..06d38553c201 100644 --- a/sys/dev/mmc/mmcbrvar.h +++ b/sys/dev/mmc/mmcbrvar.h @@ -60,7 +60,7 @@ #include "mmcbr_if.h" enum mmcbr_device_ivars { - MMCBR_IVAR_BUS_TYPE, + MMCBR_IVAR_BUS_TYPE = BUS_IVARS_PRIVATE, MMCBR_IVAR_BUS_MODE, MMCBR_IVAR_BUS_WIDTH, MMCBR_IVAR_CHIP_SELECT, diff --git a/sys/dev/mmc/mmcvar.h b/sys/dev/mmc/mmcvar.h index 268b298bce58..a335e098d2ad 100644 --- a/sys/dev/mmc/mmcvar.h +++ b/sys/dev/mmc/mmcvar.h @@ -56,7 +56,7 @@ #define DEV_MMC_MMCVAR_H enum mmc_device_ivars { - MMC_IVAR_SPEC_VERS, + MMC_IVAR_SPEC_VERS = BUS_IVARS_PRIVATE, MMC_IVAR_DSR_IMP, MMC_IVAR_MEDIA_SIZE, MMC_IVAR_RCA, diff --git a/sys/dev/nvdimm/nvdimm_var.h b/sys/dev/nvdimm/nvdimm_var.h index ad931e8fbb23..6b7c8afe42b3 100644 --- a/sys/dev/nvdimm/nvdimm_var.h +++ b/sys/dev/nvdimm/nvdimm_var.h @@ -79,7 +79,7 @@ _Static_assert(sizeof(struct nvdimm_label) == 256, "Incorrect layout"); typedef uint32_t nfit_handle_t; enum nvdimm_acpi_ivar { - NVDIMM_ROOT_IVAR_ACPI_HANDLE, + NVDIMM_ROOT_IVAR_ACPI_HANDLE = BUS_IVARS_PRIVATE, NVDIMM_ROOT_IVAR_DEVICE_HANDLE, NVDIMM_ROOT_IVAR_MAX, }; diff --git a/sys/dev/ow/ow.h b/sys/dev/ow/ow.h index b4d97f957504..6d38111d925c 100644 --- a/sys/dev/ow/ow.h +++ b/sys/dev/ow/ow.h @@ -27,7 +27,7 @@ #define DEV_OW_OW_H 1 enum ow_device_ivars { - OW_IVAR_FAMILY, + OW_IVAR_FAMILY = BUS_IVARS_PRIVATE, OW_IVAR_ROMID }; diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 546d69939699..c6a03b242f35 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -191,7 +191,7 @@ int pccard_select_cfe(device_t dev, int entry); /* ivar interface */ enum { - PCCARD_IVAR_ETHADDR, /* read ethernet address from CIS tupple */ + PCCARD_IVAR_ETHADDR = BUS_IVARS_PRIVATE, /* read ethernet address from CIS tupple */ PCCARD_IVAR_VENDOR, PCCARD_IVAR_PRODUCT, PCCARD_IVAR_PRODEXT, diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 4abb5e977346..696e1c688c68 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -340,7 +340,7 @@ struct pci_devinfo { #include "pci_if.h" enum pci_device_ivars { - PCI_IVAR_SUBVENDOR, + PCI_IVAR_SUBVENDOR = BUS_IVARS_PRIVATE, PCI_IVAR_SUBDEVICE, PCI_IVAR_VENDOR, PCI_IVAR_DEVICE, @@ -414,7 +414,7 @@ pci_write_config(device_t dev, int reg, uint32_t val, int width) /*typedef enum pci_device_ivars pcib_device_ivars;*/ enum pcib_device_ivars { - PCIB_IVAR_DOMAIN, + PCIB_IVAR_DOMAIN = BUS_IVARS_PRIVATE, PCIB_IVAR_BUS }; diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h index 66f45634ea6d..673006bff4c6 100644 --- a/sys/dev/ppbus/ppbconf.h +++ b/sys/dev/ppbus/ppbconf.h @@ -178,7 +178,9 @@ struct ppb_context { /* * List of IVARS available to ppb device drivers */ -#define PPBUS_IVAR_MODE 0 +enum { + PPBUS_IVAR_MODE = BUS_IVARS_PRIVATE +}; /* other fields are reserved to the ppbus internals */ @@ -208,9 +210,11 @@ struct ppb_device { #define EPP_1_7 0x1 /* Parallel Port Chipset IVARS */ /* elsewhere XXX */ -#define PPC_IVAR_EPP_PROTO 0 -#define PPC_IVAR_LOCK 1 -#define PPC_IVAR_INTR_HANDLER 2 +enum { + PPC_IVAR_EPP_PROTO = BUS_IVARS_PRIVATE, + PPC_IVAR_LOCK, + PPC_IVAR_INTR_HANDLER +}; /* * Maximum size of the PnP info string diff --git a/sys/dev/puc/puc_bus.h b/sys/dev/puc/puc_bus.h index 75c39a0f22fc..09fbe2dc42ab 100644 --- a/sys/dev/puc/puc_bus.h +++ b/sys/dev/puc/puc_bus.h @@ -32,8 +32,10 @@ #include #include -#define PUC_IVAR_CLOCK 0 -#define PUC_IVAR_TYPE 1 +enum { + PUC_IVAR_CLOCK = BUS_IVARS_PRIVATE, + PUC_IVAR_TYPE +}; /* Port types. */ #define PUC_TYPE_SERIAL 1 diff --git a/sys/dev/pwm/pwmbus.h b/sys/dev/pwm/pwmbus.h index 59aacc7beee4..172d8939bcf5 100644 --- a/sys/dev/pwm/pwmbus.h +++ b/sys/dev/pwm/pwmbus.h @@ -38,7 +38,7 @@ struct pwmbus_ivars { }; enum { - PWMBUS_IVAR_CHANNEL, /* Channel used by child dev */ + PWMBUS_IVAR_CHANNEL = BUS_IVARS_PRIVATE, /* Channel used by child dev */ }; #define PWMBUS_ACCESSOR(A, B, T) \ diff --git a/sys/dev/quicc/quicc_bus.h b/sys/dev/quicc/quicc_bus.h index 01d8952dddbb..385c24b93f01 100644 --- a/sys/dev/quicc/quicc_bus.h +++ b/sys/dev/quicc/quicc_bus.h @@ -29,9 +29,11 @@ #ifndef _DEV_QUICC_BUS_H_ #define _DEV_QUICC_BUS_H_ -#define QUICC_IVAR_CLOCK 1 /* The CPM clock. */ -#define QUICC_IVAR_BRGCLK 2 /* The BRG clock affected by SCCR. */ -#define QUICC_IVAR_DEVTYPE 3 +enum { + QUICC_IVAR_CLOCK = BUS_IVARS_PRIVATE + 1, /* The CPM clock. */ + QUICC_IVAR_BRGCLK, /* The BRG clock affected by SCCR. */ + QUICC_IVAR_DEVTYPE +}; /* Device types. */ #define QUICC_DEVTYPE_SCC 1 diff --git a/sys/dev/scc/scc_bus.h b/sys/dev/scc/scc_bus.h index 96169d7403d8..3b86dabf1046 100644 --- a/sys/dev/scc/scc_bus.h +++ b/sys/dev/scc/scc_bus.h @@ -32,12 +32,14 @@ #include #include -#define SCC_IVAR_CHANNEL 0 -#define SCC_IVAR_CLASS 1 -#define SCC_IVAR_CLOCK 2 -#define SCC_IVAR_MODE 3 -#define SCC_IVAR_REGSHFT 4 -#define SCC_IVAR_HWMTX 5 +enum { + SCC_IVAR_CHANNEL = BUS_IVARS_PRIVATE, + SCC_IVAR_CLASS, + SCC_IVAR_CLOCK, + SCC_IVAR_MODE, + SCC_IVAR_REGSHFT, + SCC_IVAR_HWMTX +}; /* Hardware class -- the SCC type. */ #define SCC_CLASS_UNUSED 0 diff --git a/sys/dev/sdio/sdiob.h b/sys/dev/sdio/sdiob.h index 841a3a969879..3875ced43731 100644 --- a/sys/dev/sdio/sdiob.h +++ b/sys/dev/sdio/sdiob.h @@ -64,7 +64,7 @@ #ifdef _SYS_BUS_H_ /* Ivars for sdiob. */ enum sdiob_dev_enum { - SDIOB_IVAR_SUPPORT_MULTIBLK, + SDIOB_IVAR_SUPPORT_MULTIBLK = BUS_IVARS_PRIVATE, SDIOB_IVAR_FUNCTION, SDIOB_IVAR_FUNCNUM, SDIOB_IVAR_CLASS, diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h index a6c320594064..6d2d03f11def 100644 --- a/sys/dev/smbus/smbconf.h +++ b/sys/dev/smbus/smbconf.h @@ -75,7 +75,7 @@ * ivars codes */ enum smbus_ivars { - SMBUS_IVAR_ADDR, /* slave address of the device */ + SMBUS_IVAR_ADDR = BUS_IVARS_PRIVATE, /* slave address of the device */ }; int smbus_request_bus(device_t, device_t, int); diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 3a0e63d0d464..23a6b69b627c 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -982,7 +982,7 @@ typedef int nid_t; ****************************************************************************/ enum hdac_device_ivars { - HDA_IVAR_CODEC_ID, + HDA_IVAR_CODEC_ID = BUS_IVARS_PRIVATE, HDA_IVAR_NODE_ID, HDA_IVAR_VENDOR_ID, HDA_IVAR_DEVICE_ID, diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h index 25cd380173ad..82100f767bda 100644 --- a/sys/dev/spibus/spibusvar.h +++ b/sys/dev/spibus/spibusvar.h @@ -48,7 +48,7 @@ struct spibus_ivar #define SPIBUS_CS_HIGH (1U << 31) enum { - SPIBUS_IVAR_CS, /* chip select that we're on */ + SPIBUS_IVAR_CS = BUS_IVARS_PRIVATE, /* chip select that we're on */ SPIBUS_IVAR_MODE, /* SPI mode (0-3) */ SPIBUS_IVAR_CLOCK, /* maximum clock freq for device */ SPIBUS_IVAR_CS_DELAY, /* delay in microseconds after toggling chip select */ diff --git a/sys/dev/superio/superio.h b/sys/dev/superio/superio.h index c19ffbb43fe2..82530b14429b 100644 --- a/sys/dev/superio/superio.h +++ b/sys/dev/superio/superio.h @@ -60,7 +60,7 @@ device_t superio_find_dev(device_t superio, superio_dev_type_t type, int ldn); enum superio_ivars { - SUPERIO_IVAR_LDN = 10600, + SUPERIO_IVAR_LDN = BUS_IVARS_SUPERIO, SUPERIO_IVAR_TYPE, SUPERIO_IVAR_IOBASE, SUPERIO_IVAR_IOBASE2, diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h index 855dafd63033..6266dc29b94c 100644 --- a/sys/dev/virtio/virtio.h +++ b/sys/dev/virtio/virtio.h @@ -53,13 +53,15 @@ struct vq_alloc_info; /* * VirtIO instance variables indices. */ -#define VIRTIO_IVAR_DEVTYPE 1 -#define VIRTIO_IVAR_FEATURE_DESC 2 -#define VIRTIO_IVAR_VENDOR 3 -#define VIRTIO_IVAR_DEVICE 4 -#define VIRTIO_IVAR_SUBVENDOR 5 -#define VIRTIO_IVAR_SUBDEVICE 6 -#define VIRTIO_IVAR_MODERN 7 +enum { + VIRTIO_IVAR_DEVTYPE = BUS_IVARS_PRIVATE + 1, + VIRTIO_IVAR_FEATURE_DESC, + VIRTIO_IVAR_VENDOR, + VIRTIO_IVAR_DEVICE, + VIRTIO_IVAR_SUBVENDOR, + VIRTIO_IVAR_SUBDEVICE, + VIRTIO_IVAR_MODERN +}; struct virtio_feature_desc { uint64_t vfd_val; diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h index 2d4f643d531d..f0b880de2930 100644 --- a/sys/isa/isavar.h +++ b/sys/isa/isavar.h @@ -103,7 +103,7 @@ struct isa_pnp_id { }; enum isa_device_ivars { - ISA_IVAR_PORT, + ISA_IVAR_PORT = BUS_IVARS_PRIVATE, ISA_IVAR_PORT_0 = ISA_IVAR_PORT, ISA_IVAR_PORT_1, ISA_IVAR_PORTSIZE, diff --git a/sys/powerpc/ps3/ps3bus.h b/sys/powerpc/ps3/ps3bus.h index 386e54065b35..36433202f193 100644 --- a/sys/powerpc/ps3/ps3bus.h +++ b/sys/powerpc/ps3/ps3bus.h @@ -29,7 +29,7 @@ #define _POWERPC_PS3_PS3BUS_H enum { - PS3BUS_IVAR_BUS, + PS3BUS_IVAR_BUS = BUS_IVARS_PRIVATE, PS3BUS_IVAR_DEVICE, PS3BUS_IVAR_BUSTYPE, PS3BUS_IVAR_DEVTYPE, diff --git a/sys/powerpc/psim/iobusvar.h b/sys/powerpc/psim/iobusvar.h index e95478c6f411..d732eacfaf34 100644 --- a/sys/powerpc/psim/iobusvar.h +++ b/sys/powerpc/psim/iobusvar.h @@ -35,7 +35,7 @@ */ enum iobus_ivars { - IOBUS_IVAR_NODE, + IOBUS_IVAR_NODE = BUS_IVARS_PRIVATE, IOBUS_IVAR_NAME, IOBUS_IVAR_NREGS, IOBUS_IVAR_REGS, diff --git a/sys/sys/bus.h b/sys/sys/bus.h index a0967178830f..b5c9fc09e3b5 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -297,6 +297,22 @@ enum intr_polarity { INTR_POLARITY_LOW = 2 }; +/** + * Bus drivers may maintain a set of bus-specific instance variables + * for each child device. The BUS_READ_IVAR/BUS_WRITE_IVAR API can be + * used to access these variables using an index value. Some index + * values are private to a single bus and should be defined in the + * private range. Other index values are shared by multiple busses + * and must have the same meaning in all bus drivers. + */ + +#define BUS_IVARS_PRIVATE 0x0 /* private variables */ +#define BUS_IVARS_ACPI 0x100 +#define BUS_IVARS_GIC 500 +#define BUS_IVARS_GICV3 1000 +#define BUS_IVARS_GPIOBUS 10500 +#define BUS_IVARS_SUPERIO 10600 + /** * CPU sets supported by bus_get_cpus(). Note that not all sets may be * supported for a given device. If a request is not supported by a diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h index b6a0094f0c51..7c3dacdff33b 100644 --- a/sys/sys/cpu.h +++ b/sys/sys/cpu.h @@ -35,10 +35,12 @@ * CPU device support. */ -#define CPU_IVAR_PCPU 1 -#define CPU_IVAR_NOMINAL_MHZ 2 -#define CPU_IVAR_CPUID_SIZE 3 -#define CPU_IVAR_CPUID 4 +enum { + CPU_IVAR_PCPU = BUS_IVARS_PRIVATE + 1, + CPU_IVAR_NOMINAL_MHZ, + CPU_IVAR_CPUID_SIZE, + CPU_IVAR_CPUID +}; static __inline struct pcpu *cpu_get_pcpu(device_t dev) { diff --git a/sys/x86/include/legacyvar.h b/sys/x86/include/legacyvar.h index 919650db6d71..3fb43c75f896 100644 --- a/sys/x86/include/legacyvar.h +++ b/sys/x86/include/legacyvar.h @@ -30,7 +30,7 @@ #define _X86_LEGACYVAR_H_ enum legacy_device_ivars { - LEGACY_IVAR_PCIDOMAIN, + LEGACY_IVAR_PCIDOMAIN = BUS_IVARS_PRIVATE, LEGACY_IVAR_PCIBUS, LEGACY_IVAR_PCISLOT, LEGACY_IVAR_PCIFUNC diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index 0f4168f17e6a..83638ed6302f 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -55,7 +55,7 @@ enum { /** * Path of this device node. */ - XENBUS_IVAR_NODE, + XENBUS_IVAR_NODE = BUS_IVARS_PRIVATE, /** * The device type (e.g. vif, vbd). From nobody Tue Jun 23 16:28:06 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 4gl9Ty6SMxz6hhKf for ; Tue, 23 Jun 2026 16:28:06 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Ty1Cv0z3M9h for ; Tue, 23 Jun 2026 16:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232086; 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=UevL4TG4Zx01GbxWo5BKLPHPjL5qgNd/cwOWcZOx2lc=; b=ynrYGT9U+eydSHmNyQcboeYReqW6yWXh8AbSw/Czbm5siArI3DA09VP8DZHuNTealLGL9C jSlz/0SJ6f+g7g2z/jMftYb61bn2wr7R7C+WPtyE7JhYW6kbVdnU7i0+xP72xmruU1IVsE F98vBi3YG66Qe0QQp7JHUu9SwnG9FYiNkI5YURcD10vyZJtjbOBVSZI22vq4PKSvg/x3B/ yLbE2+B6zdJzQzI5bwwUNxNt5UIGNry2Dz6ngH4O45hGFeNmrZ2oUwL/E6y4n7SVeLCQGM tqGXKmNzNcDv1KC6X1a2AFiJarbEBtpMvsZLqcZN9/I/KVrYfRuYGyrUE4qn4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232086; a=rsa-sha256; cv=none; b=YtfcZBAAoLa9BBwZ5o15rDZmmInnE+wyiclUsbY633CwO/Zyj6eM+1q4zkhNmjU9ttbTzQ DQZk9vJry0bABw8d6nv+7wWc42McM2sa2bOuGhctGbSPuC4NCelacDxmbW88QglS2SbqEc G1baeINxlnwblWvK0qHhVvXMXc85jqxL7REIQdwSLD6eVARZeH+OGvcWtZv4EebHk8nGGn pWKWBxYFMcGscukGUb/FF66ubWURtEFoR4lExbXp8B4g5L+47QWqkE7Lef9IHf6yB9hGeD pm8Ljxt5BKvhZqt+8WVZHh4jk+SQipBRNvxVYbvAUQAj+ge/l75PTOuegBBmVA== 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=1782232086; 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=UevL4TG4Zx01GbxWo5BKLPHPjL5qgNd/cwOWcZOx2lc=; b=Q3Q1ydg6/gOLgrVIbVlaS7vAEXCeibsc8CaN+KN7Ary45r4AU/eWvlsJay5KdpjTOqYE3P dREykitw0KUOsiPWJ2E+RR/+D7mLHwX0tlxR2/l/wNzjYfZmpHyNQuLmSmxIKxGx436n18 uu3XmaZo8Re+TMCMlM3amdDAkhMpzIcH/BtkPfjj4ck1/FMO9pnw9nx6lvEV5F+RkOFHk8 13Q8avmgQtC47vKCCuieO7778cjNzb7Vsoxtce34eTsuMgzp0fFfAVDKIpC9popYjup8ML JYF/aSUkRwuH9/fM350W8UGogtK+HyesXm6mLYvZx+RPHAxsigDh+c9+w8T4Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Ty08jqzhNj for ; Tue, 23 Jun 2026 16:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27001 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Zhenlei Huang From: John Baldwin Subject: git: e813c1172631 - stable/15 - sys/bus.h: Some style(9) fixes 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e813c11726317d815a236e5798150b05eca6701a Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:06 +0000 Message-Id: <6a3ab416.27001.32bddc7b@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e813c11726317d815a236e5798150b05eca6701a commit e813c11726317d815a236e5798150b05eca6701a Author: Zhenlei Huang AuthorDate: 2025-09-12 04:55:14 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:00:51 +0000 sys/bus.h: Some style(9) fixes and whitespace cleanup. MFC after: 3 days (cherry picked from commit 22238759c57d942865cf9d1a355a0d04819eb621) --- sys/sys/bus.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index b5c9fc09e3b5..801fd0a1fe51 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -78,7 +78,7 @@ typedef enum device_property_type { * The strings are placed one after the other, separated by NUL characters. * Fields should be added after the last one and order maintained for compatibility */ -#define BUS_USER_BUFFER (3*1024) +#define BUS_USER_BUFFER (3 * 1024) struct u_device { uintptr_t dv_handle; uintptr_t dv_parent; @@ -247,8 +247,8 @@ typedef struct devclass *devclass_t; * and may use regular mutexes. However, it is prohibited from * sleeping on a sleep queue. */ -typedef int driver_filter_t(void*); -typedef void driver_intr_t(void*); +typedef int driver_filter_t(void *); +typedef void driver_intr_t(void *); /** * @brief Interrupt type bits. @@ -492,18 +492,18 @@ int bus_generic_resume(device_t dev); int bus_generic_resume_child(device_t dev, device_t child); int bus_generic_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, - driver_filter_t *filter, driver_intr_t *intr, + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep); struct resource * - bus_generic_rl_alloc_resource (device_t, device_t, int, int *, - rman_res_t, rman_res_t, rman_res_t, u_int); -void bus_generic_rl_delete_resource (device_t, device_t, int, int); -int bus_generic_rl_get_resource (device_t, device_t, int, int, rman_res_t *, - rman_res_t *); -int bus_generic_rl_set_resource (device_t, device_t, int, int, rman_res_t, - rman_res_t); -int bus_generic_rl_release_resource (device_t, device_t, struct resource *); + bus_generic_rl_alloc_resource(device_t, device_t, int, int *, + rman_res_t, rman_res_t, rman_res_t, u_int); +void bus_generic_rl_delete_resource(device_t, device_t, int, int); +int bus_generic_rl_get_resource(device_t, device_t, int, int, rman_res_t *, + rman_res_t *); +int bus_generic_rl_set_resource(device_t, device_t, int, int, rman_res_t, + rman_res_t); +int bus_generic_rl_release_resource(device_t, device_t, struct resource *); struct resource * bus_generic_rman_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, @@ -578,7 +578,7 @@ int bus_get_domain(device_t dev, int *domain); int bus_release_resource(device_t dev, struct resource *r); int bus_free_resource(device_t dev, int type, struct resource *r); int bus_setup_intr(device_t dev, struct resource *r, int flags, - driver_filter_t filter, driver_intr_t handler, + driver_filter_t filter, driver_intr_t handler, void *arg, void **cookiep); int bus_teardown_intr(device_t dev, struct resource *r, void *cookie); int bus_suspend_intr(device_t dev, struct resource *r); @@ -746,9 +746,9 @@ int device_probe_child(device_t bus, device_t dev); int device_quiesce(device_t dev); void device_quiet(device_t dev); void device_quiet_children(device_t dev); -void device_set_desc(device_t dev, const char* desc); -void device_set_descf(device_t dev, const char* fmt, ...) __printflike(2, 3); -void device_set_desc_copy(device_t dev, const char* desc); +void device_set_desc(device_t dev, const char *desc); +void device_set_descf(device_t dev, const char *fmt, ...) __printflike(2, 3); +void device_set_desc_copy(device_t dev, const char *desc); int device_set_devclass(device_t dev, const char *classname); int device_set_devclass_fixed(device_t dev, const char *classname); bool device_is_devclass_fixed(device_t dev); @@ -946,7 +946,8 @@ DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ */ #define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ \ -static __inline type varp ## _get_ ## var(device_t dev) \ +static __inline type \ +varp ## _get_ ## var(device_t dev) \ { \ uintptr_t v = 0; \ int e __diagused; \ @@ -958,7 +959,8 @@ static __inline type varp ## _get_ ## var(device_t dev) \ return ((type) v); \ } \ \ -static __inline void varp ## _set_ ## var(device_t dev, type t) \ +static __inline void \ +varp ## _set_ ## var(device_t dev, type t) \ { \ uintptr_t v = (uintptr_t) t; \ int e __diagused; \ From nobody Tue Jun 23 16:28:08 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 4gl9V05kpSz6hhbl for ; Tue, 23 Jun 2026 16:28:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V02KwJz3Mch for ; Tue, 23 Jun 2026 16:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232088; 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=0CpAYbmbdrRC8v4/L7KHrhZZzYmMOh7uk4bZIa4ci64=; b=q4UMZy35d5PXEQPOFyCU4D8YE9yIz/OQZCbGZ8LGrC+HpSH0oL4ZIR3QudaybMGa7QCazM pyXacvBAGGgY9bS0OWey3+aR9FGClZ72Sx5lOjRPVpD9M1nblgIoDYsAQ5x3zcIX3xH1MF vWGTZqe1afIhUGHFsp22iAFw5WHqV3Fz3wyO0Y7kScgpIFizdz7qytliWVN56VhisF4gb0 H0JYGfCJBReIXbiEq3LdiW5KiW52QMWFzuaw5/ZWMLymqRUiykBb55Z0YHuFZZX+LsHjJQ BVye70t7s/Tm/Chk1swjLRmzb6d91ySvQuHRuGVEQjLuORZK6bCZUrQh9GoUrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232088; a=rsa-sha256; cv=none; b=lshqFgW6USCJnwz4hQJ1bt7tiTThoP7vWP3Y4XPa/ii4MNOpYzmKaH90bJRaKqv81+i0LP IJqt+66Ld3sZaMj0SzmJwPlMpqBLTqLOZanDBIcrmbzuT5TaSok2y2ZPNthc4soZBBd0py q1gr483zyx/9qdqKBRJs5yyDmiupRFIHxeO3xi+meSvKcsnSaw5HcoPKifHfMR+9jq0vTw 1lKAkFoY4li8z/B3gFfOiVHi8q2YWkO+gUDYAiZ8QFI78bDVyMhn8OiwaIjP9br0+NmZUg Zc/IIdR3UvsCCYB5DzRdhzKr1v2bCMbs0VGH2D6/C89ModRgz66VHK8XbQ50sQ== 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=1782232088; 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=0CpAYbmbdrRC8v4/L7KHrhZZzYmMOh7uk4bZIa4ci64=; b=sUA/C4Z7sN2a8cf4BC8myVAw0yl/HCBNblJz3vSQBT6+iGVjJ5pca7xJhvdpIO1nTGqyUx YONefMXATvRPKkRVMrHTiw2HVQaTF5VN1QbJKm+M9idTDlsNCbrbSJRj7HW7LphQvfa9lF IJqmAC5ELl04TiUedC8MLrvC4oWyoWRxKcWs1HRVoxL8xL2smNviV8rhTTuxfsPdMdyIrG KNxFiVsdP5lJMzjyQeMt07fOewDqFYSt6vccrSAPiuoB2A4PwFU3MaE6oW9t0N46ola9F5 MBMzRQdIEubPpEV3lvrrsL/c/+QxuMOCPKUJIClrpHw4mV46yj4F8YnbR6HNCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V01FF7zhrR for ; Tue, 23 Jun 2026 16:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ccb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a067a7170b84 - stable/15 - bus: Add __BUS_ACCESSOR_DEFAULT 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a067a7170b84320211ef834cb11bc77541933fbf Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:08 +0000 Message-Id: <6a3ab418.26ccb.15e3c4e1@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a067a7170b84320211ef834cb11bc77541933fbf commit a067a7170b84320211ef834cb11bc77541933fbf Author: John Baldwin AuthorDate: 2026-02-24 20:29:40 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:00:59 +0000 bus: Add __BUS_ACCESSOR_DEFAULT This macro is similar to __BUS_ACCESSOR in that it creates three helper routines for an ivar, but the "get" wrapper returns a default value if BUS_READ_IVAR does not return a value. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55353 (cherry picked from commit b937f9bf750907602606691dd92fb6d70e9f88da) --- sys/sys/bus.h | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index f1b4e0a7c55c..b679bef30e92 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -944,7 +944,7 @@ DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ /** * Generic ivar accessor generation macros for bus drivers */ -#define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ +#define __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ \ static __inline bool \ varp ## _has_ ## var(device_t dev) \ @@ -957,29 +957,47 @@ varp ## _has_ ## var(device_t dev) \ return (e == 0); \ } \ \ +static __inline void \ +varp ## _set_ ## var(device_t dev, type t) \ +{ \ + uintptr_t v = (uintptr_t) t; \ + int e __diagused; \ + e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \ + ivarp ## _IVAR_ ## ivar, v); \ + KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ + __func__, device_get_nameunit(dev), \ + device_get_nameunit(device_get_parent(dev)), e)); \ +} + +#define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ + __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ + \ static __inline type \ varp ## _get_ ## var(device_t dev) \ { \ uintptr_t v = 0; \ int e __diagused; \ + \ e = BUS_READ_IVAR(device_get_parent(dev), dev, \ ivarp ## _IVAR_ ## ivar, &v); \ KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ __func__, device_get_nameunit(dev), \ device_get_nameunit(device_get_parent(dev)), e)); \ return ((type) v); \ -} \ +} + +#define __BUS_ACCESSOR_DEFAULT(varp, var, ivarp, ivar, type, default) \ + __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ \ -static __inline void \ -varp ## _set_ ## var(device_t dev, type t) \ +static __inline type \ +varp ## _get_ ## var(device_t dev) \ { \ - uintptr_t v = (uintptr_t) t; \ - int e __diagused; \ - e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \ - ivarp ## _IVAR_ ## ivar, v); \ - KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ - __func__, device_get_nameunit(dev), \ - device_get_nameunit(device_get_parent(dev)), e)); \ + uintptr_t v = 0; \ + int e; \ + \ + e = BUS_READ_IVAR(device_get_parent(dev), dev, \ + ivarp ## _IVAR_ ## ivar, &v); \ + return (e == 0 ? (type) v : (default)); \ } struct device_location_cache; From nobody Tue Jun 23 16:28:07 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 4gl9Tz6Y1kz6hhYW for ; Tue, 23 Jun 2026 16:28:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Tz20qyz3Mcb for ; Tue, 23 Jun 2026 16:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232087; 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=fgl898dtKBVTDABop4M9ecsZSKN6IqNuN4dJbn6xolg=; b=QdZ33mAHBBPSjHHaIsQSOQx5TWck9HSfoPlXQpYFD1XKPUk3zfa75P5N0P77C4Bo2f/6zy tykBWXcGovAezOTBuPZPqlXk8EppEbVQAfO7YrO8KJD2wh4JTtnCa0beJfJwSrz+XvLxCo S69MdZw/sKonKnFsuhDjI3EhI7+2jwMYq6fZvaUUVGrh/8VxiHflQrhpS0hKd+c2NpkLVt F3w1tunIhf43e6NGmNxV7f6tjW2HhLvB2qmjLskVYkfGWmwNZOwfvd40RbbQiFT6RbXI/A bpkXSZNNKxZI6IE3+26RnSCmlEBvvPI0bfhC3hVk7LH8Hnjo7SLLDMI2tHXjxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232087; a=rsa-sha256; cv=none; b=nZ3MNxi7VbsnKLMeUiyKQ2WY6z4n+YDzZmkQ8dubVCib1AzEazwQcp4JBAiN5OVtxASktw pyD36TwuWpQSOfKSRx0Jr/a0Tvq0+uicMcEoNxb9suwZEaVDxj9+qGqkndR59vwq4kVBT/ REwubpb9bUkMvIzsxZuSGNbwoR4OcCPQMyeqWlspF07JbPFrLtgOfQi8lXWgn3hE4gdqtO gMr9i2MGjJwm1J/yQU2f/cvMfCHWpxXUpbNpDQx6JMK/Wv6f/LtQ7niRBKR1ABhIwkm5T5 O17tyxiuEz4mYKGWKAsvA2VnX+LhDcJu9F38M+EUwCQsoOJu+qIfZwL/KUO6Cw== 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=1782232087; 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=fgl898dtKBVTDABop4M9ecsZSKN6IqNuN4dJbn6xolg=; b=FK/e4O/n6P1B7oxJinBfpREpqHiPE28Op3ELuEGpXZAvqxEEWaEsAbtBrQtjh74fwE+dsd CzgAFNzrxDi0Ojzr8rLe/GEhh/hkwGCgRarkpsaDPSPnT/qKj2LizrC4gDcb2rvL+f8sp9 VpSH+0mzYRQm9FgjPZ0eUpHJtkIYF86p6s6rHOcv63Roxl7It4A35Qj5oF/EuT9VJfIOzA SkErsZ8hkZT2Ejt4/Bi88T9khDnb+LDczB5HJ6v3AmBt/8CwD2nZ2qKh/ZxSpOi4fEMpQI COm3FCpRhz9f8T+rbemXW0B1l4Phaj/KJJd2Wr3+J4hH1eCCdR58Dx1zMTnrWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Tz0cqkzhrQ for ; Tue, 23 Jun 2026 16:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2780c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 31d52cc42116 - stable/15 - bus: Add a new IVAR accessor to check for the existence of an IVAR 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 31d52cc42116127d7e96826a24881d20d75c512c Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:07 +0000 Message-Id: <6a3ab417.2780c.d4a86ac@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=31d52cc42116127d7e96826a24881d20d75c512c commit 31d52cc42116127d7e96826a24881d20d75c512c Author: John Baldwin AuthorDate: 2026-02-24 20:28:28 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:00:55 +0000 bus: Add a new IVAR accessor to check for the existence of an IVAR _has_ returns true if the given IVAR can be read. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55352 (cherry picked from commit cb5a0eb05310d06e9853a01a542be55b9adee038) --- sys/sys/bus.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 801fd0a1fe51..f1b4e0a7c55c 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -946,6 +946,17 @@ DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ */ #define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ \ +static __inline bool \ +varp ## _has_ ## var(device_t dev) \ +{ \ + uintptr_t v = 0; \ + int e; \ + \ + e = BUS_READ_IVAR(device_get_parent(dev), dev, \ + ivarp ## _IVAR_ ## ivar, &v); \ + return (e == 0); \ +} \ + \ static __inline type \ varp ## _get_ ## var(device_t dev) \ { \ From nobody Tue Jun 23 16:28:09 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 4gl9V217gMz6hhLR for ; Tue, 23 Jun 2026 16:28:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V12xDNz3Mcj for ; Tue, 23 Jun 2026 16:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232089; 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=ZNQrBbaoXv0/ZBhqnUVXfQGEXXFXclOULH7pbwXSY7Y=; b=pIu222R+DSe5isGxJ0pD5m09x4buxgZcWiqKJdA8SnJdGDUlMBVZaTqQJbLT9GjSAZGF/G MKFibzUDok7gcCBsh92dFyek38nS00KxX9c/51wDmII8VxOar/jjrJoFoRUdqzgeTOTZ4I z0ettnEmV10Pe6OI+Cqr2EjBaMuFGtiTaomWovFLItT56BjFZZtBf7sKNYHjdJeu5nfh4r KyKnrQZKboI4EwWn12/n493yoZouP8QE1zuumYhKh6CaXM7QdKb6iNPsuncJL9N240krl0 6525hkoFKrEY/SYOAcwb51FboUq9d5EbmR8AW2zZ+/nnyLM2gy7Sbf740Xxi0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232089; a=rsa-sha256; cv=none; b=qVlZWSfWsNmvtoGgNnoKZSMyOzB8GUp/QYFxsO44imJL6qsF/8hc3yU2C9rJNf908oErdw e9V83ENJemRReajf9xwxCmrQpQUaWrdYIYrnrIJ3l++VwpRUHI/94wzdXxJs3es9XjpjHw bwbKKcfS7inzoXkpLv53vnTmL6HyFV9cSoBgl2lxtGIB2RX5bN9gDIo7LuU7qrGhPzP7J6 jw2clIwXUVske2bqf9mOrpmdXAMJ7lzov7TOfw0ZH3wFZjvGHAE92a90rmJ55ISDvhwKjE qBpwq5CyhzzqcciUBMjeyR6QJFTpsVmZYCYWSlEMA6ZYrp8WSS2H6QVN3IH63w== 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=1782232089; 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=ZNQrBbaoXv0/ZBhqnUVXfQGEXXFXclOULH7pbwXSY7Y=; b=B8W5nJ2ruw51+MLV3x1jF9k7XTxMrdFOW9inc4PRGW4Oxq0GAwIiOWzLej7X6dTKwm4+zf 0D7jt/fSpUmVl2MWYuYSVjbtc9+XQqntSm0s7bq1/Gy5HyCytV/RApbtTbAzx2TAdQuTDI LsabyUz7QTDSYAaaGQ88Ee+7J/kdtddpBtL7aFmUhoLijnAllMwf6zKF2DGHobmaDTF/2u mCmCdniCycsfFUJvs6M5j6m6UpI2zsAudZOj49DNk34qZ4HJDXYg+hLh7zl3dMRBcq4t4Z YtJmKRS88VTWhUj0r5N/6XaPm80yuPXiFlhrwrMO1PDYM1Hd4PblyEV9FBnSbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V11ncjzhpb for ; Tue, 23 Jun 2026 16:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27810 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Nikolay Denev From: John Baldwin Subject: git: 0efab2ba4c00 - stable/15 - ctld: Return from the inner "main" loop on EINTR 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0efab2ba4c0017c28d21efca76a7947eb7a2f087 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:09 +0000 Message-Id: <6a3ab419.27810.23e78f4@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0efab2ba4c0017c28d21efca76a7947eb7a2f087 commit 0efab2ba4c0017c28d21efca76a7947eb7a2f087 Author: Nikolay Denev AuthorDate: 2026-04-20 17:18:50 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:05:31 +0000 ctld: Return from the inner "main" loop on EINTR This ensures that child processes are reaped in the outer loop in main(). PR: 294035 Reviewed by: asomers Fixes: 66b107e82b2f ("ctld: Use kevent(2) for socket events rather than select(2)") Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56525 (cherry picked from commit e56687bb2d32ee4b1774300f3960427ca56b34bb) --- usr.sbin/ctld/ctld.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 6ec64cc253d6..336aedd68aab 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -2433,7 +2433,7 @@ main_loop(bool dont_fork) error = kevent(kqfd, NULL, 0, &kev, 1, NULL); if (error == -1) { if (errno == EINTR) - continue; + return; log_err(1, "kevent"); } From nobody Tue Jun 23 16:28:10 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 4gl9V26J7sz6hhJD for ; Tue, 23 Jun 2026 16:28:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V23gfLz3Mg7 for ; Tue, 23 Jun 2026 16:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232090; 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=3/eE3WSbgbaDCkbHQJz/6ZQYNqT8IAq9OnuwmIeqQwE=; b=FqNz5iccEP3DSeGyB98WZpXqBYY/N3H5GRb1LJ1mJGoCz8krVrvx4T6ErfeRi61hrZb1HL qxqC4+y17FKpPT+dmTsvh72LAwDv7qEiDG9TFyrt0QB16a3FtPMdjSCCYFfyo+mI14nZ4s q6x2g+UGIr63/xIb/GF6hcIRHryDH1jyo3IWgT/w7mWs4fwL+P6wpU0VH9P0PX/3BbPW9n 8byRignCf59XCE2KwSRfmMMlnXnP0MhoKO7VPSujIVY9zUqehgM4NKA5aG5FqNCWq6yvXI BeIVqHpRYQ8fVXFtuSZoxTKVL6Xt1Ezo1bx74rgPAxRhWdYFFAgpPljdcqQBQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232090; a=rsa-sha256; cv=none; b=kk5gh3RMZmQlr7wN8r63SRZ4RhTXQqBFaBxNoCDg/k6hNOCBS8RsgYRf2sxzeL9MUEI0F0 rCaY7DuMChhoI5QPX/HQj0WwcRI3MCNpBlVtnh+/0tMt5Ob7T71+FTz8YzqrDNHVOL8zC6 g/Fj1jkkFVmlkKOeyo1YzgNwQVMM+kxEKojPgH4wSabEXUlngStFQfleF6TRZQlfKofK+j yzdgJIkVJy+jqdTVvg3VDjaSwA+IBdCC/0+khUCyC5rsnEw0En41RgGrGYzU8rGW2GCpYW TQkkFTDRrroC8zdTLe8jPDYgWtcZYF6CpiCEbBSbGxWWNWCklTIr2TE5Of7+KQ== 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=1782232090; 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=3/eE3WSbgbaDCkbHQJz/6ZQYNqT8IAq9OnuwmIeqQwE=; b=Pcb3I1hEFgHdhPlv5Eab5mokdw4e/MzNeZPm7NlWvscHEvTBAMcJg6JzhOwOvYEnyXCf+N xIovw02R35STV0Zo/p0FBWghfDgfwqhTNjMnYTznRTNiL8gNdBb2E8GTcxK8uQ3QY0b0JE fBwXCkJYB5PoshslWisQjzmdjqLZ4KPy24AL9qe7cqGMJo2VTvpNFY8pq9oDBgGzUlh96e w63oNEA7eG+hYU84ezSPBX2wCwAzSctTYRGlDi6V5cDocrTTPIkVAeh1cfKiLum98KNVpY zZXTzGCLHiRshJC6iZplFCA2vRCvjReyqASJKJ14pRWBEUindmtSwb25nRHyYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V22PGwzj31 for ; Tue, 23 Jun 2026 16:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8071cdf83451 - stable/15 - ctld: Support multiple physical ports in a target 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8071cdf83451f112ce17da3f429c8ae86699d7e5 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:10 +0000 Message-Id: <6a3ab41a.25a57.3722b14e@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8071cdf83451f112ce17da3f429c8ae86699d7e5 commit 8071cdf83451f112ce17da3f429c8ae86699d7e5 Author: John Baldwin AuthorDate: 2026-04-20 17:19:25 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:05:37 +0000 ctld: Support multiple physical ports in a target PR: 293076 Reported by: Ken J. Thomson Reviewed by: asomers Fixes: 969876fcee57 ("ctld: parse config file independently of getting kernel info") Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55767 (cherry picked from commit 7bb2b3801554a58039ed9d1fd05b65ce24c6c661) --- usr.sbin/ctld/conf.cc | 4 +-- usr.sbin/ctld/conf.h | 2 +- usr.sbin/ctld/ctld.cc | 72 ++++++++++++++++++++++++----------------------- usr.sbin/ctld/ctld.hh | 11 ++++---- usr.sbin/ctld/parse.y | 2 +- usr.sbin/ctld/uclparse.cc | 2 +- 6 files changed, 47 insertions(+), 46 deletions(-) diff --git a/usr.sbin/ctld/conf.cc b/usr.sbin/ctld/conf.cc index 56a149a58a25..a2c00525826b 100644 --- a/usr.sbin/ctld/conf.cc +++ b/usr.sbin/ctld/conf.cc @@ -404,9 +404,9 @@ target_set_auth_type(const char *type) } bool -target_set_physical_port(const char *pport) +target_add_physical_port(const char *pport) { - return (target->set_physical_port(pport)); + return (target->add_physical_port(pport)); } bool diff --git a/usr.sbin/ctld/conf.h b/usr.sbin/ctld/conf.h index 642c8f234d30..7eaee4f9871c 100644 --- a/usr.sbin/ctld/conf.h +++ b/usr.sbin/ctld/conf.h @@ -83,11 +83,11 @@ bool target_add_chap_mutual(const char *user, const char *secret, bool target_add_initiator_name(const char *name); bool target_add_initiator_portal(const char *addr); bool target_add_lun(u_int id, const char *name); +bool target_add_physical_port(const char *pport); bool target_add_portal_group(const char *pg_name, const char *ag_name); bool target_set_alias(const char *alias); bool target_set_auth_group(const char *name); bool target_set_auth_type(const char *type); -bool target_set_physical_port(const char *pport); bool target_set_redirection(const char *addr); bool target_start_lun(u_int id); diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 336aedd68aab..2dda88f97b73 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1097,9 +1097,9 @@ kports::has_port(std::string_view name) } struct pport * -kports::find_port(std::string_view name) +kports::find_port(const std::string &name) { - auto it = pports.find(std::string(name)); + auto it = pports.find(name); if (it == pports.end()) return (nullptr); return (&it->second); @@ -1398,14 +1398,16 @@ target::set_auth_type(const char *type) } bool -target::set_physical_port(std::string_view pport) +target::add_physical_port(std::string_view pport) { - if (!t_pport.empty()) { - log_warnx("cannot set multiple physical ports for target " - "\"%s\"", name()); - return (false); + for (const auto &s : t_pports) { + if (s == pport) { + log_warnx("duplicate physical port \"%s\" for target " + "\"%s\"", s.c_str(), name()); + return (false); + } } - t_pport = pport; + t_pports.emplace_back(pport); return (true); } @@ -2634,36 +2636,36 @@ conf::add_pports(struct kports &kports) for (auto &kv : conf_targets) { struct target *targ = kv.second.get(); - if (!targ->has_pport()) - continue; + for (const auto &pport : targ->pports()) { + ret = sscanf(pport.c_str(), "ioctl/%d/%d", &i_pp, + &i_vp); + if (ret > 0) { + if (!add_port(kports, targ, i_pp, i_vp)) { + log_warnx("can't create new ioctl port " + "for %s", targ->label()); + return (false); + } - ret = sscanf(targ->pport(), "ioctl/%d/%d", &i_pp, &i_vp); - if (ret > 0) { - if (!add_port(kports, targ, i_pp, i_vp)) { - log_warnx("can't create new ioctl port " - "for %s", targ->label()); - return (false); + continue; } - continue; - } - - pp = kports.find_port(targ->pport()); - if (pp == NULL) { - log_warnx("unknown port \"%s\" for %s", - targ->pport(), targ->label()); - return (false); - } - if (pp->linked()) { - log_warnx("can't link port \"%s\" to %s, " - "port already linked to some target", - targ->pport(), targ->label()); - return (false); - } - if (!add_port(targ, pp)) { - log_warnx("can't link port \"%s\" to %s", - targ->pport(), targ->label()); - return (false); + pp = kports.find_port(pport); + if (pp == NULL) { + log_warnx("unknown port \"%s\" for %s", + pport.c_str(), targ->label()); + return (false); + } + if (pp->linked()) { + log_warnx("can't link port \"%s\" to %s, " + "port already linked to some target", + pport.c_str(), targ->label()); + return (false); + } + if (!add_port(targ, pp)) { + log_warnx("can't link port \"%s\" to %s", + pport.c_str(), targ->label()); + return (false); + } } } return (true); diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index 2e1ee7869ceb..a88ef7eac96e 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -383,17 +383,16 @@ struct target { virtual ~target() = default; bool has_alias() const { return !t_alias.empty(); } - bool has_pport() const { return !t_pport.empty(); } bool has_redirection() const { return !t_redirection.empty(); } const char *alias() const { return t_alias.c_str(); } const char *name() const { return t_name.c_str(); } const char *label() const { return t_label.c_str(); } - const char *pport() const { return t_pport.c_str(); } bool private_auth() const { return t_private_auth; } const char *redirection() const { return t_redirection.c_str(); } struct auth_group *auth_group() const { return t_auth_group.get(); } const std::list &ports() const { return t_ports; } + const std::list &pports() const { return t_pports; } const struct lun *lun(int idx) const { return t_luns[idx]; } bool add_chap(const char *user, const char *secret); @@ -405,12 +404,12 @@ struct target { virtual bool add_initiator_portal(const char *) { return false; } virtual bool add_lun(u_int, const char *) { return false; } virtual bool add_namespace(u_int, const char *) { return false; } + bool add_physical_port(std::string_view pport); virtual bool add_portal_group(const char *pg_name, const char *ag_name) = 0; bool set_alias(std::string_view alias); bool set_auth_group(const char *ag_name); bool set_auth_type(const char *type); - bool set_physical_port(std::string_view pport); bool set_redirection(const char *addr); virtual struct lun *start_lun(u_int) { return nullptr; } virtual struct lun *start_namespace(u_int) { return nullptr; } @@ -435,8 +434,8 @@ protected: std::string t_label; std::string t_alias; std::string t_redirection; - /* Name of this target's physical port, if any, i.e. "isp0" */ - std::string t_pport; + /* Names of this target's physical ports, e.g. "isp0" */ + std::list t_pports; bool t_private_auth = false; }; @@ -584,7 +583,7 @@ private: struct kports { bool add_port(std::string &name, uint32_t ctl_port); bool has_port(std::string_view name); - struct pport *find_port(std::string_view name); + struct pport *find_port(const std::string &name); private: std::unordered_map pports; diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y index 5725c16b459a..05171d3aa159 100644 --- a/usr.sbin/ctld/parse.y +++ b/usr.sbin/ctld/parse.y @@ -774,7 +774,7 @@ target_port: PORT STR { bool ok; - ok = target_set_physical_port($2); + ok = target_add_physical_port($2); free($2); if (!ok) return (1); diff --git a/usr.sbin/ctld/uclparse.cc b/usr.sbin/ctld/uclparse.cc index 8a62636ffec6..0c6b2af8d741 100644 --- a/usr.sbin/ctld/uclparse.cc +++ b/usr.sbin/ctld/uclparse.cc @@ -1255,7 +1255,7 @@ uclparse_target(const char *name, const ucl::Ucl &top) return false; } - if (!target_set_physical_port(obj.string_value().c_str())) + if (!target_add_physical_port(obj.string_value().c_str())) return false; } From nobody Tue Jun 23 16:28:11 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 4gl9V36b9Xz6hhWT for ; Tue, 23 Jun 2026 16:28:11 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V34YyLz3MGk for ; Tue, 23 Jun 2026 16:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232091; 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=MZWi/ALwi5MjBdeN8vGlB23Y62xkaLa8O6b6rpW6jmU=; b=KNzvX+D88o86j7PUJdFKeNTreRE+xuxnDVts3HpCmsYgLE/VeiUNMjlm2vllMC8qT/j14r xzbxdqBLBlg29im5/UmGO9W5qtYSfYt7FHVgt8cnG41LTTsWIAJyn9VhIqvXudCV3yMf9M XXtxnL/tMTF3NMAoya2307wqrEWYyabYbJgcQmBXjmSmgClZCyA8avCANBobFNAwgni3Wg pjXXhke/aWbtqdWbBdHxSAXSYGjP+slUKiQPhZ6KjYFcIPDlsKJFzqQiPYl6odnzu0Yzf3 flGsak94ZCMvVwZfwdYnjS9IqQp5V2rKGMIBIzi/fbH0klfJDY4/Sc527ZveEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232091; a=rsa-sha256; cv=none; b=ter5/cx2K/qeGnnPlvcvO/z4hlktpayB7bM7XsnP96/ljNk2ank9ZWy+Z48w5VoA9aiF9I sf2iQfk5/8VSXpLEckln2KYLZGRkovJpZDjGv/tem6zEyZiWiYX6Vx5nxxHs4ghXvZdQWN R06NNzQbrmOT0jJwT9Y6v7UbwVfD6KxHwgQNPTP78P6z1BCAf8MyA6alOWR9/GL5N35M+R QuXRtzgzOaAI/f0R7fa+xmzPA9HbU0rtBt4aJKG/YMfzpzpIthBb/SH6jqV08QyvlslYyT /8dJyMXLaNZyx/rcy038D1EQ2lgddjFdbk1GY5Rdn9zj3olcfYmM1QrRrLPtHw== 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=1782232091; 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=MZWi/ALwi5MjBdeN8vGlB23Y62xkaLa8O6b6rpW6jmU=; b=yp+W0sTUylz7+vuUxqyj1pOROu7JYlPvsOYitydJbHijMhd9ms1APyoxVKdH/tCASu6Icd oV98a7qEgEx2BddtqD9V099+iBuhyUEVuiGnuAiZT4tHGk1/JSoMbifjEQ07KrUdI7Y1VI Gic2juGCKas1gDDsuJCpGW7YMUyQE9p0VSyZaoVfbJdR9Siv/2+DxJacv2p7NyckQ1NHFa 00t3Syff76VgtBGOVO5yMR3bzs7xXbEHxIHGxxIJrL5DonqL48lbnfdkZdX8W8bUGTJquJ /u74eIe87d3S61a9mWweksHUWn7zWHaSPFl82IRA0fhYnXjzOSCzVEFCXHGXZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V32yGnzhbB for ; Tue, 23 Jun 2026 16:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27815 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bab6bfa1181d - stable/15 - ctld: Update nchildren directly in wait_for_children 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bab6bfa1181df69dbd34aad1c8fc3048a558db7c Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:11 +0000 Message-Id: <6a3ab41b.27815.4cbdb7b4@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bab6bfa1181df69dbd34aad1c8fc3048a558db7c commit bab6bfa1181df69dbd34aad1c8fc3048a558db7c Author: John Baldwin AuthorDate: 2026-04-20 17:19:49 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:05:43 +0000 ctld: Update nchildren directly in wait_for_children This results in slightly less duplicated code. Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56526 (cherry picked from commit 4b79ee8eb139696c1fe845d25a56439d02ab4131) --- usr.sbin/ctld/ctld.cc | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 2dda88f97b73..8fdb3824bcf7 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -2310,18 +2310,17 @@ start_timer(int timeout, bool fatal) log_err(1, "setitimer"); } -static int +static void wait_for_children(bool block) { pid_t pid; int status; - int num = 0; - for (;;) { - /* - * If "block" is true, wait for at least one process. - */ - if (block && num == 0) + /* + * If "block" is true, wait for at least one process. + */ + while (nchildren > 0) { + if (block) pid = wait4(-1, &status, 0, NULL); else pid = wait4(-1, &status, WNOHANG, NULL); @@ -2336,10 +2335,10 @@ wait_for_children(bool block) } else { log_debugx("child process %d terminated gracefully", pid); } - num++; - } + nchildren--; - return (num); + block = false; + } } static void @@ -2358,15 +2357,13 @@ handle_connection(struct portal *portal, freebsd::fd_up fd, if (dont_fork) { log_debugx("incoming connection; not forking due to -d flag"); } else { - nchildren -= wait_for_children(false); - assert(nchildren >= 0); + wait_for_children(false); while (conf->maxproc() > 0 && nchildren >= conf->maxproc()) { log_debugx("maxproc limit of %d child processes hit; " "waiting for child process to exit", conf->maxproc()); - nchildren -= wait_for_children(true); - assert(nchildren >= 0); + wait_for_children(true); } log_debugx("incoming connection; forking child process #%d", nchildren); @@ -2806,8 +2803,7 @@ main(int argc, char **argv) log_warnx("exiting on signal"); return (0); } else { - nchildren -= wait_for_children(false); - assert(nchildren >= 0); + wait_for_children(false); if (timed_out()) { newconf->isns_update(); } From nobody Tue Jun 23 16:28:12 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 4gl9V609jBz6hhR4 for ; Tue, 23 Jun 2026 16:28:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V452c4z3MSJ for ; Tue, 23 Jun 2026 16:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232092; 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=h5UyW8kWX4c50cKuOKZWeVk+TdKftV5xOkTBEBLvNCI=; b=jabmMYbSfLPgpj6kz0kvThOOdmwL+Cr8b3/2Ri46qXHbjrrGTjGh7RKdtsomHFAz93hufR JWhKoniMfv/qM/+F7sxgr90M1uhCIcM+bQLBetvSaYjxH6e8WnUxLATx1/ra3L6Yg9JRSz bSmvNpEtwxtU0z8hMQoEY8IZOaVOXbkZs/4OXbIlig2UXTC9YYMLq+FA97Usn2E383n0+D /DLIB4RcnYJevKEBMebGU2091NvZOB92Kcen6C3f46eJIqiv4s+yCVksDNypk37ZUPwSQi mSAH26Pxmq95FI76y6q5m4aGri75k6lAGP7Mx0V9csdjGpaR5grUZ8m4ATl3Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232092; a=rsa-sha256; cv=none; b=Wda5+Qbk+t/t80ZKGrlWoXySpBeID2DAVmsFGM/BsoDrrRw6fZSoN5VcxEwBo7xNUPSJ6H oq215npWOgTepD3bFjqj1CqQQCG47oQWUf1pqvjXekgoGeffzG/OPviU3PIxV0SvsbWlIB oYjkBHShZvHjr59TXLVnmyddIZ8f+TL0WX+XwT9mLBBd4Q3eWt+1/371upUi7fFpK64REV quAJsePdFbq2yaLSDLigG4K79SLv8MK5O3yBz8htAsKHd/Ws3CmFbCIuHdwcDKJdayBphQ 1nVlttl1TCln7jO5bgeiKaHqWBOkSUfbqJJaFm2XHb3u1ufYJjJIqZN0azgihQ== 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=1782232092; 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=h5UyW8kWX4c50cKuOKZWeVk+TdKftV5xOkTBEBLvNCI=; b=HY96Bzo5hmZ10DvWXlp2OjNZwO7F4EfnmL81MjlsEsHp8GR1jpBzp/M7EfUYA6bvbU1lZ2 N24CoIe8UdzFYoX6/oSVRiFzQWh639ZMy0IC92MrmlzzSepgI17xOx/h0ih1q+dAjJCHNl P7+hFNWxuHUmgRdvnEsXR7K36lZUA9AuvmdQQD0Xf8rLJX8Ua1MIA6IBhBO7jEp7JkPqgC n1Fn1UB6fJtnY9AovFjzRpc2kh/xtniV2iwjBexLgHwbNVie+5ytg7n8GZTH0BUg4Xm01v hWes6IaMwPkfZJtL258MJFklGQyRAYj3TBMM8suZx7I68PT1llA6vmhJiSzVYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V43VkJzhcF for ; Tue, 23 Jun 2026 16:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24ce0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ken J. Thomson From: John Baldwin Subject: git: ec70458815ef - stable/15 - ctld: Don't add an iscsi port for targets with only kernel ports 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ec70458815ef5ccb3ef0b0abba2148192c8852fe Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:12 +0000 Message-Id: <6a3ab41c.24ce0.1ebb984d@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ec70458815ef5ccb3ef0b0abba2148192c8852fe commit ec70458815ef5ccb3ef0b0abba2148192c8852fe Author: Ken J. Thomson AuthorDate: 2026-04-23 19:15:48 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:05:49 +0000 ctld: Don't add an iscsi port for targets with only kernel ports PR: 293076 Reviewed by: asomers Fixes: 969876fcee57 ("ctld: parse config file independently of getting kernel info") Differential Revision: https://reviews.freebsd.org/D56523 (cherry picked from commit 614ef718496eb6fd815ddcfde203bee8da1178b1) --- usr.sbin/ctld/ctld.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 8fdb3824bcf7..6cb4599a6ca8 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1476,7 +1476,7 @@ target::verify() t_auth_group = t_conf->find_auth_group("default"); assert(t_auth_group != nullptr); } - if (t_ports.empty()) { + if (t_ports.empty() && t_pports.empty()) { struct portal_group *pg = default_portal_group(); assert(pg != NULL); t_conf->add_port(this, pg, nullptr); From nobody Tue Jun 23 16:28:13 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 4gl9V62pnqz6hhZB for ; Tue, 23 Jun 2026 16:28:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V56Vw0z3Mgt for ; Tue, 23 Jun 2026 16:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232094; 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=iPKruxgtGLEEH42Rsnk5GzZ/f+WbxycKzqY68maVvwY=; b=JtFeIWHmFL0TWcXSIUVNdFeA2qcbDolccXqp3krd4bX1BJTxIlV9TUKORL2yYB7d4xqYye UscebFVFJSO+lLbpkjEXha/jeGycS56IvqfE3JRxedNn74yY2kunVERDl16+hAoTrB/Jnd 0jxTWZ1usDZ2WUPiseEKOr/hHozmej1Riarm5MBPB+XuVcUg/I+utg8ViLv8LXR1bJWJRt jJiCdY9zvUAc2MXOUHfO8Q/WSTLdDWltwQlsRz5fqjlho8UAHIVLa6y+jZ/0FU6R4evPvp r1B1uOgsc49Ib2EfUs4o+sHvAa0o9a6MTg6/ny3DQZAkjj+vV6/4xANo57eNNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232094; a=rsa-sha256; cv=none; b=cdDO5+qNfcxG5OHpnRWfxkwoX8G07Ee3Xl3YW8w7+jIQNBKT/LFJ0oZX9twLdz0pItW4Ac djxM3j0w/rzV3JKfFvnL2MuC+8rQNPRFXbR4gbwLqaNjml6EjmztmrqXNXZpMNFC9zNpV0 XAJNTg5kneEA8fZPgNwdp5/e1YhVmkS/ODkb9hZ1BVr7qAmuE5fip6n9LZB0dAlJ+idfkf 0EMyU2ohwKDHi0TIGUTyK8bwgg9kq2uMoHQAorxKJOoTzyRA1m8XfTAOQ42zOANWmdGvN9 uR+cTB4SjKcNpR59dTGDnZWvylz28kyXHFYIORsKxR3kH8PeqkXxN9WQ6pEYVQ== 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=1782232094; 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=iPKruxgtGLEEH42Rsnk5GzZ/f+WbxycKzqY68maVvwY=; b=tQAd+Z7hs9mrtdoLMD9aRMsSABHopg9rpFhnTS+G4mAND9ANLTWyJ4pQokcianjpg8ELmx FzzrztOYozM0/DYuApip/zax/PvNAc2Mi/WfNTEzRqi1nngwQlvQ9Hxw1cCgbv1Xk3ifdH eQTinr0mTOh2KbL9ZZKFV611engDorz4E2dJrXXkJZCrAgkXBnxrk+1CWcjoAV4jPz0Ivb KlatQRCxh3tcmLwnSnVKcwDN/OPjF3RWwvIAknMlqAo1HQy0ucgj9+ZW0Q0loZ/+cJ7VAs uB9sq2+uIXvL8RjUB4B3U4ZBh6IF/xyHkrG/IOVc+HXE9G65BjsVfHqBI99s1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V54GZJzhNp for ; Tue, 23 Jun 2026 16:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b6564c32ea98 - stable/15 - ctld: Ports without a portal group are not dummy ports 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b6564c32ea988f738bdab11857b87f34b8189dd6 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:13 +0000 Message-Id: <6a3ab41d.26a94.21132aaf@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b6564c32ea988f738bdab11857b87f34b8189dd6 commit b6564c32ea988f738bdab11857b87f34b8189dd6 Author: John Baldwin AuthorDate: 2026-04-23 19:16:08 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:05:56 +0000 ctld: Ports without a portal group are not dummy ports The default implementation of is_dummy should return false. Only portal group ports should possibly return true. PR: 293076 Reported by: Ken J. Thomson Fixes: 6acc7afa34aa ("ctld: Convert struct port to a hierarchy of C++ classes") Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56524 (cherry picked from commit 3df5cc33d894edd6b0ae87e51f0e35c3501fb907) --- usr.sbin/ctld/ctld.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index a88ef7eac96e..fdd70a37c514 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -271,7 +271,7 @@ struct port { virtual struct auth_group *auth_group() const { return nullptr; } virtual struct portal_group *portal_group() const { return nullptr; } - virtual bool is_dummy() const { return true; } + virtual bool is_dummy() const { return false; } virtual void clear_references(); From nobody Tue Jun 23 16:28:14 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 4gl9V71SmNz6hhWc for ; Tue, 23 Jun 2026 16:28:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V66pFjz3MVf for ; Tue, 23 Jun 2026 16:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232095; 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=4k0sEbAfkWaVnJKvVFUpv7bYGH1WoQ/gyUY6IKBt1TA=; b=pn9sVa9cyc10kK9+nMR43dSeKIO267P43ZL3pGKCBnRzRr5fRedxMNyTRx9yxCUQ4x3DWi lyo064iQluEWM8nEhyGcxk2RF1PynX0OXEnbHXIJcbU4j3S/tYPCh6xgF1pNX0sHG+Pw1I mr/gOBpoVnWpNv5jqAmaplvEEkOCLBDU9ZkfAncnG5AmcMKuVXaNf2nA4kGpctM0RhgMsK HyilHF+DF9+1dIYUaJotUSj1b4W/SLY87wM7z54ovdWm7ZyooVPJJ9ApFzr14B+labX6PM qcOXYEfDTdOpb86+nH7l8O3losmb8Eh+BOc+bUqI5rbTpBtCfqzzSrtU7khGHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232095; a=rsa-sha256; cv=none; b=Y0fT1FQl2EY+lVQ1lyB8Ks0FgCUj4E0RvJBk3GmulEu32VJPYurJJ5bpnTfzU+93hbly+t dzgqDNTVKtE+Y5cKKgWvxPBhmlTQX41u8POpyByNORjsY1ZpOnZ4iS/DNJfsNRzPYQ6+Vj xjx1sXmfNm0IhD/M+j0K98SappNWC3DZtZ8HJQM0EJNvhVldNhQq6FFXjS8L5oGb+6qKvG jD4eEzuXlXSS2CjoGaJKT4dKa8pwms/4sgfunISdqUx/yA5AKcUCVH+Jyh9PZeA1uidn4+ W8OaV/ygE0yGDO/ua+wz3HmouiAIfM9cex92NoMLatNi4czyVejCA7Im2SgmxA== 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=1782232095; 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=4k0sEbAfkWaVnJKvVFUpv7bYGH1WoQ/gyUY6IKBt1TA=; b=TOlBU+fpU0nNCcOL01oC4ZjqECpgItzSn1L64P+MuG4NQRSj/YdSnEhdrNwqtEaZkGYe5G g1IGYmRXsBaQ1y6PjMnduAkMkRw+4TdKX/hQAXu33Y37mXRTN4c4gWw715hF0FIBIUoysD hEasF6OX35+avlbmtDkYJIniOMSM5T6Hkj/OHbVT31NwnWVhhx6kATgoIy25modxhJ2xbt l2D40lktW1g09R22nlgWU5DIHZTMAmYm48T4sVN4LFEK9EFa2h+Ng71sdku/+kuFTAy1t8 AHpB0nF7jTcIBiXnMFZGpmMTFr0wiT96tYAsQT9gCH19K6NZAA+2dLhb/EHcOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V654fdzj33 for ; Tue, 23 Jun 2026 16:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26f9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0885d8fdd607 - stable/15 - ctld: Move the pidfile handle out to a global variable 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0885d8fdd607f469a55dd192bc13751a8094a64e Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:14 +0000 Message-Id: <6a3ab41e.26f9c.e5a95f6@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0885d8fdd607f469a55dd192bc13751a8094a64e commit 0885d8fdd607f469a55dd192bc13751a8094a64e Author: John Baldwin AuthorDate: 2026-04-23 19:17:05 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:06:05 +0000 ctld: Move the pidfile handle out to a global variable This ensures it will be destroyed (removing the associated pidfile) anytime the process exits, including from exit(3) calls. This fixes a few places that would "leak" the pidfile on certain errors. This also removes the need for some convoluted logic where configuration objects would hand-off ownership of the pidfile handle from the old configuration to the new configuration. Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56527 (cherry picked from commit aad4fec5d7e260a789456a8cc82b293064fab5f3) --- usr.sbin/ctld/ctld.cc | 42 +++++++++++++----------------------------- usr.sbin/ctld/ctld.hh | 7 +------ 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 6cb4599a6ca8..8aaec41e8487 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -59,6 +59,8 @@ #include "ctld.hh" #include "isns.hh" +static freebsd::pidfile pidfile; + bool proxy_mode = false; static volatile bool sighup_received = false; @@ -125,17 +127,14 @@ conf::set_pidfile_path(std::string_view path) return (true); } -void -conf::open_pidfile() +static void +open_pidfile(const char *path) { - const char *path; pid_t otherpid; - assert(!conf_pidfile_path.empty()); - path = conf_pidfile_path.c_str(); log_debugx("opening pidfile %s", path); - conf_pidfile = pidfile_open(path, 0600, &otherpid); - if (!conf_pidfile) { + pidfile = pidfile_open(path, 0600, &otherpid); + if (!pidfile) { if (errno == EEXIST) log_errx(1, "daemon already running, pid: %jd.", (intmax_t)otherpid); @@ -143,18 +142,6 @@ conf::open_pidfile() } } -void -conf::write_pidfile() -{ - conf_pidfile.write(); -} - -void -conf::close_pidfile() -{ - conf_pidfile.close(); -} - #ifdef ICL_KERNEL_PROXY int conf::add_proxy_portal(portal *portal) @@ -1987,12 +1974,10 @@ conf::apply(struct conf *oldconf) } /* - * On startup, oldconf created via conf_new_from_kernel will - * not contain a valid pidfile_path, and the current - * conf_pidfile will already own the pidfile. On shutdown, - * the temporary newconf will not contain a valid - * pidfile_path, and the pidfile will be cleaned up when the - * oldconf is deleted. + * Rename the pidfile if the pathname changes. On startup, + * oldconf created via conf_new_from_kernel will not contain a + * valid pidfile_path. On shutdown, the temporary newconf + * will not contain a valid pidfile_path. */ if (!oldconf->conf_pidfile_path.empty() && !conf_pidfile_path.empty()) { @@ -2007,7 +1992,6 @@ conf::apply(struct conf *oldconf) conf_pidfile_path.c_str()); } } - conf_pidfile = std::move(oldconf->conf_pidfile); } /* @@ -2373,7 +2357,7 @@ handle_connection(struct portal *portal, freebsd::fd_up fd, log_err(1, "fork"); if (pid > 0) return; - conf->close_pidfile(); + pidfile.close(); } error = getnameinfo(client_sa, client_sa->sa_len, @@ -2720,7 +2704,7 @@ main(int argc, char **argv) if (test_config) return (0); - newconf->open_pidfile(); + open_pidfile(newconf->pidfile_path()); register_signals(); @@ -2754,7 +2738,7 @@ main(int argc, char **argv) oldconf.reset(); - newconf->write_pidfile(); + pidfile.write(); newconf->isns_schedule_update(); diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index fdd70a37c514..45590ada4111 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -461,6 +461,7 @@ struct conf { int maxproc() const { return conf_maxproc; } int timeout() const { return conf_timeout; } uint32_t genctr() const { return conf_genctr; } + const char *pidfile_path() const { return conf_pidfile_path.c_str(); } bool default_auth_group_defined() const { return conf_default_ag_defined; } @@ -506,10 +507,6 @@ struct conf { bool set_pidfile_path(std::string_view path); void set_timeout(int timeout); - void open_pidfile(); - void write_pidfile(); - void close_pidfile(); - bool add_isns(const char *addr); void isns_register_targets(struct isns *isns, struct conf *oldconf); void isns_deregister_targets(struct isns *isns); @@ -544,8 +541,6 @@ private: int conf_maxproc = 30; uint32_t conf_genctr = 0; - freebsd::pidfile conf_pidfile; - bool conf_default_pg_defined = false; bool conf_default_tg_defined = false; bool conf_default_ag_defined = false; From nobody Tue Jun 23 16:28:15 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 4gl9V833P1z6hhRF for ; Tue, 23 Jun 2026 16:28:16 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V8035fz3Mb1 for ; Tue, 23 Jun 2026 16:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232096; 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=VQjHGvC7BNInrElmmmqgW8kwQ60Br6J237SSIGIYV4c=; b=U/YerhBxBukGSYvh4JXev7MYNjlJW68m9ncRL7CTUMTF4Cug0pv8zO2YWoqoUeSMiCJQF9 bvHexnLRNDPIEvPXDKp25mhhA3Ca5N/xvWT7EfyP+qmCbGkGW+ozoaC7NvhNMOjR5huaVo 21qnhhql4hojvtY9jUyZ8TRXsCy2P0RetiE14yOHduUD3rZVtoLGwa/mJbKUd4P8J6WSp0 lmIcYaNO0IhNUXArxsAFLZBqYRgPdAszvUJHjVPv7P7Bo95Vkoik61pcAJIEARbK+aJV/k 3tyjuyaAD3MgWs6CNcwulA8JTR9M/sAte9tiKoi94qHk6FLyDiUgwULezqj03A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232096; a=rsa-sha256; cv=none; b=svbgejq3/nsE5I0gdKP+tPXa6QxtggqlsJmme/Fb3QkhFtCBajkpSC66WVnV8Tc7xopTPL yVYu+s8R6vnA3I3T27dynksuv4NUzpzvHznaaQQet6B1tAwpUQ1WfTW5yvMREJG/zLFbPE HkwjxHpNQZiMKDDj5ptB2ZOHBzicOe3mWFqQG7xicJQtf2hiZ7muX26oIZ8Sk/DhkNTXAm /rxnW7SaRrz06knIz8hg6tZkzUEEe1CS5WoI7oTvP558xGNj9BLNyS9emLPyfiGhef/vfX B/QmltdixHb/irjP1tzMSYxncjPJa601ex7gpkesV0linAhSAD/MQBQ4gJQlvA== 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=1782232096; 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=VQjHGvC7BNInrElmmmqgW8kwQ60Br6J237SSIGIYV4c=; b=vknX7xHax5ESYU7gofODGDwtgjc8F13lHrZLvzQXINdF0ulMKg6zokYEqUpPDjQgTGE7dr P/KO8WysRkc//ydLG72tkqfaHKaA0fMH5Y4EkHFXo1XnC+IldnJSnO0iRgjYPyxmI4f55Q 3KlbEbw+hCxrCMYb1h6D5cA+mSeRAeugV7q8VP95sZaW3h1ppGM5XWvV2014H7iUjGU9/C 1XQyY7gGFSo/iIHh43SbKhLz/QD0syNdar6IWP0vVnwiXivlf5v0Zys8JaQimwRYPl6BJC XcfGY2WcNFTJpqMnpFFfqEDCNJS/y5GNxmLXQWHAKQRTyUIdI921OSrLdL4Kxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V75tTBzhHt for ; Tue, 23 Jun 2026 16:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24d72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a40ffc719d04 - stable/15 - ctl_ioctl_frontend: Reject out-of-range initiator IDs 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a40ffc719d0401260fdcaf1bd88dfab17eb52aa8 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:15 +0000 Message-Id: <6a3ab41f.24d72.4ce42f44@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a40ffc719d0401260fdcaf1bd88dfab17eb52aa8 commit a40ffc719d0401260fdcaf1bd88dfab17eb52aa8 Author: John Baldwin AuthorDate: 2026-05-02 16:43:29 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:06:11 +0000 ctl_ioctl_frontend: Reject out-of-range initiator IDs Various places in CTL assume that initiator IDs are not larger than CTL_MAX_INIT_PER_PORT. Other IDs such as lun IDs are validated in places such as ctl_scsiio_precheck, but initiator IDs submitted by userland were not previously validated. PR: 291059 Reported by: Hans Rosenfeld Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56628 (cherry picked from commit 6f8312bdff236ad64d1c15c239051359d8245a68) --- sys/cam/ctl/ctl_frontend_ioctl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c index 3449154afb38..4b82552ec21f 100644 --- a/sys/cam/ctl/ctl_frontend_ioctl.c +++ b/sys/cam/ctl/ctl_frontend_ioctl.c @@ -588,7 +588,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td) { struct cfi_port *cfi; - union ctl_io *io; + union ctl_io *io, *user_io; void *pool_tmp, *sc_tmp; int retval = 0; @@ -606,6 +606,11 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, if ((cfi->port.status & CTL_PORT_STATUS_ONLINE) == 0) return (EPERM); + /* Reject out-of-range initiator IDs. */ + user_io = (void *)addr; + if (user_io->io_hdr.nexus.initid >= CTL_MAX_INIT_PER_PORT) + return (EINVAL); + io = ctl_alloc_io(cfi->port.ctl_pool_ref); /* @@ -614,7 +619,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, */ pool_tmp = io->io_hdr.pool; sc_tmp = CTL_SOFTC(io); - memcpy(io, (void *)addr, sizeof(*io)); + memcpy(io, user_io, sizeof(*io)); io->io_hdr.pool = pool_tmp; CTL_SOFTC(io) = sc_tmp; TAILQ_INIT(&io->io_hdr.blocked_queue); @@ -636,7 +641,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, retval = cfi_submit_wait(io); if (retval == 0) - memcpy((void *)addr, io, sizeof(*io)); + memcpy(user_io, io, sizeof(*io)); ctl_free_io(io); return (retval); From nobody Tue Jun 23 16:28:16 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 4gl9V966dkz6hhLq for ; Tue, 23 Jun 2026 16:28:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V91BK6z3MmY for ; Tue, 23 Jun 2026 16:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232097; 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=C8RoAAOG8NTG3qkioQ0ZaCXY29LplZ+mRlXbhQ6yzr4=; b=tz3s46hsDC1etrVWXrN++khGPK/VGJC22NBI0qUHe+1eTEVUzDrcnRe8rWHP22nC/jVVSn CKBr2DFVNn+vE8JB+gq8kdpFUwtg7lcxVnGcdMDEG5r1hItV5vW12MSfzLPcDZgG1xGM9A PgRjfMI59C56HOMHDYnMtf1oOHGgfWNIygW50dBFqoHuqTIBCyLRRq7UQj7Wi085qlayEf NqoCS88zWjFlJ3V69ZJphnrToizVZisJ+Bz9nkP86WCCKRsHpG9wXOdJAwzokHPrNcl6mK 1hwP4JA+NaRA6XIlmnxHtnedC/dm4ve0yeEySckapsgXepMYTptIMWNuTR7gxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232097; a=rsa-sha256; cv=none; b=HdV29zcGWzA4eyXuDACn1smQXa/+rrwxRznvZ6K1MWbCiKS11vW4ujsi1FCPLtvXxJPeLP fRQe4hkTd60OMgqZJz61lAF8DzsoYxYUH8ONdYxD6B3O9f8n9AcfbfIf5Zu2WINkGUDCl+ OwhIeT584LB43o5rvFTos8jThVvfwabUpUAF6OCrePu8Q3+3poMljOBg3sPM/l+fIVGPn/ Vmho4p2nmWoCP3l7TUFCtmHXEqOFfj7UlySUaSl5uJQs0I+pGYDfxWvbvg4FFoj0latNRS 2NsJaFoLMf6aBW5ZT/6HRVE3MePWtBlskksbxjx01kK7p2PjfE/o2LTp1L7B9g== 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=1782232097; 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=C8RoAAOG8NTG3qkioQ0ZaCXY29LplZ+mRlXbhQ6yzr4=; b=bAJ4NhHlVrzz0DUC/w1vj6YxxNAi80Xg92dq5iNz2tBw0Aj4Ha5uLu+Xs078qqR7CZjMzc rJa6QGlFaw8HnJ39eqwxZt5YW6Pg1xSgZseNjPl+wVjjmsWbQtRuJjgHO7YfjTgnD296Bs uEQYVuMLW6E+mEhVBa6LCWs5RphqtglBRDmqWhZM0ALSZ9igyli5RilxR0gOozeWiwk8K2 eVjrgfczyBCGEDPn7T5AEMDejDuZslwTpQBxhUL5u+VQyyZhR64eI3RiUBjyb/D/K6J1VE GvpXuIdP5ylXWiuMp+gm824tPx370dCzc965ThwGhsjcRe4erLL5t6SIImcEvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V86X6bzhHv for ; Tue, 23 Jun 2026 16:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 47cfba980629 - stable/15 - kobj: Assert class passed to kobj_init_static is compiled 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 47cfba980629f0fa26c6e54318b691e9ad25a87a Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:16 +0000 Message-Id: <6a3ab420.26c5b.8187ae4@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=47cfba980629f0fa26c6e54318b691e9ad25a87a commit 47cfba980629f0fa26c6e54318b691e9ad25a87a Author: John Baldwin AuthorDate: 2026-05-06 20:53:46 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:06:41 +0000 kobj: Assert class passed to kobj_init_static is compiled Inspired by discussion in https://github.com/freebsd/freebsd-src/pull/2016 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56624 (cherry picked from commit 5a6e5954d14b589bcba0125d10a6c7b62b588f4b) --- sys/kern/subr_kobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index d97834b3fe58..09fd730660c4 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -317,6 +317,8 @@ void kobj_init_static(kobj_t obj, kobj_class_t cls) { + KASSERT(cls->ops != NULL, + ("%s: class %p is not compiled", __func__, cls)); KASSERT(kobj_mutex_inited == 0, ("%s: only supported during early cycles", __func__)); From nobody Tue Jun 23 16:28:18 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 4gl9VB3Fhqz6hhPL for ; Tue, 23 Jun 2026 16:28:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VB1KrQz3MsX for ; Tue, 23 Jun 2026 16:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232098; 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=3jlDu0ontuej8ao+Gh32k3u1oLqLl33Ybbusau2ynms=; b=f9pFwtHwsZufoGNOXGQDwcu3pWGoC8+q3hX0NR+Yxqfq/7QG2heRmpCmdpQAcazxz0EPk/ qhQKAU5xXg4kZKy3iXdjE98xUmVTYiXLj9mJJA5+LzQgwKpY1sft8zVeZQTRP1ltipqpdw 9Ez6H28qQIhqdud8Y3kgCm+vwPQvoDNc7UndgCHBM5VI0wA7dHWjgsN1EqtguXxbtW8oJ6 ugm4hGGjZ/v5t3I1xY8/SVEEYpDdFNr8YoSj/+RmF+8tNfBsnYEdd+32lunhcD76O6Ya6Z nDb/k7NW9ciVPjQIATGckUkDJv5fZXevCfFzETMi+loHlLKzfZizFqXRJRd09Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232098; a=rsa-sha256; cv=none; b=CVq1nMtZyn6I6URMqbtex9AQFMOlEfjJ2y5Q556fGHTUu5txAO5MTyX8b4br0WePXHtj75 an7Gsm0P8L8sAU4ZL5eqiQJaqJQfYlR4CTumxVLVKTUS5FWNrPVSpu1hRpsN1U5/AayzdM fvtsyRGOxyoJ1QZgloBWh6siD46mFbuP/YiRVR5+RFVNL0dU/9iqr6JLt5QfXPSPd0RVru N4yQawfnvN/6haTVQ4NnwYnG869I8ps+ZTNYdRHpsZdSm+LMLIQbk3lAOOd43XmVLW8tL2 iBvKIctSoQULyy1ucAxiW+xzU3VEfJYDDvanVjnV92tkSHBDnEVIu1Z3VNDPog== 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=1782232098; 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=3jlDu0ontuej8ao+Gh32k3u1oLqLl33Ybbusau2ynms=; b=EZ1+mEC4fD6spt3LE3g/kxtPjBy1dWzFxYBbG3SJrK1QTbvOs89Io/EgIsPRryR5f4c4NM IItYocBhfuKdiTXyF+krif4UQz42Q76iFGCDAvcOCXtXKhS1pIVOcRyFdIVofLndHyeZO5 c/Hvj8o9AjourQnNTOw9Ln25OhbAVmyRdMGTMw81FTajhAIdvF5xGoToxHBqq2fY1/TtSb aXTJRFCgKjd4g0sxwSYhempS/izKC5iAnmXjeQcngN4qLiUlYi60xcyqXAO+soeUCVimAC Jxf4YGn5Z1Cbon3Qy5MzBt2an6jvSbv7tL1zxgHdluI7cSe6cgR8iQ34fT8fDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VB09bHzhpc for ; Tue, 23 Jun 2026 16:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26070 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 12683573afb3 - stable/15 - kobj: Use M_WAITOK in kobj_init 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 12683573afb3f01111c1972c50396528b02bbd80 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:18 +0000 Message-Id: <6a3ab422.26070.22db1933@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=12683573afb3f01111c1972c50396528b02bbd80 commit 12683573afb3f01111c1972c50396528b02bbd80 Author: John Baldwin AuthorDate: 2026-05-06 20:53:46 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:06:52 +0000 kobj: Use M_WAITOK in kobj_init Blocking allocation is safe in all of the current callers of kobj_init (most of them do a M_WAITOK malloc of the structure passed as the first argument to kobj_init just before calling it). kobj_init doesn't return an error code but instead panics if the nested malloc in kobj_class_compile1 fails, so using M_WAITOK here is more robust. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56625 (cherry picked from commit 5df7dae10dc02ade8639b0171e0d3cc8db790e41) --- sys/kern/subr_kobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index 09fd730660c4..a88639289954 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -308,7 +308,7 @@ kobj_init(kobj_t obj, kobj_class_t cls) { int error; - error = kobj_init1(obj, cls, M_NOWAIT); + error = kobj_init1(obj, cls, M_WAITOK); if (error != 0) panic("kobj_init1 failed: error %d", error); } From nobody Tue Jun 23 16:28:19 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 4gl9VC6Hnyz6hhPP for ; Tue, 23 Jun 2026 16:28:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VC2kBfz3MkZ for ; Tue, 23 Jun 2026 16:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232099; 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=iDy6sby1b65a1jIbxPdGDjJOQ3ZfvVi/gb4xvDtXmg4=; b=vchtfdwvb/AKYBRp3SmPtlEgNiHWMHBVabF34Akn7wzn27gTg7zEOHPBNdeu/O2q0BHNrg U171eClqeK19QuEZirE1dazJSyFI65AV2EqMqF925SM6kABN5DVit5UKXixCRQd4cdWvL+ 18X5xR6P43R8IzG4pxAI3SfFdkiliOSZtR+52hP004gLiKaN8UFMspJ2dY3p0XYNicG3xL vhHrf8dQbjjMn9tP1Q/5guxB6lbtJZx87yn9doNXGFG4xRgZ6CAoYGQLePJ+SAtPjdVVHf iXfov78FVAw0avj4R/i35X4bhJss7TD8qGKuoFPUo8H1UFsYE/i1feOfzAmEZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232099; a=rsa-sha256; cv=none; b=BqteDsZ713d49NJ4Hyn9RhQvyHAp1YUtwiBwSjF/1UsAAxEHbrURqLIVjaHYr5ApgtMBNR 8dQwM5XhLiHmjP6RMaOjvG6Q2jO5kF+Uou6HQcT5JwoG1KLfa/QbsR/Qhiq0eIWVPU1GLO W8AwgbRglRq1X+NTzHu3cGIxu0cBDFYUbdBB78EC3Mb9bcGX4cAQb2YpEinn4M3EGVmuxt cF7JNdh/PLPg6rMNM9H19AkdHcFd3+3sKbrhOfgCn5vVzH0/Rqs3giZqwQJ9SDwACSNtYe n461w5J2cpTdkTxd35825VYibcXI319sctaOsTNdDsMJni0LcDMHSmFxb998gg== 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=1782232099; 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=iDy6sby1b65a1jIbxPdGDjJOQ3ZfvVi/gb4xvDtXmg4=; b=cEfFbItrxbFyZnsih30niyJsBdm0ZezcLiwi/GIcnnBHIK4mv1MBjbaPu1FdGstqpNIf0K tLvNVa9cEX6un2EVWsZ6j6l+3pbrXixqNqmm4YfsHTi2eHShoTeMrNe51aG2K+DO7zuCqY ltiC0TuF6xOs6IxI37wMiXh4OAAmSc2/5qDINdyDBYOTn/czc60fhQnzgDAyqhioB01+Jr R17kc1cK/Srpd87SDN2id/XbqWKX9K7Vj/gUS6/eeWAzHPiUniQ9WQmAzE3qnV1FhgbLh1 O0NlybtYWQJztDJqg7Xy5yG6tA0+PO2h2KvF9aPRxURCUwT99BgNrXsXjl+ICw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VC0yXLzhpd for ; Tue, 23 Jun 2026 16:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c5f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ad47ebaeb53d - stable/15 - mandoc: Add an entry for libsys to lib.in 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ad47ebaeb53d503995a0a936d32cff51822d5a02 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:19 +0000 Message-Id: <6a3ab423.26c5f.7ece982b@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ad47ebaeb53d503995a0a936d32cff51822d5a02 commit ad47ebaeb53d503995a0a936d32cff51822d5a02 Author: John Baldwin AuthorDate: 2026-05-13 16:33:12 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:07:03 +0000 mandoc: Add an entry for libsys to lib.in Reviewed by: brooks, emaste Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D56849 (cherry picked from commit 538f0564c1197605d7ab80ba39cbf27cc9c90fed) --- contrib/mandoc/lib.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in index 134614aa6478..dcea23cf81ea 100644 --- a/contrib/mandoc/lib.in +++ b/contrib/mandoc/lib.in @@ -120,6 +120,7 @@ LINE("libsdp", "Bluetooth Service Discovery Protocol User Library (libsdp, \\-l LINE("libssp", "Buffer Overflow Protection Library (libssp, \\-lssp)") LINE("libstdthreads", "C11 Threads Library (libstdthreads, \\-lstdthreads)") LINE("libSystem", "System Library (libSystem, \\-lSystem)") +LINE("libsys", "System Call Library (libsys, \\-lsys)") LINE("libsysdecode", "System Argument Decoding Library (libsysdecode, \\-lsysdecode)") LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") From nobody Tue Jun 23 16:28: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 4gl9VF1HrRz6hhbF for ; Tue, 23 Jun 2026 16:28:21 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VD32X4z3Mmv for ; Tue, 23 Jun 2026 16:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232100; 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=svN9Hg8YWk1iWuru9EWJ3UPClaHalXXQHS2uP2XOpnk=; b=TGSZ3tLT3En4bxoKvF0fGS4XkHYjtNXXuw3dSDMRohIt12gw5lZ01Lga3SUx5Eylfk6Tsq +meDgf79eq4LBx0dTRmygh7iOi/XuGiOqxKM5WUnsl+Q1JQnxcttiBxdKG6/a9s0QsmzJm Qjnpuupw1G69OhqndZU+UV5KEEr3SVzPOpyZ2gXV/AyTjYSgiXKfXDrWdaZtkfnXMcflTV Tx/a6JtHFAq+BZDtih2X9Fh6+fOFP4foPQBDFwVkUDdaPQnZskgCXkYf4I9iLBRhMsjexG sQx5KvDKACvBlYR6Li0qs3ju1IwRkgoIFDjdKjmpLWjCImtzRwEa80UXfSfwFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232100; a=rsa-sha256; cv=none; b=VNcYVqR5VokKg7pramUcNtgqUuk03CQWxPj2Lc3MjOPHPt/dfHmzz805ERM6Hd0Axm/Y/V hO/mYN/KCEC5Tao77FGQnEuyj8+aIsEoFowtgliQDOLw7rZv3CMjdZasXZz1fKnJi4UzMz kcR5F47dUJqR9tAOajdfJpasQKP7OQEjO0OjB+SJB8y3RDMVMqt4vOD40iUA2MAwR2u6/h JmDCOT1soaWM3m9l+9tK/QppPzxryEMGEc8ENBM8iai+ZoFGXNgJL6JV3ct15TV10dUwcC EyePnkVb8qjFFWV4obalqNuCO2w7I+OI6VTrxdfYvFBDARO7Eafd0fRnKwDlyw== 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=1782232100; 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=svN9Hg8YWk1iWuru9EWJ3UPClaHalXXQHS2uP2XOpnk=; b=vxsjuNKgDHzSmZWZUYRhZxLCu5zKvB5bdzJvGwQp7HN1xP0A/8wcSEJMpLmXvPCvtZaQJT hv7jvg8gGQrMgx2U9fcpsLMzt+wBAZytcUSG9obsz+KQ57qRZE1QNmJ5zS3zC77JmTcHxv zbSTUC1dRhfz5LWIzWElJZKoa+Bu9RPoPYGp/s63qzGMa1HJsmon2iov5OTfmoTPON81H3 Yvj7g8wYrRy5JXNM4mQjQpzDLn+nDjjYymcsG0li8EG7cqZ0AUdQ5OgK/dXb7UUFZus5UT QRuJnSsGPW2mKWs1mixqk3hS9sSG7nyBwKUQ0/zRNQPkUEKeu5nJkDC5faj31A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VD1nvvzhHw for ; Tue, 23 Jun 2026 16:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27266 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4ea1d25860c7 - stable/15 - mandoc: Updating FreeBSD thead library descriptions 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4ea1d25860c73fb3a36a31603c972dad922f6ca1 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:20 +0000 Message-Id: <6a3ab424.27266.3c4b3660@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4ea1d25860c73fb3a36a31603c972dad922f6ca1 commit 4ea1d25860c73fb3a36a31603c972dad922f6ca1 Author: John Baldwin AuthorDate: 2026-05-13 16:33:29 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:07:14 +0000 mandoc: Updating FreeBSD thead library descriptions Remove libkse as it has been obsolete for many years and drop 1:1 from description of libthr. Reviewed by: brooks Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D56850 (cherry picked from commit 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0) --- contrib/mandoc/lib.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in index dcea23cf81ea..04d86f9add1e 100644 --- a/contrib/mandoc/lib.in +++ b/contrib/mandoc/lib.in @@ -74,7 +74,6 @@ LINE("libisns", "Internet Storage Name Service Library (libisns, \\-lisns)") LINE("libjail", "Jail Library (libjail, \\-ljail)") LINE("libkcore", "Kernel Memory Core Access Library (libkcore, \\-lkcore)") LINE("libkiconv", "Kernel-side iconv Library (libkiconv, \\-lkiconv)") -LINE("libkse", "N:M Threading Library (libkse, \\-lkse)") LINE("libkvm", "Kernel Data Access Library (libkvm, \\-lkvm)") LINE("libm", "Math Library (libm, \\-lm)") LINE("libm68k", "m68k Architecture Library (libm68k, \\-lm68k)") @@ -126,7 +125,7 @@ LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)") -LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)") +LINE("libthr", "Threading Library (libthr, \\-lthr)") LINE("libufs", "UFS File System Access Library (libufs, \\-lufs)") LINE("libugidfw", "File System Firewall Interface Library (libugidfw, \\-lugidfw)") LINE("libulog", "User Login Record Library (libulog, \\-lulog)") From nobody Tue Jun 23 16:28:21 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 4gl9VG0RKgz6hhfR for ; Tue, 23 Jun 2026 16:28:22 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VF41Fyz3Mn7 for ; Tue, 23 Jun 2026 16:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232101; 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=J9++l2oL5a6S1fGY6yRhSvTgtt/ybnB/FBOjgSybcFE=; b=kxku5YScojXya/AlG/VNn0JO77z/tz+fqYg8fL7mX2fif46TPmSgkSW7u+/NOcatSn2l+F IJLwFIwkC5d0YsBwGLgMj1seQ8UmWE3rLEQSqLtZvjYucwhPhrI5CfsFFCQ0ZMQy46cAfY efpzjlSbv2p1iFsxnnNnns0zoKkEZ0NGuF7qq2GyLSV3ZPNXrA5G916BrQd0qF7KoFMm27 X2EtRvMXx7it6mQeprXEsm3gE3nXRXy/FgE6RocHc12ULikYyOL/IlivbviTv5PtFC1MER 185tFVgTHyGKz0/rOqudyNraYzk/mVvdV3mViBJ+2wo0/z7fIZLGJIrnuDW8qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232101; a=rsa-sha256; cv=none; b=EgwKWVwjJjPZd+Le+ARQgAH4WkwMBdxQJaFzhyP67NKzKpoPOWzzpKVA6OJIiffluUsfUr 009PoU9ciGwcLiorYgELz6r3WbnNp8aorg1paxelUPSqGD46VjAjWUrU03CALyVfdTYzc4 T/06IXjJvzPOVMMWMduSgZNx4km+LmGYaQ0GNene8r1YGdDk/GQgdhxd8SmZTv7JI2A59l RNOyJzHLDY89Mig+eSCPjA8oK8v1oZKGFPM2uQYcwHU3NktjIiuCM7QF3ZP9TklROlVf5A Z+EshU0PvojOt8yahQqFvIT6bG5VXRxLqsMj2IMe+6rpZpgGKzlANHB59+uaYg== 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=1782232101; 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=J9++l2oL5a6S1fGY6yRhSvTgtt/ybnB/FBOjgSybcFE=; b=CzP2lSTfUrQwAT/lGASx+JOn6i3r3w96WNmowaU7p/orBWqeNH3f7DhPcpK2q8Gtktwx62 bCrj6xD9oOZXRgxXprhywtt1WJQ9CR9fH6Or28VUtF+0KV4Cvdwjq+GullcoakxtyJbqPC F+KoIbVNncI+RSUxMNFFrGnRUXisll3fPs4tCa3qQzuLpBkmeeIVVDeGjSSPYpLoOlGV+l aneuApLP4+uz5fjmr/++8Rk2fvdzfUF3vxorArgZ+rzRAHsBZ6ZN+1FnogxTRCO1gKp6Fb /0poEEi8tthspJWMnVji96pnc/2n67F/r7mN7lWkscPRpDg76QJhxvKBW4YUeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VF2ZDGzhNv for ; Tue, 23 Jun 2026 16:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26fa0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 655013d5f4a6 - stable/15 - arm64/vmm: Enforce a data barrier before tlbi for non-VHE 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 655013d5f4a6d6783349fc876f0df2d4b4410490 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:21 +0000 Message-Id: <6a3ab425.26fa0.5f962469@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=655013d5f4a6d6783349fc876f0df2d4b4410490 commit 655013d5f4a6d6783349fc876f0df2d4b4410490 Author: John Baldwin AuthorDate: 2026-05-13 16:33:52 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:07:35 +0000 arm64/vmm: Enforce a data barrier before tlbi for non-VHE Exception entry does not include an implicit, architectural data barrier. Reported by: Ben Simner Reviewed by: andrew Fixes: 5577bb2f67ff ("arm64/vmm: Support tlbi from VHE") Differential Revision: https://reviews.freebsd.org/D56855 (cherry picked from commit 04987aa1d8099e5f8f5dd8c68e65f315b3f1fd6c) --- sys/arm64/vmm/vmm_hyp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index 75c15f06dd08..27fdf18e4700 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -708,9 +708,7 @@ VMM_HYP_FUNC(s2_tlbi_range)(uint64_t vttbr, vm_offset_t sva, vm_offset_t eva, uint64_t host_tcr; #endif -#ifdef VMM_VHE dsb(ishst); -#endif #define TLBI_VA_SHIFT 12 #define TLBI_VA_MASK ((1ul << 44) - 1) @@ -768,9 +766,7 @@ VMM_HYP_FUNC(s2_tlbi_all)(uint64_t vttbr) { uint64_t host_vttbr; -#ifdef VMM_VHE dsb(ishst); -#endif /* Switch to the guest vttbr */ /* TODO: Handle Cortex-A57/A72 erratum 131936 */ From nobody Tue Jun 23 16:28:22 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 4gl9VG6myKz6hhcS for ; Tue, 23 Jun 2026 16:28:22 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VG3yskz3Mfb for ; Tue, 23 Jun 2026 16:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232102; 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=/NCytUz0S8TCoX5sXzLYYOu6BpJ22tRju2AFg6W3aUM=; b=HhmK/6fkVu69sz54b4wsRDUYrXsivxQNCzSEe50Zzn2ngTIYa0Cz2NSDnHLweXz1C86Ae3 xmM2cYoy6gvVVfwoZxCJ1mxYASJWInCrW8fQrjZvxM307//If5QCJ0BVd+vf56brxC/KMu FOXHNmWh6/DfjgSLb3aPoo1O7p2n97rsuofMW8bfyD7oF4nGs6Enn02S/8ew/N9YVqgyh/ MXEoSudJqEMjmnePOnYmq0fwRmGUACR2Fbr56z039DmESD9a6CObjwGvbH4o2semypK9mq QdR+IzfbJsV+bQ7ffniQf6KswAYd1ebat+7iWQJHE259ZLabiz4fDlG4PZaR2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232102; a=rsa-sha256; cv=none; b=jmCuuQf0JudjsxhzuOvGF2dykVosRrAw387U63NH392CvnXP0vyfUOIeOAxnfklTXpipo4 axCHcyj0sWX9G4eClnCYarQUnaMtti7yMY/IKJ5O3OXdNAoltRmJ2Wvdklhtf1P37n4j8f kVLhXjnNkAjciHgi4A6CtvcWjzEkTZaycrpvVckQP8CSNg4XHijFDRe2s0NT7xPFol0jbd 86nkCb4Z8D20TZ361rWV+657VmLPhx7928fE5TZC/8hHdsgAXZMCulVGQWIgnx62X+Rgcn mSS0mT/MKUmbMajaADwQWtrXfl+SOZdVXTxzLXreiErgFOov+goWKZdRdU8pHw== 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=1782232102; 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=/NCytUz0S8TCoX5sXzLYYOu6BpJ22tRju2AFg6W3aUM=; b=nHXZzIFKLAZHwVltUkHt2uDrx4mR9uMEUj6IporLDxVNIaxhIYbttgLnLRxBR9xou1KBQ1 kkK+dQLKV4EmjFaKgc5IEhqGBvynDIB9X5ulLHGYWbIfQpZqe19f2S69mj5hU7sltgql1H 6cdgC84Vbce+iEo8b1UJvQiUCXclSaXn5cXVbyS35L7SzTb6oUxk6mKZBrJtN+TV0brsRc NwBkO1rDWMCgpcjA679KClhenV3fb2sXPvnT0YMwg9CSgQ2vFoViuLJ5VIdwsYEokoQFXd TbakndAzAGNpCGSy1GK1hALom9n6JW/raAYNS/r//2eTEzsvtBtXaqaHALe1QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VG2xF9zhpf for ; Tue, 23 Jun 2026 16:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 355bdaddb4bf - stable/15 - clock_gettime.2: Fix a couple of typos 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 355bdaddb4bf8dac0bb883e2e5195f1784fe7c00 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:22 +0000 Message-Id: <6a3ab426.26e1c.9916b47@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=355bdaddb4bf8dac0bb883e2e5195f1784fe7c00 commit 355bdaddb4bf8dac0bb883e2e5195f1784fe7c00 Author: John Baldwin AuthorDate: 2026-05-13 18:11:26 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:07:47 +0000 clock_gettime.2: Fix a couple of typos Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56990 (cherry picked from commit 52fa2f9f8d57e4dde555567794c6b3e0e242b8a1) --- lib/libsys/clock_gettime.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/clock_gettime.2 b/lib/libsys/clock_gettime.2 index 89551d0f720b..39dbd0ae1e35 100644 --- a/lib/libsys/clock_gettime.2 +++ b/lib/libsys/clock_gettime.2 @@ -71,7 +71,7 @@ Increments in SI seconds like a wall clock. It uses a 1970 epoch and implements the UTC timescale. The count of physical SI seconds since 1970, adjusted by subtracting the number of positive leap seconds and adding the number of negative leap seconds. -Behavior during a leap second is not defined by and POSIX standard. +Behavior during a leap second is not defined by any POSIX standard. .It Dv CLOCK_MONOTONIC .It Dv CLOCK_MONOTONIC_PRECISE .It Dv CLOCK_MONOTONIC_FAST @@ -109,7 +109,7 @@ It will increase monotonically during a leap second. Will return .Er EINVAL if the current offset between TAI and UTC is not known, -which may be the case early in boot before NTP or other time daemon has +which may be the case early in boot before NTP or another time daemon has synchronized. .El .Pp From nobody Tue Jun 23 16:28:23 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 4gl9VJ1XHcz6hhff for ; Tue, 23 Jun 2026 16:28:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VH4zQ5z3N00 for ; Tue, 23 Jun 2026 16:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232103; 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=lTT5jn0cZsTUGFBCkKfXmbdPVx5aHGa6t0FtoUkhaUc=; b=gSLK2Iu6v47XciWIV871FAJ3mEAvrvJalAZtaYB1ySG7y/I0pXP9Ci7t8kESUgacoJ+94q jfBRuq8P3H6VfDsI6AaO4D7DkifqK6vp/Z8KUqWvLE2tCdZ0FwCDbK/73RoS0RGGJqipkh cuR2G8x3IO5M6dtM2Csb90nUqRtZQ/Kd3F0DK9GljTnIA5o4wlx+Q9UIEqH8d7AK5/q28p WaSjCo1AkBe3RTDkW9e0adH0I1r3+YhMJb4B6UW5AVlOgKSrINLkJeoRvU8XVZnI5zV7/K +jynuYKKJ0Vgm3OBQqVNkcManAuFqfJ1QHkSKl4t1f0hnEF3+fbPIvRR9PEj9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232103; a=rsa-sha256; cv=none; b=QuvdFAqmNrTyb/Z7PczwVzVe+tdgBmgPFzKlpQ2vPZWWfE3+FopVXiDJ5/mDMuwmhK0KFs JX1zqSGWkXJlGj1t6sKtazixSCgs5qLlw4MZebijDyU2EeIz8JnaMi3+ju8m3kRbxYGpzi 9BSicUjae702SDMlce8RGMGW9+hYQQmz8HqNlZAhS09LeJcFfVH7nX3yYhNbB9SUvJRJ1y 5vf/rJoj2ZwsFFihX6lyd9eFLe68fNZuFm9NgLIYG2XfoRp0WXv1z7typC/3tXFVJZoDUd nmpD+bRAXc7rgXhNTWv7s41BjD++m5I8rbSNbvlPgnJ4jFPkRn62LA23M9yLlg== 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=1782232103; 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=lTT5jn0cZsTUGFBCkKfXmbdPVx5aHGa6t0FtoUkhaUc=; b=gxox72QK5+/2Egb6guBRnUx9gtBWhKsJ3f3680PO+ohRKHaU9GNgMsr6t0EgkbniNETBXV PE8MJ9NoYqrh5lZG81voFVDWHW9KcS4Rn5XYrh106mqqksrx2xM9VbktsXk86b/rows+QM xlvFdi6IcCkP3mUMYEFrx9ddtBsev0tHpKb0e2Se7Sp2zU1akE6hdrQLM0C4wA76fRs7v/ Dwa9mIUI67xHx+uox5wRZKBQ9KIlnBPDkGmN21mZv382hBpbjjo7jauoIeLL3125LzANcc 8Vp27XNcG6CCwmJKDkRg4vqNy1u8KID1PXZF7J2YX2nbttivokcm2Ljp+i3b1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VH3lgzzhbF for ; Tue, 23 Jun 2026 16:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 268f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 36b17708b0db - stable/15 - LinuxKPI: Check the devclass of the parent device in dev_is_pci 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 36b17708b0dbe4e083dc21968f1834a4a8b174b5 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:23 +0000 Message-Id: <6a3ab427.268f7.5f7cf93c@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=36b17708b0dbe4e083dc21968f1834a4a8b174b5 commit 36b17708b0dbe4e083dc21968f1834a4a8b174b5 Author: John Baldwin AuthorDate: 2026-05-18 18:44:00 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:08:26 +0000 LinuxKPI: Check the devclass of the parent device in dev_is_pci Reviewed by: bz Fixes: c41d83548b6c ("LinuxKPI: pci.h add more defines and functions") Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D57066 (cherry picked from commit 6a043d0814a29e756f5d26e7b59a360e1d6dfa45) --- sys/compat/linuxkpi/common/include/linux/pci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 5cd87ff091bc..a6ddc02d1947 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -399,8 +399,8 @@ int _lkpi_pci_enable_msi_range(struct pci_dev *pdev, int minvec, int maxvec); static inline bool dev_is_pci(struct device *dev) { - - return (device_get_devclass(dev->bsddev) == devclass_find("pci")); + return (device_get_devclass(device_get_parent(dev->bsddev)) == + devclass_find("pci")); } static inline uint16_t From nobody Tue Jun 23 16:28:24 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 4gl9VK0ybcz6hhbS for ; Tue, 23 Jun 2026 16:28: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VJ5Tcyz3MrN for ; Tue, 23 Jun 2026 16:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232104; 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=qfSYQpF45Y0aplB1N6Mftq6nf6JKHLNVDR6cUJlhz5w=; b=jVCJJRCbiU/zF3xa+tGK7yA/0Tdicj3iR9HOWy5TTD4swwh1UCXF6pd5LYKIM6jEhc/8X2 +jKTPORSGrzVRGHlJrS+lzlYXJoNzP78VgmsvlGM0m9d6c6Q1Oz5oL2+gBYyizUuyqf2aw /SAUb9ODL0Q7SKQSkgKc4EKKJI85BS82hoG4Fbku/e5+nKpNSoqGxLkzqZjUtqxLzoRaUE +ktg8aL4TqBD9mJTTtUS0iPvRjFJcvCLDURVdVYudVUt6qP+uPD34YYUpqBQo23HucgrwQ 980V9NOnxdStGeHL1gEmyvigluI+W6bZQCoN+iQ5lj08FZPbDPPq+2kOV74P/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232104; a=rsa-sha256; cv=none; b=Nzikqzq+z81LVR5o3eYbuF1dppUye6guZ+EQz4IlxsBqKXJtrCk0gevvYe7sDsXuh2s87m aq/0VLOeXTRterPjeLlGIM0x1u5Khr2utmurLeRcVyFGiU0uZz67z5PZtlcnovJ9e+RmBH 6fUi3JlqTVM44AR4J07h+wMEk4dMAgxkwkHyqkrVF3AOLSZ78bK3feIvSWcGdxR0h0ZxXU UQgGBx6kS0aARCi1PJlyfMhBXoXWYAB6kUghIwOU/FmXFIaDlCZjlDDOt/Q2QhLo0M3f0U +XhyzDoaT9a7147bgN9FfqsZRbaN1YKLrykkASzQ8KMbWMQtPDQhqDLmwflmkQ== 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=1782232104; 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=qfSYQpF45Y0aplB1N6Mftq6nf6JKHLNVDR6cUJlhz5w=; b=DKAFE31T+D5MfMXHNbPyDpjI8AreGiA+LA0BzYZAGpPLZgaqs/T2PBJUlu2AcL4si4a17c tosPtkA8+Q8rRy3g+T3I+YhAg/lbrz2CdLxwacek/JPIZh6mAVgmOM1wDBMR3PAEsQK/0k GG5zFOLOiIKz4HcEk2Srvt4Ut8EppQSSOBKpX6T/FGYWMJ/RzBU37sHYhuDeH9jk/bKpCv KbKHjg7CZfVX1PzPEPNGptN2IQbiKTlAPbRw572nA218+XXSnVtQF/UWeE0mfgtK98DF1M NQzK91/otpepw3YYjczNW5s8O6E7rAqn8I6HlyRf6FQS+VMmEBehB/Hq2lw1fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VJ4QldzhHx for ; Tue, 23 Jun 2026 16:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27819 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e375116a4903 - stable/15 - pci: Add is_pci_device helper function 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e375116a49035df765c1197f980d79066f757ef0 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:24 +0000 Message-Id: <6a3ab428.27819.5fd40007@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e375116a49035df765c1197f980d79066f757ef0 commit e375116a49035df765c1197f980d79066f757ef0 Author: John Baldwin AuthorDate: 2026-05-18 18:50:39 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:08:55 +0000 pci: Add is_pci_device helper function This returns true if a given device is a PCI device (child of a PCI bus). Reviewed by: bz, kib Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56996 (cherry picked from commit ffcf5e356644252f2f6c89ba01057af45c216559) --- share/man/man9/Makefile | 3 ++- share/man/man9/pci.9 | 11 ++++++++++- sys/dev/pci/pci.c | 11 +++++++++++ sys/dev/pci/pcivar.h | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 0bdb66f32c65..7131fbcfd798 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1796,7 +1796,8 @@ MLINKS+=osd.9 osd_call.9 \ osd.9 osd_set_reserved.9 MLINKS+=panic.9 vpanic.9 \ panic.9 KERNEL_PANICKED.9 -MLINKS+=pci.9 pci_alloc_msi.9 \ +MLINKS+=pci.9 is_pci_device.9 \ + pci.9 pci_alloc_msi.9 \ pci.9 pci_alloc_msix.9 \ pci.9 pci_clear_pme.9 \ pci.9 pci_disable_busmaster.9 \ diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 871f69f887a6..4d69d3a4240f 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -23,11 +23,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 27, 2025 +.Dd May 18, 2026 .Dt PCI 9 .Os .Sh NAME .Nm pci , +.Nm is_pci_device , .Nm pci_alloc_msi , .Nm pci_alloc_msix , .Nm pci_clear_pme , @@ -80,6 +81,8 @@ .In sys/bus.h .In dev/pci/pcireg.h .In dev/pci/pcivar.h +.Ft bool +.Fn is_pci_device "device_t dev" .Ft int .Fn pci_alloc_msi "device_t dev" "int *count" .Ft int @@ -202,6 +205,12 @@ device information, device configuration, and message signaled interrupts. +.Pp +The +.Fn is_pci_device +function can be used to determine if +.Fa dev +is a PCI device. .Ss Raw Configuration Access The .Fn pci_read_config diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 9e4b64f03171..83bce77f3b05 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -6994,6 +6994,17 @@ pci_print_faulted_dev(void) } } +bool +is_pci_device(device_t dev) +{ + devclass_t pci_class; + + if (device_get_parent(dev) == NULL) + return (false); + pci_class = devclass_find("pci"); + return (device_get_devclass(device_get_parent(dev)) == pci_class); +} + #ifdef DDB DB_SHOW_COMMAND_FLAGS(pcierr, pci_print_faulted_dev_db, DB_CMD_MEMSAFE) { diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 696e1c688c68..bcd4d2d35b54 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -676,6 +676,7 @@ pci_child_added(device_t dev) return (PCI_CHILD_ADDED(device_get_parent(dev), dev)); } +bool is_pci_device(device_t dev); device_t pci_find_bsf(uint8_t, uint8_t, uint8_t); device_t pci_find_dbsf(uint32_t, uint8_t, uint8_t, uint8_t); device_t pci_find_device(uint16_t, uint16_t); From nobody Tue Jun 23 16:28:25 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 4gl9VL4k31z6hhhl for ; Tue, 23 Jun 2026 16:28:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VK6Hmzz3Mv5 for ; Tue, 23 Jun 2026 16:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232105; 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=gQK87ECaZllDsw4JfKYVUcAUvNQdEu7zGH4gqwY/rYc=; b=Ym2fGpn3TTCx4VwTbdx/irTYn1VgHl7miP8K8jA4bAucqXHzBHsNVyfGTcNnN1FSRLKpbd sUVKJ2kKWtOK9pjqwwYSFybmWJm+FWIl0qhTFLirK5mt+t2mOeESHTS64lhMxspLojEvia m2wJzfiHb96jjkG1MnVQfzJ2imsa3ET7A4h1SIVEAimpqYznpFMTS0D5FM2bAKMzsMjLeZ ZiBVF9RL3WL9s2vQyyVtSeCAUSsfpnSfAne0L9dJ+XOB6+5I2jDHU1GuOiOpg6bENdeOBg 6FI70PgGmLkfoJa8B24IM5MrK5PYgM6/eJMPO5XR8U4jAvigGw6xtN/2OP+IBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232105; a=rsa-sha256; cv=none; b=vsVFF/DUOI8yUM0xzSav0Y2PG7jCWe0oBb4bRdf0evDmMPy0gdn1V/qEec5b/PFLWngtBO 8LvYrbftIWzHyoHzQ0jjIUge075OwHj/TNaff2kl1evIc2eSjgI9qDsoPDK4fi3LTgp+yy LlSG5xQaYmCCIXUPax+EWzQnvFvlYbnj8hr0gB4oDvjNshftbLbyzkwIUT6K3WubFIzLu4 qtjybXAS9VKt8JdAfdQMy3INB3LaQxxmbMkOwXv4a4nWL0PekJmUP7DEC0ESC09DjxsQqz mPz99pVQ619xrGcq8lCkUspqSzk6/hjO+4YAe3yUFKqFt4n+QUH8OO0je7HaJA== 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=1782232105; 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=gQK87ECaZllDsw4JfKYVUcAUvNQdEu7zGH4gqwY/rYc=; b=imPimDzYTVbNuynMG68Vi7pIBBYZ5VS5ITC+bsreUb5u9syHcsQERzD4ADfjN8JNQwjPYH OoeYbaqx+VgA47nBt9LdlZZo0NvV7MIXsHw0PCWCnymttF/D4Cs/VwWQ+ptbSReCwmenAA WT5tpxKhetR5QOr5X/8N1WuZ/EryZP4bnQNy+t4bogaz5crBCC7z42sqKXzhIHsZy5r5HH wf3cY47jpzGERE37PNHEf1IJ84K9RyXEJ5+gVqWlvVBwUlxdBtaz+BVZTghPfw1EJbErCZ JKe0TNTh1xLM0nuLl92Res/XsgV6yNyXfAoo18ZN2deedhpV4JThj4fSssEcbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VK5MFTzhph for ; Tue, 23 Jun 2026 16:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2781d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 59fa4e2e1f1e - stable/15 - sys: Use is_pci_device instead of direct comparisons to devclasses 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 59fa4e2e1f1e06a3b4cd582e9b50375d23877e5f Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:25 +0000 Message-Id: <6a3ab429.2781d.7bf21fb0@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=59fa4e2e1f1e06a3b4cd582e9b50375d23877e5f commit 59fa4e2e1f1e06a3b4cd582e9b50375d23877e5f Author: John Baldwin AuthorDate: 2026-05-18 18:52:23 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:09:11 +0000 sys: Use is_pci_device instead of direct comparisons to devclasses Reviewed by: bz Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56997 (cherry picked from commit 6dc813301a173e2e1993c3064df162e6218c1231) --- sys/arm64/cavium/thunder_pcie_pem.c | 6 +---- sys/arm64/iommu/smmu.c | 6 ++--- sys/compat/linuxkpi/common/include/linux/pci.h | 6 ++--- sys/dev/ata/ata-all.c | 3 +-- sys/dev/bge/if_bge.c | 13 +++-------- sys/dev/ichwd/ichwd.c | 5 ++-- sys/dev/iommu/busdma_iommu.c | 32 +++++++------------------- sys/dev/pci/pci.c | 10 ++------ sys/dev/pci/vga_pci.c | 6 ++--- sys/dev/vnic/thunder_bgx_fdt.c | 9 ++------ sys/x86/iommu/amd_drv.c | 3 +-- sys/x86/iommu/intel_drv.c | 13 +++-------- 12 files changed, 29 insertions(+), 83 deletions(-) diff --git a/sys/arm64/cavium/thunder_pcie_pem.c b/sys/arm64/cavium/thunder_pcie_pem.c index b01dfecb347e..a97c2998f184 100644 --- a/sys/arm64/cavium/thunder_pcie_pem.c +++ b/sys/arm64/cavium/thunder_pcie_pem.c @@ -760,8 +760,6 @@ thunder_pem_attach(device_t dev) { struct resource_map_request req; struct resource_map map; - devclass_t pci_class; - device_t parent; struct thunder_pem_softc *sc; int error; int rid; @@ -773,9 +771,7 @@ thunder_pem_attach(device_t dev) sc->dev = dev; /* Allocate memory for resource */ - pci_class = devclass_find("pci"); - parent = device_get_parent(dev); - if (device_get_devclass(parent) == pci_class) + if (is_pci_device(dev)) rid = PCIR_BAR(0); else rid = RID_PEM_SPACE; diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index a84ef4ae347e..265f1e56f892 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -1825,7 +1825,6 @@ smmu_ctx_init(device_t dev, struct iommu_ctx *ioctx) struct iommu_domain *iodom; struct smmu_softc *sc; struct smmu_ctx *ctx; - devclass_t pci_class; u_int sid; int err; @@ -1836,8 +1835,7 @@ smmu_ctx_init(device_t dev, struct iommu_ctx *ioctx) domain = ctx->domain; iodom = (struct iommu_domain *)domain; - pci_class = devclass_find("pci"); - if (device_get_devclass(device_get_parent(ctx->dev)) == pci_class) { + if (is_pci_device(ctx->dev)) { err = smmu_pci_get_sid(ctx->dev, NULL, &sid); if (err) return (err); @@ -1863,7 +1861,7 @@ smmu_ctx_init(device_t dev, struct iommu_ctx *ioctx) smmu_init_ste(sc, domain->cd, ctx->sid, ctx->bypass); - if (device_get_devclass(device_get_parent(ctx->dev)) == pci_class) + if (is_pci_device((ctx->dev)) if (iommu_is_buswide_ctx(iodom->iommu, pci_get_bus(ctx->dev))) smmu_set_buswide(dev, domain, ctx); diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index a6ddc02d1947..56b9c6e05f27 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -399,8 +399,7 @@ int _lkpi_pci_enable_msi_range(struct pci_dev *pdev, int minvec, int maxvec); static inline bool dev_is_pci(struct device *dev) { - return (device_get_devclass(device_get_parent(dev->bsddev)) == - devclass_find("pci")); + return (is_pci_device(dev->bsddev)); } static inline uint16_t @@ -556,8 +555,7 @@ pci_upstream_bridge(struct pci_dev *pdev) bridge = device_get_parent(bridge); if (bridge == NULL) goto done; - if (device_get_devclass(device_get_parent(bridge)) != - devclass_find("pci")) + if (!is_pci_device(bridge)) goto done; /* diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 2e77c0f6478e..85fe40aa4584 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -1176,8 +1176,7 @@ ataaction(struct cam_sim *sim, union ccb *ccb) cpi->protocol = PROTO_ATA; cpi->protocol_version = PROTO_VERSION_UNSPECIFIED; cpi->maxio = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS; - if (device_get_devclass(device_get_parent(parent)) == - devclass_find("pci")) { + if (is_pci_device(parent)) { cpi->hba_vendor = pci_get_vendor(parent); cpi->hba_device = pci_get_device(parent); cpi->hba_subvendor = pci_get_subvendor(parent); diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 2feb19bff677..3551f10b2ae3 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -3202,20 +3202,13 @@ bge_mbox_reorder(struct bge_softc *sc) } mbox_reorder_lists[] = { { 0x1022, 0x7450, "AMD-8131 PCI-X Bridge" }, }; - devclass_t pci, pcib; - device_t bus, dev; + device_t dev; int i; - pci = devclass_find("pci"); - pcib = devclass_find("pcib"); dev = sc->bge_dev; - bus = device_get_parent(dev); for (;;) { - dev = device_get_parent(bus); - bus = device_get_parent(dev); - if (device_get_devclass(dev) != pcib) - break; - if (device_get_devclass(bus) != pci) + dev = device_get_parent(device_get_parent(dev)); + if (!is_pci_device(dev)) break; for (i = 0; i < nitems(mbox_reorder_lists); i++) { if (pci_get_vendor(dev) == diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c index 5481553cc175..b0c953e58956 100644 --- a/sys/dev/ichwd/ichwd.c +++ b/sys/dev/ichwd/ichwd.c @@ -561,13 +561,12 @@ static device_t ichwd_find_ich_lpc_bridge(device_t isa, struct ichwd_device **id_p) { struct ichwd_device *id; - device_t isab, pci; + device_t isab; uint16_t devid; /* Check whether parent ISA bridge looks familiar. */ isab = device_get_parent(isa); - pci = device_get_parent(isab); - if (pci == NULL || device_get_devclass(pci) != devclass_find("pci")) + if (!is_pci_device(isab)) return (NULL); if (pci_get_vendor(isab) != VENDORID_INTEL) return (NULL); diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index 82f73d469585..3852429c4a8a 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -117,17 +117,14 @@ iommu_bus_dma_is_dev_disabled(int domain, int bus, int slot, int func) int iommu_get_requester(device_t dev, device_t *requesterp, uint16_t *rid) { - devclass_t pci_class; device_t l, pci, pcib, pcip, pcibp, requester; int cap_offset; uint16_t pcie_flags; bool bridge_is_pcie; - pci_class = devclass_find("pci"); l = requester = dev; - pci = device_get_parent(dev); - if (pci == NULL || device_get_devclass(pci) != pci_class) { + if (!is_pci_device(dev)) { *rid = 0; /* XXXKIB: Could be ACPI HID */ *requesterp = NULL; return (ENOTTY); @@ -141,29 +138,18 @@ iommu_get_requester(device_t dev, device_t *requesterp, uint16_t *rid) * unit. */ for (;;) { - pci = device_get_parent(l); - if (pci == NULL) { + if (!is_pci_device(l)) { if (bootverbose) { printf( - "iommu_get_requester(%s): NULL parent for %s\n", + "iommu_get_requester(%s): non-pci ancestor %s\n", device_get_name(dev), device_get_name(l)); } *rid = 0; *requesterp = NULL; return (ENXIO); } - if (device_get_devclass(pci) != pci_class) { - if (bootverbose) { - printf( - "iommu_get_requester(%s): non-pci parent %s for %s\n", - device_get_name(dev), device_get_name(pci), - device_get_name(l)); - } - *rid = 0; - *requesterp = NULL; - return (ENXIO); - } + pci = device_get_parent(l); pcib = device_get_parent(pci); if (pcib == NULL) { if (bootverbose) { @@ -182,10 +168,8 @@ iommu_get_requester(device_t dev, device_t *requesterp, uint16_t *rid) * port, and the requester ID won't be translated * further. */ - pcip = device_get_parent(pcib); - if (device_get_devclass(pcip) != pci_class) + if (!is_pci_device(pcib)) break; - pcibp = device_get_parent(pcip); if (pci_find_cap(l, PCIY_EXPRESS, &cap_offset) == 0) { /* @@ -212,6 +196,8 @@ iommu_get_requester(device_t dev, device_t *requesterp, uint16_t *rid) * PCI bridge, then we know pcib is actually a * PCIe/PCI bridge. */ + pcip = device_get_parent(pcib); + pcibp = device_get_parent(pcip); if (!bridge_is_pcie && pci_find_cap(pcibp, PCIY_EXPRESS, &cap_offset) == 0) { pcie_flags = pci_read_config(pcibp, @@ -337,11 +323,9 @@ bool bus_dma_iommu_set_buswide(device_t dev) { struct iommu_unit *unit; - device_t parent; u_int busno, slot, func; - parent = device_get_parent(dev); - if (device_get_devclass(parent) != devclass_find("pci")) + if (!is_pci_device(dev)) return (false); unit = iommu_find(dev, bootverbose); if (unit == NULL) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 83bce77f3b05..2a43fa10b7e0 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -6536,11 +6536,9 @@ device_t pci_find_pcie_root_port(device_t dev) { struct pci_devinfo *dinfo; - devclass_t pci_class; device_t pcib, bus; - pci_class = devclass_find("pci"); - KASSERT(device_get_devclass(device_get_parent(dev)) == pci_class, + KASSERT(is_pci_device(dev), ("%s: non-pci device %s", __func__, device_get_nameunit(dev))); /* @@ -6556,11 +6554,7 @@ pci_find_pcie_root_port(device_t dev) KASSERT(pcib != NULL, ("%s: null bridge of %s", __func__, device_get_nameunit(bus))); - /* - * pcib's parent must be a PCI bus for this to be a - * PCI-PCI bridge. - */ - if (device_get_devclass(device_get_parent(pcib)) != pci_class) + if (!is_pci_device(pcib)) return (NULL); dinfo = device_get_ivars(pcib); diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index 763439b6e48d..d8ceb774adc0 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -111,8 +111,7 @@ vga_pci_is_boot_display(device_t dev) */ pcib = device_get_parent(device_get_parent(dev)); - if (device_get_devclass(device_get_parent(pcib)) == - devclass_find("pci")) { + if (is_pci_device(pcib)) { /* * The parent bridge is a PCI-to-PCI bridge: check the * value of the "VGA Enable" bit. @@ -186,8 +185,7 @@ vga_pci_map_bios(device_t dev, size_t *size) #endif pcib = device_get_parent(device_get_parent(dev)); - if (device_get_devclass(device_get_parent(pcib)) == - devclass_find("pci")) { + if (is_pci_device(pcib)) { /* * The parent bridge is a PCI-to-PCI bridge: check the * value of the "VGA Enable" bit. diff --git a/sys/dev/vnic/thunder_bgx_fdt.c b/sys/dev/vnic/thunder_bgx_fdt.c index 20a5b54f7448..d8c5459f2914 100644 --- a/sys/dev/vnic/thunder_bgx_fdt.c +++ b/sys/dev/vnic/thunder_bgx_fdt.c @@ -285,11 +285,9 @@ bgx_fdt_traverse_nodes(uint8_t unit, phandle_t start, char *name, static device_t bgx_find_root_pcib(device_t dev) { - devclass_t pci_class; device_t pcib, bus; - pci_class = devclass_find("pci"); - KASSERT(device_get_devclass(device_get_parent(dev)) == pci_class, + KASSERT(is_pci_device(dev), ("%s: non-pci device %s", __func__, device_get_nameunit(dev))); /* Walk the bridge hierarchy until we find a non-PCI device */ @@ -298,9 +296,6 @@ bgx_find_root_pcib(device_t dev) KASSERT(bus != NULL, ("%s: null parent of %s", __func__, device_get_nameunit(dev))); - if (device_get_devclass(bus) != pci_class) - return (NULL); - pcib = device_get_parent(bus); KASSERT(pcib != NULL, ("%s: null bridge of %s", __func__, device_get_nameunit(bus))); @@ -309,7 +304,7 @@ bgx_find_root_pcib(device_t dev) * If the parent of this PCIB is not PCI * then we found our root PCIB. */ - if (device_get_devclass(device_get_parent(pcib)) != pci_class) + if (!is_pci_device(pcib)) return (pcib); dev = pcib; diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 3a7b2819cbdd..f2a9bc518201 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -894,8 +894,7 @@ amdiommu_find_unit(device_t dev, struct amdiommu_unit **unitp, uint16_t *ridp, if (!amdiommu_enable) return (ENXIO); - if (device_get_devclass(device_get_parent(dev)) != - devclass_find("pci")) + if (!is_pci_device(dev)) return (ENXIO); bzero(&ifu, sizeof(ifu)); diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 28db14bba95b..185ed9c1a628 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -605,16 +605,13 @@ dmar_print_path(int busno, int depth, const ACPI_DMAR_PCI_PATH *path) int dmar_dev_depth(device_t child) { - devclass_t pci_class; device_t bus, pcib; int depth; - pci_class = devclass_find("pci"); for (depth = 1; ; depth++) { bus = device_get_parent(child); pcib = device_get_parent(bus); - if (device_get_devclass(device_get_parent(pcib)) != - pci_class) + if (!is_pci_device(pcib)) return (depth); child = pcib; } @@ -623,19 +620,16 @@ dmar_dev_depth(device_t child) void dmar_dev_path(device_t child, int *busno, void *path1, int depth) { - devclass_t pci_class; device_t bus, pcib; ACPI_DMAR_PCI_PATH *path; - pci_class = devclass_find("pci"); path = path1; for (depth--; depth != -1; depth--) { path[depth].Device = pci_get_slot(child); path[depth].Function = pci_get_function(child); bus = device_get_parent(child); pcib = device_get_parent(bus); - if (device_get_devclass(device_get_parent(pcib)) != - pci_class) { + if (!is_pci_device(pcib)) { /* reached a host bridge */ *busno = pcib_get_bus(bus); return; @@ -765,8 +759,7 @@ dmar_find(device_t dev, bool verbose) /* * This function can only handle PCI(e) devices. */ - if (device_get_devclass(device_get_parent(dev)) != - devclass_find("pci")) + if (!is_pci_device(dev)) return (NULL); dev_domain = pci_get_domain(dev); From nobody Tue Jun 23 16:28:26 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 4gl9VM6zFFz6hhfl for ; Tue, 23 Jun 2026 16:28:27 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VM0PkWz3MwZ for ; Tue, 23 Jun 2026 16:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232107; 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=1h2kDYAQr8dTPuc6Ay3UtInfU937jpXT2fw4TeJFals=; b=AvePiq7n8+5+EELmznqaP3y9hCN0MpCt7KZdLxo1oDx7SQ5xjgzM0wmXF68BXZLamh5e/h 3DQ0/9vuqz6UYPOnudffCylHvBe2bIKJgGGod2YdTPY/w78OityxJjBwN4v1ZmuRJ6F3nC fWTPKegWqgMhTpQJpo4J5e7XLoECICXDJp+PpEVLVIWgKpsNqdtDFBKKfNUOzTausrjEGI EhueJQ0Ur0rMV1rOAPXoTxYXEyeEq4+oAUsZ4xqJrWM4s8eiMzsoOaz7hXnGH5oJuaDw2K fLWB8A19Lys7w1rzT6ru4bHBApPDz35y9Dq8AAdME/5NJqKDDB6TPLxr/w7iOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232107; a=rsa-sha256; cv=none; b=GEaAGZGi1cCaueBRVhNSl0eReW2pMooHY5vsIqChWUbEy0wZsxfgs/H+K4FEzfwuaLk3Qx 5x12maMp2NIztWKAfxKNu2VCtVcREnEgrVpt4HfFMu+qtKKdcPE+yn+uudpThvA/S7HP8L ac4jbSXCQiiK+0Uk1kqRC7s5/sY1HlIBAawE3V7Fgy+PhMpgxRXdnnfXX8WnwJaD/c1Ngm XW1JkeBHokTeQLa6wFkv07wHp7JkZzGg28XrVNvQIhPtaXWtIJ3S/lZidYYnoHUvHzngok P/eR30CRcqzj/V2LrYo2TEsaC1SZgaPor/IXL7rKBp1y2J6bD2VF2l5hwxL6hA== 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=1782232107; 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=1h2kDYAQr8dTPuc6Ay3UtInfU937jpXT2fw4TeJFals=; b=V11xD93/an8TCv1EacxmUcFQ1VcmOJ4gwBbL2s1eTbUPI/44F4RmeOwzsO1Eu0KB2hN913 WxUIdoQG8XwDkVWcEo7lGlYKckRkqzwiuiHAztqTcH3qZlAATHSmq0x2EhIZb4tAUxHlbF RHkYFmfcY18BU894gFq0nl1dvPoP5cEaQnMG/QmFF0YB/pKOH6nStvGPgwX1K6LTZ5JeOv heowuoyAltjCIfrI44vS494F6egIzWZMtRPi2wrFfeXXq+yEV5VcFqmhpKEW2kamAx0dtv tvmJdJBZIQt6Rbp+bJwBQn9R8Xn5H1xiFlzMZRNplhgITwiA8SHPHMal77cYpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VL67HCzhcH for ; Tue, 23 Jun 2026 16:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27006 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 02d7be3b3cc1 - stable/15 - vnic: Add missing #include 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 02d7be3b3cc1bb3260906eae4aee75ae9ee2d295 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:26 +0000 Message-Id: <6a3ab42a.27006.c2cf11@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=02d7be3b3cc1bb3260906eae4aee75ae9ee2d295 commit 02d7be3b3cc1bb3260906eae4aee75ae9ee2d295 Author: John Baldwin AuthorDate: 2026-05-19 17:18:00 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:28 +0000 vnic: Add missing #include Reported by: bz, olivier Fixes: 6dc813301a17 ("sys: Use is_pci_device instead of direct comparisons to devclasses") Sponsored by: Chelsio Communications (cherry picked from commit 8c9dc47b5fcaf58a89b1511118b78a65737b20cc) --- sys/dev/vnic/thunder_bgx_fdt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/vnic/thunder_bgx_fdt.c b/sys/dev/vnic/thunder_bgx_fdt.c index d8c5459f2914..e038c0b728eb 100644 --- a/sys/dev/vnic/thunder_bgx_fdt.c +++ b/sys/dev/vnic/thunder_bgx_fdt.c @@ -52,6 +52,7 @@ #include #include #include +#include #include "thunder_bgx.h" #include "thunder_bgx_var.h" From nobody Tue Jun 23 16:28:27 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 4gl9VN72SFz6hhXW for ; Tue, 23 Jun 2026 16:28: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VN0jvsz3N28 for ; Tue, 23 Jun 2026 16:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232108; 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=QyD3xYB9oqaSpjAOpMnhZYjiZu7KU7V+PKQRxcSDUvA=; b=VrA7s1pNmjSMY+Eh1YJxUVSOiqbVwqEW++JudybbT81Yc+IVfcP0w+nm8KHzXY1GnHX0rD iH7h6QuxPhIZyh+CSqcZT45xcNC2iuBX6gSELl1zEFU3zip8ZNAmdBvycIzmLJp+HZ9RSi vWqqmtxy6xXrmOl4VraPvU5w6QG3UgEI9VcLMFSgZdUQ2f7/PYXnn0F/evppfyxcq+cEyd /C0jff896NhTgOxhAzHr6EJEGABzQALQpFKE9HyoF9nD2ANy3caB74pbA82x9ebqsLUIAW OsKCjQ7IKH+fTRXxkvtS0/dbWnfRkixavVHuOojm6xjJSpORCu/X5T24TT033g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232108; a=rsa-sha256; cv=none; b=SHxfDWGMvbEGVhSzbprakJphvPzXERK+/+YG//MY+zp8q4cj4CCvlsRtKOm0n8Y5cwQdHt jfW/Y4iy21o1pvsrenzeugZPlJu63duXoWUbru3/7RJN8HfmHFwDSvgA23O/CDBiZGTbiY 8+4KcZodSfy9ECJCi1ttLZZ5E5uZ9E82Qu0t3X4ON78v7Tbr5RASkWZ6+eSLBSaTKvMVph CplkTe7Tzhnq0Mtlt1n6zau5JoiK9sVFFRPxxtgiaSba5pVvht+8mERGDzZd6ZltNBKfuv 8FE8AttKUyHTDA3K+LGvCAropqesOxGwxz+l8ANpg41T6IOzwgHcX30zMNx9kA== 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=1782232108; 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=QyD3xYB9oqaSpjAOpMnhZYjiZu7KU7V+PKQRxcSDUvA=; b=c3k0QEgGC6sjjfqJa4MAOMQ9tzF+Qe1/DW9EJYlXNzirm2X5o2v5t5IzvzoRLifAlDMDxi JYWFQMoaAm3PfTwWFcx2vyn1RMT347FPy4dWGoIqFm6exhBPTNq7SbY9u3Azg66JATECAf XeJQ0A8345cSOwy5DTtjv7WClHXP7QJZrvL7FM165A5nUx9GQEpTKrWtaiAXT+aVY+kmPZ /Qumw89aD5Hxl+ciKxOVQl7ZStelx1MH8uYifgXWF5RFsnMhIE7yV+3Xn1W2gHj/Yxi80U bPYHbTXDHsdKuGzH9prgNs7nsDcpZX2rlH70pUrE90RhshkW9eCXZ6cPs63xRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VM6qwMzhrd for ; Tue, 23 Jun 2026 16:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 615a9c4b2aac - stable/15 - arm64/iommu: Add a missing close parenthesis 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 615a9c4b2aacb825fbd7ae9df4c3347f1c1e27db Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:27 +0000 Message-Id: <6a3ab42b.26b16.756f07ed@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=615a9c4b2aacb825fbd7ae9df4c3347f1c1e27db commit 615a9c4b2aacb825fbd7ae9df4c3347f1c1e27db Author: John Baldwin AuthorDate: 2026-05-19 17:30:01 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 arm64/iommu: Add a missing close parenthesis Fixes: 6dc813301a17 ("sys: Use is_pci_device instead of direct comparisons to devclasses") Sponsored by: Chelsio Communications (cherry picked from commit 8de34a84224b9a353bc0a9d6d3f95540b0e72707) --- sys/arm64/iommu/smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index 265f1e56f892..2d34b9177ed7 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -1861,7 +1861,7 @@ smmu_ctx_init(device_t dev, struct iommu_ctx *ioctx) smmu_init_ste(sc, domain->cd, ctx->sid, ctx->bypass); - if (is_pci_device((ctx->dev)) + if (is_pci_device((ctx->dev))) if (iommu_is_buswide_ctx(iodom->iommu, pci_get_bus(ctx->dev))) smmu_set_buswide(dev, domain, ctx); From nobody Tue Jun 23 16:28:29 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 4gl9VP4nSKz6hhlF for ; Tue, 23 Jun 2026 16:28:29 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VP1XGzz3N0p for ; Tue, 23 Jun 2026 16:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232109; 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=dq6LNXWH9iNyFraBzlCQdol57P728ic8UcddESU36pw=; b=I88mMlG0Mk0uTiC1OeB9d7dJd3SjFAn+mKsp0CFndovPPVF+/Ox4CryjLhRdZ3r8pQ2vTK hNQoTx2DOWZOpj3/NR50AkawGCo29/XU+bHlnOK7lEijmPbjHIU3LJxPHqkpc+hZUGHxR8 cUlIy8ZSQ/sJOG39IzMl1LA3DK9Xw+/m04XBwqn0KDeslpWyPlg4LGFkSisBDpCfDGPqzK ec0koFNg8Q0AUp2LgF6uAoGetu5fb7YMx1DY5wR3DL1PavMJUDhGDRk5IKhCLwvaFNK5Me dZPhZgzx8+k7DucSqUBKSLM6QGRJpyVn07lY1zcSaMuuEwTHk9wEXbxaHIKWKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232109; a=rsa-sha256; cv=none; b=lzpVamD7rGMWpj/7xJDebub78Y1mzANqyb2NuKt4wiF6IBj4GLT83LwAxKMXFMnVBh+8fZ GWUKCCE+ii+e8U6wb5J1374nSbl86ebVgI4ElFq2NZIii8b9DZE7xvs4Vd9lWTEGNvszVe eLu2lbIaBC8czFtUMDfNyChPc8FCQrQ4aD42vxizbM15JDNHKWe5VUtvuB6QyRblNt2lU5 G8AlXxSkeo4Cyy7ltvuj5Rgca851DXyDqHqigW3dSrJyGuC3054ln39w2H/cGt8XkMT0YS 4IKTy5i6EltfY52qeN5QkQLGWdc3S/J5sVWoqlPSbEO3Ktq0qCoQsDNXrwq6Rg== 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=1782232109; 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=dq6LNXWH9iNyFraBzlCQdol57P728ic8UcddESU36pw=; b=ySd4om0w9yRpy+njPmSZpTM7VpqDudxar9l4C9JHByOyMwh0yHkT8slt7isldNtQa+sblt TK9J6uvUPNm+0fujpa5ePo7xs61VAbtWaoimHheyT8NYouMWLz6PBfJZCwRgiEHpSoFlLO JPS9x/Pl+8ndH3QZhby089ZxMme1CRuunzfkvpo/sQD29YQzgQ5dGJLkIgXNx3I+uKJrkD 6tqASf+4fBQHXta9+5JeB2kVx3fzRyRfiuGdJqsMG0m5uWc3rYY5lNuhNfKAd7XE1EmsgZ Vfx999h9eBT87jwtmIpvA7yeQ7FYtM/12r/Bam32ol1CYbJoYq6mG5w17y9hwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VP0Z7kzj35 for ; Tue, 23 Jun 2026 16:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2621f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e71677cfb37d - stable/15 - sys: Use is_pci_device instead of checking device or devclass names 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e71677cfb37d83e9f65effbe635f241c75b19743 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:29 +0000 Message-Id: <6a3ab42d.2621f.2a6b944a@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e71677cfb37d83e9f65effbe635f241c75b19743 commit e71677cfb37d83e9f65effbe635f241c75b19743 Author: John Baldwin AuthorDate: 2026-05-18 18:52:39 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 sys: Use is_pci_device instead of checking device or devclass names Reviewed by: bz, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56998 (cherry picked from commit be4f245e1e4fe60d43aaff5b11b45f2a9a66a51c) --- sys/dev/sound/pcm/ac97.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c index 1407d202a0d1..ec742ccbbfaa 100644 --- a/sys/dev/sound/pcm/ac97.c +++ b/sys/dev/sound/pcm/ac97.c @@ -628,7 +628,7 @@ ac97_initmixer(struct ac97_info *codec) } pdev = codec->dev; - while (strcmp(device_get_name(device_get_parent(pdev)), "pci") != 0) { + while (!is_pci_device(pdev)) { /* find the top-level PCI device handler */ pdev = device_get_parent(pdev); } From nobody Tue Jun 23 16:28:30 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 4gl9VQ4Qhbz6hhXX for ; Tue, 23 Jun 2026 16:28:30 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VQ2B6Jz3N8R for ; Tue, 23 Jun 2026 16:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232110; 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=yxBfm/zX3JsofPnzkwLd6kVauP2xUkSH0BjTix6vQGE=; b=cLTlKTRPCYBXgW0KJw/9qJcqeAHVH9VadmaIKg3GOYdtFGH3PE5Iq9jdGkvoLzJbie6MWk kCiJDqHvSe5R2dJv6Cn7CgusdpX+8RMPLLm6kpIaoCtNS/azj5km8F3LIvlMhd/uiJANbH J3vNhgtnnHpi/3PWn8I4hvrszwHeIgA6J+oSmY1qiZd6rB1te29feE1ahduCd2+QLREYHv HlPlcyx3gVk7V8xKplrKeSGuSCSBpaNeVqP5hxuaAO4r4brryJJmcLAYl7N3MS4Au+Vr4Q i0wNEgrrqqX6mq11zvxEOA//Bz7mSkUUziwezrnad9+GHgzsukXu7GTE/+j7WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232110; a=rsa-sha256; cv=none; b=krDIppxcZ7nPOqJc5s0W3zHbnetNlpAuWyfEHyHbUcy2hbfI57sVtWm49qWpcC3JVrkjin /iGPpNSuRUYCLkcsFQGf603/aexCch5HmTz2qRKx9kK7o6Sx/rtCvN8Vf4m895fLp5uDrp fc0nC16dEjda+n6R2ZW5KigmTxfNCKBBp0f2eQwRaYZ7VkfPWI+tWc8c1/r35z9XcRMuVn gDJfSkQly8MWN6pWQn0KBVTHEw/+Iv4bYhvry4XxCp9sExnqrdnfRxxF6azsyPpMYa+s0w t+a8Jo6vzb5bHYR2+Q6j5fSEMjSHTGYMbtOnCGJLhkX6Iev432iAZcwCYFWg7w== 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=1782232110; 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=yxBfm/zX3JsofPnzkwLd6kVauP2xUkSH0BjTix6vQGE=; b=ejo/L9C9ph7Kl2axFf6oLdRnR+ODobjvebqiHC3ZfjZyFwOTKkaSydExBk8PWIzClWl+Jx d6ABJPmbr3Xjm7OUusBOQM+KAfMotPmm7BGhNI9m1gf1HscAdQ3tRHP+m+K69vYMid3rkB jDtg9nyy0URxYAASkxEAaTCd+DVjd4GsGgL3q0ZS8rZ4f9D+4sn1PGu/tkZVSLmyzmlcVE eCLoloeoiXPGIDm2B7FzJ+9CdVmmyc70QBk+mLXIXz+NQMLdCXcjqenXaaNmKCOw3hr2a2 4kUY0XRjEQfQcn5jxNJL8KXUDA8jyYb5Z6MTxzYTXJH8mdxsVWtnlRswQhU2+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VQ10ZLzhcJ for ; Tue, 23 Jun 2026 16:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a52 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 415d24137704 - stable/15 - ctld: Remove redundant call to conf::isns_schedule_update 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 415d241377042f22df15dde2fdd1fcb1b3eb095d Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:30 +0000 Message-Id: <6a3ab42e.24a52.33bb5a9e@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=415d241377042f22df15dde2fdd1fcb1b3eb095d commit 415d241377042f22df15dde2fdd1fcb1b3eb095d Author: John Baldwin AuthorDate: 2026-05-18 19:47:41 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 ctld: Remove redundant call to conf::isns_schedule_update This is already called at the end of conf::apply. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56530 (cherry picked from commit 4f90de0933218fd257300c6341abf157387f7641) --- usr.sbin/ctld/ctld.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 8aaec41e8487..627ecf8bba93 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -2740,8 +2740,6 @@ main(int argc, char **argv) pidfile.write(); - newconf->isns_schedule_update(); - for (;;) { main_loop(!daemonize); if (sighup_received) { From nobody Tue Jun 23 16:28:31 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 4gl9VR62N2z6hhXc for ; Tue, 23 Jun 2026 16:28:31 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VR395mz3NFq for ; Tue, 23 Jun 2026 16:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232111; 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=Onu//jxUA/IUNBSZiy9UQcb6FoZ0u8dtL8tc9LwMB+U=; b=M5ZAisbqVl7g5gxj1JZB04XXuhbg6y2CZRnzeEPFnR/0YDuwtCiwIAbKGGbSpSTEviXwGS +FjwUo04CMUDQN/K5IJIU8z4DsYhmdfjyGNyHNvaHl6g5rWDXM8IhskZ4pZfgWctnA1zZD 6GBs9jtJrDht6ph5XlLOss58u0qOzkNF9qD/EO/sQYmr5TyKVnDcw0jeXtwHbrQ+A5rIj3 61aTy2PePRkpScjerW+Q96K1q5NZpDt4E9Y+YbkOKudZJj4UEDLnvQKeek4nBMVnM7Mo7X XwCHHaCcqONFwCD+VcCHiZvyx75saFXDSrfrXaWy+GvlTuG54u/F9va+zgpwCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232111; a=rsa-sha256; cv=none; b=ipaKkZu7zjW31EKfysVfHHdQ8cZw1jD7rHrB6izMnh6/rqxHLjg2uU7KB1Q4TgA+DNE32j Ku34IR0fWNEOFqHd9RNxHns+/YNUV1mO2ZBFvxLo9coPPAcWZ+c7vo+WVAm4CUmrNjgpca X8hcDslbITlBo8mgtc/T6U+pRbDSNWAUkcwRz/BBPrdUtuCHhdWbqLoHMWPyzY+TilOT3e IXwdTtyVmu2aGKm0ZqUk6zlsG6pEf4w6ZZBxcQFqK9LOR6kyT+mGsEqQMhYtT3TXEm00wV k3IhZbYjEqXz0yjJw4j7EUSz5EMUC/dHVd99YycHq/9ms9n+G4vBtuJnZ/VnIg== 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=1782232111; 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=Onu//jxUA/IUNBSZiy9UQcb6FoZ0u8dtL8tc9LwMB+U=; b=U1cV1iEO+63qG2nrS7zHGupAYVX8XQ/bd4SA1WZ27Wq5wUcs9k2txvuM8thk0FQdC15VCv mgxKnH5XTigiIJ9uykYQ72pjCuMPbXNong6tGoOxu19mkaeUcKQXcb2J43xgw9oZz+A/We kqXmAmA3CQoZhbX5gfH+jduYWdlI+Ii7EzVPtfSZMwFkc2yT9n6HaTDSn6K5/5wB3Mec6O vRa7a0pWX02RKRmGE1AGq15cziiCymTE8J9xKapkXXf+uRysoUj0+XfaGy/WHOAuzUOpRr M7aE9xWpaZd64PHRhfU5X2pkNa7xxXveu1AlMzzwHvuB0WIeGHipYSsE8PYpLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VR1pLRzhpk for ; Tue, 23 Jun 2026 16:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 272ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: cafe7b072632 - stable/15 - ctld: Mark a few more isns_* methods in the conf class private 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cafe7b07263220b3eadc29914c0d238f7de7a865 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:31 +0000 Message-Id: <6a3ab42f.272ff.6d994964@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cafe7b07263220b3eadc29914c0d238f7de7a865 commit cafe7b07263220b3eadc29914c0d238f7de7a865 Author: John Baldwin AuthorDate: 2026-05-18 19:47:57 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 ctld: Mark a few more isns_* methods in the conf class private These are only invoked from other methods in the conf class. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56531 (cherry picked from commit 63d7b7fad2dd2343854c60f0da4ac46ef5b0d8b1) --- usr.sbin/ctld/ctld.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index 45590ada4111..d3b08dc12603 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -508,9 +508,6 @@ struct conf { void set_timeout(int timeout); bool add_isns(const char *addr); - void isns_register_targets(struct isns *isns, struct conf *oldconf); - void isns_deregister_targets(struct isns *isns); - void isns_schedule_update(); void isns_update(); int apply(struct conf *oldconf); @@ -523,6 +520,9 @@ private: struct isns_req isns_check_request(const char *hostname); struct isns_req isns_deregister_request(const char *hostname); void isns_check(struct isns *isns); + void isns_deregister_targets(struct isns *isns); + void isns_register_targets(struct isns *isns, struct conf *oldconf); + void isns_schedule_update(); std::string conf_pidfile_path; std::unordered_map> conf_luns; From nobody Tue Jun 23 16:28:32 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 4gl9VT0N62z6hhcq for ; Tue, 23 Jun 2026 16:28:33 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VS4Mxpz3NJb for ; Tue, 23 Jun 2026 16:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232112; 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=iORRsqzWnFNysglD6GqddQCy9SqHbaHpNxZNK7yj62U=; b=fo5hj8zNoGiIw+qJktXgRwcU0EFbtqc7SjMgtGyBDpgVmQIgojBtfsNmbmzXkCyMdlZaYE rCp9Jo7vDHy/F9JFjsAVVVi4Bn4trOAb9TAb42Xl6PuoKv1OStO/7nHgdxJoFSr9Yt+NTD WkdjktLFwcC8hOX/WcHTNIJxpPWyH5WH+mCDOQhW9QDSOpqRh5klrUirohknucJ+Fx9LwH nd6eAAssdvpeRQm5bWCEMK38J8v/d0lnFeb+K++t97tJqRH4OOPhcNohSqMz231woAs+gN Nic2kXLvT5zbnccCUoJEwr+roz+4cAuQAEPOp02lUuiBg1fKl6EHb78SGfEalw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232112; a=rsa-sha256; cv=none; b=Bp/gsUaY4l1H+Xari7geD89wxSNkqcWdvIj+43IV+p6XQlrZaQlTWvrecceV8gtWZnsNeX fUvsOQngLnjQ0Rkjqa3i/jxBnSKEuOntpshvauucxCppAZK4DHaqR0WYUuU3SlyA83LAGk anj5C6OEF/fJRPOecAEeXlkd7A9Xqjdp16TMp0JQtnGsGxIQdrJdjK32NktXoJAD1cyh2Y 5z5Rt2NHsnHbITQc0bIkZWqRaFcSes8HTmf6thlydFzW4IV/V7eZvXvh8nnjdbmuLlFP1U 4KTe4cpKt8LGYX/4XNiDk2ChxVej7ZXhKrIjdkrC6yzv2DygUrr6lL795/HVWA== 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=1782232112; 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=iORRsqzWnFNysglD6GqddQCy9SqHbaHpNxZNK7yj62U=; b=FHIZKUQVQuPt6miQag1rDpf4SZ/LfgHQ0R/sqLjxBsYojJpSiZvDdU62WHEAhElNMytp4Q A4sdq9AlZmV0rOL6H0bZDdi3DCq92d/Bnlxe/+900Z0iDTpfWDH+JjzHbPfYMUKgY5zBNM xRR/FZNHatzZu05LoCfG8t/lYZLdrkHNsU9JreZq7LTGbaB1R8IP3le1tgd9sukWn6p8v3 NapXHgACzJpIzPvnSTGwBnw4I6rtROSBECoDYq3iqw7V6uyjd+6wcpgovJfeGEUOMQyNNU UiKlMQWsYGZStVsjwmnqrA0lPg+vvS7vL6xK6f0QAKeaoiaS1zWnjKOK6Kk3CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VS2Zhlzhm9 for ; Tue, 23 Jun 2026 16:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ccf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c1a05ddfdcbc - stable/15 - ctld: Add a dedicated conf method for shutting down 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c1a05ddfdcbc7af62d63a8d8a14511187729e21e Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:32 +0000 Message-Id: <6a3ab430.26ccf.60cae983@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c1a05ddfdcbc7af62d63a8d8a14511187729e21e commit c1a05ddfdcbc7af62d63a8d8a14511187729e21e Author: John Baldwin AuthorDate: 2026-05-18 19:48:09 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 ctld: Add a dedicated conf method for shutting down Currently the main loop creates an empty config and applies it to force a shutdown of all of the existing configuration. While this is functional and does avoid duplicating some code, it is also a bit clunky and requires a special hack in the pidfile path handling in the conf::apply method. Instead, use a dedicated conf::shutdown method which tears down the CTL ports and LUNs and closes the sockets. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56532 (cherry picked from commit f1c5de5fab9d5cada11935418db11e19ebff7e34) --- usr.sbin/ctld/ctld.cc | 56 ++++++++++++++++++++++++++++++++++++--------------- usr.sbin/ctld/ctld.hh | 1 + 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 627ecf8bba93..24b02a936670 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1976,11 +1976,9 @@ conf::apply(struct conf *oldconf) /* * Rename the pidfile if the pathname changes. On startup, * oldconf created via conf_new_from_kernel will not contain a - * valid pidfile_path. On shutdown, the temporary newconf - * will not contain a valid pidfile_path. + * valid pidfile_path. */ - if (!oldconf->conf_pidfile_path.empty() && - !conf_pidfile_path.empty()) { + if (!oldconf->conf_pidfile_path.empty()) { if (oldconf->conf_pidfile_path != conf_pidfile_path) { /* pidfile has changed. rename it */ log_debugx("moving pidfile to %s", @@ -2210,6 +2208,41 @@ conf::apply(struct conf *oldconf) return (cumulated_error); } +void +conf::shutdown() +{ + /* Deregister from iSNS servers. */ + for (auto &kv : conf_isns) + isns_deregister_targets(&kv.second); + + /* Remove all ports. */ + for (const auto &kv : conf_ports) { + const std::string &name = kv.first; + port *port = kv.second.get(); + + if (port->is_dummy()) + continue; + log_debugx("removing port \"%s\"", name.c_str()); + if (!port->kernel_remove()) + log_warnx("failed to remove port %s", name.c_str()); + } + + /* Remove all LUNs. */ + for (const auto &kv : conf_luns) { + struct lun *lun = kv.second.get(); + + if (!lun->kernel_remove()) + log_warnx("failed to remove lun \"%s\", CTL lun %d", + lun->name(), lun->ctl_lun()); + } + + /* Close sockets on all portal groups. */ + for (auto &kv : conf_portal_groups) + kv.second->close_sockets(); + for (auto &kv : conf_transport_groups) + kv.second->close_sockets(); +} + bool timed_out(void) { @@ -2767,21 +2800,12 @@ main(int argc, char **argv) oldconf.reset(); } } else if (sigterm_received) { - log_debugx("exiting on signal; " - "reloading empty configuration"); + log_debugx("exiting on signal"); - log_debugx("removing CTL iSCSI ports " + log_debugx("removing CTL iSCSI and NVMeoF ports " "and terminating all connections"); - oldconf = std::move(newconf); - newconf = std::make_unique(); - if (debug > 0) - newconf->set_debug(debug); - error = newconf->apply(oldconf.get()); - if (error != 0) - log_warnx("failed to apply configuration"); - oldconf.reset(); - + newconf->shutdown(); log_warnx("exiting on signal"); return (0); } else { diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index d3b08dc12603..7ae033804157 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -513,6 +513,7 @@ struct conf { int apply(struct conf *oldconf); void delete_target_luns(struct lun *lun); bool reuse_portal_group_socket(struct portal &newp); + void shutdown(); bool verify(); private: From nobody Tue Jun 23 16:28:33 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 4gl9VV2lrVz6hhTt for ; Tue, 23 Jun 2026 16:28:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VT5vbwz3NPY for ; Tue, 23 Jun 2026 16:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232113; 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=5ov/+yjEjEBGN/VdO3+ttpL9rZR0XjM7DSu1rpaK0t8=; b=i2E9aPmNb6TPinLZoKhOXjF4MC84k3dWLL+A2Gn0whvK+RWmn3s7V/iS+iaVl9x+doUmEc cR61kT2MtuMNyskX/IRxq38L3xFJ6TyhDCEmpjsAOF5XsDP1jIEuZP2pgrZffBntFIjQxr QKnCEPGwWqU8poWyfEIsKTqzGdsRKf68fMyG3y7TETpggo9Matrval+Twp15oYCgLnr4fC X+oxlb2xpunUORMvqw2DChJ4MeMOzk6A01ABAtJhPSimL+Zn2xGT+qZ3CrHlk0X0+A4pU7 yk+QlEq0Py+6yONKdUxktYuuZT+frSdvaitikYLOnkYx8lRd6c4GqI1l0Ona0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232113; a=rsa-sha256; cv=none; b=BGhEP+NXxHMy9BvnlCkQ6gM5LsoQ2B4GulcSui1JDd8c1qn94yuIYyMgFhKrkBXBYXU9Nb fmQpx9UDSUNx84aMbwpHnYpRcGfjg1yvqrNthyU2cKHPXkuaUxwBMEuwj7gKPQE+Bei7eo Pc6+XjCIQ1vcSwfzxCmt7EU5f4ZlhIi6ypoKNzrvYfMPQaTwsOfajNEoRKqRR8XcucRGpD rgfMNW/Ym4pqm9DvdLTaU38yfKs4AWs4N/BD16Fme5iFz9GDvNpIgSxdWnHA4AIw9q2W3C STo+a4xUJ2jZ3aeiefohm4d4sDcQCasaRnAJMa8mMRxfE5+cT/rLezrPFo2f0A== 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=1782232113; 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=5ov/+yjEjEBGN/VdO3+ttpL9rZR0XjM7DSu1rpaK0t8=; b=dnNnpmmY15OQpclqJ1fAdBHRj7Xjq5vZpU8BBhICz6QLxFW/hZ1G+r6ybBk98a4LWEMGnO sX6alsJfNEejfvJF6mxRh45D+qBhNDse5WwX6olAliwcAFWoDGyXmfw/LiLBbWZVPJs/NM bCqQdnrxJv9VbEmYz3eG3Fl0X3MjvoHDdUaA6EDFG5YgIeWUpwsq4obYhDfmWGCrPjbuQj eyYB82QU0EJaEmztws5M55Xy2d25JhPwl8BFGPFCE2tOg9gB8hlWb130Hcdl5A466+RW95 AHQIlOuXIJBcz7jif8fDmRYn7q4ILm7MlXF044tyh2NWPB8oBKR83jKlOiSoYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VT3PRzzj36 for ; Tue, 23 Jun 2026 16:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26fa4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7e04dc80119f - stable/15 - ctld: Simplify pidfile rename handling in conf::apply 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7e04dc80119f8b7d9285291aab0fb9e56b0a857e Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:33 +0000 Message-Id: <6a3ab431.26fa4.23fff5b9@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7e04dc80119f8b7d9285291aab0fb9e56b0a857e commit 7e04dc80119f8b7d9285291aab0fb9e56b0a857e Author: John Baldwin AuthorDate: 2026-05-18 19:49:57 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 ctld: Simplify pidfile rename handling in conf::apply Explicitly copy the pidfile path from the initial configuration file to the kernel-derived configuration to avoid having to check if the old path is empty as a special case in conf::apply(). Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56533 (cherry picked from commit 9306d0449ba6fffadf08d5ab61aea596369e03f4) --- usr.sbin/ctld/ctld.cc | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 24b02a936670..9bdf15976911 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1973,22 +1973,14 @@ conf::apply(struct conf *oldconf) log_init(conf_debug); } - /* - * Rename the pidfile if the pathname changes. On startup, - * oldconf created via conf_new_from_kernel will not contain a - * valid pidfile_path. - */ - if (!oldconf->conf_pidfile_path.empty()) { - if (oldconf->conf_pidfile_path != conf_pidfile_path) { - /* pidfile has changed. rename it */ - log_debugx("moving pidfile to %s", + /* Rename the pidfile if the pathname changes. */ + if (oldconf->conf_pidfile_path != conf_pidfile_path) { + log_debugx("moving pidfile to %s", conf_pidfile_path.c_str()); + if (rename(oldconf->conf_pidfile_path.c_str(), + conf_pidfile_path.c_str()) != 0) { + log_err(1, "renaming pidfile %s -> %s", + oldconf->conf_pidfile_path.c_str(), conf_pidfile_path.c_str()); - if (rename(oldconf->conf_pidfile_path.c_str(), - conf_pidfile_path.c_str()) != 0) { - log_err(1, "renaming pidfile %s -> %s", - oldconf->conf_pidfile_path.c_str(), - conf_pidfile_path.c_str()); - } } } @@ -2748,6 +2740,9 @@ main(int argc, char **argv) newconf->set_debug(debug); } + /* Reuse the pidfile path from the configuration file. */ + oldconf->set_pidfile_path(newconf->pidfile_path()); + if (!newconf->add_pports(kports)) log_errx(1, "Error associating physical ports; exiting"); From nobody Tue Jun 23 16:28:35 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 4gl9VX3h69z6hhg8 for ; Tue, 23 Jun 2026 16:28:36 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VW5vWgz3N3Z for ; Tue, 23 Jun 2026 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232115; 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=wammWYllKZq0KdGfvQxk8GSmbsrMlG648QOpwYNESVw=; b=DLFrJSm2HJebIQK4kx2GLCowq2lgHBK9a4aMBh83e/sjU6a7Mi9W5Ct/ErzG7OMg8vKrAh hNHy1CtEiUw72uKAimGLYEwTX9fMK2fBL5KZt7tTGA4Wdpx1BX+96GFVuwmYH2/do/Ei+E 1l8XseJmrXKN+yiX1c6UXoS8+cvPr3pcvMS8G+6ZTBg7AtbpBs28whnbN3U6hz6VtMCkAv p85oshfkKSMAGrtcNlOgKvuSj1iTKaukVzxGWOWWSDUK8/wgeaw04TxHcYgWAGMqfZqZMY Z3y+xIP9XcANlwOcJq5wd938lr/sb3IFepgHNlKLFlcdsz1KMSB5YINh5vPRHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232115; a=rsa-sha256; cv=none; b=Z8N7al+1iLGxodhwYRN9LFfax5wecf81QQ/dy1kGbzLxpjDTDJnR/HS2Nj9ntslQ0F1hQm 64Ux0fMqlIvSO2o5rpmMUobYPKNN0P1cd0LRXqL90NmeIS0ffj6ZJm7nhBcc6r2yfro66G qYNuhOD0JqS/LCdkhhlp4pfvJzXOs9JOtuhT7qijMWPY9zbMekHDcjws8Spa8AoAEsyzNV NhEdSY46pjSO5MBiyaFg89+mMKXt9+OhRc0W6NGkWQDFMtkjVGJZ4lyBufkfS8Mi0AoXc4 D8RCoONDIHb0EPw21mkbJ/v47vkgeD33+Y+USg0MRhBQoLILg50QDXqkYeHsiA== 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=1782232115; 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=wammWYllKZq0KdGfvQxk8GSmbsrMlG648QOpwYNESVw=; b=lGSCw4pRmr/31piOfmS7XGnPQ0NsN3OYJq5SEDkAsEJK+TRGVvX3zv79E+Pp3BFYS4m8KK s2Ff+JtOcQSqX7xRX8lRWnseqRa6pJLgTwcw+GI0nk9B9NXxgb8C4PJDEBPgINYxB3PkWn hUNJ7KngJTWz0hxJm85tgwDep/zBmYxpzEraUxXf0DuekjnAYLOlzrMTiAN/GScScyzwCu ibFdN2YUeGQz9SsKlJIOjOi4y0ll5rO0BWwOW9kzUAW8BNd4d/Hr2v5sU9WP/3IqMq/X5D TIDyC1e7zCBhMUANJ4QmUO/Y8RAdFCn4uPlnzoPXkdCBfGl6FNg4zehmSq7cHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VW4j3Nzhpn for ; Tue, 23 Jun 2026 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2700a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alfredo Mazzinghi From: John Baldwin Subject: git: f62f0a16448c - stable/15 - arm64: Adjust the kernel stack pointer at the end of fork_trampoline 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f62f0a16448c34a4bc783a85b25b2142552796f2 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:35 +0000 Message-Id: <6a3ab433.2700a.4fdf4213@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f62f0a16448c34a4bc783a85b25b2142552796f2 commit f62f0a16448c34a4bc783a85b25b2142552796f2 Author: Alfredo Mazzinghi AuthorDate: 2026-04-22 23:46:14 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 arm64: Adjust the kernel stack pointer at the end of fork_trampoline All other paths that return from the kernel to userspace pop the user trapframe off of the kernel stack pointer before returning to userspace in restore_registers. fork_trampoline was missing this, so all of the user faults after fork pushed another trapframe leaving a trapframe's worth of wasted space on the kstack. This would be fatal after a future change to remove duplicate initialization of td_frame in cpu_fork() as without this fix each time a thread was recycled it would "lose" another trapframe's worth of space. Reviewed by: kib, andrew Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/23 (cherry picked from commit a1e07f21dc7458d85bd0d04c294f0389d4591666) --- sys/arm64/arm64/swtch.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index b3bf88135e57..0cc0d7462ae6 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -276,6 +276,8 @@ ENTRY(fork_trampoline) ldp x26, x27, [sp, #TF_X + 26 * 8] ldp x28, x29, [sp, #TF_X + 28 * 8] + add sp, sp, #(TF_SIZE) + /* * No need for interrupts reenabling since PSR * will be set to the desired value anyway. From nobody Tue Jun 23 16:28:34 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 4gl9VW1vSLz6hhhy for ; Tue, 23 Jun 2026 16:28:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VW0mPBz3NPn for ; Tue, 23 Jun 2026 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232115; 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=WDPN741aXnM1xM5iUVitjO3czOwiabP8J6oem1P38Ik=; b=NcR28cNhjgOm8HfVqdXTksmQj+2U9paiGWd38lxdWqf3WN6hv40opza1zceq4waD0zrXBR oPLJ9ceI8+2vmfWP/w6Kek8O8M5iM0kkyjAn+ztSl5tVA3yjP7AK3HvroL91fwyza/VT4H OdIaN6EzQxmjGfl8NHbbQIrgXbO7Kv6IJl+YRa/K4C7PFYNwxzZEvz4e62Io4avIjPRZap 0EF8Q2dx9KUgdodFJuVVyRo/vOW6yUz1wSXlrkfEYWJfoCxP7E6j43Kd0ISN9jNbrAIXpD d3BT7LqNc912HSFqFhOK7oD6mfZOi6NjhoBgbprfBpsUFOAljaZz0hFxbIDVjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232115; a=rsa-sha256; cv=none; b=pEzMEZAceLPr8wF50i/WnRCGImr1oa/DuI4pO1wESoxlYjgrmy7Za6mNCHuAsbmNHhNnsT dpNrc4a5x+ZYh5k7TKMniASDtKeytpE2G1uD74mwBZJ4QAb4SmIv5P9j2iF+cRq9gMYGvq yS+qMivRTeZkmCYSwNZtZU93srcKzbeZCjxQ0YkwCP6A0wmyXaRClHCiNuHM57qs4b1GrN 8iVf+FyYJ5eTCc0eYyYcZWuElZc2SLIb6VLjSucdd75OXXwi2w0zVfE5LWqCmHNvRL4pbV 9FRDlPiTpmCluZwv9ubfldp/lc7Xs8Fo+Hz6MGR1cCEqNOFCo68874NHjpspug== 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=1782232115; 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=WDPN741aXnM1xM5iUVitjO3czOwiabP8J6oem1P38Ik=; b=rjJB4/AJncTdz1LTKzD0fhNKJneA1a3QxiYFaZ14wLKMQx1FcE10dSZY36DIhswOCdRp+V p27Axz8RDhO+T+p2aVg9wx2AhPR6Jl4DdXlTXKKzi2EFvxc0wbfRqnn6M5YLrzxoNmngmd m4TR7aBpV2uU7qSiiTd2bKv545GPJP8Cevc0NHwuVRjdPHT+QLFZGVMahTHeTQgazF1kye nlFwNdXlwomXKpvqrzgIh4zE/Se9RNe8qHX9WTcPWLNubBjog/MQ4TZshzd/fBQBcVob4d iY7CAvs/S0kvzRWH56ALmh281Vs29dBzSYYW7/4amP9V4K4XmLumaOFTkmksjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VV4C4mzhcK for ; Tue, 23 Jun 2026 16:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b1a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a2b0b41910b8 - stable/15 - amd64: Drop segment descriptor details from trap messsages 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a2b0b41910b8bf4fbe5acf4d12be18faff29f50c Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:34 +0000 Message-Id: <6a3ab432.26b1a.601f79d@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b0b41910b8bf4fbe5acf4d12be18faff29f50c commit a2b0b41910b8bf4fbe5acf4d12be18faff29f50c Author: John Baldwin AuthorDate: 2026-05-26 17:27:40 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 amd64: Drop segment descriptor details from trap messsages Segment descriptor contents are fixed on amd64 and not very interesting compared to the other values that are displayed. While here, include both the thread and process details of the current thread and drop redundant output of the trap number. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56989 (cherry picked from commit 00b96a777845d9b558b2303cbef03ba5197b593a) --- sys/amd64/amd64/trap.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index fb18b7d06f9e..df9cc44bcbb2 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -944,13 +944,9 @@ trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) { int code; u_int type; - struct soft_segment_descriptor softseg; - struct user_segment_descriptor *gdt; code = frame->tf_err; type = frame->tf_trapno; - gdt = *PCPU_PTR(gdt); - sdtossd(&gdt[IDXSEL(frame->tf_cs)], &softseg); printf("\n%s trap %d: %s while in %s mode\n", type_str, type, type < nitems(trap_msg) ? trap_msg[type] : UNKNOWN, @@ -975,11 +971,6 @@ trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) frame->tf_rsp); printf("frame pointer = %#hx:%#lx\n", frame->tf_ss, frame->tf_rbp); - printf("code segment = base 0x%lx, limit 0x%lx, type 0x%x\n", - softseg.ssd_base, softseg.ssd_limit, softseg.ssd_type); - printf(" = DPL %d, pres %d, long %d, def32 %d, gran %d\n", - softseg.ssd_dpl, softseg.ssd_p, softseg.ssd_long, softseg.ssd_def32, - softseg.ssd_gran); printf("processor eflags = "); if (frame->tf_rflags & PSL_T) printf("trace trap, "); @@ -990,8 +981,9 @@ trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) if (frame->tf_rflags & PSL_RF) printf("resume, "); printf("IOPL = %ld\n", (frame->tf_rflags & PSL_IOPL) >> 12); - printf("current process = %d (%s)\n", - curproc->p_pid, curthread->td_name); + printf("current thread = %d/%d (%s/%s)\n", + curproc->p_pid, curthread->td_tid, curproc->p_comm, + curthread->td_name); printf("rdi: %016lx rsi: %016lx rdx: %016lx\n", frame->tf_rdi, frame->tf_rsi, frame->tf_rdx); @@ -1003,8 +995,6 @@ trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) frame->tf_r11, frame->tf_r12); printf("r13: %016lx r14: %016lx r15: %016lx\n", frame->tf_r13, frame->tf_r14, frame->tf_r15); - - printf("trap number = %d\n", type); } static void From nobody Tue Jun 23 16:28:36 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 4gl9VY25r3z6hhgL for ; Tue, 23 Jun 2026 16:28:37 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VX6hvcz3NVj for ; Tue, 23 Jun 2026 16:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232117; 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=RWrbGNBKrD4dSmc9eZFA0YKTvwMF9pbjpTc/oqgofYs=; b=hP1CtXR+6nMcFEP8MLt6htH1ogtaGeX8CwSujBt+Ef3oU1j8d7TWxx8EoMPdzeYsjFv2qk QKRu/4UNc/FnHVw0mvGaGnEtE0P8fy6YDuIpdt4NYibYyG5nsWIhcbiMf9I5v6y90BbubB ZdvRSkf4OI+WWBN6Q4280Wed1CQ1JYIFoi/LbNb2mPOh0cffrzAv7Ie1Vyn1WzL9E3AAQu 7mTEZQGRYUB7Op1Z6p0PRbiaNh45zFBXdUhAsFUibdFVOjey+HzRTKGJbRLFwmK1z5CaFa dUuhDQf0kG4j6w3HAmKwcKttrHM6+372xkEvjk+CjDeSMiuq+qPJ4f/9fF5GEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232117; a=rsa-sha256; cv=none; b=myb23FHWY5di2fLpZFZ/+IhPGWK3MfwsMLjLv8fdMJ3lZ7lklFGjYbY4rJTmD8qNHxzm5t 2kI6ADwTrlvqzg/Qrhlq1ddCXcMs3a1t8a2Qb+s2gv17HJohK08D64fSQtNkwnI/9LSgPs J0RexvLEqnNnuzyJQq/27a1D9LG7XRdBBeqLGZaxhmk6EW9QI+kmWLE2cl/3DBTOwHZUrA m7rYqosmkn+gEep75fbhgEtqCa/WghvKtapkY0HaZjBSHxwDvE4+NffljtAmXOq/Vd5nkT 4Xz9Xdaic1AKecSZGZ1khBNUzP755/69hAEwmAFVAlAc1/k0emdlhI7AyxuyBQ== 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=1782232117; 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=RWrbGNBKrD4dSmc9eZFA0YKTvwMF9pbjpTc/oqgofYs=; b=a0PS1wgfZjAdM9HUjGPMp4CydmAXODDgoUJL+99OXM/wUo1YJUat/CEQQXLpfBjBqmUlEl tH/7pIPIlRPzixS3nTIMI6fODtuPc6J47izXb0XgKgmoXbUefx88GhnxfkdpgdZcpyztsM Ss7KSJlXWwS8iXbD5VPlP7JxpDDPNOzAyZwm2/eRw/Nn07ggXnPJKGkUPMk6YlJbtKEJOc tpJPTsfb8qvr82Wqy2leIi2HzAVXZyc6bZKAFUOAC/s4sxA00cE1pG5hWRD/XY7R5Tij75 InSb4yP1Td7HgGjcS7DUiXgviBgWBcqu6kC+FXGU9OMihv0L2NPSxGeD9h1Prg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VX5VWYzhmC for ; Tue, 23 Jun 2026 16:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c9c0474ae40a - stable/15 - arm64: Remove unneeded declaration from 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c9c0474ae40a7dc68e19c3c6e53e557f2a97cfdf Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:36 +0000 Message-Id: <6a3ab434.25a5b.965cfda@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c9c0474ae40a7dc68e19c3c6e53e557f2a97cfdf commit c9c0474ae40a7dc68e19c3c6e53e557f2a97cfdf Author: John Baldwin AuthorDate: 2026-03-25 15:17:27 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 arm64: Remove unneeded declaration from Reviewed by: kib, andrew Sponsored by: AFRL, DARPA Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/23 (cherry picked from commit d01e5afbbf9bc879e570f59dddc147c0efa8b990) --- sys/arm64/include/pcpu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/arm64/include/pcpu.h b/sys/arm64/include/pcpu.h index 0d8246401193..45205a7b928e 100644 --- a/sys/arm64/include/pcpu.h +++ b/sys/arm64/include/pcpu.h @@ -54,7 +54,6 @@ struct debug_monitor_state; #ifdef _KERNEL -struct pcb; struct pcpu; static inline struct pcpu * From nobody Tue Jun 23 16:28:38 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 4gl9Vb2MVdz6hhXx for ; Tue, 23 Jun 2026 16:28:39 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Vb0NCTz3NKZ for ; Tue, 23 Jun 2026 16:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232119; 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=WYwRXs2qYph8GEGRJkxh+Mg7oAEIXQ84Z/pWQVsKIco=; b=wvBblMT/Vs7hHvU70LHpx7VZm0JF++tgwhD4/ROQPXR382OXzXdzYPheMaPZZYmU97em0e TpcVmg9JUHY2AUDVtg9i/mhLspCbY2CidS2OnV8vi3HVTamEGnb7KUOkiHwzk4R2W/uXja Rs80QWDNtfzMRx1xbnXXUBMSp/PZCewKaHLWt2ugaarV8dmibJJ+52ka14NEGpJmyYjXvK he1gQSAYTinF7VXrXWImtTnGRuSy4VJGhdZpB5QSv7ySgvSAkLLrIU4JKdLae9EU0nxmiS 7PLnjo0ZNW0Wv2DazMuqePO2NBuS8VXQKabqRLL+unpXm4Pu+i6E6yqQm6jR0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232119; a=rsa-sha256; cv=none; b=li9laPHoPK7ZEKrpECtvgjL3/QZ8revByTfR8xcQ9/4FP4PrMZ09nLiN3kPtMRsA7CODyL I/B8slX3+T6fJ0onY6WY1ovzn5PIExx7Jx86OHFl3xlkBigbrYVHY6UJOZs+5o9klZqKGi hR9lqmOdzVIGTXMm6hJoM3z+uwjpmkEzxaqrqouLy9dJM0jDJY2ycxZoeNBzSY0+45AhXx Ls0YVVZ1MECG9Gzu/EuFfdb04Uu7t2I//GtHANhj1O1x7lYge3AblsE+wYuNonHxCH0+T/ b4/JtK7mjcsqs48SoS34mZL+98+mqQR4q5ufxSnlGf1mfDfhUjLmhmrRt2Zk9A== 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=1782232119; 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=WYwRXs2qYph8GEGRJkxh+Mg7oAEIXQ84Z/pWQVsKIco=; b=WnuRkjTRJAma/dy/64ZDjG7Qf0jAnRsXtdNIn+3637cZPhHxe0IsL5AHQAk28ZgOrAvapk XIcg3r5Iim3/4QsWl1qu9sMeWrTttpHrh8qiEzifR+O++Qpo7eyl/FDteAl36679Pi4aqf qpSpqVyvhcqpNP0M81SOMjtkVfq/sJCXdf/plgd045Ug3IGXDFBAszgmPTLC73nRogBE+A qYYvnHQ+pea7WGc4R+7W9gWjZ0qEb38aN8WKr3kPY5X6pYC3Dm9J4fapC1G3xe/hxk7WW8 PeYBu7LUroN/XqN5HhxPvnsw9faa0Ud5xFUxPShuVDH5WYL6TNM2LSDQNi9JkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VZ6WQZzhmF for ; Tue, 23 Jun 2026 16:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d344b9a58613 - stable/15 - arm64 locore: Fix a comment typo: Of -> If 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d344b9a5861365f12f7a444a60530ec22311a913 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:38 +0000 Message-Id: <6a3ab436.26e20.157514c7@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d344b9a5861365f12f7a444a60530ec22311a913 commit d344b9a5861365f12f7a444a60530ec22311a913 Author: John Baldwin AuthorDate: 2026-03-26 13:03:51 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 arm64 locore: Fix a comment typo: Of -> If Reviewed by: kib, andrew Sponsored by: AFRL, DARPA Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/23 (cherry picked from commit fce595344c51850a7113430c77e70c8777383a98) --- sys/arm64/arm64/swtch.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 0cc0d7462ae6..af2c278baecf 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -75,7 +75,7 @@ * void cpu_throw(struct thread *old, struct thread *new) */ ENTRY(cpu_throw) - /* Of old == NULL skip disabling stepping */ + /* If old == NULL skip disabling stepping */ cbz x0, 1f /* If we were single stepping, disable it */ From nobody Tue Jun 23 16:28:37 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 4gl9VZ2cffz6hhgN for ; Tue, 23 Jun 2026 16:28:38 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VZ04Frz3NVs for ; Tue, 23 Jun 2026 16:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232118; 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=A0IZwWpPP2G0yH+ydKwuJgOn84YVv8jrTxt4PaBRht4=; b=PMijD1YowVtpgaZem0WxxwXaCeJr9q6OPm6QlEzMWaP/2DGFU8uwvbDXQ7lzQB047wZ28h soUyJuuT15/rhakM7DFNSYmDP0TkCMUH6hQTPRtqyuyosKh0CsCaPSHokufOybTN6vxkY2 2f8E6hLUHQ+NHwhsTohdRuVQ3KhQcmW1Rp9LmNNDWc2R7IaXGhBHWnjQb8r2An0dYLjJ0g QrqBGl38P03XfcnK5rCesbOJ7APtX5MZbnDojTN0YcxNY3W8U/Nv7fE1kl2h+MKb/1bR1C nDuj3G2EMoUEYJynxqC5mJIy43mKyVf37VPUwdQHmLlo1bxJ2Sz7I0HGcGUlBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232118; a=rsa-sha256; cv=none; b=Wd2O6J7dror1Cjyr3cUX4psEWZkkMDZSafNE1PC1qdEyPgMzooaVACT3C/LipjPr2IrbpS a5wg+YUzglyGnKesYYm0kb5qlirbBP4KPtYj0Diak4gA2JjYApUNy21j2mtOiSkv6mq5lk lz9jjdGMsK/6hOymg39zOeA7QEBv/v9Cz48hrq9FlD95qJQ9jG7mESq/DfcGpp97JOLirF D3SvgrgUDzPYEq56mjdKhgz1/CwxMDa+Dluq1Nr3J+bfAczPEEryJkw7zX3zbdckKn5x3X u+8g+pN9qG0lk41a23n9L/3BXzpixuZ3EjkYkkYeSgwfJf7PBue8o0+zCFAZFg== 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=1782232118; 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=A0IZwWpPP2G0yH+ydKwuJgOn84YVv8jrTxt4PaBRht4=; b=Wg+vag2TSnuiOyEUJppTNRmuZxn5tvo3d24qFYy1a5HGLDMy3ZY/Mut/F9xOAFGH6E179U Y/qmY7YS+rOEl9MFFPSQ/nMCxbgMNVMgZkvOoTMwl8DQ6HWNVXMEoGRaC8vbVk30u4F75W I0iiEhWlsHoXQRn5qjTbrtRToD6LtgsdTBtLXBPwCEng6kPBLneW0xCsiG+eiHoHigBFvp fY7Vp536NZv3RfOgIzpjoGVOLftwvJwtFN9IaNG85aY3dZI2M7i/b2M6/EtocVpuiEfpha yCgLSZXf4gAz91r8VdjDg81lg+wOUNB65n5AJRpAbWXDv6i4JntHI3aO4vBMWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VY63jKzhP1 for ; Tue, 23 Jun 2026 16:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26cd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a9269dc77d59 - stable/15 - amd64: Don't set an initial FPU state save size 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a9269dc77d594927f270a01b3b6d83cca1536e89 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:37 +0000 Message-Id: <6a3ab435.26cd3.66186ca3@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a9269dc77d594927f270a01b3b6d83cca1536e89 commit a9269dc77d594927f270a01b3b6d83cca1536e89 Author: John Baldwin AuthorDate: 2026-03-26 17:09:59 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 amd64: Don't set an initial FPU state save size This used to be needed to initialize the pcb pointer when the pcb was allocated on the kstack. Reviewed by: kib Sponsored by: AFRL, DARPA Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/23 (cherry picked from commit 860aaecf1bb659d8cc6023aaa2d27273823faa75) --- sys/amd64/amd64/machdep.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 64bffe2777ce..0c12007e1f74 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1529,7 +1529,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) * We initialize the PCB pointer early so that exception * handlers will work. */ - cpu_max_ext_state_size = sizeof(struct savefpu); set_top_of_stack_td(&thread0); thread0.td_pcb = get_pcb_td(&thread0); From nobody Tue Jun 23 16:28:39 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 4gl9Vc3Wpcz6hhRB for ; Tue, 23 Jun 2026 16:28:40 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Vc15mhz3NQt for ; Tue, 23 Jun 2026 16:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232120; 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=3fmkLeUbhU92zZp2F+6M91TkiZcBG9uroNe7ADqoiwQ=; b=fUqDKafsAv3zbftCOZDGSeKWIcZ+v9LnqBqUMTL5A6mlsLJ9dQlUNPA7tAxHZ7mNOa18Vk 96dM4gNKrdNEQrO54rzGxcweBMFN3gVo4oDXnAEdJzZek+XCb4G1K8UDfC9evHC2JZoenG +xs/H6i0RFU+iElPQakTykkw1NrNu6W7+67rjcL+KfTz3e6E6nQtuuy3x3UBaB6s9y6uGA xxPUeIflRkl6QthOGZ2cFBbxPNEU4VN97ggI8QRKhi67Qp8uDCy+CyIyxenJQzwmphmNWO n82gnBWJ0VAHYuYGd1rnoeTirY+Mz4yXWh8+La67EH2o9J7Iu8nUFcQw8OGzuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232120; a=rsa-sha256; cv=none; b=h61Io3BF+fju9mCCyTBv8u1c3MkKcZsrtF9A/H2+KSgZjSaFI3fgwfX1t5RwczaqYICVIo STSdnm/LLcCCu0fn1dsmTwz6naRQJJu2xWMa2bZVPh9UNfv5P9drXkUPR4BryYE3YUiq86 SOu55poMNELSIiIYHbiCkh7ggUkUY6bJ9QSZChcFFuWuAq9TOyX2NudDdiq+BMVa9GWimy Shz9SV3O2h1CSQI6tAkDCxsrjvmmcrflt7uYjptJKaFAytmg2X35NWgrEGZw4ByFKIyJOe lCMyNAycTKbsLgiiZaWWcc6ouWEOlbHef8OcxcZsUvM1XuCOgw8wlnNM/Xg/7A== 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=1782232120; 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=3fmkLeUbhU92zZp2F+6M91TkiZcBG9uroNe7ADqoiwQ=; b=r9VDPrZteGLMjOFBaEQxdDRxcz0wHXH+nxOqdKAmtM22ByCIpJfoohXQLw//IieqirXbsT gn+KsIhLd29YcUUhPH9HS1K2w/JTiu/4ibOGKsFeyf3hvOmsO+5NlKPzcFhnLiBLzqh9Ht DDHCjk6YWva2yNBiQvadZekWlorzDM8Q+wtBrfDh47mdbO86w060LaJyPFW6hnblGN7gsF aT9NMXO/kvarV5w3MdQIX+eyh9J1/TIerp2sLhChAlQbdsQMgB+QZte9uAbRmSRpmoAg0U jJ1dP8K+Mvn1r08HZFANGC+5NOjkg+U1w5EbLnKtCY1r3HaC8t8ONIMQi6PLFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Vb71sxzhpq for ; Tue, 23 Jun 2026 16:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d0f6c4ba5a13 - stable/15 - ctld: Don't ignore pp/vp values of kernel ports with pp == 0 but vp != 0 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d0f6c4ba5a132089021b6a0dabf3c129afaba4d5 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:39 +0000 Message-Id: <6a3ab437.26e24.55621222@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d0f6c4ba5a132089021b6a0dabf3c129afaba4d5 commit d0f6c4ba5a132089021b6a0dabf3c129afaba4d5 Author: John Baldwin AuthorDate: 2026-05-27 20:56:39 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 ctld: Don't ignore pp/vp values of kernel ports with pp == 0 but vp != 0 Fixes: c6f1e9b8a412 ("ctld: Simplify XML parsing memory management") Sponsored by: Chelsio Communications (cherry picked from commit 7a436d378951bedbdaa71d45bf236fb001323549) --- usr.sbin/ctld/kernel.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index d1210079ca1a..111c98e5026a 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -549,7 +549,7 @@ conf_new_from_kernel(struct kports &kports) continue; std::string name = port.port_name; - if (port.pp != 0) { + if (port.pp != 0 || port.vp != 0) { name += "/" + std::to_string(port.pp); if (port.vp != 0) name += "/" + std::to_string(port.vp); From nobody Tue Jun 23 16:28:41 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 4gl9Vf16yTz6hhr6 for ; Tue, 23 Jun 2026 16:28:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Vd1xWxz3NR1 for ; Tue, 23 Jun 2026 16:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232121; 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=nz3HcNvW/pqstXKjKwaaGyX3YA2F9fvdJ1URgTCkYsQ=; b=Z3NVlJStf0YDL4y3Leu3uHYGMYIHuHdgGWgetqK7GubAadFMVzrYjyEhFPK2i/xIdY8ETl b1AFmP1sSXapSfysfffNPkbdzBiJX6ZmlWF2pREPyZ2qAKR1GEY8k4XI0uIzMKXujSDRNK 2Bk6P3EGFBJZSTmYpHeTmOvWiZPAYhr1FEq8BO3KGrWbw7SRPRTT+yYkRgmLoYScdxfutb ggTROnwevnoGz54CNqg5ZIXaI9193z5Wm+lcHNPYaO+5N7gpjiJjzfjmX5GIJPJtYUw8cg rD6JFJ0nGpCLxE1jYV5WXivNqbJC01AFP4i+z3c/SrOE6Ft7TK91oWAxRNklYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232121; a=rsa-sha256; cv=none; b=Og5+TfmrhMjKqFq0SIbfoqmpBh/P4jLi2rNPLEIu4Iyn3/7zTmdLERaggl5fPqdHo0zS9N v34vJ0JvTXqfUOQnVB7UYQIpTLOeNSzXwSL+wlCNEoxbfgN6QuifUMZyBRPWyQXrXQa0WM OgN4t7TCw3bo1pSUC6xBggPF4g5rn+Ap98BSejLXhXXHR0ACZ0lLf/v2lJ2hlKJDgbq8PB z965MCiAd16dHZ9hBmeF3BGOzZ5uTSwjKQVquQRp74MzcksZJVqbtTnyUgWjnhlEo86eUu 2qasqhBqgepN4XhGhiNblPCYTBO+ZFfHRxWjoY0BizMNJeXSK0ULSf8Wx4992w== 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=1782232121; 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=nz3HcNvW/pqstXKjKwaaGyX3YA2F9fvdJ1URgTCkYsQ=; b=Qy/10WTveDPPy4JC591gCpHu9wdhrK8NaLZ6i5qUwpPGMTrWRtwaIY43NQ8CbyeBKIyunw me4EjR9Kc+wLF3JqKNa0uhLBo/oaBB1F6pSdZ6aT2Qb0XvCakHQDVSBfy0+63fg3B8V5xZ Y+xHrv7Nv7oWFo7b3/8uXs+R4SCW39iugclefBD/iYKUxrEwwJfZMqVo388nGebdVsqRBS I9EMxddhSlNeAmxm7H99npUMwDBYQl7q+2UCMt9w/kpz/apirIaTN2iPeS8/6bubLzLKUm W0vjbHqv4wkFVVEtL1L2g4Ead6DkNfbHAbmna4P1HXTJUa6UtMqB2KdK8M1WOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Vd0gpYzj39 for ; Tue, 23 Jun 2026 16:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9de84611ea16 - stable/15 - ctld: Refactor ioctl port handling 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9de84611ea16bd0873564a9f0f5cca9b92def53d Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:41 +0000 Message-Id: <6a3ab439.26e28.bbbead5@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9de84611ea16bd0873564a9f0f5cca9b92def53d commit 9de84611ea16bd0873564a9f0f5cca9b92def53d Author: John Baldwin AuthorDate: 2026-05-27 20:57:23 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 ctld: Refactor ioctl port handling - Normalize ioctl port names when the port name is first added to the configuration. This can catch potential duplicate port names sooner and helps with other parts of this change. - When recognizing existing ioctl ports, always expand the name to include the physical and virtual port numbers. This permits binding ioctl/0/0 or ioctl/1/0 to a target, for example. - When adding physical ports to a target, first check for an existing kernel port to reuse. This handles both ioctl and non-ioctl ports and removes the need for the conf::add_port method for ioctl ports to check in kports. - If an existing kport isn't found when adding physical ports, check to see if the port name is an ioctl port. If so, call conf::add_port to add an ioctl port. This add_port method overload is now simpler as it always creates a new port. NB: The kernel_port class handles CTL ports that already existed before ctld started including existing ioctl ports, whereas the ioctl_port class handles ioctl ports that are created and completely managed by ctld. This was true before this change but is perhaps more obvious after this change. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D57092 (cherry picked from commit caef3c50ac067ca751ba4950f310821a521ebf57) --- usr.sbin/ctld/ctld.cc | 80 ++++++++++++++++++++++++++++++------------------- usr.sbin/ctld/ctld.hh | 2 +- usr.sbin/ctld/kernel.cc | 5 +++- 3 files changed, 54 insertions(+), 33 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 9bdf15976911..8b99bde14911 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1180,16 +1180,8 @@ conf::add_port(struct target *target, struct pport *pp) } bool -conf::add_port(struct kports &kports, struct target *target, int pp, int vp) +conf::add_port(struct target *target, const std::string &pname, int pp, int vp) { - struct pport *pport; - - std::string pname = freebsd::stringf("ioctl/%d/%d", pp, vp); - - pport = kports.find_port(pname); - if (pport != NULL) - return (add_port(target, pport)); - std::string name = pname + "-" + target->name(); const auto &pair = conf_ports.try_emplace(name, std::make_unique(target, pp, vp)); @@ -1387,6 +1379,19 @@ target::set_auth_type(const char *type) bool target::add_physical_port(std::string_view pport) { + /* Normalize ioctl port names. */ + std::string pname; + if (pport.compare(0, strlen("ioctl/"), "ioctl/") == 0) { + int ret, pp, vp; + + pname = std::string(pport); + ret = sscanf(pname.c_str(), "ioctl/%d/%d", &pp, &vp); + if (ret == 2) { + pname = freebsd::stringf("ioctl/%d/%d", pp, vp); + pport = pname; + } + } + for (const auto &s : t_pports) { if (s == pport) { log_warnx("duplicate physical port \"%s\" for target " @@ -2643,35 +2648,48 @@ conf::add_pports(struct kports &kports) struct target *targ = kv.second.get(); for (const auto &pport : targ->pports()) { - ret = sscanf(pport.c_str(), "ioctl/%d/%d", &i_pp, - &i_vp); - if (ret > 0) { - if (!add_port(kports, targ, i_pp, i_vp)) { - log_warnx("can't create new ioctl port " - "for %s", targ->label()); + /* + * If this port is already present in the + * kernel, reuse the existing port. + */ + pp = kports.find_port(pport); + if (pp != nullptr) { + if (pp->linked()) { + log_warnx("can't link port \"%s\" to " + "%s, port already linked to some " + "target", pport.c_str(), + targ->label()); return (false); } + if (!add_port(targ, pp)) { + log_warnx( + "can't link port \"%s\" to %s", + pport.c_str(), targ->label()); + return (false); + } continue; } - pp = kports.find_port(pport); - if (pp == NULL) { - log_warnx("unknown port \"%s\" for %s", - pport.c_str(), targ->label()); - return (false); - } - if (pp->linked()) { - log_warnx("can't link port \"%s\" to %s, " - "port already linked to some target", - pport.c_str(), targ->label()); - return (false); - } - if (!add_port(targ, pp)) { - log_warnx("can't link port \"%s\" to %s", - pport.c_str(), targ->label()); - return (false); + /* + * If this port is an ioctl port, create a new + * port. + */ + ret = sscanf(pport.c_str(), "ioctl/%d/%d", &i_pp, + &i_vp); + if (ret == 2) { + if (!add_port(targ, pport, i_pp, i_vp)) { + log_warnx("can't create new port %s " + "for %s", pport.c_str(), + targ->label()); + return (false); + } + continue; } + + log_warnx("unknown port \"%s\" for %s", + pport.c_str(), targ->label()); + return (false); } } return (true); diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index 7ae033804157..8d63de06dd80 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -487,7 +487,7 @@ struct conf { bool add_port(struct target *target, struct portal_group *pg, uint32_t ctl_port); bool add_port(struct target *target, struct pport *pp); - bool add_port(struct kports &kports, struct target *target, int pp, + bool add_port(struct target *target, const std::string &pname, int pp, int vp); bool add_pports(struct kports &kports); diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index 111c98e5026a..ef7ef87af090 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -549,7 +549,10 @@ conf_new_from_kernel(struct kports &kports) continue; std::string name = port.port_name; - if (port.pp != 0 || port.vp != 0) { + if (port.port_frontend == "ioctl") + name += "/" + std::to_string(port.pp) + "/" + + std::to_string(port.vp); + else if (port.pp != 0 || port.vp != 0) { name += "/" + std::to_string(port.pp); if (port.vp != 0) name += "/" + std::to_string(port.vp); From nobody Tue Jun 23 16:28:42 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 4gl9Vf5nZJz6hhRR for ; Tue, 23 Jun 2026 16:28:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Vf2z8Yz3NL1 for ; Tue, 23 Jun 2026 16:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232122; 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=Me6GzAgV+62R9M8p3ao6orguXk7VI3wGrWLj1oo1glY=; b=nrGB7loi3PTFaOkSlSQZKOJ1efAF9GJgsfnqeM6VYPNkXqQFxWoFJSupW8L8otAQCIK7sa slIOzNaUJToIRfbwNJhfxoQBxn1HDpmzfzUM2Srez/iilSvC7aHgZGprSJgMEUDd1xMkqs Ii73PkTjCThTiotFHJwLnT3rZoERRgLXnrmN0w+tYv/BkAnrnxwr2SXn7iV3CXep3eYw4f MX6LAVyIN7BSu+E30hmrl28VlNWPYSb3wYS2pTQ996/EkT5oI6mM5WtvIk2mzXz93O2Mm2 xnC5lmbrnT+FjoneFnZKONVyBpy3gkMk+W5eT8GnWm2nuAdeFue4ZJduomy0HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232122; a=rsa-sha256; cv=none; b=T7be7lMUmFYZxV3M8GeRus08gySYF+xC/cnGm103H57FZIRQldDB2zPEedQn+eUnlUR373 RqoQsWUZCeFiW1Ts1ZsXUXsDEUms8qh3gcP8FkuuY76JqwsnSw8RK6LtWMAfnJufGOxF4d D6TlbFxSzq1lUm4k/1sDKtbU2fSUiEUDDPPyrnU3vAMOdeSqCdVZnfqV00MaR7eYFwvewP Fedmew0vKhOsKcCha94X4IWOeVLtf89b9s+pjIHaVT54UXrSxdxqqLt4VugIMJxeEagdI1 nsBCnyigoayRv6z1wn7Yf5ttfHMIH6R72p306kixXfcXfqO5fJtbLhRtIRS0Yg== 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=1782232122; 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=Me6GzAgV+62R9M8p3ao6orguXk7VI3wGrWLj1oo1glY=; b=OkdxafbObOpTbLZkkNjSMHzbUdNGYefiTX9K7N0ljaZMRJWmewqtvkWeDNn/xqMv9+9BVK QJr6Gf9ninmk5vfEj2olAdU5qx1gjpAzKkJ3xGa0Ldilf9utptKsupKVEXmXSQUnTIaBau SrIv631QEgzq95yFaEc7HNqy5vPYBXP6q35sImvR8876SYDOntXwIqSmPi1GlggaXZq6UZ Ipa1d9bKGVRAP9Ot8Tu9Nio3+PMPwVDSe8wZE99BAJlKcK5DiCALc8+uqCot89zBVWym41 3Jsq7JxZKOD67OiBOvI1zmB+K/nfviO7JRxgE+l2bZs4UPwt4UpXoqKKBgInLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Vf1WC8zhrh for ; Tue, 23 Jun 2026 16:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26cd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: cb2d8649148f - stable/15 - ctld: Only check physical port linking in a single configuration context 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cb2d8649148f451ac7fc6f45870cd7d5aa78736a Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:42 +0000 Message-Id: <6a3ab43a.26cd7.632ebb9c@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2d8649148f451ac7fc6f45870cd7d5aa78736a commit cb2d8649148f451ac7fc6f45870cd7d5aa78736a Author: John Baldwin AuthorDate: 2026-05-27 20:57:38 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 ctld: Only check physical port linking in a single configuration context Commit 969876fcee57 moved struct pport from being per-configuration to being a "global" object shared across multiple configurations. As a result, the check for duplicate ports actually spanned across configurations, such that reloading a configuration would now think that existing physical ports were already linked. The linking field in pport added in the C++-ification (commit 6acc7afa34aa) faithfully replicated this bug (albeit simpler as I had noticed that the TAILQ links weren't used after the earlier commit). To restore the desired behavior, remove the linking field from struct pport entirely and use a local unordered_map in conf::add_pports which tracks if a given pport is claimed by more than one target. PR: 293076 Reported by: Ken J. Thomson Fixes: 969876fcee57 ("ctld: parse config file independently of getting kernel info") Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D57093 (cherry picked from commit d1a8fa2e0f415f941e628f959fa0e70f23058fdb) --- usr.sbin/ctld/ctld.cc | 12 +++++++----- usr.sbin/ctld/ctld.hh | 4 ---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 8b99bde14911..834bef4ef363 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1175,7 +1175,6 @@ conf::add_port(struct target *target, struct pport *pp) return (false); } - pp->link(); return (true); } @@ -2641,6 +2640,7 @@ conf_new_from_file(const char *path, bool ucl) bool conf::add_pports(struct kports &kports) { + std::unordered_map linked_ports; struct pport *pp; int ret, i_pp, i_vp; @@ -2654,11 +2654,13 @@ conf::add_pports(struct kports &kports) */ pp = kports.find_port(pport); if (pp != nullptr) { - if (pp->linked()) { + const auto &pair = linked_ports.try_emplace(pp, + targ); + if (!pair.second) { log_warnx("can't link port \"%s\" to " - "%s, port already linked to some " - "target", pport.c_str(), - targ->label()); + "%s, port already linked to %s", + pport.c_str(), targ->label(), + pair.first->second->label()); return (false); } diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index 8d63de06dd80..3bc92449e372 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -567,13 +567,9 @@ struct pport { const char *name() const { return pp_name.c_str(); } uint32_t ctl_port() const { return pp_ctl_port; } - bool linked() const { return pp_linked; } - void link() { pp_linked = true; } - private: std::string pp_name; uint32_t pp_ctl_port; - bool pp_linked = false; }; struct kports { From nobody Tue Jun 23 16:28:43 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 4gl9Vg64v8z6hhp0 for ; Tue, 23 Jun 2026 16:28:43 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Vg42ctz3NX8 for ; Tue, 23 Jun 2026 16:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232123; 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=eETjBApSUeAOxDMClGH+96tGvbBI+1nGYZUJkwU10eY=; b=ETRGWhplTP4uUV2e8QX3wIQX7yecVmScNyTvBRi8QoVBnszxpwewlTkXZ4mkWUaWO0uHir ofEfShCjKhRj5X9dyk2Jg8suo3lju9PpA8KcvWB+qsiUKa0Pj2Aw7APJ1W7le1ypawgfjv w0amiD4A0JGmUhaGEI1+M5l8OjsvGbpcr+fa6xq+zaMCD+C9IYWCm9dbyxcnIVj/AKa+c9 IMPwIY5emSJnNLCfLTlPXNxC9o/vO+0oiUeRWRvWpRS5mot93QYAE/o+6mVY7Qqt4lUpAy Y8Vc0RqpdHtVVSCDS9r+AyvUDO75c96PEWfBNa6yO46cIYPjXJovQgfX7Igbtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232123; a=rsa-sha256; cv=none; b=oNi7w5krk+L0bgqL4zEir1GYEQ/uQqbT8pGbom7tlLbsD3xg0JAMIv1QL4bmVUNr0XLOJw yLzdCJSpbLkMO3sol1PxbQJUep+JdkK7Uq8ed5D/NXPaqCz6iq4WqdV1o6qFVYGtYiL+5Z v00bgC9FhyB6OpaC3Jae91RHEWdbdfTiARZcZdl5+XHJGXhWEhAx0KXmX+Cou72LtMdgbM 87jRN4R2o42XMu7U+oj2ZqOt9XD/axdUbtRmARdPgrB+UFPm/iBIEp3Ef1GLKsXpnjysF1 yvPNqmnM4Q0WfEdvmNK/+drDcFS7nwUqhCxQOJzyjx0Ad4IKDfSSpTd/buOzOg== 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=1782232123; 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=eETjBApSUeAOxDMClGH+96tGvbBI+1nGYZUJkwU10eY=; b=XVfClPZd1Op/iNmn7mITDEL8MCfVt+JnyPaVn6Q6VdefH6aKCluRxtRvojGmHEgLNxm8Bh JY+m9oL9jeCAIibqt7LzpzVoM/hndAxbYPjBBqebY2sDSwvjx8pK7cTO++nWia7hYZ0dPy Q5B1dAM96HEnvdbvSQKKlVQPCSCGlKI5rWMfVaAA4ngK3WvPfhH2B6h8web8clpC1ZVpWW nSpcTUhVnQjxxewWyEyRhuBrflBMDUbIfGwRcrhyPsymR0KD1+2eIJsv5BWS+pWtrRygcH HrCRThxr5jiZoyJzWyBtEwXekvlH1pNOI56odjpsjydu2KfSAbJcmPaE6xfMqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Vg2JNPzj5R for ; Tue, 23 Jun 2026 16:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27821 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e61edb9eff06 - stable/15 - ctl: Use CAM_PRIORITY_NORMAL for queued CCBs 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e61edb9eff065c2ec0c94e03f696e90c8454faa6 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:43 +0000 Message-Id: <6a3ab43b.27821.479b17b9@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e61edb9eff065c2ec0c94e03f696e90c8454faa6 commit e61edb9eff065c2ec0c94e03f696e90c8454faa6 Author: John Baldwin AuthorDate: 2026-05-27 20:58:05 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:32 +0000 ctl: Use CAM_PRIORITY_NORMAL for queued CCBs Previously this was using CAM_PRIORITY_NONE which tripped over the assertion added in b4b166b8c46b8. PR: 293076 Reported by: Ken J. Thomson Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56995 (cherry picked from commit 887841731be60a958e471b9fd79261169b67b7ad) --- sys/cam/ctl/scsi_ctl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c index 68f1cabf6d07..6a55aba2669b 100644 --- a/sys/cam/ctl/scsi_ctl.c +++ b/sys/cam/ctl/scsi_ctl.c @@ -522,7 +522,8 @@ ctlferegister(struct cam_periph *periph, void *arg) new_ccb->ccb_h.io_ptr = new_io; LIST_INSERT_HEAD(&softc->atio_list, &new_ccb->ccb_h, periph_links.le); - xpt_setup_ccb(&new_ccb->ccb_h, periph->path, CAM_PRIORITY_NONE); + xpt_setup_ccb(&new_ccb->ccb_h, periph->path, + CAM_PRIORITY_NORMAL); new_ccb->ccb_h.func_code = XPT_ACCEPT_TARGET_IO; new_ccb->ccb_h.cbfcnp = ctlfedone; new_ccb->ccb_h.flags |= CAM_UNLOCKED; @@ -569,7 +570,8 @@ ctlferegister(struct cam_periph *periph, void *arg) new_ccb->ccb_h.io_ptr = new_io; LIST_INSERT_HEAD(&softc->inot_list, &new_ccb->ccb_h, periph_links.le); - xpt_setup_ccb(&new_ccb->ccb_h, periph->path, CAM_PRIORITY_NONE); + xpt_setup_ccb(&new_ccb->ccb_h, periph->path, + CAM_PRIORITY_NORMAL); new_ccb->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY; new_ccb->ccb_h.cbfcnp = ctlfedone; new_ccb->ccb_h.flags |= CAM_UNLOCKED; @@ -1003,7 +1005,7 @@ ctlfe_requeue_ccb(struct cam_periph *periph, union ccb *ccb, int unlock) * target/lun. Reset the target and LUN fields back to the wildcard * values before we send them back down to the SIM. */ - xpt_setup_ccb_flags(&ccb->ccb_h, periph->path, CAM_PRIORITY_NONE, + xpt_setup_ccb_flags(&ccb->ccb_h, periph->path, CAM_PRIORITY_NORMAL, ccb->ccb_h.flags); xpt_action(ccb); From nobody Tue Jun 23 19:11:30 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 4glF6V6sQ2z6hwxT for ; Tue, 23 Jun 2026 19:11:30 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glF6V6GY3z3xVY for ; Tue, 23 Jun 2026 19:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782241890; 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=f5XD+Aqhu9+UO0EXbF6XCd5DZ12zqELEug92IsHA7d0=; b=yJ/8L7qIEH5v/KhYOo8IcmK3PiQSgn3Pgsi6Hu0tSV7dAz0qm46N8rw/NSBnp2sgR41Ch7 osZwVeFkKANCPs2OrbCJQuLlkiLdmj1fIU+xz4xc4mfPZBpHPFpOYRT4uU+gWkDDBaP9Hs RT74fbWszTxpEmdl0PynAUGOa12AJkJqGxD+Z0rbNqy1kRV56S07vsZYoz3qaSGrJZsAdj Dbw8zXWXoXXyg7smYeLP1DtTgtb3zcYYBFnw7IVfcwRPh3y7XzOsqjTu/1SKk9T7YbzDpe 5LUIwy0mDdIYKRP7ZtLbUOEFpTEhkec1FB4awJa+RFrU2Am4M/Ihx7yLVUg2zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782241890; a=rsa-sha256; cv=none; b=eBLBcWC6C/86Q8YPFtrvJPAeRV9Y65AJzM41R7GKjHDIP69A7ZPE+EMVxZwBDVou3Skc5S gadbY0KbDIYi6Mmi4hD+C/F+/J0YHCrG9s8XzfOXBPcL8feVgLVS+ppIiOYav57uFQ0nJm KqhkilkLLNw7zAHurAATPTRLvBFdUtlRBlgaqHoA09dlypALaxg9Efe9WHOGNNRLmgTfCz 5gkJRHDnzupgv0OtOjU7apz3k01vjvSvHdlySKiePkIK9cmKibknmV7cetOzZ6rpttqvRt ovmEetcOtX/49Ziq2kcVf82SAV6DBV/PGiIFZrwZ0UadRB7XqfvGzs1nThbFAg== 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=1782241890; 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=f5XD+Aqhu9+UO0EXbF6XCd5DZ12zqELEug92IsHA7d0=; b=n9d5Fam4oh+o8IsJdbY/5qAjyLPh7aYI0kLoqx9x3zpJwN8BrPpe903jMH0zv+mzuMqtbT jlGMAMw6nSFLHikrM82a4HuDppZdEpewOwfaticBRg5S5iLlPzI9lnSV8rk1hMkeXS7tBK pHqY/OkAiOe1RYL3n0fb/xx4irmaA8Q2BPI+FMNNebKT+ndjHgao5OC8f+HVrJGgeIYZQk 34jFTI5fuNHmzApXe6YL4wH2P0wiaWnRHHs4xhYSSJL9QJQPAdOvEzagOgic42hNHMuYab 3LVJ9aXY0oNqOqBvYDgtVdW5WxDccR/ONZkwa60gx35YCaUMntiwyx+Mr8Lz1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glF6V5DMlzn8M for ; Tue, 23 Jun 2026 19:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40691 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 19:11:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d9df9b4d2aff - stable/14 - ctl_ioctl_frontend: Reject out-of-range initiator IDs 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9df9b4d2aff2643e79903feae640b3575afb201 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 19:11:30 +0000 Message-Id: <6a3ada62.40691.25dba15a@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d9df9b4d2aff2643e79903feae640b3575afb201 commit d9df9b4d2aff2643e79903feae640b3575afb201 Author: John Baldwin AuthorDate: 2026-05-02 16:43:29 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:06:19 +0000 ctl_ioctl_frontend: Reject out-of-range initiator IDs Various places in CTL assume that initiator IDs are not larger than CTL_MAX_INIT_PER_PORT. Other IDs such as lun IDs are validated in places such as ctl_scsiio_precheck, but initiator IDs submitted by userland were not previously validated. PR: 291059 Reported by: Hans Rosenfeld Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56628 (cherry picked from commit 6f8312bdff236ad64d1c15c239051359d8245a68) --- sys/cam/ctl/ctl_frontend_ioctl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c index a93f6cd5a4c5..9ba0580283c7 100644 --- a/sys/cam/ctl/ctl_frontend_ioctl.c +++ b/sys/cam/ctl/ctl_frontend_ioctl.c @@ -589,7 +589,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td) { struct cfi_port *cfi; - union ctl_io *io; + union ctl_io *io, *user_io; void *pool_tmp, *sc_tmp; int retval = 0; @@ -607,6 +607,11 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, if ((cfi->port.status & CTL_PORT_STATUS_ONLINE) == 0) return (EPERM); + /* Reject out-of-range initiator IDs. */ + user_io = (void *)addr; + if (user_io->io_hdr.nexus.initid >= CTL_MAX_INIT_PER_PORT) + return (EINVAL); + io = ctl_alloc_io(cfi->port.ctl_pool_ref); /* @@ -615,7 +620,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, */ pool_tmp = io->io_hdr.pool; sc_tmp = CTL_SOFTC(io); - memcpy(io, (void *)addr, sizeof(*io)); + memcpy(io, user_io, sizeof(*io)); io->io_hdr.pool = pool_tmp; CTL_SOFTC(io) = sc_tmp; TAILQ_INIT(&io->io_hdr.blocked_queue); @@ -637,7 +642,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, retval = cfi_submit_wait(io); if (retval == 0) - memcpy((void *)addr, io, sizeof(*io)); + memcpy(user_io, io, sizeof(*io)); ctl_free_io(io); return (retval); From nobody Tue Jun 23 19:11:31 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 4glF6X13M1z6hx0g for ; Tue, 23 Jun 2026 19:11:32 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glF6X0FTpz3xQY for ; Tue, 23 Jun 2026 19:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782241892; 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=DxTaEM00tmbhwuSYbge4sG/AWujqFGYgSPMMWT7WJK4=; b=AHJAfOZJTXFv4tGaZDR88n42JVDZxDv0uoUp0iJ3cWAX3HwueQ5YwMuSLp0LEF4XTTyRbJ 0xir/lqbdOsZzIyr1nnv1gvaHlGfULe6nyB9pa9WaCXQjyKGweKOllhgprcZTUGn0NDPFR VvjBxpugcAuCr2UsdFB2r8/1wptAvNmJewNDRY66O2t9QPQRWnboXrxJjuWSb7iULgpBia 8xE+3Rx0Y1xsNHNLTm3MjFLQtceJ/YDRLKSVuEyFTdqi02Zk+wfy8Puung3jaSqxuE079H LGvYKHe81yXEgCul3PPFu/Uu7lTWO2oup3EqQ2F93IyT+iJ32zar03/X4ISB/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782241892; a=rsa-sha256; cv=none; b=nBpQop8cr9KDpbBFrgY2zKXx7kmnoIN7V5qbJfTNraZpe56cmn9e9VwxFMWORR+RgsitZn Yk83t0sMK/GVI2bdjYNXVWmBd8QZeHDT5SCeky2tfBt9bFnoo9Ipm+HJVa9dEOGpGhrDmx zJdY+lxafnZmNlJoKnXyoSTe96Pequbjui4x6h9onSe2bZ6YD3eb4DgZdCYIS3kb6NHgkl V6SosAVrEVAmcCPt+rmmXOV2kWTeBthZE6Ck6HErsrVDwRg+ifcCbVyqmlZP2jHtaWRWed wxHIljSQi387RHm5jwDLcdCdglaqq+63HLgFrUuflhbm6o38BJ9cSoIXjB7Vyw== 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=1782241892; 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=DxTaEM00tmbhwuSYbge4sG/AWujqFGYgSPMMWT7WJK4=; b=xehybcwGV6ddQYoebQB08QuHHWfK500HhrFhKGTSiy91ob9pmqvrlIhwfBw/cJCQ+a9xf7 0osXiwRHpm+trw+Buijw5OTtv/9lNodQohVUq1ppJLVmLczxcYSpmFaGtcXKvGVMAGomj4 0rBjo+d1Lwwj5XPv8XzgPzer343+40YoHUMitQlfeG4ZF3s0XE/8RIgcgo6dYhKYraIXMB fwtXOe/bQ1398C/oNo91KVpNy13ytGImYSZmdGrhKW6gyCZ7IgMf7XpltpA0DNzK3Dvgwn bvej0aenUN+7hiRt/qvsFYn9i5tEib/sTjOyAhWpxU8c/tpFKODIEzSTmSmU1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glF6W5y72znDv for ; Tue, 23 Jun 2026 19:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e869 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 19:11:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9d1baa1a87b0 - stable/14 - kobj: Assert class passed to kobj_init_static is compiled 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d1baa1a87b070ff96ac01866635a01c5c7bc5ec Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 19:11:31 +0000 Message-Id: <6a3ada63.3e869.7a636250@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9d1baa1a87b070ff96ac01866635a01c5c7bc5ec commit 9d1baa1a87b070ff96ac01866635a01c5c7bc5ec Author: John Baldwin AuthorDate: 2026-05-06 20:53:46 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:06:45 +0000 kobj: Assert class passed to kobj_init_static is compiled Inspired by discussion in https://github.com/freebsd/freebsd-src/pull/2016 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56624 (cherry picked from commit 5a6e5954d14b589bcba0125d10a6c7b62b588f4b) --- sys/kern/subr_kobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index 6569816d2ff0..38459f08b625 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -318,6 +318,8 @@ void kobj_init_static(kobj_t obj, kobj_class_t cls) { + KASSERT(cls->ops != NULL, + ("%s: class %p is not compiled", __func__, cls)); KASSERT(kobj_mutex_inited == 0, ("%s: only supported during early cycles", __func__)); From nobody Tue Jun 23 19:11:32 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 4glF6Y2BdQz6hx0m for ; Tue, 23 Jun 2026 19:11:33 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glF6Y0Z0Wz3xKf for ; Tue, 23 Jun 2026 19:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782241893; 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=khhhi+Q45PlsVOMBhU7NwMtEwd4sKnY6jrq8DR8fGCE=; b=oWn1ZaBFHYE+wsHEuaWhe3a25zcok7eyv1zJgLRnsntijaoYHyQ94p8WuoKAucshTVMl1c P08QO38iiLu7W9tAp80Emwto3ZJcvahhLdPgHXn3FOlxyc7oaLuENFN3f9zhMpwk2N9iXU ggL3moPIJI0n6PCr9kLYdCr/E08irbzEoyvaEKfg4/O+aw0CJhdCypemL9RSllQdGYuejN JUjZq3VsU7nyFXzeFLdV+J4BQ/PXdmVJcBS4xL6Xx18VdZCDo314nSN2aOtJZlG4FgxRkd qtsVJV7UrwrOaoyILCFNxFg5aAMR+Z0WKRbmKOMRqsVfckI/StIV6+CaXl4A9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782241893; a=rsa-sha256; cv=none; b=AFR1NTA0zsmDDMHAk3NPj5HUd8c6RIvcNkbFEKASkr4KLaa3Xc8XIQi9ao4sfheMWwkRaD zJjVmFcInS1RLZbHEoV27Qk1qMblq1xPXTFBXFvlIRyMz2zxixmQAVOZmSsXAyfr+S9cOK UpMNiXvCt4B5G6ryXmw5C6asocOahxLRwfZBrxqEbNRCh9646C4co8hoMqRoEFQmzJSlNL yHREhjhod2P8Pp1G73l1RYDF04jZnxtKL5eogjOz14lo+h0CvdW5AKAMPW8g+YdSeVyZbF fBE/wLDl1ZKt7YoR4kZFo3LzDfIcZFFKzLGA8ImKUvasJobVrPrhOMlxfXc+Ow== 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=1782241893; 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=khhhi+Q45PlsVOMBhU7NwMtEwd4sKnY6jrq8DR8fGCE=; b=S80mPayJYl+Uaw/clSupd6zldWXxCletFXw9QpYr9HM6fdzXzJjOf3Yfe7pBZvBd4Q/EFz VLdZIotD8asC04xo3yPt4IpMTe2JO6MI4EIEUi2crXF+X0n6UPe4KKONA8aOTLW2WcOvNt YfISJst+LamAMlIvl78gCecFgCREiJ7WmrArNBalny0P0spMDZvgnTHScVF9GpTWdBzCnX grWh4YZYmyPjPPjZRK1lqfpCFzVQS9RZRha26aeUMShtvcbr2F9yzs8LD1aekmhz4zGrng yWPoIQva6tZcsg9qFapB/f4Yvn4N4+VntfBkOKJN8TQ3ERpkiyDlBD3+Aje3Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glF6X6W1FznDw for ; Tue, 23 Jun 2026 19:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40063 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 19:11:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1b0efaa6c626 - stable/14 - kobj: Use M_WAITOK in kobj_init 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b0efaa6c6260a1f43cba768fac9c84a865e815f Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 19:11:32 +0000 Message-Id: <6a3ada64.40063.1a29faa@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0efaa6c6260a1f43cba768fac9c84a865e815f commit 1b0efaa6c6260a1f43cba768fac9c84a865e815f Author: John Baldwin AuthorDate: 2026-05-06 20:53:46 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:06:55 +0000 kobj: Use M_WAITOK in kobj_init Blocking allocation is safe in all of the current callers of kobj_init (most of them do a M_WAITOK malloc of the structure passed as the first argument to kobj_init just before calling it). kobj_init doesn't return an error code but instead panics if the nested malloc in kobj_class_compile1 fails, so using M_WAITOK here is more robust. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56625 (cherry picked from commit 5df7dae10dc02ade8639b0171e0d3cc8db790e41) --- sys/kern/subr_kobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index 38459f08b625..e2649d916577 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -309,7 +309,7 @@ kobj_init(kobj_t obj, kobj_class_t cls) { int error; - error = kobj_init1(obj, cls, M_NOWAIT); + error = kobj_init1(obj, cls, M_WAITOK); if (error != 0) panic("kobj_init1 failed: error %d", error); } From nobody Tue Jun 23 19:11:33 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 4glF6Z3hPwz6hwkV for ; Tue, 23 Jun 2026 19:11:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glF6Z16hZz3xT7 for ; Tue, 23 Jun 2026 19:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782241894; 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=GH4RKs+81mcDxl0o95cTN+w6V6VhWyFW0CGL5pXNO5o=; b=s0gNm8mP89C0d+jEocoygqJkIy41po0MFlN4MgjhJl7pHPTN2iKiTRJMkdR2W8K5Aw7Rsd VRi3GlU/nTnMvUBpFY0IwXYmO9U9s2avSxmZ5gbRR3TI6cmeiBC2UaRGNhLpsaVZgulHuc /ud3gjGbrqjajkBn9K0795ZDrRj6ZthoGLjnq9FyAtnDrjRVKa7O0vbUfjRX9DTVP1d3+f izV+Uw/M2p901BixnfnFqVDqhnnB8+clq+yQW1uBcmAsYHL9BVAZXT5nOUlSNG38Htd0cm ToPXU9y51tV/NPCf5x9i6YoEjbdKxKJAKWeHwLVVyUycp8duCv4bibZpHLIJ9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782241894; a=rsa-sha256; cv=none; b=tmPDpQnihooPwd3hlk0q/1vAA+LIRmmuOm2YARQyG8Oq1tIcNYq6zVOsbOT7U1q9TmQT55 Kli3FPfPpK8ciEA2v+7rTuUzZvISCjr6103be5c8s4CQzGEdMBZ7mkzdD5St8nLbravmQw kRj6E+aVAxZbSiYr9ZxsJQXophJVlsa/b7BBKUxK3mDnKSAmZSMAGbZM/vrIrVExcBA7kQ 0ldPDOoBlO5SMcgfh6nbo3yf9eIRgLNkSfD2cJQisI78LEksM6EABLE5YFWj67f1ZU7Fll fk1CLIH3eiG0umIu9COQU1LSDUHWJi0K9cmu+xhASOyvL52h5Q2q9cz1Pp1WRA== 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=1782241894; 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=GH4RKs+81mcDxl0o95cTN+w6V6VhWyFW0CGL5pXNO5o=; b=xTK1GppqUR6/O2auWTpRskQNsNMzI8Z5lZVCYOyaKl+7EB7we/Zghe4IHOHQA/bfttAzMO P+7k4LG/ih6FRqpVVtnm4cBVQ500PqpWcThfmHfd0KbRC83DE2oGLS23mlURm91QvdtS5c O5NcKcrtbQaQemWPJdG2q/u7FzQRMF/sx4rUqJ/yINPUaaCNgDTvA7+DS+UCLSip7ENXPq ye+4MIrpJHGa6EOijcEYaQVuM51dOgiUAeW1t4O0rRMsY1wohTqdhzTJEJPHRfl64wVdfH q8AFBp16c81V/BUzvLkgAPOqGFsnDcNaZ0sl0baClkPt4mJiVrekAC+T4/uBiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glF6Y72g7zn8N for ; Tue, 23 Jun 2026 19:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 19:11:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b925c93c7859 - stable/14 - mandoc: Updating FreeBSD thead library descriptions 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b925c93c78596b6ec0bbf99cb56e14404798fd68 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 19:11:33 +0000 Message-Id: <6a3ada65.3ef54.57ca9cae@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b925c93c78596b6ec0bbf99cb56e14404798fd68 commit b925c93c78596b6ec0bbf99cb56e14404798fd68 Author: John Baldwin AuthorDate: 2026-05-13 16:33:29 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:07:25 +0000 mandoc: Updating FreeBSD thead library descriptions Remove libkse as it has been obsolete for many years and drop 1:1 from description of libthr. Reviewed by: brooks Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D56850 (cherry picked from commit 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0) --- contrib/mandoc/lib.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in index 6b17aab5b27b..9a39c1c12927 100644 --- a/contrib/mandoc/lib.in +++ b/contrib/mandoc/lib.in @@ -74,7 +74,6 @@ LINE("libisns", "Internet Storage Name Service Library (libisns, \\-lisns)") LINE("libjail", "Jail Library (libjail, \\-ljail)") LINE("libkcore", "Kernel Memory Core Access Library (libkcore, \\-lkcore)") LINE("libkiconv", "Kernel-side iconv Library (libkiconv, \\-lkiconv)") -LINE("libkse", "N:M Threading Library (libkse, \\-lkse)") LINE("libkvm", "Kernel Data Access Library (libkvm, \\-lkvm)") LINE("libm", "Math Library (libm, \\-lm)") LINE("libm68k", "m68k Architecture Library (libm68k, \\-lm68k)") @@ -125,7 +124,7 @@ LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)") -LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)") +LINE("libthr", "Threading Library (libthr, \\-lthr)") LINE("libufs", "UFS File System Access Library (libufs, \\-lufs)") LINE("libugidfw", "File System Firewall Interface Library (libugidfw, \\-lugidfw)") LINE("libulog", "User Login Record Library (libulog, \\-lulog)") From nobody Tue Jun 23 19:11:35 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 4glF6b4NtTz6hwkb for ; Tue, 23 Jun 2026 19:11:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glF6b29Qjz3xVj for ; Tue, 23 Jun 2026 19:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782241895; 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=FYnIGVGCjoVNsKBccjrQSqrcwdkKSYLXUYdpNx+Bhao=; b=mF9wESSoXOvSr1qQH86w6CovVZ2MQ5MG78lU+dQpQbsLaYPE+vhvpgmd69gphnvCPWxn/G GvI+BHAn3MwLTD/DDMR6vS3Y6ihkgsFbHsP1cMEuxmxWR2dNqBYDCrGpuAj2AD0pkuJOWg P8q9O+1wtlRUSdN0UX5KZdQGkdTL3F+cjuUfHVG1vml6ov9HpMRRGDFPx9I9RETXAxnMcb q8iJ+CuOTWCLEfniVRBCPOsPmiXDLR02GyS/DaeeRLhii5rFuXpEMWs4ei1baX5Tsm4Efp TT+zfIAJMxomr92J3Mcx1IOPichSSkUuhv0A13Ep0QSotW1uao6HBUhnXK0eyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782241895; a=rsa-sha256; cv=none; b=WDqRHG9JiWNgfmNXtYWJbOmAi7HAXNn7DJCVWJ+AQbiTPRR5EvMzB399kxgnFIBdXpok5d HdCYSA/aJ1LkxsYWW34f/qKnaMgmMGvL1M4+JYIMMhE//3dnaO/2FJPfFf/RrvDcbMDb15 2aK1BbL8E1GNoj7L/yX5710gjB6tsSdfRCa6w1JxxK73wEric6MsV6vgZ/glZ398QxhUtS YPb2jxKRqAXl8lUTvZasTSc8l/2i1p3Ru0i5jTTQk4OTRIjTxoSGf7gAUU8qGSOutgfGNc pWHIVaz95rvuMgO3WWMP3JPjMCNXjovLwxeId5EdHiuTHsDjGg4EsfiZf9DoeA== 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=1782241895; 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=FYnIGVGCjoVNsKBccjrQSqrcwdkKSYLXUYdpNx+Bhao=; b=J/lUZNnKvHTBexoVd86C2/cDqk1CAT/1Em39NA60MU2iMoUvqgR+YUhFoSeTa0SJcEIX9C ulcHTGGuRN0Ba43putg5d8p00Reh6wDI9ezMHcpPDghord62OcHKYFF/Rzg5Do6XVbuqjQ 6toNRMk8qfI3d4a1lsibyoSpLf6f1BJOFQPYzfk8B196vH6DT9m8czLlHqyVGpDgazyy7w anuHPx+HAQSCehnB4yFGePIAoADFpvJtzy7cpexvJbyz8EXl7QnOaJK8oMv3nBtbQmCNcj A/sJH9iuZjIYMFYyCsowWRiCBpuApkk0h24zJzNX4TLf/w/oZfDYCjk7gZWG8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glF6b0kmNzmMw for ; Tue, 23 Jun 2026 19:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40b8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 19:11:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 10f33a860388 - stable/14 - LinuxKPI: Check the devclass of the parent device in dev_is_pci 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10f33a86038833df9971471960423105325e33f2 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 19:11:35 +0000 Message-Id: <6a3ada67.40b8c.200dbbae@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=10f33a86038833df9971471960423105325e33f2 commit 10f33a86038833df9971471960423105325e33f2 Author: John Baldwin AuthorDate: 2026-05-18 18:44:00 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:08:31 +0000 LinuxKPI: Check the devclass of the parent device in dev_is_pci Reviewed by: bz Fixes: c41d83548b6c ("LinuxKPI: pci.h add more defines and functions") Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D57066 (cherry picked from commit 6a043d0814a29e756f5d26e7b59a360e1d6dfa45) --- sys/compat/linuxkpi/common/include/linux/pci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 381ad65febe5..247057f0fedf 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -384,8 +384,8 @@ int _lkpi_pci_enable_msi_range(struct pci_dev *pdev, int minvec, int maxvec); static inline bool dev_is_pci(struct device *dev) { - - return (device_get_devclass(dev->bsddev) == devclass_find("pci")); + return (device_get_devclass(device_get_parent(dev->bsddev)) == + devclass_find("pci")); } static inline uint16_t From nobody Tue Jun 23 19:11:36 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 4glF6c5XlNz6hwbt for ; Tue, 23 Jun 2026 19:11:36 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glF6c2n1Dz3xNM for ; Tue, 23 Jun 2026 19:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782241896; 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=ituqlzkag3Wseaj1nSQFeZFoIlY84j7foA8r3VWF4YM=; b=A6QP859u4dWHOkUd+TBa/Fygt2mr636O53qHMK2JBRC41DxqDG2UNkcoftxbmJ8KEI59Qj pZRHEbjawOMz798dTgSbObrRNo55mqmkU11E0NCsxEgY2tr1Wl1onzwXBVMceEhEO6ZdPF 7CLp4rv7rd5MBn3jE0yVOIi8CowSXL5HXzbI3Uo+M30G+SPv6CHysVevJDkkOONsfFZZFE suRD65Cpw/PlObYsAjQ/ljF5RXrwlH7RN545KtkDi7vVwMI131PdqNrIhsPI4WusyvPgPj fHNxNaugWzta0Ahar31niO10FS2m3Ad2JJucaXlWf0aLpbezt0Jv1DRLv8j+EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782241896; a=rsa-sha256; cv=none; b=C2iqake0JsnV9DXURpqkwQi8vxktC4eLoyu7wIVYZ1Z+0kujJjxjjEgAPXVdHkjNfT1SBS yzgL2JHidM9tFH1f1eMm5w4PCY8k/07ZkItwIf8zYmN36DL57kfQ3pXZJ9Z1suiqkzQdj7 a4unR2kp3IvmdjgG7ls46Q+sRIOkpehS4r+hSKF+9oQ2eJvEi7VAjyLaVgtxRD+zhuU+7M 5f1I/rS35GVuZ6O13nfrYNr0jJb4X8NCExYW0YLAP1aTK54TYDyVCDxGrcn0XwGSOTTPFv UHYyDwiWbKrZYUvnUrv7jcGst7caeGq/qIg1Qy7fv2/76OLvJg2s0vS99OzOVw== 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=1782241896; 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=ituqlzkag3Wseaj1nSQFeZFoIlY84j7foA8r3VWF4YM=; b=AQmz4jXSxARyYnLe0j5CZcPACtVM1yFci6Q63EY4F6kAUr7Qz/11gD9Nq5Z/Z4ajNuk9KW MPfQ9kjbGeiIo9mUwnWRWso4l3BLvSc+z8hXeUQyXZ17j16dZTlF3Pe/fPafZw3XjYMoPV C3AKD9pREEN/9KdF2g38wr/16EdgT05Geu54ZIivxzyFjYf9RLrdVkUuROYVEshO4x/FR2 V17aVsWL4dunHkq5u+1O0gujUwVXHPD8NgU9i/yhOkXXaT1WClcYlP9I7Q0PTvSVPFkQYK j2hk/KFM+LYuofmxQxpTDITwXkaInHl4sta1vE/C/HvnODi3RKzDmCRPdYOxqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glF6c1Yx0znDx for ; Tue, 23 Jun 2026 19:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fefe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 19:11:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0603a7459fc1 - stable/14 - pci: Add is_pci_device helper function 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0603a7459fc1d04a0415af37fd5f45c2ef3f13dc Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 19:11:36 +0000 Message-Id: <6a3ada68.3fefe.1c75b4e5@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0603a7459fc1d04a0415af37fd5f45c2ef3f13dc commit 0603a7459fc1d04a0415af37fd5f45c2ef3f13dc Author: John Baldwin AuthorDate: 2026-05-18 18:50:39 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:08:58 +0000 pci: Add is_pci_device helper function This returns true if a given device is a PCI device (child of a PCI bus). Reviewed by: bz, kib Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56996 (cherry picked from commit ffcf5e356644252f2f6c89ba01057af45c216559) --- share/man/man9/Makefile | 3 ++- share/man/man9/pci.9 | 11 ++++++++++- sys/dev/pci/pci.c | 11 +++++++++++ sys/dev/pci/pcivar.h | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index a0af571a4e9b..4e275e3099e9 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1782,7 +1782,8 @@ MLINKS+=osd.9 osd_call.9 \ osd.9 osd_set_reserved.9 MLINKS+=panic.9 vpanic.9 \ panic.9 KERNEL_PANICKED.9 -MLINKS+=pci.9 pci_alloc_msi.9 \ +MLINKS+=pci.9 is_pci_device.9 \ + pci.9 pci_alloc_msi.9 \ pci.9 pci_alloc_msix.9 \ pci.9 pci_clear_pme.9 \ pci.9 pci_disable_busmaster.9 \ diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index b01b51683b4f..3aacda94eaca 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -23,11 +23,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 27, 2025 +.Dd May 18, 2026 .Dt PCI 9 .Os .Sh NAME .Nm pci , +.Nm is_pci_device , .Nm pci_alloc_msi , .Nm pci_alloc_msix , .Nm pci_clear_pme , @@ -80,6 +81,8 @@ .In sys/bus.h .In dev/pci/pcireg.h .In dev/pci/pcivar.h +.Ft bool +.Fn is_pci_device "device_t dev" .Ft int .Fn pci_alloc_msi "device_t dev" "int *count" .Ft int @@ -202,6 +205,12 @@ device information, device configuration, and message signaled interrupts. +.Pp +The +.Fn is_pci_device +function can be used to determine if +.Fa dev +is a PCI device. .Ss Raw Configuration Access The .Fn pci_read_config diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 58fdbe1703f1..bf9797784362 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -6995,6 +6995,17 @@ pci_print_faulted_dev(void) } } +bool +is_pci_device(device_t dev) +{ + devclass_t pci_class; + + if (device_get_parent(dev) == NULL) + return (false); + pci_class = devclass_find("pci"); + return (device_get_devclass(device_get_parent(dev)) == pci_class); +} + #ifdef DDB DB_SHOW_COMMAND_FLAGS(pcierr, pci_print_faulted_dev_db, DB_CMD_MEMSAFE) { diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index c69f2b1e09bd..9f8ca069af88 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -663,6 +663,7 @@ pci_child_added(device_t dev) return (PCI_CHILD_ADDED(device_get_parent(dev), dev)); } +bool is_pci_device(device_t dev); device_t pci_find_bsf(uint8_t, uint8_t, uint8_t); device_t pci_find_dbsf(uint32_t, uint8_t, uint8_t, uint8_t); device_t pci_find_device(uint16_t, uint16_t); From nobody Tue Jun 23 20:53:06 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 4glHMl2jmhz6j5xh for ; Tue, 23 Jun 2026 20:53:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glHMk63kfz3HVw for ; Tue, 23 Jun 2026 20:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782247986; 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=p8Uj6txK7SQeGeF7gQ+wi801CZFUMOQ5b6em0t+qw8o=; b=uMWzNXDK3L8M2etsbrh79pHhf4vDElV/vDJ8FrZQpN9Eij6u16FdyRQ8QnsgGSmA8J9XzJ H5G/FiOr3uIR3CNIYSGZ3THnOSkPmNNqqFed/n5dbHPmUaTKKBkDoWwuTK8d+wkemcVCLg HK0jQTKwBPVJVIBHfllG+uLWzehgLNdFWdRndByJvSFwI74vdyuM8hQL8pM0NdOH/raj+Q UyTYJnDmVm8hjREYlsIZ0c310p3fDULPnYXeeSjxnyLJwHb7Ruo31zJIEnhbq5rcV1osT4 ac38gqAYZxTTgUj1BAMez8Vpr8SWfBeM2nV0skX8A4U//8dUZYe9nftKR+25sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782247986; a=rsa-sha256; cv=none; b=hD22pO+yAAZhc3LI2unWbN2G1URhcaZcZuxhkuo7E5AGY/AtrYMclqUehXBeI9BxuNuP+X h4GerzKFGatfnr8M8LUWmjbvftnJCL3c24eps63IlIJZku9jG8L537pa95eJb6GsXHEwTC RZHBc8clNcytzwAWwZ3SKQTr96R08zB5/t4ivtZvPQMm9EbQJZ2ET1RxwB4zGc3qXwwbIy tsCd3EsumNm4BKXvOawuPaPGKnA2sqIEd5npdOSSDFKiHyNnsOl0c5dUt3bW9nxqwXiyaB /gtfutSOw5FC2jx4lw0Nr/LEBA6VWF9IR8p66ThZ/ZhLXAdDUwsUvYg9mIXlQQ== 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=1782247986; 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=p8Uj6txK7SQeGeF7gQ+wi801CZFUMOQ5b6em0t+qw8o=; b=gR/A5dFxQcuWGsl6ZhpoagIgNMNALoDmMrkcrAXewdYlI74Liy8/c2mZwoFIZpGZtXnuVV ejisoQsu+tKf12AaYznOIzI5Uw5iCtC93FFp5VkMN1Wcd4vZJOCrTB0VmltixcrbRSVV0n WpM+bKLPbtXFzpi13MfsDQiMzbHjT3M5pNISh7ILw5roTPez5EYa3LbTkaGHzfs9G8udCs apwwa0lplQEwLiLEQQPOXLDpwwmGPq2tT/WAQQ1QNHzsmYO9Iw0DHOrbgWgQAMrSQQ8ox8 T2Pnc8cJQr12h3tPWqJlVUNB9NMEFI4qkqhBoqbYQHcXzJ3haMJYgQcCRQWVIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glHMk54s0zqnD for ; Tue, 23 Jun 2026 20:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c37b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:53:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: df2d5780bf6b - stable/15 - xhci: Do not drop and add bits in xhci 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: df2d5780bf6b27915af54ed3a3414d13be640ded Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:53:06 +0000 Message-Id: <6a3af232.1c37b.396f39fb@gitrepo.freebsd.org> The branch stable/15 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=df2d5780bf6b27915af54ed3a3414d13be640ded commit df2d5780bf6b27915af54ed3a3414d13be640ded Author: ShengYi Hung AuthorDate: 2026-05-21 12:49:42 +0000 Commit: ShengYi Hung CommitDate: 2026-06-23 20:52:08 +0000 xhci: Do not drop and add bits in xhci Drop and Add bits reset the data toggle for high-speed devices in XHCI. The toggle bit represents the sequence number in USB 2.0 transfers. However, a device can only recognize that the toggle bit has been reset while in the HALT state. As a result, the host and device toggle values may become mismatched, causing xHCI to reject the packet. This issue was observed while testing the EZ-USB FX2 device. The transfer may then return to the original value after a bi-directional TD because the toggle field is only one bit wide. This explains the reson that we can only receive packets bi-transfer in some case. Therefore, we do not reset the toggle bit here. Reviewed by: adrian MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57146 (cherry picked from commit 28d85db46b484589e2ee74cf4b270db066821de1) --- sys/dev/usb/controller/xhci.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 788b2b718062..23ad3f86e46b 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3898,10 +3898,8 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) */ switch (xhci_get_endpoint_state(udev, epno)) { case XHCI_EPCTX_0_EPSTATE_DISABLED: - drop = 0; - break; case XHCI_EPCTX_0_EPSTATE_STOPPED: - drop = 1; + drop = 0; break; case XHCI_EPCTX_0_EPSTATE_HALTED: err = xhci_cmd_reset_ep(sc, 0, epno, index); @@ -3910,9 +3908,15 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) DPRINTF("Could not reset endpoint %u\n", epno); break; default: - drop = 1; + /* + * xHCI spec 4.6.8: + * The Drop and Add operation resets the toggle bit, which can + * cause a toggle mismatch between the device and host. As a + * result, xHCI may refuse to receive or process the packet. + */ err = xhci_cmd_stop_ep(sc, 0, epno, index); - if (err != 0) + drop = (err != 0); + if (drop) DPRINTF("Could not stop endpoint %u\n", epno); break; } From nobody Tue Jun 23 20:53:07 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 4glHMm27y7z6j68L for ; Tue, 23 Jun 2026 20:53:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glHMl6nBTz3HPH for ; Tue, 23 Jun 2026 20:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782247988; 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=bSJlqT9WI36vAYDxyMMuaIvK+0HpjqifAkHwO20Xq3Y=; b=DMRmfQOcZQuCsadRxs5kpdG2imeeeGzJykRW7TBLHnOfT8hfT4pWQCJ+S1U4+rQfzae6x4 0TdBkU9gPR14ieDrUBKxcQTFoeGhQoqvQfaeh/MchD5AeC89Z46cmZ1sMwd+28UD5L4BLo HsFLm2Kei+Dd7581wFF39mE9t93CEwZcEBFYet6tFsAfN80yMnAwvD8A4n7+atgI9p7ElA 3Q/98dDXjSBmgTNKu5sc15NrolXuBmupwPPVV+zUXVsLwYm6lyNkONa5psFkPRqm5HAL2i ADvR4H3aIskBTegOT6Pd4oESCqS+n2zABx/0BrUBXOxnTwHh6Ei9pLVLHxRoVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782247988; a=rsa-sha256; cv=none; b=aOCw/xvF2nKwOKee4u31hT8beq9ONS3Cdv3wMjik3QyEn95JpMImnpspFkgdRCAkP++D2V ayQu2nok+gQDoBKO2dc+3IX1WdnuUCHOVQg2j8jYSzuiie0dsm39qPBvahOk4lpAspckvo NLI8IiAEV1RTdqZGzGrb8O8UO7jfE34poZlJS9Q9jBRWio4P+2l5xRN9AFzIrWF1+DsxRh SzSVLR0Ma8W2ceNnTAI1VOJRF69RUpLGQC8XkNMRMREoUJ/sHvna+IFxO8arz30jkfJS9I lrq7VMSNdDzWRRmezIIZygy9kj1tJcjPTwrguitCRELvDopGFREj0v+zz0i8lQ== 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=1782247988; 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=bSJlqT9WI36vAYDxyMMuaIvK+0HpjqifAkHwO20Xq3Y=; b=PIy33/Vf54uDDQGJkPk2aQ/xy/wMq6NaIIj/+6ThkG3aScTSPThGi17XH++GitVPWQsjE3 lxBCkLFXJU1t4BtZvSN2TVdwgTMN9j2rT8fg8Cw1zLWPTwc8NRnGNE2CM8uFBhNv/oyuO5 2Q9PReRVjGDH/n63cJFlud3FxEtwyjcDdz6j2I76XLlTHN07iDphTQ29boL7aanym54wBE RvEgJvb+NNTtw7g9mxAHKXy+nLBSccdgh/M/9twEgxDsBK5HiIMhR9Y5ZotK/8mXrGP4vn 75VEP5rd9Gstq3uwC+pcwzLBxy4oxICnEwMZ6oOKdvx9vOWPAebC9zGiTJKvGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glHMl5SzWzqc8 for ; Tue, 23 Jun 2026 20:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a317 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:53:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: 4f40c7c37fb4 - stable/15 - usb: Add missing mtx lock and unlock in pushing dma queue 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4f40c7c37fb458b6a5c494a28bd78aa1d66fa9a8 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:53:07 +0000 Message-Id: <6a3af233.1a317.25fdff51@gitrepo.freebsd.org> The branch stable/15 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=4f40c7c37fb458b6a5c494a28bd78aa1d66fa9a8 commit 4f40c7c37fb458b6a5c494a28bd78aa1d66fa9a8 Author: ShengYi Hung AuthorDate: 2026-05-28 08:42:11 +0000 Commit: ShengYi Hung CommitDate: 2026-06-23 20:52:08 +0000 usb: Add missing mtx lock and unlock in pushing dma queue Accessing usb_xfer_queue requires bus lock, we added this missing lock in here to prevent racing issue. Reviewed by: adrian MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57293 (cherry picked from commit df5e9e3da5b9b3fe63ed4aaaa19b824fd18ae0f2) --- sys/dev/usb/usb_transfer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/usb/usb_transfer.c b/sys/dev/usb/usb_transfer.c index 67745cf49397..d41121ed3a06 100644 --- a/sys/dev/usb/usb_transfer.c +++ b/sys/dev/usb/usb_transfer.c @@ -1889,8 +1889,10 @@ usbd_transfer_submit(struct usb_xfer *xfer) */ #if USB_HAVE_BUSDMA if (xfer->flags_int.bdma_enable) { + USB_BUS_LOCK(bus); /* insert the USB transfer last in the BUS-DMA queue */ usb_command_wrapper(&xfer->xroot->dma_q, xfer); + USB_BUS_UNLOCK(bus); return; } #endif From nobody Tue Jun 23 20:53:08 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 4glHMn3L3fz6j644 for ; Tue, 23 Jun 2026 20:53:09 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glHMn0LK5z3Hcc for ; Tue, 23 Jun 2026 20:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782247989; 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=JAvVgZCJcR/ts1UbsYPF+19qo6Myq+j0ls4hIkX1lVo=; b=vDU3AV4um2LSxpSpA69bfAHoi62HKE7aPrM2uzKReh59+RuKvQIqK//Z4uN5pNOD/LRg6e jyPaHTPNsXolWS0v/nkwl6E/qRRFvx8odb6kzUMZitVxEP3B4VyxWF+CU7hIYPdXtf9HTO g7GuG2Y6YGDV9ujZ+EY5e8P6TSjX9e0IOJgqjCNxBnk27aWfa5Rz7BNGCC473NeBkruZfE AT1kkfNF6lIm/l6qF3U/ywGMsaWRppjGu9sAbo/ChIoDobVix8wk7urwnybw4JUOcVUqkq MD4CHjgKqa+JM82OCdeQYiRJfzPN95Xo8RnVL49iLgNrTQWp4orJEXnqXgucIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782247989; a=rsa-sha256; cv=none; b=WvF9nlsQewPql18z/kADmvPZZllKmPMKM4jVP/WXP+Dx+F99SZM0Y+fyo51a0bIMtR7aXO QRvKHxbFRbEmCvIXID46XJSJ+LUDBGgmz/BctQS78GoO+EO/JvqoAW5xOlFooSGoocYXD/ 2bVcPh3oO37hW89extxkswuoS2MsUQBvfUnknjLX/0pl4Q5lL+VVU0C/lKnb2hpLNUiMAf 4UjtNt7Iw/D2Ynd3FP14KxldmTIusMmpUcD6XP1IAbQ9yEZ5KtnaSVdM2IWatqTaXe+dSU YUDenJpzyhXRlFxh+IlIg8TqPeSYOUoEqzlkcq6LsKy7DSy6AIpxJNuL13jEvg== 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=1782247989; 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=JAvVgZCJcR/ts1UbsYPF+19qo6Myq+j0ls4hIkX1lVo=; b=pP41LboHX/Cjc2U0L39uVQ8mp/galT3Wp7zh95M7g9YK4oZ3K3EBmPrzWA18L5jaDbARjS pB9kSoSogrTwtBZcfLBOH65bZY6Ui45GqRC1dRAgogKaR0cjUMTvzlkKz2dWGc//uMVoxR ibpAaAMLAz9Baw8XzyFJPpUSCRMTBflSLmcW1V9woqFWoA+PYUpSkeTRLzMom0tjUnuEyt 2xSJzhrJeBq+yLUccuX8Vk4N1U34Dh4T/8OEKkjRNaBTzUJtPbpggP8WTNlaW3U8qnu7M6 aNnzJaLXX2OLnk/D2nl7Csr9XpJWhFiU37gitl91X/jqenFcUWbXooWRA4dAFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glHMm6JsTzr1h for ; Tue, 23 Jun 2026 20:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a24a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:53:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: 27b24894ec78 - stable/15 - hwpstate_intel: Disable package control on hybrid CPU 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 27b24894ec7822e7bc2e447bc62384b8f5beb5fa Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:53:08 +0000 Message-Id: <6a3af234.1a24a.598419c1@gitrepo.freebsd.org> The branch stable/15 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=27b24894ec7822e7bc2e447bc62384b8f5beb5fa commit 27b24894ec7822e7bc2e447bc62384b8f5beb5fa Author: ShengYi Hung AuthorDate: 2026-06-01 09:46:37 +0000 Commit: ShengYi Hung CommitDate: 2026-06-23 20:52:58 +0000 hwpstate_intel: Disable package control on hybrid CPU In package control mode, the performance of all cores depends on the most recent value written to the request field. If the last write comes from an E-core, all cores are forced to align with the E-core performance level, resulting in significant performance degradation. Therefore, package control is disabled on hybrid-core systems. Reviewed by: olce MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Framework Computer Inc Differential Revision: https://reviews.freebsd.org/D57377 (cherry picked from commit 7b26353a59d66dc1bc611fd042a49b9e3bd13699) --- sys/x86/cpufreq/hwpstate_intel.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c index 3d2cc0a5966b..db8600d7b89a 100644 --- a/sys/x86/cpufreq/hwpstate_intel.c +++ b/sys/x86/cpufreq/hwpstate_intel.c @@ -321,9 +321,19 @@ out: return (ret); } +static void +intel_hwpstate_hybrid_cb(void *ctx) +{ + uint32_t *small_cores = ctx; + + atomic_add_32(small_cores, PCPU_GET(small_core)); +} + void intel_hwpstate_identify(driver_t *driver, device_t parent) { + uint32_t small_cores = 0; + if (device_find_child(parent, "hwpstate_intel", DEVICE_UNIT_ANY) != NULL) return; @@ -343,6 +353,17 @@ intel_hwpstate_identify(driver_t *driver, device_t parent) if ((cpu_power_eax & CPUTPM1_HWP) == 0) return; + /* + * On hybrid-core systems, package-level control cannot be used. + * It may cause all cores to run at the E-core frequency because + * the resulting package frequency depends on the last core that + * sets the frequency. + */ + smp_rendezvous_cpus(all_cpus, smp_no_rendezvous_barrier, + intel_hwpstate_hybrid_cb, smp_no_rendezvous_barrier, &small_cores); + if (small_cores > 0 && small_cores < mp_ncores) + hwpstate_pkg_ctrl_enable = false; + if (BUS_ADD_CHILD(parent, 10, "hwpstate_intel", device_get_unit(parent)) == NULL) device_printf(parent, "hwpstate_intel: add child failed\n"); From nobody Tue Jun 23 20:53:11 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 4glHMq60yrz6j648 for ; Tue, 23 Jun 2026 20:53:11 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glHMq3XRHz3HSw for ; Tue, 23 Jun 2026 20:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782247991; 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=i+vVYSlEJv2cgZj1nYKbGrD/ldOxFVOiG0XQPGdOUwQ=; b=PZpnHrbOcqGen0k9EREsR7KbgRWgI185HyaFcA3GUagQEsy+EZUg4Pdiyvs1IJB4rQZbG8 F8BsaGNieLGkl1tA/OOKpKm5q9iDYyxOcR9Y+f2rU9fxk89HKImr4gfma1AaGLv3HQCFI/ cgZ8ooMz4ThiSKsZ9F7PMyTr0ovgaroa251Dwy5rB8Lo+stYhPp2lm8gkEHMaXKb0zlm+Z DJNSxKdN+wrVfi/MIKooBtsHvl/QzMQgHZpim4zpNBoqRmeHS9Dwgjd/W5iHP7S5F0BK2X KsKn99H6K5JC6dolHWsn5OekaxR0FLB5u1PBverWEFpnIPf/39hIYnOtjfR/eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782247991; a=rsa-sha256; cv=none; b=Ct7F7rjIMLhMCElelXSoryFzyDUSRrbtQ49SM7lsAwgJnvEp7JSJ5IdvV/W/eILyNega0z MwJ59t+ux8Gex+cj4aUu5Nkvm+bLn3MiQPynEGpy/VT1SPKemWzNdciamJBIbSzIA57iiT cO9GMBgJ276wPFI/WNRy0k1TAqxh40LZ5W30HjpFGQcCEC7U1rO0ghMxIdjw/L15LEe3eF u+lTFKQ9RO9qWNGv3KQfDTB2opQDO1hjNHOk6U0Zp4Uh/kummaZr9/ZDC7CSjgKiVPs65f P6L8ugLtpRyWKPgDg23hC92BA9oNY9QNkrzqnrXQfunx3Q/m9jlyeQQ3lD2Haw== 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=1782247991; 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=i+vVYSlEJv2cgZj1nYKbGrD/ldOxFVOiG0XQPGdOUwQ=; b=giM6J5wHzmJJucVFKMpXCN7HOf6yIMYxSuVgTXj8UPa5H8J+eGrr95x8X2KoWu95aJa0Rj L0c+LfjK+NeU8ThJl31xcaWs0wm8Tld3haeBTMgploQbzB5hWR1fnmeQzvMXprBujC8rQN q3G0gjuSNX/3Xy2CXuHn/AW+LYJiP7B1OWMzSVET5ldr/m/Q8+geIThytqCD2cLXDqIq7Q BMdFhkpdznY8S8+4TzrhUUJtuSDIqToKTkQ9ZfnbxRrTjQdF2007hfjuPl7HNyTzOPgP8E mBCSUISFr7buXazU/nSkKE80dYec232yJnwWkv3EzyUb1mIkOtr84JkGfpCLuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glHMq0N7rzqmH for ; Tue, 23 Jun 2026 20:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a24e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:53:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: 6c9fbc4c7e62 - stable/15 - usb: Add missing unsetup while detaching uchcom 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6c9fbc4c7e627776f8004b9533212684a4f932c2 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:53:11 +0000 Message-Id: <6a3af237.1a24e.7c4d7d5f@gitrepo.freebsd.org> The branch stable/15 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=6c9fbc4c7e627776f8004b9533212684a4f932c2 commit 6c9fbc4c7e627776f8004b9533212684a4f932c2 Author: ShengYi Hung AuthorDate: 2026-05-29 15:09:52 +0000 Commit: ShengYi Hung CommitDate: 2026-06-23 20:52:58 +0000 usb: Add missing unsetup while detaching uchcom Reviewed by: christos MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57329 (cherry picked from commit 2934783fa80de2854d9527ae11db85c47ac65a91) --- sys/dev/usb/serial/uchcom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c index fdc5515fa722..ff1ac8897c90 100644 --- a/sys/dev/usb/serial/uchcom.c +++ b/sys/dev/usb/serial/uchcom.c @@ -404,6 +404,7 @@ uchcom_detach(device_t dev) DPRINTFN(11, "\n"); ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom); + usbd_transfer_unsetup(&sc->sc_intr_xfer, 1); usbd_transfer_unsetup(sc->sc_xfer, UCHCOM_N_TRANSFER); device_claim_softc(dev); From nobody Tue Jun 23 20:53:09 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 4glHMv4Lnnz6j5wj for ; Tue, 23 Jun 2026 20:53:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glHMp1BH0z3HdY for ; Tue, 23 Jun 2026 20:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782247990; 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=HhP7UTIie1NO7CxchgPyYc9qMqon18sYifZaQyzHhQQ=; b=QBdYoOvof9L7a+CyClDtJ96GnV5cv8UG9qLZVo46zyuhgLUG279YMtpKfnAxOTRYDcFc/e HZmGxW0ux74LAbY71RYFVk3uRiFy/8XK2PB1k137Mjx5HU3aja84g2dsSROJ5lzIJt/XOj jrxylUKm8hkrGCcuaVqjUaoqaPlYBIY7Wj6PB2eouKdnkgE9W1qG0sxMzrrI9PAdAqoEYm F2OojlPUgdcJTAEEfgESDmgP87Ah14gVEWphTc/xaf8/Z3SoCWy9p4x5Um9CnVwcJI9VVF iZTZhwcQYSP1PHyNUf4pYfI2NueJVMtESbchFUhgBSTJ+BqNmh3NtLGB1L1nsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782247990; a=rsa-sha256; cv=none; b=aUbNnCbW6OiWrkgBpFEFc9shd3qefI2mVfKEEh4Bktyuay6U2/CURY8OKvZPTtNurLVZqk kJVQPob/qABh8tisvRQUFUnEaT4cO+lTo7oOcuvGuHSS9yvtyzkg+u7b6RJBeltdYQ9IMy gIT0uNwyAtA07b3a+/3aSMBIk02O1mPW2KSIrtiuvo4npVI68PUzaPBTFT40MxjNLybNPx 1HF8gQtw56127lWyj1FETrw03fbJvndSjzBQH5vDXyZ6hr3WuuoLv1LG7JWHWXTnKbYCgN fSmnjdbtjmKq5YW2bACl73dZGRMaGJHWJ52x/+HgxPX2X0ARzKna3sQTkC99mw== 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=1782247990; 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=HhP7UTIie1NO7CxchgPyYc9qMqon18sYifZaQyzHhQQ=; b=P0A2bfVlWgPmx9D6LZmdtLFT//+/sRuYqLgSxUFUvf8SVtPKF+gwfCE+jHjH46Rt9Jyw6z iq/r//V6cmE80xmZ2CLiOYBjE1UT71MZuax/FrL0Tpjbz0zdE4StmzKszZnIlD/Vr24Bdb QPiLzOYvH6CzqsXFFoZQegYyf3v6s4wg+C5ii4jvBHuAIy6mqUFxborq7OcO919DZNN+Ch Sw9PHdZtmqK6Btsnh0GCT79MbEbIgJlcgK+/fvwH7kBcfqDeZ7suN7W2HqO9KrQaDtXESv o99+fNUyEMvjywBZSLLrfQcnJg0O9kj+Wzc0FxB+9x+fxMGnEKoWz36v4E47lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glHMn6fmZzqcB for ; Tue, 23 Jun 2026 20:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19862 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:53:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: 9f2b898a0f32 - stable/15 - libc: Use slow path in fenv in C++ 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9f2b898a0f321c7d6e229733c604b99147a1dd0c Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:53:09 +0000 Message-Id: <6a3af235.19862.17dc0c1c@gitrepo.freebsd.org> The branch stable/15 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=9f2b898a0f321c7d6e229733c604b99147a1dd0c commit 9f2b898a0f321c7d6e229733c604b99147a1dd0c Author: ShengYi Hung AuthorDate: 2026-06-04 08:58:28 +0000 Commit: ShengYi Hung CommitDate: 2026-06-23 20:52:58 +0000 libc: Use slow path in fenv in C++ C++ exposes cfenv functions via using ::func. Our name-mangling mechanism rewrites all function calls causing symbols such as std::feclearexcept to be transformed into std::__feclearexcept_int. Since no such function exists, compilation fails. The using ::feclearexpect declarations themselves are unaffected because they are not function calls, which further exposes the mismatch As a result, enable the fast path only for C and fall back to the slow path in C++. Reviewed by: kib Fixes: 5bc64b7d417d MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57450 (cherry picked from commit 9c0489508695fde3bdd742edfd1b4b681aab4d19) --- lib/msun/aarch64/fenv.h | 10 ++++++++++ lib/msun/arm/fenv.h | 10 ++++++++++ lib/msun/powerpc/fenv.h | 12 ++++++++++++ lib/msun/riscv/fenv.h | 12 ++++++++++++ lib/msun/x86/fenv.h | 10 ++++++++++ 5 files changed, 54 insertions(+) diff --git a/lib/msun/aarch64/fenv.h b/lib/msun/aarch64/fenv.h index 5d47940cf9eb..aebcd99909ce 100644 --- a/lib/msun/aarch64/fenv.h +++ b/lib/msun/aarch64/fenv.h @@ -96,6 +96,15 @@ int feenableexcept(int); int fedisableexcept(int); int fegetexcept(void); +/* + * C permits a standard library function to also be exposed as a function-like + * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++ + * forbids it: imports these names into namespace std (using + * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the + * actual functions. Expose the inlining macros to C only; C++ uses the real + * extern functions (defined in the matching lib/msun//fenv.c). + */ +#ifndef __cplusplus #define feclearexcept(a) __feclearexcept_int(a) #define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) #define fesetexceptflag(e, a) __fesetexceptflag_int(e, a) @@ -110,6 +119,7 @@ int fegetexcept(void); #define feenableexcept(a) __feenableexcept_int(a) #define fedisableexcept(a) __fedisableexcept_int(a) #define fegetexcept() __fegetexcept_int() +#endif /* !__cplusplus */ __fenv_static inline int __feclearexcept_int(int __excepts) diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h index 78ca9ef0f589..6febbf95008d 100644 --- a/lib/msun/arm/fenv.h +++ b/lib/msun/arm/fenv.h @@ -129,6 +129,15 @@ int fedisableexcept(int); int fegetexcept(void); #endif +/* + * C permits a standard library function to also be exposed as a function-like + * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++ + * forbids it: imports these names into namespace std (using + * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the + * actual functions. Expose the inlining macros to C only; C++ uses the real + * extern functions (defined in the matching lib/msun//fenv.c). + */ +#ifndef __cplusplus #define feclearexcept(a) __feclearexcept_int(a) #define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) #define fesetexceptflag(e, a) __fesetexceptflag_int(e, a) @@ -145,6 +154,7 @@ int fegetexcept(void); #define fedisableexcept(a) __fedisableexcept_int(a) #define fegetexcept() __fegetexcept_int() #endif +#endif /* !__cplusplus */ __fenv_static inline int __feclearexcept_int(int __excepts) diff --git a/lib/msun/powerpc/fenv.h b/lib/msun/powerpc/fenv.h index 21a99e0fbb5f..e401603793ab 100644 --- a/lib/msun/powerpc/fenv.h +++ b/lib/msun/powerpc/fenv.h @@ -142,6 +142,15 @@ int feholdexcept(fenv_t *); int fesetenv(const fenv_t *); int feupdateenv(const fenv_t *); +/* + * C permits a standard library function to also be exposed as a function-like + * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++ + * forbids it: imports these names into namespace std (using + * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the + * actual functions. Expose the inlining macros to C only; C++ uses the real + * extern functions (defined in the matching lib/msun//fenv.c). + */ +#ifndef __cplusplus #define feclearexcept(a) __feclearexcept_int(a) #define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) #define fesetexceptflag(e, a) __fesetexceptflag_int(e, a) @@ -153,6 +162,7 @@ int feupdateenv(const fenv_t *); #define feholdexcept(e) __feholdexcept_int(e) #define fesetenv(e) __fesetenv_int(e) #define feupdateenv(e) __feupdateenv_int(e) +#endif /* !__cplusplus */ __fenv_static inline int __feclearexcept_int(int __excepts) @@ -289,8 +299,10 @@ __feupdateenv_int(const fenv_t *__envp) int feenableexcept(int); int fedisableexcept(int); +#ifndef __cplusplus /* see the note above; C++ uses the real functions */ #define feenableexcept(a) __feenableexcept_int(a) #define fedisableexcept(a) __fedisableexcept_int(a) +#endif __fenv_static inline int __feenableexcept_int(int __mask) diff --git a/lib/msun/riscv/fenv.h b/lib/msun/riscv/fenv.h index 1059744941f3..199ca1806684 100644 --- a/lib/msun/riscv/fenv.h +++ b/lib/msun/riscv/fenv.h @@ -91,6 +91,15 @@ int feholdexcept(fenv_t *); int fesetenv(const fenv_t *); int feupdateenv(const fenv_t *); +/* + * C permits a standard library function to also be exposed as a function-like + * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++ + * forbids it: imports these names into namespace std (using + * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the + * actual functions. Expose the inlining macros to C only; C++ uses the real + * extern functions (defined in the matching lib/msun//fenv.c). + */ +#ifndef __cplusplus #define feclearexcept(a) __feclearexcept_int(a) #define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) #define fesetexceptflag(e, a) __fesetexceptflag_int(e, a) @@ -102,6 +111,7 @@ int feupdateenv(const fenv_t *); #define feholdexcept(e) __feholdexcept_int(e) #define fesetenv(e) __fesetenv_int(e) #define feupdateenv(e) __feupdateenv_int(e) +#endif /* !__cplusplus */ __fenv_static inline int __feclearexcept_int(int __excepts) @@ -224,8 +234,10 @@ __feupdateenv_int(const fenv_t *__envp) int feenableexcept(int); int fedisableexcept(int); +#ifndef __cplusplus /* see the note above; C++ uses the real functions */ #define feenableexcept(a) __feenableexcept_int(a) #define fedisableexcept(a) __fedisableexcept_int(a) +#endif __fenv_static inline int __feenableexcept_int(int __mask __unused) diff --git a/lib/msun/x86/fenv.h b/lib/msun/x86/fenv.h index b5da37902083..cb44624a858a 100644 --- a/lib/msun/x86/fenv.h +++ b/lib/msun/x86/fenv.h @@ -150,12 +150,22 @@ int fesetround(int); int fegetround(void); int fesetenv(const fenv_t *); +/* + * C permits a standard library function to also be exposed as a function-like + * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++ + * forbids it: imports these names into namespace std (using + * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the + * actual functions. Expose the inlining macros to C only; C++ uses the real + * extern functions (defined in the matching lib/msun//fenv.c). + */ +#ifndef __cplusplus #define feclearexcept(a) __feclearexcept_int(a) #define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) #define fetestexcept(a) __fetestexcept_int(a) #define fesetround(a) __fesetround_int(a) #define fegetround() __fegetround_int() #define fesetenv(a) __fesetenv_int(a) +#endif /* !__cplusplus */ #ifdef __i386__ From nobody Tue Jun 23 20:57:09 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 4glHSQ0FxSz6j6gF for ; Tue, 23 Jun 2026 20:57:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glHSP4GDnz3Jtl for ; Tue, 23 Jun 2026 20:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782248229; 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=i2m7B4mrmJAX2/WFYDEZ2jmqYcE9z9+YJsljONUtLF8=; b=WvY/bcwkyAoisEPvudzVuIz6vXoc5Udw7nPZFHbQzVlNpbNEeQwhdSGBhKpBaNa744vvqB epAIzk8hrZvtRNztx9fMg9c4o60zo3g59L71cTaUkShlSMf9zdIZVsoKj4kaiBdfjdNEhe BayLqhWOY5ERK517Lu/AnIYNQwBuHdTGTtW1luNxn9kMv/T7G5QXSQpG+4AInP1V9JR+4x o6mwz7G8undZ425UUkcUO+Qw9beY2Lr0tUOMEKnP/D99fHyEO0YD3UhegmxBI3px4bbux8 5mE523ATOh9wDBXtTtoZ6YaTSPMOUK6BCQCvnuycuI/KZG6PzdrsTWGecBMycw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782248229; a=rsa-sha256; cv=none; b=RgKxP2BIJBQEFwWG38ULyT5Vk9IJlT0qjirpcbnvKRecPkp55FFLKzKkIjb1NVyzfJWFBz guSEWRl21vstKbiRe+IOJlDjmBSr/JracNXT+jpIVK49sIpwA0j5NYN6krGk//ZpyFEchK bDcoVf2LwILRmbgCfgBHgKp+E7RnKsfnqwG1pAUPuVDACk4hUe+hVVZE9zB4k9Y6N8eHdZ +kf/8Z2597EmBWwx3af6m8MuA2JBqLyQGGP4HdtOSC2F5ap9JWrXUbCI+icGSMp7zp/d6+ up1atcP2YcVmTdg3zDl6mTnQoF4/MhMJEl3ffX2Iki5YiDdFfJjgB6RQAAWsXw== 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=1782248229; 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=i2m7B4mrmJAX2/WFYDEZ2jmqYcE9z9+YJsljONUtLF8=; b=BfgsoZem3Nrawhpru+9Ba/YomeLPKrrKuwjaTsN0mhj4VG8O/G6crSpDDGr+9E9rgz0LYS r6J6dJ2G/66HpI6gneI0pyOPZyp5uipdvgjtBTyzFPsGJW8rqwL8RFGOqB0yYEkSEazLBz YhKY/hjBqDn+RpPs0YzjpCsqwXBUMd4vqUjuHQ4QSu096RMn8hZfTtwk4mHP9Dn+khu+4r kbGeqJU5lVlQYYBbiOTVc0TZi78OwwvriON5stVE0uSGwCMILP1oM4c590qcVLhJJTYLFU wdUFL7h41T957iacJnLmbk4Cf+qChIHmJNV7bqKSM+pEGIeUvehh9+pJj7F5Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glHSP3BjBzqTJ for ; Tue, 23 Jun 2026 20:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 182ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:57:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: 2cf3e6b554b7 - stable/14 - xhci: Do not drop and add bits in xhci 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2cf3e6b554b7e0da480880c114d2fa539d2f7570 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:57:09 +0000 Message-Id: <6a3af325.182ed.19838b06@gitrepo.freebsd.org> The branch stable/14 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=2cf3e6b554b7e0da480880c114d2fa539d2f7570 commit 2cf3e6b554b7e0da480880c114d2fa539d2f7570 Author: ShengYi Hung AuthorDate: 2026-05-21 12:49:42 +0000 Commit: ShengYi Hung CommitDate: 2026-06-23 20:56:03 +0000 xhci: Do not drop and add bits in xhci Drop and Add bits reset the data toggle for high-speed devices in XHCI. The toggle bit represents the sequence number in USB 2.0 transfers. However, a device can only recognize that the toggle bit has been reset while in the HALT state. As a result, the host and device toggle values may become mismatched, causing xHCI to reject the packet. This issue was observed while testing the EZ-USB FX2 device. The transfer may then return to the original value after a bi-directional TD because the toggle field is only one bit wide. This explains the reson that we can only receive packets bi-transfer in some case. Therefore, we do not reset the toggle bit here. Reviewed by: adrian MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57146 (cherry picked from commit 28d85db46b484589e2ee74cf4b270db066821de1) --- sys/dev/usb/controller/xhci.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 17800dc11d0c..c9820ce55423 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3813,10 +3813,8 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) */ switch (xhci_get_endpoint_state(udev, epno)) { case XHCI_EPCTX_0_EPSTATE_DISABLED: - drop = 0; - break; case XHCI_EPCTX_0_EPSTATE_STOPPED: - drop = 1; + drop = 0; break; case XHCI_EPCTX_0_EPSTATE_HALTED: err = xhci_cmd_reset_ep(sc, 0, epno, index); @@ -3825,9 +3823,15 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) DPRINTF("Could not reset endpoint %u\n", epno); break; default: - drop = 1; + /* + * xHCI spec 4.6.8: + * The Drop and Add operation resets the toggle bit, which can + * cause a toggle mismatch between the device and host. As a + * result, xHCI may refuse to receive or process the packet. + */ err = xhci_cmd_stop_ep(sc, 0, epno, index); - if (err != 0) + drop = (err != 0); + if (drop) DPRINTF("Could not stop endpoint %u\n", epno); break; } From nobody Tue Jun 23 20:57:10 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 4glHSR1Rs7z6j6kY for ; Tue, 23 Jun 2026 20:57:11 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glHSQ5BMtz3K0B for ; Tue, 23 Jun 2026 20:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782248230; 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=GGuccEvkigz/H+C8hRF7hrprqNo7cG2n1cYdDE/NNYk=; b=ZQakUDHA5LMDfdnAnU+FJLkeP8wdCCsJC9c2nTlZy9Fpw0ipP/6QZRusImhxXOyZv2W2le 9lDKRxewta21Rqx8yMKiVe7Lj4cgE081X8j2Zvw4KnVX8YmKwMhsZ4Tqcak5hv7c01ADNy CjsdnjH/GornTOn1wiHXIBvmoFD3yvk/aG51N0iwXghXOVo5C1m2dg+dF7NucGoLFE0N5q kvBVfb5ouaY3L4L+pK2SvS96/RO5F95XhGL3Inx0Iohz4e4hOjzyIiEE2sdaNPpWt2yuJd /0iiVwccOyYqaixj3pTL6oayGNBAow8felxbvVgD4NdsofHUGwQKQ58WoFF9vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782248230; a=rsa-sha256; cv=none; b=iWXaHy1R+TMwb3CKCccIhYmNLXxnqHEdyvRzs03M+F8GuocSK6lpC+2FSR8Q9gUHhC0tkN tYRSTgvi/wrvnS/k2y7av/eqV2GZvxrYpATS5FgA9NSBhgrWBGA1WC4zZr4wElgTDqH5fI kAEcyINhMomfD7EzSEK7hQibe8ca9Z6YaUjBjeAAnudaABMDfvA8Thp+2xQPWOOniOeftB MDaYKTNo4ly6xBBEwUg5cfwzTsEh1o1ZkYTB2xDkywYwZsQwfqd6Qg5W7p9WHsRBCJDZwF 7+SlWsMfouvvaHeTqAL66/yz64rMa4bV3BdGCdBnmFhw+9S0czIvwxF/Wbvybg== 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=1782248230; 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=GGuccEvkigz/H+C8hRF7hrprqNo7cG2n1cYdDE/NNYk=; b=DTZ/GlsGEUqAta74DB17iSGMhDqG9aaJS7Td2PEMdBu86GAzs2pFOLtn02ltohT/KoW8L/ 5b3vrgGEpCZF9cMNpx1M844pnlzvl451ANhF8NSxI65A9d1cOtp7a5AIqQU98J2npISVLm PW4CsgXqbY3DS0/DB4EBz7Xugb5ZueaT5kpKipG/1O7Ipl0ngA95As0TXn5odDwMeiLWVB /FLVn0yo6Oi2Zdqv6Gl0Jo/eyX7HPIu3KFu5B8vMjuuMasfgsJ44Lqo+2jAJymCJLE86IV g4Yu7BKVNRLhItc+YFuTXLAjTEsEkIECODw0Bjhvl/vwV82taTgdBr8tBF6VnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glHSQ3mDCzqmL for ; Tue, 23 Jun 2026 20:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c37f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:57:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: e01b5034a627 - stable/14 - usb: Add missing mtx lock and unlock in pushing dma queue 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e01b5034a627cec33c0cd2768687c7db6db3cbeb Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:57:10 +0000 Message-Id: <6a3af326.1c37f.280ee49@gitrepo.freebsd.org> The branch stable/14 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=e01b5034a627cec33c0cd2768687c7db6db3cbeb commit e01b5034a627cec33c0cd2768687c7db6db3cbeb Author: ShengYi Hung AuthorDate: 2026-05-28 08:42:11 +0000 Commit: ShengYi Hung CommitDate: 2026-06-23 20:56:03 +0000 usb: Add missing mtx lock and unlock in pushing dma queue Accessing usb_xfer_queue requires bus lock, we added this missing lock in here to prevent racing issue. Reviewed by: adrian MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57293 (cherry picked from commit df5e9e3da5b9b3fe63ed4aaaa19b824fd18ae0f2) --- sys/dev/usb/usb_transfer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/usb/usb_transfer.c b/sys/dev/usb/usb_transfer.c index 67745cf49397..d41121ed3a06 100644 --- a/sys/dev/usb/usb_transfer.c +++ b/sys/dev/usb/usb_transfer.c @@ -1889,8 +1889,10 @@ usbd_transfer_submit(struct usb_xfer *xfer) */ #if USB_HAVE_BUSDMA if (xfer->flags_int.bdma_enable) { + USB_BUS_LOCK(bus); /* insert the USB transfer last in the BUS-DMA queue */ usb_command_wrapper(&xfer->xroot->dma_q, xfer); + USB_BUS_UNLOCK(bus); return; } #endif From nobody Tue Jun 23 20:57:11 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 4glHSS0sZQz6j6X6 for ; Tue, 23 Jun 2026 20:57:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glHSR6CLLz3K98 for ; Tue, 23 Jun 2026 20:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782248231; 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=VSf2BXNy8JaxqJFvkphU74XX8pYlbydT/DKVlBXVwUE=; b=r6kdStMWbf2D5nqja6q+UAb9s6AeGnjgmPlOAve1sGLNJzr6QJWTFftf/4UHQ6KXCdOTPf W4fhVWlJ0GQq9TIFswWjD2jZkERC3AOBPOwEA/JM2NLb+PsTB2WQIrVPx05GHOC/D5Ym6K a/+WJQp04GVRH6xDIZwY3xKFTx3EwOKttAe45o/npo8xOfKXC7Y3kE9qF+ZuL1uxw9csF7 IXuIsEH0JovFx/QWO/uQHMuBGsVIY7G/yFHZcVqTXBTjmQC5eFBaMqKLFI+q7zunLdtHN6 Xckz/oCJixtsUfxC7cs82I73oF64yTQlz4H47j7G33n7/ciy+U2wUFtjUyysDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782248231; a=rsa-sha256; cv=none; b=dnhwBDMvgSGdjUsTZM6vse88zhzSf0e5Stddkn1VcGaPbM/18FpIZt7q9RHXygVLitfFl4 043mnvEZTOBYmDa4nGJRYld4SaX+AZYAcKnAkswC4KjWHv+39QyI9pCtnBDl36+dvNEEzz uDBNsPNOYXPikT6GUTpCCzU5I8UqVJfIHm6TF6QN0mzY7DnzvsBsgiE8XZKZIQ9wbUo/DJ K6JxailzpVzlKGGuE5HZyx8mmg+JZyveQ7NKhfpkOfxOEY3kfNHlLVmUJgbo+KXEN2KUS4 FkyjlFC1T/pmQOtcaDgkFIS730nH72OGKERNkG1Kz0/MmEmjpbO0FrQGm1CJHg== 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=1782248231; 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=VSf2BXNy8JaxqJFvkphU74XX8pYlbydT/DKVlBXVwUE=; b=WNlHupX0evVOsZHQupKMz3gBEXL9430FdfCgFDWlH3iyZ9b4S/oDOHB+6/lBMZE8PvGs/6 LTC5M1TW5qvaNcSD9oB68BIJnV9dpScSYJ69c8TfIWg43jarK4Bee9B6zinTh8Ly3EeJBu WLVfNfDCoFhB/GXYWQOqBhkdB6n7hTjV4yeSGSQmotmAcfKwXTDULnhwFiVnph3Wg6jrJd rce/Gpr+5FrQTpEzL+aVR1boU6Bpag5hixGm4KFXT7Rd+pId/OWnY/RiWBwwr1zByeRhKT vAyQlUvt64mPpr0bp+xtHcjLZAIA9kZtvNYSFrjeW+l9UUXw3/uJpRW5lOSXTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glHSR4Wd8zqnK for ; Tue, 23 Jun 2026 20:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bb96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:57:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: 6a606e777326 - stable/14 - usb: Add missing unsetup while detaching uchcom 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a606e7773262ed1e22ea1cf132eb5a87dea5da1 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:57:11 +0000 Message-Id: <6a3af327.1bb96.292d51cd@gitrepo.freebsd.org> The branch stable/14 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=6a606e7773262ed1e22ea1cf132eb5a87dea5da1 commit 6a606e7773262ed1e22ea1cf132eb5a87dea5da1 Author: ShengYi Hung AuthorDate: 2026-05-29 15:09:52 +0000 Commit: ShengYi Hung CommitDate: 2026-06-23 20:57:03 +0000 usb: Add missing unsetup while detaching uchcom Reviewed by: christos MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57329 (cherry picked from commit 2934783fa80de2854d9527ae11db85c47ac65a91) --- sys/dev/usb/serial/uchcom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c index fdc5515fa722..ff1ac8897c90 100644 --- a/sys/dev/usb/serial/uchcom.c +++ b/sys/dev/usb/serial/uchcom.c @@ -404,6 +404,7 @@ uchcom_detach(device_t dev) DPRINTFN(11, "\n"); ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom); + usbd_transfer_unsetup(&sc->sc_intr_xfer, 1); usbd_transfer_unsetup(sc->sc_xfer, UCHCOM_N_TRANSFER); device_claim_softc(dev); From nobody Wed Jun 24 13:39:15 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 4gljhm3SS8z6jClv for ; Wed, 24 Jun 2026 13:39: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gljhm2qnJz3sLD for ; Wed, 24 Jun 2026 13:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782308360; 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=G9Oim1sN1JZmpsv8RGy0ct/zj14aUvA00PpaOPAvQog=; b=rZXt1sCbMr3CDgbJxq/L61IKe+4/cDfgt4AMQAN7i0nHA9YxV/4OwtiYPsdde6cobE65ZU QdSIdtphOgOK6p7A57zZtyOpmXOaqVKVN0vTzg//XcBQUocdfKbL4sabdkWwz/fdDSmUjn DSQlWkDcAw5oU/vpDLzcBcNcobwkN+044n2Nhm38eC0vdYMrtisrGErNEcew6ciCkKH7/l Sl1AdUsDM0tK9hFYlDvGc1BSv5XvcSHXaHhVTrKEdp04WnBOjRE36tO78f24XbX4/+7T66 ZFVB1WzLJv3tMDvGKe8fSZPXUkZB/X/QnVX8KTlzHqvoGMS93R+mgyzAX7P6og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782308360; a=rsa-sha256; cv=none; b=ygPjI4Z2oA+F8ntHsq8vd5RswFhyq8B8vtkzC8lagYDPM4WFm1gJh8+6VChLWa5jSk84F7 lOI5O/cwLWQc9H1ugXq/JvhAHXpdTd9fOsIISmzKwS4ZzlHvU7GJ+qyKOonIgkfvjCIixj mN+lJLxb80HdXwG279Z9I6/ShcNdtNLGO4XJGbvxYUYsuYZ5kt3oVYvo6HZ61qs1VAg8Sk qfJabHBSS02HCYtfdGx1xNu5fdZhcTS3FChL006bVhfHBP930B/+Oo/0i5WuIZNacYr5lJ aMAOwk3nk5/V7rfAyN3iIK0kjAelMkedJLhtxbNDWd+dUzqc5MnsauRjCH2RVw== 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=1782308360; 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=G9Oim1sN1JZmpsv8RGy0ct/zj14aUvA00PpaOPAvQog=; b=JJt4DpNI4NoKvH437zE2z57wiPTtL5W0HT0tnZM/kVW/laDE0dNc2tS10emPtfCmlWPMbq /SnvK6CcJ48Sdfj5/km8Wl0yZ9nJf3kAqyaG2CwP2vapixOpnXCmCAcyCAn6IpwxXlNFGf Vxoeag4K9Q/gewayR1s9O4UGhu+3Js6UKAa/4p6eYDhzLTALcPf03AfP+fTBlS4V/J3dzY c9Qqpyuy4MyL1HytZ2b8dt8HXLuZC3EvRsRbx0YokWvtWhMz23yJd5s8gKdpZVgdCe9gbT G+YM2XxJNGwWO7IWDVcnFyTAtD/omeUi18+43kmN9MGh5HhwORkcz85T9Ry4XA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gljhm1f5vz6cV for ; Wed, 24 Jun 2026 13:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d20c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 13:39:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e1c951dccde1 - stable/15 - groups.7: Document audio group 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e1c951dccde1496330fe69425f8e97f2f8003d32 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 13:39:15 +0000 Message-Id: <6a3bde03.3d20c.595c3a84@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e1c951dccde1496330fe69425f8e97f2f8003d32 commit e1c951dccde1496330fe69425f8e97f2f8003d32 Author: Christos Margiolis AuthorDate: 2026-05-21 18:42:25 +0000 Commit: Christos Margiolis CommitDate: 2026-06-24 13:39:06 +0000 groups.7: Document audio group Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/35 (cherry picked from commit 7f2d790824692b16ab2bf64a9b1e176f192cf319) --- share/man/man7/groups.7 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man7/groups.7 b/share/man/man7/groups.7 index 822717d68983..b940c4a17f41 100644 --- a/share/man/man7/groups.7 +++ b/share/man/man7/groups.7 @@ -26,7 +26,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 19, 2026 +.Dd May 21, 2026 .Dt GROUPS 7 .Os .Sh NAME @@ -183,6 +183,10 @@ group). Not used by .Fx ; available for the administrator's interpretation. +.It Em audio +Used to access +.Xr virtual_oss 8 +loopback devices. .It Em video Used for access to .Pa /dev/drm/* From nobody Wed Jun 24 17:25:34 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 4glpjp5GbRz6jX0j for ; Wed, 24 Jun 2026 17:25:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glpjp4QdSz3WLR for ; Wed, 24 Jun 2026 17:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782321934; 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=Hg9GxwJqoEcZd8j2AwRS+N09+iNAELT6CmUoTNrI0Oo=; b=ST6WuDo3TKvzMcOgRnEZLioIYqxKK4v22WM62Vaid8LFtmCzQgPkPmdJepQ5n31fVG+H76 9vjmISyXp3XNvypa3pixnCZTdMux2QIAIhuSFXiaO3+dH+XtBHmEDsQ+FX+PwqWaI+p+uq qQQPLQ8MxRBZcMvdhqQv28TaK/VmZ4kMHgaWjx9k6uc73CdZ+KoxB1FNL0+yGkEEks/paC y3f7RUY2Xcn8rHNFEOprmIdI/X3NIiOXPaz3AT/sgaEUE5jJE8/jiuzYWoH8mN3uNuiNYs S9rIBypyjylknL/7d0AN5Ta1F3LZZ9SsEq5uDen6BnB2R2IsXf5MAbFnc17/qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782321934; a=rsa-sha256; cv=none; b=xXVAXyl32u+wI4SZF53DcEu7Gu1X8J2JQ747AStPMbVlpbfUhd9XuOFMUCrPKQF72s2Tu/ RIVs6kg5LNnTnKTunJRuwnC5CuVAAl58rDB2Ll2fdGgD9HU6r6visD7tcTp7O0QTmE3NH6 FO4ltOLrQx15eg/9O6T6P1slJyrcE8vOuyBGvfrNU5gpf7uHU6RT2KybA0svjfbjnXRRRa oxvl00f4OUV2ULg+JKz80RmUKiqBYsH0f5kjoXqUzxnPzPiYfaBIbJQ3JERmRIHEnhV339 o3AXNt+Ozuqoa9QWLZGdKczlq1o4hO5PlJZ/ERYwquZgNBy3saBxztG7k5phMQ== 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=1782321934; 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=Hg9GxwJqoEcZd8j2AwRS+N09+iNAELT6CmUoTNrI0Oo=; b=BrmdB0DVwe/8VOpIWrrXephkAtsXRHk4FlQnpZi/3BJvbaPnQ2VCc9ZXOlhHKeFEkB6Qdw 45+7ezqZKAaRhKcM3U+OctkkZsXHR2rRP/3HaNqYm85nL3JDsvaLJA3MXzXSugSEgdHGOQ nW0cpHzr80PS2lOHegLcuhdH05XjA2XpDwu7cdC3gc8+5Q7OpTcEE0tvVpgSYg9raTZrtb HpZvn9rKbXXAwnycEOdoQpVyZwYcU/mn7ssBNZorlnBFcH8KuzAh7xk6HkeXFk7CyDsTym QvTChsjvDJ7YRkZh2ir4wjrRLJUfAoqRVXLcwazW5eLc/Vu2D+oFR/TrYERORg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glpjp3B18zTpd for ; Wed, 24 Jun 2026 17:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33aea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 17:25:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a1977a1284b5 - stable/15 - ldns: Update to 1.9.1 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a1977a1284b5de27c2d6c72eaa428bcab4c63bb5 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 17:25:34 +0000 Message-Id: <6a3c130e.33aea.6e8d2ffb@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a1977a1284b5de27c2d6c72eaa428bcab4c63bb5 commit a1977a1284b5de27c2d6c72eaa428bcab4c63bb5 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-19 07:24:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-24 17:23:30 +0000 ldns: Update to 1.9.1 Merge commit '026e5b88eb0cde54d9fc22b9a1ebc79ea0f67aec' (cherry picked from commit 4593470d16714d83ac06a3ccc319f998a02ced07) --- contrib/ldns/Changelog | 4 ++++ contrib/ldns/config.guess | 17 +++++++++++------ contrib/ldns/config.sub | 11 ++++++----- contrib/ldns/configure | 28 +++++++++++++++------------- contrib/ldns/configure.ac | 10 ++++++---- contrib/ldns/ldns/config.h | 4 ++-- contrib/ldns/ldns/util.h | 4 ++-- 7 files changed, 46 insertions(+), 32 deletions(-) diff --git a/contrib/ldns/Changelog b/contrib/ldns/Changelog index 74e2631af72d..cd056f0c089d 100644 --- a/contrib/ldns/Changelog +++ b/contrib/ldns/Changelog @@ -1,3 +1,7 @@ +1.9.1 2026-06-10 + * Bugfix: Insufficient verification that responses belong to a + query (CVE-2026-10846). Thanks Pablo Ruiz from 'codecome.ai' + 1.9.0 2025-12-04 * PR #246: Make ldns_calc_keytag() available for CDNSKEY RR Thanks tgreenx and pnax diff --git a/contrib/ldns/config.guess b/contrib/ldns/config.guess index a9d01fde4617..c7f4c3294a63 100755 --- a/contrib/ldns/config.guess +++ b/contrib/ldns/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2025 Free Software Foundation, Inc. +# Copyright 1992-2026 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2025-07-10' +timestamp='2026-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2025 Free Software Foundation, Inc. +Copyright 1992-2026 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -150,7 +150,7 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case $UNAME_SYSTEM in -Linux|GNU|GNU/*) +Ironclad|Linux|GNU|GNU/*) LIBC=unknown set_cc_for_build @@ -167,6 +167,8 @@ Linux|GNU|GNU/*) LIBC=gnu #elif defined(__LLVM_LIBC__) LIBC=llvm + #elif defined(__mlibc__) + LIBC=mlibc #else #include /* First heuristic to detect musl libc. */ @@ -1186,6 +1188,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; + sw_64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; @@ -1598,10 +1603,10 @@ EOF GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*) - GUESS=$UNAME_MACHINE-pc-ironclad-mlibc + GUESS=$UNAME_MACHINE-pc-ironclad-$LIBC ;; *:[Ii]ronclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc + GUESS=$UNAME_MACHINE-unknown-ironclad-$LIBC ;; esac diff --git a/contrib/ldns/config.sub b/contrib/ldns/config.sub index 3d35cde174de..404aa0824443 100755 --- a/contrib/ldns/config.sub +++ b/contrib/ldns/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2025 Free Software Foundation, Inc. +# Copyright 1992-2026 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale -timestamp='2025-07-10' +timestamp='2026-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2025 Free Software Foundation, Inc. +Copyright 1992-2026 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1432,6 +1432,7 @@ case $cpu-$vendor in | sparcv9v \ | spu \ | sv1 \ + | sw_64 \ | sx* \ | tahoe \ | thumbv7* \ @@ -1525,7 +1526,7 @@ EOF ;; ironclad*) kernel=ironclad - os=`echo "$basic_os" | sed -e 's|ironclad|mlibc|'` + os=`echo "$basic_os" | sed -e 's|ironclad|gnu|'` ;; linux*) kernel=linux @@ -2220,7 +2221,7 @@ case $kernel-$os-$obj in ;; uclinux-uclibc*- | uclinux-gnu*- ) ;; - ironclad-mlibc*-) + ironclad-gnu*- | ironclad-mlibc*- ) ;; managarm-mlibc*- | managarm-kernel*- ) ;; diff --git a/contrib/ldns/configure b/contrib/ldns/configure index b731de6c2933..7671ed9d2671 100755 --- a/contrib/ldns/configure +++ b/contrib/ldns/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ldns 1.9.0. +# Generated by GNU Autoconf 2.71 for ldns 1.9.1. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ldns' PACKAGE_TARNAME='libdns' -PACKAGE_VERSION='1.9.0' -PACKAGE_STRING='ldns 1.9.0' +PACKAGE_VERSION='1.9.1' +PACKAGE_STRING='ldns 1.9.1' PACKAGE_BUGREPORT='dns-team@nlnetlabs.nl' PACKAGE_URL='' @@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ldns 1.9.0 to adapt to many kinds of systems. +\`configure' configures ldns 1.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ldns 1.9.0:";; + short | recursive ) echo "Configuration of ldns 1.9.1:";; esac cat <<\_ACEOF @@ -1644,7 +1644,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ldns configure 1.9.0 +ldns configure 1.9.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2263,7 +2263,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ldns $as_me 1.9.0, which was +It was created by ldns $as_me 1.9.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3029,7 +3029,7 @@ LDNS_VERSION_MAJOR=1 LDNS_VERSION_MINOR=9 -LDNS_VERSION_MICRO=0 +LDNS_VERSION_MICRO=1 # Library version @@ -3050,10 +3050,12 @@ LDNS_VERSION_MICRO=0 # ldns-1.8.1 had libversion 5:0:2 # ldns-1.8.1 had libversion 6:0:3 # ldns-1.8.2 had libversion 7:0:4 -# ldns-1.8.3 has libversion 8:0:5 -# ldns-1.9.0 will have libversion 9:0:6 (new behaviour for dnssec_rrs_add_rr) +# ldns-1.8.3 had libversion 8:0:5 +# ldns-1.8.4 had libversion 9:0:6 +# ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) +# ldns-1.9.1 will have libversion 11:0:0 # -VERSION_INFO=9:0:6 +VERSION_INFO=11:0:0 @@ -20525,7 +20527,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ldns $as_me 1.9.0, which was +This file was extended by ldns $as_me 1.9.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20593,7 +20595,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ldns config.status 1.9.0 +ldns config.status 1.9.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/ldns/configure.ac b/contrib/ldns/configure.ac index 91938e4a3430..a820720d615e 100644 --- a/contrib/ldns/configure.ac +++ b/contrib/ldns/configure.ac @@ -6,7 +6,7 @@ sinclude(acx_nlnetlabs.m4) # must be numbers. ac_defun because of later processing. m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[9]) -m4_define([VERSION_MICRO],[0]) +m4_define([VERSION_MICRO],[1]) AC_INIT([ldns],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[dns-team@nlnetlabs.nl],[libdns]) AC_CONFIG_SRCDIR([packet.c]) # needed to build correct soname @@ -32,10 +32,12 @@ AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO]) # ldns-1.8.1 had libversion 5:0:2 # ldns-1.8.1 had libversion 6:0:3 # ldns-1.8.2 had libversion 7:0:4 -# ldns-1.8.3 has libversion 8:0:5 -# ldns-1.9.0 will have libversion 9:0:6 (new behaviour for dnssec_rrs_add_rr) +# ldns-1.8.3 had libversion 8:0:5 +# ldns-1.8.4 had libversion 9:0:6 +# ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) +# ldns-1.9.1 will have libversion 11:0:0 # -AC_SUBST(VERSION_INFO, [9:0:6]) +AC_SUBST(VERSION_INFO, [11:0:0]) AC_USE_SYSTEM_EXTENSIONS if test "$ac_cv_header_minix_config_h" = "yes"; then diff --git a/contrib/ldns/ldns/config.h b/contrib/ldns/ldns/config.h index c8a1a4291a57..c3398290bef9 100644 --- a/contrib/ldns/ldns/config.h +++ b/contrib/ldns/ldns/config.h @@ -378,7 +378,7 @@ #define PACKAGE_NAME "ldns" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ldns 1.9.0" +#define PACKAGE_STRING "ldns 1.9.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libdns" @@ -387,7 +387,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.9.0" +#define PACKAGE_VERSION "1.9.1" /* Define this to enable RR type AMTRELAY. */ #define RRTYPE_AMTRELAY /**/ diff --git a/contrib/ldns/ldns/util.h b/contrib/ldns/ldns/util.h index aaa34a072fda..898089dfa6e3 100644 --- a/contrib/ldns/ldns/util.h +++ b/contrib/ldns/ldns/util.h @@ -27,8 +27,8 @@ extern "C" { #define dprintf(X,Y) fprintf(stderr, (X), (Y)) /* #define dprintf(X, Y) */ -#define LDNS_VERSION "1.9.0" -#define LDNS_REVISION ((1<<16)|(9<<8)|(0)) +#define LDNS_VERSION "1.9.1" +#define LDNS_REVISION ((1<<16)|(9<<8)|(1)) /** * splint static inline workaround From nobody Wed Jun 24 17:25:35 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 4glpjr1jyQz6jX50 for ; Wed, 24 Jun 2026 17:25:36 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glpjq57SWz3WGP for ; Wed, 24 Jun 2026 17:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782321935; 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=IzNjmmpUBjnEjBafu1kO2ElQHNpkbSE4rds9nCgS/MY=; b=Tf1+6kil9FXlw1KJkrwDHqahzHMEOxQkBtp2K0QxsEH1FCh0PekURKPOb2suv85iD6OAfi cRgxvX7P32XLywO8z08oYas4sO00YRC8uzgu3uiEhL2pZeHClF2xe+32j9HgODjVp17MIh TCTC3JT4WtgHwq/G0kw2AX0fP6+1TmUHr5SjVnDeSPVA3zBda3Q9c4VHPrbThIr4DJ+6nd igaP1BVPJ24DBh855mD7nOSGu+7o8PGmZEQv+Xk3aKTOAqVXNhQL5l9QfsvegyiCjLglWc ukRaEMGR5E+KPE+uGRt7+PlQkrKqxrZPNbc9Rzx705p5r1WbN5QyNyomDNS0pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782321935; a=rsa-sha256; cv=none; b=p20azU7+HOyofpxPR1/IJ7o9jHcuVkItDgohQ7XAcrf3at8PISY+Wv4H0PJ8dC5ddpxUVI 12Ln/xgBItUZZArtob6OQPjj4NFCt0RfMVYpKhQ5EMDVAQlW80wtTOLxBYpn3hWI9VRaDP 0zWumIiiB4oWfJpXaDnLFSGRrRIamvROovVoUImneDmtr9jJDqoPvBFqIfuJJPET3ToL5m NgYsO+YQd1XwIQLJmYV7MHfVve89zrv0tS4K1jJXvGuETry3HikUsCVOKsfFO53Q7183v9 JXHdIVBkXT3A1H2Wh4WCHMfbCCKn98vPG6DQrerNqVHoEnL9AkRkaxsu8xUC7A== 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=1782321935; 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=IzNjmmpUBjnEjBafu1kO2ElQHNpkbSE4rds9nCgS/MY=; b=u+E80p6QsQ6ce0PZxjjA3azpq5ik9c33KQ60+84OEr4BQ0+fqHHhjy6h1FXJ532ajHMP/4 qX/RXmapvvRtRpUaxxFezO9sDvlFK4MYJay2Yhquj8MimSNAYC1UeBm8TtubAm4FADYfqh 25uAoKZM4kcSAYMU5A9euHnmhfuKoTZ+QPvlGk+PTnukyo88JMyokQ06/7hxC0ah6fUczY 8eP9GlzwqS5hYdmEPmplQN8E1hkMSYE6VcHKqQYItzl/7y9eQ/0Pie16j1FVx9fQ6OVgCy /5wJnVEHZjYM35vWDfkepWsuKlg7cntlaqLkN8xhcJ5P65y5VVyi0ECjIXEEtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glpjq3YSQzTmN for ; Wed, 24 Jun 2026 17:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 341ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 17:25:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c31042a7a944 - stable/15 - ldns: Update to 1.9.2 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c31042a7a944fb7a39404fa9f1b68b2befaa919c Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 17:25:35 +0000 Message-Id: <6a3c130f.341ca.65f486a0@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c31042a7a944fb7a39404fa9f1b68b2befaa919c commit c31042a7a944fb7a39404fa9f1b68b2befaa919c Author: Dag-Erling Smørgrav AuthorDate: 2026-06-19 07:26:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-24 17:23:33 +0000 ldns: Update to 1.9.2 Merge commit '3750aed65c1f5a610b44d29c92236ca119b62780' (cherry picked from commit 63442ceae5ed31ad45e401f5fe0010b824bc2b38) --- contrib/ldns/Changelog | 4 ++++ contrib/ldns/configure | 25 +++++++++++++------------ contrib/ldns/configure.ac | 7 ++++--- contrib/ldns/ldns/config.h | 4 ++-- contrib/ldns/ldns/util.h | 4 ++-- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/contrib/ldns/Changelog b/contrib/ldns/Changelog index cd056f0c089d..5f6b2193cdb9 100644 --- a/contrib/ldns/Changelog +++ b/contrib/ldns/Changelog @@ -1,3 +1,7 @@ +1.9.2 2026-06-10 + * Fix to set VERSION_INFO to create .so.3 instead of .so.11 which will + be reserved for a future 1.10.0 release + 1.9.1 2026-06-10 * Bugfix: Insufficient verification that responses belong to a query (CVE-2026-10846). Thanks Pablo Ruiz from 'codecome.ai' diff --git a/contrib/ldns/configure b/contrib/ldns/configure index 7671ed9d2671..0667649dca8f 100755 --- a/contrib/ldns/configure +++ b/contrib/ldns/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ldns 1.9.1. +# Generated by GNU Autoconf 2.71 for ldns 1.9.2. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ldns' PACKAGE_TARNAME='libdns' -PACKAGE_VERSION='1.9.1' -PACKAGE_STRING='ldns 1.9.1' +PACKAGE_VERSION='1.9.2' +PACKAGE_STRING='ldns 1.9.2' PACKAGE_BUGREPORT='dns-team@nlnetlabs.nl' PACKAGE_URL='' @@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ldns 1.9.1 to adapt to many kinds of systems. +\`configure' configures ldns 1.9.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ldns 1.9.1:";; + short | recursive ) echo "Configuration of ldns 1.9.2:";; esac cat <<\_ACEOF @@ -1644,7 +1644,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ldns configure 1.9.1 +ldns configure 1.9.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2263,7 +2263,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ldns $as_me 1.9.1, which was +It was created by ldns $as_me 1.9.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3029,7 +3029,7 @@ LDNS_VERSION_MAJOR=1 LDNS_VERSION_MINOR=9 -LDNS_VERSION_MICRO=1 +LDNS_VERSION_MICRO=2 # Library version @@ -3053,9 +3053,10 @@ LDNS_VERSION_MICRO=1 # ldns-1.8.3 had libversion 8:0:5 # ldns-1.8.4 had libversion 9:0:6 # ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) -# ldns-1.9.1 will have libversion 11:0:0 +# ldns-1.9.1 had libversion 11:0:0 (but should have had 10:0:7 with 11:0:0 reserved for the ldns-1.10.0 release) +# ldns-1.9.2 has libversion 12:0:9 # -VERSION_INFO=11:0:0 +VERSION_INFO=12:0:9 @@ -20527,7 +20528,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ldns $as_me 1.9.1, which was +This file was extended by ldns $as_me 1.9.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20595,7 +20596,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ldns config.status 1.9.1 +ldns config.status 1.9.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/ldns/configure.ac b/contrib/ldns/configure.ac index a820720d615e..eaf605e0a1ec 100644 --- a/contrib/ldns/configure.ac +++ b/contrib/ldns/configure.ac @@ -6,7 +6,7 @@ sinclude(acx_nlnetlabs.m4) # must be numbers. ac_defun because of later processing. m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[9]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MICRO],[2]) AC_INIT([ldns],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[dns-team@nlnetlabs.nl],[libdns]) AC_CONFIG_SRCDIR([packet.c]) # needed to build correct soname @@ -35,9 +35,10 @@ AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO]) # ldns-1.8.3 had libversion 8:0:5 # ldns-1.8.4 had libversion 9:0:6 # ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) -# ldns-1.9.1 will have libversion 11:0:0 +# ldns-1.9.1 had libversion 11:0:0 (but should have had 10:0:7 with 11:0:0 reserved for the ldns-1.10.0 release) +# ldns-1.9.2 has libversion 12:0:9 # -AC_SUBST(VERSION_INFO, [11:0:0]) +AC_SUBST(VERSION_INFO, [12:0:9]) AC_USE_SYSTEM_EXTENSIONS if test "$ac_cv_header_minix_config_h" = "yes"; then diff --git a/contrib/ldns/ldns/config.h b/contrib/ldns/ldns/config.h index c3398290bef9..ce506d4e1ec0 100644 --- a/contrib/ldns/ldns/config.h +++ b/contrib/ldns/ldns/config.h @@ -378,7 +378,7 @@ #define PACKAGE_NAME "ldns" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ldns 1.9.1" +#define PACKAGE_STRING "ldns 1.9.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libdns" @@ -387,7 +387,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.9.1" +#define PACKAGE_VERSION "1.9.2" /* Define this to enable RR type AMTRELAY. */ #define RRTYPE_AMTRELAY /**/ diff --git a/contrib/ldns/ldns/util.h b/contrib/ldns/ldns/util.h index 898089dfa6e3..8726d5bf1f1a 100644 --- a/contrib/ldns/ldns/util.h +++ b/contrib/ldns/ldns/util.h @@ -27,8 +27,8 @@ extern "C" { #define dprintf(X,Y) fprintf(stderr, (X), (Y)) /* #define dprintf(X, Y) */ -#define LDNS_VERSION "1.9.1" -#define LDNS_REVISION ((1<<16)|(9<<8)|(1)) +#define LDNS_VERSION "1.9.2" +#define LDNS_REVISION ((1<<16)|(9<<8)|(2)) /** * splint static inline workaround From nobody Wed Jun 24 17:25:57 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 4glpkG5YTlz6jWgF for ; Wed, 24 Jun 2026 17:25:58 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glpkG0rzFz3Wgt for ; Wed, 24 Jun 2026 17:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782321958; 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=drEipIUCK8rGdLUFxsATLWlyp+F7U6xNLMhs7zxWOjw=; b=L65JBwYgHTLrFI/n09YryL4QH0nIGstF6EjOIE5Nnxr32yFoYbc55ebh4on5jqmz/uYW+o NgBWUvPIBrUo+MjxYCJAMSuwPtJzfxvRACRJi+5NWwQyWCWoR7Fnyaox4+pXSsqm3sS+3f 6DTbJ2ZSVqaiZFCXLgvDyP3X6jGCgRM53nrbZe82Aa8dDQJ9orF5VfcF8foBTtLlbkcigJ Pj/KG2X/Twbbqf36kpcwT1AXi5TDEkSjJIxGHOh8Yk2MsqS9O3W2R5zNE8SiPeTKtqy5LL 1x0cF6PPn4jtXwHZnTj7itOm9Mwhlwe13q8UJitHQ3AYogC3KaQY1vYIxxiprw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782321958; a=rsa-sha256; cv=none; b=qRa5ovXnFFqGIC4IjH6Ek7/nMp6I5IPPo9ngkRl0no21oSTbn3CUSEZFlmYPPsYfyXZUZq CBTvclfGEwPIbjAPPyVaWAi/AODVgI13eMTJaD7dhf8txfQYeD475ihn51TbrZC4+prVsp PYIUyPZlNNXiz6jtYKFYttqPO0NifnJOh/hctGN4A+rMboYS04tlTuVFjdA8TahsLPRWLl /d4gLrn3wGhAGquqqGiQvc43SRtozFHxndFObyxENidr/nMw9q4ir6PiDKfWIK9fY+wFc8 fXjH0OkAgQm7r9XDO5Hs5z+KfIj7KEG/l81cwmcgHsacT1bk0A8u3zBYwvPCmg== 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=1782321958; 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=drEipIUCK8rGdLUFxsATLWlyp+F7U6xNLMhs7zxWOjw=; b=Hng2889PtN1cHICWQNpW6orwwN3+0KcgV+giYujUNR6NSf6HWaUaz+CXa4pGHCT9JsYYw2 dbkKLpzljI40B/jBICgV008DFFyvPlnum2cHASh14xwsfpqwJMC4rEXrU+YiMSWwS6q/VW fHXDcEbPFUPz85yMOh3GSz0RTRfiGdtmK4Xtm1gr1LOl/nnyhdt8ds6hjkVTUQjtz/W5jw usReR6z+5cgis9qSmTVVpFHOLDHQtduKEEgVVQFVUQ6yiss6xQw40vazNBL9plZHlU5CWt 0PYf6R0RBpSUyteEjbEw6BfyIiQaa/+PtguRaOEEMr9fSrYpfFvWfMp2QHRhCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glpkF6rl5zTjp for ; Wed, 24 Jun 2026 17:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36b27 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 17:25:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a878e7b4985f - stable/14 - ldns: Update to 1.9.1 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a878e7b4985f0c178b9d49a6cd80c2eade9b77e3 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 17:25:57 +0000 Message-Id: <6a3c1325.36b27.139ee49b@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a878e7b4985f0c178b9d49a6cd80c2eade9b77e3 commit a878e7b4985f0c178b9d49a6cd80c2eade9b77e3 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-19 07:24:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-24 17:25:00 +0000 ldns: Update to 1.9.1 Merge commit '026e5b88eb0cde54d9fc22b9a1ebc79ea0f67aec' (cherry picked from commit 4593470d16714d83ac06a3ccc319f998a02ced07) --- contrib/ldns/Changelog | 4 ++++ contrib/ldns/config.guess | 17 +++++++++++------ contrib/ldns/config.sub | 11 ++++++----- contrib/ldns/configure | 28 +++++++++++++++------------- contrib/ldns/configure.ac | 10 ++++++---- contrib/ldns/ldns/config.h | 4 ++-- contrib/ldns/ldns/util.h | 4 ++-- 7 files changed, 46 insertions(+), 32 deletions(-) diff --git a/contrib/ldns/Changelog b/contrib/ldns/Changelog index 74e2631af72d..cd056f0c089d 100644 --- a/contrib/ldns/Changelog +++ b/contrib/ldns/Changelog @@ -1,3 +1,7 @@ +1.9.1 2026-06-10 + * Bugfix: Insufficient verification that responses belong to a + query (CVE-2026-10846). Thanks Pablo Ruiz from 'codecome.ai' + 1.9.0 2025-12-04 * PR #246: Make ldns_calc_keytag() available for CDNSKEY RR Thanks tgreenx and pnax diff --git a/contrib/ldns/config.guess b/contrib/ldns/config.guess index a9d01fde4617..c7f4c3294a63 100755 --- a/contrib/ldns/config.guess +++ b/contrib/ldns/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2025 Free Software Foundation, Inc. +# Copyright 1992-2026 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2025-07-10' +timestamp='2026-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2025 Free Software Foundation, Inc. +Copyright 1992-2026 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -150,7 +150,7 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case $UNAME_SYSTEM in -Linux|GNU|GNU/*) +Ironclad|Linux|GNU|GNU/*) LIBC=unknown set_cc_for_build @@ -167,6 +167,8 @@ Linux|GNU|GNU/*) LIBC=gnu #elif defined(__LLVM_LIBC__) LIBC=llvm + #elif defined(__mlibc__) + LIBC=mlibc #else #include /* First heuristic to detect musl libc. */ @@ -1186,6 +1188,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; + sw_64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; @@ -1598,10 +1603,10 @@ EOF GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*) - GUESS=$UNAME_MACHINE-pc-ironclad-mlibc + GUESS=$UNAME_MACHINE-pc-ironclad-$LIBC ;; *:[Ii]ronclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc + GUESS=$UNAME_MACHINE-unknown-ironclad-$LIBC ;; esac diff --git a/contrib/ldns/config.sub b/contrib/ldns/config.sub index 3d35cde174de..404aa0824443 100755 --- a/contrib/ldns/config.sub +++ b/contrib/ldns/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2025 Free Software Foundation, Inc. +# Copyright 1992-2026 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale -timestamp='2025-07-10' +timestamp='2026-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2025 Free Software Foundation, Inc. +Copyright 1992-2026 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1432,6 +1432,7 @@ case $cpu-$vendor in | sparcv9v \ | spu \ | sv1 \ + | sw_64 \ | sx* \ | tahoe \ | thumbv7* \ @@ -1525,7 +1526,7 @@ EOF ;; ironclad*) kernel=ironclad - os=`echo "$basic_os" | sed -e 's|ironclad|mlibc|'` + os=`echo "$basic_os" | sed -e 's|ironclad|gnu|'` ;; linux*) kernel=linux @@ -2220,7 +2221,7 @@ case $kernel-$os-$obj in ;; uclinux-uclibc*- | uclinux-gnu*- ) ;; - ironclad-mlibc*-) + ironclad-gnu*- | ironclad-mlibc*- ) ;; managarm-mlibc*- | managarm-kernel*- ) ;; diff --git a/contrib/ldns/configure b/contrib/ldns/configure index b731de6c2933..7671ed9d2671 100755 --- a/contrib/ldns/configure +++ b/contrib/ldns/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ldns 1.9.0. +# Generated by GNU Autoconf 2.71 for ldns 1.9.1. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ldns' PACKAGE_TARNAME='libdns' -PACKAGE_VERSION='1.9.0' -PACKAGE_STRING='ldns 1.9.0' +PACKAGE_VERSION='1.9.1' +PACKAGE_STRING='ldns 1.9.1' PACKAGE_BUGREPORT='dns-team@nlnetlabs.nl' PACKAGE_URL='' @@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ldns 1.9.0 to adapt to many kinds of systems. +\`configure' configures ldns 1.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ldns 1.9.0:";; + short | recursive ) echo "Configuration of ldns 1.9.1:";; esac cat <<\_ACEOF @@ -1644,7 +1644,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ldns configure 1.9.0 +ldns configure 1.9.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2263,7 +2263,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ldns $as_me 1.9.0, which was +It was created by ldns $as_me 1.9.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3029,7 +3029,7 @@ LDNS_VERSION_MAJOR=1 LDNS_VERSION_MINOR=9 -LDNS_VERSION_MICRO=0 +LDNS_VERSION_MICRO=1 # Library version @@ -3050,10 +3050,12 @@ LDNS_VERSION_MICRO=0 # ldns-1.8.1 had libversion 5:0:2 # ldns-1.8.1 had libversion 6:0:3 # ldns-1.8.2 had libversion 7:0:4 -# ldns-1.8.3 has libversion 8:0:5 -# ldns-1.9.0 will have libversion 9:0:6 (new behaviour for dnssec_rrs_add_rr) +# ldns-1.8.3 had libversion 8:0:5 +# ldns-1.8.4 had libversion 9:0:6 +# ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) +# ldns-1.9.1 will have libversion 11:0:0 # -VERSION_INFO=9:0:6 +VERSION_INFO=11:0:0 @@ -20525,7 +20527,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ldns $as_me 1.9.0, which was +This file was extended by ldns $as_me 1.9.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20593,7 +20595,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ldns config.status 1.9.0 +ldns config.status 1.9.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/ldns/configure.ac b/contrib/ldns/configure.ac index 91938e4a3430..a820720d615e 100644 --- a/contrib/ldns/configure.ac +++ b/contrib/ldns/configure.ac @@ -6,7 +6,7 @@ sinclude(acx_nlnetlabs.m4) # must be numbers. ac_defun because of later processing. m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[9]) -m4_define([VERSION_MICRO],[0]) +m4_define([VERSION_MICRO],[1]) AC_INIT([ldns],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[dns-team@nlnetlabs.nl],[libdns]) AC_CONFIG_SRCDIR([packet.c]) # needed to build correct soname @@ -32,10 +32,12 @@ AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO]) # ldns-1.8.1 had libversion 5:0:2 # ldns-1.8.1 had libversion 6:0:3 # ldns-1.8.2 had libversion 7:0:4 -# ldns-1.8.3 has libversion 8:0:5 -# ldns-1.9.0 will have libversion 9:0:6 (new behaviour for dnssec_rrs_add_rr) +# ldns-1.8.3 had libversion 8:0:5 +# ldns-1.8.4 had libversion 9:0:6 +# ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) +# ldns-1.9.1 will have libversion 11:0:0 # -AC_SUBST(VERSION_INFO, [9:0:6]) +AC_SUBST(VERSION_INFO, [11:0:0]) AC_USE_SYSTEM_EXTENSIONS if test "$ac_cv_header_minix_config_h" = "yes"; then diff --git a/contrib/ldns/ldns/config.h b/contrib/ldns/ldns/config.h index c8a1a4291a57..c3398290bef9 100644 --- a/contrib/ldns/ldns/config.h +++ b/contrib/ldns/ldns/config.h @@ -378,7 +378,7 @@ #define PACKAGE_NAME "ldns" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ldns 1.9.0" +#define PACKAGE_STRING "ldns 1.9.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libdns" @@ -387,7 +387,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.9.0" +#define PACKAGE_VERSION "1.9.1" /* Define this to enable RR type AMTRELAY. */ #define RRTYPE_AMTRELAY /**/ diff --git a/contrib/ldns/ldns/util.h b/contrib/ldns/ldns/util.h index aaa34a072fda..898089dfa6e3 100644 --- a/contrib/ldns/ldns/util.h +++ b/contrib/ldns/ldns/util.h @@ -27,8 +27,8 @@ extern "C" { #define dprintf(X,Y) fprintf(stderr, (X), (Y)) /* #define dprintf(X, Y) */ -#define LDNS_VERSION "1.9.0" -#define LDNS_REVISION ((1<<16)|(9<<8)|(0)) +#define LDNS_VERSION "1.9.1" +#define LDNS_REVISION ((1<<16)|(9<<8)|(1)) /** * splint static inline workaround From nobody Wed Jun 24 17:25:59 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 4glpkH4JpZz6jX55 for ; Wed, 24 Jun 2026 17:25:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glpkH1sWyz3Wpq for ; Wed, 24 Jun 2026 17:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782321959; 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=9LLbvX0DdJZO6Ol4OXG8HpuUQCNTtuk1sFH/ireMdcQ=; b=fn1FZEO6Q2FDqz8qQcvvUXT8al3zz3ovT7UQk6aBG3jPzR56zPWz24Ou7lYUxCvMy1eW2a I2GfkW7jesCqKWkXPJ5QSGW4AYVf7L6YnjPqWIzCedxZRDMxx8/ai2w4Y4YGCGKbKuGxC2 drRa+VZp31n8OlYTgtIlCkwo99bTcZ6EwWVOdeHJIG2+9qSMzXNeh1CfeVwmB4wTCAqEb+ TgMbYFRdumK0q35sGDucFGohPCEzvl0mgmX7i4GvHtK7374jLiMPzhtaysp06Sx6nV+STo 726m1uHN0wgjt8QOi0knzmkpkMXjliq/Foe1liHgX1NCp0I7frilMMtjbTpR1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782321959; a=rsa-sha256; cv=none; b=KjVIDrcREM2mpCoTAC58gwVwkRQ7M6UZZJZI7svZVC7cu/ccfG+jsTtrC56FuGz8elTlkV kOLpwFlu/kAH799LoLHD5Z7tl0NpB6mM3BRkaCgvVzVO1QGY8gk5l8jIuFKI8bFp7qdMnB MXlkUd3GwfAy7QU4OxS+iZBsQaN+3CkQrClk6RPN42F9ujd5zGLZETLfOGrRgbuC6z2SWE D4P6EG0o9m3D7oW+pJbWjyT6bErTrCgFFj9WQnfpqrM1O7gHQq3pbCQgPmbIh/3vX468vz Z2Pi7poR8BuEmLt6LJJAZ/raeluvMnM6havMGG0/sRTjBp4KEEBLGpkirNBaXQ== 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=1782321959; 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=9LLbvX0DdJZO6Ol4OXG8HpuUQCNTtuk1sFH/ireMdcQ=; b=wqVKqHAj72038FgkI7bk+GLofP8QUiDsfWfd9+t4z90ksHkcHFc2z0QocXvsWp8ULgi8Hf K3muPmkz0TGIy7lkbzKzsfZpS6ORKvU3lWReAhIpD01IddsxBiP9/MEk7lCi3VOQU9AbYK yttw3TUXuf/OGzsra/zpRes0/eYoCX3seXp6VqUDtkHNaAnKVJg9rwsVdbHoY6tD5FvXkx MjPkzWpwScC+LRCbFjocQ/fbIDnfv1Qvu58+vTbRGdq5YkgQuMnkSuIINydEQqJvcsQu+M ZnFRkQmhKnUiJIKC8vji4M9Ogu050ez9Fh9j12jO1gSfp99MXLRt04JKqtQ9GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glpkH0h8QzTpf for ; Wed, 24 Jun 2026 17:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 17:25:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 222648172b80 - stable/14 - ldns: Update to 1.9.2 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 222648172b80e27e06ea83d60f50f9d9ed75dfbc Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 17:25:59 +0000 Message-Id: <6a3c1327.33b69.5c812a6@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=222648172b80e27e06ea83d60f50f9d9ed75dfbc commit 222648172b80e27e06ea83d60f50f9d9ed75dfbc Author: Dag-Erling Smørgrav AuthorDate: 2026-06-19 07:26:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-24 17:25:03 +0000 ldns: Update to 1.9.2 Merge commit '3750aed65c1f5a610b44d29c92236ca119b62780' (cherry picked from commit 63442ceae5ed31ad45e401f5fe0010b824bc2b38) --- contrib/ldns/Changelog | 4 ++++ contrib/ldns/configure | 25 +++++++++++++------------ contrib/ldns/configure.ac | 7 ++++--- contrib/ldns/ldns/config.h | 4 ++-- contrib/ldns/ldns/util.h | 4 ++-- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/contrib/ldns/Changelog b/contrib/ldns/Changelog index cd056f0c089d..5f6b2193cdb9 100644 --- a/contrib/ldns/Changelog +++ b/contrib/ldns/Changelog @@ -1,3 +1,7 @@ +1.9.2 2026-06-10 + * Fix to set VERSION_INFO to create .so.3 instead of .so.11 which will + be reserved for a future 1.10.0 release + 1.9.1 2026-06-10 * Bugfix: Insufficient verification that responses belong to a query (CVE-2026-10846). Thanks Pablo Ruiz from 'codecome.ai' diff --git a/contrib/ldns/configure b/contrib/ldns/configure index 7671ed9d2671..0667649dca8f 100755 --- a/contrib/ldns/configure +++ b/contrib/ldns/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ldns 1.9.1. +# Generated by GNU Autoconf 2.71 for ldns 1.9.2. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ldns' PACKAGE_TARNAME='libdns' -PACKAGE_VERSION='1.9.1' -PACKAGE_STRING='ldns 1.9.1' +PACKAGE_VERSION='1.9.2' +PACKAGE_STRING='ldns 1.9.2' PACKAGE_BUGREPORT='dns-team@nlnetlabs.nl' PACKAGE_URL='' @@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ldns 1.9.1 to adapt to many kinds of systems. +\`configure' configures ldns 1.9.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ldns 1.9.1:";; + short | recursive ) echo "Configuration of ldns 1.9.2:";; esac cat <<\_ACEOF @@ -1644,7 +1644,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ldns configure 1.9.1 +ldns configure 1.9.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2263,7 +2263,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ldns $as_me 1.9.1, which was +It was created by ldns $as_me 1.9.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3029,7 +3029,7 @@ LDNS_VERSION_MAJOR=1 LDNS_VERSION_MINOR=9 -LDNS_VERSION_MICRO=1 +LDNS_VERSION_MICRO=2 # Library version @@ -3053,9 +3053,10 @@ LDNS_VERSION_MICRO=1 # ldns-1.8.3 had libversion 8:0:5 # ldns-1.8.4 had libversion 9:0:6 # ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) -# ldns-1.9.1 will have libversion 11:0:0 +# ldns-1.9.1 had libversion 11:0:0 (but should have had 10:0:7 with 11:0:0 reserved for the ldns-1.10.0 release) +# ldns-1.9.2 has libversion 12:0:9 # -VERSION_INFO=11:0:0 +VERSION_INFO=12:0:9 @@ -20527,7 +20528,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ldns $as_me 1.9.1, which was +This file was extended by ldns $as_me 1.9.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20595,7 +20596,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ldns config.status 1.9.1 +ldns config.status 1.9.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/ldns/configure.ac b/contrib/ldns/configure.ac index a820720d615e..eaf605e0a1ec 100644 --- a/contrib/ldns/configure.ac +++ b/contrib/ldns/configure.ac @@ -6,7 +6,7 @@ sinclude(acx_nlnetlabs.m4) # must be numbers. ac_defun because of later processing. m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[9]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MICRO],[2]) AC_INIT([ldns],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[dns-team@nlnetlabs.nl],[libdns]) AC_CONFIG_SRCDIR([packet.c]) # needed to build correct soname @@ -35,9 +35,10 @@ AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO]) # ldns-1.8.3 had libversion 8:0:5 # ldns-1.8.4 had libversion 9:0:6 # ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) -# ldns-1.9.1 will have libversion 11:0:0 +# ldns-1.9.1 had libversion 11:0:0 (but should have had 10:0:7 with 11:0:0 reserved for the ldns-1.10.0 release) +# ldns-1.9.2 has libversion 12:0:9 # -AC_SUBST(VERSION_INFO, [11:0:0]) +AC_SUBST(VERSION_INFO, [12:0:9]) AC_USE_SYSTEM_EXTENSIONS if test "$ac_cv_header_minix_config_h" = "yes"; then diff --git a/contrib/ldns/ldns/config.h b/contrib/ldns/ldns/config.h index c3398290bef9..ce506d4e1ec0 100644 --- a/contrib/ldns/ldns/config.h +++ b/contrib/ldns/ldns/config.h @@ -378,7 +378,7 @@ #define PACKAGE_NAME "ldns" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ldns 1.9.1" +#define PACKAGE_STRING "ldns 1.9.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libdns" @@ -387,7 +387,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.9.1" +#define PACKAGE_VERSION "1.9.2" /* Define this to enable RR type AMTRELAY. */ #define RRTYPE_AMTRELAY /**/ diff --git a/contrib/ldns/ldns/util.h b/contrib/ldns/ldns/util.h index 898089dfa6e3..8726d5bf1f1a 100644 --- a/contrib/ldns/ldns/util.h +++ b/contrib/ldns/ldns/util.h @@ -27,8 +27,8 @@ extern "C" { #define dprintf(X,Y) fprintf(stderr, (X), (Y)) /* #define dprintf(X, Y) */ -#define LDNS_VERSION "1.9.1" -#define LDNS_REVISION ((1<<16)|(9<<8)|(1)) +#define LDNS_VERSION "1.9.2" +#define LDNS_REVISION ((1<<16)|(9<<8)|(2)) /** * splint static inline workaround From nobody Wed Jun 24 17:48:03 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 4glqCm03VQz6jZ18 for ; Wed, 24 Jun 2026 17:48:04 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glqCl4DnDz3bsR for ; Wed, 24 Jun 2026 17:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782323283; 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=xpoU+ivVuCaCkLlgtp4LI2qdOM5budW7NG5qk43u1fQ=; b=lRXIa2ozgpHvyH3nIVvvUu5+HjR6hWC/+SIlBL0Y/oEk+QK0zT/lEBfbAr8Z+uIgPl8C3M aCz0+O4aYQB/kS8+eZcEkm+3JChuiMPorpRYiceLHn/fLofg1j18Ve6zuHRKDQfvGDFqF8 sNzU+Ddn9sPPQF1aY8/K87YiW1sjFNRgJToNF9CNPbBBtTDs2d4ql4EzihPMh7OtP90DzS /noYBFWDozNLWC+n2iQjDvq0H7iZtjeHfLGSayt78oTTcKgTe6d28nnHUvldoVF3QlDBKG O9824f8qpNUtGKOOeyJp81jK+7yaZWvmYvSfiOLkxw4dJY8xd8WzCbxcCz+Fig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782323283; a=rsa-sha256; cv=none; b=qOJxcyBk226UHn9PlAXGLgjou7cjK7c/4mO/vExBpLZzl25UZc3oYqRx0HyHheKeOWSfck lOhsHFrU7R1on5L5gAIweqi5xcIpp29z/4/zp6EblVejGxwBBFPrpdBYA/hqje0LmK5l5s bZCNHwyPWwMIdFxfqnZNYloK3Gnc8Bfi9+K9gnk7H0fBn91qng4GuQoOnvDrYHfpjwk6w6 dM+TnZyXzFeWABE+p5bSKCNBhOnkaCcRQBxZLTYmipSV+LXffKx+HgG5qD2Vzg3D3uh1JA g0oSnBT8cV0qWv/TQzpjvj85EzqY3pnTN9iYVPQVucUQPrSsFNIyVdGE3a+ueg== 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=1782323283; 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=xpoU+ivVuCaCkLlgtp4LI2qdOM5budW7NG5qk43u1fQ=; b=FLFMJQFii/op1AKoUdSpaJwAWwKywzBcEEpgE6IfnkZL0wreFD9sfahRdM85s+2BLGODPr CDlbTmvTOgTAR2vJN6UK08fokYe0DSHmcL6315O5ulIpvkhB9iJFcsmV7XIeUKwbzdQ5nw /ieoioMTV1hEe4tEctXQuwegyIhObe/1CJlseQRe7NC4u2051qtMtDsCQCc3X0B5XGgfuY sJFVevtwApCgLbDwYo+ha6F5C9kYMu++jZno4NbhIhiDQ25eCoil5wihq+se/lShVMbjel GaFCgrSHvNTxrjaHH5bCEJMHqYJOD85FltLz6Y+O7EWP6BniaBEh7HyaQSB+Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glqCl2q51zVDg for ; Wed, 24 Jun 2026 17:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37a39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 17:48:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 315238df5323 - stable/15 - jail: call PR_METHOD_ATTACH again (with old jail) if the first call fails 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 315238df53233a35752146cf291a37049a4656a3 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 17:48:03 +0000 Message-Id: <6a3c1853.37a39.43fa584b@gitrepo.freebsd.org> The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=315238df53233a35752146cf291a37049a4656a3 commit 315238df53233a35752146cf291a37049a4656a3 Author: Jamie Gritton AuthorDate: 2026-06-19 19:45:27 +0000 Commit: Jamie Gritton CommitDate: 2026-06-24 17:47:43 +0000 jail: call PR_METHOD_ATTACH again (with old jail) if the first call fails jail_attach lets modules do attachment-specific work by calling osd_jail_call(PR_METHOD_ATTACH). If one of the modules returns an error, the call needs to be repeated with the thread's current prison, so possible earlier modules and undo any changes they may have made. (cherry picked from commit e91e8ebefadcce9d57c8ff945ff70050cbbe1ce1) --- sys/kern/kern_jail.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 43acde461e40..72ccbdf77550 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3024,10 +3024,8 @@ do_jail_attach(struct thread *td, struct prison *pr, int drflags) /* Let modules do whatever they need to prepare for attaching. */ error = osd_jail_call(pr, PR_METHOD_ATTACH, td); - if (error) { - prison_deref(pr, drflags); - return (error); - } + if (error) + goto e_revert_osd; sx_unlock(&allprison_lock); drflags &= ~(PD_LIST_SLOCKED | PD_LIST_XLOCKED); @@ -3093,8 +3091,10 @@ do_jail_attach(struct thread *td, struct prison *pr, int drflags) VOP_UNLOCK(pr->pr_root); e_revert_osd: /* Tell modules this thread is still in its old jail after all. */ - sx_slock(&allprison_lock); - drflags |= PD_LIST_SLOCKED; + if (!(drflags & (PD_LIST_SLOCKED | PD_LIST_XLOCKED))) { + sx_slock(&allprison_lock); + drflags |= PD_LIST_SLOCKED; + } (void)osd_jail_call(td->td_ucred->cr_prison, PR_METHOD_ATTACH, td); prison_deref(pr, drflags); return (error); From nobody Thu Jun 25 00:49:54 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 4gm0ZV6l3xz6k5Gs for ; Thu, 25 Jun 2026 00:49:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gm0ZV6FWnz3ZVV for ; Thu, 25 Jun 2026 00:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782348594; 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=kX9lCt9+aEBNGWFwippqvVSLlcaKQtjzXSuq1PGKJvQ=; b=b/4f9CzeyoGfuTfNfqapM3Kfu2EELIBGsr85p/43zjxK5M0MGcmjoGyC3IVvdqKEXuJYsY gAtlu1QwCn8gkaAA5OPeXRRQMr/4bQamwqcPJmKqXPN6FZPyGJvmTR8iBkfPlBihXNub1X 8V1kiyJ6rQofjSxBh5UaGWEQBWgCJPR74i+1rpSzLxymjnTeBX6YPp70mGRhsCPrXZtFeX ixFsWwE8eCb5ad6WC1veIZoCvYZosFoN4tgsAzHcQNQS6RZDXJMNjz6kFKrmUTkwrmRlvr 2y1k0yZ03atbW+cFi+EfHVj3KEGvo1L0FFGS91GMCcr6ujgbS+AOsj82RO6Y9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348594; a=rsa-sha256; cv=none; b=kldYh2QPHN6jtbkF26pd7Ao8WStp3pbBxdfMlZ2H7nT7YsAFBl4ZiFF1NJKAZEzxqerzxz nzimGhBUkXvgOcg3VbOV1B7Tndxfur332rOLodFPEPtQGy7ESOb92rThTfMh8NXMgUbygO 0RrhhZpRdvIM10Ut1GisY5wsEyKrWJRtOMWf4nal8V5PNBiqNv68ojv8Kds+KcXjtff8CT lb2is6m6r8smaqwSkq+GaeP4c+ihkm3euf3aDl6SxY7FHyUtQsEQTT1gKORRVpfbU6j7Eb dTDAwPFsaq2hUYK8ow6+Dq0KpFcLkAJv/O9xPjxWGgJ0vnymBpLPzHTvk9s1Xg== 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=1782348594; 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=kX9lCt9+aEBNGWFwippqvVSLlcaKQtjzXSuq1PGKJvQ=; b=aD6ZH6xh1cCVVRGmWvvuc3hs3Fvi7kQs5wGamCcBzBIwfevAG7WQhWxkGP0PijK9jm+iuT ILqbyYIu62v+6LlXQWgSvpHz9ddSFkGoq4cQKyBBTbHEExo9CcAy4Yol+HimoWafob70s0 D5S855SBAVCNTDkJfEAy8QNFEgI32b1k41tpPPees2Gwz0/l5L+6ZBJ/cYnod2T4pdU4J4 80Whw8S2fHVTlOjJMsjrJ08Hf/lb52Rh2zEIw9yxLL07oinpU0bh5kap60acfeQsunWfDe njfq4dhqC37zTgKbLkfQdSiUurCbkEcoGv3BVqY+KIAVQapm0SII6nxaAetFVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0ZV5JBbzkL4 for ; Thu, 25 Jun 2026 00:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d288 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 00:49:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 3a3d12112483 - stable/15 - nfs_clvnops.c: Fix the case where va_flags are being cleared 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3a3d12112483d22624971ca97c8b975329416122 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 00:49:54 +0000 Message-Id: <6a3c7b32.3d288.479e8330@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3a3d12112483d22624971ca97c8b975329416122 commit 3a3d12112483d22624971ca97c8b975329416122 Author: Rick Macklem AuthorDate: 2026-06-18 00:30:29 +0000 Commit: Rick Macklem CommitDate: 2026-06-25 00:48:15 +0000 nfs_clvnops.c: Fix the case where va_flags are being cleared Commits c5d72d2 and 3b6d4c6 broke the case where the archive/hidden/system attributes are being set false (UF_ARCHIVE, UF_HIDDEN or UF_SYSTEM bits being cleared.) and the NFS server does not support those attributes. These patches only checked for support if the archive/hidden/system attributes were non-zero. This patch fixes the problem. PR: 296088 (cherry picked from commit 572680712c317b81d66475203ac1b9d6bbeca5d5) --- sys/fs/nfsclient/nfs_clvnops.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 6b0531dda504..ecaa27a0f889 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1033,12 +1033,9 @@ nfs_setattr(struct vop_setattr_args *ap) nmp = VFSTONFS(vp->v_mount); if (vap->va_flags != VNOVAL && (!NFSHASNFSV4(nmp) || (vap->va_flags & ~(UF_ARCHIVE | UF_HIDDEN | UF_SYSTEM)) != 0 || - ((vap->va_flags & UF_ARCHIVE) != 0 && - !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_ARCHIVE)) || - ((vap->va_flags & UF_HIDDEN) != 0 && - !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN)) || - ((vap->va_flags & UF_SYSTEM) != 0 && - !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM)))) + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_ARCHIVE) || + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN) || + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM))) return (EOPNOTSUPP); /* From nobody Thu Jun 25 00:50:52 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 4gm0bc5krmz6k5BQ for ; Thu, 25 Jun 2026 00:50:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gm0bc4nBWz3Zng for ; Thu, 25 Jun 2026 00:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782348652; 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=uOrC2Cvc4PtPGpWrnwuis0Vv8aek/Pso+DcYDU64S/k=; b=D8hO2eDS3iPvT2y4XeYvTAtY8u5Z/oC7r6H7nf53M3OoVncUBugjHTyCTzmr9OhkbsIQ0z hjApS86wldYl9kNUEo30MPo/xX1ncbRbK5xLQY7AjC2Nc/GEDyvb8TsaxHE+q56UWSl2/F upy5NKU5ksVdoFdlY2gMmLl5w2/dzS+g2euzUzrqK0ey9Q/4umVZkxIpiNJ9aAq7rA/9MD R+/ZzK6hfoffpbA5DKsIbkbu4UYXIpDYJ9hk2C/+qYkJt9ciY02FGsmJ1VvsiMtp+qgsvk AJOQFrY/gp8lcdwT4RCDlKIkWO37IB8Zi4bfgcSgFro5fgzjnJaGzMCNctM6Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348652; a=rsa-sha256; cv=none; b=L5zH5m88TFkNS2yjvEV07NZwQ/ZB7fQQY5b2VpRIMCsOfsDSYoG6Lr5eCjEEqZ2LjJrBgT A71rGG9RAZ2GDNwaMVLe7SIamhvZtvqTD8MSSlq5qRNtZD0aSIjVhiKSiakqIVjIJnKO3a rUi1eYcgwvAEcB7dzo6h/RfTRxObGEelkYYbhl+pT+cuVlq2uSsVK3HKMle3Ec9YyGUccd 2RS/vwRQSmXzQdZx9Q5qwqbfEBrFloTW+9SR2odnatwRQ2DC3xTADbhN7xVTPFtpc3YYni wEBbw4zNrIw/WKPH2CjHPHGbjQKcJpNS5v9hxVL00O7yYElwMrlWc9n5OnxIRQ== 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=1782348652; 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=uOrC2Cvc4PtPGpWrnwuis0Vv8aek/Pso+DcYDU64S/k=; b=Iuh2O+98kKURXBAjeTLv8q2jk2Aci/K6994IiANDRZRJDJVcWvKBLBhVlWm1Tu0Mpy1wUf dUIYbHtrxF+oN2RfeD+ZLF2MLzCvVx+w24t0c5/4dhuKEYWk2zuenhY62CJp18Kp7b6Y4D SCsug5ZsbA+sLB5c9HRhTr2U/VvIxQh3z5J/ocXkjd0dElIORVCLI/AnoknD9ml14F/Mo9 btJr/Nlxb/+ta83L4dRv1aA8qKdaxZ4YvargLbprYOmEF8TC9FWx4CM2DCqJ3bMwMQqIyA NkeKC6YPso6XKxm19KP4K6sYkbV23saQndRnOYP/CugUTzOKCJYjBSO1e64BhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0bc3jKWzk4P for ; Thu, 25 Jun 2026 00:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 00:50:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 98172618820e - stable/15 - efirt(9): in verbose mode, announce the attachment and fw spec version 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 98172618820e5960f9ffa674e74f72e8965bc3f4 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 00:50:52 +0000 Message-Id: <6a3c7b6c.3df4f.466726e3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=98172618820e5960f9ffa674e74f72e8965bc3f4 commit 98172618820e5960f9ffa674e74f72e8965bc3f4 Author: Konstantin Belousov AuthorDate: 2026-06-20 13:52:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-25 00:50:22 +0000 efirt(9): in verbose mode, announce the attachment and fw spec version (cherry picked from commit 43fb5b33b00f3b66ec03ab3e0ea002afd16cb7b3) --- sys/dev/efidev/efirt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index b55c1c191077..d6a572720c37 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -234,6 +234,8 @@ efi_init(void) return (ENXIO); } + rtdm = (struct efi_rt *)efi_phys_to_kva((uintptr_t)efi_runtime); + #if defined(__aarch64__) || defined(__amd64__) /* * Some UEFI implementations have multiple implementations of the @@ -243,7 +245,6 @@ efi_init(void) * with an old loader.efi, check if the RS->GetTime function is within * the EFI map, and fail to attach if not. */ - rtdm = (struct efi_rt *)efi_phys_to_kva((uintptr_t)efi_runtime); if (rtdm == NULL || !efi_is_in_map(map, ndesc, efihdr->descriptor_size, (vm_offset_t)rtdm->rt_gettime)) { if (bootverbose) @@ -255,6 +256,12 @@ efi_init(void) } #endif + if (bootverbose) { + printf("EFI runtime driver, fw spec %d.%d.%d\n", + rtdm->rt_hdr.th_rev >> 16, + (rtdm->rt_hdr.th_rev >> 4) & 0xf, + rtdm->rt_hdr.th_rev & 0xf); + } /* * We use SHUTDOWN_PRI_LAST - 1 to trigger after IPMI, but before ACPI. */ From nobody Thu Jun 25 00:50:53 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 4gm0bf1QJMz6k5H6 for ; Thu, 25 Jun 2026 00:50:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gm0bd5P2Xz3ZjY for ; Thu, 25 Jun 2026 00:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782348653; 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=SLGODxjM/TsDTyi9Zp/QQQnR1MrKak1ZXvOK7d1dEj8=; b=pQZPu6FSHFA9jkTwz4Prgxc96ExsLTxh9YG68Eez4Ev9Ha/m78phrZxzpd3Bm/9Dbvb3mu lB9KS63crnwDUFlEftin1+ormuzUgZJOQ1PlkaALDYUFZvuaGm4s0uzoG9ld2BiQAz1/yd 3/NF4vITnPEOtWCD1MYEH7dN20xFpQCqH0zvnsgbPERLSTqZJrrZFU5ocHZaxFYHOxhL46 l5pUo430QpxZZZqW6QvL8ObGtp6+2LGzLRqfmZPDEQq6cfK2qqNwEwLfrYefQk8NxIVNhN PkdoJsrvlgRoEAd5iJzGigEfI329Irp1/XskGX4hLYmO23XT6QekQDiUtGauag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348653; a=rsa-sha256; cv=none; b=K2BgV/TAw6OV+EdzaRpWlIMF9hygwHYdgwmhegVhmXp46DmVxG0fz53fI+na6yj14msYqZ BKC3d/5RqyzgFXlDNC8okmtzrWwQIVBri+m4JruPCT0ChVmIlDzsel9WWIs5OrRRxKES4g 4q2gO22AUssKvNZftMVaPoEbMmgvIbestA1wWpaHVbabhYdqkOBQmznFGXjmvpUhFQz4hN ZB+s3Jpe/o/CfM25t77L1fjaH+2nIcFAsahVZsOXO6czoz6Q7T2KR2SsiFcQcBigtjMHx3 z7i445PlGFsOPgqSyf0UcrhnyvqMovo12H6zQ4Vrms3QuyVwbRRvPBxn+cAI3g== 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=1782348653; 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=SLGODxjM/TsDTyi9Zp/QQQnR1MrKak1ZXvOK7d1dEj8=; b=C9Gz/BkSG/YUpEJlTXPt3y14IQDmkSoU/s2QzjjvS74Mk0iKwxyL8AYpUK6gTFX2Cn5lE3 oOTse8tZsF6jEqYVbNpl7C9H7/t+2CIZrSAvYzsph1hEzpfaqHPdmJ1nG7m8USr1SBJXaw XJ8e4OGY8QcRbQBr37f4cvXNA5f7KDkXtXQOieC0Xp6DiBV/mbClKvo0XK446b7Mwru7me 9Tvl+UgOAhd2sb9tBFJPsVZRvPgjSDCuaOat7jSdzUv/tihGv6SUs4ReylMwHYl8K0VG75 NPiF9XfSV74/3SpwDr5gXI/c5INX3OwL93878QWiAABLgzVL75tDBVqLJCLgDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0bd4T2rzjpy for ; Thu, 25 Jun 2026 00:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc43 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 00:50:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b94b53178039 - stable/15 - efirt(9): carefully destroy efi_lock 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b94b53178039c86da9acb597a9191d5e5db0f636 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 00:50:53 +0000 Message-Id: <6a3c7b6d.3cc43.439d8967@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b94b53178039c86da9acb597a9191d5e5db0f636 commit b94b53178039c86da9acb597a9191d5e5db0f636 Author: Konstantin Belousov AuthorDate: 2026-06-20 12:20:38 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-25 00:50:22 +0000 efirt(9): carefully destroy efi_lock (cherry picked from commit 8edcb37dd0753dc7e50044d9ccf0e991392a3d84) --- sys/dev/efidev/efirt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index d6a572720c37..52ccb5ca548b 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_acpi.h" #include @@ -184,7 +183,6 @@ efi_init(void) TUNABLE_INT_FETCH("efi.rt.disabled", &rt_disabled); if (rt_disabled == 1) return (0); - mtx_init(&efi_lock, "efi", NULL, MTX_DEF); if (efi_systbl_phys == 0) { if (bootverbose) @@ -285,8 +283,6 @@ efi_uninit(void) efi_systbl = NULL; efi_cfgtbl = NULL; efi_runtime = NULL; - - mtx_destroy(&efi_lock); } static int @@ -858,13 +854,19 @@ const struct efi_ops *active_efi_ops = &efi_ops; static int efirt_modevents(module_t m, int event, void *arg __unused) { + int error; switch (event) { case MOD_LOAD: - return (efi_init()); + mtx_init(&efi_lock, "efi", NULL, MTX_DEF); + error = efi_init(); + if (error != 0) + mtx_destroy(&efi_lock); + return (error); case MOD_UNLOAD: efi_uninit(); + mtx_destroy(&efi_lock); return (0); case MOD_SHUTDOWN: From nobody Thu Jun 25 00:50:54 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 4gm0bg1zPtz6k5H7 for ; Thu, 25 Jun 2026 00:50:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gm0bf6rtMz3Zjc for ; Thu, 25 Jun 2026 00:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782348655; 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=xKCIxEMiOVbLst+NC3Nzqw7Vr/SSPtNiy0l+ODYzl0Q=; b=ftDgpcs52Hi0QT5KqVMo1PoDrmBbcrc6aAov2PlfG70olW9D9dMBKNzSSU/AbhLgit7bWq 1domLdIUoaW3rUlnf0EeuYJV0Uf5Yj9Y5OTweCWvzxqUvC+N0/+qBQ2xj8+gL+8wCngHdn 6uraAsuXZzMHKW7Xa1dUHOrhLBuuIQ2SN72oxuwRR5zKNaiYL+RCleDHTxvgIxLn2h2Nfx Q9je6IbuBb7tIumZ1xMAAZgt/P2vgX2P4dtnyiPhLkmFYvJFiO2YDQNOs/Dk6Kr0FLmDMS zyDMHeA4fhbXbq5yOjRRqAam45Pfm9cM041CNs6FYTly5rH4zoZQmqk2hevLFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348655; a=rsa-sha256; cv=none; b=BZik59IOEuZJbe2m3kyG2MN4HlZmhsD7HjtNRZjC9A9IeElsTA3lG7DKdeGC8repy0hfb0 vNdY2Sj5UlsqQeu2OwDyW2AgqBFLY+37QP9SKWv4X/+vnbMEDxJ3oV83ug54mIBVI6rlqo NRwJPJZ579/42FC62TKMKctMaB9Yk96DKpiTy3YhMZ1PJvZ+zsRztVkVeppFdWtH5C8LbE alsk9/Ni22eLnDa7uuDKDLf9hpB2fIINPTmvVYPSjhBXx9Tu9WuNaku6ItpzOq0/FJ0EO4 T8S8s8gF3K5qkcJLEVIY4H4IXZxJLASk79G9A7JR5EC4yPfm8xpizQddo0ApUQ== 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=1782348655; 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=xKCIxEMiOVbLst+NC3Nzqw7Vr/SSPtNiy0l+ODYzl0Q=; b=xMMidgeTgbZqqHe1ffGLuL7Nf6tOIdHm86Uyh5cdWHRTT1B6VM/mKABcyAlN8PdU37J37y SAR8frzKNAPM3fUIGK73D0o6YcS4bzEemwdC0WP+pHzA5rp64i0SXyEhb+OY3m/v3xbbtW BReqWMR8+C1RqcsuGlnAJFlkKL8eRMp69yhPy29YzdWnckgDl+1bFI0t9Ef5EdKW5m9u8A BtWUCh4xQhTZr6eY1m70imPhSnyarTXVB8jshQDKOlrb9JisotezQ+yLhzGAer7s8aCjT6 X9y1CzOV0173KNP7XM17PXqaPMkWMvIVUcBx8d2v3M8GOk8VlDoPSYBZa3RfAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0bf500Zzkby for ; Thu, 25 Jun 2026 00:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e35c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 00:50:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b4bbe15fe4c7 - stable/15 - amd64: do not restore fsbase/gsbase for 32bit processes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b4bbe15fe4c7f168af996e1bea62b947f2fc500a Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 00:50:54 +0000 Message-Id: <6a3c7b6e.3e35c.791c1ef8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b4bbe15fe4c7f168af996e1bea62b947f2fc500a commit b4bbe15fe4c7f168af996e1bea62b947f2fc500a Author: Konstantin Belousov AuthorDate: 2026-06-16 21:44:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-25 00:50:23 +0000 amd64: do not restore fsbase/gsbase for 32bit processes (cherry picked from commit c7e5802ab6e6230a5782a09c914585d055eb5223) --- sys/amd64/amd64/exception.S | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index babfbacf92ef..afdcdeedf0f5 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -1161,12 +1161,15 @@ do_segs: .globl ld_fs ld_fs: movw %ax,%fs + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz after_ld_fsbase movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx .globl ld_fsbase ld_fsbase: wrmsr +after_ld_fsbase: /* Restore %gs and gsbase */ movw TF_GS(%rsp),%si pushfq @@ -1179,6 +1182,8 @@ ld_fsbase: .globl ld_gs ld_gs: movw %si,%gs + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz ld_gsbase_32 /* Restore kernel %gs base */ movl %r12d,%eax movl %r13d,%edx @@ -1194,6 +1199,8 @@ ld_gs: .globl ld_gsbase ld_gsbase: wrmsr /* May trap if non-canonical, but only for TLS. */ + +after_ld_gsbase: .globl ld_es ld_es: movw TF_ES(%rsp),%es @@ -1241,6 +1248,30 @@ ld_regs: doreti_iret: iretq + /* + * 32bit gsbase path. + * The KGSBASE is not loaded from the pcb_gsbase, instead we move + * the GSBASE value into KGSBASE right after loading user %gs, then + * restore kernel gsbase. + */ +ld_gsbase_32: + /* Read the user gsbase into %r14d:%r15d. */ + movl $MSR_GSBASE,%ecx + rdmsr + movl %eax,%r14d + movl %edx,%r15d + /* Restore kernel %gs base */ + movl %r12d,%eax + movl %r13d,%edx + wrmsr + popfq + /* Load the user gsbase into KGSBASE. */ + movl $MSR_KGSBASE,%ecx + movl %r14d,%eax + movl %r15d,%edx + wrmsr + jmp after_ld_gsbase + set_segs: movw $KUDSEL,%ax movw %ax,TF_DS(%rsp) From nobody Thu Jun 25 00:50:55 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 4gm0bh1bqqz6h6Zw for ; Thu, 25 Jun 2026 00:50:56 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gm0bg6mv3z3ZlD for ; Thu, 25 Jun 2026 00:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782348655; 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=RbRm29ZnIi2BX5DueYPBKvM+XXSPPCxVu39ORtpZ8Ns=; b=rFu+k52Ir+OJ+nkLZDQe4m28YW9Bd7ZmhWKVmi/SRpHhC3JvtMNLQM+Q+XL5wjpa4Txc+P 98gI01cm2nXz3mZubB/ve5pCvAuJSvBwgOuQPvSSVKFxYKN+3CxHpuw+2bQVqrVr26AwNs tr/NfKphYZw880FmFWHpy/CnUwsf6MCcG71uea06U0GRQudTYPS1+hPlu0Y+LX0SaUFjMm W3IrAVweUJHVuVO2eNC7pxtCNPaF/loN4ZCo4lmfzFgyGQoKo2qOK/ecq5T2e0LuqFzZuq zlfcBD6xUaVNcTUqjs34sWwN+gIURREnWSe0u/k4w0REEbWUFjxSZXMCigT8Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348656; a=rsa-sha256; cv=none; b=pt/LqujySXrdUiHkMBD4cIJPF4J6os0bGoD/prCuBOknRpkS3tAE3aDWROwnrra0Cw0y2g mm4h4xYkESf9zyDD6Rrhw75pjhiIYkHJlJpTPQmqAXgahK5xarN4cUBgFZzzvB203Kt2cs /qnSoe8fizJ7IgI5bkJLUa3lMuImaPQr9tSM166k1jYgZfiuH4nmgBGhWkAbkNKuxk2rxG qYl+Cn9AC85RzIafBUQtfE4J0/+4T6CUtjIhnOROAaZ9roFIk9mYWn0IU9bJubzVivjhhH BVeauG1P3bXr4LV3fYXcEj+qoire8336Wp6MQS9PvqGxI+wtlkoPNQ81M4vhLA== 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=1782348656; 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=RbRm29ZnIi2BX5DueYPBKvM+XXSPPCxVu39ORtpZ8Ns=; b=mc0g6hQRXvvF7l2f6IMz+SnGcrK/zGQM5yZqwhRwp8ShxdYWJcFmRZTLQWXvw4bEfCOaxH t6poNh8X5BIsY7Cw1MqqHQ7Q2ZTPwKYKEYm8WyyjVFBYY1gInO4c29Pie3lY0RaJXQrjaJ 35RnzbWUik97ofc6khosLi9Z1lRZ1dw9rJgZuyTCyheaBDivPM+CeAaB1yqnYWNzZGKrwV NJYP1zv4SEd+zZu/+PO7ZFumn0IqK//3fRpOTCgOzVndvRGKTU3hXuedG7RkMlfCAyyeuj AI16iDRawj8LhkFG8imxHY85/lc3zPJtOnZOqt8/Uh/NlY6ZtrtHi/74vZh4AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0bg5Z7HzkLF for ; Thu, 25 Jun 2026 00:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dc16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 00:50:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 41e974ab3e76 - stable/15 - x86/ucode.c: supposedly fix i386 compilation 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 41e974ab3e7629476fd935551f348d6906fed833 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 00:50:55 +0000 Message-Id: <6a3c7b6f.3dc16.1ceffc43@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=41e974ab3e7629476fd935551f348d6906fed833 commit 41e974ab3e7629476fd935551f348d6906fed833 Author: Konstantin Belousov AuthorDate: 2026-06-22 00:48:11 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-25 00:50:23 +0000 x86/ucode.c: supposedly fix i386 compilation PR: 295926 (cherry picked from commit f4cd99131c70e8be2a793d939b644e20bbbd3374) --- sys/x86/x86/ucode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c index 439b0b83e650..8ee0c2978638 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -385,7 +385,7 @@ map_ucode(const void *match, uintptr_t free, size_t len) for (va = free; va < free + len; va += PAGE_SIZE) pmap_kenter(va, (vm_paddr_t)va); - memcpy_early(free, match, len); + memcpy_early((void *)free, match, len); return ((const void *)free); #else (void)len; From nobody Thu Jun 25 00:50:56 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 4gm0bj2d4nz6k5H9 for ; Thu, 25 Jun 2026 00:50:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gm0bj1Ry8z3Zjf for ; Thu, 25 Jun 2026 00:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782348657; 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=eGm6FXIouv6ORIK3hLYbPY4bfeL0JuCYw9faZqylylc=; b=wsFxHw+pPLiGHvwiQLHU9DYPAX1PQ9Wc+dcMU+lG2a+d7KUEFseGloBtvR8Fix4Xi8O7VC VB5h+ca0Y/tGSpCdKAHIfp+AS5UxwFk+wcls+0oBk/SBci8ZG3q/lxtgipwKq7rPVHMJI6 VGkSAmZvMnFf6W/wuaryluZZdqltP47oRhji7siJ8PaJPIe7OFkAcCrD8dt1CyoTwzCpaM 0zk/w/E3RZmFItUMGGrjmeJQnQx6/ogKJI6/Au0A3coQpN1puo5CjB9t13VZBXok+LO8Wl 1RPb/DrxYaTab5DTCeW36Uz3XQBylXzVpvPytCd4NI+qKVhm0zsgkFIMW2UTEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348657; a=rsa-sha256; cv=none; b=MSQmLPZJ7Vhx77v7PP5je77B4A5RvtXix0TgeFNL1bLUcjrBeH3sh33Ok985TdEoV6CpJI Q4/6WkpoLudFu9QJoJrJevn+BVTlJ+xmDPnCQ9mrLGKfV8H/s0Ik0bLxR8dns4D6bznYDk M2PARp4qYptKBCDLicJEkvat2RJOThvEhPrp3QmZnYfP+5cbK303YRIIJTCnwFNXORaaEf 6L9iRO9WDdMInO40zqufFMBkEUEqqyL309y6FO3hL5FkGxujBHQq8RSUGsXmnxmBXJShbi /GRmIBLqhHWvH1Btp+ycWP2rY04fAkfIEd5bQKULFth5N65y3NWwHsU5PYUnMg== 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=1782348657; 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=eGm6FXIouv6ORIK3hLYbPY4bfeL0JuCYw9faZqylylc=; b=UxYb7jjd1Ute/ZWLuo8aTR3uB8/QEAMdzerqGpLFxoYE2BUsf51P5c5YszoE+G+M6EGwNE 3yWjKpUl2AkFinQ2J9W/fYlzgicJ4LsCJclBP0bb8oTRmiR+batmZKJv+NpUsqJa3RmADU I5KDRWr4BhGKkxRkRtOLNwRD9rKlaMXzzNLXvRmBO1NT4NZIucNf/8w+f4ZUJkKt67U5Tt btE/o7wxJhe80/xp8v3yt4xUii4g1HvhuhSFt6QTfYIFha3FnsV0CQ3LmP04Vv86dt7IEr pNM7O9W2Grc/VwN5J4pPdE3OU+3vHnNOAdwvYE7VUM+nQob053kg/lGaAorSyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0bh6ZTszkRh for ; Thu, 25 Jun 2026 00:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cfd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 00:50:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d082115bd719 - stable/15 - kqueue.2: knote is activated as the first action of tdsendsignal() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d082115bd7198abdbea1017d4556b4771262d30d Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 00:50:56 +0000 Message-Id: <6a3c7b70.3cfd8.6890dcb8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d082115bd7198abdbea1017d4556b4771262d30d commit d082115bd7198abdbea1017d4556b4771262d30d Author: Konstantin Belousov AuthorDate: 2026-06-22 19:07:19 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-25 00:50:24 +0000 kqueue.2: knote is activated as the first action of tdsendsignal() (cherry picked from commit df8ca3f89aa2b2c374886cc39b24c76796d7db9a) --- lib/libsys/kqueue.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsys/kqueue.2 b/lib/libsys/kqueue.2 index 97532c530b20..6e2d2df40ead 100644 --- a/lib/libsys/kqueue.2 +++ b/lib/libsys/kqueue.2 @@ -612,7 +612,7 @@ been marked as except for the .Dv SIGCHLD signal, which, if ignored, will not be recorded by the filter. -Event notification happens after normal +Event notification happens before normal signal delivery processing. .Va data returns the number of times the signal has occurred since the last call to From nobody Thu Jun 25 17:24:50 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 4gmQfV6zS3z6j3TV for ; Thu, 25 Jun 2026 17:24:50 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfV6Nffz3Hy1 for ; Thu, 25 Jun 2026 17:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408290; 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=49KTMWRHzk2YmN/yuBw5mOQ7s+/Dd6qUgiTFpHOuUus=; b=WwuznmRjDUwT7mPqU4dcAYEUJkBhK+5qgXRWDfjf256dreGNKG6SKuxR7rzwS4Rz0+BUnl lQM/IGgoryLTX53us9i/oSNnOIbDAWuUEZRKWbcRs4ogQjuuXMaLLQRD7jT61Pde0nO+fA LEKdv8rE1R1OV6y9KrZsIv5vTaK4bqwad6TgTjbjIiYNvI9Bp3Yc0QNBJEFoyfSitGrMxf M62usRmxsKLpP8kvGLWni1KmNnAPl4+LcCFEnZvz8+5eM9l4YsAwrcaz72SMZpQICtCpti 7yIMBEyd+KAFIbAja2679ejiuwqRmL4/SW3zjtsFDpENixbCiPEfu1tDkl8QmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408290; a=rsa-sha256; cv=none; b=jGsPFpCH7nQCPcICtqiurs91/g3kmLAJUHWTStsfB5DqELq40sj84fP3T+Bce4CvMM3qpT h89UWFeT01sMIeFR05Mf8TscNxJJK5ysRUSgSVHNIut2s1Kfk7w57tlJHNkURihPeYCbBu UT317FLZCla6kNXBFqf0VkBEgmQ8CGOalH2fl0TlkIbiqsCI13OO1GZD8JBuA4d9dNhVmw e0uN2FHlR39vVV5HMX9Cxn2j58UIC+XaXj0gUGjLoQA2JGtz83ViDpvqMNO4xC8v9D6drm UYzRMHkz9GlqJYnueey2UkKAAYcMJihH190fmoOOETtpKGwvKUex8zviiymLnA== 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=1782408290; 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=49KTMWRHzk2YmN/yuBw5mOQ7s+/Dd6qUgiTFpHOuUus=; b=tXmLYynmsTh3WPZVRvn//Ne6UCro8ZS/t5VD55Cgk4YPYlnYTXebaA93G0E/wjx/EAiYEm 7RfZMYcVCE8wrwSZhPEW0y7T/1WtuCmcnJScDY8jvMghvjmvLzVebS1O1yCDDRM3UqcJNU qZnjUXOYO7pwolSN+wSf9iOeFlNN3JuRGZZ28H85gDY+fk+UCdJYvvCJoAs6ymxXfHXSIB Ckr1cwodEJz4//yAARQGQqWECBY/JpWYllBVMvzBm92frdK8+zIzZB72f65yK0ebLZxAud lZCEExrnMoPfj9RuaoPkrnAU1MKOAxPArV8KZhfug40pvJ0E8hgcEHK8+sqTHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfV57Ljz1FBr for ; Thu, 25 Jun 2026 17:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34956 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2a809c77dfcd - stable/15 - divert: Define semantics for SO_REUSEPORT_LB on divert sockets 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 2a809c77dfcd2ea6e18d9ea763051b5988de9c0e Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:50 +0000 Message-Id: <6a3d6462.34956.3ed98e12@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2a809c77dfcd2ea6e18d9ea763051b5988de9c0e commit 2a809c77dfcd2ea6e18d9ea763051b5988de9c0e Author: Mark Johnston AuthorDate: 2026-05-26 12:43:51 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:21:51 +0000 divert: Define semantics for SO_REUSEPORT_LB on divert sockets Allow SO_REUSEPORT_LB to be set on divert sockets. If set, then bind() will add the socket to a "load-balancing group". When a divert-to rule matches a port with an associated group, the corresponding state ID is used to select a specific socket from the group. Packets without an associated state are simply forwarded to the first socket in the group. For now I only pass a state ID from pf, as I couldn't see a useful identifier on the ipfw side. This implementation is simple but has a caveat, that being that if sockets are added to the group while flows are being processed, the size of the group will change and this changes the mapping of state IDs to sockets. So, to get a consistent mapping, the divert socket application must bind all of its sockets before any traffic is diverted by the firewall. Reviewed by: glebius MFC after: 1 month Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D56563 (cherry picked from commit 895a0ae67fe2c0c45b68991f1bba0c62f4d00ad5) --- lib/libsys/getsockopt.2 | 6 +- share/man/man4/divert.4 | 24 ++++++- sys/netinet/ip_divert.c | 158 +++++++++++++++++++++++++++++++++++++----- sys/netinet/ip_var.h | 2 +- sys/netinet/raw_ip.c | 2 +- sys/netpfil/ipfw/ip_fw_pfil.c | 2 +- sys/netpfil/pf/pf.c | 2 +- 7 files changed, 172 insertions(+), 24 deletions(-) diff --git a/lib/libsys/getsockopt.2 b/lib/libsys/getsockopt.2 index 3867824681d7..85d94e014631 100644 --- a/lib/libsys/getsockopt.2 +++ b/lib/libsys/getsockopt.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 25, 2024 +.Dd April 21, 2026 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -220,6 +220,10 @@ Incoming TCP and UDP connections are distributed among the participating listening sockets based on a hash function of local port number, and foreign IP address and port number. A maximum of 256 sockets can be bound to the same load-balancing group. +.Dv PF_DIVERT +sockets may also be bound to a group, see the +.Xr divert 4 +manual page for details. .Pp .Dv SO_KEEPALIVE enables the diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4 index 647bb72ab49b..6292df190eb1 100644 --- a/share/man/man4/divert.4 +++ b/share/man/man4/divert.4 @@ -1,5 +1,4 @@ -.\" -.Dd January 23, 2026 +.Dd April 21, 2026 .Dt DIVERT 4 .Os .Sh NAME @@ -57,7 +56,26 @@ firewall processing at the next rule. .Pp By reading from and writing to a divert socket, matching packets can be passed through an arbitrary ``filter'' as they travel through -the host machine, special routing tricks can be done, etc. +the host machine, special routing tricks can be done, etc.. +.Pp +Multiple divert sockets may be bound to the same port if the +.Dv SO_REUSEPORT_LB +socket option is set on all of them. +In this case, the kernel will attempt to load-balance packets among +the sockets. +The implementation ensures that packets from the same flow are delivered +to the same socket. +To this end it relies on the firewall to provide a flow identifier with +each diverted packet. +When using the +.Xr pf 4 +firewall, this is the associated state ID, if one exists, otherwise all +packets are diverted to the first socket in the group. +Currently the +.Xr ipfw 4 +firewall does not provide a flow identifier, so all packets are diverted +to the first socket in the group. +At most 32 sockets can be bound to the same port. .Sh READING PACKETS Packets are diverted either as they are ``incoming'' or ``outgoing.'' Incoming packets are diverted after reception on an IP interface, diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 046df7f99ed8..54789f279272 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -89,7 +90,7 @@ */ #define DIVHASHSIZE (1 << 3) /* 8 entries, one cache line. */ #define DIVHASH(port) (port % DIVHASHSIZE) -#define DCBHASH(dcb) ((dcb)->dcb_port % DIVHASHSIZE) +#define DCBHASH(dcb) (DIVHASH((dcb)->dcb_port)) /* * Divert sockets work in conjunction with ipfw or other packet filters, @@ -148,10 +149,22 @@ struct divcb { struct epoch_context dcb_epochctx; }; +struct divcblbgroup { + CK_SLIST_ENTRY(divcblbgroup) dl_next; + struct epoch_context dl_epochctx; + uint16_t dl_port; + uint16_t dl_count; +#define DIVCBLBGROUP_SIZE 32 + struct divcb *dl_dcb[DIVCBLBGROUP_SIZE]; +}; + CK_SLIST_HEAD(divhashhead, divcb); +CK_SLIST_HEAD(divlbgrouphashhead, divcblbgroup); -VNET_DEFINE_STATIC(struct divhashhead, divhash[DIVHASHSIZE]) = {}; +VNET_DEFINE_STATIC(struct divhashhead, divhash[DIVHASHSIZE]); #define V_divhash VNET(divhash) +VNET_DEFINE_STATIC(struct divlbgrouphashhead, divlbhash[DIVHASHSIZE]); +#define V_divlbhash VNET(divlbhash) VNET_DEFINE_STATIC(uint64_t, dcb_count) = 0; #define V_dcb_count VNET(dcb_count) VNET_DEFINE_STATIC(uint64_t, dcb_gencnt) = 0; @@ -164,10 +177,15 @@ MTX_SYSINIT(divert, &divert_mtx, "divert(4) socket pcb lists", MTX_DEF); /* * Divert a packet by passing it up to the divert socket at port 'port'. + * + * 'id' is an opaque identifier for the flow and is used to load-balance packets + * across multiple divert sockets bound to the same port. Packets with the same + * identifier will be delivered to the same socket. */ static void -divert_packet(struct mbuf *m, bool incoming) +divert_packet(struct mbuf *m, uint64_t id, bool incoming) { + struct divcblbgroup *dlb; struct divcb *dcb; u_int16_t nport; struct sockaddr_in divsrc; @@ -273,10 +291,27 @@ divert_packet(struct mbuf *m, bool incoming) sizeof(divsrc.sin_zero)); } - /* Put packet on socket queue, if any */ - CK_SLIST_FOREACH(dcb, &V_divhash[DIVHASH(nport)], dcb_next) - if (dcb->dcb_port == nport) + /* + * Look for a matching divert socket or socket group, and enqueue the + * packet. + */ + CK_SLIST_FOREACH(dlb, &V_divlbhash[DIVHASH(nport)], dl_next) { + uint16_t count; + + count = atomic_load_acq_16(&dlb->dl_count); + if (dlb->dl_port == nport && count > 0) { + uint32_t hash; + + hash = jenkins_hash(&id, sizeof(uint64_t), 0); + dcb = dlb->dl_dcb[hash % count]; break; + } + } + if (dlb == NULL) { + CK_SLIST_FOREACH(dcb, &V_divhash[DIVHASH(nport)], dcb_next) + if (dcb->dcb_port == nport) + break; + } if (dcb != NULL) { struct socket *sa = dcb->dcb_socket; @@ -597,6 +632,53 @@ div_free(epoch_context_t ctx) free(dcb, M_PCB); } +static void +divlbgroup_free(epoch_context_t ctx) +{ + struct divcblbgroup *dlb = __containerof(ctx, struct divcblbgroup, + dl_epochctx); + + free(dlb, M_PCB); +} + +static void +div_lbgroup_detach(struct divcb *dcb) +{ + struct divcblbgroup *dlb; + + CK_SLIST_FOREACH(dlb, &V_divlbhash[DCBHASH(dcb)], dl_next) { + if (dlb->dl_port != dcb->dcb_port) + continue; + + /* + * Delicately remove the socket from its group, taking + * care to synchronize with lookups, which do not handle + * NULL slots in the group table. + * + * Note that the hash is not stable across different + * group sizes. + */ + for (int i = 0; i < dlb->dl_count; i++) { + unsigned int count; + + if (dlb->dl_dcb[i] != dcb) + continue; + + count = dlb->dl_count; + if (i != count - 1) + dlb->dl_dcb[i] = dlb->dl_dcb[count - 1]; + atomic_store_rel_16(&dlb->dl_count, count - 1); + if (count == 1) { + CK_SLIST_REMOVE(&V_divlbhash[DCBHASH(dcb)], dlb, + divcblbgroup, dl_next); + NET_EPOCH_CALL(divlbgroup_free, + &dlb->dl_epochctx); + } + return; + } + } +} + static void div_detach(struct socket *so) { @@ -604,8 +686,10 @@ div_detach(struct socket *so) so->so_pcb = NULL; DIVERT_LOCK(); - if (dcb->dcb_bound != DCB_UNBOUND) + if (dcb->dcb_bound != DCB_UNBOUND) { CK_SLIST_REMOVE(&V_divhash[DCBHASH(dcb)], dcb, divcb, dcb_next); + div_lbgroup_detach(dcb); + } V_dcb_count--; V_dcb_gencnt++; DIVERT_UNLOCK(); @@ -615,28 +699,70 @@ div_detach(struct socket *so) static int div_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { + struct divcblbgroup *dlb; struct divcb *dcb; + int error; uint16_t port; if (nam->sa_family != AF_INET) return EAFNOSUPPORT; if (nam->sa_len != sizeof(struct sockaddr_in)) return EINVAL; + + error = 0; + if ((so->so_options & SO_REUSEPORT_LB) != 0) + dlb = malloc(sizeof(*dlb), M_PCB, M_WAITOK | M_ZERO); + else + dlb = NULL; + port = ((struct sockaddr_in *)nam)->sin_port; DIVERT_LOCK(); - CK_SLIST_FOREACH(dcb, &V_divhash[DIVHASH(port)], dcb_next) - if (dcb->dcb_port == port) { - DIVERT_UNLOCK(); - return (EADDRINUSE); + if (dlb == NULL) { + CK_SLIST_FOREACH(dcb, &V_divhash[DIVHASH(port)], dcb_next) { + if (dcb->dcb_port == port) { + DIVERT_UNLOCK(); + return (EADDRINUSE); + } } + } dcb = so->so_pcb; - if (dcb->dcb_bound != DCB_UNBOUND) - CK_SLIST_REMOVE(&V_divhash[DCBHASH(dcb)], dcb, divcb, dcb_next); - dcb->dcb_port = port; - CK_SLIST_INSERT_HEAD(&V_divhash[DIVHASH(port)], dcb, dcb_next); + if (dlb != NULL) { + struct divcblbgroup *tmp; + + CK_SLIST_FOREACH(tmp, &V_divlbhash[DIVHASH(port)], dl_next) { + if (tmp->dl_port == port) + break; + } + if (tmp == NULL) { + dlb->dl_port = port; + dlb->dl_count = 1; + dlb->dl_dcb[0] = dcb; + CK_SLIST_INSERT_HEAD(&V_divlbhash[DIVHASH(port)], dlb, + dl_next); + } else if (tmp->dl_count < DIVCBLBGROUP_SIZE) { + KASSERT(tmp->dl_count > 0, + ("div_bind: lbgroup %p has count 0", tmp)); + + tmp->dl_dcb[tmp->dl_count] = dcb; + atomic_store_rel_16(&tmp->dl_count, tmp->dl_count + 1); + free(dlb, M_PCB); + } else { + error = ENOSPC; + free(dlb, M_PCB); + } + } + if (error == 0) { + if (dcb->dcb_bound != DCB_UNBOUND) { + CK_SLIST_REMOVE(&V_divhash[DCBHASH(dcb)], dcb, divcb, + dcb_next); + div_lbgroup_detach(dcb); + } + dcb->dcb_port = port; + CK_SLIST_INSERT_HEAD(&V_divhash[DIVHASH(port)], dcb, dcb_next); + } DIVERT_UNLOCK(); - return (0); + return (error); } static int diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 934ca80a083d..081938ec7ae4 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -324,7 +324,7 @@ VNET_DECLARE(ip_fw_ctl_ptr_t, ip_fw_ctl_ptr); #define V_ip_fw_ctl_ptr VNET(ip_fw_ctl_ptr) /* Divert hooks. */ -extern void (*ip_divert_ptr)(struct mbuf *m, bool incoming); +extern void (*ip_divert_ptr)(struct mbuf *m, uint64_t id, bool incoming); /* ng_ipfw hooks -- XXX make it the same as divert and dummynet */ extern int (*ng_ipfw_input_p)(struct mbuf **, struct ip_fw_args *, bool); extern int (*ip_dn_ctl_ptr)(struct sockopt *); diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 806a66703d05..dfb7cbeaf710 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -96,7 +96,7 @@ VNET_DEFINE(ip_fw_ctl_ptr_t, ip_fw_ctl_ptr) = NULL; int (*ip_dn_ctl_ptr)(struct sockopt *); int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); -void (*ip_divert_ptr)(struct mbuf *, bool); +void (*ip_divert_ptr)(struct mbuf *, uint64_t, bool); int (*ng_ipfw_input_p)(struct mbuf **, struct ip_fw_args *, bool); #ifdef INET diff --git a/sys/netpfil/ipfw/ip_fw_pfil.c b/sys/netpfil/ipfw/ip_fw_pfil.c index ddd8e00316b8..7e1c24a89edd 100644 --- a/sys/netpfil/ipfw/ip_fw_pfil.c +++ b/sys/netpfil/ipfw/ip_fw_pfil.c @@ -563,7 +563,7 @@ ipfw_divert(struct mbuf **m0, struct ip_fw_args *args, bool tee) m_tag_prepend(clone, tag); /* Do the dirty job... */ - ip_divert_ptr(clone, args->flags & IPFW_ARGS_IN); + ip_divert_ptr(clone, 0, args->flags & IPFW_ARGS_IN); return 0; } diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 05a71cd45a35..edd723abb3b6 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -11274,7 +11274,7 @@ done: pd.m->m_flags &= ~M_FASTFWD_OURS; } } - ip_divert_ptr(*m0, dir == PF_IN); + ip_divert_ptr(*m0, s != NULL ? s->id : 0, dir == PF_IN); *m0 = NULL; return (action); } else if (mtag == NULL) { From nobody Thu Jun 25 17:24:51 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 4gmQfX1JDhz6j3WZ for ; Thu, 25 Jun 2026 17:24:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfX0TcGz3JBr for ; Thu, 25 Jun 2026 17:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408292; 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=Mo7UmgGbXgVLfJA8ZcMx6MXmJVgwoXJ4pTP4G8y0tsI=; b=wrxnX6uxH5Ml27WfU46P65RczQsNf2FiF9OYzlezioN04vIkhJ48lK/L4zp0gNIpKeTgrP HtAGDzCiiUvUi90WkzHucMZ1c18beJt0/PJVgnFWKjJO6PCHjlkPpO4oy53T6XnilbO0Rq BDaKEB2g5baNKjd2a/CLZmukRxpUoYQVMXVvUns0tG5oEfOPUFngSnSf1K8LyVc3doiEpD 0niLH8blPzTzGjO/k+sHbJvvfHPTkQuxCpXaJoNQu/ljFsXB5MTJDtdPk2NPpWGtQPC98J ZfJdf9xdvcfsoBO82J5oYC/ZE4lDMOo3rWLmU7sYQ5nnr2igRLJGaIJG3pEdQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408292; a=rsa-sha256; cv=none; b=nWYItgkyqCJFjlovGRgq1xXcs26HBbVnydrq1knlTvRYs766Mh38uglIryQ8p2cb96Wfzi hZYgF/xCXds8Xz8x1OHKMyncoM3ptAqbCcE3lr9JaytSzoHg+XqE119GFzxWCT0HMlMpoU qIAXOE5vtQCHnzgUHdeHNeS2gcGlNZYInroCuYFmj+Zke+wgLu6PhUfZu4+qqP87Y3hXAw ykXJrC580jkK4X27n+zSqllBc+9WCwtdLgst1zKA30P0KlJ03tlOtXdxXTFvRLOXOChr6T i+llgQ+QwsacYndmb2xuYQqPJE6Y2qrRZaqOCe3iKtU607/72CbwYNysIssUsg== 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=1782408292; 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=Mo7UmgGbXgVLfJA8ZcMx6MXmJVgwoXJ4pTP4G8y0tsI=; b=h0X+7O6n9JEvnB1vcZ2ffBYxjV1nOyvKN5uWcKt/qT3/ucW+rmO7zAdV50QuBPBAahOVG3 QmnsmEsRxwUaOvlH1zf5YGWCYsD/5srHiDSOEBqFuim80esTPHVN2b+UPfFwKM+O5IhWB/ 3WBuL+o6VSSC/JLuE9tJhnetCwZMiwWffOmgtps15p/af/G0ROjCkGPTPS36l+IGagoLnj GNe7ihAZL8zoPJSs1mLKCLK3TElfLbTGsRnzK/TyiYl5DoJ0X+Jx/TN0ARYIXclGfaV6/Z +A8MkjbQb/kYBQ573gS0qNZOZvYLmc4K2/o0cTEmW2cYDgDU2ozRSNSTkk4d5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfW5xGnz1FQM for ; Thu, 25 Jun 2026 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38043 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a64246401e62 - stable/15 - divert: Avoid using atomic_(load|store)_(acq|rel)_16 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/stable/15 X-Git-Reftype: branch X-Git-Commit: a64246401e62c3351b149445ebe638f4d894f69e Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:51 +0000 Message-Id: <6a3d6463.38043.c82e86c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a64246401e62c3351b149445ebe638f4d894f69e commit a64246401e62c3351b149445ebe638f4d894f69e Author: Mark Johnston AuthorDate: 2026-05-26 18:21:27 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:21:51 +0000 divert: Avoid using atomic_(load|store)_(acq|rel)_16 It's not implemented on some arches. Use a plain int to count the number of sockets in a divert lbgroup. Reported by: Jenkins Fixes: 895a0ae67fe2 ("divert: Define semantics for SO_REUSEPORT_LB on divert sockets") (cherry picked from commit c564074c9aaa8a3f9273de3cb802edcb3e2e2a40) --- sys/netinet/ip_divert.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 54789f279272..47c4ad861b8a 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -51,12 +51,14 @@ #include #include #include -#include + +#include #include #include #include #include +#include #include #include @@ -153,7 +155,7 @@ struct divcblbgroup { CK_SLIST_ENTRY(divcblbgroup) dl_next; struct epoch_context dl_epochctx; uint16_t dl_port; - uint16_t dl_count; + int dl_count; #define DIVCBLBGROUP_SIZE 32 struct divcb *dl_dcb[DIVCBLBGROUP_SIZE]; }; @@ -298,7 +300,7 @@ divert_packet(struct mbuf *m, uint64_t id, bool incoming) CK_SLIST_FOREACH(dlb, &V_divlbhash[DIVHASH(nport)], dl_next) { uint16_t count; - count = atomic_load_acq_16(&dlb->dl_count); + count = atomic_load_acq_int(&dlb->dl_count); if (dlb->dl_port == nport && count > 0) { uint32_t hash; @@ -667,7 +669,7 @@ div_lbgroup_detach(struct divcb *dcb) count = dlb->dl_count; if (i != count - 1) dlb->dl_dcb[i] = dlb->dl_dcb[count - 1]; - atomic_store_rel_16(&dlb->dl_count, count - 1); + atomic_store_rel_int(&dlb->dl_count, count - 1); if (count == 1) { CK_SLIST_REMOVE(&V_divlbhash[DCBHASH(dcb)], dlb, divcblbgroup, dl_next); @@ -744,7 +746,7 @@ div_bind(struct socket *so, struct sockaddr *nam, struct thread *td) ("div_bind: lbgroup %p has count 0", tmp)); tmp->dl_dcb[tmp->dl_count] = dcb; - atomic_store_rel_16(&tmp->dl_count, tmp->dl_count + 1); + atomic_store_rel_int(&tmp->dl_count, tmp->dl_count + 1); free(dlb, M_PCB); } else { error = ENOSPC; From nobody Thu Jun 25 17:24:52 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 4gmQfY2f6Gz6j3Nd for ; Thu, 25 Jun 2026 17:24:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfY0NtTz3JKN for ; Thu, 25 Jun 2026 17:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408293; 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=lJsxOeVshFFJuIevOgjdZcSZOV9jqqDhe8L2n+lPOdw=; b=lfb/IdfuP9krCLUZtxoYGIgkXKGsZs0T+nQLl8hgbjxaQxchVgPiEO3yIlCrSDjNgR9DnF taQeHLN0Syb61nTwATPhLOWuyIqx+oexCT6Xye27kwFU7usW5fNYlGEL1vpShoLi0XzGhU TDYPXazRZ0UIvUid7RmbRggVQtMuQrGW+WAtq8d26sypAKDko140EUDtdYur6GFrkZwzTn AanveAcVyWUpt0u2T0I9wr3TcySMYc965ueKKWGhh1u5NGjDZJbx87OkQiWBkcnq+lLRqn mOEkpWJgyni+STisiEYsOKP8CxSRkGb51U4CK5mHuuWy1m5+cp4eGsFaM8nTfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408293; a=rsa-sha256; cv=none; b=YDRJ2fOKhNXMLimL5aFH7+UH3kvxTc21QFCdHxs3qXqvXiDvb5xl+4Tf51lg79Cd6HZ2tE BgeJqyKK+F1TOjueCQuB3AN7dBTitmTGAQto7afuq4n2V3v7e/i4uI4bzQVCV2WeXYQqvc HboAaqX1L3ShfW+6jcJDKpakVwPHHOQ3zksAAaQ5sFjQtktc2AY2J4TO+3eJMxSu5U9e79 +iOgiq/1DgKRVdqq2ZTR2KxKwOEmIvl3VGwieKxKoM2i1kGKSAEXGGkCUn0rjMYSswYp1H Lr0AhhqOQ1torm5/WMLrab3OLEXgtolfBWXF5NhkPyBMhWr0McRPbTj6Kt9S8Q== 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=1782408293; 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=lJsxOeVshFFJuIevOgjdZcSZOV9jqqDhe8L2n+lPOdw=; b=E4rYFvUhBDbOLJ5aiSHxU17ojRwdWYusN8Xje3U8XYOj4CVh/iFf8w8nHv39N0dMGs9JYn XsWyNI57byWJ4rSUQzeCdn/H+jpsLd0ZbnJEFEMAMCz3+g/McbP0K/QT4LDvEhGd8sJKcj byUJK0oPVVKCYsBURKmDjlr3gtIc6haIt07YH15zQjMgTxr3rK8NWnHOYsP9Fn+jcBysQY I3vkNj/VGje2F7A1Mhit2Mp644F1SOmTTtHpvkgJDBaGLQca5ceWKuHz/PBZmBzWW5quaz BhmPN/KyiHsDFQ+NwpK7FF9x21ctas3DOnQPEAbwu2/XbXOnzPKtDX0Hpn6ssw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfX6bDcz1FQN for ; Thu, 25 Jun 2026 17:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37aab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 95030a914349 - stable/15 - bhyve/slirp: Drop privileges before entering capability mode 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 95030a9143491eb237627b1d7d9b7e8c0661cbea Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:52 +0000 Message-Id: <6a3d6464.37aab.3a8d3ada@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=95030a9143491eb237627b1d7d9b7e8c0661cbea commit 95030a9143491eb237627b1d7d9b7e8c0661cbea Author: Mark Johnston AuthorDate: 2025-11-24 14:15:27 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:33:22 +0000 bhyve/slirp: Drop privileges before entering capability mode When in restricted mode, the slirp-helper process enters a capsicum sandbox, after which we cannot look up the uid for the "nobody" user. Reverse the order. Reported by: kp Fixes: 0e62ebd20172 ("bhyve: Move the slirp backend out into a separate process") (cherry picked from commit b0c7eaf83d21bbc333e247ab9e136965b3ca54ed) --- usr.sbin/bhyve/slirp/slirp-helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/slirp/slirp-helper.c b/usr.sbin/bhyve/slirp/slirp-helper.c index 5ad941524e19..ec0f8a3486e0 100644 --- a/usr.sbin/bhyve/slirp/slirp-helper.c +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -553,6 +553,11 @@ main(int argc, char **argv) priv.slirp = slirp; + /* + * Drop root privileges if we have them. + */ + drop_privs(); + /* * In restricted mode, we can enter a Capsicum sandbox without losing * functionality. @@ -560,11 +565,6 @@ main(int argc, char **argv) if (restricted && caph_enter() != 0) err(1, "caph_enter"); - /* - * Drop root privileges if we have them. - */ - drop_privs(); - /* * Enter our main loop. If bhyve goes away, we should observe a hangup * on the socket and exit. From nobody Thu Jun 25 17:24:54 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 4gmQfZ46bTz6j3Wc for ; Thu, 25 Jun 2026 17:24:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfZ1Nyyz3Hs9 for ; Thu, 25 Jun 2026 17:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408294; 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=1KsLLjcRGvFVBq2Tc3v6sqO6CSraDPLQVvCJvMHYK2Y=; b=vkf79vRkTFSTevJWItvAU0AcxW0YRAa1+/mdTyPGdnfZfCnrPiq3l2Qv5Ppjvfj4Me0oVb OQK01dv0R5IX8vIuQeqv+lUyjzgodOPFsTktajLNYFmyDe6XEhGmq3YO921l9M2NA1+DaY YhhvDBMP/aVyUn5HlDeLVyP3RLgMUYi8SPYhcXstvHK56ZogXVDHr2at3ZEVrXZa/Rnm4R U/h8lrgeApuvHwECiJ9JrKQA/kfBsiJPFLSgs2JFzMW6M2nugtsJ24Xfl/FuWQMJgmh3Ju jBZ15K/HZYcjcSdzC3gUzRqNRDRp92yRW+67wEuKC3og5Jt+lk7ddwMsvrqwMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408294; a=rsa-sha256; cv=none; b=O0X3fvrl1GhDE+1MEEakydo3ohI09f7SQRFcaCAlyTsy05e57FMXm0C0nF/LJbZ/fNnCC4 +Y5KBQH3FUrkoygBAWKUUJ0kR1wJ+72wI6j8AZRQFZxhWDTS6j03Z9wxzep2nich3oQFUc KVa7THGnAhnsgzSLleq0we6Q7x4fKbci0Bn/VPQGFlLbjN2EGn7apqYGFU7RJwHWVmKQO5 y34UjBgxmttle/sPZn7yyr+E9GMh4w/Hpm4RvWz7+6uUrK2m4CoQr6WfAJcfItRZ7RUfTr 2i7C8AMeM/DG+K0E1VVAvhTFOiUe5JDRiTMQhF76+gx8mM9/athFUTUk7juSiQ== 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=1782408294; 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=1KsLLjcRGvFVBq2Tc3v6sqO6CSraDPLQVvCJvMHYK2Y=; b=ZZJEeQmb8Hx0cZZJHYd3YQDhEfZ7KZI73jwuuJ97wlV8pW7zu5S5wJ0/x6H6h9mRvV8rFY 2yvPmnnpi+Lm5KS0LZkTKCHN5wK3wOdcBNf3+aNyKnGuK97ve76czndDFT/XSgK+AR9S1a n+iAYzvh2bL1C+/vluqwDil8abluyDErN6gcUoeapoxL015VLXJEruG3OQDqCUgx1xDwag DIPuGo5tdtDZZRB+nJ+eEAWdwxZzCbSSqPiRj0sBZl5XFrmEMquGnepS4rOEYhU8O6QQQc XxdK97wEOFrjdtTWkdy80VYGNyUnRD9tTaZzt248N8arA/Wf8BhrzKNyXWhEsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfZ0Hbxz1FhP for ; Thu, 25 Jun 2026 17:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34a60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eeff383ba634 - stable/15 - vmm: Avoid clobbering errors from vmm_modinit() 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/stable/15 X-Git-Reftype: branch X-Git-Commit: eeff383ba634e2496f67949254a2a8432c8f0582 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:54 +0000 Message-Id: <6a3d6466.34a60.4d6dfc92@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eeff383ba634e2496f67949254a2a8432c8f0582 commit eeff383ba634e2496f67949254a2a8432c8f0582 Author: Mark Johnston AuthorDate: 2026-01-19 14:29:33 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:33:48 +0000 vmm: Avoid clobbering errors from vmm_modinit() Reported by: novel Reviewed by: bnovkov Fixes: e758074458df ("vmm: Move the module load handler to vmm_dev.c") Differential Revision: https://reviews.freebsd.org/D54750 (cherry picked from commit 99afbc5cc7ae8ba7b112fbafbf24ea2575a65ba4) --- sys/dev/vmm/vmm_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 625a6dce9465..302a73be25b8 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -1151,9 +1151,11 @@ vmm_handler(module_t mod, int what, void *arg) if (error == 0) vmm_initialized = true; else { - error = vmmdev_cleanup(); - KASSERT(error == 0, - ("%s: vmmdev_cleanup failed: %d", __func__, error)); + int error1 __diagused; + + error1 = vmmdev_cleanup(); + KASSERT(error1 == 0, + ("%s: vmmdev_cleanup failed: %d", __func__, error1)); } break; case MOD_UNLOAD: From nobody Thu Jun 25 17:24:55 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 4gmQfb5Bddz6j3Wp for ; Thu, 25 Jun 2026 17:24:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfb1zdjz3JMx for ; Thu, 25 Jun 2026 17:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408295; 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=cLgouR/5eVYgH4NOVxhzzt++C3uPgwpLCMVRzbMovSw=; b=Fn8sAb26OzMymWehdPgJEaXcCW2i9u2jzAkjoX5Q7U+PXZNtwlIBmgyPoNKEG1+yw1AvnP 7aq9Ms5N8G//oAFnDLP3BP5Um1d+b25GKDijbIG4NU1o8o0gwIF9OgE57cC0oK5L/xLYK2 tKqZKaih0Tjhz4tgC69c5guDT2SK5qr4fKww3qcZFQ3C4af4FCpE7tzSEvUPjFSd871JDS UHhoYtw9pZ/mSTXv1du5rXfhNdpk1G0vOVqC5iKhRUzieMD0cEoKNwE0ovTuYMJesMY0Om mS3pQ957ugxs/vapykIZc3WWLDjlGuQaZsyfe7yX1sRqPnE9vTJs8IYDqreYZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408295; a=rsa-sha256; cv=none; b=Z/n9Fi5WVIgj3w6WluOm07LIUQf3SfA0oxvrnnbLEBWZFuNEFCU8jOk3BuYkc7qbHIFLaw DlsBu5txarOdkru3GCl/T2mAuOYZqCruFjcixsROlHU+NFhCzbZKSw5JlE8SNeBTFFIJgd Uo8Rg3eU0Mg5Ksv7+mSZHSQI3/vfA+5NyUzD0k+a81/G8VySU4sGqoCsOI3TImGJVZajci uOtwqgddufFXOun/t65yfv9aaf/Iik8S8IRQUbqW1PzqMhrOfaJPgIFH3jRVeHR58XrC6s KPH2u8XOEN8/8OzjVGjqJh/833hu1D9d/z9oJUlwx9hvcVKuvKtY3ifJoqQBMQ== 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=1782408295; 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=cLgouR/5eVYgH4NOVxhzzt++C3uPgwpLCMVRzbMovSw=; b=UlGPULFQ81mi824tfZoDLcmj9Jridjb4EZ8VNwACqWnvbqTGAfcXnpgNM1ZT7hHxgZOaOD vjwvTpMG+maT/u+sR59x8DHf0nAOJ09KB/+nlDGiCmhQ13TeLeuzNBR4K370OcjAZD8VG1 KsBfF1zaOsLl6yKAo/aNsa+OtKTJFRS+5VKBDREMFrhivTxrmF61MO4jMSEMVlKnrW1JcF 8HmzecD6DUnzl+/x5t4Sgkjgq/fhMBexvIitLATw2Uomrq070UXLzNvNhuBcyf1vZ8DD5z SQyhCsm6Red+Ue22OBZSAsfcDAfMOFT9oqEt1c4kgeMZxKgk5eJ9Rr3g0QWNfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfb148Kz1FZx for ; Thu, 25 Jun 2026 17:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37cd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 777f67d8a9c3 - stable/15 - bhyve: Use a blocking socket in the helper process 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 777f67d8a9c3ad8f3b90c378cb5c1754a7d4c554 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:55 +0000 Message-Id: <6a3d6467.37cd8.5cdaeeba@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=777f67d8a9c3ad8f3b90c378cb5c1754a7d4c554 commit 777f67d8a9c3ad8f3b90c378cb5c1754a7d4c554 Author: Mark Johnston AuthorDate: 2025-12-22 19:12:34 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:34:06 +0000 bhyve: Use a blocking socket in the helper process The send_packet callback does not handle EAGAIN, and on the recv side we already use poll() and MSG_DONTWAIT to implement a non-blocking loop. PR: 291616 Tested by: novel Fixes: 0e62ebd20172 ("bhyve: Move the slirp backend out into a separate process") Differential Revision: https://reviews.freebsd.org/D54340 (cherry picked from commit daef625cf884dea33d50ad7a0e2da0879a442495) --- usr.sbin/bhyve/slirp/slirp-helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/bhyve/slirp/slirp-helper.c b/usr.sbin/bhyve/slirp/slirp-helper.c index ec0f8a3486e0..36192c590eb1 100644 --- a/usr.sbin/bhyve/slirp/slirp-helper.c +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -502,6 +502,8 @@ main(int argc, char **argv) memset(&priv, 0, sizeof(priv)); priv.sock = sd; + if (ioctl(priv.sock, FIONBIO, &(int){0}) == -1) + err(1, "ioctl(FIONBIO)"); if (pipe2(priv.wakeup, O_CLOEXEC | O_NONBLOCK) != 0) err(1, "pipe2"); From nobody Fri Jun 26 01:31:09 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 4gmdRk6VHLz6jj6q for ; Fri, 26 Jun 2026 01:31:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmdRk5kjgz44Hw for ; Fri, 26 Jun 2026 01:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782437474; 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=VXPjqURtyRYishT0Bn5eMFzlB+g16KXJ6hxYFSxR9ww=; b=yNW+dh8/1x502HMnLHSgb6S/sv0V4FVgxBV8KI/zzJukclHNm4YY8xjnDhUdEvfjXvuUkY TWceZwToeAHTtbp/VvIWCHr0EWu5v6+NYW7PpV9qd4TpdYTVNtdxuSye2ngJz27w73GOvs mtO6LSYPceDfO7zbWcdYJQQ+F5jGIb950A/4bWDjtOumsDFt1ppJ1I6nS3xdkcTPw6HGN8 oGxljclj1khQPV2qsc7FlV5vHGkjNHYgsBoFhLmXfQrQ4zyiIcrPAiupPoKr3F43ayckXj hbPFC1Kf+O4C7n37iVFpRCL2rT6TjblRs9oWVTupamT95ARaQ9AZL6p5mkMirA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782437474; a=rsa-sha256; cv=none; b=ShOr4aL2yISuuoT2IUd5rhaiiRIGAXQx13IlEV1Vlr+nJ0QpN3MlrQYWGwUVAj66A4hpm5 UmJjoWWGsVNrBeIb3fz2eOOgnstV7p0Iw+da4mrqVVR5gJxKA2VWCgJfgRCifOsDecg6jW mrbiL0motqX5tn2GDdmr7BYZU5AEzgb159vuiGmQtjNcIPp4GscLDJD7SnimrkPHdJXC2t 0nD4RWF23lVnasMq5DermIs4p5F8g7USIo7Th/35/kxLXzV05Gswb3kGxggmthH6fpZ0Ly pBw3Mb1cQqxyD2a5i7o9lr9m66PFaEBBA3v0v6g9n4h7+W5eRUy4TrvUCtrgfQ== 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=1782437474; 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=VXPjqURtyRYishT0Bn5eMFzlB+g16KXJ6hxYFSxR9ww=; b=SunbPA1snbk7q18lfnaPD+B3KSPFcQULiiSRKLQDKWyNwH8ks4lBWptQgPW2dG+kWqJJIv FmlceCR/P3dhMkS/e/KrwnRlF7LaejomP4TuQ1xvI5w9qPCDVKF/kJVgrFyB8FGoo/Kvf1 UbqweOSBWHcjsMlWWxHb5jLUqnY2q4wLdbW0gAiUtAqindpaOvBFzy3gRzeboh5SFurxLL WcUSt1GHza4/fQX/Emcz3LQclmivaMGd48squ1aDHmPLlFkO8j+NS/BNdPhvNzcpQ4XV13 D+uuCIbVtwP/+6x7TIrgs4fDgDyA4X97aQ0kQVLdgVpXlTrRYh7+13ewaYujdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmdRk3fmfz1DH for ; Fri, 26 Jun 2026 01:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42dd1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 01:31:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 84043284ad1f - stable/15 - nfs: Fix argument typo to avoid a crash 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 84043284ad1f6e7c0423555f28c9133efd37b6a8 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 01:31:09 +0000 Message-Id: <6a3dd65d.42dd1.385e59a4@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=84043284ad1f6e7c0423555f28c9133efd37b6a8 commit 84043284ad1f6e7c0423555f28c9133efd37b6a8 Author: Rick Macklem AuthorDate: 2026-05-25 19:22:32 +0000 Commit: Rick Macklem CommitDate: 2026-06-26 01:28:58 +0000 nfs: Fix argument typo to avoid a crash A typo resulted in the wrong argument for a bytewise comparison that could result in a crash if the incorrect argument was not a valid pointer. This patch fixes the argument. While investigating this, I noticed that the correct argument was not being filled in as required, so this patch fixes that, as well. Somehow, recovery from a NFSv4.1/4.2 server crash worked during testing, so this was not detected. The bug/patch only affects NFS client mounts using NFSv4.1/4.2. PR: 294925 (cherry picked from commit 4d80d4913e79c8b5918b1f04c1c7b38e6c76b9b4) --- sys/fs/nfs/nfs_commonkrpc.c | 5 +++-- sys/fs/nfs/nfs_commonsubs.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 9ea4e5f4c9df..2d4c41994c0e 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1265,8 +1265,9 @@ tryagain: goto out; } sep = NFSMNT_MDSSESSION(nmp); - if (bcmp(sep->nfsess_sessionid, nd->nd_sequence, - NFSX_V4SESSIONID) == 0) { + if (bcmp(sep->nfsess_sessionid, + nd->nd_sessionid, NFSX_V4SESSIONID) == 0 && + sep->nfsess_defunct == 0) { printf("Initiate recovery. If server " "has not rebooted, " "check NFS clients for unique " diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index cc93c2270fa0..090bee203a6d 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -368,6 +368,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, * First, fill in some of the fields of nd. */ nd->nd_slotseq = NULL; + NFSBZERO(nd->nd_sessionid, NFSX_V4SESSIONID); if (vers == NFS_VER4) { nd->nd_flag = ND_NFSV4 | ND_NFSCL; if (minorvers == NFSV41_MINORVERSION) @@ -5350,6 +5351,7 @@ nfsv4_setsequence(struct nfsmount *nmp, struct nfsrv_descript *nd, NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID + 4 * NFSX_UNSIGNED); nd->nd_sequence = tl; bcopy(sessionid, tl, NFSX_V4SESSIONID); + bcopy(sessionid, nd->nd_sessionid, NFSX_V4SESSIONID); tl += NFSX_V4SESSIONID / NFSX_UNSIGNED; nd->nd_slotseq = tl; if (error == 0) { @@ -5596,6 +5598,7 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfsclsession *tsep, 0, NULL); NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID); bcopy(tsep->nfsess_sessionid, tl, NFSX_V4SESSIONID); + bcopy(tsep->nfsess_sessionid, nd->nd_sessionid, NFSX_V4SESSIONID); nd->nd_flag |= ND_USEGSSNAME; error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); From nobody Fri Jun 26 01:35:34 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 4gmdXl07sYz6jjkV for ; Fri, 26 Jun 2026 01:35:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmdXk68Nqz4525 for ; Fri, 26 Jun 2026 01:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782437734; 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=tKWyVMv1ATqZ9Dj4uO6XMPn7ZjtqUolz5i2B5IW1ssE=; b=u/geLSPtc2fzARzlSxkUjhs456nFFPVfi8JGoSixi2EOGh1mfxaz4DB4Cw73dWOXiNjptt 4X91sArRDNuA6VaNpVWDVOvOUz9GPOet2ZM+xL6bDlBLz3OXAHgrG0aGyJGABBmyfOsYDV VjsbRc7biq4dRreCYuH198olbXq7vrblaETvBLy1BKC0ZA7gnQ/4IQ0i2CZwbl7HYFgV/x 2rzX7QWRanrrcoNMQtZoZ+3RQGDlvudrkSpjGC8kPBYjWHNWL6hMbciPvoJi+DV6Q9JOo4 9Mit42MvhSlb81iD7b556bhJLynWD+i6Xm0V9H/wajIMU2JRhWHQexUjL5MoKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782437734; a=rsa-sha256; cv=none; b=d3qzzm8y03hqFAB4kWgG95C1sttpA9aVYeeLzjFFsnJfY2lSK56DSbOGtO9+pEhANlRK1X ++OyH354zRlpJHdwZ5FT8nZ+E0+rYJXvMmhrjCQ37xd4FNeYSA7odLEe0211lB838f2Rbv P2KnKibTGo90B8RVhxvImfBybaPzjvuugfAiJLIs0hkvjW+z89X3YI5NFu/sD59+A6rvup lmzI8o0LgGLv4r+IxChaQWBo0EGygbKSriylfgADWyCFjHZ1YhCCITJuHbl23O2zLxigR2 hduHGTi0YUfFs0cgyGea37vIj9blnFStbCkcWrbBRCVP6v6qj3/H2vntSKlA/g== 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=1782437734; 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=tKWyVMv1ATqZ9Dj4uO6XMPn7ZjtqUolz5i2B5IW1ssE=; b=GPXwQRsUXe2hIZV9k/CvP4YIBksL1onZ6H9yEDoiJTRqqccxLEXQpJRy+YgJQFFVL27cq3 fd2HihXcx5T3V52ONzKHFVby0/P8E+dDC3QMPMzTol5qYiDPB6xOwwdo6Rt7iuxGqQ0gol 2CrwA0O+xnNGqThixbPBk0BVl3V/+EwC80dBnOxIXcVsXe6UfumAfKNy6UvPn/EOVg/RgT U3S5SoZpLXOCwLCsqy8Nue0001Mps3Qb6kxBdNGCgrmAbwF1/0Nmjc3VLqxHsW2iFtENFp uGZ5O2IlhST93u+16LQi5SMzDQGZEpeVcfOXhkuwnwEgYMmbtScU3a8JOynUpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmdXk5B3Wz1Mr for ; Fri, 26 Jun 2026 01:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42f42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 01:35:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 28ae0d849118 - stable/14 - nfs: Fix argument typo to avoid a crash 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 28ae0d8491187bd7c4b244a68d79634dd8f9a698 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 01:35:34 +0000 Message-Id: <6a3dd766.42f42.50673d46@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=28ae0d8491187bd7c4b244a68d79634dd8f9a698 commit 28ae0d8491187bd7c4b244a68d79634dd8f9a698 Author: Rick Macklem AuthorDate: 2026-05-25 19:22:32 +0000 Commit: Rick Macklem CommitDate: 2026-06-26 01:33:54 +0000 nfs: Fix argument typo to avoid a crash A typo resulted in the wrong argument for a bytewise comparison that could result in a crash if the incorrect argument was not a valid pointer. This patch fixes the argument. While investigating this, I noticed that the correct argument was not being filled in as required, so this patch fixes that, as well. Somehow, recovery from a NFSv4.1/4.2 server crash worked during testing, so this was not detected. The bug/patch only affects NFS client mounts using NFSv4.1/4.2. PR: 294925 (cherry picked from commit 4d80d4913e79c8b5918b1f04c1c7b38e6c76b9b4) --- sys/fs/nfs/nfs_commonkrpc.c | 5 +++-- sys/fs/nfs/nfs_commonsubs.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 0ae3b94bef89..c7ac2553d1f4 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1247,8 +1247,9 @@ tryagain: goto out; } sep = NFSMNT_MDSSESSION(nmp); - if (bcmp(sep->nfsess_sessionid, nd->nd_sequence, - NFSX_V4SESSIONID) == 0) { + if (bcmp(sep->nfsess_sessionid, + nd->nd_sessionid, NFSX_V4SESSIONID) == 0 && + sep->nfsess_defunct == 0) { printf("Initiate recovery. If server " "has not rebooted, " "check NFS clients for unique " diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 6a9a73b40fb0..7c10e4bee964 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -337,6 +337,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, * First, fill in some of the fields of nd. */ nd->nd_slotseq = NULL; + NFSBZERO(nd->nd_sessionid, NFSX_V4SESSIONID); if (vers == NFS_VER4) { nd->nd_flag = ND_NFSV4 | ND_NFSCL; if (minorvers == NFSV41_MINORVERSION) @@ -4919,6 +4920,7 @@ nfsv4_setsequence(struct nfsmount *nmp, struct nfsrv_descript *nd, NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID + 4 * NFSX_UNSIGNED); nd->nd_sequence = tl; bcopy(sessionid, tl, NFSX_V4SESSIONID); + bcopy(sessionid, nd->nd_sessionid, NFSX_V4SESSIONID); tl += NFSX_V4SESSIONID / NFSX_UNSIGNED; nd->nd_slotseq = tl; if (error == 0) { @@ -5165,6 +5167,7 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfsclsession *tsep, 0, NULL); NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID); bcopy(tsep->nfsess_sessionid, tl, NFSX_V4SESSIONID); + bcopy(tsep->nfsess_sessionid, nd->nd_sessionid, NFSX_V4SESSIONID); nd->nd_flag |= ND_USEGSSNAME; error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); From nobody Fri Jun 26 01:37:04 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 4gmdZZ43vNz6jjtJ for ; Fri, 26 Jun 2026 01:37:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmdZZ2GMfz45gt for ; Fri, 26 Jun 2026 01:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782437830; 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=X+Bj8sRq/VGeZrWZ9plkScJKxfm67YWnjl8JM/xeK38=; b=JcF8ULokdVXNZTiC8dWQieVb/3cDWGxrMBYJfcRtv//oN3NPeF9TaIrSRaZzhLmloz21h1 irmJMBI0l2RqOO0H9lpZ3JKNe1t00dzYIXCElWgD55R1Jz0L292I+cmARFq/CKdzfzcbGP JWWY5iApBf8NyGLQ8LfDAC5fO7HastywfGOeMNvsvx0P1dlD5JeboPUmZrvMjcrqYCgif9 +1c0F0qjJLzjHhbGIHN4YdbxWm2v3XM5i8+cTO8WqVVc29KgGkKZ33ga+8UfgVooW3buSW HgnyCg2rNgZd1vz0a+VrorWnvQusD+lv3xwFDrvneHMu+J72Q7/ZZ7CoxOl0kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782437830; a=rsa-sha256; cv=none; b=lBWMjVrGwy9kaOukFuuwExGGSlJA2jp7RBUn/NtkJEQhh3OZkQsnSZSgHn+DnJ5Pk7zXxY sbbOx6vFgTnui3SDQ1+zuisWgONWmuNrjaK+mceoVIVkYqd43WgOwa840f4/hSjweNVbGm Y8HT01yL8/9+qi0K8309TQyOSVvaPl2P4lQoKrLoSk2j45wnluL719TavmEfDR8yXCBIYj OWCvfxStgxJOiZJ0rgXBmRzBoXAG3Bz76HkYgYDumymZlvnkh1u62t/C2woOZuBwOXxvk3 jYwPmF064jxONupc1i6NlYOwnnlt0Sf3B4Dh4P+FEPWZ6Z/suIbjsf5uZv1mRg== 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=1782437830; 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=X+Bj8sRq/VGeZrWZ9plkScJKxfm67YWnjl8JM/xeK38=; b=rIurgRf/u4M9ZsiwuH2284Onw3SjnWatRok/Uatwq/q3wO7lao3Jv4sQ+WzZGhHJfDVplz frbXFrvmuQ0n8UkpmtprCjKR6qSUsDerRj2+a2E50IDXOm70OVViQPuUfsgblckuwkdnyQ e4z8L2rDPVShG3/18/JpkuJnkVkticmV2DC96/8Zb5QIN1cbCcSD4fMiyKiAedFDrWSq0k lhkL+rsJ+sp9paFuUt8RryrLI0GwAYWfNyqdDDa8Kgq0hLLiDEhtKMMQSr3aJQLubHHejJ 5ad9GgYyRbg4AhACduXytBInsoOVl4nkuh/8kldlCzI+Q8nSrUY8+wqII8Gtpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmdZZ0GXjz1Mw for ; Fri, 26 Jun 2026 01:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42dd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 01:37:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: afc113696ff6 - stable/14 - nfs_commonkrpc.c: Improve handling of NFSv4.1/4.2 recovery 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: afc113696ff6652f132e2893e8efacb669860667 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 01:37:04 +0000 Message-Id: <6a3dd7c0.42dd6.1adbb277@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=afc113696ff6652f132e2893e8efacb669860667 commit afc113696ff6652f132e2893e8efacb669860667 Author: Rick Macklem AuthorDate: 2026-06-04 22:02:48 +0000 Commit: Rick Macklem CommitDate: 2026-06-26 01:35:27 +0000 nfs_commonkrpc.c: Improve handling of NFSv4.1/4.2 recovery Commit 4d80d4913e79 fixed a long standing bug in the recovery code. However. glebius@ reported seeing multiple recovery cycles with this patch during an NFSv4.1/4.2 server reboot. This commit should minimize the risk of multiple recovery cycles. PR: 294925 (cherry picked from commit ea4886f2829bf33866c8c0c60b14a9641fc54b40) --- sys/fs/nfs/nfs_commonkrpc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index c7ac2553d1f4..7a256366de2e 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1250,17 +1250,20 @@ tryagain: if (bcmp(sep->nfsess_sessionid, nd->nd_sessionid, NFSX_V4SESSIONID) == 0 && sep->nfsess_defunct == 0) { - printf("Initiate recovery. If server " - "has not rebooted, " - "check NFS clients for unique " - "/etc/hostid's\n"); /* Initiate recovery. */ sep->nfsess_defunct = 1; NFSCL_DEBUG(1, "Marked defunct\n"); - if (nmp->nm_clp != NULL) { + if (nmp->nm_clp != NULL && + (nmp->nm_clp->nfsc_flags & + (NFSCLFLAGS_RECVRINPROG | + NFSCLFLAGS_RECOVER)) == 0) { nmp->nm_clp->nfsc_flags |= NFSCLFLAGS_RECOVER; wakeup(nmp->nm_clp); + printf("Initiate recovery. If " + "server has not rebooted, " + "check NFS clients for " + "unique /etc/hostid's\n"); } } NFSUNLOCKCLSTATE(); From nobody Fri Jun 26 01:41:01 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 4gmdg24T0bz6jk9K for ; Fri, 26 Jun 2026 01:41:02 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmdg20X62z45ly for ; Fri, 26 Jun 2026 01:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782438062; 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=OrmzC4L85kKOPKS91e63BySwc9xlNbJjtUOFyqCo6HM=; b=wJjyhNNYVX0LdQKQGNB6g8dg6qoDqb4sj1/dFW2HWCo2391trAp8cQP77plS7XlI1PlkGv H7yercAfLqSJ5ifS5TGJ2nrxJW5bSqHbzM4HwCSejLyuqRmm8/vQaWqknmM2Q5dvfddwoA iIP173g13ZTs1F31R5PSizO4i/mLGuxoHZUJ5kdnzj7D4y4Qc83oGt7zPMA2OLCiIHpB3d P4p1yPKCrNwj5O1KVpRa2j99xDbLS7uQyHj+po2yBUc8hKDjH5IGMfWwytIQn408rC1Nft YgvWLKMpeYTZGgPBW4SHlY+4MIAbDO0R2Gx0/LLpSyDu1YnXkEo1MusmGIU1nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782438062; a=rsa-sha256; cv=none; b=kTRIaFtToIY0zF8qRRaty8fKKcRZe3JsqHE9u3LOfiPC8AFjS5kbzN3jp58q+HTz9ovyKW 98txjscEgTMhFazl7ucKB7EsJGjyV6SH1enPS7iCTliNmWYJIHhoPDCIibvnMsm5mvhoaT PQ0k1gOzhG5tOSifjfUQfQkj1fMrgti8yDCdF7agmwlgzTWNTn0wkB/m49HRjBKz5oO4FI XN3XpZ1irdSE9+GfjOLBMxwX5ywLyCmuHqGLvg2qeBWt3zpkBvFvU9TNGtYo3DAnL2/cnj MULyRs4UonuRBI7mptPh4PT9Ap0cE3ibj+dVvnRKcT6YyVjx6nenGN8IP4oLOw== 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=1782438062; 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=OrmzC4L85kKOPKS91e63BySwc9xlNbJjtUOFyqCo6HM=; b=nOU7OsZxE15n9/tup/0C5+x3b4UbnNMCHClfTEUab+W0Mi5ChhqiHugq4dbupGp7RH45oM NAq9jLrJp5F2o+0uNWkAmJMICnVk1Lg9zGcfBvHioQFlnv0EMwI0UNqyJlmeDfRh6W7e7q hlBW7D1o+r2JZbQ8mQRSFj6VOSM8/fEY/CCCWQ5mxrYrt0Y8hXD2x5VZUhJEzG27Qe7/YM he14La5b/y6PoIlr11Hptc1i8ZNW7E+lzwnUGYhxXClPuSHxPQPor+ZcGjWJYRAHZyi81j O4Oxdrxi4cvU1NTH3h1JHpm+TitrvwjiSawMD64ZAiW97z7R0FDOJj5SgRpyVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmdg16CNcz1c3 for ; Fri, 26 Jun 2026 01:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42dfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 01:41:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: ae9f66486df6 - stable/15 - nfs_commonkrpc.c: Improve handling of NFSv4.1/4.2 recovery 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae9f66486df64edcd0f2bef70afa67d245916835 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 01:41:01 +0000 Message-Id: <6a3dd8ad.42dfb.45e0e057@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ae9f66486df64edcd0f2bef70afa67d245916835 commit ae9f66486df64edcd0f2bef70afa67d245916835 Author: Rick Macklem AuthorDate: 2026-06-04 22:02:48 +0000 Commit: Rick Macklem CommitDate: 2026-06-26 01:39:35 +0000 nfs_commonkrpc.c: Improve handling of NFSv4.1/4.2 recovery Commit 4d80d4913e79 fixed a long standing bug in the recovery code. However. glebius@ reported seeing multiple recovery cycles with this patch during an NFSv4.1/4.2 server reboot. This commit should minimize the risk of multiple recovery cycles. PR: 294925 (cherry picked from commit ea4886f2829bf33866c8c0c60b14a9641fc54b40) --- sys/fs/nfs/nfs_commonkrpc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 2d4c41994c0e..f30ae7cbffa2 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1268,17 +1268,20 @@ tryagain: if (bcmp(sep->nfsess_sessionid, nd->nd_sessionid, NFSX_V4SESSIONID) == 0 && sep->nfsess_defunct == 0) { - printf("Initiate recovery. If server " - "has not rebooted, " - "check NFS clients for unique " - "/etc/hostid's\n"); /* Initiate recovery. */ sep->nfsess_defunct = 1; NFSCL_DEBUG(1, "Marked defunct\n"); - if (nmp->nm_clp != NULL) { + if (nmp->nm_clp != NULL && + (nmp->nm_clp->nfsc_flags & + (NFSCLFLAGS_RECVRINPROG | + NFSCLFLAGS_RECOVER)) == 0) { nmp->nm_clp->nfsc_flags |= NFSCLFLAGS_RECOVER; wakeup(nmp->nm_clp); + printf("Initiate recovery. If " + "server has not rebooted, " + "check NFS clients for " + "unique /etc/hostid's\n"); } } NFSUNLOCKCLSTATE(); From nobody Fri Jun 26 10:26:42 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 4gmsKh1zSnz6jGtB for ; Fri, 26 Jun 2026 10:26:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmsKg6K8lz3yf2 for ; Fri, 26 Jun 2026 10:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782469607; 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=UloS225M8vCaQe3Iwhghw4C4a21RT+wOwXkWvJabtnQ=; b=MRzL6F1uWxa3zPwLPqT19Wc3d7u+2gcYdyeq4BgR3jqCzOSq/Z6Kty0eW8e8Y+eOUMpZ6e Os3IgklVIrD6Cu2mwhR4Prk9/3Yz0Gey33DckCe/1oi2c+4UUM3PnJbK6H9SzMmYy5fVXp 5o+dpA1LOZ2GtLQYNZ1SLx6PXa8ARla6iMbQ3/bTzm6TELl4Z6EJN48gO+yGveVm2WDr9I hHWoaFh/7KY+KXdkCe2SfiXJV6+jgY2RctW81DZFrQJfvMIVrjjGY4lGrzT+kG/jO83BJo L0Mq/1gkAQYw/9i6RoiBIDa1PQibsneiRcPo/wlUKLuGhRS4mINbJbNBwozqVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782469607; a=rsa-sha256; cv=none; b=RIquXMQ5qXrg6OxjNQtFG+3bEpns61OC0YbKTI0+pMeEJ4QwFrXYhHhz/KX2+JEW3B6Mbz SnsFGr3IBvszFzIbQf81lSdez1bb68LoEEg2V+O2G30rLx9ouWLAOTuGbiy7kppVj+sGIX K90sOGA6MQX1ePCMeuMfPvBTlxScNBK+JJ77Q4OErGKfIicY/vynEWK+sUlHjN7IMBfqLZ PF0JDVHJQ+ndA83mA2zYZblBsf8Cwz9RDuCtQ2T32f2q7XQ/Yk7cdiUnEHfu8Pl9IeWd+4 syDQ0o2mNOmlgjSeESM63VsYGuUjOCvbiEJ7UC+FdRNArA+enfNncUdTZ8UB+A== 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=1782469607; 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=UloS225M8vCaQe3Iwhghw4C4a21RT+wOwXkWvJabtnQ=; b=Qgw9TMrs6Mief6K5DVNxyPdJhrFvj1EGz99dfyAaHLnLmmUnqSmmMnRSQDocjsUhUPDpLn yx/AQ2C40Ts8fqpudeCf5rxJUhO2LDvDvt+s0MXzX1uwhMJmjgwHlu7OsCR9bCXd67HPLk N+q+CLm8nIogN5RxkYETTm5P5W6yHIUQTUWMvaTr3LJjBGnkLJF5P432xKOM7s+ytVPQiN ED2bfxbWQDtgZrRxac4cg/2awAm48Xd0siaYMcN4eQf9sW4D48ll+8mtyNVUDM97mGFmIJ QmlSKQU9C26mR5oh7NcM8m2SGM3txCfsCc48gKYjo7A4et0F/wD6Rkr3AdBLCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmsKg4YNtzZJF for ; Fri, 26 Jun 2026 10:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33614 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 10:26:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Daniel Levin From: Pouria Mousavizadeh Tehrani Subject: git: 77cf9e791b93 - stable/15 - rtld: Check for -1 as an-end-of-section marker 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 77cf9e791b93ace59422df8c123b11a535d7beec Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 10:26:42 +0000 Message-Id: <6a3e53e2.33614.417b947e@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=77cf9e791b93ace59422df8c123b11a535d7beec commit 77cf9e791b93ace59422df8c123b11a535d7beec Author: Daniel Levin AuthorDate: 2026-06-08 14:42:03 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-06-26 10:20:55 +0000 rtld: Check for -1 as an-end-of-section marker rtld calls functions in the .init_array section one at a time, until it finds a distinguished sentinel value. The C runtime does the same thing (in crtend.c). However, that checks for the sentinel -1 and not 1. If one is using a linker that unifies .ctors and .init_array, then rtld will miss the sentinel value. I believe the author of this code intended to write -1 instead of 1. Indeed, changing the code to also check for -1 prevents rtld from attempting to call a non-existent function. The same is true of .dtors and .fini_array. Signed-off-by: Daniel Levin Reviewed by: kib MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2270 (cherry picked from commit 45a0cb52d3d62f8caae420b93e4b8c76ae3bc766) --- libexec/rtld-elf/rtld.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index a72726684f0f..2a05afe66902 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3159,7 +3159,8 @@ objlist_call_fini(Objlist *list, Obj_Entry *root, RtldLockState *lockstate) for (index = elm->obj->fini_array_num - 1; index >= 0; index--) { if (fini_addr[index] != 0 && - fini_addr[index] != 1) { + fini_addr[index] != 1 && + fini_addr[index] != (Elf_Addr)-1) { dbg("calling fini function for %s at %p", elm->obj->path, (void *)fini_addr[index]); @@ -3265,7 +3266,8 @@ objlist_call_init(Objlist *list, RtldLockState *lockstate) for (index = 0; index < elm->obj->init_array_num; index++) { if (init_addr[index] != 0 && - init_addr[index] != 1) { + init_addr[index] != 1 && + init_addr[index] != (Elf_Addr)-1) { dbg("calling init function for %s at %p", elm->obj->path, (void *)init_addr[index]); From nobody Fri Jun 26 14:40:53 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 4gmyys5Zplz6jbpK for ; Fri, 26 Jun 2026 14:40:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmyys2vmTz3Y3v for ; Fri, 26 Jun 2026 14:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484853; 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=fsDZ4lMjDewj0jLxpQCFm1+WJ+x+5llpPOkEFOGBIK8=; b=VJIxzEzss0r7wCTW2ebvK4t5jE72MLurHPPQOdGNL9nwXTqAN3p+U6wtB1lGV4EdSzAJy+ xZLgX2iw5mYn1Ij+EOpATgNivcq+Xt+i41HxlTxGFXFiXpAH/q7ZZATR7pXKwLwusq5bj6 7ZLbVJcDZB1TghK+pIkELvcMX6Q8scDsIoEh4xeupTl01M6mx7IJRo51nrJvl6XXpwFrVw lnf88DbpQG38JmorfmYWl6Gl7gSwEyY3Klte9YgGXopn0rTXavoJUAnvoED+HTdeIY+csb anRQKO5Nha6TKFXhtOjSRZ78z4xbyzp3NYYHr1cWktLXxG0iKEFDI9n3Mjfxcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484853; a=rsa-sha256; cv=none; b=DBSxhJdbJN2gOlIZJx89UkiArddUk4uDaGDONLUwNq9jZt7rc/KLGMFjsFkleUGTSbse4J ix9Ec5EVvtScR0SzAoutprwCKS5mhRriGVHIyYaWkzSaRoi2uOoVkb2J6RVpteSUb6JnDN qBIVYynjPfz/NUSiYGG2hcdhjmNHAfch8E62/Q9IBGqKViQYy7+BRuTeYeTn3vqx2VTfbh T55ZFaMpU/MFL0LVNBjpG/1d/i67LGcw6Y2jOGGU8v1ErTkCZ1zY+oD7dIA8h4d76KWoSU U8f59qhClt9LDicUIl8YjE7TrIbpnNK22zBgDxz5IItc2V5l41jlUxZv19ob7A== 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=1782484853; 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=fsDZ4lMjDewj0jLxpQCFm1+WJ+x+5llpPOkEFOGBIK8=; b=rVKnQe0CjQCFn0QYg0K643DmOvYk7D/OmFtuBGQkZW0vBbU7ZdGiT35jEBSPdhL+THHmno iuhX36aj64lhXzC9g9hZ8j0KubQYvuWixBNwoTvgwfHuDeuaHpQUaHiTuVdD4cWolIliSS XxvtQicIrJn/1tdlZ6+tB3WEPvt1wvvtSTwhSjR33OmEVJiC2SKU8I/21oJbyymrIpcIIV dFolGSHVOaupwE9il8aB5eFWQzU8n1LFtjITtFdIke4qJ3+QHTbBMkCmaOqzu8iqlY/r3G J3Yhs0QSE2y+4jNe+2wir27mq1zPLSdkRGEwiiXOo/riAvo8zKc07oWzi3mcKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyys1cBzzhKd for ; Fri, 26 Jun 2026 14:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:40:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 401e3bd0397f - stable/15 - iconv: Update availability of bool 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 401e3bd0397fa8fa86472eeed967a71944da3c96 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:40:53 +0000 Message-Id: <6a3e8f75.1ec4a.4e96278@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=401e3bd0397fa8fa86472eeed967a71944da3c96 commit 401e3bd0397fa8fa86472eeed967a71944da3c96 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-22 13:23:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 10:58:57 +0000 iconv: Update availability of bool While here, drop duplicate include. MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D57733 (cherry picked from commit 8f750231d4b58ac71cbd3ac3548e1d7eb849f04b) --- include/iconv.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/iconv.h b/include/iconv.h index a5a830b75fac..97e00f11acd0 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -37,9 +37,7 @@ #include -#include - -#ifdef __cplusplus +#if __STDC_VERSION__ >= 202311L || defined(__cplusplus) typedef bool __iconv_bool; #elif __STDC_VERSION__ >= 199901L typedef _Bool __iconv_bool; From nobody Fri Jun 26 14:40:54 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 4gmyyt5TGKz6jbls for ; Fri, 26 Jun 2026 14:40:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmyyt3Qfkz3Y8w for ; Fri, 26 Jun 2026 14:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484854; 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=xdvMGwM/XRm4/xJxinp9AT8QAoHbClgGhKUsPG7/Rkw=; b=LHEopZb97mi54Ra8Eo1PXo+zWiu15HACehqVD9JsCfpaK/2st3nbLGJ20ZpNELgnvX74sB ALOkUzEm5igo35TXMYMbmoISpD6YaGeu9effF3i9O+x7YCRIwE7XlP5/9ufR482mjHcH6A rpr7baznz9WgCkHhd7lzUUBYiUKopgeuW9jHA9DapmWcgMR8y9X7XUpUxvB7cTHGOzGJZu woI1uP/ooXjJHSams+mb/p8iX5gh/92bdiN700wN8C6Jd/RkkdKcnt+qOVbU6wPypmdYRg QNWiXowSoGTtbyQLtK9w9pJcuhmSHiXhi8wAPiyB/Wo30vtWXu2f27VuElYlzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484854; a=rsa-sha256; cv=none; b=QXVjlNziujXQFC/eCOijAMQ/pv6sV4QRtPv3/BJTjbfcDlAz4PfdrzlXQM0BisflF9CsDt C23wjGumGfJUaVdNqW+QQWE1fTn188i6QJV9NxjFg/L862apBFmChhLIbojdJ7UIU/QKPQ FLf/FEp0YqQjbkQVHPr9F3qnljWVvHbf15CFmXZbbet+18I3b7ChpJYzeb8mqNfhQXeapv 6TAQNBEQTRcRLCxGpSTcL5fkkmZ78WDlMjhCh9ClwKptNIZmSKfOIpKAWrz8FVO9dBS1S4 OCG/RZB+Ae1jGnQfkknQ9SXvf/BNp3HIybJ6Hnx7dzt9iL7ES2oTAb+i5Rj1Lg== 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=1782484854; 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=xdvMGwM/XRm4/xJxinp9AT8QAoHbClgGhKUsPG7/Rkw=; b=HbSQdkW2DshqgPIOVWJr2m0p6DVGAuLqQsWFYFqPgFr4n9LyrS0xwWcMwkXgtpaCTarrxF jLyW6ob01mU0UILuO9IO3k7Fb0wSjXYz1PGWy21N4uu4gWM+VFiHvvAksge4QVc+RdTaWf YrkkZsFbz27obgRl4bWWBFjKUHa0mHkaJoZZLk/prcrkipFdc0MCkanWcj+ueLXThjpC0f QoikwSzXHazTnrC/u6D+xUSF0LcVPN0eXBnGioKejcyKDdkRpE97NGtz1wOSvtY1iPi4dO f1X/RL2e/73SVCKUigoCBpGhDilNj4L4pC9BsOxDkn8HYf5fozD0EXD62GGgdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyyt2M9RzhH8 for ; Fri, 26 Jun 2026 14:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ecae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:40:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: e2e736234437 - stable/15 - x86: Harmonize GENERIC and MINIMAL 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e2e7362344375bcbb772c8ed77fcbaefffa36933 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:40:54 +0000 Message-Id: <6a3e8f76.1ecae.6441befa@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e2e7362344375bcbb772c8ed77fcbaefffa36933 commit e2e7362344375bcbb772c8ed77fcbaefffa36933 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 07:51:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 10:58:57 +0000 x86: Harmonize GENERIC and MINIMAL * Reorder MINIMAL so everything is in the same order as in GENERIC. * Wherever comments diverged, except for the explanatory comment at the top, copy the GENERIC version to MINIMAL. * Add KDTRACE_FRAME to i386 GENERIC; it was already in MINIMAL, and adding it to GENERIC seemed like the more correct move. With these changes, MINIMAL is a strict subset of GENERIC, apart from the identifier and the explanatory comment at the top. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57729 (cherry picked from commit 01c8644093c28d09f0d41fb522dc53f1ab696a7e) --- sys/amd64/conf/MINIMAL | 26 +++++++++++++------------- sys/i386/conf/GENERIC | 1 + sys/i386/conf/MINIMAL | 34 +++++++++++++++++----------------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 595ff454f400..06680cf6c774 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -89,6 +89,18 @@ device acpi options IOMMU device pci +# ATA controllers +device ahci # AHCI-compatible SATA controllers + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) + +# NVM Express (NVMe) support +device nvme # base NVMe driver + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller device atkbd # AT keyboard @@ -129,8 +141,8 @@ device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device -device virtio_balloon # VirtIO Memory Balloon device device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver @@ -147,15 +159,3 @@ device xentimer # Xen x86 PV timer device options EVDEV_SUPPORT # evdev support in legacy drivers device evdev # input event device support device uinput # install /dev/uinput cdev - -# NVM Express (NVMe) support -device nvme # base NVMe driver - -# ATA controllers -device ahci # AHCI-compatible SATA controllers - -# CAM -device scbus # SCSI bus (required for ATA/SCSI) -device da # Direct Access (disks) -device cd # CD -device pass # Passthrough device (direct ATA/SCSI access) diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index a2f86753e945..dec49b37eecf 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -79,6 +79,7 @@ options AUDIT # Security event auditing options CAPABILITY_MODE # Capsicum capability mode options CAPABILITIES # Capsicum capabilities options MAC # TrustedBSD MAC Framework +options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data options INCLUDE_CONFIG_FILE # Include this file in kernel diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index fc04d4ed6dec..bcfe2642677d 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -88,9 +88,9 @@ options KDB_TRACE # Print a stack trace for a panic. options GZIO # gzip (dumps) options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) -# Make an SMP-capable kernel by default +# To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel -device apic +device apic # I/O APIC # CPU frequency control device cpufreq @@ -100,6 +100,18 @@ device acpi device smbios device pci +# ATA controllers +device ahci # AHCI-compatible SATA controllers + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) + +# NVM Express (NVMe) support +device nvme # base NVMe driver + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller device atkbd # AT keyboard @@ -139,15 +151,15 @@ device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device -device virtio_balloon # VirtIO Memory Balloon device device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver # Xen HVM Guest Optimizations -# NOTE: XENHVM depends on xenpci and xentimer. -# They must be added or removed together. +# NOTE: XENHVM and xenpci interdepend. They must be added or removed +# together. xentimer depends on XENHVM and isn't required. options XENHVM # Xen HVM kernel infrastructure device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device @@ -156,15 +168,3 @@ device xentimer # Xen x86 PV timer device options EVDEV_SUPPORT # evdev support in legacy drivers device evdev # input event device support device uinput # install /dev/uinput cdev - -# NVM Express (NVMe) support -device nvme # base NVMe driver - -# ATA controllers -device ahci # AHCI-compatible SATA controllers - -# CAM -device scbus # SCSI bus (required for ATA/SCSI) -device da # Direct Access (disks) -device cd # CD -device pass # Passthrough device (direct ATA/SCSI access) From nobody Fri Jun 26 14:41:13 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 4gmyzF6L07z6jbgL for ; Fri, 26 Jun 2026 14:41:13 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmyzF1wxKz3YqT for ; Fri, 26 Jun 2026 14:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484873; 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=ICb8A4Mblei5nBRcZ5XqGqnA1+82IQ/1uU0aL2MiZK0=; b=Ac9GtcHHbGxRZtoFKesxQRlfnogcrZObobTYWUdQbhY3f+ZnN7i1gxFk9xz5ogvhHR2CBB ucyZtI1oTKUtnmByoRbwbwHenQl+Blf0rO8IfXmBmzz4rj0wiTGA/HtBKYew6QpzrOQdII y+fdDQFujjuDlwxbcTS1tcR9t4Hiufk7Hdly2Azx8975L+ZHfuW2+xRJPvENQKoOzn8fvl speFZBKj6lA1o/z+fQfrcU526ti/u0044ejO7R5g3lAMcpmjVUOoPHCj7mz68L+M9Svvb3 wEX3ljMH2iZPBcoP/BOKuTPcNUvdkNxfte8bbEo0u5iq4MAToSPCeAJ22ydNtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484873; a=rsa-sha256; cv=none; b=PFSNz4NDSSL7cXtIFbQp2ATkCfDe7zk4Mtj1tMCBINp/6T+LzI9B0p//6YYPkJYJ43nVRf ImjqDbn7VYxCNOBaaITxpBufasLzVwKf/UNADgKDaI14RYyY2iVO6GSm2Iuhq3H4opX47w WsAP9Vfy7ZJ/j07HU3adINgK8Llx9HlVLQ8TnWBSkN1wx4cF21OLBV1606zAknTNyGo4dF hyWBaj06h91JnHvoTAs1r91MpjAmkjrIgvtUpQjhlZTgftakUVLJ/PtzMr8+y7ZSQB8bcw NSDhzteM0ufgT1hdYDGIPjOYTArB3zfnLiM62DevP4FYrN7MBpFgMDet6j+kEw== 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=1782484873; 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=ICb8A4Mblei5nBRcZ5XqGqnA1+82IQ/1uU0aL2MiZK0=; b=dLoe5IhmZUCf7pCPH/Hjkvt6bnFYFS07SSa72WnGGU/gT/UipYPIb6MxXCmVeDDpe+OByS +hZ2sHhPZ8WRSvkazx6TYt1b6yOjoYTxG2/lixbOk2CWI7eYxSomfRFNMVu8XPRNPqAdri RuoCf6jniAh0mgrCLirPZ3z2yCQY6m0dBOmAqY8PcgsYcOzlMnNzJF7NMYLD4MB8qEyXkO Q0sxrxgXvT1X7IMZMNwCvXb/MWf1/8k+rCf9xaPrYCf9sBtgG6nJLs+bDEAyLfgv3LWQSu 78ZXY90KvRiGJVVvz9nsmNgxINLRBV3a0l9Q9AlNmxjCatojsbDSmx+3ArQzwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyzF10pLzhVs for ; Fri, 26 Jun 2026 14:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fbbe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:41:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b53d2de9acd1 - stable/14 - MINIMAL: Add virtio_scsi 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b53d2de9acd19f572eac6350fb5744726e6841e2 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:41:13 +0000 Message-Id: <6a3e8f89.1fbbe.5715435e@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b53d2de9acd19f572eac6350fb5744726e6841e2 commit b53d2de9acd19f572eac6350fb5744726e6841e2 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-12 16:57:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 14:41:06 +0000 MINIMAL: Add virtio_scsi This allows a MINIMAL kernel to boot in qemu/kvm. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. (cherry picked from commit 77a6992bf5329e32b0b77608421dafccb125ad37) --- sys/amd64/conf/MINIMAL | 1 + sys/i386/conf/MINIMAL | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index c3eca5221890..3d95ee84cf08 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -129,6 +129,7 @@ device virtio_pci # VirtIO PCI device device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device device virtio_balloon # VirtIO Memory Balloon device +device virtio_scsi # VirtIO SCSI device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index e543f2089124..a27c90a005f8 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -137,6 +137,7 @@ device virtio_pci # VirtIO PCI device device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device device virtio_balloon # VirtIO Memory Balloon device +device virtio_scsi # VirtIO SCSI device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver From nobody Fri Jun 26 14:41:12 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 4gmyzD3NVcz6jbjR for ; Fri, 26 Jun 2026 14:41:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmyzD1SJlz3YwP for ; Fri, 26 Jun 2026 14:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484872; 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=pFlBfGZDkAAxkYok4fQIyiw8NweR88nn3P7nG2Ltfz8=; b=c+R0IZyH6V6JoCmBWtBCqCfWHSi7AE5vEfGtfeUgtxpy9gpC7l9KeNLL6RHRFVGtH8Q1z7 rTz86JiMS3s4nVJnB2h+CdKehvQQ6yXwGU6HLZytrLMjmajwMFsRAacoVnk/GWe3yxHn/S XT76Dvy/TUftYXR7jZJ4Nim4Cc5C5OqqOrVKxdrdcRjemf3Z/wU+yoWZCb0cnx3/DMdGxd t92ab4hcZUyYPQWgqSSTrWmOBHOWdJhStM+M293Hn0ohR52o8pySht1T1Zb+1gMcFWlpi9 X4u9jw7wbHHaXTHjcy6yXBOqqkifNv75GMSBq3BiJ0Rmb1wEmG1zKyVkN03rLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484872; a=rsa-sha256; cv=none; b=mpbXg8IwUC5k0KlhdL1N+2W7sT00+d48yYEz+As/fxmQEeML/10/ZJ9SMCvNgLZUpAV7T8 OKi1FcP6E8ZzDxKibIEc2iIdKgMP3a2z3HtX3+YYG4yVxskETaWvZpbbpQYM9guqoS257J IbuiDdM2x05eZBf+GJul5urFHViVSMx4Lra4KojUYQdN6SXtJzST8MtZjsDONy+ZvlsT4n ILfBgfUV+73ZxCfF+UsJafw56tnfEFrn8eeOAG+zULpckuoTLr77fEw21nW+EA7920k6ji IuQiT78uKw7b51MYFv0Kl6x9x063cZioiKQxhIBti8ZumRim5ryI6IamWkAkkg== 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=1782484872; 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=pFlBfGZDkAAxkYok4fQIyiw8NweR88nn3P7nG2Ltfz8=; b=jdjatc7QpzFWqlfskHnei2Cq8ynmTUi8skMn++/88oQAqPvUOfKNmHR92h+pAjJFCEQI2j jATLEMC/xueZzXdGWZb78eXAQxCWvc7jms22WJ+vFUaoGmEMyfiLEY7wpIHKmRnNAC/VIf NOCU4PD4RFLqsY80EHBmGsRJVQ5kr+0hZyaDQPKwVuyY7Qw4tLm+9R2RckPOJAIyuqclef QHzrWeRmIVqhOfWsUdaJ23uG2Gvs6QV2p6MG7UP5ny5ZOfrpTsC/1yPLXV3+P4FeWMM6Be 5fUZHxEVH0i2d2YetAzP6OXjre8trddjABdBTClFfCCSCiW2bTsF0Urc9EkJUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyzD0B93zhYQ for ; Fri, 26 Jun 2026 14:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f508 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:41:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3377fbc14bb3 - stable/14 - iconv: Update availability of bool 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3377fbc14bb3e9dea44845fa788a20578d07146e Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:41:12 +0000 Message-Id: <6a3e8f88.1f508.69ad7558@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3377fbc14bb3e9dea44845fa788a20578d07146e commit 3377fbc14bb3e9dea44845fa788a20578d07146e Author: Dag-Erling Smørgrav AuthorDate: 2026-06-22 13:23:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 14:41:05 +0000 iconv: Update availability of bool While here, drop duplicate include. MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D57733 (cherry picked from commit 8f750231d4b58ac71cbd3ac3548e1d7eb849f04b) --- include/iconv.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/iconv.h b/include/iconv.h index 05e7427a4bf0..e4f6173f9984 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -38,10 +38,7 @@ #include -#include -#include - -#ifdef __cplusplus +#if __STDC_VERSION__ >= 202311L || defined(__cplusplus) typedef bool __iconv_bool; #elif __STDC_VERSION__ >= 199901L typedef _Bool __iconv_bool; From nobody Fri Jun 26 14:41:14 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 4gmyzH1Wqjz6jbZp for ; Fri, 26 Jun 2026 14:41:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmyzG2zhMz3Z7K for ; Fri, 26 Jun 2026 14:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484874; 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=O0GU5k3kWocuxg/e8RFgFj/N/868OBhTJ4DK2gpS+Zs=; b=phbF0TcRBZN3fHuUC9JcoTJMjlg4N6CoUhP00k2EbTYarW2VFtTeeGcucPbgjxt75zjOqq amSlxeerE4SZFAotocf6BM/Y/UZn9+lQqt+DbjswAQOwJ5Jwu5rQQyjRO65zdY2X3zqenr +t5SxFhP8TJRboKgLYqk/iqHjbw86AQixbrtDRf9wxA1V4FeLUv42KtdvND0c2orItHWfI OGewQh1Dfotn4nBNwPSPd/FEFRmjpz4sLs4i2VVKZ/77sNLPW8cAPmb/eKxQ+xURA1/UGf INXWjGZZ2FZhJpkbynyPfI+/rRPcviWJocVNaWo+IU7JiFkngDo2gAtOhK1+uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484874; a=rsa-sha256; cv=none; b=T6N65y9zmJHvl3Au7wxRpm3QOxF5mpsKmiOxYDYuD6mTJQQiougpAiqPISRbp5D0MAY8XX SiEnO7pZbfb9ZLPugczU208DQnEXAwEYOTM6h2EP0Mn/QSLL31vGO92pHVL8sRQ9YVPj+8 noCMyPq01Edi3anCz1nHL70VlreDlX3SOL3qfv4JSjm6sB8cDGxUCl9JryT6km3Xq6LkP8 KKMCwtyBcFbTG3LUhteDbaQZBmIC+QoYvzbIhbe4S1tKnMIPa26zrME9E1Q+BR4rFcA4Pz G153xCHQzF3LhqJWkMqsDQLb5bIaOj8yHFm4LgqXouNOl0IWsVhHOkKwf/Yx7w== 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=1782484874; 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=O0GU5k3kWocuxg/e8RFgFj/N/868OBhTJ4DK2gpS+Zs=; b=gJMzRCCVI+1/WxyMdcxAG1eSeQ7k38+0Z2VWSP2x4XGR5sErRd7E5W8KoEsadIDQ2eEoH/ d78aRBVPdFxoUlatPV8merI9FYoiVagfAxh3WP/1HOGHnywsGfNTnWmEqOc/o1pQaEI/Hi XHv5G+O3j1egWtfNOd127gtz0GCNmt6Iz+qbQuGh0QSIN5pgIxQtxYtRAOKhndoMSPkJCT 2mcXUywkRzSH440d93KrX3s5yzsAwE7knIKSpb/8S7KVu6zzHkj5h7BKJpv+GOvOCSSf2i md1Ni6cpxNUGryX6jGP9+QAmRtQalbiU5OopfXTlFWBRiJwPutIq/luZlqeDbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyzG1pr2zghs for ; Fri, 26 Jun 2026 14:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fbc2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:41:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3c687b750065 - stable/14 - kernel: Be clearer about what ZSTDIO is for 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3c687b75006585168be091add06ae121cbbe334a Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:41:14 +0000 Message-Id: <6a3e8f8a.1fbc2.2932969@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3c687b75006585168be091add06ae121cbbe334a commit 3c687b75006585168be091add06ae121cbbe334a Author: Dag-Erling Smørgrav AuthorDate: 2026-03-21 07:21:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 14:41:06 +0000 kernel: Be clearer about what ZSTDIO is for ZSTDIO is not just for core dumps, and it is now required by ZFS, so move it (and GZIO, which is still just for dumps) to a new “Compression support” section in GENERIC, and add them both to MINIMAL. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55940 (cherry picked from commit 092687a031064dc08ac198648c6393cc50b06cee) --- sys/amd64/conf/FIRECRACKER | 6 ++++-- sys/amd64/conf/GENERIC | 6 ++++-- sys/amd64/conf/MINIMAL | 4 ++++ sys/arm64/conf/std.arm64 | 6 ++++-- sys/conf/NOTES | 4 ++-- sys/i386/conf/GENERIC | 6 ++++-- sys/i386/conf/MINIMAL | 4 ++++ sys/powerpc/conf/GENERIC | 6 ++++-- sys/powerpc/conf/GENERIC64 | 6 ++++-- sys/powerpc/conf/GENERIC64LE | 6 ++++-- sys/riscv/conf/GENERIC | 8 +++++++- 11 files changed, 45 insertions(+), 17 deletions(-) diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER index b9cf11543245..6d544085b55e 100644 --- a/sys/amd64/conf/FIRECRACKER +++ b/sys/amd64/conf/FIRECRACKER @@ -105,10 +105,12 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support options NETGDB # netgdb(4) client support diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 98a08c18cbd9..96c7862e6147 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -100,10 +100,12 @@ options KDB_TRACE # Print a stack trace for a panic. #options KUBSAN # Kernel Undefined Behavior Sanitizer #options KCSAN # Kernel Concurrency Sanitizer +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support options NETGDB # netgdb(4) client support diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 3d95ee84cf08..000bfc2ab9a6 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -77,6 +77,10 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index 02631aa32164..3734d0702d33 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -79,10 +79,12 @@ options KDB_TRACE # Print a stack trace for a panic. #options KUBSAN # Kernel Undefined Behavior Sanitizer #options KCSAN # Kernel Concurrency Sanitizer +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 410b5e79fee1..a81d04d0dfcd 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2831,8 +2831,8 @@ options IMGACT_BINMISC options GZIO # zstd support -# This enables support for Zstd compressed core dumps, GEOM_UZIP images, -# and is required by zfs if statically linked. +# This enables support for Zstandard compression for core dumps, +# kernel dumps, GEOM_UZIP images, and tarfs, and is required by zfs. options ZSTDIO # BHND(4) drivers diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 6fcbaa7d50fe..10d6a67a7ac2 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -87,10 +87,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support options NETGDB # netgdb(4) client support diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index a27c90a005f8..b8d654151a95 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -85,6 +85,10 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel device apic diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index c2a68dba326a..dd2f78eb6ac7 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -90,10 +90,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index e807206a4338..c67c28867f9c 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -100,10 +100,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 5a9e914177e0..1a1d8f704a21 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -96,10 +96,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 411e25a3b9d6..a6b92574f2d0 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -180,8 +180,14 @@ device da9063_pmic # Dialog Semiconductor DA9063 PMIC options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. -options ZSTDIO # zstd-compressed kernel and user dumps +options EKCD # Support for encrypted kernel dumps +options DEBUGNET # debugnet networking +options NETDUMP # netdump(4) client support # Pseudo devices. device crypto # core crypto support From nobody Fri Jun 26 14:41:15 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 4gmyzJ2Q7Yz6jbZq for ; Fri, 26 Jun 2026 14:41:16 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmyzH3SwTz3Ynr for ; Fri, 26 Jun 2026 14:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484875; 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=V9hbHX5tri0X/Jm1+zlDWtTBQz5OZxrPOYpWp32BubM=; b=VcMK0VeYcxWEkTdg2nRG8rrk/iaQ6Jt72aaAWeM8UVh1D4nFUVO+seckIf9zQD0mrGikMS 9OjPLVAf03EMb5eMuZ6H0ti9aUA9teu35TGwFK3u5vm5iC/wpYIcu7w6ao+ft4fdbemUmT O0rMfo0A4iitIy21a6k5vau55QGI95g8vfle5HQuYm3oaONnGQ8TMHQNGPMCGLR6ZA706m f0jcrrCaH4iIt7rp5Yv6QrJpcLkL60PhW3V+qtwC0szYKm3YpsSZSD8rkJMFg76HHvidWA SXes/hhTULdf/GYW6HlUkcSHYqn4ua9ugCr229KPF0zDb3aAM7vhyq9vZHcvFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484875; a=rsa-sha256; cv=none; b=qSC2zX7/0kXlRH/RURZGnCLSnc0lHNJZcZIUqchWKn/01usOvrmRz54+8HJn1/hxtiAwIT rusTUWcwVhCAoAe730lOf1hygHHQ2VzUGN9c03w4kC/EbgRbm0rmvFXkTJhNTf+RjNPh21 MojEvacqGChXvuCgqY1XUnQ91Mp9sChOzLSsTa6wOgSo3LeTm2cakr6s4PGVtSzJQAHYtQ ryDvg7vwJSgqfzCCjD6xzMKEgS4Gt1HctGpBB4jb5bwKMK5kQt3YWafDKzE7tU6g65RE37 TB/fww4s9OV3DhkhxG0VNG9G+LTg6GcJLAoP0way2yW+SEBzi44SrHFosHf/7g== 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=1782484875; 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=V9hbHX5tri0X/Jm1+zlDWtTBQz5OZxrPOYpWp32BubM=; b=U7GWztrCwNcfMewb9H0CGGFg1BS/neFtrSuZpo/o7f37i8IfPE+rfhSsJnjLeSt4DZR4yE 8Jj64/IKHCBw6PtT5InZk7K8s8jq8v7kxaH3xcnsWnkycIahpGvIPdt7U6WhFM0tm7GUTZ E0D0kxNj1o4+WgGobpeIjL/Wuak4tbCwOWCrGcLKJlY14150HzXyF9n9I4gT0IzBdkhLA5 hE3LEncWRlYbMl0NmXXNfG9F4s44L1CHDrtJ8GFdWQHRSoUekaJTCrMBT0CcZO69U2njZa /ePiayFQidY1O58EFeem20g1A43U7arxQmqtRpEWjQRf6OUtmRAPwFxrTSe0Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyzH2JcvzhKm for ; Fri, 26 Jun 2026 14:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d45d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:41:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f523af0e05a5 - stable/14 - x86: Harmonize GENERIC and MINIMAL 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f523af0e05a5a7e1aa9a872e165d9dcf3b60ad18 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:41:15 +0000 Message-Id: <6a3e8f8b.1d45d.6edb641f@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f523af0e05a5a7e1aa9a872e165d9dcf3b60ad18 commit f523af0e05a5a7e1aa9a872e165d9dcf3b60ad18 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 07:51:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 14:41:06 +0000 x86: Harmonize GENERIC and MINIMAL * Reorder MINIMAL so everything is in the same order as in GENERIC. * Wherever comments diverged, except for the explanatory comment at the top, copy the GENERIC version to MINIMAL. * Add KDTRACE_FRAME to i386 GENERIC; it was already in MINIMAL, and adding it to GENERIC seemed like the more correct move. With these changes, MINIMAL is a strict subset of GENERIC, apart from the identifier and the explanatory comment at the top. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57729 (cherry picked from commit 01c8644093c28d09f0d41fb522dc53f1ab696a7e) --- sys/amd64/conf/MINIMAL | 14 +++++++++++++- sys/i386/conf/GENERIC | 1 + sys/i386/conf/MINIMAL | 22 +++++++++++++++++----- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 000bfc2ab9a6..45e905898115 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -92,6 +92,18 @@ device acpi options IOMMU device pci +# ATA controllers +device ahci # AHCI-compatible SATA controllers + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) + +# NVM Express (NVMe) support +device nvme # base NVMe driver + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller device atkbd # AT keyboard @@ -132,8 +144,8 @@ device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device -device virtio_balloon # VirtIO Memory Balloon device device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 10d6a67a7ac2..89b6b9bbac3b 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -76,6 +76,7 @@ options AUDIT # Security event auditing options CAPABILITY_MODE # Capsicum capability mode options CAPABILITIES # Capsicum capabilities options MAC # TrustedBSD MAC Framework +options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data options INCLUDE_CONFIG_FILE # Include this file in kernel diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index b8d654151a95..a488c32cd8dd 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -89,9 +89,9 @@ options KDB_TRACE # Print a stack trace for a panic. options GZIO # gzip (dumps) options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) -# Make an SMP-capable kernel by default +# To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel -device apic +device apic # I/O APIC # CPU frequency control device cpufreq @@ -101,6 +101,18 @@ device acpi device smbios device pci +# ATA controllers +device ahci # AHCI-compatible SATA controllers + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) + +# NVM Express (NVMe) support +device nvme # base NVMe driver + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller device atkbd # AT keyboard @@ -140,15 +152,15 @@ device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device -device virtio_balloon # VirtIO Memory Balloon device device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver # Xen HVM Guest Optimizations -# NOTE: XENHVM depends on xenpci and xentimer. -# They must be added or removed together. +# NOTE: XENHVM and xenpci interdepend. They must be added or removed +# together. xentimer depends on XENHVM and isn't required. options XENHVM # Xen HVM kernel infrastructure device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device From nobody Fri Jun 26 15:18:19 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 4gmzp33dmNz6jfCF for ; Fri, 26 Jun 2026 15:18:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzp32YtFz3l5M for ; Fri, 26 Jun 2026 15:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487099; 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=ru1ZsoVlKZv+iG63jKdb8GDz11fi2/zg/UZ1JnoW1XU=; b=aBvwzfPJnUNn8sp05z7bdRMaLD2nfgzkSwCgsw9SvBG6Q5CwKbswJsRF5JAulk0bzgqQiQ q+A836v64HaE5ulVRGjUQLwupeWD/JY85bwY4Kp0LSa2ov6JvK0efdOV3Hn0GoNka6mbyq y9ynya/x6zlJI3xNCsaMx8WBPjQD5o6zc/bleeGZ4hZ6pi34uOAYr55pekhNtsie4yb4Kd EBHS13V+gLzL7esdBnTAAqa/IbjqBkLZzqdh7i9OdSnPq8fTkZOE8fDYAhjLbjc2kaAj5H bwMTvuiq82XsXVTYGNcO4AnJ5sVZifbv2Ans+I1pAv6gMXCa71uo/3PxuGmxUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487099; a=rsa-sha256; cv=none; b=KmP4YSIxWU12tWxfzwIIC5/KjK4cm94uiECLhDNUsRMX1ogdqopTwK6v+TKXormmR80/0a HC0P3K00Jh3tXlNAHtxv1oijuXV5TJoNe5CBfDvxfEaK+w2GY8/LLYqU1f6MBkqnb+xtDt qDY9QHLnwhl8ywiD7Pt2mFHoSIEKv54qbvRfnVdweyO2RLPnEkcwGC2KfqFi/I68VxfNVN 31yQBz2gnBYpPGyfab0fNDodfifeHctKA2iDXZlNhTKD4Wmc4Ce008MonpIpaj4tkh8PY5 OnX49vmDfYD4LUv+7mLq3xgDEMx/rIUaxMYE3HbVRqA9PInUVzFDjm57IqGn2w== 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=1782487099; 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=ru1ZsoVlKZv+iG63jKdb8GDz11fi2/zg/UZ1JnoW1XU=; b=TrU8mrBJo8+cJjlgqvYRIqaOL0VYXshrL0L4fnYnbKM501guDrBr41i1Nj9TI8Ts78N+KY wsKGq3VrvQY00t/T4xr3wSltwY8UnD9U2ww1gxkHBQ033m1/aBG7buxxxtHfwY26y065b6 MV2i3JdI3HOwKHJ7L8T8L0MJs1AaMv39JoXCdCPtSDPFi233uu/NZiPpP7gTbhXJx44IvB RtStH96+8pmE3NqbwTzkGN4xSyPQN8Via7hztZ5q5ifN0IXaRtErRuAdrQ3k4N9nUwxN1A g/6ZbPjK/rOGXxymn/v1SQrxHnO+Zs8OWYT/QomDHXjDK0BxXVNDypOykGaRVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzp31Pn6zjJZ for ; Fri, 26 Jun 2026 15:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 11d85cee1c71 - stable/15 - lib/msun/tests: Remove newlines in ATF msgs 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 11d85cee1c71ac3b05ce705d3f92fb3822d11d90 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:19 +0000 Message-Id: <6a3e983b.22d75.5be10575@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=11d85cee1c71ac3b05ce705d3f92fb3822d11d90 commit 11d85cee1c71ac3b05ce705d3f92fb3822d11d90 Author: Siva Mahadevan AuthorDate: 2025-10-01 15:13:08 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:42 +0000 lib/msun/tests: Remove newlines in ATF msgs This fixes broken test reports with the following message: lib/msun/fe_round_test:fe_round -> broken: Test result contains multiple lines: expected_failure: /usr/src/contrib/netbsd-tests/lib/libm/t_fe_round.c:95: Didn't get the same rounding mode out!<>(index 0) fed in 64 rounding mode, got 0 out<> [0.079s] Signed-off-by: Siva Mahadevan MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit ec640742e30270098f8d982c1c0838f2dfde9ad5) --- contrib/netbsd-tests/lib/libm/t_fe_round.c | 24 ++++++++++++------------ lib/msun/tests/fmaxmin_test.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/netbsd-tests/lib/libm/t_fe_round.c b/contrib/netbsd-tests/lib/libm/t_fe_round.c index 33da289eb156..a7ee3bf77b98 100644 --- a/contrib/netbsd-tests/lib/libm/t_fe_round.c +++ b/contrib/netbsd-tests/lib/libm/t_fe_round.c @@ -80,15 +80,15 @@ ATF_TC_BODY(fe_round, tc) received = lrint(values[i].input); ATF_CHECK_MSG( (labs(received - values[i].expected) < EPSILON), - "lrint rounding wrong, difference too large\n" - "input: %f (index %d): got %ld, expected %ld\n", + "lrint rounding wrong, difference too large. " + "input: %f (index %d): got %ld, expected %ld", values[i].input, i, received, values[i].expected); /* Do we get the same rounding mode out? */ ATF_CHECK_MSG( (fegetround() == values[i].round_mode), - "Didn't get the same rounding mode out!\n" - "(index %d) fed in %d rounding mode, got %d out\n", + "Didn't get the same rounding mode out!. " + "(index %d) fed in %d rounding mode, got %d out", i, values[i].round_mode, fegetround()); } } @@ -109,15 +109,15 @@ ATF_TC_BODY(fe_nearbyint, tc) received = nearbyint(values[i].input); ATF_CHECK_MSG( (fabs(received - values[i].expected) < EPSILON), - "nearbyint rounding wrong, difference too large\n" - "input: %f (index %d): got %f, expected %ld\n", + "nearbyint rounding wrong, difference too large. " + "input: %f (index %d): got %f, expected %ld", values[i].input, i, received, values[i].expected); /* Do we get the same rounding mode out? */ ATF_CHECK_MSG( (fegetround() == values[i].round_mode), - "Didn't get the same rounding mode out!\n" - "(index %d) fed in %d rounding mode, got %d out\n", + "Didn't get the same rounding mode out! " + "(index %d) fed in %d rounding mode, got %d out", i, values[i].round_mode, fegetround()); } } @@ -151,8 +151,8 @@ ATF_TC_BODY(fe_nextafter, tc) } ATF_CHECK_MSG( res && (fabs(received - values2[i].expected) < EPSILON), - "nextafter() rounding wrong, difference too large\n" - "input: %f (index %d): got %f, expected %f, res %d\n", + "nextafter() rounding wrong, difference too large. " + "input: %f (index %d): got %f, expected %f, res %d", values2[i].input, i, received, values2[i].expected, res); } } @@ -177,8 +177,8 @@ ATF_TC_BODY(fe_nexttoward, tc) } ATF_CHECK_MSG( res && (fabs(received - values2[i].expected) < EPSILON), - "nexttoward() rounding wrong, difference too large\n" - "input: %f (index %d): got %f, expected %f, res %d\n", + "nexttoward() rounding wrong, difference too large. " + "input: %f (index %d): got %f, expected %f, res %d", values2[i].input, i, received, values2[i].expected, res); } } diff --git a/lib/msun/tests/fmaxmin_test.c b/lib/msun/tests/fmaxmin_test.c index 51956b1084af..85a105a7f44f 100644 --- a/lib/msun/tests/fmaxmin_test.c +++ b/lib/msun/tests/fmaxmin_test.c @@ -50,7 +50,7 @@ CHECK_FP_EXCEPTIONS_MSG(0, ALL_STD_EXCEPT, \ #func "(%.20Lg, %.20Lg) rmode%d", (x), (y), rmode); \ ATF_CHECK_MSG(fpequal_cs(__result, (expected), true), \ - #func "(%.20Lg, %.20Lg) rmode%d = %.20Lg, expected %.20Lg\n", \ + #func "(%.20Lg, %.20Lg) rmode%d = %.20Lg, expected %.20Lg", \ (x), (y), rmode, __result, (expected)); \ } while (0) From nobody Fri Jun 26 15:18: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 4gmzp44Mjsz6jfFp for ; Fri, 26 Jun 2026 15:18: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzp43B2Mz3lFn for ; Fri, 26 Jun 2026 15:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487100; 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=ceooYp/sZxA3lcaORjt5CodALI2CAlXcyNKw7wm3So8=; b=D3RVkrpdKqhqhcka2VTpl5toSzOeIUDzmynie6wnoGJR/VrCeyVrvl5Yvd+W9xIeihFW4t ZLmOGcugl8gJVceI3LPiG3yKmsZO/2Lr3SF/eQBiahKIai8cJlvSZEp6JZ6SVDYbO+7Lnq xgDvdIHvkKuj5F1Rp79FhKOxjANWjOZkI98rcjpLzMiuDBnyJUZmWiA56aXFiunVEXCCL9 qnZns+QuPdPxGHRlWCnQ/pB7BxmTy7vBkZcpG3aNouZzeS2wUllBr2e+VBTQ3kFb6yTCT9 qa6jCyptzxVjUcE6OEIsFTjO+hx6BvG8OioKBrlPafZOvlY0rWdZcLe3haI+zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487100; a=rsa-sha256; cv=none; b=BAzF0I+5Kgc89sPbN9svftvc2n/0iObcspzJA7t15u+Mdh3YoY6yIPaMqQSCq7hnrQPrZH b6Q7dSVSMoiNA3REv3hsrI3nkILM89wQpadjvDJRQTv1ChRAJmgiByHLBA5j72LVQu7yMH JRyAYGvw9v2HGr9HW4F55Bfb5LVD3wRHpoVTyZshknk4qxkcUjQujoJgK8Ue5qNqEo/MBY PAySv/srb5hHpvJqXJVUMnh5blu/LJR+QTeKCZfeGkrbpjy/70+fNCuzu6mWg2BFPJuplH Sr9VOUGvG8oMZawOUNXnOXk/AXJUq52IMI5FxvQCzmpOFZR9gW9tJboV6XfoWA== 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=1782487100; 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=ceooYp/sZxA3lcaORjt5CodALI2CAlXcyNKw7wm3So8=; b=ZT9xaCVD6IR/FUDnVONISikU+qCArPMBoKd6c8Q8meRwVhYgyGzqdgoif+8SJmxehHj67f nW10uvNQUb6FGq7rMRpcREFCDbVoRvYHAiOGAhPSmiTeeRtxkANy9E1L8VN2T8C0ylIkYK DxHAPI/QaR8zy2Cp7iDzfk06jJCMjhp9ob/WmbxU4GBbNVAisUr0fkFpUlzGZNJIkwnqSe PvwoYJ2Ciby7S2gxuabxIdtvc9tptsu6x7Ddk0nx85JKDWcluKmQfzWH3tz5AjJ3mY1L8L 2RWbPvX/A3YG0YTgcpQVTEQJ1smAp7Oa0iBtBHR1zLD/K0Tgi9ZS8LaiUVFh3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzp42DP0zjJb for ; Fri, 26 Jun 2026 15:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23990 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: c1cab4384052 - stable/15 - lib/msun/tests: Add REQUIRE_ variants of test-utils macros 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c1cab43840520a2f00c9e8234618310e5420cb8c Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:20 +0000 Message-Id: <6a3e983c.23990.5c24690c@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c1cab43840520a2f00c9e8234618310e5420cb8c commit c1cab43840520a2f00c9e8234618310e5420cb8c Author: Siva Mahadevan AuthorDate: 2025-10-08 20:38:47 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:42 +0000 lib/msun/tests: Add REQUIRE_ variants of test-utils macros Signed-off-by: Siva Mahadevan MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit a9b1650f90f4dbc62baa52b395082b1714b6cbf3) --- lib/msun/tests/test-utils.h | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/lib/msun/tests/test-utils.h b/lib/msun/tests/test-utils.h index 0a926551639c..984833605fe8 100644 --- a/lib/msun/tests/test-utils.h +++ b/lib/msun/tests/test-utils.h @@ -144,21 +144,20 @@ fpequal_tol(long double x, long double y, long double tol, return (ret); } -#define CHECK_FPEQUAL(x, y) CHECK_FPEQUAL_CS(x, y, true) - -#define CHECK_FPEQUAL_CS(x, y, checksign) do { \ +#define _fpequal_cs(atf_variant, x, y, checksign) do { \ long double _x = x; \ long double _y = y; \ - ATF_CHECK_MSG(fpequal_cs(_x, _y, checksign), \ + ATF_##atf_variant##_MSG(fpequal_cs(_x, _y, checksign), \ "%s (%.25Lg) ~= %s (%.25Lg)", #x, _x, #y, _y); \ } while (0) -#define CHECK_FPEQUAL_TOL(x, y, tol, flags) do { \ +#define _fpequal_tol(atf_variant, x, y, tol, flags) do { \ long double _x = x; \ long double _y = y; \ bool eq = fpequal_tol(_x, _y, tol, flags); \ long double _diff = eq ? 0.0L : fabsl(_x - _y); \ - ATF_CHECK_MSG(eq, "%s (%.25Lg) ~= %s (%.25Lg), diff=%Lg, maxdiff=%Lg,", \ + ATF_##atf_variant##_MSG(eq, \ + "%s (%.25Lg) ~= %s (%.25Lg), diff=%Lg, maxdiff=%Lg,", \ #x, _x, #y, _y, _diff, fabsl(_y * tol)); \ } while (0) @@ -170,32 +169,48 @@ cfpequal(long double complex d1, long double complex d2) fpequal_cs(cimagl(d1), cimagl(d2), true)); } -#define CHECK_CFPEQUAL_CS(x, y, checksign) do { \ +#define _cfpequal_cs(atf_variant, x, y, checksign) do { \ long double _x = x; \ long double _y = y; \ bool equal_cs = \ fpequal_cs(creal(_x), creal(_y), (checksign & CS_REAL) != 0) && \ fpequal_cs(cimag(_x), cimag(_y), (checksign & CS_IMAG) != 0); \ - ATF_CHECK_MSG(equal_cs, "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ + ATF_##atf_variant##_MSG(equal_cs, \ + "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ #x, creall(_x), cimagl(_x), #y, creall(_y), cimagl(_y)); \ } while (0) -#define CHECK_CFPEQUAL_TOL(x, y, tol, flags) do { \ +#define _cfpequal_tol(atf_variant, x, y, tol, flags) do { \ long double _x = x; \ long double _y = y; \ bool equal_tol = (fpequal_tol(creal(_x), creal(_y), tol, flags) && \ fpequal_tol(cimag(_x), cimag(_y), tol, flags)); \ - ATF_CHECK_MSG(equal_tol, "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ + ATF_##atf_variant##_MSG(equal_tol, \ + "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ #x, creall(_x), cimagl(_x), #y, creall(_y), cimagl(_y)); \ } while (0) -#define CHECK_FP_EXCEPTIONS(excepts, exceptmask) \ - ATF_CHECK_EQ_MSG((excepts), fetestexcept(exceptmask), \ - "unexpected exception flags: got %#x not %#x", \ +#define _fp_exceptions(atf_variant, excepts, exceptmask) \ + ATF_##atf_variant##_EQ_MSG((excepts), fetestexcept(exceptmask), \ + "unexpected exception flags: got %#x not %#x", \ fetestexcept(exceptmask), (excepts)) -#define CHECK_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) \ - ATF_CHECK_EQ_MSG((excepts), fetestexcept(exceptmask), \ +#define _fp_exceptions_msg(atf_variant, excepts, exceptmask, fmt, ...) \ + ATF_##atf_variant##_EQ_MSG((excepts), fetestexcept(exceptmask), \ "unexpected exception flags: got %#x not %#x " fmt, \ fetestexcept(exceptmask), (excepts), __VA_ARGS__) +#define CHECK_FP_EXCEPTIONS(excepts, exceptmask) _fp_exceptions(CHECK, excepts, exceptmask) +#define CHECK_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) _fp_exceptions_msg(CHECK, excepts, exceptmask, fmt, __VA_ARGS__) +#define CHECK_CFPEQUAL_TOL(x, y, tol, flags) _cfpequal_tol(CHECK, x, y, tol, flags) +#define CHECK_CFPEQUAL_CS(x, y, checksign) _cfpequal_cs(CHECK, x, y, checksign) +#define CHECK_FPEQUAL(x, y) _fpequal_cs(CHECK, x, y, true) +#define CHECK_FPEQUAL_TOL(x, y, tol, flags) _fpequal_tol(CHECK, x, y, tol, flags) + +#define REQUIRE_FP_EXCEPTIONS(excepts, exceptmask) _fp_exceptions(REQUIRE, excepts, exceptmask) +#define REQUIRE_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) _fp_exceptions_msg(REQUIRE, excepts, exceptmask, fmt, __VA_ARGS__) +#define REQUIRE_CFPEQUAL_TOL(x, y, tol, flags) _cfpequal_tol(REQUIRE, x, y, tol, flags) +#define REQUIRE_CFPEQUAL_CS(x, y, checksign) _cfpequal_cs(REQUIRE, x, y, checksign) +#define REQUIRE_FPEQUAL(x, y) _fpequal_cs(REQUIRE, x, y, true) +#define REQUIRE_FPEQUAL_TOL(x, y, tol, flags) _fpequal_tol(REQUIRE, x, y, tol, flags) + #endif /* _TEST_UTILS_H_ */ From nobody Fri Jun 26 15:18:21 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 4gmzp559v7z6jfCP for ; Fri, 26 Jun 2026 15:18:21 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzp540wpz3lB1 for ; Fri, 26 Jun 2026 15:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487101; 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=7wkFBKUFuZe06Nn/taEKeEWc1MAZo2m/tHzJ01GJOro=; b=XeuCgwsHeqoG5EK0sGj728i9UEaCPAqReWkevF2jY1QD7tJd3JwMUoyiXubEo8hX2WEE0x OdubkDgyUKbVfbVdQNxuZcudWUDevknLEE2xx+TS2+sW0X+LiQyu2y70U0dmVqkh/5V/DQ 3fvT9b8zGvJfIj8s7wYgfWq0k0xQN33Hzvmwd5n6wcWBm+aB9oneiS+Ifwioliz8OyZoVt XKmM9MEpVvKgbGCckbQ4SpuzcnO3JHk10YqM7n1v9SlkxMtLwtqQy4vIfUH+ZNDDWDyYT/ cTK7D+dJzz0UcqsjmshSiMd99rOJ/VGUnBdu/nDbS5Zd/wrv/Ufs5vxfcdz67w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487101; a=rsa-sha256; cv=none; b=RlZ1uASbL2+2WBiKElNGQ9jIOiQuwGYdFYy0VNKAxiWM7IaxbU4nDp7Y8t1QX+6KTtVovm KXjK7Y0yt4plpM9lEm5N0MXTn/X6qe6F72wS8zlIUAqwPKlrdQTc0pKBzI3vcJJlC8KgCb uYqaB7OWi2LeFHHdaFqTlG/VEeHDameJhALj42rRyU9Y5N1JxLQqShy+Ty4FR+3/gE1j99 4nKRrivLH7F8Vqn0ViTOUR2rUVJz68+ZGGf8vD4nRnCs4Jmw0upWHQGP8wkcYrnmAT3Vdl LG+S6a9HuGCqN44a44cb7QnUVb14IvIJdc1CFvkQnK8bzQopJieJAu4tVD5hpQ== 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=1782487101; 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=7wkFBKUFuZe06Nn/taEKeEWc1MAZo2m/tHzJ01GJOro=; b=h2qB9obiRBV3H/uvP3FEoB22Do84VnseifhEjj6bQ6ybNvyURgtBwzUxIcpRTjwx5ACvap uvYpRnQ0WX35HDyJJG4/tbuhZJayEIKQkyzAYCF1waNXadOElfEnQ9sjkjEr0w/FaqFJgr 87QrVih1PwTVQHgZ1ikNjykPuMc/5TcG5SRDZt+EHKnFQ1WYlLNGlQJSQoLF1dGSmSg3BS 64pOhaFOZWfHHpnzp5d9EUZw769ZioHwsZ7EpfsIqBA7XITdpn+PvaI/1Eqm/AsUk1clOW StEDGaRI5GvIhbKm5u1kasLkWFx/HeGfe281qYpR8znX5b0YqmyAQhQbXAmqVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzp530Mvzj4l for ; Fri, 26 Jun 2026 15:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2056f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 86f508508716 - stable/15 - lib/msun/tests: xfail fe_round on riscv64 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 86f508508716b7e6c8b01b06ebdceb58d81ec9f0 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:21 +0000 Message-Id: <6a3e983d.2056f.63d530a4@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=86f508508716b7e6c8b01b06ebdceb58d81ec9f0 commit 86f508508716b7e6c8b01b06ebdceb58d81ec9f0 Author: Siva Mahadevan AuthorDate: 2025-10-08 20:40:15 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:42 +0000 lib/msun/tests: xfail fe_round on riscv64 Replace ATF_CHECK_* with ATF_REQUIRE_* to fail fast and avoid unexpected aborts. Signed-off-by: Siva Mahadevan PR: 290099 MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit 6c18c40b29fd5ac66230af34726260ce2d47aecd) --- contrib/netbsd-tests/lib/libm/t_fe_round.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/netbsd-tests/lib/libm/t_fe_round.c b/contrib/netbsd-tests/lib/libm/t_fe_round.c index a7ee3bf77b98..58d1dbfc0e37 100644 --- a/contrib/netbsd-tests/lib/libm/t_fe_round.c +++ b/contrib/netbsd-tests/lib/libm/t_fe_round.c @@ -72,20 +72,23 @@ ATF_TC_HEAD(fe_round, tc) ATF_TC_BODY(fe_round, tc) { +#if defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif long int received; for (unsigned int i = 0; i < __arraycount(values); i++) { fesetround(values[i].round_mode); received = lrint(values[i].input); - ATF_CHECK_MSG( + ATF_REQUIRE_MSG( (labs(received - values[i].expected) < EPSILON), "lrint rounding wrong, difference too large. " "input: %f (index %d): got %ld, expected %ld", values[i].input, i, received, values[i].expected); /* Do we get the same rounding mode out? */ - ATF_CHECK_MSG( + ATF_REQUIRE_MSG( (fegetround() == values[i].round_mode), "Didn't get the same rounding mode out!. " "(index %d) fed in %d rounding mode, got %d out", From nobody Fri Jun 26 15:18:22 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 4gmzp71lKvz6jf8v for ; Fri, 26 Jun 2026 15:18:23 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzp64ykvz3l7h for ; Fri, 26 Jun 2026 15:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487102; 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=GoMKiorU78y6nfVm9cr3yWKJgSDTPqADtfzLUEOkUyM=; b=wFCg4ZiD7yA9zW84ibPPU756whHPCRdi+xQOF9drRtrVtjhUkY8hxErC5GfGp4Ys0mkSCI ZrhOwcR+49RiHdgYL0KjP0J69nzOPee7yaWWWcXq1UV5ZpYS1+hE3VXnxVAAi3umRmsnn/ GIFO8T9nT+nawIuQ6WGFenmzpMejnHcllk6IuOLE24/+Zeo/fY2UORlZTZIGAGjdnerITc kJKSwzyRkUjTcQPT27a6yKejeq7mVI+q7/Ba6Bx5W0Ei7kedDpQaS/XgTWAbHp6sQ2xJ7E 4Cvq9pjbg3gzUZxZimMe7ETCFGj7VQiueWu1mHz9EMfkA75B3ta0W32HF0PXZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487102; a=rsa-sha256; cv=none; b=GWsBL0Qikhp6E/EUwiW25lp0YV6Ly6+3GLkhmaIyO0XgrUXKDCXt/xJbFFuN6C6I8XUQ/r xOO6mBsmbVrINbrMnSe2uibfSWWUCI4xVyrh4qZx1fZfKJ2BxBXsVR6OaaPUM8rq+zjFtc wtHhplnNUrYxmwYXQTLt4HWYQ2DqRk1oRpgMPcxzadRsCEmRz1ZqlGeT9tJi4SopKqB6yZ R3AwRjJ3boE85sYeiOXOnoczV1YCxPACqElvCN0pAYdD8f+8Ysosc9uvddpBw2WTZWNrBE Vhjx4cCzw7V9IkPvi8PsyZKsl6rMZjucP19yuZ0g50CfNOveoUf7Bhsa8XLWYw== 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=1782487102; 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=GoMKiorU78y6nfVm9cr3yWKJgSDTPqADtfzLUEOkUyM=; b=ZrsMpMIhX1VXXJ9LkcSjKDhrMNo2Rz4KDu7Mbseqb9UW8tAflabfVB6suvEqbRW3k+Gmbx 4+vHmFwDgFLtgHgDlNK1+rdVqxoekjArtpgDfe3KbMmDEI/QAFqOH4cJmHX4KR9AG7A5+F eK3ajcGxNdipjIbFWP662ztht+IR3b6V24ADDyvlJd61fhSRdnxACtFQh6+1NeQaA1pBhx 3N91EqnvhC3JD3JabHNrSwlJ+g87X+aZya/mFdgLjRtIe9byZMEjD9elI8lMx9AikxmZ7B K5Jyl24HM7mRw4h9unsrmpzRMAVKWkyhMN7Fw+xKYqyVVKXYxR3PAJdf6BJpqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzp63pvfzjPS for ; Fri, 26 Jun 2026 15:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22794 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 1a861f3b4ce0 - stable/15 - lib/msun/tests: xfail failing invtrig_test cases on non-x86 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1a861f3b4ce0542a6b2a0d15ad4c13f794edf2fc Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:22 +0000 Message-Id: <6a3e983e.22794.75859289@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=1a861f3b4ce0542a6b2a0d15ad4c13f794edf2fc commit 1a861f3b4ce0542a6b2a0d15ad4c13f794edf2fc Author: Siva Mahadevan AuthorDate: 2025-10-08 20:40:15 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 lib/msun/tests: xfail failing invtrig_test cases on non-x86 Replace ATF_CHECK_* with ATF_REQUIRE_* to fail fast and avoid unexpected abort. PR: 290099 MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit 5a0617454e37c6a3df4106c24bd5ad20b338fe3a) --- lib/msun/tests/invtrig_test.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/lib/msun/tests/invtrig_test.c b/lib/msun/tests/invtrig_test.c index 8c6fdb7c6e2f..76fbd33bf73e 100644 --- a/lib/msun/tests/invtrig_test.c +++ b/lib/msun/tests/invtrig_test.c @@ -52,8 +52,8 @@ #define test_tol(func, x, result, tol, excepts) do { \ volatile long double _in = (x), _out = (result); \ ATF_REQUIRE_EQ(0, feclearexcept(FE_ALL_EXCEPT)); \ - CHECK_FPEQUAL_TOL(func(_in), _out, (tol), CS_BOTH); \ - CHECK_FP_EXCEPTIONS_MSG(excepts, ALL_STD_EXCEPT, "for %s(%s)", \ + REQUIRE_FPEQUAL_TOL(func(_in), _out, (tol), CS_BOTH); \ + REQUIRE_FP_EXCEPTIONS_MSG(excepts, ALL_STD_EXCEPT, "for %s(%s)", \ #func, #x); \ } while (0) #define test(func, x, result, excepts) \ @@ -82,8 +82,8 @@ #define test2_tol(func, y, x, result, tol, excepts) do { \ volatile long double _iny = (y), _inx = (x), _out = (result); \ ATF_REQUIRE_EQ(0, feclearexcept(FE_ALL_EXCEPT)); \ - CHECK_FPEQUAL_TOL(func(_iny, _inx), _out, (tol), CS_BOTH); \ - CHECK_FP_EXCEPTIONS_MSG(excepts, ALL_STD_EXCEPT, "for %s(%s)", \ + REQUIRE_FPEQUAL_TOL(func(_iny, _inx), _out, (tol), CS_BOTH); \ + REQUIRE_FP_EXCEPTIONS_MSG(excepts, ALL_STD_EXCEPT, "for %s(%s)", \ #func, #x); \ } while (0) #define test2(func, y, x, result, excepts) \ @@ -125,7 +125,9 @@ sqrt2m1 = 4.14213562373095048801688724209698081e-01L; ATF_TC_WITHOUT_HEAD(special); ATF_TC_BODY(special, tc) { - +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/283017"); +#endif testall(asin, 0.0, 0.0, 0); testall(acos, 0.0, pi / 2, FE_INEXACT); testall(atan, 0.0, 0.0, 0); @@ -238,7 +240,9 @@ ATF_TC_BODY(special_atan2, tc) ATF_TC_WITHOUT_HEAD(accuracy); ATF_TC_BODY(accuracy, tc) { - +#if defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* We expect correctly rounded results for these basic cases. */ testall(asin, 1.0, pi / 2, FE_INEXACT); testall(acos, 1.0, 0, 0); @@ -276,7 +280,9 @@ ATF_TC_BODY(accuracy, tc) ATF_TC_WITHOUT_HEAD(p2x_atan2); ATF_TC_BODY(p2x_atan2, tc) { - +#if defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif testall2(atan2, 1.0, 1.0, pi / 4, FE_INEXACT); testall2(atan2, 1.0, -1.0, c3pi / 4, FE_INEXACT); testall2(atan2, -1.0, 1.0, -pi / 4, FE_INEXACT); @@ -299,6 +305,9 @@ ATF_TC_BODY(p2x_atan2, tc) ATF_TC_WITHOUT_HEAD(tiny); ATF_TC_BODY(tiny, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/283017"); +#endif float tiny = 0x1.23456p-120f; testall(asin, tiny, tiny, FE_INEXACT); @@ -436,6 +445,9 @@ tanatanl(long double x) ATF_TC_WITHOUT_HEAD(inverse); ATF_TC_BODY(inverse, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif float i; for (i = -1; i <= 1; i += 0x1.0p-12f) { From nobody Fri Jun 26 15:18:23 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 4gmzp81nYXz6jf1N for ; Fri, 26 Jun 2026 15:18:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzp76mT1z3kp4 for ; Fri, 26 Jun 2026 15:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487104; 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=8g5QRqPD0A+j+wZRAtDUklUWZzNySKi0SJbzrZDB9ks=; b=uIJM0Scs4R1sTBHlB8OeVcP29DLpPmYGC+cRuZa/uyYpN0cZlzZLXEuL/9tfkrbovWCaPe teVujheTp17Q+MqIIObZ5PftmFZsEFx2Sg4qa4aKmpFBFCNZEOP0Pek7TFKoRHbQv+0cah 5lW697Jcx8PfSbe9iFbgQGjLWDB36jhcpQe8oTID8hgDalzujakOdCLyPFlEOGWtwFYgZI yjtQtMx9hZsorODQe7UNtiVIH9VaqVqo/MW7PEp80Cfk1f4YII3nMAOdcYP82UWOSg5nR1 1LJfdd0GNs6Qo9ddeqqYQ3qkRLK7kZXAAECiYa9dniRiRyQzcd3BwlJCIhO1sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487104; a=rsa-sha256; cv=none; b=P5ePeYOs2pNkIR7iMD+ul3nj4+L2tsEop/lhYCSAxTmoHzIRo+DgX9BFL8kloIk4BEqTtb Vupj5wAM26xz3JQ2/rAWvCWD3m0mOgbE7y0RSdMRO9dIRCit/JY2xb2KVhDJ8JGsD91+Fv P07hDNvRsilwR2/q9ZHnFKy3yt6UHCWv/vtUS/X8iz2RyZUo2shnQ4oaaagGRzQ7wPHg67 ozUkVhTs9Z3hwSPx7UmWll+0DYD+Y9fk2VzqU4NUihO415nN0g8jlDATdmempIE9hbFwgh uk+lu/Ligx7p1j/swCzGd66CcsQwOFL+z3aUYZRsdsZuwj2TQP/aASJpyn9uvg== 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=1782487104; 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=8g5QRqPD0A+j+wZRAtDUklUWZzNySKi0SJbzrZDB9ks=; b=ykZ/dL/pvClBXAj+WsBlipyzwIrnUO3qarMzYSw975E+VNDrqD6iJd+qY6iUqhblTtSSI8 rccIo6bQ8znvRW1lKio70KXnxo7OU1UxFm6msEfW/9AmJpUlkGaqsZTHxWrRy2WlncrGvU 1tGR1mdeAIe29Do1jvvtAqVAjF8p6Dzrfin/6p4aPQPVmzA3LL0Wbfljl4mtTXNzV2G6ce aFKmSwXwFyMcfLAh3yRr1viyICqs5TAJWtJXwreV0yfx1sWPkS6gCukuQIGqVKsMFlFWBQ W4GhdNFDU/HV9wywY4aloOvNu6npKj1pqyf5oi0WRZ0z4PGPYveMD1DjMHAJoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzp74dX0zjY5 for ; Fri, 26 Jun 2026 15:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22a06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: a230865b2170 - stable/15 - lib/msun/tests: xfail failing lrint_test cases on non-x86 archs 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a230865b21703f24245e2f4ddfebaabb5f5b3b5d Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:23 +0000 Message-Id: <6a3e983f.22a06.7c8156b8@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a230865b21703f24245e2f4ddfebaabb5f5b3b5d commit a230865b21703f24245e2f4ddfebaabb5f5b3b5d Author: Siva Mahadevan AuthorDate: 2025-10-08 20:40:15 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 lib/msun/tests: xfail failing lrint_test cases on non-x86 archs Replace ATF_CHECK_* with ATF_REQUIRE_* to fail fast and avoid unexpected aborts. Signed-off-by: Siva Mahadevan PR: 290099 MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit de601d5bf5c6d2409134abc4638c7a0818cc896e) --- lib/msun/tests/lrint_test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/msun/tests/lrint_test.c b/lib/msun/tests/lrint_test.c index 29ba82222642..a3f4225dc569 100644 --- a/lib/msun/tests/lrint_test.c +++ b/lib/msun/tests/lrint_test.c @@ -41,9 +41,9 @@ #include "test-utils.h" #define test(func, x, result, excepts) do { \ - ATF_CHECK(feclearexcept(FE_ALL_EXCEPT) == 0); \ + ATF_REQUIRE(feclearexcept(FE_ALL_EXCEPT) == 0); \ long long _r = (func)(x); \ - ATF_CHECK_MSG(_r == (result) || fetestexcept(FE_INVALID), \ + ATF_REQUIRE_MSG(_r == (result) || fetestexcept(FE_INVALID), \ #func "(%Lg) returned %lld, expected %lld", (long double)x, _r, \ (long long)(result)); \ CHECK_FP_EXCEPTIONS_MSG(excepts, FE_ALL_EXCEPT & ALL_STD_EXCEPT, \ @@ -131,6 +131,9 @@ run_tests(void) ATF_TC_WITHOUT_HEAD(lrint); ATF_TC_BODY(lrint, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif run_tests(); #ifdef __i386__ fpsetprec(FP_PE); From nobody Fri Jun 26 15:18:18 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 4gmzp75LYRz6jfKx for ; Fri, 26 Jun 2026 15:18:23 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzp72SPqz3lG7 for ; Fri, 26 Jun 2026 15:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487103; 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=omudLUHEr+APrT8B7QHdckUAZCTKlk3Q3ak0R9ZwS6g=; b=jvgfIq8ogEYvCJapPk4i99eLR3OUdw+Myxuo4Q3Pg930yS59Z69ZrG3oPeuGpO6LZNg8VO tBYJI3atXblKyp7o+LuaJipQ0GE9lEbHGCnCCy515zBrjoYCCXwLbLQLIgLdqnpdNMFjcu 8GrubS3cFYVgZRe41hoxGkxpOm0TjV+yKEDrPhbc0cgAeA55dtyXYcSnYBL/L3o5cd018C MY/IgbVJapCDjHX0nfmHdZhNFgVM7hSKuEzdlV20txeryE3w8zv0XO54ucdJ6j1YNdSvR4 HQeBDZhIkBUHSiErDd6H4XLqT3dZvQdo9XIgrHT3IY0KD+WaOPbYgjKc8tQLgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487103; a=rsa-sha256; cv=none; b=iQvVvRRBvEwq9ivyp2JUvQDHQL4FyPX7ToL0QQ/G1fLmZ8UlKBbo9t3IOjlY1wFxey4e9h LgXPEGFRzW5BbwwB0QBVRkx4iH+NXLMjptxdqLOXaMTk0TKXR5jQINqTsX9Bgs7tfzvFo7 bWWxRT1ohy6junMqJ4ebfxpGbo4qBmom6SMKzFVrmoHSIck1m3wIm/vYiHZDyaYvabtR0m oJZLpcg9N1xH8ByYOyOOTA/Cgya9JQGWDHDo2M+is4flAZiEq1vLdw1vc4amd39AYMjqbV +MkpiIcofVbCX9qPe09xGS1Prb6FJ/c/p9dXL4s2+lwGgli8/ryrL8zpsuocKg== 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=1782487103; 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=omudLUHEr+APrT8B7QHdckUAZCTKlk3Q3ak0R9ZwS6g=; b=Ud+MLg7n0nF1tr3/NhH02uFTHvRxRmPtChLHCfOUVlc9eZtQNkYJ39TjWnOUi8R4FJ8Ahj nnB+j0TNJSFI0uylppW1oGUXXen3Qn/XiRYOA8TdrcECDDo52GupPZaYO/uo1THswHQ2t3 TZ1dI5O49jJvmumN1rGPyO2QRqWtx99YZvn0g0kMxYsdZffpXIbwtSFNAb4sQ4j2xUpgUh HGZ1cVN2n1U7T8Z2rfBFUaO8CUuLGGgubj1XnK3iAH+8jPQfQqD/635CsSfrYfUR+hJTKC 9JWw6CguD5DGDuYyRkY0piGtdQq0ww81a2tUaQ3qf8Mc+R1UxZbd0UNtUFg2FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzp71MV6zjML for ; Fri, 26 Jun 2026 15:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2047c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 17e00bfb6f0a - stable/15 - lib/msun/tests: Replace remaining printf() with debug() 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 17e00bfb6f0a42b19913420d00a643b6205d7dbc Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:18 +0000 Message-Id: <6a3e983a.2047c.118a3133@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=17e00bfb6f0a42b19913420d00a643b6205d7dbc commit 17e00bfb6f0a42b19913420d00a643b6205d7dbc Author: Siva Mahadevan AuthorDate: 2025-10-08 21:04:28 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:42 +0000 lib/msun/tests: Replace remaining printf() with debug() Signed-off-by: Siva Mahadevan MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit d03c9b8f662466537753056608d6a64d8c5513c3) --- lib/msun/tests/ctrig_test.c | 6 +++--- lib/msun/tests/fma_test.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/msun/tests/ctrig_test.c b/lib/msun/tests/ctrig_test.c index ac1b79f2a1ce..2a5f8b5982b8 100644 --- a/lib/msun/tests/ctrig_test.c +++ b/lib/msun/tests/ctrig_test.c @@ -323,9 +323,9 @@ ATF_TC_BODY(test_axes, tc) test_odd_tol(csinhf, z, CMPLXL(sinhf(nums[i]), 0), FLT_ULP()); test_even_tol(ccoshf, z, CMPLXL(coshf(nums[i]), 0), FLT_ULP()); - printf("%a %a\n", creal(z), cimag(z)); - printf("%a %a\n", creal(ctanhf(z)), cimag(ctanhf(z))); - printf("%a\n", nextafterf(tanhf(nums[i]), INFINITY)); + debug("%a %a\n", creal(z), cimag(z)); + debug("%a %a\n", creal(ctanhf(z)), cimag(ctanhf(z))); + debug("%a\n", nextafterf(tanhf(nums[i]), INFINITY)); test_odd_tol(ctanhf, z, CMPLXL(tanhf(nums[i]), 0), 1.3 * FLT_ULP()); test_odd_tol(csinf, z, CMPLXL(sinf(nums[i]), diff --git a/lib/msun/tests/fma_test.c b/lib/msun/tests/fma_test.c index f1aa855df6f2..2cbfd6d6c296 100644 --- a/lib/msun/tests/fma_test.c +++ b/lib/msun/tests/fma_test.c @@ -472,7 +472,7 @@ ATF_TC_WITHOUT_HEAD(zeroes); ATF_TC_BODY(zeroes, tc) { for (size_t i = 0; i < nitems(rmodes); i++) { - printf("rmode = %d\n", rmodes[i]); + debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); test_zeroes(); } @@ -482,7 +482,7 @@ ATF_TC_WITHOUT_HEAD(infinities); ATF_TC_BODY(infinities, tc) { for (size_t i = 0; i < nitems(rmodes); i++) { - printf("rmode = %d\n", rmodes[i]); + debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); test_infinities(); } @@ -500,7 +500,7 @@ ATF_TC_WITHOUT_HEAD(small_z); ATF_TC_BODY(small_z, tc) { for (size_t i = 0; i < nitems(rmodes); i++) { - printf("rmode = %d\n", rmodes[i]); + debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); test_small_z(); } @@ -511,7 +511,7 @@ ATF_TC_WITHOUT_HEAD(big_z); ATF_TC_BODY(big_z, tc) { for (size_t i = 0; i < nitems(rmodes); i++) { - printf("rmode = %d\n", rmodes[i]); + debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); test_big_z(); } From nobody Fri Jun 26 15:18:24 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 4gmzp91x85z6jf94 for ; Fri, 26 Jun 2026 15:18: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzp86wBkz3lDR for ; Fri, 26 Jun 2026 15:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487105; 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=o2+q2nOgC1iX/yQyuPL3xFhE2rJ+Ge/IzIZnp3P+SlI=; b=xg4SrdKtbUEaywH5+7fwfvKKLD9Nt4K35YX381nFDEfoAddTpyXu5A11duCM6K2n1HKzP4 5mexHOt+R+f3ghw3Oev5C8WmfAcZOcCsItC+drOcHO1rujlTG/xQI6lFztEdbmIID2yFld W/bENF78U5bc2Wfo2wa4dLC2zvE9erhS5ssvKLq2rCkFjo3pD9xqWw+VTk++DgeEE7LQOS MbtHnP8do7uUq62wed+1fibjhcMaLr30215kxHT6oxLf4sMkTyeVEFwwWYBM0yK4g7T7gE IPmHQDt6nGR60uIahgLYzNCPe0WPNhKxnkvAhtuIVV3JT04OoN1S12rJ9VMfkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487105; a=rsa-sha256; cv=none; b=dxh1QEyJbg0ay2EtmMW2uylHADfsoNzOvQlPad99HQimTftzeQ15/Sl4ZZ7Guj8c/u+Msj IldmbAfIeaDBbD4CxK1zQOQaMsZ1w/YattmYOoVOs1V2xfB9mgmv3bHU6KfCMvuV6/ZRgj ZaBQ0920YZK2cX+y8iLjHd3tRb7n9p5X09fo/JgzyMulJwxz7fDhKV7qOMHt+1o9FI0giw Ziw1kSYqm+TsL8QQDEtygt+iM7eTdsPN+YjX/j9GBeGR5FygqAjjaflfVj02Dyp0iv8uyh dWkeuqlR9HKGHDWUeVobyQXquUsEsv2NvqUoJBQytCPhxmQtIGLUcLH/s3qOkQ== 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=1782487105; 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=o2+q2nOgC1iX/yQyuPL3xFhE2rJ+Ge/IzIZnp3P+SlI=; b=O3nOmgYb15v7MStJFOJvPqNQpPl7tg3R6peC1Dq9llKEQUtAIG1zZRDOakZdDah8uOsviE 5mxH3kBiZ8Ddj3m+xyKrlqm/26MPDxK2Jwa2rAhGiQxpm+cyvsM796Lt04ov3vpRrl2ymn R5o6Ms5FecdXLM8U2TzVngIpanuz1wVEbPcl4rurWHpLyCrop0dw151m3Zmc3IwzMq1ivp 8T59y5ZrT1N4JHOZiT+qXw4+maKtXDzYmfnF6w6o3I/js52L1yGvlHwQl3lNw85u6jXy4O 6XkRlz299jy4mj/MinodaznV3Yjns0/bmqPE+hsxZOk2zljwDHwzgy9P8t43PQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzp85VtyzjJh for ; Fri, 26 Jun 2026 15:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22799 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: e639219b16f1 - stable/15 - lib/msun/tests: xfail remaining failing tests on non-x86 archs 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e639219b16f1106548febeaade84451c78fa5715 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:24 +0000 Message-Id: <6a3e9840.22799.4af20df8@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=e639219b16f1106548febeaade84451c78fa5715 commit e639219b16f1106548febeaade84451c78fa5715 Author: Siva Mahadevan AuthorDate: 2025-10-08 20:40:15 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 lib/msun/tests: xfail remaining failing tests on non-x86 archs These are the remaining trivial xfail cases where no other test logic changes are necessary. Signed-off-by: Siva Mahadevan PR: 290099 MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit 405188aeac540f7666dfde37c2f32d222119f56e) --- lib/msun/tests/cexp_test.c | 3 +++ lib/msun/tests/ctrig_test.c | 9 +++++++++ lib/msun/tests/exponential_test.c | 3 +++ lib/msun/tests/fma_test.c | 9 +++++++++ lib/msun/tests/invctrig_test.c | 15 +++++++++++++++ lib/msun/tests/logarithm_test.c | 11 +++++++++-- lib/msun/tests/lround_test.c | 3 +++ lib/msun/tests/nan_test.c | 3 +++ lib/msun/tests/nearbyint_test.c | 3 +++ lib/msun/tests/next_test.c | 9 +++++++++ lib/msun/tests/trig_test.c | 4 +++- 11 files changed, 69 insertions(+), 3 deletions(-) diff --git a/lib/msun/tests/cexp_test.c b/lib/msun/tests/cexp_test.c index 35b23990a3f3..a32872958c42 100644 --- a/lib/msun/tests/cexp_test.c +++ b/lib/msun/tests/cexp_test.c @@ -232,6 +232,9 @@ ATF_TC_BODY(imaginaries, tc) ATF_TC_WITHOUT_HEAD(small); ATF_TC_BODY(small, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif static const double tests[] = { /* csqrt(a + bI) = x + yI */ /* a b x y */ diff --git a/lib/msun/tests/ctrig_test.c b/lib/msun/tests/ctrig_test.c index 2a5f8b5982b8..778612430c93 100644 --- a/lib/msun/tests/ctrig_test.c +++ b/lib/msun/tests/ctrig_test.c @@ -302,6 +302,9 @@ ATF_TC_HEAD(test_axes, tc) } ATF_TC_BODY(test_axes, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif static const long double nums[] = { M_PI / 4, M_PI / 2, 3 * M_PI / 4, 5 * M_PI / 4, 3 * M_PI / 2, 7 * M_PI / 4, @@ -365,6 +368,9 @@ ATF_TC_HEAD(test_small_inputs, tc) } ATF_TC_BODY(test_small_inputs, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif /* * z = 0.5 + i Pi/4 * sinh(z) = (sinh(0.5) + i cosh(0.5)) * sqrt(2)/2 @@ -432,6 +438,9 @@ ATF_TC_HEAD(test_large_inputs, tc) } ATF_TC_BODY(test_large_inputs, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif long double complex z; /* tanh() uses a threshold around x=22, so check both sides. */ diff --git a/lib/msun/tests/exponential_test.c b/lib/msun/tests/exponential_test.c index 9dc3b2698744..c3dcca869dcb 100644 --- a/lib/msun/tests/exponential_test.c +++ b/lib/msun/tests/exponential_test.c @@ -159,6 +159,9 @@ ATF_TC_BODY(exp2l, tc) ATF_TC_WITHOUT_HEAD(generic); ATF_TC_BODY(generic, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif run_generic_tests(); } diff --git a/lib/msun/tests/fma_test.c b/lib/msun/tests/fma_test.c index 2cbfd6d6c296..ec57fc34c1b1 100644 --- a/lib/msun/tests/fma_test.c +++ b/lib/msun/tests/fma_test.c @@ -121,6 +121,9 @@ test_zeroes(void) static void test_infinities(void) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif testall(INFINITY, 1.0, -1.0, INFINITY, ALL_STD_EXCEPT, 0); testall(-1.0, INFINITY, 0.0, -INFINITY, ALL_STD_EXCEPT, 0); testall(0.0, 0.0, INFINITY, INFINITY, ALL_STD_EXCEPT, 0); @@ -471,6 +474,9 @@ static const int rmodes[] = { ATF_TC_WITHOUT_HEAD(zeroes); ATF_TC_BODY(zeroes, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif for (size_t i = 0; i < nitems(rmodes); i++) { debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); @@ -481,6 +487,9 @@ ATF_TC_BODY(zeroes, tc) ATF_TC_WITHOUT_HEAD(infinities); ATF_TC_BODY(infinities, tc) { +#if defined(__powerpc64__) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif for (size_t i = 0; i < nitems(rmodes); i++) { debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); diff --git a/lib/msun/tests/invctrig_test.c b/lib/msun/tests/invctrig_test.c index 18d59e6f5416..8380557f02b6 100644 --- a/lib/msun/tests/invctrig_test.c +++ b/lib/msun/tests/invctrig_test.c @@ -123,6 +123,9 @@ c3pi = 9.42477796076937971538793014983850839L; ATF_TC_WITHOUT_HEAD(zero); ATF_TC_BODY(zero, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif long double complex zero = CMPLXL(0.0, 0.0); testall_tol(cacosh, zero, CMPLXL(0.0, pi / 2), 1); @@ -143,6 +146,9 @@ ATF_TC_BODY(zero, tc) ATF_TC_WITHOUT_HEAD(nan); ATF_TC_BODY(nan, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif long double complex nan_nan = CMPLXL(NAN, NAN); long double complex z; @@ -222,6 +228,9 @@ ATF_TC_BODY(nan, tc) ATF_TC_WITHOUT_HEAD(inf); ATF_TC_BODY(inf, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif long double complex z; /* @@ -269,6 +278,9 @@ ATF_TC_BODY(inf, tc) ATF_TC_WITHOUT_HEAD(axes); ATF_TC_BODY(axes, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif static const long double nums[] = { -2, -1, -0.5, 0.5, 1, 2 }; @@ -306,6 +318,9 @@ ATF_TC_BODY(axes, tc) ATF_TC_WITHOUT_HEAD(small); ATF_TC_BODY(small, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif /* * z = 0.75 + i 0.25 * acos(z) = Pi/4 - i ln(2)/2 diff --git a/lib/msun/tests/logarithm_test.c b/lib/msun/tests/logarithm_test.c index de80b5b45615..df1fcdc8627d 100644 --- a/lib/msun/tests/logarithm_test.c +++ b/lib/msun/tests/logarithm_test.c @@ -92,7 +92,9 @@ ATF_TC_WITHOUT_HEAD(generic_tests); ATF_TC_BODY(generic_tests, tc) { - +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* log(1) == 0, no exceptions raised */ testall0(1.0, 0.0, ALL_STD_EXCEPT, 0); testall1(0.0, 0.0, ALL_STD_EXCEPT, 0); @@ -179,6 +181,9 @@ ATF_TC_BODY(roundingmode_tests, tc) ATF_TC_WITHOUT_HEAD(accuracy_tests); ATF_TC_BODY(accuracy_tests, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif static const struct { float x; long double log2x; @@ -248,7 +253,9 @@ ATF_TC_BODY(log1p_accuracy_tests, tc) if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) atf_tc_expect_fail("https://bugs.freebsd.org/253984"); #endif - +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif test_tol(log1pf, 0x0.333333p0F, 1.82321546859847114303367992804596800640e-1L, FLT_ULP()); test_tol(log1p, 0x0.3333333333333p0, diff --git a/lib/msun/tests/lround_test.c b/lib/msun/tests/lround_test.c index a61672617081..e22f59c323a2 100644 --- a/lib/msun/tests/lround_test.c +++ b/lib/msun/tests/lround_test.c @@ -65,6 +65,9 @@ ATF_TC_WITHOUT_HEAD(main); ATF_TC_BODY(main, tc) { +#if defined(__powerpc64__) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif testall(0.0, 0, 0); testall(0.25, 0, FE_INEXACT); testall(0.5, 1, FE_INEXACT); diff --git a/lib/msun/tests/nan_test.c b/lib/msun/tests/nan_test.c index 32c5c39af0c1..3dcea3f9e402 100644 --- a/lib/msun/tests/nan_test.c +++ b/lib/msun/tests/nan_test.c @@ -105,6 +105,9 @@ testnan(const char *nan_format) ATF_TC_WITHOUT_HEAD(nan); ATF_TC_BODY(nan, tc) { +#if defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* Die if a signalling NaN is returned */ feenableexcept(FE_INVALID); diff --git a/lib/msun/tests/nearbyint_test.c b/lib/msun/tests/nearbyint_test.c index 749c2bb23c99..fa1dc7d739be 100644 --- a/lib/msun/tests/nearbyint_test.c +++ b/lib/msun/tests/nearbyint_test.c @@ -152,6 +152,9 @@ test_modf(int testindex) ATF_TC_WITHOUT_HEAD(nearbyint); ATF_TC_BODY(nearbyint, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif unsigned i; for (i = 0; i < nitems(tests); i++) { diff --git a/lib/msun/tests/next_test.c b/lib/msun/tests/next_test.c index 282e47d783a0..a14b1ba433d9 100644 --- a/lib/msun/tests/next_test.c +++ b/lib/msun/tests/next_test.c @@ -79,6 +79,9 @@ static const long double ldbl_eps = LDBL_EPSILON; ATF_TC_WITHOUT_HEAD(zeros); ATF_TC_BODY(zeros, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif long double ldbl_small; #ifdef __i386__ @@ -164,6 +167,9 @@ ATF_TC_BODY(ordinary, tc) ATF_TC_WITHOUT_HEAD(boundaries); ATF_TC_BODY(boundaries, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* * Tests at word boundaries, normalization boundaries, etc. */ @@ -211,6 +217,9 @@ ATF_TC_BODY(boundaries, tc) ATF_TC_WITHOUT_HEAD(overflow); ATF_TC_BODY(overflow, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif long double ldbl_max; /* * We can't use a compile-time constant here because gcc on diff --git a/lib/msun/tests/trig_test.c b/lib/msun/tests/trig_test.c index fe8c5298093a..494b5b10b64c 100644 --- a/lib/msun/tests/trig_test.c +++ b/lib/msun/tests/trig_test.c @@ -85,7 +85,9 @@ ATF_TC_HEAD(special, tc) } ATF_TC_BODY(special, tc) { - +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* Values at 0 should be exact. */ testall(tan, 0.0, 0.0, ALL_STD_EXCEPT, 0); testall(tan, -0.0, -0.0, ALL_STD_EXCEPT, 0); From nobody Fri Jun 26 15:18:25 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 4gmzpB4lw4z6jf6n for ; Fri, 26 Jun 2026 15:18:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpB0VQqz3lDn for ; Fri, 26 Jun 2026 15:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487106; 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=KPqBD7Y9suIdQ4qGzl9wvlFZwxrzaaQ7IrMOtQ0gIT4=; b=LOcDBwA6fRP1htTjHuPn7zDVHK+HjzJUyRvoaCYbcF8maODHfT6ZAFUa1R+N6u/wqFdKK2 6ZZO78FOUzgkGHvhorfIeK/NzVb2WqtKKD8ePPSBy0P9PtwlVIWAfdc0AfY4kvUdJLlSMA F0ffKt2v6wYRBt0oeQBLrmGriXB3rWDjdps80DVVlSNE7ABzqdpH9y7FXGxyemwfnBTXnf DqAYHHuxt/T3XIZ7gfkEEJxNRiXvXf8DN3zD0GD6o8yPMfzLZg0jtJ9SNnM2OSv1i5FUUg DQn3bIEpFFAO2nh4wOXbj/sITNvvcV1icwlDCY7H2VkvOASjg62qCW6KLEyD1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487106; a=rsa-sha256; cv=none; b=DAmJfXKlPYaPTMgIDI8Xu7ZKGfzn5+1YztpI0GfpEnB6Wl822gkZIk0jQQlJR1ig+vItW5 Ml58h9OCSLqPzP1i7pf6Psc4in5RMPxsqIOa6cVSxoeRHEt/Bcf7uSk2TAVpsefguwCM0I vvFaSOi9IP1KahAySTtiYhiHNZrC7ZmxfSJ/jMlAmyzsLzho1zfGJ+brG4sFC6cdfdScen +zgc/m19gyFSPKdT2rY+3hORoojV3FyBwoQVgtQ7NkfyIniTN7LjWb9ioVmRtchFjk+E0u z23f9Vya1RlHe5K3YxYSIlwst6yXxedZd/SnCqxgtsOim3AtJNGhnCnMHD6FXw== 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=1782487106; 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=KPqBD7Y9suIdQ4qGzl9wvlFZwxrzaaQ7IrMOtQ0gIT4=; b=UU0iZe/EJQckstMl95Zuo/Nn5GAtMURsuAvJg2Enpg4O2W2tTZCOo3NRgZ6LH1EsPfXJYO awWaCBWpAgk1t5rK804Bn90EBhrvHdEux8YFMb7RNVQZO8JeBA+iN3L4X8LXLsLJbA12fL Ry2rGUyVxqUqKGtd8IptGfrV20rxN1I5e2M90KHK0iAPZMSu8PtT4U/er38e1qTQdQW5dY B3zqdSpWFLS9S5X6ulYJiJ3hcwf48BL/5XFI78JJK/YSF02HsbWifIRwuXk40EF/Tqgw65 TVJ9PWRrhG4clCIaTpgJ1h7ZYs++HwNOiLxVzdng0ujabhagCiLQDmZs6I1dVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzp96FqbzjMN for ; Fri, 26 Jun 2026 15:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22bcf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 3e559ac76d33 - stable/15 - ptrace_test: expect PT_STEP tests to fail on riscv 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3e559ac76d33a3e43c4431e8b81004d99bfde333 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:25 +0000 Message-Id: <6a3e9841.22bcf.70a28617@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=3e559ac76d33a3e43c4431e8b81004d99bfde333 commit 3e559ac76d33a3e43c4431e8b81004d99bfde333 Author: Siva Mahadevan AuthorDate: 2026-05-28 16:32:24 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 ptrace_test: expect PT_STEP tests to fail on riscv ptrace_single_step currently returns EOPNOTSUPP on riscv. This temporarily fixes the following CI failures: https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ptrace_test/ptrace__PT_STEP_with_signal/ https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ptrace_test/ptrace__step_siginfo/ Reviewed by: kib Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D57288 (cherry picked from commit a7df326619ef9caa2ed00bf2d103dd278e7b32ec) --- tests/sys/kern/ptrace_test.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index 3827d2e8f41f..478e787d129b 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -3616,6 +3616,10 @@ ATF_TC_BODY(ptrace__PT_STEP_with_signal, tc) ATF_REQUIRE(pl.pl_flags & PL_FLAG_SI); REQUIRE_EQ(pl.pl_siginfo.si_signo, SIGABRT); +#if defined(__riscv) + atf_tc_expect_fail("PT_STEP not implemented on riscv, see sys/riscv/riscv/ptrace_machdep.c"); +#endif + /* Step the child process inserting SIGUSR1. */ REQUIRE_EQ(ptrace(PT_STEP, fpid, (caddr_t)1, SIGUSR1), 0); @@ -3733,6 +3737,10 @@ ATF_TC_BODY(ptrace__step_siginfo, tc) ATF_REQUIRE(WIFSTOPPED(status)); REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); +#if defined(__riscv) + atf_tc_expect_fail("PT_STEP not implemented on riscv, see sys/riscv/riscv/ptrace_machdep.c"); +#endif + /* Step the child ignoring the SIGSTOP. */ REQUIRE_EQ(ptrace(PT_STEP, fpid, (caddr_t)1, 0), 0); From nobody Fri Jun 26 15:18:26 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 4gmzpC5VnPz6jf1S for ; Fri, 26 Jun 2026 15:18:27 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpC1RhYz3l68 for ; Fri, 26 Jun 2026 15:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487107; 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=AzGWqdo/Ha0sCCZcVLxQH5UMK2IN0Xk0NuKs4VLakjA=; b=GlYXEFBtU3uJCN7ppbdbKLf91VhibsvB8PqGyzbF7fMLSxbqJZSt/qPbStvwLusNcn1Cxc picJAQxsU+YkEndcGCR8ppN2r10CQh0uESVxdJ0MnGMKyX4H6eaauV0Z7ZUuZScoDx8R5g +H4oEQx+PHYrIldmj/cRVoj8MRbmg+zmKu/pWobsmlcuaCT4JyQjfUD5DhwnRJnOGW8cil Co22VsliJgjPMhyPoslFPVUDMXymO5xjd3yzIAkaVJkecRc4i618FswpwneRyQ7yyodomE 7x1Y+xhG17jXujdvCKvoEiSvasO97tCxmMNz+sNxiYX3Lpe+7bC/icytWOrjIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487107; a=rsa-sha256; cv=none; b=gwwMZf8mgKES8Mi4A6Xj1IqP4QuRRXwLvt7afhR2CTI3PAHq7MVUAEwaU6HCBJyAPemf09 WrkR4MRKQOQHeZIr09RM+9RM+GfNGDSHFQbLxdJiLJexhPwOVYdijswGmB1SJuPPlgb9lj VQfr+jSPpGBO9zLKalMc0vK1MvFcqJufBQD8N8KXh3ja7zRd5buL4a0spvJb0wOYRe+2i3 Oj0aJuWLC98owc7PMq2uYkui+Y+U8wGzlQsdL5Sh1CpeNgK+4Gxsa6XAydxT2XfqrGBtRa 7dJtKkEd6OqwbOUA8yTc/qqviGuvifFZvZy69hNwxnGqN8GC76K2at69z5k1fA== 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=1782487107; 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=AzGWqdo/Ha0sCCZcVLxQH5UMK2IN0Xk0NuKs4VLakjA=; b=U1BH51d0rruYf3/uVrAVdHaC+4fomZ85CtYNUp9W3GqGrhwOByS8fQWlcr7no6WNUAtx9j jHY4C2Q8QzBBSznGTZvurANFok0IuxheS8GAlX/rLSsg/UkiWzBnTz2Njx/DuT4/9ghIWR 2sYW3S9bVwRru+oRp6lkTvyrAXsAfDfnwgiHIGHDYLOQpZVs7Bwe5NxWo9D9CeqwdFukny M57iSprxNQXMTWOlMVmBArFRKrPEbBiaWxJnb4Znx83x/5f845KeuflAPoKXR/JMY+43Vk EJRj/+ZVD4imYUtFnsCi6AJDhz4K07cwy3COXVqkgm/L2ZVYTpTxs+VdZPKAXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpB75Vxzjb5 for ; Fri, 26 Jun 2026 15:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22815 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: c8039d9ee01e - stable/15 - pf: free match rules after exiting critical section 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c8039d9ee01e6312b4373bcded89d12eadda5db7 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:26 +0000 Message-Id: <6a3e9842.22815.3ccaf85@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c8039d9ee01e6312b4373bcded89d12eadda5db7 commit c8039d9ee01e6312b4373bcded89d12eadda5db7 Author: Siva Mahadevan AuthorDate: 2026-06-07 01:26:55 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 pf: free match rules after exiting critical section This fixes a panic reported on armv7: sys/netpfil/pf/counters:match_block -> panic: free: called with spinlock or critical section held [...] vpanic() at vpanic pc = 0xc0321b5c lr = 0xc02f7b5c (free+0x140) sp = 0xc8c858bc fp = 0xc8c858e0 r4 = 0xe2fad648 r5 = 0xe402ce78 r6 = 0xc8c859e8 r7 = 0x0000001c r8 = 0xc8c858b4 r9 = 0xc0321b5c r10 = 0xc8c858bc free() at free+0x140 pc = 0xc02f7b5c lr = 0xe2f4f920 ($a+0x5f8) sp = 0xc8c858e8 fp = 0xc8c85930 r4 = 0xe402ce68 r5 = 0xc8c8599c r6 = 0xffffffff r10 = 0x0000001c [...] KDB: enter: panic Consequently, this fixes armv7 CI: https://ci.freebsd.org/job/FreeBSD-main-armv7-test/2287/consoleText Fixes: 6353f5d9a5c6f194bb014b8785a57f5314e8c652 Reviewed by: kp MFC after: 3 days (cherry picked from commit 432ac5c07c6b1fb960f2e7d8e8cfb1306ce351ff) --- sys/netpfil/pf/pf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index edd723abb3b6..d8010ef7c224 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -10852,10 +10852,6 @@ pf_counters_inc(int action, struct pf_pdesc *pd, struct pf_kstate *s, } } - if (s == NULL) { - pf_free_match_rules(mr); - } - if (a != NULL) { pf_rule_counters_inc(pd, a, dir_out, op_r_pass, af, src_host, dst_host); @@ -10867,6 +10863,10 @@ pf_counters_inc(int action, struct pf_pdesc *pd, struct pf_kstate *s, } pf_counter_u64_critical_exit(); + + if (s == NULL) { + pf_free_match_rules(mr); + } } static void From nobody Fri Jun 26 15:18:29 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 4gmzpF4TnFz6jf6w for ; Fri, 26 Jun 2026 15:18:29 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpF2D8qz3lHH for ; Fri, 26 Jun 2026 15:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487109; 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=sbGU+6kc2VSiVXYWYLA5DtZE6XIVyRGp7mPdKJsEuZw=; b=PCadB/4zzKCBh0mpr5T2Dns0bImQNDc+i+sBVfBHygPQF3aKtq9lJvxS1M06D3l7QnhABV 8q8hF1vWtsUvb5yapc2AIRUw+MW2oEEYlwf4TYEsikYsFlPfnCA9JE5Q7anySWxiwy5DlV o8cyEuWgCNHo+EPAX2rnC26F7Qx/wICtilaN5DblhhCPI3354uGTXW+sXQM+N3S9t858Tn q4UxotNAtYv0kuSsT5Ne9CqZOWaZRtAHmPSbsI6vRtj3077tyFQnCGuE+G0pobWRzA7y9Q FUCN5rxi+pNN8ftQ/BnbfglBPsy+eeIMp0uHaf69QsAjLEQbWDwhm+fBb8ekVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487109; a=rsa-sha256; cv=none; b=JCjoyrabFNCMGV60In6JmwmQzzEO+YVpbw9V5L8bWWQzlExWzNdnpNCtKJtLm+iRkgm85J UtgGbohJ2hzZM23XyhXKjiqTkSDawdQRbaxlLP5n0Yccuqp5rLUs9Xoys574UCrQFYWq4X GTZ3f741+flt2aTFg5HM/jsU1MCTp88FCQNHND89cqxtCLe/BtxAPvuLSCmBv9DGTB/H3y 5EFj2SR6FXH4x31bZODSDnH6mkqeFTbJ61dSOR2wlmv0YcSZAUafMjys0t7tGtE6v2rfNH BbS0dCcqFWZpz26HU8x6W6Esmkkm/fCSQhruTmCNckIoaSajINLH6b4Uj50LbQ== 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=1782487109; 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=sbGU+6kc2VSiVXYWYLA5DtZE6XIVyRGp7mPdKJsEuZw=; b=pqUNwWN41mh9oXtsF2JajBXeHYu0WpLBic4tcFox7bHA7PYjcM1FQ1U4fCHbGS4ZckofW/ EA4dN5sUevgbaP1AEhIbNZdGLYowQD+Y3G5z51X38dgZLZuf4kbKMB3PmqPQjuSpzNyUJf HJzK49IFoDSjvihhKaqTnQjITeyPcjPtrOfECdOrZ2YHWmpI9FfwbYdd+tF2d4kmBt7W8m GrRmWYfUaPSEQ291yU63pjsWzLqnyftKAqLvJ1bnlpbqNwjAjQyNfADmG8Q6270pDQ6Z/H FuAYyN+LSd2juByk9IXbs5mfHe1jtUdtL1NUn/5qIKSpWjCXcOzicn6CmfqTVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpF19QvzjPV for ; Fri, 26 Jun 2026 15:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 200f43fb4535 - stable/15 - libc: fix strtold NaN representation on riscv 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 200f43fb45350f0929f32e9cd7258dd3f3840346 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:29 +0000 Message-Id: <6a3e9845.22d7a.180635e@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=200f43fb45350f0929f32e9cd7258dd3f3840346 commit 200f43fb45350f0929f32e9cd7258dd3f3840346 Author: Siva Mahadevan AuthorDate: 2026-06-10 22:29:02 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 libc: fix strtold NaN representation on riscv Regenerate gd_qnan.h on riscv using the qnan.c config tool found in contrib/gdtoa. This fixes the following tests in CI: lib/libc/stdio/scanfloat_test:infinities_and_nans lib/libc/stdlib/strtod_test:strtold_nan Reviewed by: jrtc27 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57405 (cherry picked from commit 1e25cda7f06923d05e28dac8eb1c1c428a5c92dc) --- lib/libc/riscv/gd_qnan.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/riscv/gd_qnan.h b/lib/libc/riscv/gd_qnan.h index 66e48706d6bb..d4e3baeed108 100644 --- a/lib/libc/riscv/gd_qnan.h +++ b/lib/libc/riscv/gd_qnan.h @@ -9,11 +9,11 @@ #define d_QNAN0 0x0 #define d_QNAN1 0x7ff80000 #define ld_QNAN0 0x0 -#define ld_QNAN1 0x7ff80000 +#define ld_QNAN1 0x0 #define ld_QNAN2 0x0 -#define ld_QNAN3 0x0 +#define ld_QNAN3 0x7fff8000 #define ldus_QNAN0 0x0 #define ldus_QNAN1 0x0 #define ldus_QNAN2 0x0 -#define ldus_QNAN3 0x7ff8 +#define ldus_QNAN3 0x0 #define ldus_QNAN4 0x0 From nobody Fri Jun 26 15:18:28 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 4gmzpD343fz6jfJc for ; Fri, 26 Jun 2026 15:18: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpD1sLbz3lBf for ; Fri, 26 Jun 2026 15:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487108; 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=bddhHnt5LPbsfT4y9yFEVqS3qJWUvwuXAWPRrarfGF4=; b=K7g99+IDCTzQAst8xZWeHe77E6jz143ZflFo8gOmiscgTCErrjgIe9FMQ9a+Y9/z3CGwpB Hf3c4i11h8Wf6jVs2AlMW0Qm/XXuGoZvEiTo+5CAHgQpF9k6Dg8nZ8jpwUyNjkw9dL/Efr qCONoGBYSiARDVkt1/leKnhz/S1OlZ2DY0ckW4nY6yDFTPKiY6lOjaZoI5yBlMpHwYOcOm B8Zk5ZUIy5UHukGyCciY/qkKCQGYc6tU6ppPKvCEB3W5IGJYSCbmnsoVhhDt/UnnRU9d0L xsE3dpr8p9DlP1t8XHUn9qLNgQZjPiOcqu/nNeRkg+KAcOfW1QvWkYG4l0pa/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487108; a=rsa-sha256; cv=none; b=aJ4jjIQywag/9uA3BnnTqgL1uI29g68boKQRPBoeQRy8kXwDP5vVnirbcyJaRQ4eQhS9bV X15+c6U5vt67DuBGWYTiYZYPOXNbWUUAtM8BJ434N5fe3LKiF4a3DycOplgvsgh9dM4L/I 6ihj5MgbohZBjRGG2udrC/HUE5rcasqE0/rnvuOWDAOjPwARKvr/UARQSCakCPbL+KYiKT IXTEDojBkZLhZN3sUGIKLGtoM+9QzKQNOD0dvdAFRIC2xauusRxkKb9OomBdKgnChfADJP E/bMSnxQkzX9JgyONyTW67uXA/FIJ2mieey8LiDHpe2FwiBAxQ86j0wd9QF6qQ== 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=1782487108; 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=bddhHnt5LPbsfT4y9yFEVqS3qJWUvwuXAWPRrarfGF4=; b=E8TlZeICTZcmh4hyXBBodYXaPSEMAKDb9X/7bX6SByarenB3LyuUesT1dHlUkC9sON9aso /OFNkoF/ABwEeXugmXuv/rBv4gIr5L7xAdsO+3AIZdO4UxMF/g92TBkaH2Dw7NMdiovLp2 0zOqraVJyYJBtmGXGr6uhVWBCfz6sbOKw+v9ZQ2fSoykXh3NPE8KnIz0KkGAOTQqIh9Vj9 A2mSASGhzebIv/0v96pcH7nd9ev1h1b348fYlFZdRCV9VaO2HRzLHQRC2jjW50EMgIynO6 qe4dix/YnQe6p1vLnFM+sYb6AODZjbYKeuCW47/5VSAsfCc0AuaczqbtXUsd9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpD0qxkzjMP for ; Fri, 26 Jun 2026 15:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22a0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: bacf780c3447 - stable/15 - libc/fortify_uio_test: replace stdin in base readv tests 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bacf780c34471cab0e92a1274b631ff35e92591e Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:28 +0000 Message-Id: <6a3e9844.22a0b.4147232@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=bacf780c34471cab0e92a1274b631ff35e92591e commit bacf780c34471cab0e92a1274b631ff35e92591e Author: Siva Mahadevan AuthorDate: 2026-06-10 22:27:42 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 libc/fortify_uio_test: replace stdin in base readv tests This fixes the readv_before_end and preadv_before_end test timeout failures on riscv. See https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/lastCompletedBuild/testReport/lib.libc.secure/fortify_uio_test/readv_before_end/ Reviewed by: kevans, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57420 (cherry picked from commit 9f2a38cf40f2632472b3889505fd1ab5d6ba9e1b) --- lib/libc/tests/secure/fortify_uio_test.c | 18 ++++++++++++++++++ lib/libc/tests/secure/generate-fortify-tests.lua | 2 ++ 2 files changed, 20 insertions(+) diff --git a/lib/libc/tests/secure/fortify_uio_test.c b/lib/libc/tests/secure/fortify_uio_test.c index 46b46ed2f7df..b1b51eff824c 100644 --- a/lib/libc/tests/secure/fortify_uio_test.c +++ b/lib/libc/tests/secure/fortify_uio_test.c @@ -179,6 +179,8 @@ ATF_TC_BODY(readv_before_end, tc) const size_t __len = 2 - 1; const size_t __idx __unused = __len - 1; + replace_stdin(); + readv(STDIN_FILENO, __stack.__buf, __len); #undef BUF @@ -200,6 +202,8 @@ ATF_TC_BODY(readv_end, tc) const size_t __len = 2; const size_t __idx __unused = __len - 1; + replace_stdin(); + readv(STDIN_FILENO, __stack.__buf, __len); #undef BUF @@ -230,6 +234,8 @@ ATF_TC_BODY(readv_after_end, tc) /* Child */ disable_coredumps(); + replace_stdin(); + readv(STDIN_FILENO, __stack.__buf, __len); _exit(EX_SOFTWARE); /* Should have aborted. */ @@ -274,6 +280,7 @@ ATF_TC_BODY(readv_heap_before_end, tc) const size_t __idx __unused = __len - 1; __stack.__buf = malloc(__bufsz); + replace_stdin(); readv(STDIN_FILENO, __stack.__buf, __len); #undef BUF @@ -297,6 +304,7 @@ ATF_TC_BODY(readv_heap_end, tc) const size_t __idx __unused = __len - 1; __stack.__buf = malloc(__bufsz); + replace_stdin(); readv(STDIN_FILENO, __stack.__buf, __len); #undef BUF @@ -329,6 +337,7 @@ ATF_TC_BODY(readv_heap_after_end, tc) /* Child */ disable_coredumps(); __stack.__buf = malloc(__bufsz); + replace_stdin(); readv(STDIN_FILENO, __stack.__buf, __len); _exit(EX_SOFTWARE); /* Should have aborted. */ @@ -542,6 +551,8 @@ ATF_TC_BODY(preadv_before_end, tc) const size_t __len = 2 - 1; const size_t __idx __unused = __len - 1; + replace_stdin(); + preadv(STDIN_FILENO, __stack.__buf, __len, 0); #undef BUF @@ -563,6 +574,8 @@ ATF_TC_BODY(preadv_end, tc) const size_t __len = 2; const size_t __idx __unused = __len - 1; + replace_stdin(); + preadv(STDIN_FILENO, __stack.__buf, __len, 0); #undef BUF @@ -593,6 +606,8 @@ ATF_TC_BODY(preadv_after_end, tc) /* Child */ disable_coredumps(); + replace_stdin(); + preadv(STDIN_FILENO, __stack.__buf, __len, 0); _exit(EX_SOFTWARE); /* Should have aborted. */ @@ -637,6 +652,7 @@ ATF_TC_BODY(preadv_heap_before_end, tc) const size_t __idx __unused = __len - 1; __stack.__buf = malloc(__bufsz); + replace_stdin(); preadv(STDIN_FILENO, __stack.__buf, __len, 0); #undef BUF @@ -660,6 +676,7 @@ ATF_TC_BODY(preadv_heap_end, tc) const size_t __idx __unused = __len - 1; __stack.__buf = malloc(__bufsz); + replace_stdin(); preadv(STDIN_FILENO, __stack.__buf, __len, 0); #undef BUF @@ -692,6 +709,7 @@ ATF_TC_BODY(preadv_heap_after_end, tc) /* Child */ disable_coredumps(); __stack.__buf = malloc(__bufsz); + replace_stdin(); preadv(STDIN_FILENO, __stack.__buf, __len, 0); _exit(EX_SOFTWARE); /* Should have aborted. */ diff --git a/lib/libc/tests/secure/generate-fortify-tests.lua b/lib/libc/tests/secure/generate-fortify-tests.lua index c9cd9353a869..ef34fb8513c8 100755 --- a/lib/libc/tests/secure/generate-fortify-tests.lua +++ b/lib/libc/tests/secure/generate-fortify-tests.lua @@ -411,6 +411,7 @@ local all_tests = { "__buf", "__len", }, + init = stdio_init, }, { func = "readv", @@ -435,6 +436,7 @@ local all_tests = { "__len", "0", }, + init = stdio_init, }, { func = "preadv", From nobody Fri Jun 26 15:18:30 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 4gmzpG5kVpz6jfCk for ; Fri, 26 Jun 2026 15:18:30 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpG2vzWz3lBv for ; Fri, 26 Jun 2026 15:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487110; 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=0Gu58NL+A4BkO/qQoapn6f6rC53b39INjq42Xeq0FWY=; b=rRhpkUkDf/pdZ4P6e89yCK+47mTTLDtA3I/qoNfWzMrG1d6Wb8Hip9bm420hBDe5NTRWJX Vl38IyYKHqoci0Y1hc0dBoymfHq9IGaq5Jbek37t8OTjCRSiokmrfGnGU90it0zgoYgvvI AL3gBzgu3DP/i/fLMU/r2uS6rkU/mm4QfDP/FyBHZqpz4fmI21ShFMxS62jSLrd2kqwpa/ qLaZTBJ4HrkMQrHX6hKla6za8Nny90WNDlxyyp02HPVHJnMJJZ5c9qENuDimQfRE0+it3/ Uwvv48lxybOibLqI4VdcnkWcwydxEnHWOOrINsHKWEGqawcZQAkZetAQ6zrPrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487110; a=rsa-sha256; cv=none; b=A6m9W2bdCpuAozKmY0iQWG7BDStSJ50P2p0dryqrsHz+qQ3q6sJXwiM9W5neuDvlqEAO6w gvEo1uCAGO+d6spbaV0dNohxMzIK6qUbuml8LxF1DpbeaHJw8K3KEuGl9pgE1ptMIje0AG OoaQVe0ux4WfZZ0nX8kMxHfMXZUvYILbm29O7+khTodCer4QHqkMDybSiCeGHqY5gGGE/K 22biebtbFsPKNqksJZsUwkCcCGmGY5q2kZVx+Yv/kE4Zn85S+5vZfgH7UYcftynVGWAN8u 3v9tM+v31KgTM7yCvUOyATyg9RUWuKTVpb7TFLNbEHnD66/cVBDEPN6hK3l6Lw== 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=1782487110; 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=0Gu58NL+A4BkO/qQoapn6f6rC53b39INjq42Xeq0FWY=; b=SJRZlbdG/cTRHBDV83ozl88phVXkETgKekVYwGLDw8xPDyWyMcrAKQ34ELe23qNMQVADlz 8FpnHWXkZpE7THmM6/l9P9gW7AjEJQcuGzoFTtNcUo8nr26kUtKXJ2OhMBPYchTL+UrMl2 Ig0wEZCIuYVMwCFbx9tHqfWptrmPasU3aPU5TIr8f4k9JMVjimZXeFIFYOWkH3fekfzsdw uiQmmtRtWEezFQw45OvjiwNm5W7SrEppSsw3qHWwP841oHFTWvBv2nb9MoBQLHw4CZBfnl n9aITA/R/Mnag8NpJmrA3RoPucTRssJxLVCe4SFpVjYKA6eX4SlwYiflYPCXOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpG1zWXzjJn for ; Fri, 26 Jun 2026 15:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2174f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 12f47bff4a97 - stable/15 - src.opts.mk: enable OPENSSL_KTLS by default on riscv64 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 12f47bff4a97f06d172dc38bbc987f0823d372c2 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:30 +0000 Message-Id: <6a3e9846.2174f.7878c9ff@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=12f47bff4a97f06d172dc38bbc987f0823d372c2 commit 12f47bff4a97f06d172dc38bbc987f0823d372c2 Author: Siva Mahadevan AuthorDate: 2026-06-10 22:30:14 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 src.opts.mk: enable OPENSSL_KTLS by default on riscv64 1e649491b8567151270095fda3bce8faea394952 enabled KERN_TLS in riscv/conf/GENERIC, but didn't enable OPENSSL_KTLS. This passes all testcases in the sys/kern/ssl_sendfile suite and fixes CI failures seen here: https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ssl_sendfile/ PR: 293810 Fixes: 1e649491b8567151270095fda3bce8faea394952 MFC after: 3 days Reviewed by: gallatin, ngie Differential Revision: https://reviews.freebsd.org/D57316 (cherry picked from commit b61ab2d693c04d4be5468e7db4b03d5777228f95) --- share/man/man5/src.conf.5 | 12 +++++++++--- share/mk/src.opts.mk | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index ad1a2b3ed93a..2ec7862b1a21 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd March 28, 2026 +.Dd June 26, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1527,12 +1527,12 @@ is set explicitly) Do not include kernel TLS support in OpenSSL. .Pp This is a default setting on -arm/armv7, i386/i386 and riscv/riscv64. +arm/armv7 and i386/i386. .It Va WITH_OPENSSL_KTLS Include kernel TLS support in OpenSSL. .Pp This is a default setting on -amd64/amd64, arm64/aarch64, powerpc/powerpc64 and powerpc/powerpc64le. +amd64/amd64, arm64/aarch64, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITHOUT_PAM Do not build PAM library and modules. .Bf -symbolic @@ -1893,6 +1893,12 @@ not .Pa /etc/src.conf . .It Va WITHOUT_USB Do not build USB-related programs and libraries. +When set, it enforces these options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_USB_GADGET_EXAMPLES +.El .It Va WITHOUT_USB_GADGET_EXAMPLES Do not build USB gadget kernel modules. .It Va WITHOUT_UTMPX diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index f9fc2dad280a..ad87a295c8fd 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -348,8 +348,8 @@ BROKEN_OPTIONS+=LOADER_IA32 BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA .endif -# Kernel TLS is enabled by default on amd64, aarch64 and powerpc64* -.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" +# Kernel TLS is enabled by default on amd64, aarch64, powerpc64*, and riscv64* +.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" || ${__T:Mriscv64*} != "" __DEFAULT_YES_OPTIONS+=OPENSSL_KTLS .else __DEFAULT_NO_OPTIONS+=OPENSSL_KTLS From nobody Fri Jun 26 15:18:31 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 4gmzpJ0fZYz6jfJm for ; Fri, 26 Jun 2026 15:18:32 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpH42mSz3lCF for ; Fri, 26 Jun 2026 15:18:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487111; 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=jaD6CTT8hvAEmfm03f1KfCtVGrrpQJboPYRzn+SxAyg=; b=lUV9a93w8qKk22o6YTE+cfMwEzrBtXnjxH+AX7GgiiJsZfk1BoeWe0hRd27Dj0FJNxN7gx yspO6ZBh2z6tHeKNeOFotVOGW19ku36LfrZza0rtMQHaW0JKqluxq2hy995wG1WMmaGY1H MnZbPaAj7L7KXpL7axwbbQzckXjSEh8+oSekW2ap24dNUL0VDWd1G04MyY6PpBCwuz1U7N yBr0GxkX4+a+f5jH2jwO1W0wbVgCYd7hkAchNJ92+DGa3JQrpEd4bgNL7r9DyONCMDnYNI fPg0FtW7oasqfGpjf1qrdmeLIqBv5rLpNaP0gwQhnhXq3rgsvySOuSDv1+2IaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487111; a=rsa-sha256; cv=none; b=QhONWOrKMFV3SV4/SaALyQO20UaZlmvtMGuOXDhLAV8bCvB9M5Z8N5cmmioFJAnrCpKGI2 0WEyaep+hqaaLzYh3oGIZg59gPWrnznbsSBYbgtv2mRoFA5ad+5cvbb8+17GeFTBkItXlZ gLNN1JDAI/CX8n/s2eCKQ03OfWLtRY9sQOxnUb+wlTjGtzQoMQK/5NEmpWntqMMu4oc8wA l966N/TFbPXbGmdSGtZ6qsp/u1Hq62VYDHKCKNyZPJiGm5pFxE4pdy/88EbH+UdaBewKt0 xQisrFgBUT3GII9vZQOReGNRdEwjVWKE5IfBVQR8WCyznNqq3v83zIpPnmvaQg== 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=1782487111; 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=jaD6CTT8hvAEmfm03f1KfCtVGrrpQJboPYRzn+SxAyg=; b=oWlUNNdcthnFJHjP3M1AWpKgYi59PgadvNFQkIr/NBbYnk0enKfkrrgZ2QrAuOxFQCfAQt HDGLUiN1j/JErw/VjvJ77OLp/EYu4AC6L6i7NSJn2/6aEtZRYx/mQj2KMDqUYXaQMApwWf H/EYFyu3M8t6xbrptqHi7J38NazLdRp8vHfU5QVaqndJ0w7T59DatWinGRguRrXuYxQPUS RpUOZjif1X1o9Qzc3VxryFjAxcZH2fLyHDUMwEKHBS5Q4dZnKXIF2c6Pit7+vPUO3Gx3qd OkM9+Ve3UuFw0MEruSvIjh65XqLrpCekyO9by84NNfMpGllST88/rtHTOGzf8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpH2rk3zjY8 for ; Fri, 26 Jun 2026 15:18:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 218c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: f6ca004c5545 - stable/15 - memfd_test: skip hugetlb testcase when large page requests are not supported 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f6ca004c55456e6e372a2373e1205215a33c73d4 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:31 +0000 Message-Id: <6a3e9847.218c9.2f753edf@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=f6ca004c55456e6e372a2373e1205215a33c73d4 commit f6ca004c55456e6e372a2373e1205215a33c73d4 Author: Siva Mahadevan AuthorDate: 2026-06-11 00:08:37 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 memfd_test: skip hugetlb testcase when large page requests are not supported Fixes this CI test failure: https://ci.freebsd.org/view/Test/job/FreeBSD-main-riscv64-test/16606/testReport/junit/sys.posixshm/memfd_test/hugetlb/ Reviewed by: kevans MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57289 (cherry picked from commit 64b053f879a8b3c4aa31e1ab99340dfe0ddfea0c) --- tests/sys/posixshm/memfd_test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/sys/posixshm/memfd_test.c b/tests/sys/posixshm/memfd_test.c index 387eca4cafe9..9b4930a56f56 100644 --- a/tests/sys/posixshm/memfd_test.c +++ b/tests/sys/posixshm/memfd_test.c @@ -294,8 +294,11 @@ ATF_TC_BODY(hugetlb, tc) if (!MFD_HUGE_SUPPORTED(pgsize)) continue; - ATF_REQUIRE_MSG((fd = memfd_create("...", - MFD_HUGETLB | MFD_HUGE_FLAGS(pgsize))) != -1, + fd = memfd_create("...", MFD_HUGETLB | MFD_HUGE_FLAGS(pgsize)); + if (fd == -1 && errno == ENOTTY) + atf_tc_skip("large page requests are not supported on the current platform"); + + ATF_REQUIRE_MSG(fd != -1, "Creating a %zu-size hugetlb memfd", pgsize); } From nobody Fri Jun 26 15:18:32 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 4gmzpK0ZdKz6jf76 for ; Fri, 26 Jun 2026 15:18:33 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpJ4FnNz3l8h for ; Fri, 26 Jun 2026 15:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487112; 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=HkVIMyb7ZnAOgNWb7ocXdVDoSBp1DJxnSJN/IB1uD5g=; b=plLhCa3M61XizajymuF8EmZQWV9XPXhpMgrwAWpFv6jsLGznU54GXBYepnrW5JyWypp+2f HHPwhzb0hk0WvvUXUm6pPelUieYYttMaBIU6G/gxKrtDfUW1okO7LthgBGcdL2Mqs/uu0A CxQ/MKGtE81Yb73FhK9IQGcI1gqX5Hthm7ac41ijA1O+FBkKev2oV3EhUa4pZumzd4+iYe mjZAIgUbTVuS/5u7BPqo22LLrhGQ9N9GJR5QdbOsdZmedfSECpduP8gCNBN2iZrGKnwgwJ 4NUWdQ3p37TOImBQkgaoH5HBJr//rSmhufTWXqHjkc8uXivXX3hZRT0ksz+f6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487112; a=rsa-sha256; cv=none; b=W3BgLxEcmRVP4LnPhYMXbNR897i0zKCZhYDwybdHKldLd9Zuqi/pHqxyW4Jk2OmFfDVPxs nwffeAHBBMmQ+bY23iPC7vzzLtgLKUvQ+/xWptOLbkOPjoApT4/6PpmQrXKyllKLrG9Fgi ynhT7Ms2CEBOKWSd+xrnRam0CWsJJPMg6cQZ59nDZTtOh8sWE6lebR9it38Gfsl/KIvekG NAF8UvgDNCc19sS4/5UKMbY/RHE/rv6CimpAap5h0LYWKyHEW9UmI5E820qn4mgBhwSWli eFDN48QSJKgo9/4+rEHbL93OYPPvDTVIsJMroKXO9EqAwv4ysEIdl+slqEbpZg== 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=1782487112; 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=HkVIMyb7ZnAOgNWb7ocXdVDoSBp1DJxnSJN/IB1uD5g=; b=c7jOaWtvAdgJzvFAXdeMvKEX2dYdrlwfCmVW9OM2mWlLfFh6yF4e8gQ5XIIJdL7dv99cB8 iSih1qKEaE9hWupsn3Or0sPafnuF7cCxjLMHF2rgU1ietgiTOZSUP11k7MjD0tUGfn9+ZH idEKzPc3OGZLnJybG5XPved1jTS4e6mS1nG3Qt1qJ8zn1vyovFbBARuUFh7GUVmzngnZJD SYQs7Bsc7njGk3xMY0qcWJsyns54IKIPsIQk9+M/28AX7cuQlO0ca5l7qGnPipWP+cj1qD /XBFr6I7AAleYxIceylMSOJNIoHw2lAAHZTGARh5nYtOntUVuZZfas238g8ysA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpJ3KVMzjb6 for ; Fri, 26 Jun 2026 15:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20574 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 76c1cb3f6133 - stable/15 - tests/sigtramp_test: xfail on non-amd64 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 76c1cb3f6133ffb65ec0424682ee302736514c1e Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:32 +0000 Message-Id: <6a3e9848.20574.3dd0cd3e@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=76c1cb3f6133ffb65ec0424682ee302736514c1e commit 76c1cb3f6133ffb65ec0424682ee302736514c1e Author: Siva Mahadevan AuthorDate: 2026-06-15 22:09:05 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 tests/sigtramp_test: xfail on non-amd64 This test fail until at least https://reviews.llvm.org/D155066 is rebased and picked up for aarch64 and more work is done for the other archs. PR: 289096 Reviewed by: jlduran Fixes: fef84fd8ae845e19cec0f6b9aac0e6451cca3d7a MFC after: 3 days (cherry picked from commit 0010c4b8a020dbeb81e61b71117d1caae9b044cc) --- lib/libexecinfo/tests/sigtramp_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libexecinfo/tests/sigtramp_test.c b/lib/libexecinfo/tests/sigtramp_test.c index 5dead9a4146b..b440781aa857 100644 --- a/lib/libexecinfo/tests/sigtramp_test.c +++ b/lib/libexecinfo/tests/sigtramp_test.c @@ -45,12 +45,12 @@ handler(int signum __unused) ATF_TC_WITHOUT_HEAD(test_backtrace_sigtramp); ATF_TC_BODY(test_backtrace_sigtramp, tc) { -#if defined(__aarch64__) +#if !defined(__amd64__) /* * https://reviews.llvm.org is deprecated and * this review is never going to be updated or completed */ - atf_tc_expect_fail("https://reviews.llvm.org/D155066"); + atf_tc_expect_fail("https://reviews.llvm.org/D155066 and https://bugs.freebsd.org/289096"); #endif struct sigaction act; From nobody Fri Jun 26 15:18:33 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 4gmzpL2dCnz6jfLK for ; Fri, 26 Jun 2026 15:18:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpK52CNz3lQH for ; Fri, 26 Jun 2026 15:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487113; 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=2aXvtWb5m9rShOBOb7PojRCjzRSKy/Tqyfydfi4MRr0=; b=QCsFQaiY1+ne+jIRaGpnzxcdadhM0/4Q8jD9ss9EaqTkMlKwsvekxjHY0OSVemCl7ayfXH NwlNPufr5FQGStTLuZOzRCVh4XzqzpX5uIdX6QVagV9Lwhqe6dHaYYXDJyzex7HKhZ1KA+ EA/rpo4KodCJLzLD+8gvqN+9Gx9VwSQ81HCt761s5q8prTeFgUbGi7smDSixEVN+0cVRjx ijHpVKyAfGDcd4oH2+o+PJCwuQTBAkd41W8/T2uEBIvFmBBuAzrRqSnyWJCu8gFRH0YKFc zjJYsS1VWkeLV8zfhfYWDmfFmiDTKJKSifdpuKWSpw7MHSQYtR78ARkFOaWnFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487113; a=rsa-sha256; cv=none; b=j3lt0XMA/Q4pqx1ChbupTcYyoAnmxZcjxt9gT+PgxaPD+2l+nbs9EiwmjI3Ihee3Wu4cqY TKi8puz/SZyDU5AS574+HOaiSfk2ptUl3yDgBZvF1jN9hIK3jeiHaPyUTctsj6nNYNw1o1 8jzzAWZRW17Y6slsaONGEgj8h7HQNfw4nHYMpxAv2WX0n4MDWk7SMwHe6iKNyf3YyNePtZ iNF28bjAmb6uxFOAzTq43KMD3IYOBY0goLd02BRmZiLlcUFB1ITCPdG8jpASU5fRRllMLl 9gwxV9IMZ9soYMQ4rBHZ/rv4u7za1WLjOmaV+BoPgAV8HvQshfWaJeDByeii3A== 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=1782487113; 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=2aXvtWb5m9rShOBOb7PojRCjzRSKy/Tqyfydfi4MRr0=; b=s7MhCbYfJWW6dBhBlH22d8bjEZb9YKjZ7ooEhcwCkU8bqw+wxFdMnYJ+e1JwRechvuW4Oj jd1LPCqCySQhwwNvmSNaHZtWq9iIYljeIAzJ+pEqV96LpmqJmOYvaY3ZiV4x5zWrPxFE91 6YY8iA5Tq1HmOgYjc7hAh85N2q/VKcL21YIcqa3wf3R3VsyhVShhHLz7nV9UVgYYobnmX4 Cu3QXkfrVmKsPp3q5g5iQY8WvsQgPv+lPcGu9Ze4abhmOBcC6+EwES5bCVxouNeCoCYs6k zh3ASSLSRmqKjrIKSHA4aTVpy/YHBIdWUwD29ye5sj7KfQ4NcFlDDRVgsqRjWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpK46Mnzjdb for ; Fri, 26 Jun 2026 15:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22f9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 2dc5e14396cf - stable/15 - GENERIC: enable extended error strings on all archs 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2dc5e14396cf2cce43af34a42dd219bf2b8d1048 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:33 +0000 Message-Id: <6a3e9849.22f9b.493a6822@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=2dc5e14396cf2cce43af34a42dd219bf2b8d1048 commit 2dc5e14396cf2cce43af34a42dd219bf2b8d1048 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 GENERIC: enable extended error strings on all archs This follows commit 3296fda0c309c873ae37a0a4e25ded3ae04b421c. PR: 289236 Reviewed by: kib MFC after: 3 days (cherry picked from commit f38cbefef8090f3363e5685c5a3b30ffbf1d3ad0) --- sys/amd64/conf/GENERIC | 2 +- sys/arm/conf/std.armv7 | 1 + sys/arm64/conf/std.arm64 | 2 +- sys/i386/conf/GENERIC | 1 + sys/powerpc/conf/GENERIC | 1 + sys/riscv/conf/GENERIC | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 6f1b4993a849..d775b20653f6 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -27,7 +27,7 @@ options SCHED_ULE # ULE scheduler options SCHED_4BSD # Original 4.xBSD scheduler options NUMA # Non-Uniform Memory Architecture support options PREEMPTION # Enable kernel thread preemption -options EXTERR_STRINGS +options EXTERR_STRINGS # Retain exterror(9) strings in the kernel options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 15d8304ae5f1..5c4281f3892d 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -3,6 +3,7 @@ options HZ=1000 options PREEMPTION # Enable kernel thread preemption +options EXTERR_STRINGS # Retain exterror(9) strings in the kernel options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index 2a1221d1b1d0..f9a7d9a2f7f4 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -7,7 +7,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support options SCHED_ULE # ULE scheduler options NUMA # Non-Uniform Memory Architecture support options PREEMPTION # Enable kernel thread preemption -options EXTERR_STRINGS +options EXTERR_STRINGS # Retain exterror(9) strings in the kernel options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index dec49b37eecf..4ca900d0e434 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -29,6 +29,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options EXTERR_STRINGS # Retain exterror(9) strings in the kernel options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 8720a2c27447..73a0e081b532 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -34,6 +34,7 @@ options PSERIES # PAPR-compliant systems options FDT options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options EXTERR_STRINGS # Retain exterror(9) strings in the kernel options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index ee529feb49ab..9eb61862d504 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -25,6 +25,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options EXTERR_STRINGS # Retain exterror(9) strings in the kernel options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols From nobody Fri Jun 26 15:18:34 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 4gmzpM2h2vz6jfMp for ; Fri, 26 Jun 2026 15:18:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpL5xZ5z3lQS for ; Fri, 26 Jun 2026 15:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487114; 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=ippVXUSs97oPEVtvnMBe7CltTufsz7TWfWXZvtokLIE=; b=bBKOr975PbQE7Ew+udZ/Q3NHq1Zb8ZSgf/jdRqd92yUSvA9OrHIgYB47nFrY4g+gQIkvga AXrGtsPOWe/IOTg2q9GbMFRN85cZLCyte0+lMo/e7wcxqfl9WI9S2ouqWB9YbrsPpNQ7kh YQXShH1kUjx8iQUodxPFZAo4ZHedlgw4HTok00fmP6DhMQ+uhZNfbaC3IED9g5l30OHpIA sNGvWEcdG1SKonkY9ntStVYI32VTHICgsQ2BJV85jKYWGKjAi06NT+HISeuhEUFtMnUCRk iR3TqAapjnPfNFBR/UbKP6KAmtsBZtN2Ba8fH+h0prxUY5aTLIL4wijqbOXd1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487114; a=rsa-sha256; cv=none; b=cvpgrn9ENH2sZEjm8NhHT8/REQAF27/T/Uyis9HNO1MrjqHxTroxbNI0GHWn/Rkcc5DUK/ zw+xtbJkQs4sv4jIXtR8HA5CuVogsaV4L2B5UvXT3wROsB1EpTqPcB9PoeYNJ49kM8Y1mH ktapNbH5tnRt9dGB50Mwl0JTJ6uk2Llis7BcK29Ppk3c6yaBagIaZy+QEeozInAxMeZyLr RLmkYJJlfkRKFXGryt7VGA7U2u7k6V3wKn6fmZJ0fga46Xr3swimW0OHIjr6aFo6g7H+Jc yWpCkbWfVJdD9XTdZLf8ev1dVKMqkOY/IDrBn9ml+0UF3/rbBWZl5DekW6/xPw== 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=1782487114; 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=ippVXUSs97oPEVtvnMBe7CltTufsz7TWfWXZvtokLIE=; b=EpLCaKLiB+mSW4uKz6aH9OWoQeRcRH/bdpeYlMvF20G2U7DgzqqmziB9uDpcrlZv6PP8GP xX3p6b7M77EeugxJpl0TjBpxI0ORKYzXgsSdU9a8nIksZ6aK6cu8if0jzKgl2wB2K1ne7z qv7rVqtrtYKiU7jqwMXUfCT/skp+ndXa2HZQmHlBC5DQLH+Vn2sVZYTJW39BKWBVnSQxCt cwAfYva0/KLm7oSnGk+o3RvMO9Je8zadw1sJECftfxnX1j8vVyr6FTKXjD9Pq7yUIa8xWU U4SYxkiqEG88c35Fs42Nahye9QjN3sr1qZrc06h7gtneNWh6ipWqTrBmtc2fmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpL4xZnzjMS for ; Fri, 26 Jun 2026 15:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 230a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: a13936fcdc8d - stable/15 - tests/pf/route_to: check_random: rely on test timeout to fail 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a13936fcdc8dc3f37125614daa424a9cf1ae380d Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:34 +0000 Message-Id: <6a3e984a.230a8.237ed139@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a13936fcdc8dc3f37125614daa424a9cf1ae380d commit a13936fcdc8dc3f37125614daa424a9cf1ae380d Author: Siva Mahadevan AuthorDate: 2026-06-17 16:52:00 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 tests/pf/route_to: check_random: rely on test timeout to fail This test is known to be flaky if 10 attempts happens to be not enough for the test to pass. Usually, this test passes in ~4-6 attempts. See https://ci.freebsd.org/job/FreeBSD-main-amd64-test/28664/testReport/junit/sys.netpfil.pf/route_to/random_table/ Rely on the timeout (default 5 mins) to catch a failure here, rather than just 10 attempts. It's very unlikely that 5 mins worth of attempts still isn't enough. For a history of flakiness, see https://ci.freebsd.org/job/FreeBSD-main-amd64-test/lastSuccessfulBuild/testReport/junit/sys.netpfil.pf/route_to/random_table/history/ PR: 289477 Reviewed by: kp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57408 (cherry picked from commit 1294f332aec02e111b47d69e0d91e32dc2624001) --- tests/sys/netpfil/pf/route_to.sh | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh index 13b60c8f80bc..99387aa3802d 100644 --- a/tests/sys/netpfil/pf/route_to.sh +++ b/tests/sys/netpfil/pf/route_to.sh @@ -29,10 +29,10 @@ common_dir=$(atf_get_srcdir)/../common # We need to somehow test if the random algorithm of pf_map_addr() is working. -# The table or prefix contains multiple IP next-hop addresses, for each one try -# to establish up to 10 connections. Fail the test if with this many attempts -# the "good" target has not been chosen. However this choice is random, -# the check might still ocasionally fail. +# The table or prefix contains multiple IP next-hop addresses. For each one, +# repeatedly try to establish connections until the "good" target has been chosen. +# However, since this choice is random, the test might still ocasionally fail +# due to timeout. check_random() { if [ "$1" = "IPv4" ]; then ping_from="${net_clients_4}.1" @@ -47,8 +47,9 @@ check_random() { port=42000 states=$(mktemp) || exit 1 for good_target in $good_targets; do - found="no" - for attempt in $(seq 1 10); do + # Loop until either the "good" target has been chosen + # or the test times out. + while :; do port=$(( port + 1 )) jexec router pfctl -Fs atf_check -s exit:0 ${common_dir}/pft_ping.py \ @@ -65,13 +66,9 @@ check_random() { done fi; if grep -qE "route-to: ${good_target}@" $states; then - found=yes break fi done - if [ "${found}" = "no" ]; then - atf_fail "Target ${good_target} not selected after ${attempt} attempts!" - fi done } @@ -1354,8 +1351,7 @@ prefer_ipv6_nexthop_mixed_af_roundrobin_ipv6_body() # The "random" flag will pick random hosts from the table but will # not dive into prefixes, always choosing the 0th address. # Proper address family will be choosen. The choice being random makes - # testing it non-trivial. We do 10 attempts to have each target chosen. - # Hopefully this is enough to have this test pass often enough. + # testing it non-trivial. # pf_map_addr() starts iterating over hosts of the pool from the 2nd # host. This behaviour was here before adding prefer-ipv6-nexthop From nobody Fri Jun 26 15:18:35 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 4gmzpN6fjTz6jfMq for ; Fri, 26 Jun 2026 15:18:36 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpN1j9Tz3lJD for ; Fri, 26 Jun 2026 15:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487116; 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=5qyo3Y/FYmN54hdb/Hl4k3zdeif+uXaHDNpPmC+PDAA=; b=cju8L+hPHpJkVjXY2IfJW0Rzw33R6X+v75O3jr1MeDRhVqUN+QcjeyoPjHtHy1DuILCRTh tnVxMiysXcZqvbCuWi/10g3aIIO1eouwKb0zpAGaB30ff2csdIytkB2aok60O4IWuSndHh aT6lS0wjePbFAikJOLIWH3l86zkJxCtoUEGYhMBDBShll/ln/3bIxpAm46xvK1lVbnCAZi ZSm4nsf+fmpX/GyTZKb0a6dIwzZflCiC3mzYMv+JRh++6/NYIZM0fPjN+W637irlcVuHuo iPVT0N6aiaZlb9MjWNVYbCBPQfsjEriVxkc89IR74Zcv/hSj+TIaj9nddxkBIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487116; a=rsa-sha256; cv=none; b=YHkSlW5+zNXkUbSLJBeXosYHnX/qDiHtjakE5e7d55KmxDpRJv+Jbl9TfL4IT8LpZzbeyD xDY9VYN7/k8EPjG/t3HdM4pZ0boCc+xkU094yElO32cT3uQbbxZ3wvTHWsZKg/IApr2ROB RDj8l8XnsUJNJEyiSlw5FfGarp6yYXSXuaVwVnWHkMKYmRtUeM40VnQgZS6f/WkNu1ZCvi u1kFWGX4iVCfbYrA+4Tl7OGYEYtlonX2drWknLSEXFU2yukTm3TQq5KWgPGBH8dpC7ACgT eLdURh476EymT073uAxxQF5m1Qjd6kjwDx6LCShVsnLsPemfvJlQcV7NQdxzXA== 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=1782487116; 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=5qyo3Y/FYmN54hdb/Hl4k3zdeif+uXaHDNpPmC+PDAA=; b=D6YlLvJtTzyzaZ5NUTM5V7RfReiIse5qIurcEnY0zywZ6+UhYO9WfWj8qvT5ajszwHskUZ 9rOKBeV3/Lbjm8m40EC9LlUWBORyLJAgfwv2Kh3FW5598dRNDSEZtGnQEp9BooywfROwz+ xWV2W5zYZRw6s7dTJYZgwftLRs10SHy0ycXeqTS1EnDfXNZ9PPhqtmTqY21CTGtwTZifDD IE7azzURLIXsRg38n1eoCTMsBSKyHno3HHynm7GvxHan3TcS0CSMyYeoEHFIwjr2nu7yMh z9LZ4aV3l1aKEAfb0FtIFl5qknDyPj1+m0mpdgW6+5HYlKcOqL6lfevywX+NKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpM5nPbzjqP for ; Fri, 26 Jun 2026 15:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2298a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: c5be733527f1 - stable/15 - msun/logarithm_test: expect_fail log1p_accuracy_tests in the correct spot 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c5be733527f1e4fabc83e35c87e26afd002e08e2 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:35 +0000 Message-Id: <6a3e984b.2298a.65489194@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c5be733527f1e4fabc83e35c87e26afd002e08e2 commit c5be733527f1e4fabc83e35c87e26afd002e08e2 Author: Siva Mahadevan AuthorDate: 2026-06-17 17:04:54 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:44 +0000 msun/logarithm_test: expect_fail log1p_accuracy_tests in the correct spot While here, remove the conditional on the "ci" config var to ensure that this is reproducible locally as well. This fixes a case where we are expecting a fail before the failing ATF_CHECK_* assertion happens. Found in a CI failure here: https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16608/testReport/lib.msun/logarithm_test/log1p_accuracy_tests/ PR: 253984 Fixes: 405188aeac540f7666dfde37c2f32d222119f56e MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57351 (cherry picked from commit 19af9c77acc912e4bf90a667924f5f4ff78a7759) --- lib/msun/tests/logarithm_test.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/msun/tests/logarithm_test.c b/lib/msun/tests/logarithm_test.c index df1fcdc8627d..a605fa6a6bfc 100644 --- a/lib/msun/tests/logarithm_test.c +++ b/lib/msun/tests/logarithm_test.c @@ -249,10 +249,6 @@ ATF_TC_BODY(accuracy_tests, tc) ATF_TC_WITHOUT_HEAD(log1p_accuracy_tests); ATF_TC_BODY(log1p_accuracy_tests, tc) { -#if LDBL_MANT_DIG > 64 - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_expect_fail("https://bugs.freebsd.org/253984"); -#endif #if defined(__riscv) atf_tc_expect_death("https://bugs.freebsd.org/290099"); #endif @@ -260,6 +256,9 @@ ATF_TC_BODY(log1p_accuracy_tests, tc) 1.82321546859847114303367992804596800640e-1L, FLT_ULP()); test_tol(log1p, 0x0.3333333333333p0, 1.82321556793954589204283870982629267635e-1L, DBL_ULP()); +#if LDBL_MANT_DIG > 64 + atf_tc_expect_fail("https://bugs.freebsd.org/253984"); +#endif test_tol(log1pl, 0x0.33333333333333332p0L, 1.82321556793954626202683007050468762914e-1L, LDBL_ULP()); From nobody Fri Jun 26 15:18:36 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 4gmzpP5Wzgz6jf9S for ; Fri, 26 Jun 2026 15:18:37 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmzpP0Q8Tz3ldx for ; Fri, 26 Jun 2026 15:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487117; 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=A7suMgR+s0ILLkN9+iB/LzwInbk2FfsZ30vHx3WYORM=; b=Kjola0EtRhpjgBtDbWy/G2EaSSLle9Sn0EMETNensfuwjCMX+Ekppr4ngzIbb3D6OPIDjl EjGC2oPZWoCvcapm6GuJjVIh4mdo6leLmtdp2LLZ5PoLSoxz8m9f0kj2qC6XBY0t9/7PAm XwQI2VouvEDTkm89OPNjjeKi23ft3YUbDjsSUqCmo3wskD+G1AXx8b9Mh7h2PzCgri4RJI FDtEXbjsSaMXvjxT3n2oDNFyZesiFRMIFFT4DEAwKeQekXaaQpKmojbLvqG3sPUqua0KU0 uAIEkAdngnutS+Cr99tcNiwpkqLROFpHstHr3dotQZXmuYzyHegEH8mL/T3DUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487117; a=rsa-sha256; cv=none; b=fezgQ3zqTbiqNgUqg3bSYobcj7VukKep+CFz9N0iA9uGXVo9x9MgxWZFeEsyDUnL5fGSNB uWATXUe1RzOyoHrcEmUNfIVqatl5IhW0vpWyx1ZG634F4r32ZaI52M3RjoPPMezKCD+Vik +jdoefQZkO45ErELlRjXa1QQDfkR8BCs/6uMJXJE+JlasMpak5G5MnhY8uZGyXq6himJ4Y DVawA8VqPlJlZvCST2glBRunYrY3y/e+XRLmFg9JrwU2IOfNWkgzmDAhLHX3H0uIO/k/zJ y859erC/zetszOgpZZLchavr2aaO6x14zGsJNYncW6nYQPLuWsFcgAGOYXpXrg== 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=1782487117; 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=A7suMgR+s0ILLkN9+iB/LzwInbk2FfsZ30vHx3WYORM=; b=bmqHwcCAWEHPTUSNdBJ1GJWP9Aa2eOFYaWiJN/rTx1q7yKZOji6Qc5ikAETwnQG7rhndmg 7YD/CKVA5SGSISA3sxq+QSq9+EYbJO2BhJqjk2k7lVnD7xjgfDoaBHMHlX68b++5SqGqR6 UtVuOEaj+CMcEHNuUJq4kk8BYpXpqyOxHZoCE6FTKhkGyH2LYaqzGzmMMgTS28z4y+SRAW twxcqa5+Pfc2EBsNRXFQkw1Ej9lR0JYAeIWHAveG3IgDGktk4qQPgB/ALUn4UR6QWqNaos IVKnANWja6Zh2aT2dPwpaDht6XVZc8vz92tTGLulcYpGB6oI7PTKZYTlUX7yWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpN6ZCjzjYB for ; Fri, 26 Jun 2026 15:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 230f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: be5333a0a0e6 - stable/15 - lib/msun/tests: re-enable nan_test on riscv 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: be5333a0a0e609eb2e4bd154fd7213cb8a3882e3 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:36 +0000 Message-Id: <6a3e984c.230f3.3aa3cfa@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=be5333a0a0e609eb2e4bd154fd7213cb8a3882e3 commit be5333a0a0e609eb2e4bd154fd7213cb8a3882e3 Author: Siva Mahadevan AuthorDate: 2026-06-15 22:27:52 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:44 +0000 lib/msun/tests: re-enable nan_test on riscv Commit 1e25cda7f06923d05e28dac8eb1c1c428a5c92dc fixed it. MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 52ad4f883489f73e7a876f5cf296bb5a7dc696a2) --- lib/msun/tests/nan_test.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/msun/tests/nan_test.c b/lib/msun/tests/nan_test.c index 3dcea3f9e402..32c5c39af0c1 100644 --- a/lib/msun/tests/nan_test.c +++ b/lib/msun/tests/nan_test.c @@ -105,9 +105,6 @@ testnan(const char *nan_format) ATF_TC_WITHOUT_HEAD(nan); ATF_TC_BODY(nan, tc) { -#if defined(__riscv) - atf_tc_expect_fail("https://bugs.freebsd.org/290099"); -#endif /* Die if a signalling NaN is returned */ feenableexcept(FE_INVALID); From nobody Fri Jun 26 15:33:29 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 4gn07Y3z3Hz6jgTN for ; Fri, 26 Jun 2026 15:33:29 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn07Y36zNz3vK5 for ; Fri, 26 Jun 2026 15:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782488009; 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=mN/wTHpMSaRpFnQ0fHD7Dm3UOUctgSJ4rKlLqS0g6dE=; b=H52fmF/+q2u/mJ17wRqWeDrZNPSdXxRwddzq5XRGYbr2WDTAy+Ztx61lDqdoNxI1y/vwzH GwMWfkRnze87GkdFHV/Plk7SWp+6a1HYLv4TjbFNaYhQ2Ccufoxm6zqreiSfXeQpdiusM8 VpIEKi6u8rSjhzMD5cdM3JGMHiNBM9m+6myOZ9f6X6UBPQOqVojcKRbDL7oO+2cV76aP4X nfqIGqEsSlhLe3EEcjcrHHsvNzylze57cUjccYsWs/bsPhTZqK7BBK8HLOkhys+JcoahBz 1D4EUCB0Y88VQh7kIPEByYxqwouGRO5DIqP7MhUJ2+jvaH9dzQRRZUkbO8RFMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782488009; a=rsa-sha256; cv=none; b=uQBI5qXMX/M4AIT4YA77gJND4+zZKdP9043g8nLhEmb+6oFw5L7rl+Mmw1GLfLucUXR3rP UCkojU/+0vkUFww7yRHQAOFxyEqqeQ0ziNboxL5P25sMtPwXEOITLN7WRTiarwTaS24+hJ ajuJum8Qx0ucgZn6TmwJ9EBrEIyZtfh4ehp0sJ12nKDPCswo0XrXODFaxoukIpQM1j0pXV EYkkHt19DkktjHC63ZxuqzM3JHlfj0GjNwm6luARWKTMEdClS33M4iiFrpJrw3NfMz8s+d f9MsnofWT7sc89FBdY5XBA2b06ISqxf8El1VWpxDFEM0RnA1HnIzjRQeVCJHFw== 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=1782488009; 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=mN/wTHpMSaRpFnQ0fHD7Dm3UOUctgSJ4rKlLqS0g6dE=; b=if3EldPwLwJMgeYSYlD4LJoKGRksi+Z8WUHKRJp9ufMa2M+Yv9Szg/i4sMFy8oRFg987Ma iMDIuVx+hXRl1+00SODHWDLD45s+0NJdWJPTmU6p13PpiXhCSDmn1vnnm14RlHADR6fvyG u7q+VQQ/0W7Nj8CTMdC1BGHM1ghE/Wv2Vsyvj6rLZk6NJB9+UUX3k9hsUoe1cogy0Ma1OT vhxALO8BNP6MxiYnBk0+hfP0HJhedf6LUWVHuSHM4SIV+vXnIPcQljyr9tq+fmAbDBfwqk QN62lZKFVJajtxW51xB5iGOLRps7Zr4fKTLLTl/28shB0JRhM+1aKsmqcgqbog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn07Y1wpSzkKJ for ; Fri, 26 Jun 2026 15:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23cbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:33:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: aefff0a9cfba - stable/15 - if_media: Claim 10BASE-T1S and 10BASE-T1L constants 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: aefff0a9cfbabf329eaeb6e929d5401e2fe34e02 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:33:29 +0000 Message-Id: <6a3e9bc9.23cbf.4701c913@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=aefff0a9cfbabf329eaeb6e929d5401e2fe34e02 commit aefff0a9cfbabf329eaeb6e929d5401e2fe34e02 Author: Ed Maste AuthorDate: 2026-05-04 23:48:25 +0000 Commit: Ed Maste CommitDate: 2026-06-26 15:33:15 +0000 if_media: Claim 10BASE-T1S and 10BASE-T1L constants These are two single-pair Ethernet (SPE) variants that run at 10 Mbps. 10BASE-T1S has automotive origins and supports multiple nodes on up to 25m of cable. 10BASE-T1L is intended for building and industrial automation and supports long-distance point to point links of over 1km. Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D56952 (cherry picked from commit a3036edd0292291a71fb74ba2bce355159ac6913) --- sys/net/if_media.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 892b7d1e3e52..5cc8714219c8 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -262,6 +262,8 @@ uint64_t ifmedia_baudrate(int); #define IFM_1000_BX IFM_X(121) /* 1000Base-BX */ #define IFM_400G_SR8 IFM_X(122) /* 400GBase-SR8 */ #define IFM_400G_CR8 IFM_X(123) /* 400GBase-CR8 */ +#define IFM_10_T1S IFM_X(124) /* 10BASE-T1S */ +#define IFM_10_T1L IFM_X(125) /* 10BASE-T1L */ /* * Please update ieee8023ad_lacp.c:lacp_compose_key() @@ -554,6 +556,8 @@ struct ifmedia_description { { IFM_400G_AUI8, "400G-AUI8" }, \ { IFM_400G_SR8, "400GBase-SR8" }, \ { IFM_400G_CR8, "400GBase-CR8" }, \ + { IFM_10_T1S, "10BASE-T1S" }, \ + { IFM_10_T1L, "10BASE-T1L" }, \ { 0, NULL }, \ } @@ -903,6 +907,8 @@ struct ifmedia_baudrate { { IFM_ETHER | IFM_400G_AUI8, IF_Gbps(400ULL) }, \ { IFM_ETHER | IFM_400G_SR8, IF_Gbps(400ULL) }, \ { IFM_ETHER | IFM_400G_CR8, IF_Gbps(400ULL) }, \ + { IFM_ETHER | IFM_10_T1S, IF_Mbps(10) }, \ + { IFM_ETHER | IFM_10_T1L, IF_Mbps(10) }, \ \ { IFM_IEEE80211 | IFM_IEEE80211_FH1, IF_Mbps(1) }, \ { IFM_IEEE80211 | IFM_IEEE80211_FH2, IF_Mbps(2) }, \ From nobody Fri Jun 26 15:34:19 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 4gn08W6TK2z6jgRX for ; Fri, 26 Jun 2026 15:34:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn08W5jHmz3vw4 for ; Fri, 26 Jun 2026 15:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782488059; 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=78ew5ILrsCVj3r9kVPHrjYB+wDJ7JCaPUGfd/plX7JM=; b=bg3FFDKXLKRNRZiCrvHOgzBj/myUhnhiJZ8Iiph8Iqs4egVx4qutgxfdzrDwsC2U2/L5Li yOndgS83kDotBBrvEw3Ohg2ZUK4nH+Ric90OOxK2Yq7oazp1a4ikOHbFMMgyCqUQH0edSi YnPrzRYkZ0kLfPehTWTIcx0LN/USe/egiY3xEU5Uco5V3xPUhifrm8Sl3J6gjFRRuSU3gc b++Hs/fcDyCvPp6m31hhAiNUPhctGbD6kr2qcw7JVPctvUBMs5EL5ndobVM0jD7zYME001 QXP8CBqG7ZkvSK8UGIISpbYjPwbwRl8nwjdyYOqHwQ77wuswdn1U6l3TsgiHyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782488059; a=rsa-sha256; cv=none; b=We2NefpnEIySm6eoMZ9cc9YyHTzknmM/Y8Nm/OSAT+zUputNmTmEkf130LlVinX4+Rz36J C+psjMYRM0Txpu8++zYl4mlIwMEW2qt5OrunQzVcYRYpyVmm3MOlr2TBANSxcD5id73IFM up6QhmAdlHFZ98iU73PkN4807wfGwIrzGNAa9/BnOu9nkfLHSRlplUvl2b7R0cNVxybgT+ qlB4mojARcz5Q5IwWotovwYUdgmkpUl9871qeVEUparoBv9jC/ofOZE7v4dKln1s1Hx87L vVYIpp6+T819jTcUqX01ptb+wPaLcwiYC6/5zBdpZ/1q+wwTcuIUrE2RqO3HyA== 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=1782488059; 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=78ew5ILrsCVj3r9kVPHrjYB+wDJ7JCaPUGfd/plX7JM=; b=YVZHQuhm+JsZC9XlwAo8659uF2neY35mbQFJuw3oNnRRGEjJ6P0pydmsi1nmGXUPua49Am Jv4z+Tgn5sOMTgFQax3xQhNtpUWNwJ1+fgCTI7J1sl4cy88ar4ei2ZdtpF6H6/1h/uYSiO kt0K2Ld5zRWme4R3dE3h6GoQYdvRAgyN4MHckfMvH1VdgAcUR7iMeLflL0qjSYOmuI8fXO Eh30FiaWvLFJ9uEkoTw21hGiiUCQ2IRZ8Hb4ZQMtRPZb0cE1bfcOkJCbc/sGLLH7HkEDgS Gi2PmAaXuvBIYN1nxVImb9UBFMnniCboi0NiNQVJ7O40JvXIqrm9Yq5gjeRAEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn08W4WwpzjyK for ; Fri, 26 Jun 2026 15:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24b42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:34:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2d7f1cf13822 - stable/15 - syscalls.master: Allow clock_nanosleep in capability mode 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2d7f1cf138229066090a74b9222b2884fc2ec371 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:34:19 +0000 Message-Id: <6a3e9bfb.24b42.3ca21c5@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2d7f1cf138229066090a74b9222b2884fc2ec371 commit 2d7f1cf138229066090a74b9222b2884fc2ec371 Author: Ed Maste AuthorDate: 2026-05-29 20:26:06 +0000 Commit: Ed Maste CommitDate: 2026-06-26 15:34:03 +0000 syscalls.master: Allow clock_nanosleep in capability mode It is akin to nanosleep(2) and does not access global namespaces. It should be permitted in capability mode. Reviewed by: vangyzen Fixes: 3f8455b0905a ("Add clock_nanosleep()") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57343 (cherry picked from commit 692b0ef1506ba51b72d0a2707cbf8879a6e01d78) --- sys/kern/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 6856a0907d48..4c7de9d59ded 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1430,7 +1430,7 @@ _Out_ _Contains_timet_ struct ffclock_estimate *cest ); } -244 AUE_NULL STD { +244 AUE_NULL STD|CAPENABLED { int clock_nanosleep( clockid_t clock_id, int flags, From nobody Fri Jun 26 16:59:36 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 4gn22w45ZQz6jmtb for ; Fri, 26 Jun 2026 16:59:36 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn22w39bxz4Cvq for ; Fri, 26 Jun 2026 16:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493176; 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=9dImUYettxIMndv4JGNccWUPQW+KXU179i4xy50w1gc=; b=eyr+d8LbJQICuEp4/e/NwrKsvhyzhcET7x8zoYxzSCrM0Ut1dOWsUDQcmwp/0s4UM/rVjC qF5n70tfw9DX1WIOJZdPzwSSEkslJwhFQK20YZ8AIOkrhsV49BGd+3h66bfJW7rjStfiS/ xNFNz6jCjEk/RIYKSqFG0iSPojjvg5v8ft1OrRxi0ewZ1F2m6CpeUW2fJhsjuSw8mtJMDy UgnkwUfODXiFqfW2VB6bsQ5R6PwPSt0kC+MwDmRdF7OtEYbky6E/p0NaKB4tANvk8F0ZAk Wmcj2hZjhxWtn/2qF8/2GJLFmMiKeHdG3wBQjcqX/BsooT19x4aX9nAbVr+W8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493176; a=rsa-sha256; cv=none; b=AtkilEFqXnqzsB8tyCbzfmRZpIx9HPCrZNGVyff+c74zwc6VnU8XMQ7I71ybYymUkfQVPn bhpvKvodvaoMesap8wgYhuFvaeE/D6SV6kdf18TcyG4SuuNS6rV6Tl+Ks9DqXgAgeTiuIV peFpScTUAjgGD3+AxPJDgSv4qMCs0XMdHBZltQgRgRxLkAlYgE9ADXrXa2yi7//5bTdu8I pIDNSFsrrJm8tRo14gUwXtRxJSw8nkmBhn7geBcp5SISw0/U0HsqAIUk5XbsIo8TT+cTDB 39JBFVbwUfEQghhGvXVLz11ErSzA93x6jdxLzfe+idwd2BY+TLNHQ7EyVzGf8w== 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=1782493176; 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=9dImUYettxIMndv4JGNccWUPQW+KXU179i4xy50w1gc=; b=J2GPDnMrXg/n0dHl5LDsyHJycmGBGo/qwx7JoozsfxEvFkDFj+B2X90RbFZf0LwsuvdHZS uMMtf4MQGJf/QB7yk4Tusk9u4D0ZufWsoq7twLE4JnDlqpx0IWfH4Gd/N1WtYL7SK8pX1c y/hfo3TTQaqV0mWaQtcJZToyXFb/wEMO/DRxeQ7gEbswBiau9gFqEAtHCx4qa3ZPX2zD55 Kzs9QtdCoukw65jZZVfNPBEEuzWYw71PqbKYXkpE3wq1U/OBv35W/GbeOYxNEbV3hvmCLA GZxhgV/sKn/vtXOjkIzOGgH0E8VMEjPIJCczZY4PKvD/2NEhx4ej27nv/kpi5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn22w1vSczmNH for ; Fri, 26 Jun 2026 16:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: ae7241e7d08b - stable/14 - tests/ktest_netlink_message_writer: remove INVARIANTS requirement 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae7241e7d08b2193b0370d16b3d8b6a82423d9ef Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:36 +0000 Message-Id: <6a3eaff8.35e42.4ec59b64@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=ae7241e7d08b2193b0370d16b3d8b6a82423d9ef commit ae7241e7d08b2193b0370d16b3d8b6a82423d9ef Author: Siva Mahadevan AuthorDate: 2026-01-22 19:49:51 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:28:18 +0000 tests/ktest_netlink_message_writer: remove INVARIANTS requirement INVARIANTS is meant to be used to enable extra sanity checking for internal structures, not enable/disable tests in the freebsd kyua test suite. STABLE branches include a GENERIC kernconf without INVARIANTS, so ktest_netlink_message_writer is broken on such branches: https://ci.freebsd.org/job/FreeBSD-stable-15-amd64-test/253/testReport/sys.netlink.test_netlink_message_writer/py/__test_cases_list__/ Reviewed by: lwhsu, imp Approved by: lwhsu (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1889 MFC after: 3 days Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation (cherry picked from commit 8352e24d0bc59f9730980986600bde7d8cdce21d) --- sys/netlink/ktest_netlink_message_writer.c | 5 ----- sys/netlink/ktest_netlink_message_writer.h | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/netlink/ktest_netlink_message_writer.c b/sys/netlink/ktest_netlink_message_writer.c index e46065dd4bd2..4f894d5e070a 100644 --- a/sys/netlink/ktest_netlink_message_writer.c +++ b/sys/netlink/ktest_netlink_message_writer.c @@ -37,8 +37,6 @@ #define KTEST_CALLER #include -#ifdef INVARIANTS - struct test_mbuf_attrs { uint32_t size; uint32_t expected_avail; @@ -146,10 +144,8 @@ test_mbuf_chain_allocation(struct ktest_test_context *ctx) return (0); } -#endif static const struct ktest_test_info tests[] = { -#ifdef INVARIANTS { .name = "test_mbuf_writer_allocation", .desc = "test different mbuf sizes in the mbuf writer", @@ -162,6 +158,5 @@ static const struct ktest_test_info tests[] = { .func = &test_mbuf_chain_allocation, .parse = &test_mbuf_parser, }, -#endif }; KTEST_MODULE_DECLARE(ktest_netlink_message_writer, tests); diff --git a/sys/netlink/ktest_netlink_message_writer.h b/sys/netlink/ktest_netlink_message_writer.h index b7864bea59c9..8a4c4c481d18 100644 --- a/sys/netlink/ktest_netlink_message_writer.h +++ b/sys/netlink/ktest_netlink_message_writer.h @@ -28,7 +28,7 @@ #ifndef _NETLINK_KTEST_NETLINK_MESSAGE_WRITER_H_ #define _NETLINK_KTEST_NETLINK_MESSAGE_WRITER_H_ -#if defined(_KERNEL) && defined(INVARIANTS) +#if defined(_KERNEL) bool nlmsg_get_buf_type_wrapper(struct nl_writer *nw, int size, int type, bool waitok); void nlmsg_set_callback_wrapper(struct nl_writer *nw); From nobody Fri Jun 26 16:59:37 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 4gn22x5BdWz6jmwM for ; Fri, 26 Jun 2026 16:59:37 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn22x46QYz4D45 for ; Fri, 26 Jun 2026 16:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493177; 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=qEFZWvJIUELPWn8PmzH/Jm/rZwQlgabkVET9KGReKOI=; b=gUwNNTVV+leX2zLRCsCKhcFZkj/GW3uCmhfprdDhcHnR46ulW7pHWRjCUaTWqIEvIjgJgF TSp4j5htFRC37fP5Gx2puSnfUSGvFkk/Qidu/MuRkwx5y3JM1MHAfqADkqrIuYOYLgS6ra 29S45i/ZtFOHEKqTJBtUwDTeKqIja6B4VFFGvkI37sYwwU2qJkI9aOBe2+K3QZfCsyvDPC Ckn9t4kq3DFkP2yqE11oBvtrnNSgup/EKpeLic5MLr8tgFfRu15kl9FUv5mvp1jBkaUw7b 6XtQkFCREFY7rhPHNUFL/Hezriyyc31NU8QlnKX2S1owYmHC/eyrfCANsQyKaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493177; a=rsa-sha256; cv=none; b=K3CJK1zveLCKePI4M5EjS+wwTOjMSpp42GZ/aycbG33/cgNB0SJXl1NQfVX+PaqAqmEcHE 1fgK/LWH4FznGiycMvhTSibg1BC+BV4d2Kny3pli8Dbs7UMiaP0s29I6EaINTaD6+5OXJ+ 3G60GzwWaT+5qJZuRYy30fRtpUglLgGmkz2leZbc/J9QrH3LkZSO2szahb/4Bez7sQHGqk 1OuRTSZPk2xYVORKuY3YLDv6KC83COhrXZ0ZM3m+sBeF4Dut0aVflJlK1lPGBFzxQc490J iVMDt/BUDKbbCCnFWADuw/totBvaX3yKD3IKmu/3jGRX9Nh/ilxugDzHqP2PLA== 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=1782493177; 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=qEFZWvJIUELPWn8PmzH/Jm/rZwQlgabkVET9KGReKOI=; b=VRVor/85W051HpV9fE6fji6I92wC54jvNKUSuot6RVvq3urlDLkveLaYmaz60ynhZ/RFLK ktIXjiSILcwBEIDeGjnTEmbUv0xp4fRKeiaVcIHKqIky6i6YE63Ci3PuYPxeBXxHKTK44f neXF/aIvLNbFZWP/Z69d2adHDah9OhMOG7LFgJZsHfg/YmOiPveKC+p9xMPL7k1LedDK/n YuNzXAet3oC7o7nzUlpNT9LYuNrME1aM2pKg+0pl1qaZoOscP+hw5YvRVN8YrlhxLMgd8W 2uhHTctd1Ri4kwZprO4qzaq95RUG5kz2THzYajI0QYtmRNtOUCUHUmvKonYhyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn22x2dR8zmNJ for ; Fri, 26 Jun 2026 16:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34772 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: ef7724764a1d - stable/14 - mixer/tests: use require.kmods property instead of ad-hoc checks 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ef7724764a1da3d7615528f1ec4a13ff315562d2 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:37 +0000 Message-Id: <6a3eaff9.34772.1fd89d8d@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=ef7724764a1da3d7615528f1ec4a13ff315562d2 commit ef7724764a1da3d7615528f1ec4a13ff315562d2 Author: Siva Mahadevan AuthorDate: 2026-02-11 21:50:00 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:46:32 +0000 mixer/tests: use require.kmods property instead of ad-hoc checks Reviewed by: christos Approved by: lwhsu (mentor) Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55221 (cherry picked from commit 5fa297f4bcd277dca7eef03e68363fb1e721799e) --- usr.sbin/mixer/tests/Makefile | 3 ++- usr.sbin/mixer/tests/mixer_test.sh | 12 ------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/usr.sbin/mixer/tests/Makefile b/usr.sbin/mixer/tests/Makefile index c8056169f9a4..a39a66cc8277 100644 --- a/usr.sbin/mixer/tests/Makefile +++ b/usr.sbin/mixer/tests/Makefile @@ -1,6 +1,7 @@ ATF_TESTS_SH+= mixer_test # mixer tests fiddle with a singleton dummy audio device. -TEST_METADATA.mixer_test= is_exclusive=true +TEST_METADATA.mixer_test= is_exclusive=true \ + required_kmods="snd_dummy" .include diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh index 45003251c460..c48512db5ec7 100755 --- a/usr.sbin/mixer/tests/mixer_test.sh +++ b/usr.sbin/mixer/tests/mixer_test.sh @@ -45,13 +45,6 @@ restore_conf() test -r "test_mixer_conf" && mixer $(cat test_mixer_conf) } -load_dummy() -{ - if ! kldload -n snd_dummy; then - atf_skip "cannot load snd_dummy.ko" - fi -} - set_default() { deflt_unit="$(mixer | grep ^pcm | cut -f1 -d:)" @@ -78,7 +71,6 @@ o_flag_head() } o_flag_body() { - load_dummy mixer_exists set_default @@ -96,7 +88,6 @@ d_flag_head() } d_flag_body() { - load_dummy mixer_exists set_default @@ -118,7 +109,6 @@ volume_head() } volume_body() { - load_dummy mixer_exists set_default save_conf @@ -204,7 +194,6 @@ mute_head() } mute_body() { - load_dummy mixer_exists set_default save_conf @@ -248,7 +237,6 @@ recsrc_head() } recsrc_body() { - load_dummy mixer_exists set_default save_conf From nobody Fri Jun 26 16:59:38 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 4gn22y5WsDz6jmlM for ; Fri, 26 Jun 2026 16:59:38 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn22y49Crz4DKb for ; Fri, 26 Jun 2026 16:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493178; 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=ZxnWJg8EoOWBfelEwqgyJQKnQMrpM7nk7LjgGWgp+M0=; b=yoYJd5DQlzkIOeLxqTyV4tVyHpYkVjWsylKFE2WTjeKLYkqXqBdKk8pbwOMqZAEDuyecct PLrwQd/Ax0hooY+dyKBaaTzWUHaI7KiU1VvdWqDsNQ6SoBId2pycY0FzxVuWzgCGw5ngSf y2sfypaMeBhbEp+EmnmKIqvBRy1QP+CaoZs6v/Qggq5Vy3Wmby9O4oQXQV4mx132yKqo6V CPNBm7JDYpb1ClK7LoyFhs3sNSKhRDejhCePD+h6QBF0wC1S6ww76B8Z1gNneHptxDaYR0 17rf9I09upGo5muiuObkrSeyKM/O3fOjyA6fcUDMJWccdFgIg+5wSzYplyTSnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493178; a=rsa-sha256; cv=none; b=jpXh13JGXsPizYqm2KT/4AfTQntuE0WTtRh/WzX6jqHZ7og5WeiFXzGtgKuq6KNFTDCT+7 83aFiJg5AqZMUOdywsr4ndmHcUw0t4Lwjy9JwvivhG3dMt0LXpkT8cwXrD9rgh3esBfFi4 6Gf79BhPFgD+w8WWPL9Ajp56ILdsNmD3ggURHI+R7nPBTv4sNd6Fa1f6jkKnEQ7ypC2LMu kIVt86YsjYpuPewoCzkqQ53NU09k3WZHUu0fnFokToOcG2kDZe/NHuiXsIDYEOUXAR39Qm tefzdKAVfcIDT8RReGHQkxH1LgYwYkm8hO/7gbMIFCnhjVWsgtnCrQfanRf+kw== 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=1782493178; 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=ZxnWJg8EoOWBfelEwqgyJQKnQMrpM7nk7LjgGWgp+M0=; b=YMA+WaHaRKhDEG9BVCTNO1MsN4fyrQzZf8D/WwoVTZpKIrEv3CU8kq8JyKvTV8WY9cGQ+o N3oJbNCgrVAuptWYlaGdvuAvsACVbnIKZME/3qx1eJbGQ4s+58cDdCqAEAGH1xioFsW6GV GlooMEKZ7LoJ7Ef72yV0PF9uNYWUWDi3doBWXWT1bPD3kwHCui1uHDZVwJ3qbYYoW24FpZ FsrLUtgwBsBgXI8ZhAAYyYwLNPwG6qEtVzg/UgWjxZrbcxKcjWdtiQK/J/buHirBIJZ6pT YWM5zzDR0lHqXMYUgrHR2RpRwVgcg5VED3KnHzxrVxFCIzkyPlp7saK/kpNapg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn22y30vgzmNK for ; Fri, 26 Jun 2026 16:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34944 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: e6b52cea8044 - stable/14 - universe: allow moving build logs to UNIVERSE_LOGDIR 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e6b52cea8044b30718478c16a0ba2de6dadc0fd7 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:38 +0000 Message-Id: <6a3eaffa.34944.566861b2@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=e6b52cea8044b30718478c16a0ba2de6dadc0fd7 commit e6b52cea8044b30718478c16a0ba2de6dadc0fd7 Author: Siva Mahadevan AuthorDate: 2026-05-20 20:05:53 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:55:15 +0000 universe: allow moving build logs to UNIVERSE_LOGDIR This allows `make universe` or `make tinderbox` to build from a read-only src tree. Reviewed by: ziaee, imp, delphij Approved by: lwhsu (mentor), emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55566 (cherry picked from commit 02ef0b6d76e9717b8e3182dd706e23fd2702701d) --- Makefile | 17 ++++++++--------- share/man/man7/build.7 | 7 ++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index ba435813fbed..d24e09d907db 100644 --- a/Makefile +++ b/Makefile @@ -613,8 +613,9 @@ targets: .PHONY .endfor .endfor +UNIVERSE_LOGDIR?=${.CURDIR} .if defined(DOING_TINDERBOX) -FAILFILE=${.CURDIR}/_.tinderbox.failed +FAILFILE=${UNIVERSE_LOGDIR}/_.tinderbox.failed MAKEFAIL=tee -a ${FAILFILE} .else MAKEFAIL=cat @@ -626,9 +627,7 @@ universe_prologue: .PHONY @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.if defined(DOING_TINDERBOX) @rm -f ${FAILFILE} -.endif universe-toolchain: .PHONY universe_prologue @echo "--------------------------------------------------------------" @@ -644,9 +643,9 @@ universe-toolchain: .PHONY universe_prologue TOOLS_PREFIX_UNDEF= \ kernel-toolchain \ MK_LLVM_TARGET_ALL=yes \ - > _.${.TARGET} 2>&1 || \ + > ${UNIVERSE_LOGDIR}/_.${.TARGET} 2>&1 || \ (echo "${.TARGET} failed," \ - "check _.${.TARGET} for details" | \ + "check ${UNIVERSE_LOGDIR}/_.${.TARGET} for details" | \ ${MAKEFAIL}; false) @if [ ! -e "${HOST_OBJTOP}/tmp/usr/bin/cc" ]; then \ echo "Missing host compiler at ${HOST_OBJTOP}/tmp/usr/bin/cc?" >&2; \ @@ -730,9 +729,9 @@ universe_${target}_${target_arch}: universe_${target}_prologue .MAKE .PHONY TARGET=${target} \ TARGET_ARCH=${target_arch} \ ${MAKE_PARAMS_${target_arch}} \ - > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ + > ${UNIVERSE_LOGDIR}/_.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \ - "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \ + "check ${UNIVERSE_LOGDIR}/_.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \ ${MAKEFAIL})) @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`" .endfor @@ -789,9 +788,9 @@ universe_kernconf_${TARGET}_${kernel}: .MAKE TARGET_ARCH=${TARGET_ARCH_${kernel}} \ ${MAKE_PARAMS_${TARGET_ARCH_${kernel}}} \ KERNCONF=${kernel} \ - > _.${TARGET}.${kernel} 2>&1 || \ + > ${UNIVERSE_LOGDIR}/_.${TARGET}.${kernel} 2>&1 || \ (echo "${TARGET} ${kernel} kernel failed," \ - "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL})) + "check ${UNIVERSE_LOGDIR}/_.${TARGET}.${kernel} for details"| ${MAKEFAIL})) @echo ">> ${TARGET}.${TARGET_ARCH_${kernel}} ${kernel} kernel completed on `LC_ALL=C date`" .endfor .for target_arch in ${TARGET_ARCHES_${TARGET}} diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 82d3e3913bce..7badf4d18a2b 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 8, 2025 +.Dd May 20, 2026 .Dt BUILD 7 .Os .Sh NAME @@ -890,6 +890,11 @@ Only build worlds for each supported architecture. Only build kernels for each supported architecture. .It Va WITHOUT_KERNELS Only build worlds for each supported architecture. +.It Va UNIVERSE_LOGDIR +Write all build logs to this directory for each supported architecture. +When invoking +.Cm tinderbox , +also write the summary of all failed targets to this directory. .It Va UNIVERSE_TARGET Execute the specified .Xr make 1 From nobody Fri Jun 26 16:59:39 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 4gn2300w7vz6jmfH for ; Fri, 26 Jun 2026 16:59:40 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn22z5Fzsz4DBY for ; Fri, 26 Jun 2026 16:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493179; 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=72KhoGJghD2rq76LH6leUnYVxY16rceFVYq6GcX31pE=; b=bI38MBHpvbGKtT2gzgMGJ6Fle4yzMnfvWvC8jgZwtsk5W57VOd1bWOabhjFLaDoHQgFSFe nixZq9GMek7Tug5YxgtzuC1cABZmIxlpL8GuV1ugUCKuybecEN0W1gzDWsK0YQ+jNg9Bcm OriEDGGQRGBSuUx9jnn1eT6kd7BXuVVdKEWAPYY+2xJLG4uO17QsyJZ3bEqbesdVz2u+f0 UCsayVw2ZZmQJhHJsqg1iwJm4GJsNGYbvCx+i9Qd034AWYPfu8mUyXwG+HAtCp+75PzeU9 idg8ga9Ntae6h+22frJKjB84Vmnc5byBud7YGIBHOY/LkObB5PRGemOBsvSnJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493179; a=rsa-sha256; cv=none; b=Yaary//SL3JVVU0dwHvRorjSPmP3Ce0zg+eivm4iuhRIbWWk5GbUMIuMXIQYvNoTOPRtq8 irscSM1dp+mirCpJV4FGfIOF6w4yq6b2uzxRiAoUhgl0hsdf9E/NPYtIlUe/+FVu4CGa5I VyRikagvv7BVQirYS/zsQtsZFfPB38E5kJOSbx5KCFR+xL0uFhWvWVWfQd1z5+bfswOpCp pqMsVgPp9A68f6+ZXEIQS80/o7ZnDqved3V9GFWj6xGWHzNvOAhRw+lHQVJXG8Ju7uw8/5 +ttQSRUQCV51otoYjJsDG4JiCSkrPrmR4o75xJdMG1gBnIWj7aPYXB1yaLZLrg== 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=1782493179; 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=72KhoGJghD2rq76LH6leUnYVxY16rceFVYq6GcX31pE=; b=V/CUHXlKsJGWau++JYQKU4AtbANCR4+RDOVWlF5bIkWYGiNSAjzIMJuwW1mhTfQkRQIKWM Rn05m+eze+ZhVsh93gmmK/etw1VFq7RLL9X/5gSjS8EMXbL0pVJxeqPEt4RH7+ZnS07Q7M kANoaJYy5fZPxvA68wrUjqP7Q2L36PYytlZP/lwsunLTDrehRVoTQ6cd06vLP98kSZnYoP PjIS3NSqcPIUhj2UCQJG4ueUSxNBcsa8KZqJjEY1LaqQ6aH6uwPSCDdS4ksAjQsJADBUbF 190j51QeMPUdfEwz+LJhCa0LmvOP7qBX9x5VrhlpTQ4DEgXtyu9mTQp0r5CnMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn22z3q36zmNL for ; Fri, 26 Jun 2026 16:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34a8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: c8dfb30bc001 - stable/14 - universe: emit warning instead of error for bad/missing KERNCONF 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8dfb30bc001976b7dfc3a1ee745771e4b75ab67 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:39 +0000 Message-Id: <6a3eaffb.34a8c.4a52b780@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c8dfb30bc001976b7dfc3a1ee745771e4b75ab67 commit c8dfb30bc001976b7dfc3a1ee745771e4b75ab67 Author: Siva Mahadevan AuthorDate: 2026-05-21 14:08:32 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:55:53 +0000 universe: emit warning instead of error for bad/missing KERNCONF When doing a large `make universe` build with multiple KERNCONFS, it should not be an error when a particular target has a missing KERNCONF. In this example, ``` $ make universe TARGETS='arm64 riscv' KERNCONFS='QEMU VIRT' ``` Currently, arm64 does not have a QEMU conf, and riscv does not have a VIRT conf. However, this command should still succeed instead of failing with the following message: ``` make[2]: /usr/src/Makefile:767: Target architecture for riscv/conf/VIRT unknown. config(8) likely too old. in .for loop from /usr/src/Makefile:761 with kernel = VIRT in make[2] in directory "/usr/src" make[2]: stopped making "universe_kernels" in /usr/src ``` Since the opposite is true, we should build whatever confs are available from the requested list of KERNCONFS, while making sure to still emit warnings along the way. Reviewed by: imp Approved by: lwhsu (mentor), emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55571 (cherry picked from commit c170a96dbeeb3b0d36456d21beee6c551957a456) --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d24e09d907db..4eab18a7dce1 100644 --- a/Makefile +++ b/Makefile @@ -772,12 +772,16 @@ KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \ ${_THINNER} universe_kernconfs: universe_kernels_prologue .PHONY .for kernel in ${KERNCONFS} +.if !exists(${KERNSRCDIR}/${TARGET}/conf/${kernel}) +.warning ${TARGET}/conf/${kernel} missing; skipping. +.else TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \ env PATH=${HOST_OBJTOP}/tmp/legacy/bin:${PATH:Q} \ config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \ grep -v WARNING: | cut -f 2 .if empty(TARGET_ARCH_${kernel}) -.error Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old. +.error Target architecture for ${TARGET}/conf/${kernel} cannot be determined, kernconf file may be invalid! +.endif .endif universe_kernconfs_${TARGET_ARCH_${kernel}}: universe_kernconf_${TARGET}_${kernel} universe_kernconf_${TARGET}_${kernel}: .MAKE From nobody Fri Jun 26 16:59:41 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 4gn2323rczz6jmyn for ; Fri, 26 Jun 2026 16:59:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2321C7Dz4DZ1 for ; Fri, 26 Jun 2026 16:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493182; 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=378OhlRdhnpHexAaHJwHV/7Sj7Vo4jBGY01Tyd/HjEA=; b=ypafuJnxmMaKDJzE57cMO2rvcsy/bbQjcMgduYmP1fDM3SoSGA0HhuP38Bs7wD4HA3BaTT vg8TaP5vhxXt4ZSc0MY9waN31ZS4J9Rra5cBqdyVGcxUDE0QKVOSoG7csxGzQN+ou/If9E io9E9nAwcXmz7xS42ZiLZ5trXd0IMjrq0BsvwW07fgqAQNEl5BbloGwFd+bDMl2kB8Y2kt UCFjsJHOcmjN0EodDDCp4fIjpA7Fu9JG/iVyVH9wcrd12zw0Y1G8PG+Xdr2XqcJZ1ha/pp dH9klVUbARjFFDHJSmkTzNVAnyV7J9+x23fvRvk4TpiBhfOKVT6FAS24TIrE9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493182; a=rsa-sha256; cv=none; b=PmxzQuzujva9y8zD916Lh8YzS7r/CH3ZKLdbzLh7OgXtOoVhk5QHYvQBFPFpbSrIRx68C4 /ON3UgZAfoI+xPC4pIfdUl/xLgzcUyj6/ybNzdraWuOPfOsNyjjpGxUmmjbLEM9Y4pwYL/ DEkUHGIuQN73fB6gXCVVEhgip2C4qXTY1x3ecN+FMrQhVXHcBPLsrmvCC2rvALQMLK2PBO 4mYMLrrZu2TSMiX86tVvVlMMpEJLehCKsMhsp69S9Cpa4eGWNqbIQ/GRikxKrWQYgDKGDM sHfO6JY6e18vtOv+RBPxXTPGYT2TdMETVvagaPuTpYttKhC9WiANGbmXsWxHDg== 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=1782493182; 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=378OhlRdhnpHexAaHJwHV/7Sj7Vo4jBGY01Tyd/HjEA=; b=Uu/5d8lYJ7PkV0IVKwkwo7HxqgSmbaOen0qlqAcOC9piSg5qcqsdn+EZjbnfVnH307E6wT Y4b/jPZy5jstJJJV+D6J6OoZKukV2SLq4Q6KpbJLcoluwGrIQJGbp4ORtwr6zJCWy0dXWi r6RHL63TBZ652NN8GUhqzNiJbg8GjOUrMeFyi4Bo8tjaI7BW8z4IXzYzUf+Eni6vUUHdLj TxEGRwAAbgHYR57kOx83ZTo5TtLwlcSGl7+bPnF/fZBZNY5ygK5ilxpjdcEULAgitFZExF zs1ePPLVevAZemJfOxINnjKewFmdsoZPAe/gyeIRqqenSbTJQX7XbXrCuYVm4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn2315NzYzmR7 for ; Fri, 26 Jun 2026 16:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36701 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 1ae396e2adae - stable/14 - libc: fix strtold NaN representation on riscv 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ae396e2adaebb4fc71d29628789804ac9b0be44 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:41 +0000 Message-Id: <6a3eaffd.36701.14c616ac@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=1ae396e2adaebb4fc71d29628789804ac9b0be44 commit 1ae396e2adaebb4fc71d29628789804ac9b0be44 Author: Siva Mahadevan AuthorDate: 2026-06-10 22:29:02 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:59:48 +0000 libc: fix strtold NaN representation on riscv Regenerate gd_qnan.h on riscv using the qnan.c config tool found in contrib/gdtoa. This fixes the following tests in CI: lib/libc/stdio/scanfloat_test:infinities_and_nans lib/libc/stdlib/strtod_test:strtold_nan Reviewed by: jrtc27 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57405 (cherry picked from commit 1e25cda7f06923d05e28dac8eb1c1c428a5c92dc) --- lib/libc/riscv/gd_qnan.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/riscv/gd_qnan.h b/lib/libc/riscv/gd_qnan.h index 66e48706d6bb..d4e3baeed108 100644 --- a/lib/libc/riscv/gd_qnan.h +++ b/lib/libc/riscv/gd_qnan.h @@ -9,11 +9,11 @@ #define d_QNAN0 0x0 #define d_QNAN1 0x7ff80000 #define ld_QNAN0 0x0 -#define ld_QNAN1 0x7ff80000 +#define ld_QNAN1 0x0 #define ld_QNAN2 0x0 -#define ld_QNAN3 0x0 +#define ld_QNAN3 0x7fff8000 #define ldus_QNAN0 0x0 #define ldus_QNAN1 0x0 #define ldus_QNAN2 0x0 -#define ldus_QNAN3 0x7ff8 +#define ldus_QNAN3 0x0 #define ldus_QNAN4 0x0 From nobody Fri Jun 26 16:59:40 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 4gn2314YDdz6jmwW for ; Fri, 26 Jun 2026 16:59:41 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2306KClz4DWC for ; Fri, 26 Jun 2026 16:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493180; 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=NHoVOX8B1Str1au6jC+mLKCen0CqnrNWYXn8r93fajU=; b=BMj7dxfWRB3+TEE7/XjIjoOkKRKKW7thaBiltbPCRYPZ+qNdPoQ53DTNC/cCMPdG25RFsD tTwmRpB10jgQByODr+a6pFBsrEhp2p0tWNEwoAmXWegE84V4keU5LsTZGVWygZ3+/UP4rG P0F8f521EdnYoA2HoWNbkUFGSbWNMa5L9Wd1CcSe8Y680N/J4KKRhI6Dz1GjElIBkzJjCM 4KC/wb/bmBEqRn6X1iJjS3edmqh8j8ImOKePFIGPrp823zg0vFfslUqNKmVo+yO6XzVZj7 CwOX0tP+4Vz0M+6XtaWHh38LVO9YRTHnZU3rwGfGUaOdSrDVv7UA+hA21x6CPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493180; a=rsa-sha256; cv=none; b=t8tQEMeFjb2rMdTXWZaUBtbsPdQqIIZuvOu7r6U4bHdX2iZmDIaG3poveURY9CwovE+f2e UwrWFgdw75I633tTmacrkBSyo+V4othlcLQAJL9sVFSG4HBnwXi2bHukL5icTjSt8gXoDW W0C8CkVZ30KdGhy2aMaGR0YgrF+DQ+yKmKXeUUGNky4E2fkHKnS8tJ9zuh+Zvs3WSTa/aD qE5p13GMAsZu3cM3AdNpHnXh6Da8S5Bb/CU9BRmrsMpLCOTOIqLz2V9pf1GcA/1VxbVbef rcCqo+Q/PjghjEAvVKlhKgf3Tdf5Fo0eTYMxGNwjBVTZ1fR32+wuN2lVSkkgow== 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=1782493180; 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=NHoVOX8B1Str1au6jC+mLKCen0CqnrNWYXn8r93fajU=; b=CFroJ8Vo2CcFBiH0l/XuL9DWSO5/nfXez8tlz5ZioNdkUk1GS3fBJcLkf+gyrbU1zm8T2t /tHt/u81Ayi1N3iq4OLPQt7aX4wZpoERhEWCyct3UFNdTUZGyxV6uOI8jVLu9kI7cCSBgA 4q02sXo9ixVs3SszFcdtRD6HUHrPQg0Iwk10dJClA58lDJ8FAhFJy1bBhUkec8T4ryFmio 2IVb0Q+iLACorEJvZr6WxXBMNn9wXVjWvB+0SW3MhafzAAbwBRtG1tMx4PjKHGTGctQ8+s IUH+eaYp8xJCfuPgIouHUtf7B8inaF7tce/V5VdoKUQTri4KNnIXrlGBv+oQtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn2304d8WzmNr for ; Fri, 26 Jun 2026 16:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 0c4bafd0333f - stable/14 - ptrace_test: expect PT_STEP tests to fail on riscv 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c4bafd0333f47850d46a96e7deb98a7da387de6 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:40 +0000 Message-Id: <6a3eaffc.32a65.4c7bf088@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=0c4bafd0333f47850d46a96e7deb98a7da387de6 commit 0c4bafd0333f47850d46a96e7deb98a7da387de6 Author: Siva Mahadevan AuthorDate: 2026-05-28 16:32:24 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:56:09 +0000 ptrace_test: expect PT_STEP tests to fail on riscv ptrace_single_step currently returns EOPNOTSUPP on riscv. This temporarily fixes the following CI failures: https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ptrace_test/ptrace__PT_STEP_with_signal/ https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ptrace_test/ptrace__step_siginfo/ Reviewed by: kib Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D57288 (cherry picked from commit a7df326619ef9caa2ed00bf2d103dd278e7b32ec) --- tests/sys/kern/ptrace_test.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index f5350524273b..064c0cfbcf41 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -3615,6 +3615,10 @@ ATF_TC_BODY(ptrace__PT_STEP_with_signal, tc) ATF_REQUIRE(pl.pl_flags & PL_FLAG_SI); REQUIRE_EQ(pl.pl_siginfo.si_signo, SIGABRT); +#if defined(__riscv) + atf_tc_expect_fail("PT_STEP not implemented on riscv, see sys/riscv/riscv/ptrace_machdep.c"); +#endif + /* Step the child process inserting SIGUSR1. */ REQUIRE_EQ(ptrace(PT_STEP, fpid, (caddr_t)1, SIGUSR1), 0); @@ -3732,6 +3736,10 @@ ATF_TC_BODY(ptrace__step_siginfo, tc) ATF_REQUIRE(WIFSTOPPED(status)); REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); +#if defined(__riscv) + atf_tc_expect_fail("PT_STEP not implemented on riscv, see sys/riscv/riscv/ptrace_machdep.c"); +#endif + /* Step the child ignoring the SIGSTOP. */ REQUIRE_EQ(ptrace(PT_STEP, fpid, (caddr_t)1, 0), 0); From nobody Fri Jun 26 16:59:42 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 4gn23361hbz6jn4C for ; Fri, 26 Jun 2026 16:59:43 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2326wnMz4DcN for ; Fri, 26 Jun 2026 16:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493183; 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=zc6KsSK62hBbY9yoy5z77x4+vgFGYisyTKiRVY5oueg=; b=dDPnZErBK8myUKCm/0/abfziVeGRt+G6vGgXtUYYoagL8lymGXR04jw3Z/PjY5BEZ415ov jokq9JHZpOxVWlYk3gnmKlSot6EFth6PfIWXdUTWuaVkdc71d+AwUzPGketQUN+hv7Pn4T f+7PPjZh3EPCqrVAONBT8kPlAkobiD/OLck+zjOpUXQphnAa8EW3paZ6Ta8kmhDFh9ao0v +sc+y1JD6bHn4NDAmSPm93jS0uLIpAlzTX9gnRRuGE+ROAZkV23OyBMjwgVuyVwWb8pL9r rYPsGb4oPt4WrdVSLdmiZAiLPx+qXsaV4PNE2ekOqY/FLjqOXaccwxi8QCLqoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493183; a=rsa-sha256; cv=none; b=MBnubUiPDSczqJKKeSeDfecUZnsyi9xt76sAI/wyWJ+1L2lR7rNnhV+BzrwHGAvSSouXO2 LQHIfPBznCSpdcriz3i95ATIdovmfGgYbBR9vG4F0wX8muwcSSFnPa2F2R+p/JdNGO7yZV mBsL1O9hqDe/7DrAgMJvd4m5m2qTnhvksUzNGJ+t5SzFb89I6YrC9Imsggi/VJsmz/SYbP OrNZYgqOhhwDyQ0HDdsm3uoPGZGo0atuxu7KgY6gp1nmG78DLOlxKPYwmUuBsJ5krr5OpK dKHGff5cfwRWVqrO4qeRRzAHAcod7/LGp3GZmSufMfo2NiSOWIwXnkjNgXOM5w== 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=1782493183; 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=zc6KsSK62hBbY9yoy5z77x4+vgFGYisyTKiRVY5oueg=; b=rTZ1LrH+aAmP2JzJyDScm0pssYhZDtdpxUyFc7mY6WuFKunkxp5iL7W4wlmCiX1ipq+tLs lTqX8tW4BmPsp2uTPpnT7rtJqVoda/bQt8flU57LAAu/Ok6hj0H/vG5PEFKoVqZfWpV0um SeU3t+4f2utsjPYFdnrfyAlErkdNiTODcDfund++pkZtb3EW4u/c179QwjhOlzuf8PZ7ub /g1r62rYER/b+rOOCcdSXt21v5CC7iPjyxkg6yAkrcHobqm2GL7uUe9EyBHwL3m5icUllx 4HujLbgrrFnXv/cenupgHJG4gLi3J7IIoomM6amN5/x3+nYhDjz2ixFyjWppTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn2325sv0zlxf for ; Fri, 26 Jun 2026 16:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 339bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 83344fec91c1 - stable/14 - src.opts.mk: enable OPENSSL_KTLS by default on riscv64 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83344fec91c1978f35da9e5fd0f205085fd1e2f3 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:42 +0000 Message-Id: <6a3eaffe.339bc.3f68bf5f@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=83344fec91c1978f35da9e5fd0f205085fd1e2f3 commit 83344fec91c1978f35da9e5fd0f205085fd1e2f3 Author: Siva Mahadevan AuthorDate: 2026-06-10 22:30:14 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:03:41 +0000 src.opts.mk: enable OPENSSL_KTLS by default on riscv64 1e649491b8567151270095fda3bce8faea394952 enabled KERN_TLS in riscv/conf/GENERIC, but didn't enable OPENSSL_KTLS. This passes all testcases in the sys/kern/ssl_sendfile suite and fixes CI failures seen here: https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ssl_sendfile/ PR: 293810 Fixes: 1e649491b8567151270095fda3bce8faea394952 MFC after: 3 days Reviewed by: gallatin, ngie Differential Revision: https://reviews.freebsd.org/D57316 (cherry picked from commit b61ab2d693c04d4be5468e7db4b03d5777228f95) --- share/man/man5/src.conf.5 | 6 +++--- share/mk/src.opts.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index c0528238b519..bc82020946cc 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd February 23, 2026 +.Dd June 26, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1474,12 +1474,12 @@ is set explicitly) Do not include kernel TLS support in OpenSSL. .Pp This is a default setting on -arm/armv7, i386/i386, powerpc/powerpc and riscv/riscv64. +arm/armv7, i386/i386 and powerpc/powerpc. .It Va WITH_OPENSSL_KTLS Include kernel TLS support in OpenSSL. .Pp This is a default setting on -amd64/amd64, arm64/aarch64, powerpc/powerpc64 and powerpc/powerpc64le. +amd64/amd64, arm64/aarch64, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITHOUT_PAM Do not build PAM library and modules. .Bf -symbolic diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index f3e4f672347e..d79fa75d2d5f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -337,8 +337,8 @@ BROKEN_OPTIONS+=LOADER_IA32 BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA .endif -# Kernel TLS is enabled by default on amd64, aarch64 and powerpc64* -.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" +# Kernel TLS is enabled by default on amd64, aarch64, powerpc64*, and riscv64* +.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" || ${__T:Mriscv64*} != "" __DEFAULT_YES_OPTIONS+=OPENSSL_KTLS .else __DEFAULT_NO_OPTIONS+=OPENSSL_KTLS From nobody Fri Jun 26 16:59:43 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 4gn23444rwz6jn6f for ; Fri, 26 Jun 2026 16:59:44 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2341SmPz4DZG for ; Fri, 26 Jun 2026 16:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493184; 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=WWc+FU5Mwfdj4rYXbp9IyF96X9Fy5DcTv2MHzdAb0w4=; b=UtqQbwYm4/h0Xg/sj+Aok1wDl27X8oT1rn8tXNvAEs7KVJr2+VWaqYKuP/Eg3s5n31NQdc O8n8mB+FuGsBuppcAAa4ePmgJoGFQbROrEw0n6RS3QLXLZ/mM0VgYE7SXJrnA66KzWIByr tMFpegzU+BBiZVo0XpOOJVgH8d/0ofHqPWkd7IOREAwuaSwWumX95tX3wN/9wZHDYF2eN3 n0Rnr15vzxfQBuMvPWNPwMeq+05jUas/MdBmjG7lV76CajkmvspycaR9iozfDixUqPBOwB ZB30wc8o7dY8D79W3QmWn96r4j24qzwTkqKfa+ol2eVqbiat0uB6w4G7Zo6Y1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493184; a=rsa-sha256; cv=none; b=unGiZidmrFcrETiDRzj/oi6Ctjnl0gNj6D2MDFCIcSLTfZGgVWBSOBmCMX68aAJtHWoSyL F6GomWjtoLR5n27uuvJPWD2CMLzpsbJT6Z0P2nPIq8DR8V3oMW8GFuoXdGHBZY47vXC/e2 C7q5s0XqNMFPt+13QI/lLbqIr6iE0mRJjm8hEFdheNb4OIJhLades0QcXhIqvNXup2g/FX RWr9rODE8P0oujp7KaFVhSxPYGkmx1iDoN6QUpwEPmSOGqAltbUNs6zEja8Gr/ZIB+Extm Yg4jU4hpBHeIMmBfY1F6PwrswXTBcnk+tC+67IjQCqhaxXK6AS20zKqeeUys/w== 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=1782493184; 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=WWc+FU5Mwfdj4rYXbp9IyF96X9Fy5DcTv2MHzdAb0w4=; b=P5/LPpAIERbwEhrC7xDtCHEWeBOPp6J2OJs6O6+2d7HcnGtHGjoDEZ63K+M0gR9RrzG3Mv THcROxp4HJ6VOfXe607prNLAxYldrgcpxyh4i1V4Mm83acrDTcFFMWOxXWs636V5jSo1vc 3ypqH6GOedTCNptbCSFL6DCdcZt3m4kVPRpESLYsHDoDLV5kvtq/+qiId8Iw3rrUWuzosw SbCjleF1MJGojKnmiudplB7DqMSHEOdVzZst77TH39kKHAihtZYDhssNWuWx3yIau10l1X 9XuXMbazJWsPpC4n1TyrwdtSqwDv69sOs67sen+hwnRleO4WGG+YPmYC0nBvag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn2336R9MzmNM for ; Fri, 26 Jun 2026 16:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35b9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 97ecf34a94dc - stable/14 - memfd_test: skip hugetlb testcase when large page requests are not supported 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 97ecf34a94dc2fe2ac69afbb1ae7a3d029dfa04a Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:43 +0000 Message-Id: <6a3eafff.35b9b.363c5236@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=97ecf34a94dc2fe2ac69afbb1ae7a3d029dfa04a commit 97ecf34a94dc2fe2ac69afbb1ae7a3d029dfa04a Author: Siva Mahadevan AuthorDate: 2026-06-11 00:08:37 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:04:25 +0000 memfd_test: skip hugetlb testcase when large page requests are not supported Fixes this CI test failure: https://ci.freebsd.org/view/Test/job/FreeBSD-main-riscv64-test/16606/testReport/junit/sys.posixshm/memfd_test/hugetlb/ Reviewed by: kevans MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57289 (cherry picked from commit 64b053f879a8b3c4aa31e1ab99340dfe0ddfea0c) --- tests/sys/posixshm/memfd_test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/sys/posixshm/memfd_test.c b/tests/sys/posixshm/memfd_test.c index 387eca4cafe9..9b4930a56f56 100644 --- a/tests/sys/posixshm/memfd_test.c +++ b/tests/sys/posixshm/memfd_test.c @@ -294,8 +294,11 @@ ATF_TC_BODY(hugetlb, tc) if (!MFD_HUGE_SUPPORTED(pgsize)) continue; - ATF_REQUIRE_MSG((fd = memfd_create("...", - MFD_HUGETLB | MFD_HUGE_FLAGS(pgsize))) != -1, + fd = memfd_create("...", MFD_HUGETLB | MFD_HUGE_FLAGS(pgsize)); + if (fd == -1 && errno == ENOTTY) + atf_tc_skip("large page requests are not supported on the current platform"); + + ATF_REQUIRE_MSG(fd != -1, "Creating a %zu-size hugetlb memfd", pgsize); } From nobody Fri Jun 26 16:59:46 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 4gn23667Ljz6jn4N for ; Fri, 26 Jun 2026 16:59:46 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2362cmdz4DZn for ; Fri, 26 Jun 2026 16:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493186; 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=m64eYRaCRYKeZnZu/0/SFxIF2f0yDlOXTWrV1dymV+Q=; b=tPYfmSx4Mv//WwVitlKFpiBTLry186Y7bwlGlgTn1HriROV57yMY/fd/tL5HyRB4mABcZo miZw8HtDD399OdrEeWUZGsJurYtjvNUrIfM2Ot4cGt8OuT33B0RcOen6zmK7XfPEyU2L/e YwY5wQYTPyayegCSsaB25SiaJpEiz7ycPtkDztt3k2fBbJT8N+S66w8XOhsl6+HmYSJtzu m22zCC9QzYxrcWDc4WFBwu1YwtBsZWUPaBt7kkfmP9ysciZ8076R31hVcOXk4eLRYUTlzH YThLPvtIsLHo139ZoHi6Uj0Kx8hVWY2Fpm47ggyZG7YKfHnRuiIUkqYKkpYDtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493186; a=rsa-sha256; cv=none; b=QJUnf9ap03Zy1fucnPrKBtJC3D0FvY4KJKzMsWSqmGlhblc8yqU+dK7hzEW05CT/Cgk+93 ZEbcpkrIVR++zYGkg+w583zr4Jmv6r7HvB6ndkgKLdKOmzy7LOw0pw//P5SJwO+fQhh6A6 DYEookBKR70DRGTQQnEqzIAYehg9vpymobvR7JloCtKngHw5Riacu/jJDYaVzCZVxrSFSu q4HPXrQhWUXqz7f2TWnZx9s3u8dMqkU00kHRoY6zna7ljN5O8RGJhA1ZqdrT6Of2GcPe9k R+uaEVkxxMym1RupWMN8ExvvoCUYPauxfYdhE+R+tiXy4yICRn77warQsBFikA== 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=1782493186; 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=m64eYRaCRYKeZnZu/0/SFxIF2f0yDlOXTWrV1dymV+Q=; b=bBJOgGh1539riVlZnNCd5pS25ndqrBmB97sMzOSW6u/0peJix6t/xm5lzSjCPPq57YYUkL jbwNs/4p/nzNThncSHHgCmAxkxHFrlRdOTv7EOOlK5ZDfjcY9cz5qF6r1UCTfK1PS1sdgF hYpQ53EwTimDvxZtheK6zcWEVw/kk1f/wtPKyqdSn8WMu98zKqT3zB7L5CKGH6AmJEvEHv 8EjeI0sczeOXd1ywTNl85oJpHIkraCNr1jHxVTDy616+4FwcHR1CZrt4+Wv+GQdS+AKwgM 9CF8qc5ZdQDZGY6WPl3rkyfyiX46fOs3347qFK01xenOpu43wXc6iSoouCd4zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23614RZzmCM for ; Fri, 26 Jun 2026 16:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 675eccc6c396 - stable/14 - tests/sys/netpfil: unskip tests that no longer need to be skipped 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 675eccc6c3962ef905f05a2715f82fab98ff172a Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:46 +0000 Message-Id: <6a3eb002.35e46.794d9541@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=675eccc6c3962ef905f05a2715f82fab98ff172a commit 675eccc6c3962ef905f05a2715f82fab98ff172a Author: Siva Mahadevan AuthorDate: 2025-07-21 13:25:26 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:08:15 +0000 tests/sys/netpfil: unskip tests that no longer need to be skipped All of these are passing consistently in the latest CI environment in 15 back-to-back test runs. Signed-off-by: Siva Mahadevan PR: 260458, 260459, 260460, 264805 Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1788 (cherry picked from commit 6ff78a63d8cd0dd64ae79cbda5cb03572c1e17f5) --- tests/sys/netpfil/common/dummynet.sh | 4 ---- tests/sys/netpfil/pf/forward.sh | 4 ---- tests/sys/netpfil/pf/killstate.sh | 4 ---- tests/sys/netpfil/pf/set_tos.sh | 4 ---- 4 files changed, 16 deletions(-) diff --git a/tests/sys/netpfil/common/dummynet.sh b/tests/sys/netpfil/common/dummynet.sh index ab96bedb1ec0..c732c1c03691 100644 --- a/tests/sys/netpfil/common/dummynet.sh +++ b/tests/sys/netpfil/common/dummynet.sh @@ -265,10 +265,6 @@ queue_body() { fw=$1 - if [ $fw = "ipfw" ] && [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/264805" - fi - firewall_init $fw dummynet_init $fw diff --git a/tests/sys/netpfil/pf/forward.sh b/tests/sys/netpfil/pf/forward.sh index 31abfad82c13..f2eb005529e9 100644 --- a/tests/sys/netpfil/pf/forward.sh +++ b/tests/sys/netpfil/pf/forward.sh @@ -101,10 +101,6 @@ v6_body() { pft_init - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/260460" - fi - epair_send=$(vnet_mkepair) epair_recv=$(vnet_mkepair) diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh index 33995eec6fcc..a4e41e156bf3 100644 --- a/tests/sys/netpfil/pf/killstate.sh +++ b/tests/sys/netpfil/pf/killstate.sh @@ -114,10 +114,6 @@ v6_body() { pft_init - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/260458" - fi - epair=$(vnet_mkepair) ifconfig ${epair}a inet6 2001:db8::1/64 up no_dad diff --git a/tests/sys/netpfil/pf/set_tos.sh b/tests/sys/netpfil/pf/set_tos.sh index bfec61f0d221..a531012eaf65 100644 --- a/tests/sys/netpfil/pf/set_tos.sh +++ b/tests/sys/netpfil/pf/set_tos.sh @@ -129,10 +129,6 @@ v6_body() { pft_init - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/260459" - fi - epair=$(vnet_mkepair) ifconfig ${epair}a inet6 add 2001:db8:192::1 vnet_mkjail alcatraz ${epair}b From nobody Fri Jun 26 16:59:45 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 4gn2352DcNz6jn2G for ; Fri, 26 Jun 2026 16:59:45 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23516JBz4DPM for ; Fri, 26 Jun 2026 16:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493185; 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=OEUPVXHeXMQyGorWlF7YUBcBKF70pdXy5UTDK7ohiJI=; b=YOZO0W683xU8OrhAXxk3KiKTHh/GTQnEn+EftQm2Ihsnk6iWQABEoKAeKsrO8PY1Ct4UyQ 6/7tVGGI0aA7PSo+ZHnNX+hVN6NkNGI8IqBg0FcDBtuU9d5SxDA0q4osvRsmTTv52tvb8F kkTu2VDnPdZg23Gh61ph+u3YSdf0F5xVi1c9SPk5+TFeWcjRkbrdRYu93qrsvfsW8wrLTs KGLUrPyDDcumL4RS8BC2XPYlQ38SqZriJByPou719nwIC79t8dK2jtIBBlRidapQx11Bt5 p10kcRF3kKjXsuMeu3GTMycIntIwag3gXsMZD2FRuJXzYQk2C2HzuSCk3WOkFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493185; a=rsa-sha256; cv=none; b=fF4+r6iXUmYMvyTllsXQc4v72hYYWfk2PLfw871u1P+tAgRdWDVjTCUs24088w4H1oJEaf mUWszq6joh7SqPitfCF3H5wa/OTrs/i9aI6CaYtNLMjrYXtCcDVRQ0YaQzIDyDsc6NPVlH SxVP7HFsXuzh+Fn02aJTqm9dT6k9nU2sbpkoX1+5Eu7SNncQ+sH9pAsgLWk0omDfz2B/Lf W11sdyVcKeFuF/qxuSS/efwlI0t+2SPdIRJIgx7MvNx2TyCRO+HV/xAorpczeFEKy9jmRn 6Yk6RYd4MSIEfiqSFHzhDRjIi6GJ2AyzvuFboqBMgYqCB0HWriD3jzHqcFfEkA== 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=1782493185; 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=OEUPVXHeXMQyGorWlF7YUBcBKF70pdXy5UTDK7ohiJI=; b=AP8xE0O9b/n2KqFM+FX9t2/ZxhjpneoUUsTstgH8yLpvsq+eORX0Sb0PkI93iimQDT3P03 /NQwRtzoZUBZuhOsXBunpGa263hyv8a13jq34AuzC8jMLAx7FT10U2KQlGQLEey8y8XWAI GtoK/1YkwL2wGpXKNSrvGiGcoP29n2x50mfrYDIiVFknv5cbNGzqtfIVmgkPUfns5q8Udu 5ivTX1PtGDRsiggPt+R6ZQC+ruqk3LbkaNkIKgtfpe6u+gd9wkTvqlVKJkX6DSqgW9i/xx 32siUnysJ72nJMO8a/nm6HBcHCKqgzfSmfwvkK3a4k41jzqPtVRcq3LEruaieg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23505CkzmNs for ; Fri, 26 Jun 2026 16:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32b6e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 0b6f420611fa - stable/14 - tests/sigtramp_test: xfail on non-amd64 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b6f420611fae6a9dbeb07ae6376049bfe2d408c Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:45 +0000 Message-Id: <6a3eb001.32b6e.7b0195e6@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=0b6f420611fae6a9dbeb07ae6376049bfe2d408c commit 0b6f420611fae6a9dbeb07ae6376049bfe2d408c Author: Siva Mahadevan AuthorDate: 2026-06-15 22:09:05 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:04:30 +0000 tests/sigtramp_test: xfail on non-amd64 This test fail until at least https://reviews.llvm.org/D155066 is rebased and picked up for aarch64 and more work is done for the other archs. PR: 289096 Reviewed by: jlduran Fixes: fef84fd8ae845e19cec0f6b9aac0e6451cca3d7a MFC after: 3 days (cherry picked from commit 0010c4b8a020dbeb81e61b71117d1caae9b044cc) --- lib/libexecinfo/tests/sigtramp_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libexecinfo/tests/sigtramp_test.c b/lib/libexecinfo/tests/sigtramp_test.c index ab90f49c24a5..d5632df8aa92 100644 --- a/lib/libexecinfo/tests/sigtramp_test.c +++ b/lib/libexecinfo/tests/sigtramp_test.c @@ -45,12 +45,12 @@ handler(int signum __unused) ATF_TC_WITHOUT_HEAD(test_backtrace_sigtramp); ATF_TC_BODY(test_backtrace_sigtramp, tc) { -#if defined(__aarch64__) +#if !defined(__amd64__) /* * https://reviews.llvm.org is deprecated and * this review is never going to be updated or completed */ - atf_tc_expect_fail("https://reviews.llvm.org/D155066"); + atf_tc_expect_fail("https://reviews.llvm.org/D155066 and https://bugs.freebsd.org/289096"); #endif struct sigaction act; From nobody Fri Jun 26 16:59:47 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 4gn2380D0Fz6jn2R for ; Fri, 26 Jun 2026 16:59:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2373fRzz4DZw for ; Fri, 26 Jun 2026 16:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493187; 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=VhjCvoZaaJpWEiVbUd3lcdm44ZfSnjfaZyLmzlQ3gXI=; b=nZCdSFtXfVzf6CMCERqHl/Q9lXF3UawWeiNN2vyFzVDeLOCzjizPoKnCsbeRTA+a4njZm9 HAckDhC3+BmNapt63owMXhyhs9HhPkOjEg8VlVgmJbsHzCyQeNBfCH2Xzdqd2Vo/DXM0lw JpeD45JSlU3r34POB5Pm9VwyL7CipQ16xz2dI8yfJsLD92+aU67fAciOlVYydfY+vsD7E6 jgtyylv22gwoJTHr2KqdKiaAxFO4Mk+z9+fBhVe2ksom74DoBElocO4lVlwckwO53Sflgi Ocv9bgYm+OgmU58fP71smWlWIV3vOsJUCaipXkmRUwktBL9NcKtx+hPrveKWBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493187; a=rsa-sha256; cv=none; b=wWN8iCwYr5uiZybrHzGZQW4wjuvFAU6iUrt4bncuJSGFKN5mWzQOf+f0qyGY6Q2/c3jOQa gudAoajxe7pbcdHgZwhNdmNFfkQ4FcTfLARQR6cuScnb267R1IzLR8kazoOcd9uHhNe9kB xa3CVLw9dCibbhrhj+NksemY7F0rFdinmSapfLPstDqzR+l9gpsNQ3wMPfr2hmLU5U5w8n r1AjBz+9GkuxAJGNOFqKtQT/0V40SI6TnWlvqapL7BaNLMSHwV2sIPBDTzbptHpdgzZKf1 fuZ2Yu3Jgx1QN9YWqNbtnLAn7wAZgiLeFTgjiI/pd0H6qnXsGjAn2aQE5QOnFQ== 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=1782493187; 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=VhjCvoZaaJpWEiVbUd3lcdm44ZfSnjfaZyLmzlQ3gXI=; b=rrh4X0IoOt1VtSwRwTRQwQy9DSaScu+NmBTGA++MPRrjRRV8yaUXo/vuaI+tKAMIFljePC tP+Idl81aNzxf/+AcC8zHYoi9OLtNzCC0bd/DIFv5xEa7IDskZGo8DkTK/gHBeJn25J8Ec 9h0q/Udaqa6q5crU7npTUqOK8SL6esP72z4NMwTWgrzRayZ1y+0K2kaZ7AtRlK1xG97smB Cbc1jRxiPd0YZmpXMysBAdm577QXoiptkvr2xYIjAqScGDaKjZWFCnjISSxF6tyErjpBzo 242bA229Gf9XjtT0/KJdKT7YNcARz/Qr1SQMcgZrLjsfdphptJlEFUVvBkekgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23720RgzmNw for ; Fri, 26 Jun 2026 16:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 347a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 2fb507fafbba - stable/14 - cap_net/net_test: require 'allow_network_access' 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fb507fafbba5d1c9518f2b9d6ee7c9ddbfbde6b Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:47 +0000 Message-Id: <6a3eb003.347a5.35577aa5@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb507fafbba5d1c9518f2b9d6ee7c9ddbfbde6b commit 2fb507fafbba5d1c9518f2b9d6ee7c9ddbfbde6b Author: Siva Mahadevan AuthorDate: 2025-07-18 13:20:19 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:08:31 +0000 cap_net/net_test: require 'allow_network_access' Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1779 (cherry picked from commit df88c711a26c04192761e96dc08a6f3f9e42afed) --- lib/libcasper/services/cap_net/tests/net_test.c | 168 ++++++++++++++++++++---- 1 file changed, 140 insertions(+), 28 deletions(-) diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index dcb897de467b..dac7aa31a0f9 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -332,7 +332,11 @@ test_extend_mode(cap_channel_t *capnet, int current) } } -ATF_TC_WITHOUT_HEAD(capnet__getnameinfo); +ATF_TC(capnet__getnameinfo); +ATF_TC_HEAD(capnet__getnameinfo, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__getnameinfo, tc) { cap_channel_t *capnet; @@ -345,7 +349,11 @@ ATF_TC_BODY(capnet__getnameinfo, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__connect); +ATF_TC(capnet__connect); +ATF_TC_HEAD(capnet__connect, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__connect, tc) { cap_channel_t *capnet; @@ -357,7 +365,11 @@ ATF_TC_BODY(capnet__connect, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__bind); +ATF_TC(capnet__bind); +ATF_TC_HEAD(capnet__bind, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__bind, tc) { cap_channel_t *capnet; @@ -369,7 +381,11 @@ ATF_TC_BODY(capnet__bind, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__getaddrinfo); +ATF_TC(capnet__getaddrinfo); +ATF_TC_HEAD(capnet__getaddrinfo, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__getaddrinfo, tc) { cap_channel_t *capnet; @@ -387,7 +403,11 @@ ATF_TC_BODY(capnet__getaddrinfo, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__gethostbyname); +ATF_TC(capnet__gethostbyname); +ATF_TC_HEAD(capnet__gethostbyname, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__gethostbyname, tc) { cap_channel_t *capnet; @@ -399,7 +419,11 @@ ATF_TC_BODY(capnet__gethostbyname, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__gethostbyaddr); +ATF_TC(capnet__gethostbyaddr); +ATF_TC_HEAD(capnet__gethostbyaddr, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__gethostbyaddr, tc) { cap_channel_t *capnet; @@ -412,7 +436,11 @@ ATF_TC_BODY(capnet__gethostbyaddr, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__getnameinfo_buffer); +ATF_TC(capnet__getnameinfo_buffer); +ATF_TC_HEAD(capnet__getnameinfo_buffer, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__getnameinfo_buffer, tc) { cap_channel_t *chan; @@ -451,7 +479,11 @@ ATF_TC_BODY(capnet__getnameinfo_buffer, tc) cap_close(chan); } -ATF_TC_WITHOUT_HEAD(capnet__limits_addr2name_mode); +ATF_TC(capnet__limits_addr2name_mode); +ATF_TC_HEAD(capnet__limits_addr2name_mode, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_addr2name_mode, tc) { cap_channel_t *capnet; @@ -482,7 +514,11 @@ ATF_TC_BODY(capnet__limits_addr2name_mode, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_addr2name_family); +ATF_TC(capnet__limits_addr2name_family); +ATF_TC_HEAD(capnet__limits_addr2name_family, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_addr2name_family, tc) { cap_channel_t *capnet; @@ -527,7 +563,11 @@ ATF_TC_BODY(capnet__limits_addr2name_family, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_addr2name); +ATF_TC(capnet__limits_addr2name); +ATF_TC_HEAD(capnet__limits_addr2name, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_addr2name, tc) { cap_channel_t *capnet; @@ -581,7 +621,11 @@ ATF_TC_BODY(capnet__limits_addr2name, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_deprecated_addr2name_mode); +ATF_TC(capnet__limits_deprecated_addr2name_mode); +ATF_TC_HEAD(capnet__limits_deprecated_addr2name_mode, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_deprecated_addr2name_mode, tc) { cap_channel_t *capnet; @@ -610,7 +654,11 @@ ATF_TC_BODY(capnet__limits_deprecated_addr2name_mode, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_deprecated_addr2name_family); +ATF_TC(capnet__limits_deprecated_addr2name_family); +ATF_TC_HEAD(capnet__limits_deprecated_addr2name_family, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_deprecated_addr2name_family, tc) { cap_channel_t *capnet; @@ -661,7 +709,11 @@ ATF_TC_BODY(capnet__limits_deprecated_addr2name_family, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_deprecated_addr2name); +ATF_TC(capnet__limits_deprecated_addr2name); +ATF_TC_HEAD(capnet__limits_deprecated_addr2name, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_deprecated_addr2name, tc) { cap_channel_t *capnet; @@ -713,7 +765,11 @@ ATF_TC_BODY(capnet__limits_deprecated_addr2name, tc) } -ATF_TC_WITHOUT_HEAD(capnet__limits_name2addr_mode); +ATF_TC(capnet__limits_name2addr_mode); +ATF_TC_HEAD(capnet__limits_name2addr_mode, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_name2addr_mode, tc) { cap_channel_t *capnet; @@ -745,7 +801,11 @@ ATF_TC_BODY(capnet__limits_name2addr_mode, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_name2addr_hosts); +ATF_TC(capnet__limits_name2addr_hosts); +ATF_TC_HEAD(capnet__limits_name2addr_hosts, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_name2addr_hosts, tc) { cap_channel_t *capnet; @@ -798,7 +858,11 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_name2addr_hosts_servnames_strict); +ATF_TC(capnet__limits_name2addr_hosts_servnames_strict); +ATF_TC_HEAD(capnet__limits_name2addr_hosts_servnames_strict, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_name2addr_hosts_servnames_strict, tc) { cap_channel_t *capnet; @@ -830,7 +894,11 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts_servnames_strict, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_name2addr_hosts_servnames_mix); +ATF_TC(capnet__limits_name2addr_hosts_servnames_mix); +ATF_TC_HEAD(capnet__limits_name2addr_hosts_servnames_mix, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_name2addr_hosts_servnames_mix, tc) { cap_channel_t *capnet; @@ -883,7 +951,11 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts_servnames_mix, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_name2addr_family); +ATF_TC(capnet__limits_name2addr_family); +ATF_TC_HEAD(capnet__limits_name2addr_family, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_name2addr_family, tc) { cap_channel_t *capnet; @@ -942,7 +1014,11 @@ ATF_TC_BODY(capnet__limits_name2addr_family, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_deprecated_name2addr_mode); +ATF_TC(capnet__limits_deprecated_name2addr_mode); +ATF_TC_HEAD(capnet__limits_deprecated_name2addr_mode, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_deprecated_name2addr_mode, tc) { cap_channel_t *capnet; @@ -973,7 +1049,11 @@ ATF_TC_BODY(capnet__limits_deprecated_name2addr_mode, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_deprecated_name2addr_hosts); +ATF_TC(capnet__limits_deprecated_name2addr_hosts); +ATF_TC_HEAD(capnet__limits_deprecated_name2addr_hosts, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_deprecated_name2addr_hosts, tc) { cap_channel_t *capnet; @@ -1012,7 +1092,11 @@ ATF_TC_BODY(capnet__limits_deprecated_name2addr_hosts, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_deprecated_name2addr_family); +ATF_TC(capnet__limits_deprecated_name2addr_family); +ATF_TC_HEAD(capnet__limits_deprecated_name2addr_family, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_deprecated_name2addr_family, tc) { cap_channel_t *capnet; @@ -1066,7 +1150,11 @@ ATF_TC_BODY(capnet__limits_deprecated_name2addr_family, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_bind_mode); +ATF_TC(capnet__limits_bind_mode); +ATF_TC_HEAD(capnet__limits_bind_mode, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_bind_mode, tc) { cap_channel_t *capnet; @@ -1098,7 +1186,11 @@ ATF_TC_BODY(capnet__limits_bind_mode, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_bind); +ATF_TC(capnet__limits_bind); +ATF_TC_HEAD(capnet__limits_bind, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_bind, tc) { cap_channel_t *capnet; @@ -1123,7 +1215,11 @@ ATF_TC_BODY(capnet__limits_bind, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_connect_mode); +ATF_TC(capnet__limits_connect_mode); +ATF_TC_HEAD(capnet__limits_connect_mode, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_connect_mode, tc) { cap_channel_t *capnet; @@ -1155,7 +1251,11 @@ ATF_TC_BODY(capnet__limits_connect_mode, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_connect_dns_mode); +ATF_TC(capnet__limits_connect_dns_mode); +ATF_TC_HEAD(capnet__limits_connect_dns_mode, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_connect_dns_mode, tc) { cap_channel_t *capnet; @@ -1187,7 +1287,11 @@ ATF_TC_BODY(capnet__limits_connect_dns_mode, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_connect); +ATF_TC(capnet__limits_connect); +ATF_TC_HEAD(capnet__limits_connect, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_connect, tc) { cap_channel_t *capnet; @@ -1231,7 +1335,11 @@ ATF_TC_BODY(capnet__limits_connect, tc) cap_close(capnet); } -ATF_TC_WITHOUT_HEAD(capnet__limits_connecttodns); +ATF_TC(capnet__limits_connecttodns); +ATF_TC_HEAD(capnet__limits_connecttodns, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_connecttodns, tc) { cap_channel_t *capnet; @@ -1280,7 +1388,11 @@ ATF_TC_BODY(capnet__limits_connecttodns, tc) } -ATF_TC_WITHOUT_HEAD(capnet__limits_deprecated_connecttodns); +ATF_TC(capnet__limits_deprecated_connecttodns); +ATF_TC_HEAD(capnet__limits_deprecated_connecttodns, tc) +{ + atf_tc_set_md_var(tc, "require.config", "allow_network_access"); +} ATF_TC_BODY(capnet__limits_deprecated_connecttodns, tc) { cap_channel_t *capnet; From nobody Fri Jun 26 16:59:48 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 4gn2391qPTz6jmwk for ; Fri, 26 Jun 2026 16:59: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2384g32z4DQ3 for ; Fri, 26 Jun 2026 16:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493188; 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=pAo5pINrPgw+VmN7W54krDgU5w8KtA3rEpyJPeUc1PI=; b=a9oomYL2D49nRMFN/c0tiNQIQUiFBd1dzfABieIVV/lB7gdefmyseFJT6I9FFeAOQLZkQ1 M8snWKUVPhEU8r5opBlSNHpaMHMo/D57Eh9O4FpexI7YkpZLSAJ6OGgua+WytKo87us/0U KNJMXJECU6rYS2LM/7DcVMMYUcUb0/yn0nD7VwtwCA5HeVzIVy2K5R1jEFvN2izXsFNO7I 5BE+jj0gBtizY+AwGDRv6LPCcFVQdrwO8JARhBEoy/tqxCrWwMVAMIxZgdlj5ZENmNBrTt EmmYAJbiWVYSIeP2joBxfNF/8js6XRUlL60qqVtukjhPHOw1yHL6d6T6BzecHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493188; a=rsa-sha256; cv=none; b=pztI0ViBlUpCxh4iP/oylB+Z6u3N7pczYKVtq2jmX/O+FgJT6M1ArdSzYrNEkDeUGCbxIY jYL0s8qiqhNQY30s3QC/16iIKG3HHwHsQGKaXwSNWZtB2OwC/bR2oTvhrp6K+8NEnbYWwu 4yHYxBhHgsWxVt3ZEK5ney3HteCxHfmpGXDd3gHRwYfmz30WZJMFRjVTZ0itGEA4bPo1J/ FfQarLjhEQenymQAPu23yj1tp1XrFvwgNglnvqidvjoCxHuntSR5soUD65S9Jt7nN6azKO MKF2eNm7sNgn5GEZ03OXRjYzjHX2snd+tI7bZhdEcdnjPyMKGLVCbg2GhkKLIg== 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=1782493188; 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=pAo5pINrPgw+VmN7W54krDgU5w8KtA3rEpyJPeUc1PI=; b=H/0mKpeMYKJWFcieQkQU9FJ89XuaSmgyopSqMwank+jRb8aevcO0Q3+dP10uuWyQ6E65Ew T3V5kQwx/THM+1dpAYVBr472PjVb2j/4KHwzVLaqXb7jXA52zeuCmffH+11kiY7m/mO5LN oDOCcuei7elPA6eKKd5gcaug/y10fd5AcqiOWrhO9/ATkUqcu/1Cd/BlXVW5k+LS7ikIsZ QojKDo0OecKKRgaTreIYWN7vRDZaQVf2gQWZkBSYDDIVuTHVV9xYkN2y1admDOXQubWaYn Mta0eVhW4ClZkqVaRWCYrYUN1ssup9iFh4/Gmdr8cckRXhLW4vP53Hf8CQvhmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn2382m1Jzm7Q for ; Fri, 26 Jun 2026 16:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 0bc4bed347ed - stable/14 - tests/mac_portacl: enable is_exclusive for now 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0bc4bed347ed9e9cf1d396d187c6273316a7c5d2 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:48 +0000 Message-Id: <6a3eb004.32a69.5c81ed39@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=0bc4bed347ed9e9cf1d396d187c6273316a7c5d2 commit 0bc4bed347ed9e9cf1d396d187c6273316a7c5d2 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:08:51 +0000 tests/mac_portacl: enable is_exclusive for now Both tests rely on ports 77 and 7777 to be available and thus cannot be run concurrently. This is a temporary measure to ensure that they don't conflict with each other. In the future, these should be rewritten to wait until the necessary ports are available, or deterministically select a free port instead. Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1790 (cherry picked from commit 5dadfac51c3876b0ba6fde831cb4417594167fed) --- tests/sys/mac/portacl/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile index a26ff4a7c80a..8e23775c62c8 100644 --- a/tests/sys/mac/portacl/Makefile +++ b/tests/sys/mac/portacl/Makefile @@ -12,6 +12,7 @@ TAP_TESTS_SH+= root_test TEST_METADATA.$t+= required_kmods="mac_portacl" TEST_METADATA.$t+= required_user="root" TEST_METADATA.$t+= timeout="450" +TEST_METADATA.$t+= is_exclusive="true" .endfor .include From nobody Fri Jun 26 16:59:49 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 4gn2396cm7z6jn08 for ; Fri, 26 Jun 2026 16:59: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2394btJz4DdZ for ; Fri, 26 Jun 2026 16:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493189; 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=icPFfzIIR7JzIk1CrdA+Zd6Soq+2YLxy8PcYb3WupGQ=; b=tWimF1Ph1zlP1AeDdZzKi6J9qW6WKKwo1uZVxgZfwAOLmwYcHdfvJ+C/onVWRECG/tHsfu 3lVLzxBwSmkVlXzVnW60EpyclfN0+ChziRvim2QNpOqUnKwDOxT9mPQBjbv4uIQSINK97a 203v3Rwi3xpiV5WUnjmG1cd9OwFo9AGxytr0mXPcPkoXuuy6YFuBuC9tjI3HvjAOfcFLdt nAv2BmNMc1ztN5rgDGTUyHqaoz79roeVOli/D8VvO2LbyP/+EFQYl4InfW93OWyhwB6hMl J+1c48loO5t6ug3aMT2UZ5m9zWFsAGzZ4hVXQ7lMqnHjwvo2R3J/yQuzQVNr6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493189; a=rsa-sha256; cv=none; b=uJ6Nv1kwqpH0gB2fJl2LFxdxDlzubSF2JnSJKVASKhGs1vg3ccm6vnQuNPDUhUYvj3SUrR d+A+LI4Pe9mnEhH/UKh/kkWbLrW8e43b/11NStcxwzRsKwkqdmdzsBTkJJCcnggJevDBAE 5tgRcdJiOBHi1Tg1wR/FXbrRUxjGmbEsNAelznwkFFISJOFTCblyUc6rEh6FrbuqJ1MENO TVNEJQGIVtxabeoP8XjooANisnX5raMpNQZ0/iG+3PieblpyRa+YIyIPnP84v9h0+EF8ZK g507T80dEKjRgKnpBMMN+0dhiZkqLjFtH1ACEtnUkOytorQFGkDxCf1nSPqrMQ== 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=1782493189; 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=icPFfzIIR7JzIk1CrdA+Zd6Soq+2YLxy8PcYb3WupGQ=; b=XfXPlvTIrUQXjA+7JssW4eZt/kld7yBIbcif4lvDCi2Fi7gls+MVa2I65p4ZwHWh9PVlky EZ13hziIzd110Gcwmh4JViiLdwuIN/uH+OqkM+aC9k1ICgbc3wzMB6bUL1Cv00PEvIskVe skukyu3kvSRdodPPCvw33jp5Isct0EpL7qxml60FVBJWwwE5z9mERj9VHsqoVrjOdGdRdU tuAJV0OHrouH3m4rYAR9018vRCezRFKNsvuf1S0Aj0Trn5bqFPrFjhM9zPa7HItrox4hAB FvJc+SuE+CYKa32O4IisbkdvuS2wc+k1yVPvDJ9MqNERblKmBWykhtamAj/6lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn2393X54zlh5 for ; Fri, 26 Jun 2026 16:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b35 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 77200838f378 - stable/14 - tests/fibs_test: unskip udp_dontroute6 testcase 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 77200838f3780aeb6f8d072770680617fd4f6e13 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:49 +0000 Message-Id: <6a3eb005.33b35.1721fd84@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=77200838f3780aeb6f8d072770680617fd4f6e13 commit 77200838f3780aeb6f8d072770680617fd4f6e13 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:09:04 +0000 tests/fibs_test: unskip udp_dontroute6 testcase This test now consistently passes (300+ consecutive runs). Signed-off-by: Siva Mahadevan PR: 244172 Sponsored by: The FreeBSD Foundation (cherry picked from commit e93e57d3da2ea54598b5db01cc12a3acd656faba) --- tests/sys/netinet/fibs_test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/sys/netinet/fibs_test.sh b/tests/sys/netinet/fibs_test.sh index b58a45b26f3e..794d22a3882b 100644 --- a/tests/sys/netinet/fibs_test.sh +++ b/tests/sys/netinet/fibs_test.sh @@ -661,9 +661,6 @@ udp_dontroute6_head() udp_dontroute6_body() { - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/244172" - fi # Configure the TAP interface to use an RFC3849 nonrouteable address # and a non-default fib ADDR0="2001:db8::2" From nobody Fri Jun 26 16:59:51 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 4gn23C75m6z6jmfq for ; Fri, 26 Jun 2026 16:59:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23C5JN5z4DjW for ; Fri, 26 Jun 2026 16:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493191; 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=ScQ9aVxwogjN7dQQCWWnnLra0m1CROvlQI7pBQcFMXA=; b=A0t7kdt3fp17TnL0+46PSXMuVKTzCJ9cCMM04TlEjEYwAOj58P19rfm7QHJ68bvCWu+emR DscWV+ssIb/Lt9jgiZ+nL9LNwiRcxIy0wNYWO88rGP7TkCC5dAyNKixt0UmmhBfVWatOgS 9J5D8eUWEoKcIwWGeZSnvHBAecAuSnmH9uaBNxMZq8lKtsWrZUj1EwpMampG9MP9bJ9bYR GigTtjAOi2ZmqGH2+jL93swo9bDNlQagWzf3gGy26TE8vwgnWLTt3+GnltkC56+3rQDlmR fbZ5bFNOE78MzA7MUMNAlgHjg1UxGzHbT9FuqJAAvrlTHDf8DFpfA3NsbQrJiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493191; a=rsa-sha256; cv=none; b=aeaaEnQYTfGxc4Dc5SM2tjk0AL9af4w31JU5+HvSVrj190dSgZK6EfK3vP3m1M9cro7+1l m1MBwNJzf6UYiQxUH0oytiPIIzwLkSeXI7phEB5+lXb+zUVnegGocCt25lwELLaE7UoXcL 4+49ydxyNk8m/m2cg0+bKPYMjclSDVOSl0dc6om285le94LIUb3Z2jD4UgfB5k7TxTwt6D R4WusnMLVAuzdpYIHoG1R/OtryJtLHrU+2fYtKc5xwehFp/pre1D8qfGPF4ezhEMEdYX40 nxsfd8v6mvF04g+IqQ5STIeRsRHa46Wlj+tQf9CbldPkgcnzyhulFrTrwIL20A== 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=1782493191; 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=ScQ9aVxwogjN7dQQCWWnnLra0m1CROvlQI7pBQcFMXA=; b=yQVovSn9GISjX1H94via4/BlcvyNTZGw1qWkDQ+LOJ+xPQOkP0CBmyg/H6zLyXmjcgC1E9 lhvFbWRYj6Egt2wgCSJZ7ssL7hHi6v/vF3zULKC+LIK+rfGYBi4a/jGX5QshvCC/Q5vXHZ 2Lz8T/9AeKqgnoN0Wgx/IzvdcuMFLYwQ27PjUxMWbGwt2n6hXn6etKw/jOl9+Ht4/7Iqu9 VaHQ52QjmJVb7Kd3AnFXCJsfKE8Rx2WYmHRUyfCjwVW/Na9fV19yem2G8YAW6kr+I/VRPn JdX4vtPvbjNt5P0M4ArUOWEn3kT13X10r0JIg/2JuocHPhBkRYTvHXdhTDriWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23C4NX6zmNQ for ; Fri, 26 Jun 2026 16:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3427e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: d4459e2df050 - stable/14 - Unskip test sys.netinet6.frag6.frag6_07.frag6_07 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4459e2df0505573098d2e275566d61edaccf04f Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:51 +0000 Message-Id: <6a3eb007.3427e.5c7734b9@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=d4459e2df0505573098d2e275566d61edaccf04f commit d4459e2df0505573098d2e275566d61edaccf04f Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:09:16 +0000 Unskip test sys.netinet6.frag6.frag6_07.frag6_07 This is now consistently passing with 100+ consecutive runs. Signed-off-by: Siva Mahadevan PR: 244170 MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 681e9d3e391f30a512c523514f69a63c9782a901) --- tests/sys/netinet6/frag6/frag6_07.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/sys/netinet6/frag6/frag6_07.sh b/tests/sys/netinet6/frag6/frag6_07.sh index 09c82102b9b0..6189314013fd 100755 --- a/tests/sys/netinet6/frag6/frag6_07.sh +++ b/tests/sys/netinet6/frag6/frag6_07.sh @@ -218,9 +218,6 @@ frag6_07_head() { } frag6_07_body() { - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/244170" - fi frag6_body 7 frag6_07_check_stats } From nobody Fri Jun 26 16:59:50 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 4gn23C0nmxz6jmwn for ; Fri, 26 Jun 2026 16:59:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23B563Fz4Dbd for ; Fri, 26 Jun 2026 16:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493190; 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=wTNyknhTYTVDVBmzQdpFxJMW9BdJMofcpSBJRadBkdA=; b=dEZIl4nOO3OxAV+aC44b8kH3zNT1rX7QyGQ+v2WrgLrD4cnNTqHF8tRyx4ZhLcgsGztMqQ jYma+edfLkS4LLUIy7hvjuqEXg7vcxWlG87jSn2f7AaMNSi7SCC7K9p9ckfA4XcogmYucb OXXJDgWHdVuHPPh2joEvbcoYDu/ZqEBL7iz/7fR3hx3DAku58IglnUEcPN8X45E3iZiu29 a0peq7unwwchBsk8t9GSPF7YNE6GA0advr7XKnN0q3FI45X9d9noWzsnDB4CTNMwdEDIL2 Qt/mnbyp+IC2qeO/qszT/M9KuGubwmxXKsmHBCzJMtXtrXdbDhxpEVRm/W4yaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493190; a=rsa-sha256; cv=none; b=R59/+fexwkht/OuKMDX1wNnOYjKbvax1Bh0AS1w1ydKpGsAVQYJxEtCMsmARHgH9qfKjMH ZuEuEBzedHqt7QtzZk+sCqL/ztEExFKkoRWSZXKFDqejrMBhfgaQ0Jm4zaqjvD9xBiFyod jfL67dOlapEoF34P2ZMYswiQIewhiDgMgOa2KAxkLmtM8YHljn6RLfkdxBkCukI1XBTE8A wSUwUfl7eLhnHuQLZR7dO3a1hvf+9jkP3VlO53tqyR8vOOkSvTUdYjOGDgQH/rAuYuX8Ns ssfbWTAkFOvOH2bHfvbniHmQbieLfiBdO+cyDNfRIoMvOgc1XzBCcxWhRD7KyQ== 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=1782493190; 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=wTNyknhTYTVDVBmzQdpFxJMW9BdJMofcpSBJRadBkdA=; b=iu2NmuuWcPM0gKauteFvdTQSrXJCTYGQqC8+tTc2LkcJZ1DiG4uyY+AYuOnFDVrOh78S3d UlEH9AtMIDsOOAiX+e4o19hNoa6yGcMwKK8FSf03iLW0UGdyzPIu4DhJoBO6425jfHW5yR seaLeZKxSOh+q6FmI76nT0a81/mXTFlN+kqR0Iqv0Sd1CHVlXYELwYDt25GJXYrA1IhjOv DoxoSbRjqwFALef8rn1gF2UwYTksYLiK1Qjgd23UV1/8b/VznAkezBf3RSAMClmM6U37Ix z2sJOgmKPZfGYjUoOkwAckAz4uLl1m74aOWYEdH6+5ADvbiJlMwP6LASnIT+Tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23B42knzmRC for ; Fri, 26 Jun 2026 16:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33a1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 73ff854c205a - stable/14 - tests/if_lagg_test: unskip 'witness' testcase 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73ff854c205a8718d71532b683ea86160b5769be Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:50 +0000 Message-Id: <6a3eb006.33a1f.1efd8784@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=73ff854c205a8718d71532b683ea86160b5769be commit 73ff854c205a8718d71532b683ea86160b5769be Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:09:11 +0000 tests/if_lagg_test: unskip 'witness' testcase This testcase passes consistently (in 100+ runs) now. Signed-off-by: Siva Mahadevan PR: 244163, 251726 MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 7a83fedc116d827cc9c6d8e049b785f1d7b68dcd) --- tests/sys/net/if_lagg_test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/sys/net/if_lagg_test.sh b/tests/sys/net/if_lagg_test.sh index 8484470c54ee..ecf1cf1ccdc5 100755 --- a/tests/sys/net/if_lagg_test.sh +++ b/tests/sys/net/if_lagg_test.sh @@ -412,9 +412,6 @@ witness_head() } witness_body() { - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/244163 and https://bugs.freebsd.org/251726" - fi if [ `sysctl -n debug.witness.watch` -ne 1 ]; then atf_skip "witness(4) is not enabled" fi From nobody Fri Jun 26 16:59:53 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 4gn23G1gQ8z6jmfw for ; Fri, 26 Jun 2026 16:59:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23F70BSz4Dll for ; Fri, 26 Jun 2026 16:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493194; 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=uQSatwZ0equ4VnpIwNJ6ejTcwdGHqu3vGyHyCCExqKI=; b=UHWeCMjjGtAXjtUEVJBVpB7pHJ4QGHcHimgk1LgHlY/MowvNJzUNodsdOpUnu/sMQtgx6K l2zZvho5jkAhDvPKldL5zU8ah/VThFgEIdWu/FbBwQuZgMiwEOV24+tQrmu5bEgaZ6eJoZ 9PgeU+d3DUoqoZRr5RQqnM9Bls2MqMtL+IbVYvR6mdllZQtMwrcuY+dUGeew4W/HOIjd7b RUjwcw8um4WRLHSjDTbvkCt0OLSVljPuQ1uecOwv66DDv+YkGL7fwe+h41AUmcRag70RBk JLCOLS9uBt6u6WisnKzZcHgR2PIuY4PD/cPUg9zfMI9DxzFCBhrMGg/n80zXkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493194; a=rsa-sha256; cv=none; b=nPZbfEFO1nARcKrGfHEJa1GFkp0HdV8ryizzOLfZonbzWcKhUz8KW2euRF6RLsZHBoHc2w 1XZHluROzZGr7mt19DxmGMY7cJGOFCW2/rJitmucJU6iVCp1UvlgyaE+nkGIvbLSUkfmzm IfY/sPcKCFImgyLK5FQOvgFXJinnOv1yIa3PI1nb0/PRGNuhms/eKbeCA7k4s1jBnlHy2T qADh+3F6+Mm5A93M/JrvTnmnCVIYxKSxZY88L89kNMXnMNsQo6Man9OHblz4o0gijsi20+ vbAraj/e4xEyVoCjFsLlnqnQZR0ThGDqGrOWgjFHmjtqs7lqfNuDCzcJi6JHxg== 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=1782493194; 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=uQSatwZ0equ4VnpIwNJ6ejTcwdGHqu3vGyHyCCExqKI=; b=cd5aD/NXPmX4qZcpovOI2wyK8FXRPLI+EhqFlimuJuyi6ZYswolHdCqXmEtZ8y0+3fUY6Y MM9zP6eN2tDUtohK0dTCBNczpiwS0ImCCB6yA+qOT+do2Ji4PTVk1mGW8+4GAP2hKQ2gjO sRElGv8TcWmnQwckb6uuLWfI4Wqx7sa8TQcxF5aaNeNnU7i9WQVbNcjlcQ5NrArYLhJCa0 oeyQDgpRmbj9r1MF/qLUQZa/F2BNEHU/MBD5P/lFIDMiFwB9PoKLaoPDccMMFXVXCrzwnQ GvDy1TkL1v1vvAVGN+xWo9ku8MK8BEDoMRo/BPTAY+hzVshZVNL53eW6i85EPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23F63ftzlxk for ; Fri, 26 Jun 2026 16:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34a90 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 548a058c54e3 - stable/14 - lib/msun/tests: Replace remaining printf() with debug() 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 548a058c54e3dd89d9585b8562065b9ce80d5a4a Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:53 +0000 Message-Id: <6a3eb009.34a90.4bac0a96@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=548a058c54e3dd89d9585b8562065b9ce80d5a4a commit 548a058c54e3dd89d9585b8562065b9ce80d5a4a Author: Siva Mahadevan AuthorDate: 2025-10-08 21:04:28 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:01 +0000 lib/msun/tests: Replace remaining printf() with debug() Signed-off-by: Siva Mahadevan MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit d03c9b8f662466537753056608d6a64d8c5513c3) --- lib/msun/tests/ctrig_test.c | 6 +++--- lib/msun/tests/fma_test.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/msun/tests/ctrig_test.c b/lib/msun/tests/ctrig_test.c index dd03d11fdbd1..6a71770e791a 100644 --- a/lib/msun/tests/ctrig_test.c +++ b/lib/msun/tests/ctrig_test.c @@ -324,9 +324,9 @@ ATF_TC_BODY(test_axes, tc) test_odd_tol(csinhf, z, CMPLXL(sinhf(nums[i]), 0), FLT_ULP()); test_even_tol(ccoshf, z, CMPLXL(coshf(nums[i]), 0), FLT_ULP()); - printf("%a %a\n", creal(z), cimag(z)); - printf("%a %a\n", creal(ctanhf(z)), cimag(ctanhf(z))); - printf("%a\n", nextafterf(tanhf(nums[i]), INFINITY)); + debug("%a %a\n", creal(z), cimag(z)); + debug("%a %a\n", creal(ctanhf(z)), cimag(ctanhf(z))); + debug("%a\n", nextafterf(tanhf(nums[i]), INFINITY)); test_odd_tol(ctanhf, z, CMPLXL(tanhf(nums[i]), 0), 1.3 * FLT_ULP()); test_odd_tol(csinf, z, CMPLXL(sinf(nums[i]), diff --git a/lib/msun/tests/fma_test.c b/lib/msun/tests/fma_test.c index e6a34e0f2afa..f8dee9e16a5b 100644 --- a/lib/msun/tests/fma_test.c +++ b/lib/msun/tests/fma_test.c @@ -473,7 +473,7 @@ ATF_TC_WITHOUT_HEAD(zeroes); ATF_TC_BODY(zeroes, tc) { for (size_t i = 0; i < nitems(rmodes); i++) { - printf("rmode = %d\n", rmodes[i]); + debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); test_zeroes(); } @@ -483,7 +483,7 @@ ATF_TC_WITHOUT_HEAD(infinities); ATF_TC_BODY(infinities, tc) { for (size_t i = 0; i < nitems(rmodes); i++) { - printf("rmode = %d\n", rmodes[i]); + debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); test_infinities(); } @@ -501,7 +501,7 @@ ATF_TC_WITHOUT_HEAD(small_z); ATF_TC_BODY(small_z, tc) { for (size_t i = 0; i < nitems(rmodes); i++) { - printf("rmode = %d\n", rmodes[i]); + debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); test_small_z(); } @@ -512,7 +512,7 @@ ATF_TC_WITHOUT_HEAD(big_z); ATF_TC_BODY(big_z, tc) { for (size_t i = 0; i < nitems(rmodes); i++) { - printf("rmode = %d\n", rmodes[i]); + debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); test_big_z(); } From nobody Fri Jun 26 16:59:52 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 4gn23F1z2Pz6jmlm for ; Fri, 26 Jun 2026 16:59:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23D6qPpz4DVm for ; Fri, 26 Jun 2026 16:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493193; 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=yv2hOOPdD6fYSUaSgxBeob0FF1zqbz1G5fvRBSZma7I=; b=alAWV5q0/+huhlJEcFrNRL44x0V+72x1I4E0/l0pyeSZOqkJG+t+hYEm23bMLqYdn6VMP4 hbiB0G8z1H34bYxJ3Q8zfhn5mJhDU43dNGsND1Ih1OBMEBmvFP2vH9sWA8GLq/tE7z9Fea SnNph8sWRGcPutujylbxOMz/P7ttIONcwDuKNVudWHkZQyDrNWeAdWX+1AiNjLYnCFUBB3 BAibz2Tw2v8d1shVUV+YrFPyhlXjjTjWsJ9bAPB1Hh63sL5NeO+OMaxPNunlhXsYoLBWUM aYvUU1qFrkIDSMv4aZbyPhsvYGa824PwU/vCD52ja+Oiqk9WQthYI0/J47+Pxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493193; a=rsa-sha256; cv=none; b=TyUwkBpau7Fa769SHObW9R5E1trpQNb/FtwKZmhRe6LK1qIonkzguGec1gaqEVKULJFcE7 vcxdsxNAfGyS6aclXr5/OtdgZMhCNtqfK4qHWsN3w8yPj1IGK9pgNOCe2GJL+ksUdU2R7q lDHiYeOLM+ivHY1Cewc/RFz8aPVRNfwFv9YkFPMM42ozz2gVFqmI3Hv/fKLkglSbdcuIVA fAl3OQtajjYr58AJ+K+H4bIGuUNJ9dwvcDa51AJFp5l7diex/7D5Mlx9kV0NPx4MbdrL8Z 6sS8T4foPedPlr12uPrP2yPYXErat65xrDQUXfcFbp8rPWuv0NFG8Wfrkq+7ug== 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=1782493193; 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=yv2hOOPdD6fYSUaSgxBeob0FF1zqbz1G5fvRBSZma7I=; b=ghjFry6AvEVV8gfKQiXl+IefMExb46dXFl1Qbl0hLZ6yW5vNdwI8uJ2s9UQSB7oum17M+r RuKzLwG/sO/JnMEf+ZdCb9CAS5ErCQctiFA9A651E8yjw5+f2akKl5Jf3UW8EnjnweB3i1 dr6xQqUdsl6M5cAPDLYl4fI9z+hoWtfjQsHaIZvWO+Cp0HIm1ME6J+3dxZcvaMGj2ah1RX aSAmZBU531P8jBDtjlj+QHsi6ml1tvpm/IS1Oy9+9JXRmVSWDvKR3Kiun3OJFYeUi1YFKC A/kxGF+OOlNC+/HNAHDEbQyb1yb1q4CJZUHWH2/O41ar2gdTL3vBht6dWsWJTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23D59mkzlxh for ; Fri, 26 Jun 2026 16:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35c52 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 35f572e7a0df - stable/14 - tests/lorder_test: Add require.progs for nm and cc 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35f572e7a0df8ff5719e419f14b820f31e595e6b Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:52 +0000 Message-Id: <6a3eb008.35c52.1872b6ac@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=35f572e7a0df8ff5719e419f14b820f31e595e6b commit 35f572e7a0df8ff5719e419f14b820f31e595e6b Author: Siva Mahadevan AuthorDate: 2025-09-26 17:46:19 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:09:48 +0000 tests/lorder_test: Add require.progs for nm and cc Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1858 (cherry picked from commit 66d2816407c32a0da0f039c4edb4f19b280f9bb5) --- usr.bin/lorder/tests/Makefile | 2 ++ usr.bin/lorder/tests/lorder_test.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/usr.bin/lorder/tests/Makefile b/usr.bin/lorder/tests/Makefile index 21207f413a8d..a7920b82c90a 100644 --- a/usr.bin/lorder/tests/Makefile +++ b/usr.bin/lorder/tests/Makefile @@ -1,4 +1,6 @@ PACKAGE= tests ATF_TESTS_SH= lorder_test +TEST_METADATA+= required_programs="nm" + .include diff --git a/usr.bin/lorder/tests/lorder_test.sh b/usr.bin/lorder/tests/lorder_test.sh index a4276b2dcfe6..9c2db08e1718 100644 --- a/usr.bin/lorder/tests/lorder_test.sh +++ b/usr.bin/lorder/tests/lorder_test.sh @@ -16,6 +16,7 @@ noargs_body() { atf_test_case onearg onearg_head() { atf_set descr "One argument" + atf_set require.progs "cc" } onearg_body() { echo "void a(void) { }" >a.c @@ -28,6 +29,7 @@ onearg_body() { atf_test_case dashdash dashdash_head() { atf_set descr "One argument" + atf_set require.progs "cc" } dashdash_body() { echo "void a(void) { }" >a.c @@ -59,6 +61,7 @@ invalid_body() { atf_test_case objects objects_head() { atf_set descr "Order objects" + atf_set require.progs "cc" } objects_body() { echo "void a(void) { }" >a.c @@ -77,6 +80,7 @@ objects_body() { atf_test_case archives archives_head() { atf_set descr "Order archives" + atf_set require.progs "cc" } archives_body() { echo "void a(void) { }" >a.c From nobody Fri Jun 26 16:59:54 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 4gn23H2QGDz6jn0Q for ; Fri, 26 Jun 2026 16:59:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23H0VM2z4DvG for ; Fri, 26 Jun 2026 16:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493195; 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=9aqkpqQSLKIr6rJV9aAEtP4Owr6ZwvbCXBK4XQfxY1I=; b=JASIlxcyxsur/KeWvgqjy5CX/RDnpgNxPTMw4By9hhhb2lrKYnJkJRou0KEC17vWZgJVJn FRDQ9O9/KrclawCOys09b5w79zrLxL0BrOYj+Avwi9ReFls/dB6y4e4l39brQzBDZFurfW 20Pz5Djj2qORPUldPzMZfRRdqGwu7vkPSnyWOo6HQKjRyDTFPWgm/1GDhojfRU5CbS3brY P61yWvec8ZRhr+pvSGFi4yQ6XbfG0EjLS86re0XZLgzF1TIM/TKI4RDcs5MCfYhW6hOFoZ zOw3qUPC8/Gnj7S5LMdiQqRaX85vSKBIYB7sfiX0X7EbJbuEqWSkuaxpcYMG9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493195; a=rsa-sha256; cv=none; b=VEIEce2lLInaYqTb+CjBsMXDggzjJ7PyTN9arhlwzMk3xWXJsJYH8hIW7PRrdO4X/KWbcO xmah6wzn7oHMYEh3w5zgrsUYw9heo3emgvsoIzT5V+b4fcWNa92oyqFRPXjj7oIMDoUpR7 HmG3eOy81d5+SkMDki8h6jiTVaIkImlXccao51q1Hr/PNKkXmtMb9MYDNs01YqreqhCG5D +MFLW/flABFXaBYF0Fu2V6Yffg/Xdp5PvNEEpqauQvTXbBiFj9k/w1k3gA1+AmOJ6n1ppb HVNsydxgjaiEEjIxUqH9TknaDgf3xNaTTQfFbvVilNfpE+3e3Wh2Rcbj+IZfLA== 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=1782493195; 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=9aqkpqQSLKIr6rJV9aAEtP4Owr6ZwvbCXBK4XQfxY1I=; b=gB3tGzlJP9YmaemFGTwh6V4FlCbDc5zM/frOvGeHrDD181uf8hu+hPdnUatOIdLU7FsxBp bSlzcHN2tiDi2WxfBM5Pz7cZbwAfzS3J88s6ornUJxUNfAPG54p7gLT3o4j43VUnL6KmGn urCACAdDIYXuXUWXWR374ernY7MXAeoJqs0XgAPLikhnoDJE09lPCP0zBmp/9wp/M1wS8f 0cpGx535XJp8GzPWinUXdHSALqQNkxlTW8CjiR1Qs6T54wYGjh8pKtvas1/kQfRxhc71w9 7ahlRLsL6kULoTUpVA+e5cDJoL4sua7LYmKdwqtKZiaIaYPClx/mLct8hPsVaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23G6h25zmNy for ; Fri, 26 Jun 2026 16:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: a90616ce34c4 - stable/14 - lib/msun/tests: Remove newlines in ATF msgs 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a90616ce34c4f19903ce04160b0d11ce25721bd5 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:54 +0000 Message-Id: <6a3eb00a.33b3a.25f2a338@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a90616ce34c4f19903ce04160b0d11ce25721bd5 commit a90616ce34c4f19903ce04160b0d11ce25721bd5 Author: Siva Mahadevan AuthorDate: 2025-10-01 15:13:08 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:05 +0000 lib/msun/tests: Remove newlines in ATF msgs This fixes broken test reports with the following message: lib/msun/fe_round_test:fe_round -> broken: Test result contains multiple lines: expected_failure: /usr/src/contrib/netbsd-tests/lib/libm/t_fe_round.c:95: Didn't get the same rounding mode out!<>(index 0) fed in 64 rounding mode, got 0 out<> [0.079s] Signed-off-by: Siva Mahadevan MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit ec640742e30270098f8d982c1c0838f2dfde9ad5) --- contrib/netbsd-tests/lib/libm/t_fe_round.c | 24 ++++++++++++------------ lib/msun/tests/fmaxmin_test.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/netbsd-tests/lib/libm/t_fe_round.c b/contrib/netbsd-tests/lib/libm/t_fe_round.c index 33da289eb156..a7ee3bf77b98 100644 --- a/contrib/netbsd-tests/lib/libm/t_fe_round.c +++ b/contrib/netbsd-tests/lib/libm/t_fe_round.c @@ -80,15 +80,15 @@ ATF_TC_BODY(fe_round, tc) received = lrint(values[i].input); ATF_CHECK_MSG( (labs(received - values[i].expected) < EPSILON), - "lrint rounding wrong, difference too large\n" - "input: %f (index %d): got %ld, expected %ld\n", + "lrint rounding wrong, difference too large. " + "input: %f (index %d): got %ld, expected %ld", values[i].input, i, received, values[i].expected); /* Do we get the same rounding mode out? */ ATF_CHECK_MSG( (fegetround() == values[i].round_mode), - "Didn't get the same rounding mode out!\n" - "(index %d) fed in %d rounding mode, got %d out\n", + "Didn't get the same rounding mode out!. " + "(index %d) fed in %d rounding mode, got %d out", i, values[i].round_mode, fegetround()); } } @@ -109,15 +109,15 @@ ATF_TC_BODY(fe_nearbyint, tc) received = nearbyint(values[i].input); ATF_CHECK_MSG( (fabs(received - values[i].expected) < EPSILON), - "nearbyint rounding wrong, difference too large\n" - "input: %f (index %d): got %f, expected %ld\n", + "nearbyint rounding wrong, difference too large. " + "input: %f (index %d): got %f, expected %ld", values[i].input, i, received, values[i].expected); /* Do we get the same rounding mode out? */ ATF_CHECK_MSG( (fegetround() == values[i].round_mode), - "Didn't get the same rounding mode out!\n" - "(index %d) fed in %d rounding mode, got %d out\n", + "Didn't get the same rounding mode out! " + "(index %d) fed in %d rounding mode, got %d out", i, values[i].round_mode, fegetround()); } } @@ -151,8 +151,8 @@ ATF_TC_BODY(fe_nextafter, tc) } ATF_CHECK_MSG( res && (fabs(received - values2[i].expected) < EPSILON), - "nextafter() rounding wrong, difference too large\n" - "input: %f (index %d): got %f, expected %f, res %d\n", + "nextafter() rounding wrong, difference too large. " + "input: %f (index %d): got %f, expected %f, res %d", values2[i].input, i, received, values2[i].expected, res); } } @@ -177,8 +177,8 @@ ATF_TC_BODY(fe_nexttoward, tc) } ATF_CHECK_MSG( res && (fabs(received - values2[i].expected) < EPSILON), - "nexttoward() rounding wrong, difference too large\n" - "input: %f (index %d): got %f, expected %f, res %d\n", + "nexttoward() rounding wrong, difference too large. " + "input: %f (index %d): got %f, expected %f, res %d", values2[i].input, i, received, values2[i].expected, res); } } diff --git a/lib/msun/tests/fmaxmin_test.c b/lib/msun/tests/fmaxmin_test.c index 51956b1084af..85a105a7f44f 100644 --- a/lib/msun/tests/fmaxmin_test.c +++ b/lib/msun/tests/fmaxmin_test.c @@ -50,7 +50,7 @@ CHECK_FP_EXCEPTIONS_MSG(0, ALL_STD_EXCEPT, \ #func "(%.20Lg, %.20Lg) rmode%d", (x), (y), rmode); \ ATF_CHECK_MSG(fpequal_cs(__result, (expected), true), \ - #func "(%.20Lg, %.20Lg) rmode%d = %.20Lg, expected %.20Lg\n", \ + #func "(%.20Lg, %.20Lg) rmode%d = %.20Lg, expected %.20Lg", \ (x), (y), rmode, __result, (expected)); \ } while (0) From nobody Fri Jun 26 16:59:56 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 4gn23J5PfQz6jn0Y for ; Fri, 26 Jun 2026 16:59:56 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23J1d4Fz4DkG for ; Fri, 26 Jun 2026 16:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493196; 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=bfDQY8kgI0yHSifSMg2sP6LrdeF85oRQyFH7Smb0a5Y=; b=inGOQHJF1/iIJdRv4KvYZvXggp/y0dvsiJD50msQj6GASG4hbXu/HtCopHl9l72npgBw/9 WgitDnywLO3EFXQymMSos1LksAuEFwbOkEjRk5dEeobBNOYY13sJb5KDYh0UG4ryUoIrJH 9KN45FZl6hBM8z5wveol69p8kJ1HCTPvoZZhHna5WEWdGR9vzLGXxxk2dON0f8WAZmEfc2 E7CsWRtMR489W6rnKbTlDD2g07yp47nOmnTqDai3XIty6XaqnwBtACeVDD0qJvFQLyOc/D hwv/S70F2wkmT1rDJbb1ipMNGP1eeP24eQXFQwO43e09Q69ihhcjgSy0HvUxPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493196; a=rsa-sha256; cv=none; b=WBzkHNJktS+hsE284H5nmw85ixaiu23pQjAodcIBFLaTmaGZ7pc7j1KcjbVP0lov71ntOL 6wOH3cTB/tSVj67ByaRnl+hr8gjyR7LI/t+Wy3CiQJ6APX03DN0uYNjw0ZAgL6H3GupO/c y1S5MSbH3/M5rqPLdGdCfJtuVvDNahwtIrzZRPb3wM2rkJHHtYDCWy8V2SvCbAKZlpkurk utyV1buJfKifz1oud+Q3MBGJqJHYQ8XYqnaCu09gJ1TkYFJGsfoaAvst1lJNuOe2cAepRC /0wPCq4q4fvx4XXxMms+jZ6cHjBMuCoyoZlTYLYX5HadzmEVX65+S06RuI3bIw== 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=1782493196; 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=bfDQY8kgI0yHSifSMg2sP6LrdeF85oRQyFH7Smb0a5Y=; b=NXZoZTYwkJHKyLDdk/33rWO0oHtPMf85+syOMjEiQuLeujhrRwbQIQMs8M6p6PsZaY5JD7 9Zsz+T1pVQB6hQ5y3QJSgIYiTI1YiSRe47petfw0Pd4apsq7ugZGTe8tY+OV8Z3Y7zTAvT ChGFoyEwHt7LSSj5fD+B8ntDhuE0e3yLGx9hydqyqlBlAM3novbrazqnZLPEyQluBKvr5U 917dg8gcp/K8xHbLQ7xp2y0oonFo4312w6fhi9MaE/ezj/Fb7FW347hPOaUhpwmFpC6FuN ABJzuhD+xssZRErqJ1rZOiW/Cn6VZtHDhYQtVok0hDgW5J1buCAg4Ik1miJ9cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23J0D1Fzm9T for ; Fri, 26 Jun 2026 16:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36783 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: d87110b036ed - stable/14 - lib/msun/tests: Add REQUIRE_ variants of test-utils macros 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d87110b036ed45c750c547750e427904d742d5cb Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:56 +0000 Message-Id: <6a3eb00c.36783.1eddc13a@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=d87110b036ed45c750c547750e427904d742d5cb commit d87110b036ed45c750c547750e427904d742d5cb Author: Siva Mahadevan AuthorDate: 2025-10-08 20:38:47 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:09 +0000 lib/msun/tests: Add REQUIRE_ variants of test-utils macros Signed-off-by: Siva Mahadevan MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit a9b1650f90f4dbc62baa52b395082b1714b6cbf3) --- lib/msun/tests/test-utils.h | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/lib/msun/tests/test-utils.h b/lib/msun/tests/test-utils.h index 0a926551639c..984833605fe8 100644 --- a/lib/msun/tests/test-utils.h +++ b/lib/msun/tests/test-utils.h @@ -144,21 +144,20 @@ fpequal_tol(long double x, long double y, long double tol, return (ret); } -#define CHECK_FPEQUAL(x, y) CHECK_FPEQUAL_CS(x, y, true) - -#define CHECK_FPEQUAL_CS(x, y, checksign) do { \ +#define _fpequal_cs(atf_variant, x, y, checksign) do { \ long double _x = x; \ long double _y = y; \ - ATF_CHECK_MSG(fpequal_cs(_x, _y, checksign), \ + ATF_##atf_variant##_MSG(fpequal_cs(_x, _y, checksign), \ "%s (%.25Lg) ~= %s (%.25Lg)", #x, _x, #y, _y); \ } while (0) -#define CHECK_FPEQUAL_TOL(x, y, tol, flags) do { \ +#define _fpequal_tol(atf_variant, x, y, tol, flags) do { \ long double _x = x; \ long double _y = y; \ bool eq = fpequal_tol(_x, _y, tol, flags); \ long double _diff = eq ? 0.0L : fabsl(_x - _y); \ - ATF_CHECK_MSG(eq, "%s (%.25Lg) ~= %s (%.25Lg), diff=%Lg, maxdiff=%Lg,", \ + ATF_##atf_variant##_MSG(eq, \ + "%s (%.25Lg) ~= %s (%.25Lg), diff=%Lg, maxdiff=%Lg,", \ #x, _x, #y, _y, _diff, fabsl(_y * tol)); \ } while (0) @@ -170,32 +169,48 @@ cfpequal(long double complex d1, long double complex d2) fpequal_cs(cimagl(d1), cimagl(d2), true)); } -#define CHECK_CFPEQUAL_CS(x, y, checksign) do { \ +#define _cfpequal_cs(atf_variant, x, y, checksign) do { \ long double _x = x; \ long double _y = y; \ bool equal_cs = \ fpequal_cs(creal(_x), creal(_y), (checksign & CS_REAL) != 0) && \ fpequal_cs(cimag(_x), cimag(_y), (checksign & CS_IMAG) != 0); \ - ATF_CHECK_MSG(equal_cs, "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ + ATF_##atf_variant##_MSG(equal_cs, \ + "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ #x, creall(_x), cimagl(_x), #y, creall(_y), cimagl(_y)); \ } while (0) -#define CHECK_CFPEQUAL_TOL(x, y, tol, flags) do { \ +#define _cfpequal_tol(atf_variant, x, y, tol, flags) do { \ long double _x = x; \ long double _y = y; \ bool equal_tol = (fpequal_tol(creal(_x), creal(_y), tol, flags) && \ fpequal_tol(cimag(_x), cimag(_y), tol, flags)); \ - ATF_CHECK_MSG(equal_tol, "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ + ATF_##atf_variant##_MSG(equal_tol, \ + "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ #x, creall(_x), cimagl(_x), #y, creall(_y), cimagl(_y)); \ } while (0) -#define CHECK_FP_EXCEPTIONS(excepts, exceptmask) \ - ATF_CHECK_EQ_MSG((excepts), fetestexcept(exceptmask), \ - "unexpected exception flags: got %#x not %#x", \ +#define _fp_exceptions(atf_variant, excepts, exceptmask) \ + ATF_##atf_variant##_EQ_MSG((excepts), fetestexcept(exceptmask), \ + "unexpected exception flags: got %#x not %#x", \ fetestexcept(exceptmask), (excepts)) -#define CHECK_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) \ - ATF_CHECK_EQ_MSG((excepts), fetestexcept(exceptmask), \ +#define _fp_exceptions_msg(atf_variant, excepts, exceptmask, fmt, ...) \ + ATF_##atf_variant##_EQ_MSG((excepts), fetestexcept(exceptmask), \ "unexpected exception flags: got %#x not %#x " fmt, \ fetestexcept(exceptmask), (excepts), __VA_ARGS__) +#define CHECK_FP_EXCEPTIONS(excepts, exceptmask) _fp_exceptions(CHECK, excepts, exceptmask) +#define CHECK_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) _fp_exceptions_msg(CHECK, excepts, exceptmask, fmt, __VA_ARGS__) +#define CHECK_CFPEQUAL_TOL(x, y, tol, flags) _cfpequal_tol(CHECK, x, y, tol, flags) +#define CHECK_CFPEQUAL_CS(x, y, checksign) _cfpequal_cs(CHECK, x, y, checksign) +#define CHECK_FPEQUAL(x, y) _fpequal_cs(CHECK, x, y, true) +#define CHECK_FPEQUAL_TOL(x, y, tol, flags) _fpequal_tol(CHECK, x, y, tol, flags) + +#define REQUIRE_FP_EXCEPTIONS(excepts, exceptmask) _fp_exceptions(REQUIRE, excepts, exceptmask) +#define REQUIRE_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) _fp_exceptions_msg(REQUIRE, excepts, exceptmask, fmt, __VA_ARGS__) +#define REQUIRE_CFPEQUAL_TOL(x, y, tol, flags) _cfpequal_tol(REQUIRE, x, y, tol, flags) +#define REQUIRE_CFPEQUAL_CS(x, y, checksign) _cfpequal_cs(REQUIRE, x, y, checksign) +#define REQUIRE_FPEQUAL(x, y) _fpequal_cs(REQUIRE, x, y, true) +#define REQUIRE_FPEQUAL_TOL(x, y, tol, flags) _fpequal_tol(REQUIRE, x, y, tol, flags) + #endif /* _TEST_UTILS_H_ */ From nobody Fri Jun 26 16:59:57 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 4gn23K5hccz6jmxF for ; Fri, 26 Jun 2026 16:59:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23K1xKDz4DmH for ; Fri, 26 Jun 2026 16:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493197; 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=FgduYH1LtzV0gUHfqnKF42zWJ0/aYmEqAja4Ck8/3Z4=; b=X5do4kFlELh6+ASZfT4+s6RKlhCIOfEHZWufGRbWP0Kje2bUjzey+EIw0K20GI4O/IY0Ap 0fNLoL9levHzepE6xquuP/AhoerqjGeDhdywczZGNVeJ7Ivs73oxamk/wj/oRB4pA22HG3 T2dNPELEuw3d6Tldzfm/n1eU0Um6ZVZQnSwPE5ud9ZRuHmdpHnyg15r9S94mVGEvW1YGbJ d0voLLXhjySElPI23nuyk90DvYa4vE1gyzCmqMrYTJ9vdJIdaAFzuN6l1ckWP4oENxfOV6 ENeG9muYy7YmUijnlN5hEDGpxRurAto2DWacJkMR6TVlANbYT6kPbwyfZ/1mHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493197; a=rsa-sha256; cv=none; b=naUXwangllTMzLVJBOMLUYoqgVaT8cKBSxY/QOTIzbn6Kze0OGnBzbmvp1lK5vgP+KE8Wp 9P4I1Qa75FwJyTfNcNI+YW1jPbofj4MP1Shfh54oEysGlmgyvYEUKdtvwWwCm4mtaX93er +uZ6QcDPl4Osq+SKuyjadELJQUq8h9iFzpl0TchHU1wSdrcDQsr5S/ZkPh+TsyWdIOIRbU LyPisWGCwbz2eIA3lfy0l0HzLop4/LWbQQaIAOlHzw3xrHLpcoWy/ITpeU8NZSViSC37qd ZnbP69SKM1ecZZgto51xmMrhz/uQwn3BZfeGdu36mAEudv1YZAC2o+iCfWqG0w== 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=1782493197; 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=FgduYH1LtzV0gUHfqnKF42zWJ0/aYmEqAja4Ck8/3Z4=; b=N2kwFPPI7b0lu5gaPMoPzw33TRVx5xMvXUAI68VT1RLEPMifgKJcKIHz3cA3z/m33YPgaz 24R5nCm1OulEijPR2dSlR1cPlgi4gHB/rZhEmL54FHdrH8xgA+yBzB3dQHbmoxjpGAZ01H XiRkwWoPXjJ9WcWOLYg0zTF4dYyzn2ySpuG9WXQoXfKYSm7lwjb7M9w1TeRBXmxvIxt6ye dJw8WRST1HRhQIMIbr4rA+K9Ga12feJR961pCliaVteiqScHIMP03xlKClNIgHN69MjyeK 2LwRKXtY4LxGeM3JEGGwAGH5vweyghvW0EhMX/bxd28N2ffgVKATJ64VRMn24g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23K100Rzlh7 for ; Fri, 26 Jun 2026 16:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34997 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 4a07cff871da - stable/14 - lib/msun/tests: xfail fe_round on riscv64 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a07cff871da327ecffffab3015198bd0b40c11a Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:57 +0000 Message-Id: <6a3eb00d.34997.2eac3f0d@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=4a07cff871da327ecffffab3015198bd0b40c11a commit 4a07cff871da327ecffffab3015198bd0b40c11a Author: Siva Mahadevan AuthorDate: 2025-10-08 20:40:15 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:13 +0000 lib/msun/tests: xfail fe_round on riscv64 Replace ATF_CHECK_* with ATF_REQUIRE_* to fail fast and avoid unexpected aborts. Signed-off-by: Siva Mahadevan PR: 290099 MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit 6c18c40b29fd5ac66230af34726260ce2d47aecd) --- contrib/netbsd-tests/lib/libm/t_fe_round.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/netbsd-tests/lib/libm/t_fe_round.c b/contrib/netbsd-tests/lib/libm/t_fe_round.c index a7ee3bf77b98..58d1dbfc0e37 100644 --- a/contrib/netbsd-tests/lib/libm/t_fe_round.c +++ b/contrib/netbsd-tests/lib/libm/t_fe_round.c @@ -72,20 +72,23 @@ ATF_TC_HEAD(fe_round, tc) ATF_TC_BODY(fe_round, tc) { +#if defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif long int received; for (unsigned int i = 0; i < __arraycount(values); i++) { fesetround(values[i].round_mode); received = lrint(values[i].input); - ATF_CHECK_MSG( + ATF_REQUIRE_MSG( (labs(received - values[i].expected) < EPSILON), "lrint rounding wrong, difference too large. " "input: %f (index %d): got %ld, expected %ld", values[i].input, i, received, values[i].expected); /* Do we get the same rounding mode out? */ - ATF_CHECK_MSG( + ATF_REQUIRE_MSG( (fegetround() == values[i].round_mode), "Didn't get the same rounding mode out!. " "(index %d) fed in %d rounding mode, got %d out", From nobody Fri Jun 26 16:59:58 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 4gn23L6dqHz6jn4b for ; Fri, 26 Jun 2026 16:59:58 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23L3bgxz4DhZ for ; Fri, 26 Jun 2026 16:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493198; 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=HOa3j4TfcY6R3fXEF8jF76BXBQAiO6AdWzVoRB3rgrw=; b=a2XH/yXqgZHsnT0nxl9X4LscNEJeVMAJUbe2pgsXhxl13L7KjYIxaXgKZchYyo5Cpra3Ws HOj144ST3n57oid6eFTY1epCU26tzNc3PdW+z2FPc3Z70DhFetjpsIIxH4HhjTP1eEj2nw qwhByY3/9SWZi9p0317JqRiUulxPJirwgjTYcSLSouerWB4eEBTx3YLImwYn+VwQeuLSRE Lgu1xJRYqCqzMH0/s5E6odfpDSJ+gyCpNAddTQO7PkrOTvMfOlax0y2AnAb5+nzIa7n2Tg 9Uylc5k7OzcoULZiUl4+JXzdxYDIumZrISKO3It6u+JEZM2qWjAu1PJjgoA2LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493198; a=rsa-sha256; cv=none; b=QapWlEME458OLbI+57CgIwDJpl1HngyWXNySRofVqrz+zGo6UZ4feZ0CylZGyXPH38sQv3 uFYIjcky8cPabxktHyG2C4ByJZaBEmJi2zGNJvwUCrvmtVGP+S9NpBL6QH7hoVwkx4/6DV XAMSumnrxVKNZwMWXYd1erhDAAieOhyGCkT3NdXrQza5KZVUauB5TvJWShwrarUYMfO5Ge zFPvXZ3Trt+bzOjN+twBwtiSYXdrrrmmhV5f+M5aSkK93/f6WtJpR7ZuI/w1DVMKESvhjj oh4VkLY8k5wi8ovutxojSv4zaPJLbie6RiZxqB3P6+qK/MoT6emoGemNKi6EHw== 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=1782493198; 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=HOa3j4TfcY6R3fXEF8jF76BXBQAiO6AdWzVoRB3rgrw=; b=sNiTZaFenOsZ0CaneHZPvsHuSZhFwnaBeUk0EX8ubVgIpkChkaDxAJPI45j4l1tTs8rw6A Qgz50c+7pth5GW1a7k8DYhVtk9bCTVxvmGADZ2X/bzb49NqcM56eYRngbl6oCN1mXflSyu 1tImMumWbfr7bdVHi4NIqxHtj/ZmS9UxgaTSZU+acWp5dS90BExy1gvIpzgLPTC8yU2VZN doTkBHfTJXGiCcxkKd/trx3JyRsxsM41wd/PtVG6XgToO4/IoVmQVpcOjXxrSgy0P3o5hB yCW4Iy0wSs79GPUlvHxbzPpEtQ+mpKpVVMEhHaB71gMqJYToAQU3XO3OwwDH+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23L1pBYzlh9 for ; Fri, 26 Jun 2026 16:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33eef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: 20806e71e00c - stable/14 - lib/msun/tests: xfail failing invtrig_test cases on non-x86 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20806e71e00c06969dbcfa2514f32a0787934627 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:58 +0000 Message-Id: <6a3eb00e.33eef.218dd8ca@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=20806e71e00c06969dbcfa2514f32a0787934627 commit 20806e71e00c06969dbcfa2514f32a0787934627 Author: Siva Mahadevan AuthorDate: 2025-10-08 20:40:15 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:17 +0000 lib/msun/tests: xfail failing invtrig_test cases on non-x86 Replace ATF_CHECK_* with ATF_REQUIRE_* to fail fast and avoid unexpected abort. PR: 290099 MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit 5a0617454e37c6a3df4106c24bd5ad20b338fe3a) --- lib/msun/tests/invtrig_test.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/lib/msun/tests/invtrig_test.c b/lib/msun/tests/invtrig_test.c index 8c6fdb7c6e2f..76fbd33bf73e 100644 --- a/lib/msun/tests/invtrig_test.c +++ b/lib/msun/tests/invtrig_test.c @@ -52,8 +52,8 @@ #define test_tol(func, x, result, tol, excepts) do { \ volatile long double _in = (x), _out = (result); \ ATF_REQUIRE_EQ(0, feclearexcept(FE_ALL_EXCEPT)); \ - CHECK_FPEQUAL_TOL(func(_in), _out, (tol), CS_BOTH); \ - CHECK_FP_EXCEPTIONS_MSG(excepts, ALL_STD_EXCEPT, "for %s(%s)", \ + REQUIRE_FPEQUAL_TOL(func(_in), _out, (tol), CS_BOTH); \ + REQUIRE_FP_EXCEPTIONS_MSG(excepts, ALL_STD_EXCEPT, "for %s(%s)", \ #func, #x); \ } while (0) #define test(func, x, result, excepts) \ @@ -82,8 +82,8 @@ #define test2_tol(func, y, x, result, tol, excepts) do { \ volatile long double _iny = (y), _inx = (x), _out = (result); \ ATF_REQUIRE_EQ(0, feclearexcept(FE_ALL_EXCEPT)); \ - CHECK_FPEQUAL_TOL(func(_iny, _inx), _out, (tol), CS_BOTH); \ - CHECK_FP_EXCEPTIONS_MSG(excepts, ALL_STD_EXCEPT, "for %s(%s)", \ + REQUIRE_FPEQUAL_TOL(func(_iny, _inx), _out, (tol), CS_BOTH); \ + REQUIRE_FP_EXCEPTIONS_MSG(excepts, ALL_STD_EXCEPT, "for %s(%s)", \ #func, #x); \ } while (0) #define test2(func, y, x, result, excepts) \ @@ -125,7 +125,9 @@ sqrt2m1 = 4.14213562373095048801688724209698081e-01L; ATF_TC_WITHOUT_HEAD(special); ATF_TC_BODY(special, tc) { - +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/283017"); +#endif testall(asin, 0.0, 0.0, 0); testall(acos, 0.0, pi / 2, FE_INEXACT); testall(atan, 0.0, 0.0, 0); @@ -238,7 +240,9 @@ ATF_TC_BODY(special_atan2, tc) ATF_TC_WITHOUT_HEAD(accuracy); ATF_TC_BODY(accuracy, tc) { - +#if defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* We expect correctly rounded results for these basic cases. */ testall(asin, 1.0, pi / 2, FE_INEXACT); testall(acos, 1.0, 0, 0); @@ -276,7 +280,9 @@ ATF_TC_BODY(accuracy, tc) ATF_TC_WITHOUT_HEAD(p2x_atan2); ATF_TC_BODY(p2x_atan2, tc) { - +#if defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif testall2(atan2, 1.0, 1.0, pi / 4, FE_INEXACT); testall2(atan2, 1.0, -1.0, c3pi / 4, FE_INEXACT); testall2(atan2, -1.0, 1.0, -pi / 4, FE_INEXACT); @@ -299,6 +305,9 @@ ATF_TC_BODY(p2x_atan2, tc) ATF_TC_WITHOUT_HEAD(tiny); ATF_TC_BODY(tiny, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/283017"); +#endif float tiny = 0x1.23456p-120f; testall(asin, tiny, tiny, FE_INEXACT); @@ -436,6 +445,9 @@ tanatanl(long double x) ATF_TC_WITHOUT_HEAD(inverse); ATF_TC_BODY(inverse, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif float i; for (i = -1; i <= 1; i += 0x1.0p-12f) { From nobody Fri Jun 26 16:59:59 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 4gn23M5D26z6jmly for ; Fri, 26 Jun 2026 16:59:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23M3qTKz4Dhl for ; Fri, 26 Jun 2026 16:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493199; 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=sGApyZz15L6F2DjAs5mWR0cdr6q6ZDSw1Yqb7MjNQOY=; b=DUhGkJJydyWgFZdAQuByzSozyM17agtuLXJjhTXT2FNNOVrMkoMefi1BCor+eSJkyLDwg2 tTuJQktJTDDtl6vaCTSDKdRAx0fCkkwJbf3JZ+jhd9TDks6MST4cyrJ4+g+RVLfmV9DAF8 igCY7p9wk1oUrhEMsQutoEwRw1k+YBAU3UJhIkuF9RKCcDEUJB7mw+37PYoGdiGTi6tS0i aOdg6+83T4ql5/mSCvtv5sILdW3ZNpQpOESAwRTJAGhwBgCRzetT/AGq5jW5j9zre0fnYq 6JDRt/fE/qSzvim2eyre/hNYCE+cocKyoKBTmfNyGnySjLVTjQ7y+VUW2NNxMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493199; a=rsa-sha256; cv=none; b=Mke9Z+acGpj477YSMICSrvYFwB+CLVBAiV9CmF5K6iIQckw5+jbpmgOCjpuGkER8y9iTAX aCDJPm8KIgRgqeue6fQijfjyva5VOARVZHFi3ZUzKQnwi4uzocDY6p1+qhRBQBGFL/PNjQ jmY8A9POL7ZGxtNLFXBVFEP/j2s+zFmTQFFLQJnviojLG4X5mKs5eM0ngQgbMc3P0z0gNZ a7E8Z9ZJmuypd9Ty3aDtURIGk1gYeoB4pEpRg+rUsoSsHFrD47Of6hZHYVcQswTMYdHoH6 y5KkampvBG6ToOrxGG8Rq7h8U9jC7tS3rKr+Hl8YiyWD6OfMeli+Qr5lsu4UqA== 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=1782493199; 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=sGApyZz15L6F2DjAs5mWR0cdr6q6ZDSw1Yqb7MjNQOY=; b=gisgawpOs5vXm9gvXmBFwoxT1nxaYqxPQRcbvoB1wUxpmQ1acnu/a65NF5H4XUBEMzJWpm ksFBlCSdmmD/louzDMOSVpbptlRE5v+5bQOAqpVW8Xt+7DMAyxl7qkfAiMBUtk01wZ+OqF u6a8Ju8PMwE2cQxv3+EvSEBl07FLBhmNerGDT+fGq/KdOJpwNWyWJ0w0d6JIgWGyW9/PEL ieyxrWVBaxZiYPaTvCNxkF8sFKhenypyyRHVG9GtzmKb5XrlAUDF7f39pYrA4rxef9i7Wk PpvywYmfiJW7cNSpaLsJ1meiqM0J0Zm9bhENuaJs9YL42ZD8eh+nxcdgfWDqDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23M2Xvfzm9V for ; Fri, 26 Jun 2026 16:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: a55f9466439b - stable/14 - lib/msun/tests: xfail failing lrint_test cases on non-x86 archs 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a55f9466439b021bb1a2721b2c17fce8c1af4f06 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:59 +0000 Message-Id: <6a3eb00f.33b3f.154a3c46@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a55f9466439b021bb1a2721b2c17fce8c1af4f06 commit a55f9466439b021bb1a2721b2c17fce8c1af4f06 Author: Siva Mahadevan AuthorDate: 2025-10-08 20:40:15 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:20 +0000 lib/msun/tests: xfail failing lrint_test cases on non-x86 archs Replace ATF_CHECK_* with ATF_REQUIRE_* to fail fast and avoid unexpected aborts. Signed-off-by: Siva Mahadevan PR: 290099 MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit de601d5bf5c6d2409134abc4638c7a0818cc896e) --- lib/msun/tests/lrint_test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/msun/tests/lrint_test.c b/lib/msun/tests/lrint_test.c index 29ba82222642..a3f4225dc569 100644 --- a/lib/msun/tests/lrint_test.c +++ b/lib/msun/tests/lrint_test.c @@ -41,9 +41,9 @@ #include "test-utils.h" #define test(func, x, result, excepts) do { \ - ATF_CHECK(feclearexcept(FE_ALL_EXCEPT) == 0); \ + ATF_REQUIRE(feclearexcept(FE_ALL_EXCEPT) == 0); \ long long _r = (func)(x); \ - ATF_CHECK_MSG(_r == (result) || fetestexcept(FE_INVALID), \ + ATF_REQUIRE_MSG(_r == (result) || fetestexcept(FE_INVALID), \ #func "(%Lg) returned %lld, expected %lld", (long double)x, _r, \ (long long)(result)); \ CHECK_FP_EXCEPTIONS_MSG(excepts, FE_ALL_EXCEPT & ALL_STD_EXCEPT, \ @@ -131,6 +131,9 @@ run_tests(void) ATF_TC_WITHOUT_HEAD(lrint); ATF_TC_BODY(lrint, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif run_tests(); #ifdef __i386__ fpsetprec(FP_PE); From nobody Fri Jun 26 17:00:00 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 4gn23P04Dcz6jmxL for ; Fri, 26 Jun 2026 17:00:01 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23N45Xnz4Dhs for ; Fri, 26 Jun 2026 17:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493200; 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=tieHzD2FRpO+JWJ8mFBjw4wRQNXKIqUgTOIM3gFCUTI=; b=frmUO3CO5IQdrAaICN6uR/hvXTl2uu1+4VPi7cv0N4hn1lVklzzzioEPSHorHnxPFqD0E6 8e4IyWivbBU64T4mTLdAiYeSr9RQr/ikqjFsM47PtuJimtQvmsRcNb48yAfPDJfsl5SeVL 9KCBI1S+O+accTeEa6AJfgZ1y2aZajT2Vshf3rODfQ5aseNhXE99OUTie5UDCrtwnRHMTU YB4aeWzIQzmfGJb0CQwDTW5SY77ZkvxPX0xlMVtW141inbCic3C1lwcnRd2WZKqe0sMpMk 6JW3Sg74sEKsjglZKZCB3u4auOUbgZGUfmuD6IB0DsEyR5oPgkeVfVNnG4j/Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493200; a=rsa-sha256; cv=none; b=VDlk8WGvOTijE1YNO5dcjF2oxVa+3c+K4HXQFERctwpkdM4Zhnlw1UR4DNOFonuIGZUX4x X+ykMNY69aekpmqJ7f0HFsDNcp4ZHYcK6qswbrOT2Yfj0igxCybtnEwinkvQfwIf4O2nys zcGkTzqmQLHHuILSFBUMmvdGkmxMmXOBXFGyX3JP9eKc9Jz+CVWE8cHMrfW8sdxsyj9I47 YxMlb1gePrzRxN8Eoy8q+BBw1Y+1o9xZOp5exYCVRGVNUMPZV0Rh2HcvccWR/9OfSTh4Yt ZOlHH5lxpYw3bkcaujempC2vHRk9VfNkLmHWNIPMJufXe6tOQwN+QF21lAz7vQ== 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=1782493200; 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=tieHzD2FRpO+JWJ8mFBjw4wRQNXKIqUgTOIM3gFCUTI=; b=yBHQTWJMCrvr71yJNfK9ZX/S86xYOUvX3Dlto7JqW/9sqFbYl6s2Nf1rFWISGpTVbXead9 uqOzZok2mc+13c9o31zcfFVqa5RQDgzVgeErWR32Vt+YqrQabXZpr13ia+t6ANAdHhdfUI HKCjrrqGVvOtWQ9jEhCo/Wt04TCc4EpYXWXMZQku0q7XlDXUXFFCaO+DAmQ0BQUn0p+nXX wWCFGYAvOKRzLUxdSLHDDXM44PqSw9LShr1F4QIfYKg8S1qkHG82p0o+cdagXRoOU/0dtW k+EEjlHyzvB6EfE97DkXClqCGpV3H0Y6HhDvBsYthX+aVZuY6mpFbS+ogw7UKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23N2y7tzmP1 for ; Fri, 26 Jun 2026 17:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36789 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 17:00:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: f08d5362b013 - stable/14 - lib/msun/tests: xfail remaining failing tests on non-x86 archs 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f08d5362b0138ad0be532fe339067224e470787d Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 17:00:00 +0000 Message-Id: <6a3eb010.36789.52a98367@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=f08d5362b0138ad0be532fe339067224e470787d commit f08d5362b0138ad0be532fe339067224e470787d Author: Siva Mahadevan AuthorDate: 2025-10-08 20:40:15 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:24 +0000 lib/msun/tests: xfail remaining failing tests on non-x86 archs These are the remaining trivial xfail cases where no other test logic changes are necessary. Signed-off-by: Siva Mahadevan PR: 290099 MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit 405188aeac540f7666dfde37c2f32d222119f56e) --- lib/msun/tests/cexp_test.c | 3 +++ lib/msun/tests/ctrig_test.c | 9 +++++++++ lib/msun/tests/exponential_test.c | 3 +++ lib/msun/tests/fma_test.c | 9 +++++++++ lib/msun/tests/invctrig_test.c | 15 +++++++++++++++ lib/msun/tests/logarithm_test.c | 11 +++++++++-- lib/msun/tests/lround_test.c | 3 +++ lib/msun/tests/nan_test.c | 3 +++ lib/msun/tests/nearbyint_test.c | 3 +++ lib/msun/tests/next_test.c | 9 +++++++++ lib/msun/tests/trig_test.c | 4 +++- 11 files changed, 69 insertions(+), 3 deletions(-) diff --git a/lib/msun/tests/cexp_test.c b/lib/msun/tests/cexp_test.c index a23e448ee62a..40605ed76f26 100644 --- a/lib/msun/tests/cexp_test.c +++ b/lib/msun/tests/cexp_test.c @@ -233,6 +233,9 @@ ATF_TC_BODY(imaginaries, tc) ATF_TC_WITHOUT_HEAD(small); ATF_TC_BODY(small, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif static const double tests[] = { /* csqrt(a + bI) = x + yI */ /* a b x y */ diff --git a/lib/msun/tests/ctrig_test.c b/lib/msun/tests/ctrig_test.c index 6a71770e791a..dc11993900aa 100644 --- a/lib/msun/tests/ctrig_test.c +++ b/lib/msun/tests/ctrig_test.c @@ -303,6 +303,9 @@ ATF_TC_HEAD(test_axes, tc) } ATF_TC_BODY(test_axes, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif static const long double nums[] = { M_PI / 4, M_PI / 2, 3 * M_PI / 4, 5 * M_PI / 4, 3 * M_PI / 2, 7 * M_PI / 4, @@ -366,6 +369,9 @@ ATF_TC_HEAD(test_small_inputs, tc) } ATF_TC_BODY(test_small_inputs, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif /* * z = 0.5 + i Pi/4 * sinh(z) = (sinh(0.5) + i cosh(0.5)) * sqrt(2)/2 @@ -433,6 +439,9 @@ ATF_TC_HEAD(test_large_inputs, tc) } ATF_TC_BODY(test_large_inputs, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif long double complex z; /* tanh() uses a threshold around x=22, so check both sides. */ diff --git a/lib/msun/tests/exponential_test.c b/lib/msun/tests/exponential_test.c index 9dc3b2698744..c3dcca869dcb 100644 --- a/lib/msun/tests/exponential_test.c +++ b/lib/msun/tests/exponential_test.c @@ -159,6 +159,9 @@ ATF_TC_BODY(exp2l, tc) ATF_TC_WITHOUT_HEAD(generic); ATF_TC_BODY(generic, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif run_generic_tests(); } diff --git a/lib/msun/tests/fma_test.c b/lib/msun/tests/fma_test.c index f8dee9e16a5b..1406d659f953 100644 --- a/lib/msun/tests/fma_test.c +++ b/lib/msun/tests/fma_test.c @@ -122,6 +122,9 @@ test_zeroes(void) static void test_infinities(void) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif testall(INFINITY, 1.0, -1.0, INFINITY, ALL_STD_EXCEPT, 0); testall(-1.0, INFINITY, 0.0, -INFINITY, ALL_STD_EXCEPT, 0); testall(0.0, 0.0, INFINITY, INFINITY, ALL_STD_EXCEPT, 0); @@ -472,6 +475,9 @@ static const int rmodes[] = { ATF_TC_WITHOUT_HEAD(zeroes); ATF_TC_BODY(zeroes, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif for (size_t i = 0; i < nitems(rmodes); i++) { debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); @@ -482,6 +488,9 @@ ATF_TC_BODY(zeroes, tc) ATF_TC_WITHOUT_HEAD(infinities); ATF_TC_BODY(infinities, tc) { +#if defined(__powerpc64__) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif for (size_t i = 0; i < nitems(rmodes); i++) { debug("rmode = %d\n", rmodes[i]); fesetround(rmodes[i]); diff --git a/lib/msun/tests/invctrig_test.c b/lib/msun/tests/invctrig_test.c index 170fb1cad3a3..ea49edd1dee4 100644 --- a/lib/msun/tests/invctrig_test.c +++ b/lib/msun/tests/invctrig_test.c @@ -124,6 +124,9 @@ c3pi = 9.42477796076937971538793014983850839L; ATF_TC_WITHOUT_HEAD(zero); ATF_TC_BODY(zero, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif long double complex zero = CMPLXL(0.0, 0.0); testall_tol(cacosh, zero, CMPLXL(0.0, pi / 2), 1); @@ -144,6 +147,9 @@ ATF_TC_BODY(zero, tc) ATF_TC_WITHOUT_HEAD(nan); ATF_TC_BODY(nan, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif long double complex nan_nan = CMPLXL(NAN, NAN); long double complex z; @@ -223,6 +229,9 @@ ATF_TC_BODY(nan, tc) ATF_TC_WITHOUT_HEAD(inf); ATF_TC_BODY(inf, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif long double complex z; /* @@ -270,6 +279,9 @@ ATF_TC_BODY(inf, tc) ATF_TC_WITHOUT_HEAD(axes); ATF_TC_BODY(axes, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif static const long double nums[] = { -2, -1, -0.5, 0.5, 1, 2 }; @@ -307,6 +319,9 @@ ATF_TC_BODY(axes, tc) ATF_TC_WITHOUT_HEAD(small); ATF_TC_BODY(small, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif /* * z = 0.75 + i 0.25 * acos(z) = Pi/4 - i ln(2)/2 diff --git a/lib/msun/tests/logarithm_test.c b/lib/msun/tests/logarithm_test.c index 9da4ad3ba407..28f9a328e1d8 100644 --- a/lib/msun/tests/logarithm_test.c +++ b/lib/msun/tests/logarithm_test.c @@ -93,7 +93,9 @@ ATF_TC_WITHOUT_HEAD(generic_tests); ATF_TC_BODY(generic_tests, tc) { - +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* log(1) == 0, no exceptions raised */ testall0(1.0, 0.0, ALL_STD_EXCEPT, 0); testall1(0.0, 0.0, ALL_STD_EXCEPT, 0); @@ -180,6 +182,9 @@ ATF_TC_BODY(roundingmode_tests, tc) ATF_TC_WITHOUT_HEAD(accuracy_tests); ATF_TC_BODY(accuracy_tests, tc) { +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif static const struct { float x; long double log2x; @@ -249,7 +254,9 @@ ATF_TC_BODY(log1p_accuracy_tests, tc) if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) atf_tc_expect_fail("https://bugs.freebsd.org/253984"); #endif - +#if defined(__riscv) + atf_tc_expect_death("https://bugs.freebsd.org/290099"); +#endif test_tol(log1pf, 0x0.333333p0F, 1.82321546859847114303367992804596800640e-1L, FLT_ULP()); test_tol(log1p, 0x0.3333333333333p0, diff --git a/lib/msun/tests/lround_test.c b/lib/msun/tests/lround_test.c index a61672617081..e22f59c323a2 100644 --- a/lib/msun/tests/lround_test.c +++ b/lib/msun/tests/lround_test.c @@ -65,6 +65,9 @@ ATF_TC_WITHOUT_HEAD(main); ATF_TC_BODY(main, tc) { +#if defined(__powerpc64__) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif testall(0.0, 0, 0); testall(0.25, 0, FE_INEXACT); testall(0.5, 1, FE_INEXACT); diff --git a/lib/msun/tests/nan_test.c b/lib/msun/tests/nan_test.c index 75c28d45fb78..e5b1334926f2 100644 --- a/lib/msun/tests/nan_test.c +++ b/lib/msun/tests/nan_test.c @@ -106,6 +106,9 @@ testnan(const char *nan_format) ATF_TC_WITHOUT_HEAD(nan); ATF_TC_BODY(nan, tc) { +#if defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* Die if a signalling NaN is returned */ feenableexcept(FE_INVALID); diff --git a/lib/msun/tests/nearbyint_test.c b/lib/msun/tests/nearbyint_test.c index 9dcdbdf6b852..cd2d9c139a9a 100644 --- a/lib/msun/tests/nearbyint_test.c +++ b/lib/msun/tests/nearbyint_test.c @@ -153,6 +153,9 @@ test_modf(int testindex) ATF_TC_WITHOUT_HEAD(nearbyint); ATF_TC_BODY(nearbyint, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif unsigned i; for (i = 0; i < nitems(tests); i++) { diff --git a/lib/msun/tests/next_test.c b/lib/msun/tests/next_test.c index 282e47d783a0..a14b1ba433d9 100644 --- a/lib/msun/tests/next_test.c +++ b/lib/msun/tests/next_test.c @@ -79,6 +79,9 @@ static const long double ldbl_eps = LDBL_EPSILON; ATF_TC_WITHOUT_HEAD(zeros); ATF_TC_BODY(zeros, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif long double ldbl_small; #ifdef __i386__ @@ -164,6 +167,9 @@ ATF_TC_BODY(ordinary, tc) ATF_TC_WITHOUT_HEAD(boundaries); ATF_TC_BODY(boundaries, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* * Tests at word boundaries, normalization boundaries, etc. */ @@ -211,6 +217,9 @@ ATF_TC_BODY(boundaries, tc) ATF_TC_WITHOUT_HEAD(overflow); ATF_TC_BODY(overflow, tc) { +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif long double ldbl_max; /* * We can't use a compile-time constant here because gcc on diff --git a/lib/msun/tests/trig_test.c b/lib/msun/tests/trig_test.c index d1d831e07c71..9ed35530ecd6 100644 --- a/lib/msun/tests/trig_test.c +++ b/lib/msun/tests/trig_test.c @@ -86,7 +86,9 @@ ATF_TC_HEAD(special, tc) } ATF_TC_BODY(special, tc) { - +#if defined(__aarch64__) || defined(__riscv) + atf_tc_expect_fail("https://bugs.freebsd.org/290099"); +#endif /* Values at 0 should be exact. */ testall(tan, 0.0, 0.0, ALL_STD_EXCEPT, 0); testall(tan, -0.0, -0.0, ALL_STD_EXCEPT, 0); From nobody Fri Jun 26 17:00:01 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 4gn23Q0Dgkz6jn7S for ; Fri, 26 Jun 2026 17:00:02 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23P4Lqyz4Dj6 for ; Fri, 26 Jun 2026 17:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493201; 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=BreJHPRfeX4CnB7o9/CqLqKsRB8zD9dLmrTP27s5DPo=; b=lT6/Q3udUanqr70WffEFHyy0/eR8ckZnw28fZqex6wKP5DGooIHW/UWHSdSeu7i1yxG0Pb NaXJG/sYar1wSZdRMyjzxspFcGoMUi4ymXYUaS2EzkfHtP4pVga8LOA1RLGNg7D6xvG+Yn r20fOtHPFN5wMyGqBolIXxYFPdrJBmg8YO4aOSyDniZ21/AAq/hnzRxR6np3mIRN2tHs1J K2rDCm+6LB2MiRjDckVE8LtjDV8x6Z9WopaxMwmPd//CccwC3Pa6YuCitUkelCg2mmBTXw IoWP5KeC31tuI23cp9bkB5lcx6aaAlEQ7LED5WtFZucaf46iWCsuyuPL3lr1sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493201; a=rsa-sha256; cv=none; b=yvufINixX2NV670fJ8Fni9gPaM1di/YV6AlPHMo/NFnKy8nA/rwhKgwMenDyFVQ1250O5R rQnVdcJWLfi36EShq0fTplybFimKPcvnkSSxuSe57jyIK2J3NQph+kThjOJV8u+ttJS6XG OjPRLtJ8l0kWqZgvS6hEFnG3+5/LOVxVgEBpCaBlTstfR/A+e7/H+yon6ovYHiAWbZQpkd neGfDDn/xRLe+L0xSVeMuyRY8CiB1VmHWiesOPDimofXfxOhCIlGPGCEOvkZzyONws7EEX 8KnCOK+NoW0E+oz/9tj7HsIAAia4iQ5hwPYxohjI5wQWEB3PcBfqz7P+1X0M+g== 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=1782493201; 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=BreJHPRfeX4CnB7o9/CqLqKsRB8zD9dLmrTP27s5DPo=; b=cZVI9kNQN22OciZXFrT6RdKRnFUl5mFXBS/1/5PN+DQGJ9ObobNUJF9j8svycnVR9Z1aYc +dxcINeEAXIMNTfBb3/6I/Z6N6eTZINKSRJSpYzCD5c8iLMhAtPerGEz1SqVf7RPBHs7i+ Qow/MvwdCBpxx8QR5xv2+68cx3mwLMi3ZoiS6VQHFJj/gN+5GAZrsTWAk4DBs73dZjp8je PURfkYSIt9BqvaaZnYD0vaFLPLQtTI+JTkFHWkSiiUc0jsod+oabM33JfTexEQpWmU2YxP XHQY7Xuhe9OAYpEJeuOdL9PcnIdg/1Jnqv641AIYkovjhriuCepnTbHd4tAIxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23P3PywzlhB for ; Fri, 26 Jun 2026 17:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35ee9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 17:00:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 487e1d061615 - stable/14 - msun/logarithm_test: expect_fail log1p_accuracy_tests in the correct spot 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 487e1d061615935c91c0ec71c7be3e6fb60cdeb1 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 17:00:01 +0000 Message-Id: <6a3eb011.35ee9.5e0dfeb0@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=487e1d061615935c91c0ec71c7be3e6fb60cdeb1 commit 487e1d061615935c91c0ec71c7be3e6fb60cdeb1 Author: Siva Mahadevan AuthorDate: 2026-06-17 17:04:54 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:59 +0000 msun/logarithm_test: expect_fail log1p_accuracy_tests in the correct spot While here, remove the conditional on the "ci" config var to ensure that this is reproducible locally as well. This fixes a case where we are expecting a fail before the failing ATF_CHECK_* assertion happens. Found in a CI failure here: https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16608/testReport/lib.msun/logarithm_test/log1p_accuracy_tests/ PR: 253984 Fixes: 405188aeac540f7666dfde37c2f32d222119f56e MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57351 (cherry picked from commit 19af9c77acc912e4bf90a667924f5f4ff78a7759) --- lib/msun/tests/logarithm_test.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/msun/tests/logarithm_test.c b/lib/msun/tests/logarithm_test.c index 28f9a328e1d8..970524f0fdd7 100644 --- a/lib/msun/tests/logarithm_test.c +++ b/lib/msun/tests/logarithm_test.c @@ -250,10 +250,6 @@ ATF_TC_BODY(accuracy_tests, tc) ATF_TC_WITHOUT_HEAD(log1p_accuracy_tests); ATF_TC_BODY(log1p_accuracy_tests, tc) { -#if LDBL_MANT_DIG > 64 - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_expect_fail("https://bugs.freebsd.org/253984"); -#endif #if defined(__riscv) atf_tc_expect_death("https://bugs.freebsd.org/290099"); #endif @@ -261,6 +257,9 @@ ATF_TC_BODY(log1p_accuracy_tests, tc) 1.82321546859847114303367992804596800640e-1L, FLT_ULP()); test_tol(log1p, 0x0.3333333333333p0, 1.82321556793954589204283870982629267635e-1L, DBL_ULP()); +#if LDBL_MANT_DIG > 64 + atf_tc_expect_fail("https://bugs.freebsd.org/253984"); +#endif test_tol(log1pl, 0x0.33333333333333332p0L, 1.82321556793954626202683007050468762914e-1L, LDBL_ULP()); From nobody Fri Jun 26 17:00:02 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 4gn23R1yq4z6jmxS for ; Fri, 26 Jun 2026 17:00:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23Q4mHmz4DqC for ; Fri, 26 Jun 2026 17:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493202; 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=5UTmYOt30FNOpx1UYvwE4YbFuePySscLW1J+j5+Cj/M=; b=D/4nK1tnt7R6GlzdDoX2R6iRcsw81hJYUWHNiKEirx1fvBHkj24NhsPzr07PgCJX4bwlh/ mV6me4CU/ilIVzaAbH9cEw2d87N9SCfgRlO7F2AiHHDCjN5+ZTq7pefJ6rKLZ+IPtC3xMH bsgXVPx1Ae3kWuwTJLuaaSzLGyM7rwxV+k7xXh0JAbc29Ze14K/MIJUblbvP3iPh7dZw1a xu5YGZYKnISMz9ubkKPwKL4y26eQZSpqjOZ1XzAgVUV4wq0pA7OjNiLlfd2A4cpisK8mdU WT7+grndz11iVtkZYpr8snVKFo8o4Ga/ihEmOqumDm230arSRf6A4nDAE9jDfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493202; a=rsa-sha256; cv=none; b=kk1DpKV8Ng0S2HCG3qgFMEKEkS9woOsH8jDnI/SXMmmlt7Ng3Ck5z93SGnz2fHTKsTDv4u Od5CcxZoKwZhOvKLI8XhPFS2AIostHRizyLjoCIP8qrBKggG3xyvyEPlcBDj3aBhLxIitz WRC9RGsjDgWsYc5Ca55oxGGH7fN4IjuxxXXSo9gldjTjmiO+g5hX128GubrK+a+KeRgH6K rBwI+mXmq0xih+VLhyziGxFpNacHvM8OUIMWCVrEb+2zmP1isnst0TJj+50lDFCnMnI9Zi 2hmyajv/q2Tj6bgr6zJLNnVMCl6SJMyY41nI4t6IE+dVFpdw/iQGdy8cUW2CSg== 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=1782493202; 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=5UTmYOt30FNOpx1UYvwE4YbFuePySscLW1J+j5+Cj/M=; b=Yx+s6L/syT6xyyuWf+/XGN+7pVdawCCWx54YM2S/WYf9y5kiGow3DhiFV82UgQWxUod9GU ONJKk4JkbbL9fe8BSVXOgwRpFXKwAULVfTws62zGMreXv6cUSOppEAoHEE3EDVK21SO0S5 xpe2PwnpcPSUSXIX4K8KgdIpslGD3WCQAys1eBgJau4uWhQd63zoDQJ++CWRfu9rldvmBk Hazj/HgAq08yf6JsnMmAmbmoa/oSoJys2hcft4ROGaJOB1rTVF0j7904qwPrbDboEDA8zS PVtSLwSa3zfrUmjBwcrwHegsGmHiB+ZWDnsy5lczHR7kHNOdn/V7YFDj32Iodw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23Q3hcZzlhC for ; Fri, 26 Jun 2026 17:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 17:00:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 62bb16c64737 - stable/14 - lib/msun/tests: re-enable nan_test on riscv 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 62bb16c64737b32b43a2824d158923bc6245b6bc Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 17:00:02 +0000 Message-Id: <6a3eb012.367a1.184ad2cc@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=62bb16c64737b32b43a2824d158923bc6245b6bc commit 62bb16c64737b32b43a2824d158923bc6245b6bc Author: Siva Mahadevan AuthorDate: 2026-06-15 22:27:52 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:11:03 +0000 lib/msun/tests: re-enable nan_test on riscv Commit 1e25cda7f06923d05e28dac8eb1c1c428a5c92dc fixed it. MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 52ad4f883489f73e7a876f5cf296bb5a7dc696a2) --- lib/msun/tests/nan_test.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/msun/tests/nan_test.c b/lib/msun/tests/nan_test.c index e5b1334926f2..75c28d45fb78 100644 --- a/lib/msun/tests/nan_test.c +++ b/lib/msun/tests/nan_test.c @@ -106,9 +106,6 @@ testnan(const char *nan_format) ATF_TC_WITHOUT_HEAD(nan); ATF_TC_BODY(nan, tc) { -#if defined(__riscv) - atf_tc_expect_fail("https://bugs.freebsd.org/290099"); -#endif /* Die if a signalling NaN is returned */ feenableexcept(FE_INVALID); From nobody Fri Jun 26 22:20:44 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 4gn99T358Cz6j2hD for ; Fri, 26 Jun 2026 22:20:45 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99T0gwyz3mJ5 for ; Fri, 26 Jun 2026 22:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512445; 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=usilsFiOaQMx4Q1MoTXclvTPZn2LyhPhp2KUzpQhhOM=; b=qpzzh+dpq4faCHhkG7qZSCSKhkNXmBbzy+F6R5r9KAH02ppt8gaieCyNL71Mq1UEqYKcbA zDclhA4Del8GdonazlmDU0rGyhsTUm0tONcDrJxkJi3FTdBlYfZ80yM9hXdeVNsbyHU8Ip lRGV9fLXGtydj5VhdQkQpDunUzGai+GQor+Yl5gs5bA+msJRNSy0HhtiSvqSJ5pc14hyw5 M09RCZx7vIjXm+XiM5IX9C03WvN+HPm0RXsgSCbXzuK0L+YWEqGFvrVQgmpaZ0e7yP+kQz wON7sxs4wq6yxLTZJ9yQXiHAMjFmBsOIsBPcAlhVKqGiQo/2NvT0f7hhGxzSuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512445; a=rsa-sha256; cv=none; b=TaRinaOws0yZpoyPbYakFxOJ8n0dlQlsaen5M5nhJYKzssfEB6h8KLFU1Dh/0AVHiBhjbU uYDR6kImEIn5hI+I1TwfOaMg+c/+xOAqnZ8WPginx3SxyNrjuN7tDxmJd00c/3I6MJjPAM o5a5+rPkNhCHqoXeCe+d31BIo8VtdGRQN61isvKg0TiR+XEC6FQ33CRuCGuBlCCy5vsxvv V5ooqHK1543mR5oqOuWokSfUG2p/3FwmjLMscqFAOKbWbg4iEKpKHtB3001oGMrphw/qR3 /Wx6dkpoZZCo+94cuffkXeM3Imklmwrp8qFjCvbr20c6tOJTQUwQBgDW00QpyQ== 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=1782512445; 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=usilsFiOaQMx4Q1MoTXclvTPZn2LyhPhp2KUzpQhhOM=; b=CGoKkeLlPjUDbbv/Gxox/10EWao5207k7TV4GvMABEFz92syv9EkyIg6F4Vs1fUl5mkSbr r9fEJ3U82UDjSKUtGHXLRRht8U9p+BDNhVhpY2xbKHCAkTue1aOMw0vXwTUj4/KdHRbMhB ZeKJdOzAPpkN+R+nwb+7wYle55e8+iXEDEecCi6C91/2v4FFB+UuV9fZ+1XA5IbJbxacKa QEgaDtew7+jHQSXYPStH5rZ+Sl/Kxf7WocaR9l0tV6v3hOy8UFJubAAi5GfR9D38XEOdzv l+n5uv49K0m7y/aCPHhQaVhwPXBXHLcTrjd5SZ2clvOX2k96X27EmProe8IbaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99S6vFPzxJt for ; Fri, 26 Jun 2026 22:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 272c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a80e40ce9ee0 - stable/15 - execve_block(): a mechanism for mutual exclusion with execve() on the process 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a80e40ce9ee0a0641927730a193ff1f5641e71b6 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:44 +0000 Message-Id: <6a3efb3c.272c8.a59c457@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a80e40ce9ee0a0641927730a193ff1f5641e71b6 commit a80e40ce9ee0a0641927730a193ff1f5641e71b6 Author: Konstantin Belousov AuthorDate: 2026-05-26 17:36:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:03 +0000 execve_block(): a mechanism for mutual exclusion with execve() on the process (cherry picked from commit e1a84b7708c2514769625c2af6c5034694013b6a) --- sys/kern/kern_exec.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++-- sys/kern/kern_exit.c | 1 + sys/kern/kern_fork.c | 1 + sys/sys/imgact.h | 3 +++ sys/sys/proc.h | 3 ++- 5 files changed, 74 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index e7552bab6005..ed7534af21bf 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -385,6 +385,62 @@ execve_nosetid(struct image_params *imgp) } } +/* + * Returns true if the execblock was obtained, in this case the + * process lock is kept. Returns false if the execblock was not + * obtained, but the function slept and the lock was dropped. + */ +bool +execve_block(struct thread *td, struct proc *p) +{ + PROC_LOCK_ASSERT(p, MA_OWNED); + MPASS(td == curthread); + MPASS(p != td->td_proc || (p->p_flag & P_INEXEC) == 0); + + if (p != td->td_proc && (p->p_flag & P_INEXEC) != 0) { + p->p_flag |= P_INEXEC_WAIT; + msleep(&p->p_execblock, &p->p_mtx, PDROP, "inexec", 0); + return (false); + } + MPASS(p->p_execblock < UINT_MAX); + p->p_execblock++; + return (true); +} + +/* + * Might drop the process lock internally, callers must re-check the + * invariants afterward. + */ +void +execve_block_wait(struct thread *td, struct proc *p) +{ + bool first; + + PROC_ASSERT_HELD(p); + PROC_LOCK_ASSERT(p, MA_OWNED); + + for (first = true;; first = false) { + if (!first) + PROC_LOCK(p); + if (execve_block(td, p)) + return; + } +} + +void +execve_unblock(struct thread *td, struct proc *p) +{ + PROC_LOCK_ASSERT(p, MA_OWNED); + MPASS(td == curthread); + + MPASS(p->p_execblock > 0); + p->p_execblock--; + if (p->p_execblock == 0 && (p->p_flag & P_INEXEC_WAIT) != 0) { + p->p_flag &= ~P_INEXEC_WAIT; + wakeup(&p->p_execblock); + } +} + /* * In-kernel implementation of execve(). All arguments are assumed to be * userspace pointers from the passed thread. @@ -440,6 +496,10 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p, PROC_LOCK(p); KASSERT((p->p_flag & P_INEXEC) == 0, ("%s(): process already has P_INEXEC flag", __func__)); + while (p->p_execblock != 0) { + p->p_flag |= P_INEXEC_WAIT; + msleep(&p->p_execblock, &p->p_mtx, 0, "exeblk", 0); + } p->p_flag |= P_INEXEC; PROC_UNLOCK(p); @@ -910,7 +970,10 @@ interpret: * as we're now a bona fide freshly-execed process. */ KNOTE_LOCKED(p->p_klist, NOTE_EXEC); - p->p_flag &= ~P_INEXEC; + MPASS(p->p_execblock == 0); + if ((p->p_flag & P_INEXEC_WAIT) != 0) + wakeup(&p->p_execblock); + p->p_flag &= ~(P_INEXEC | P_INEXEC_WAIT); /* clear "fork but no exec" flag, as we _are_ execing */ p->p_acflag &= ~AFORK; @@ -1006,7 +1069,9 @@ exec_fail_dealloc: exec_fail: /* we're done here, clear P_INEXEC */ PROC_LOCK(p); - p->p_flag &= ~P_INEXEC; + if ((p->p_flag & P_INEXEC_WAIT) != 0) + wakeup(&p->p_execblock); + p->p_flag &= ~(P_INEXEC | P_INEXEC_WAIT); PROC_UNLOCK(p); SDT_PROBE1(proc, , , exec__failure, error); diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 2f94386c9101..8f9007752b3b 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -365,6 +365,7 @@ exit1(struct thread *td, int rval, int signo) while (p->p_lock > 0) msleep(&p->p_lock, &p->p_mtx, PWAIT, "exithold", 0); + MPASS(p->p_execblock == 0); PROC_UNLOCK(p); /* Drain the limit callout while we don't have the proc locked */ callout_drain(&p->p_limco); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 3de2a6224834..313fdef86fd8 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -431,6 +431,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * bzero(&p2->p_startzero, __rangeof(struct proc, p_startzero, p_endzero)); + p2->p_execblock = 0; /* Tell the prison that we exist. */ prison_proc_hold(p2->p_ucred->cr_prison); diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h index 51cda4406cad..8c91b3a54bfa 100644 --- a/sys/sys/imgact.h +++ b/sys/sys/imgact.h @@ -123,6 +123,9 @@ int exec_shell_imgact(struct image_params *); int exec_copyin_args(struct image_args *, const char *, char **, char **); int pre_execve(struct thread *td, struct vmspace **oldvmspace); void post_execve(struct thread *td, int error, struct vmspace *oldvmspace); +bool execve_block(struct thread *td, struct proc *p); +void execve_block_wait(struct thread *td, struct proc *p); +void execve_unblock(struct thread *td, struct proc *p); #endif #endif /* !_SYS_IMGACT_H_ */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index fd5c366ab95d..4e423c3ad0c7 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -780,6 +780,7 @@ struct proc { LIST_ENTRY(proc) p_jaillist; /* (d) Jail process linkage. */ u_int p_asig; /* (c) ASYNCEXIT pending signal. */ u_int p_tree_refcnt; /* (e) proctree refcount */ + u_int p_execblock; /* (c) Blockers for execve. */ }; #define p_session p_pgrp->pg_session @@ -852,7 +853,7 @@ struct proc { #define P_STATCHILD 0x08000000 /* Child process stopped or exited. */ #define P_INMEM 0x10000000 /* Loaded into memory, always set. */ #define P_ASYNC_EXIT 0x20000000 /* XXX */ -#define P_UNUSED2 0x40000000 /* --available-- */ +#define P_INEXEC_WAIT 0x40000000 /* Waiters for P_INEXEC/p_execblock */ #define P_PPTRACE 0x80000000 /* PT_TRACEME by vforked child. */ #define P_STOPPED (P_STOPPED_SIG|P_STOPPED_SINGLE|P_STOPPED_TRACE) From nobody Fri Jun 26 22:20:46 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 4gn99V4R56z6j2SV for ; Fri, 26 Jun 2026 22:20:46 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99V1Sttz3mLl for ; Fri, 26 Jun 2026 22:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512446; 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=w5hYGIXg2zcTs9NMTGS8QNI0vot2gYvJ0FGhP8wVqOM=; b=G7lQhpJCjzgbfwfx/bSkJZBqHBKyRE0N+rdoWKd26zpCj0N1DCKhpf4I8CQSaizdA0NvxJ 39zqvYeCzIPyaRCmZGdav4fN9+4C70ibMJxGJXfTQNXivnDYj1TchqujuGQ+NUALM8nwW0 Dj0GyuIISlQOrNhDGeVlTuZEG5KH3dwWR1AsCT+a7FHFmON1ty7ploqGIqlPDfWMUCwwqL uP+tZi8REyMtHl6QUjrILk5DymDpuFYaW8trE3uK7t2bF1dy3ozRxUTyGcLV9FHy0O7a0+ WXJf64n2SLhlfBYQ0KpUCiviiRTf/ktOpiI1b6laopSsU+vDQJJeZj8VzpJK1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512446; a=rsa-sha256; cv=none; b=gCn0LVUDfpMqaB7dprxRJ4y1rzjUuDPa2GIM/eX4qwV4lAXmsJnt5mVpyo9IwkC0oISO8n uypPJwGupXMM7LMMTa4DrKFZ60ZG3nrrPPLTV/a6DwkSedtbCnhxIsmTvnundLI9szWVMs yfUg7aLp8hei8MxjogZ72tHuRBSsPQ4iPfQlQqWxEGUaFYHwo6ynIQ5g9WAgWnNxGV/GBH RCJ720rJAii2ZCL8wXWJfYVbVnS0ruvBwamOZqauhZUOEKq2usCD2KNIM0N5apciz3Dxo9 sK8XYn0cOWzJgvI6eX1r80QnP7g3iWA+awfYqqVwwh0f8zKmJrFScuIiANzfVA== 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=1782512446; 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=w5hYGIXg2zcTs9NMTGS8QNI0vot2gYvJ0FGhP8wVqOM=; b=rkNtYcWTmvLEZdSTxWaWsyyRmt2wnlCGP9h672d+14qOZqDh6v2vdlx66R79amulKKQzMW kokj1sIUcjbrV6vZiF8rPI5RS4moFcLDzy9dHxQrCfC5z8Sm2/c8RI2F5teFPmCx/+P4pl 7598w0JlIK6cpRTJwMzqMzbdrsRwrkpejyouV1HM9uM866roGTTagAXDZGjYXlyHtz6YtV Y68Y+7KvLHs5o3JZJ5bFToSz1ZmWTEl32NkIqrQxQdITJJwBVnVJDTEeULYwkPGC9j1Ehc nJjghoeLBwCNsW8Bx3TPau0YSj+SFHxmokMbDEGc8h4F/a5Y+u0WjcsTgxEL3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99V0GJtzxSC for ; Fri, 26 Jun 2026 22:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3096e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cbd584772858 - stable/15 - execve_block_pass(9): a helper to wait for the execblock to pass 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cbd58477285888b1b7ff21bdd0bc039f7ffad4ef Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:46 +0000 Message-Id: <6a3efb3e.3096e.7b2d1ce7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cbd58477285888b1b7ff21bdd0bc039f7ffad4ef commit cbd58477285888b1b7ff21bdd0bc039f7ffad4ef Author: Konstantin Belousov AuthorDate: 2026-06-17 19:06:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:03 +0000 execve_block_pass(9): a helper to wait for the execblock to pass (cherry picked from commit 450fe67d19eb2ea8e27109214ff21064fdcf808c) --- sys/kern/kern_exec.c | 20 ++++++++++++++++---- sys/sys/imgact.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index ed7534af21bf..a3c9a4baa787 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -441,6 +441,21 @@ execve_unblock(struct thread *td, struct proc *p) } } +void +execve_block_pass(struct thread *td) +{ + struct proc *p; + + MPASS(td == curthread); + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + + while (p->p_execblock != 0) { + p->p_flag |= P_INEXEC_WAIT; + msleep(&p->p_execblock, &p->p_mtx, 0, "exeblk", 0); + } +} + /* * In-kernel implementation of execve(). All arguments are assumed to be * userspace pointers from the passed thread. @@ -496,10 +511,7 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p, PROC_LOCK(p); KASSERT((p->p_flag & P_INEXEC) == 0, ("%s(): process already has P_INEXEC flag", __func__)); - while (p->p_execblock != 0) { - p->p_flag |= P_INEXEC_WAIT; - msleep(&p->p_execblock, &p->p_mtx, 0, "exeblk", 0); - } + execve_block_pass(td); p->p_flag |= P_INEXEC; PROC_UNLOCK(p); diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h index 8c91b3a54bfa..df7d8b2d3908 100644 --- a/sys/sys/imgact.h +++ b/sys/sys/imgact.h @@ -126,6 +126,7 @@ void post_execve(struct thread *td, int error, struct vmspace *oldvmspace); bool execve_block(struct thread *td, struct proc *p); void execve_block_wait(struct thread *td, struct proc *p); void execve_unblock(struct thread *td, struct proc *p); +void execve_block_pass(struct thread *td); #endif #endif /* !_SYS_IMGACT_H_ */ From nobody Fri Jun 26 22:20:47 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 4gn99W4h6jz6j2WJ for ; Fri, 26 Jun 2026 22:20:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99W1vhGz3m7f for ; Fri, 26 Jun 2026 22:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512447; 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=dRMfOxa4u9Nu9Sm1lH4et5aNp2kr0NtiWPC/5lJQNCQ=; b=IHTLyUQB5V0qTIpTBTDlyqjQAx59rPixoJnR3e4d1iXd706sJc2x/SySmm2mIhjBV98CYX HuLw0acquOxDBpltM4OW6Q3rBdbloH8PTAXq+y2Rk1RgyHFa0T1eFxG1kdKL1BB8jxq0Oe tnm7RY4yfyxrD539Hv5W+mjNfc6GBpELkR8Fed2b9rjpNIxXCJnmY+7AN2e6UQ2BroDZ5o sMJna0P3z6yqHRAxyOMlxYJLYZ3jdUzE4YFLAefHWDTKqII28cO4AmGv4GmN/k947YPU3C AQ+4sDgnseO2HyU4JsQ7kJJThtM5I6b6+BicbGEtH0xeEv8jmvy/VYvcvXuLgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512447; a=rsa-sha256; cv=none; b=AlxZqyvA4ygd3aoqXLwBZe3ORuZaR08amYzZsAmAfZ3yxAs+TwMRpfGCEO2UmMUCdtzmP5 G+HfIdzJq9+ew2jA2T+xeMnDlbNfizyKdYGybZ+AFa3gasuJOyjaq7RQFHC9UIPqPfJtUt /nPRPfvEHw7wBlJuj9YP//KBWCK9BXKWvl1gKv/QyPD8cH6TdUbeP+AK/jVfXjnRNlPCo0 y9HzQuGuObe9/RiL1xbh2+ryluLPkoW5xCeAw9C0o6HLkE435GT6Xle4XVGwc8ys2LNFRR 1RecWR2wP+bmZ6nCFR7LSGDRNEg6dStMiUVmQ4aUpk8y+LB+jhEUupw6tYnPsA== 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=1782512447; 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=dRMfOxa4u9Nu9Sm1lH4et5aNp2kr0NtiWPC/5lJQNCQ=; b=Ei/YrZAi0cPrDOFXw9ZJuctsuyXfug415tUqBYPQWyQoATBjTQtGNaspZS36wME5ZHOegR 2lxIIUaIAqW6Ep0b7ftSmmXa0H/VXdumkz663drYsZm7XuxcpYofB1lFdmq7DQWPwjA+cu DiVKEKCLD5BDtEKS0RVO9V8TyWORh4ndxpkB6CzPYwwEx8dqE9CgIG9DrnMAhGpQIaO/mC gyB4ehtfVaq5/6kzVjCNge3Wr0/rwFwgZ37vPnfGDBXjkzqn/xHSPnD82+GlXzIj1hlkVJ HrV/ADc135UQiv56PRFbijdYjrvFSsKLyBALfcZwZLNSObvQmj0cfYIqHuwcsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99W0hlpzwtg for ; Fri, 26 Jun 2026 22:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30bfd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: be6e51310667 - stable/15 - proc: Allow to make proc_rwmem() operate on a consistent address space 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: be6e5131066753dc23f8e9f223acc023b7618b63 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:47 +0000 Message-Id: <6a3efb3f.30bfd.6704c75b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be6e5131066753dc23f8e9f223acc023b7618b63 commit be6e5131066753dc23f8e9f223acc023b7618b63 Author: Konstantin Belousov AuthorDate: 2026-06-07 17:57:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:04 +0000 proc: Allow to make proc_rwmem() operate on a consistent address space (cherry picked from commit e1b0d051bbf7e4e730470cbd6622f71a639834c3) --- sys/fs/cuse/cuse.c | 4 +- sys/fs/procfs/procfs_mem.c | 2 +- sys/kern/kern_prot.c | 10 ++-- sys/kern/sys_process.c | 131 +++++++++++++++++++++++++++++++++++++-------- sys/sys/ptrace.h | 15 +++++- 5 files changed, 131 insertions(+), 31 deletions(-) diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index b914b2d5017c..8f67c4b5572b 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -916,7 +916,7 @@ cuse_proc2proc_copy(struct proc *proc_s, vm_offset_t data_s, }; PHOLD(proc_s); - error = proc_rwmem(proc_s, &uio); + error = proc_rwmem(proc_s, &uio, 0); PRELE(proc_s); } else if (proc_cur == proc_s) { @@ -935,7 +935,7 @@ cuse_proc2proc_copy(struct proc *proc_s, vm_offset_t data_s, }; PHOLD(proc_d); - error = proc_rwmem(proc_d, &uio); + error = proc_rwmem(proc_d, &uio, 0); PRELE(proc_d); } else { error = EINVAL; diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 0020b8f8a8d8..824fcd33b2ef 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -64,7 +64,7 @@ procfs_doprocmem(PFS_FILL_ARGS) error = p_candebug(td, p); PROC_UNLOCK(p); if (error == 0) - error = proc_rwmem(p, uio); + error = proc_rwmem(p, uio, 0); return (error); } diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index c8dc05f0ebbd..47744f6b07fe 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -2360,11 +2360,11 @@ p_candebug(struct thread *td, struct proc *p) } /* - * Can't trace a process that's currently exec'ing. - * - * XXX: Note, this is not a security policy decision, it's a - * basic correctness/functionality decision. Therefore, this check - * should be moved to the caller's of p_candebug(). + * Can't trace a process that's currently exec'ing. Otherwise + * the process vmspace might change, and the target might be + * loading a setugid image. The execve_block(9) and + * proc_vmspace_ref(9) allow to get the stable credentials and + * vmspace reference. */ if ((p->p_flag & P_INEXEC) != 0) return (EBUSY); diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 7225a63328b4..023d61d4346c 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -333,25 +334,93 @@ proc_sstep(struct thread *td) return (ptrace_single_step(td)); } +static int +proc_vmspace_check_access(struct thread *td, struct proc *p, int flags) +{ + PROC_ASSERT_HELD(p); + if ((flags & PRVM_CHECK_DEBUG) != 0) + return (p_candebug(td, p)); + if ((flags & PRVM_CHECK_VISIBILITY) != 0) + return (p_cansee(td, p)); + return (0); +} + int -proc_rwmem(struct proc *p, struct uio *uio) +proc_vmspace_ref(struct thread *td, struct proc *p, int flags, + struct vmspace **vmp) +{ + struct vmspace *vm; + int error; + + MPASS((flags & ~(PRVM_BLOCK_EXEC | PRVM_CHECK_VISIBILITY | + PRVM_CHECK_DEBUG)) == 0); + MPASS((flags & (PRVM_CHECK_VISIBILITY | PRVM_CHECK_DEBUG)) != + (PRVM_CHECK_VISIBILITY | PRVM_CHECK_DEBUG)); + + PROC_LOCK(p); + if (p != td->td_proc) { + PROC_ASSERT_HELD(p); + + /* + * Make sure that the vmspace doesn't switch out from + * under us. + */ + if ((flags & PRVM_BLOCK_EXEC) != 0) { + for (;;) { + if (!execve_block(td, p)) { + PROC_LOCK(p); + continue; + } + error = proc_vmspace_check_access(td, p, flags); + if (error != 0) { + execve_unblock(td, p); + PROC_UNLOCK(p); + return (error); + } + break; + } + } else { + error = proc_vmspace_check_access(td, p, flags); + if (error != 0) { + PROC_UNLOCK(p); + return (error); + } + } + } + vm = vmspace_acquire_ref(p); + if (vm == NULL) { + if (p != td->td_proc && (flags & PRVM_BLOCK_EXEC) != 0) + execve_unblock(td, p); + PROC_UNLOCK(p); + return (ESRCH); + } + PROC_UNLOCK(p); + *vmp = vm; + return (0); +} + +void +proc_vmspace_unref(struct thread *td, struct proc *p, int flags, + struct vmspace *vm) +{ + vmspace_free(vm); + if (p != td->td_proc && (flags & PRVM_BLOCK_EXEC) != 0) { + PROC_LOCK(p); + PROC_ASSERT_HELD(p); + execve_unblock(td, p); + PROC_UNLOCK(p); + } +} + +static int +vmspace_rwmem(struct vmspace *vm, struct uio *uio) { vm_map_t map; vm_offset_t pageno; /* page number */ vm_prot_t reqprot; int error, fault_flags, page_offset, writing; - /* - * Make sure that the process' vmspace remains live. - */ - if (p != curproc) - PROC_ASSERT_HELD(p); - PROC_LOCK_ASSERT(p, MA_NOTOWNED); - - /* - * The map we want... - */ - map = &p->p_vmspace->vm_map; + map = &vm->vm_map; /* * If we are writing, then we request vm_fault() to create a private @@ -363,9 +432,9 @@ proc_rwmem(struct proc *p, struct uio *uio) fault_flags = writing ? VM_FAULT_DIRTY : VM_FAULT_NORMAL; if (writing) { - error = priv_check_cred(p->p_ucred, PRIV_PROC_MEM_WRITE); - if (error) - return (error); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + goto out; } /* @@ -423,16 +492,34 @@ proc_rwmem(struct proc *p, struct uio *uio) } while (error == 0 && uio->uio_resid > 0); +out: return (error); } -static ssize_t -proc_iop(struct thread *td, struct proc *p, vm_offset_t va, void *buf, +int +proc_rwmem(struct proc *p, struct uio *uio, int flags) +{ + struct vmspace *vm; + struct thread *td; + int error; + + td = curthread; + error = proc_vmspace_ref(td, p, flags, &vm); + if (error != 0) + return (error); + error = vmspace_rwmem(vm, uio); + proc_vmspace_unref(td, p, flags, vm); + return (error); +} + +ssize_t +vmspace_iop(struct thread *td, struct vmspace *vm, vm_offset_t va, void *buf, size_t len, enum uio_rw rw) { struct iovec iov; struct uio uio; ssize_t slen; + int error; MPASS(len < SSIZE_MAX); slen = (ssize_t)len; @@ -446,8 +533,8 @@ proc_iop(struct thread *td, struct proc *p, vm_offset_t va, void *buf, uio.uio_segflg = UIO_SYSSPACE; uio.uio_rw = rw; uio.uio_td = td; - proc_rwmem(p, &uio); - if (uio.uio_resid == slen) + error = vmspace_rwmem(vm, &uio); + if (error != 0 || uio.uio_resid == slen) return (-1); return (slen - uio.uio_resid); } @@ -457,7 +544,7 @@ proc_readmem(struct thread *td, struct proc *p, vm_offset_t va, void *buf, size_t len) { - return (proc_iop(td, p, va, buf, len, UIO_READ)); + return (vmspace_iop(td, p->p_vmspace, va, buf, len, UIO_READ)); } ssize_t @@ -465,7 +552,7 @@ proc_writemem(struct thread *td, struct proc *p, vm_offset_t va, void *buf, size_t len) { - return (proc_iop(td, p, va, buf, len, UIO_WRITE)); + return (vmspace_iop(td, p->p_vmspace, va, buf, len, UIO_WRITE)); } static int @@ -1458,7 +1545,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) goto out; } PROC_UNLOCK(p); - error = proc_rwmem(p, &uio); + error = proc_rwmem(p, &uio, 0); piod->piod_len -= uio.uio_resid; PROC_LOCK(p); break; diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index cdde142d0487..2ef52b22044c 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -247,7 +247,20 @@ int proc_write_fpregs(struct thread *_td, struct fpreg *_fpreg); int proc_read_dbregs(struct thread *_td, struct dbreg *_dbreg); int proc_write_dbregs(struct thread *_td, struct dbreg *_dbreg); int proc_sstep(struct thread *_td); -int proc_rwmem(struct proc *_p, struct uio *_uio); + +#define PRVM_BLOCK_EXEC 0x00000001 +#define PRVM_CHECK_VISIBILITY 0x00000002 +#define PRVM_CHECK_DEBUG 0x00000004 + +#include +struct vmspace; +int proc_vmspace_ref(struct thread *_td, struct proc *_p, int _flags, + struct vmspace **_vmp); +void proc_vmspace_unref(struct thread *_td, struct proc *_p, int _flags, + struct vmspace *_vm); +ssize_t vmspace_iop(struct thread *td, struct vmspace *vm, vm_offset_t va, + void *buf, size_t len, enum uio_rw rw); +int proc_rwmem(struct proc *_p, struct uio *_uio, int _flags); ssize_t proc_readmem(struct thread *_td, struct proc *_p, vm_offset_t _va, void *_buf, size_t _len); ssize_t proc_writemem(struct thread *_td, struct proc *_p, vm_offset_t _va, From nobody Fri Jun 26 22:20:48 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 4gn99X4FYdz6j2YW for ; Fri, 26 Jun 2026 22:20:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99X26fkz3m7h for ; Fri, 26 Jun 2026 22:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512448; 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=1I+ra3EClQaRFTs5YcKUQuKZZ+uluoScotLNBT5NQHc=; b=pcz7HGgB2ma9Hyjj/jmpraj1F0A0Ypi6OIVDks/vlWoAzziVlcksUMz4dYeFv4YsIcsgXE cfseu4HlpzlA+kl2NZrqRpMsC0EYkGeyXT/WhLyl9JdX7Peb+Ezd2YPqGF3kZ+lyPuZ3wD awcJqae9MMkaNBt3EuyaLYmgEjZEydCTRp94eUVNMl1zHaYelF//ZmGH1vrCMy7jEnYyDF rj+XNOfuBz/gKWa6T7QEW4drLvqZt/ok5P5miFmdd2nAWvcFXMXRKkAvImmbTP/dYt9V3/ Agxx4gPbHYtC47AgmwcF2S3AlcBeM69dRhowj3qOfQTi6vnctj81nUEgI667sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512448; a=rsa-sha256; cv=none; b=Q9yPkYBc8lVXLj+lU2NxiD1P9ig7D1gA5uTLU/Gr/hX/bzOeZVf0J0OAKxXO10QMr10nQ8 bhDBVaUVw6YRL4AZugX8iRb3kLTOjJHNi4q63Ya1LjhlemAmTrKamIg9jRACzW6/GMaahM I7raghzPpt10MtwQbqAgdDA/YtOd5D3ByKaePMXvLgYeVDMPrEKu3UZL3M+K2w3K4vWaEH SrEYq3Tcplb2B6UDHC5XW7bLX3fTObeO9D2/XxBmfa3PrMS6Bcj1OwBqYhybuvCgwebugD rg+HMCH0VfM7aLQHazoHGSljL9cEds/7r7SEf+GBJ645yDIWGFOB7kIKVh/itA== 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=1782512448; 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=1I+ra3EClQaRFTs5YcKUQuKZZ+uluoScotLNBT5NQHc=; b=mXFFHOOYhd+RIjt7yyqatM/9cLrGhaSurpu1rqVfAHuo/S4wO7r+E1WIiLow7lp2iitZbA A36RDkbY7E/O8QZyhtqekalgqERHRU4eX4xJXaGTQw+ibAFDpfJERbOrma/+Cz/qtsu1z0 qo9YeGtnaUqLl/AhcLRtSOu/Y4iR8orOqvaZEd/cXWTsQIqqYHKoS1tsHlC3P8cwe2mMXc zY/8YqAnACIymieaI1p/q3LoRVvKhPKrnNg2PPMqsGB4RfO/DRQTtu+toe488Gheccnz3Y j3W9KyRG2MBw0wJQ8WhoHfKDMeXkn5GNu5cU31AO8x/lerXTm2a/Xf9ZQsOpUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99X19YyzxMn for ; Fri, 26 Jun 2026 22:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2744a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3748c2e25704 - stable/15 - kern_proc.c: ensure stability of the vmspace we read the strings from 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3748c2e257046056b969a5d47231695798198f4d Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:48 +0000 Message-Id: <6a3efb40.2744a.1614424@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3748c2e257046056b969a5d47231695798198f4d commit 3748c2e257046056b969a5d47231695798198f4d Author: Konstantin Belousov AuthorDate: 2026-06-07 19:12:54 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:04 +0000 kern_proc.c: ensure stability of the vmspace we read the strings from (cherry picked from commit a22c044cce41864a32af6b8281a3c416a2664d7f) --- sys/kern/kern_proc.c | 60 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 71d5faf3c050..7c1a75e480bc 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1839,8 +1839,8 @@ pargs_drop(struct pargs *pa) } static int -proc_read_string(struct thread *td, struct proc *p, const char *sptr, char *buf, - size_t len) +proc_read_string(struct thread *td, struct vmspace *vm, const char *sptr, + char *buf, size_t len) { ssize_t n; @@ -1849,7 +1849,7 @@ proc_read_string(struct thread *td, struct proc *p, const char *sptr, char *buf, * and is aligned at the end of the page, and the following page is not * mapped. */ - n = proc_readmem(td, p, (vm_offset_t)sptr, buf, len); + n = vmspace_iop(td, vm, (vm_offset_t)sptr, buf, len, UIO_READ); if (n <= 0) return (ENOMEM); return (0); @@ -1865,8 +1865,8 @@ enum proc_vector_type { #ifdef COMPAT_FREEBSD32 static int -get_proc_vector32(struct thread *td, struct proc *p, char ***proc_vectorp, - size_t *vsizep, enum proc_vector_type type) +get_proc_vector32(struct thread *td, struct proc *p, struct vmspace *vm, + char ***proc_vectorp, size_t *vsizep, enum proc_vector_type type) { struct freebsd32_ps_strings pss; Elf32_Auxinfo aux; @@ -1877,8 +1877,8 @@ get_proc_vector32(struct thread *td, struct proc *p, char ***proc_vectorp, int i, error; error = 0; - if (proc_readmem(td, p, PROC_PS_STRINGS(p), &pss, sizeof(pss)) != - sizeof(pss)) + if (vmspace_iop(td, vm, PROC_PS_STRINGS(p), &pss, sizeof(pss), + UIO_READ) != sizeof(pss)) return (ENOMEM); switch (type) { case PROC_ARG: @@ -1901,8 +1901,8 @@ get_proc_vector32(struct thread *td, struct proc *p, char ***proc_vectorp, if (vptr % 4 != 0) return (ENOEXEC); for (ptr = vptr, i = 0; i < PROC_AUXV_MAX; i++) { - if (proc_readmem(td, p, ptr, &aux, sizeof(aux)) != - sizeof(aux)) + if (vmspace_iop(td, vm, ptr, &aux, sizeof(aux), + UIO_READ) != sizeof(aux)) return (ENOMEM); if (aux.a_type == AT_NULL) break; @@ -1918,7 +1918,7 @@ get_proc_vector32(struct thread *td, struct proc *p, char ***proc_vectorp, return (EINVAL); } proc_vector32 = malloc(size, M_TEMP, M_WAITOK); - if (proc_readmem(td, p, vptr, proc_vector32, size) != size) { + if (vmspace_iop(td, vm, vptr, proc_vector32, size, UIO_READ) != size) { error = ENOMEM; goto done; } @@ -1939,8 +1939,8 @@ done: #endif static int -get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp, - size_t *vsizep, enum proc_vector_type type) +get_proc_vector(struct thread *td, struct proc *p, struct vmspace *vm, + char ***proc_vectorp, size_t *vsizep, enum proc_vector_type type) { struct ps_strings pss; Elf_Auxinfo aux; @@ -1950,11 +1950,13 @@ get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp, int i; #ifdef COMPAT_FREEBSD32 - if (SV_PROC_FLAG(p, SV_ILP32) != 0) - return (get_proc_vector32(td, p, proc_vectorp, vsizep, type)); + if (SV_PROC_FLAG(p, SV_ILP32) != 0) { + return (get_proc_vector32(td, p, vm, proc_vectorp, + vsizep, type)); + } #endif - if (proc_readmem(td, p, PROC_PS_STRINGS(p), &pss, sizeof(pss)) != - sizeof(pss)) + if (vmspace_iop(td, vm, PROC_PS_STRINGS(p), &pss, sizeof(pss), + UIO_READ) != sizeof(pss)) return (ENOMEM); switch (type) { case PROC_ARG: @@ -1992,8 +1994,8 @@ get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp, * to the allocated proc_vector. */ for (ptr = vptr, i = 0; i < PROC_AUXV_MAX; i++) { - if (proc_readmem(td, p, ptr, &aux, sizeof(aux)) != - sizeof(aux)) + if (vmspace_iop(td, vm, ptr, &aux, sizeof(aux), + UIO_READ) != sizeof(aux)) return (ENOMEM); if (aux.a_type == AT_NULL) break; @@ -2015,7 +2017,7 @@ get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp, return (EINVAL); /* In case we are built without INVARIANTS. */ } proc_vector = malloc(size, M_TEMP, M_WAITOK); - if (proc_readmem(td, p, vptr, proc_vector, size) != size) { + if (vmspace_iop(td, vm, vptr, proc_vector, size, UIO_READ) != size) { free(proc_vector, M_TEMP); return (ENOMEM); } @@ -2031,6 +2033,7 @@ static int get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, enum proc_vector_type type) { + struct vmspace *vm; size_t done, len, nchr, vsize; int error, i; char **proc_vector, *sptr; @@ -2043,9 +2046,14 @@ get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, */ nchr = 2 * (PATH_MAX + ARG_MAX); - error = get_proc_vector(td, p, &proc_vector, &vsize, type); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_VISIBILITY, &vm); if (error != 0) return (error); + + error = get_proc_vector(td, p, vm, &proc_vector, &vsize, type); + if (error != 0) + goto out; for (done = 0, i = 0; i < (int)vsize && done < nchr; i++) { /* * The program may have scribbled into its argv array, e.g. to @@ -2055,7 +2063,7 @@ get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, if (proc_vector[i] == NULL) break; for (sptr = proc_vector[i]; ; sptr += GET_PS_STRINGS_CHUNK_SZ) { - error = proc_read_string(td, p, sptr, pss_string, + error = proc_read_string(td, vm, sptr, pss_string, sizeof(pss_string)); if (error != 0) goto done; @@ -2072,6 +2080,8 @@ get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, } done: free(proc_vector, M_TEMP); +out: + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_VISIBILITY, vm); return (error); } @@ -2092,11 +2102,17 @@ proc_getenvv(struct thread *td, struct proc *p, struct sbuf *sb) int proc_getauxv(struct thread *td, struct proc *p, struct sbuf *sb) { + struct vmspace *vm; size_t vsize, size; char **auxv; int error; - error = get_proc_vector(td, p, &auxv, &vsize, PROC_AUX); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, + &vm); + if (error != 0) + return (error); + error = get_proc_vector(td, p, vm, &auxv, &vsize, PROC_AUX); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, vm); if (error == 0) { #ifdef COMPAT_FREEBSD32 if (SV_PROC_FLAG(p, SV_ILP32) != 0) From nobody Fri Jun 26 22:20:49 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 4gn99Y4w6yz6j2Yd for ; Fri, 26 Jun 2026 22:20: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99Y371xz3mJJ for ; Fri, 26 Jun 2026 22:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512449; 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=XE8IqQM0aVzE9+JezrslEmUIItv4z5hAOOtIi2a1qe0=; b=LiyUds5QhrIGZLAm/zR7bgY0shWpysDtJIzg4TXJQMNi9bABC8CaLeonCbPQoJsEdX0Eez 4gTyOXgE8SWVe1Mr2DZO6Ushe4Z9j7E2obW8RVZeUz/XBdWD2HyNVWNbswN6ehkDO2ch5p iNAeKAxhT8bL0STnhDTStT6n53/2HlZTwRg77rG3Y8eGilhKOoNGWIvisUN4PgSgTFQ9/A gjG8LPm+HAMWa4UJm7g3/S9BzP7q9Tm6yY8+u0QDi5hF5pcpr18HiqF6eKgwCugQeuV1TV x4cAiIz2OPw4eHuNUCrCjdkfsfEMHhQG4sqXIkv3C+vdYAe57NfnMHUDTfA12Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512449; a=rsa-sha256; cv=none; b=oL7VMFDJpc8MFK6LttbbVNRy5RHaSeO+9Jl8zxrfIEI0BRcyOtp4YRILl4tuxVsCQ7T59q E9DfWIPGeg5PezLLoA5KbZVBYwfr/ML9S3/EQ+Y6URHWlIBPba7QL1jKRmoZGPnXv9vvEt 5t7Tadh5zBN1MvfkQhvLCuW5A2t31GdKSl5Pc0PXHeeSMGtAngVYBlNzoe5ZjFt938NpmN gjHTJIUoE/LMlMVWX5QN7biMOHRnOihjRbMXmiDt5h2Apqd2wvXxckTwMEVTndTynoFLI/ IElDmMTesqb3Bu16s561iHIsvJiBalUndBvgZjVhrVyGzbmbrxJa0yIBrimIcA== 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=1782512449; 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=XE8IqQM0aVzE9+JezrslEmUIItv4z5hAOOtIi2a1qe0=; b=ZrrdRzqAb/Pg6T+BIhtzFk96Mjl1NIvv6R282/CeXN9ucHl6QHtQ2kxJQC1y2nb8rP13Y4 D+ebEGXMtQYo82dDjhnd35M95oqLllaIAcBYR2wGXCv4xKmP0juedzSK8+np4Gbv6Dj/l5 hArcUXcpSszXI9Es7gcvdIASGcqUzT5uDeiKJ5vV/wyezJiYs4g3DZJEWyIaHN130Sd0jY zwvOV0QMtY2bv8i8RMUhC9xhBekXQohcX3KG7Er97fn+zdXUJAzVbkAiJuM82sufVOmrSH iURwLqrfXeWKr61M/tL+91CQGdclBDR88l8pNBPhPLBMcT5afxWinO6/YqtJHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99Y1mg1zxSD for ; Fri, 26 Jun 2026 22:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 20ed389b3650 - stable/15 - kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vmmap 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 20ed389b365030b868298d7ab4e8a01270c06c9f Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:49 +0000 Message-Id: <6a3efb41.308f0.22a47439@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=20ed389b365030b868298d7ab4e8a01270c06c9f commit 20ed389b365030b868298d7ab4e8a01270c06c9f Author: Konstantin Belousov AuthorDate: 2026-06-14 23:49:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:05 +0000 kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vmmap (cherry picked from commit 5fe6e08d2db56b530f0df2903ef24cfabab7b8ea) --- sys/kern/kern_proc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 7c1a75e480bc..5d37d0b5fa39 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2425,6 +2425,7 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) int error, *name; struct vnode *vp; struct proc *p; + struct thread *td; vm_map_t map; struct vmspace *vm; @@ -2433,11 +2434,12 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) return (EINVAL); name = (int *)arg1; + td = curthread; error = pget((pid_t)name[0], PGET_WANTREAD, &p); if (error != 0) return (error); - vm = vmspace_acquire_ref(p); - if (vm == NULL) { + error = proc_vmspace_ref(td, p, PRVM_CHECK_DEBUG, &vm); + if (error != 0) { PRELE(p); return (ESRCH); } @@ -2549,7 +2551,7 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG, vm); PRELE(p); free(kve, M_TEMP); return (error); @@ -2644,6 +2646,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) struct ucred *cred; struct vnode *vp; struct vmspace *vm; + struct thread *td; vm_offset_t addr; unsigned int last_timestamp; int error; @@ -2655,10 +2658,11 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) _PHOLD(p); PROC_UNLOCK(p); - vm = vmspace_acquire_ref(p); - if (vm == NULL) { + td = curthread; + error = proc_vmspace_ref(td, p, PRVM_CHECK_DEBUG, &vm); + if (error != 0) { PRELE(p); - return (ESRCH); + return (error); } kve = malloc(sizeof(*kve), M_TEMP, M_WAITOK | M_ZERO); @@ -2762,7 +2766,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) if (vp != NULL) { vn_fullpath(vp, &fullpath, &freepath); kve->kve_vn_type = vntype_to_kinfo(vp->v_type); - cred = curthread->td_ucred; + cred = td->td_ucred; vn_lock(vp, LK_SHARED | LK_RETRY); if (VOP_GETATTR(vp, &va, cred) == 0) { kve->kve_vn_fileid = va.va_fileid; @@ -2818,7 +2822,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG, vm); PRELE(p); free(kve, M_TEMP); return (error); From nobody Fri Jun 26 22:20:50 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 4gn99Z6hZ9z6j2Sf for ; Fri, 26 Jun 2026 22:20:50 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99Z3JPwz3mRG for ; Fri, 26 Jun 2026 22:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512450; 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=mI+Q8vJFj1KIxBXsdGsUPoi3Bwhg5ElJx3Rmm01dxfE=; b=czQZTg4yPALmpHzbxjs55j8G/Bm+vmHmWpTZkwLfwFDRgz/OgIYnNhZET2ITFv6oKGtY+g FQ8MqgBeRNQxePVZ4RPXheSQn0PkFSywwUFzvReS3mWPULJcPfJmB2xrEPAHBkv8AGTLwG fk4hVa4Qs8VdA1pkib/gAQRYPSfJqvzUF8jW1BBQgV/mhpZwDFPRR0PZv0Gy6tl4WKJv9m GVw3QEbHmJDrGJumI2FXiO9JI6AgMWWRSfmCd/7SYP+mRlqgMitcFU68bfDRrFQ6yfcYj0 cdkQjfaGP4AF085peLC48xhDXM9C0F1j3Q4ckWpMg/JTD+4Qbp9ncxbdCUr3DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512450; a=rsa-sha256; cv=none; b=fFLer+bDlQEc5b/Js22vsQCdKLOFPpo2Y/36ZbXsR5C2ZQhVtnRWjHJG9goJW5EuFaGvxz hfyMOTJkZvR/SctkJ5N7X0Ju9GHan4vRt9xHCluy50fWWOZbV51Zz+7/qxQ77uwGPta/Zb zV5sv60WdPuxNYVMV5SUEVaEJmi21T2AuwoVUp4n/SXDgBBD4aibXCO3C5jIXXV7h3ijP2 cRuzRrHgGiQtpW40GHV1JCEOn17q7Ik1WFEL9xHkTx0cOkKGMEDkyTe75falwmlkdEmVj1 p+3VwFFC5P9+pJaIQRpR4DGvPKSH/C6aAW6KUkXyFrPZvlBqWhhhBsFJSaNmWg== 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=1782512450; 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=mI+Q8vJFj1KIxBXsdGsUPoi3Bwhg5ElJx3Rmm01dxfE=; b=RkxTMA1K7rKNWqDDztGkqtSUPH13fD4xGKZ5NaCQ29Gq7TyhSU635kSweftkSt+lnWfBnc guXw0mcGWhIvlYmZCAtvhmp5VH6X5+gY2tk12+QTWYp5RBcmsM7z8cTd9SoD9eEOkvUS0D jy3gH942ey9vNNc1RwXtmGzvXgxeXICTkZ4j7ITT2ngp/+98kUzRrSeYvd7D12P3nb2ODW p3PK0gMf3LuG/XZK66xYLrFtsV/yY6hWCKXDjsYvxfasLTwi7MkEmLXDxz/TTYc+kY7bNp Hu4QPFt1KE4Sptz0bryzSB+++gTqDpIEULo/1w9k56NDhMVW6mVn1yYE9HyeNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99Z2NBTzx0H for ; Fri, 26 Jun 2026 22:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27bc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: eb03358c407d - stable/15 - kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vm_layout 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eb03358c407d6f3c073320bdc26a5e4ceb923ca1 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:50 +0000 Message-Id: <6a3efb42.27bc7.58a5d287@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eb03358c407d6f3c073320bdc26a5e4ceb923ca1 commit eb03358c407d6f3c073320bdc26a5e4ceb923ca1 Author: Konstantin Belousov AuthorDate: 2026-06-14 23:49:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:06 +0000 kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vm_layout (cherry picked from commit 31fa677e4af00b795bf671847b4dc72960c90f14) --- sys/kern/kern_proc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 5d37d0b5fa39..1e09e6042e7a 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -3292,6 +3292,7 @@ sysctl_kern_proc_vm_layout(SYSCTL_HANDLER_ARGS) { struct kinfo_vm_layout kvm; struct proc *p; + struct thread *td; struct vmspace *vmspace; int error, *name; @@ -3299,6 +3300,7 @@ sysctl_kern_proc_vm_layout(SYSCTL_HANDLER_ARGS) if ((u_int)arg2 != 1) return (EINVAL); + td = curthread; error = pget((pid_t)name[0], PGET_CANDEBUG, &p); if (error != 0) return (error); @@ -3310,8 +3312,13 @@ sysctl_kern_proc_vm_layout(SYSCTL_HANDLER_ARGS) } } #endif - vmspace = vmspace_acquire_ref(p); + _PHOLD(p); PROC_UNLOCK(p); + error = proc_vmspace_ref(td, p, PRVM_CHECK_DEBUG, &vmspace); + if (error != 0) { + PRELE(p); + return (error); + } memset(&kvm, 0, sizeof(kvm)); kvm.kvm_min_user_addr = vm_map_min(&vmspace->vm_map); @@ -3363,7 +3370,8 @@ sysctl_kern_proc_vm_layout(SYSCTL_HANDLER_ARGS) #ifdef COMPAT_FREEBSD32 out: #endif - vmspace_free(vmspace); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG, vmspace); + PRELE(p); return (error); } From nobody Fri Jun 26 22:20:51 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 4gn99b6xZ6z6j2by for ; Fri, 26 Jun 2026 22:20:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99b4Kk7z3mRS for ; Fri, 26 Jun 2026 22:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512451; 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=VRXKG32rxVN4rQyg6MoHLvjD4SwTSSnhG1wedqIC0kM=; b=bLDMmLl7UxzpGxoDJMh0/PuODoHf9crwdhy8X74m9yDynf0sHup8gKaL+WbqNLIvBnUkUt fT6e4k3NUxruGoDKBYQiP3UeoGKFvelphyJ9GLZG9JmJjgDjemhx95IpVWFapejf55BxLz UPoaxjXb5HfbnS5ERVsWi092kKoxHz4FuQVff3B841tqF/XiLR+kDd19yyVmxH9+QVSPbf JqLcXd2quznepb7wUvhhPRcE+J0jP2ph/kvramTLjDqbKFVZMtcxfa/n7SbwB8pYc/gGiU P0jwlg+6/vibHp5+zIetZux3pDdU6zvefbUG49dKKIAqVLYLjKGFFwJTQfUuDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512451; a=rsa-sha256; cv=none; b=ysBh+QYCrmpTlGcIt3+klvsScP9NKo1UjmXzn9O3OriLjBPUhhlJsssGkx1bwD3V9kla11 90YRrnOS2BmpOiYhoqr4icQafwXR1QTwgKy3WWDNXqK9gniMRYsG5X/ex7Tfdd3pgYvGan dsaMHa16lRZQFxi4iiad/xWQazB0BspXj4GLXydkIuTY1Cd9u1teohwzZL9t2h5o740PqZ BS+cvm+G4ZKFvLssHbWfT/jWo586Cw+LDsJ18H67kzT0q2cNDTH0CIdhnddEkZYjaESklG h6D9QnqE/9IVB1d6Ih8/VLQtxIaspXhOeF0eXBw15+AjMCM8CCiCKasu+2f3xg== 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=1782512451; 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=VRXKG32rxVN4rQyg6MoHLvjD4SwTSSnhG1wedqIC0kM=; b=SwRcRLG9sDSFtYrYyf/17LJNoJ1w83mWvrAM+X+pXcic0nTXpSIp+BKNKBgYzGVYHFkhtj LZboXaD6nryGWk4OydMcK4Jq6EFPfHbmIFdS7g7KMeni7Bhl+M6DM21ZrgjCN/T7/EQ18P +FUZVSD1UHlQYr38UvGT2m4NxRx5WyvC+2F0GSFFi6QWyETeyX7C6VEUuKzjtRF744Pvzg lMTDcHTLcE/tttn9uunRwIpAQo1EhngLXb9dpx2EJcqsnD/9dXVp3JtODrr7K7XEt077u1 +W0zcAl1Z9RfjmjaTzw+01zBquFVY5AEWcZMFYOIqB41fHUhdfgOMli7SB0PlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99b2y06zxSG for ; Fri, 26 Jun 2026 22:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a09 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5e633db3f8e1 - stable/15 - kern_proc.c: make kern.proc.osrel atomic 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5e633db3f8e126578c097c9649ba3be552664c6a Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:51 +0000 Message-Id: <6a3efb43.30a09.20dcbf35@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e633db3f8e126578c097c9649ba3be552664c6a commit 5e633db3f8e126578c097c9649ba3be552664c6a Author: Konstantin Belousov AuthorDate: 2026-06-15 17:28:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:06 +0000 kern_proc.c: make kern.proc.osrel atomic (cherry picked from commit 80626f34ee985671bb8c60ee986b89587b7a1511) --- sys/kern/kern_proc.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 1e09e6042e7a..056176399062 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -3123,39 +3123,38 @@ sysctl_kern_proc_osrel(SYSCTL_HANDLER_ARGS) int *name = (int *)arg1; u_int namelen = arg2; struct proc *p; - int flags, error, osrel; + int flags, error, old_osrel, osrel; if (namelen != 1) return (EINVAL); - if (req->newptr != NULL && req->newlen != sizeof(osrel)) - return (EINVAL); - - flags = PGET_HOLD | PGET_NOTWEXIT; - if (req->newptr != NULL) + flags = PGET_NOTWEXIT; + if (req->newptr != NULL) { + if (req->newlen != sizeof(osrel)) + return (EINVAL); + error = SYSCTL_IN(req, &osrel, sizeof(osrel)); + if (error != 0) + return (error); + if (osrel < 0) + return (EINVAL); flags |= PGET_CANDEBUG; - else + } else { flags |= PGET_CANSEE; + } error = pget((pid_t)name[0], flags, &p); if (error != 0) return (error); - - error = SYSCTL_OUT(req, &p->p_osrel, sizeof(p->p_osrel)); - if (error != 0) - goto errout; - - if (req->newptr != NULL) { - error = SYSCTL_IN(req, &osrel, sizeof(osrel)); - if (error != 0) - goto errout; - if (osrel < 0) { - error = EINVAL; - goto errout; - } - p->p_osrel = osrel; + if ((p->p_flag & P_INEXEC) != 0) { + error = EBUSY; + } else { + old_osrel = p->p_osrel; + if (req->newptr != NULL) + p->p_osrel = osrel; } -errout: - PRELE(p); + PROC_UNLOCK(p); + + if (error == 0) + error = SYSCTL_OUT(req, &old_osrel, sizeof(old_osrel)); return (error); } From nobody Fri Jun 26 22:20:52 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 4gn99d0szpz6j2NC for ; Fri, 26 Jun 2026 22:20:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99c5F70z3mTr for ; Fri, 26 Jun 2026 22:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512452; 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=oYjwhaMLetos7Clp/49GvXdw/mvGOq177lHId10PnE0=; b=xg602L9hXsacq3AyqVtmLkwqJ/Nxf0xD/nctHPphBF1Gjre+/8A1qbyzRnc5oACq+U0VH0 7tb3aDwpkCjaoyW6wls8h4UnemslUsY89yC6pb0P3rjX0Iy5QpbHTPdTcrG3iDVreSMgXH EVx8wAiPrF2XNopH7sgYa9gf6fP6j5uSCEoxO02vlNdXxThv9Iy8hP+YZODxGWenCZ06ZQ nGBST0qH8/QJM/hd0QAk8LbMz0+53miTQaEzhFh9FApiw7oxXpbmOU4tLvV5zK/8SUGAP6 tgz3i3tFt5G3AQ6axs6mtcaTrupEa40MVKCDl2FKS0u6VbRmNgnvJw2HdEV3Pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512452; a=rsa-sha256; cv=none; b=xf84yJZ0cSl7kEAZre+IQTZ3H+8JDfLCq3T9IsPHz9LYWwrnpGjsaBhAiMD0HT4nsmRIDi x6vub6P+IJARcOE+cRwZrEW0nuH8C8lv7844CVlBVQCl9kv+8E5qv1S/U7XwXZGVg6mKs4 aF79qcKYpo7K+Scetm+SIfBctK5g5dXOOg3BbrIrRG1C12MwF1Qhg8XxgWgJc4LyV2VQy6 oBiAn0iYtt8rvTZqJWB+yPqE2H53vDjlK073f8mfUL7xBxUbNOpKYU8z8ZmIxusP2C0JpG 7YALTKqV4GZTY2GlPXyIb0NvfR9ADwsjbb2C5t1yn7tj1RWv1nHsUaWmeNJnNQ== 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=1782512452; 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=oYjwhaMLetos7Clp/49GvXdw/mvGOq177lHId10PnE0=; b=pWlu/14LJBLZQupCTpEZkWiBaPeSoAZtS3sndfvJUno7KwaYc0/9+OiYMeqY45l2L54+G6 kwXUieQ6jA0Jlkk8dXVqY1Nqd8NV6QnWH2+/VtHJynZZKJhzY9ah3MDjH91n0n9lzDty7I WaV1QTTeqSnjIjD+5daFKHHb7k2mNwRx76/Q2eLl+Nmcgbh7yDMGmNaO2ugcqDKVNXHYxL DM+QU/KPVtZVZFnofmXdKawa7QBEeiZkOtGIw3AYFg4uOs2NpaCnIbK6PIy3Z3qCb0+skn sxZGU3RdYZPNhoIODNNDmAAxikItiH7y6wlqGrDpTBZGO/6FdoAL5T0X6uUCpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99c3dcbzxSH for ; Fri, 26 Jun 2026 22:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3083b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 60d8df61846f - stable/15 - kern_proc.c: disallow execve around sysctl kern.proc.kstacks 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 60d8df61846fc1f5f7e2a400d2b0237c9f1a6be8 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:52 +0000 Message-Id: <6a3efb44.3083b.2a439f4d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=60d8df61846fc1f5f7e2a400d2b0237c9f1a6be8 commit 60d8df61846fc1f5f7e2a400d2b0237c9f1a6be8 Author: Konstantin Belousov AuthorDate: 2026-06-15 17:57:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:07 +0000 kern_proc.c: disallow execve around sysctl kern.proc.kstacks (cherry picked from commit 8b5abd9027b8b1f6290c756730ee3adebed007f4) --- sys/kern/kern_proc.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 056176399062..e2a71466a273 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -2861,7 +2862,7 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) struct kinfo_kstack *kkstp; int error, i, *name, numthreads; lwpid_t *lwpidarray; - struct thread *td; + struct thread *td, *ctd; struct stack *st; struct sbuf sb; struct proc *p; @@ -2872,7 +2873,8 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) return (EINVAL); name = (int *)arg1; - error = pget((pid_t)name[0], PGET_NOTINEXEC | PGET_WANTREAD, &p); + ctd = curthread; + error = pget((pid_t)name[0], PGET_WANTREAD, &p); if (error != 0) return (error); @@ -2881,6 +2883,14 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) lwpidarray = NULL; PROC_LOCK(p); + execve_block_wait(ctd, p); + error = p_candebug(ctd, p); + if (error != 0) { + execve_unblock(ctd, p); + _PRELE(p); + PROC_UNLOCK(p); + return (error); + } do { if (lwpidarray != NULL) { free(lwpidarray, M_TEMP); @@ -2893,15 +2903,6 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) PROC_LOCK(p); } while (numthreads < p->p_numthreads); - /* - * XXXRW: During the below loop, execve(2) and countless other sorts - * of changes could have taken place. Should we check to see if the - * vmspace has been replaced, or the like, in order to prevent - * giving a snapshot that spans, say, execve(2), with some threads - * before and some after? Among other things, the credentials could - * have changed, in which case the right to extract debug info might - * no longer be assured. - */ i = 0; FOREACH_THREAD_IN_PROC(p, td) { KASSERT(i < numthreads, @@ -2934,7 +2935,10 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) if (error) break; } - PRELE(p); + PROC_LOCK(p); + execve_unblock(ctd, p); + _PRELE(p); + PROC_UNLOCK(p); if (lwpidarray != NULL) free(lwpidarray, M_TEMP); stack_destroy(st); From nobody Fri Jun 26 22:20:53 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 4gn99f0Vpbz6j2WZ for ; Fri, 26 Jun 2026 22:20:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99d5Hztz3mPS for ; Fri, 26 Jun 2026 22:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512453; 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=G7RCQWucg2je1wYuaYLp0XBWMr5WHjkF6AMlHNUjl5c=; b=jO8V2bfYJnlBVaSuc0mIZSI5Jkff4IeT083uCeMIzU0lDMQl/LegfujXwcZSsR+A8U073D bZufhPl0ZG0hUiAmscOVNeOBZJJ2pF8xlsbxFobreB2RAh6hAy1BdUG5KHB08GaTWleglt 47VNhdf4o/Duf9yMIdPR89M7+qa8/h0KZx4hoicCEa5uyDd3Ob0ksmVeC0fP3DBGD5P+09 WiM/haD+xMCLpMMv5hlMNm7gTP5sw1Uhthjec8purNIBbQnyL8pN2XFN8X8pM6iVEZpCbY OaEEkGz63hTUepp0B+4MLWZHiCf6utsK9f2V64a5KimQxWo2DpwLCB+vlk04kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512453; a=rsa-sha256; cv=none; b=fNOVStiq18IxSK8FZQMJ5vpjFJT5SqDsHkQVjCwWxTIb1I7LJTMLgrQuprHrEZJkZEC4It H6ioEj30FlwiaF9t/3xsLs+spdzT0gH7oEURgU/91L/RHFfmgK35XtOwsqkS18+5D7xxVN yHfhyULPRH06wLUeilfBSGyQ+i83cgjIYBsRGUNewkkX8svoMqR4IuWnE25+KmKZYSPCqN dggeY6TVU+VPk40mrmawTLj7oi++78uH/1l7pjiZjHL+SQkdFS04KgzHy+XZFjo1QS2NjS PEPCrvmg4GR0gDheqS9SHQZsJMGbsQzWMwxlLT+TP6HHdfM0qEAdN/L9wt5HYA== 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=1782512453; 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=G7RCQWucg2je1wYuaYLp0XBWMr5WHjkF6AMlHNUjl5c=; b=EGYfMDOFwn64OvRF74+mYjGWCkQLCYemz0oLVs68Dh4lJ9wXxBa8gapTVdDqTdi0+AzMhy D5Nxig/SZTQLgdQJdy5xAOijTW5mfpfZeW6TdMeq9G4ygI1e+IOe8j6bncc4JJOE1rkP34 3GJzz1GcGxoRTorvyBQvqgha2f3KNGhswE1HekMWSE5hcntniJLGPsbtz0tn6AchWlvlPh krggjva3QmQeiWF+OjANU+QDvrO/ij9hidBDNmCpS2dkvlIh1eAEN+COkgCN8Bb95JJgpk beXDSQGeiiuVMAJI8QY90LybIoVtUFVo9xA7AzJwEO+U79FRs6Y4kI0IgLuYeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99d4HvvzxTt for ; Fri, 26 Jun 2026 22:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2577b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 24d8b3364405 - stable/15 - kern_proc.c: disallow execve around sysctl kern.proc.rlimit 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 24d8b3364405e5c32618c6930d4fdd8bc543a08f Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:53 +0000 Message-Id: <6a3efb45.2577b.37d97f2b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=24d8b3364405e5c32618c6930d4fdd8bc543a08f commit 24d8b3364405e5c32618c6930d4fdd8bc543a08f Author: Konstantin Belousov AuthorDate: 2026-06-16 04:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:07 +0000 kern_proc.c: disallow execve around sysctl kern.proc.rlimit (cherry picked from commit 5a91fa5a7656c99e527fe7e6f6bf6bd9e85ab589) --- sys/kern/kern_proc.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index e2a71466a273..8cf828c7360d 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2994,8 +2994,9 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) u_int namelen = arg2; struct rlimit rlim; struct proc *p; + struct thread *td; u_int which; - int flags, error; + int error; if (namelen != 2) return (EINVAL); @@ -3007,23 +3008,24 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) if (req->newptr != NULL && req->newlen != sizeof(rlim)) return (EINVAL); - flags = PGET_HOLD | PGET_NOTWEXIT; - if (req->newptr != NULL) - flags |= PGET_CANDEBUG; - else - flags |= PGET_CANSEE; - error = pget((pid_t)name[0], flags, &p); + td = curthread; + error = pget((pid_t)name[0], PGET_NOTWEXIT, &p); if (error != 0) return (error); + _PHOLD(p); + execve_block_wait(td, p); + error = req->newptr != NULL ? p_candebug(td, p) : p_cansee(td, p); + if (error != 0) + goto errout1; /* * Retrieve limit. */ if (req->oldptr != NULL) { - PROC_LOCK(p); lim_rlimit_proc(p, which, &rlim); - PROC_UNLOCK(p); } + PROC_UNLOCK(p); + error = SYSCTL_OUT(req, &rlim, sizeof(rlim)); if (error != 0) goto errout; @@ -3038,7 +3040,11 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) } errout: - PRELE(p); + PROC_LOCK(p); +errout1: + _PRELE(p); + execve_unblock(td, p); + PROC_UNLOCK(p); return (error); } From nobody Fri Jun 26 22:20:54 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 4gn99g2Wr6z6j2Sn for ; Fri, 26 Jun 2026 22:20:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99f5gSwz3mMt for ; Fri, 26 Jun 2026 22:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512454; 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=z1EsVidCgRqEJLm7zkTBjAhEb9WSgUiFuKw925Whoik=; b=WjlHZpsyTLi09ZzxGt35hxb2TCAgLhEuhQCtEAkFlB1TMXoEa45j4TG76CBf2Js5MAf45B 2O8CM4QCEnlRqdEHhabZeXrrkM+5CzJpNBihrfGvFLiSh6vWNvUJSWRyxMbwzuPcXxRnry OODsirl7aX2o+6FguaRVqCblw7dp4vWJJ0ufO28dd+y8fHbG9m/bB4eopVbqWJiUbKolTH JYSgWezhAi3OvAgFzBVXREC4vjyyCd7EaZ2FmmsOdZlGzf1yBGtrYu7l8OZmk4vDGmQSe2 khBSqjYkzI3XJ83PLf10R+upg+cjZ7v5gZiLZe1glxbYLqRupm5IH37s2hDViQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512454; a=rsa-sha256; cv=none; b=VsJ7GY97kb9+7j6oM4OxzLW7pNybzu9eZuacV1tW4s6wkmE8p/J+lMJXFN2br1E6r4rr9r 9UYcDCzq2+dg4rAjX0WSWJKPsN7IuTvREC3qpqmV+fZmztqjOH28VRkW7yDjTEaNrMZIQ4 WkFE/2ZsC2Yvr5ISARlv5yn8GT8wQTBK5X3cIBT82yklRADe5Xt5LljsRsNsMDq7a6F8Ic mJU0ZAqp0dXf+HtsgHEEL0RdnR8Ju9LCpcX5WiNn1b9apNeSE+W0GChVBZmDP5OF4amvf7 oyWhoka6gTrWJoQgpTWeCbDPATyupNtxHWmwAC4j0lNnjaAgHAd+ZuejTDcCEw== 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=1782512454; 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=z1EsVidCgRqEJLm7zkTBjAhEb9WSgUiFuKw925Whoik=; b=XRE3d5ygXOQOwVRishlUySPWGJfVAigWKlLnEHXzfIn6idYD8CtsdF7P8drJsD3mAUKw5R YpFNaH+RjPkVWt2xbMks6Zua3JMMGeYskXjEKdAnRGEse6SQjaHhCO+3t/aVoLR8lCZ0go QMO7cq6+dW/1k0xu8587wR79IwsLd5C+9LJN6XNT0L8rDEQjmLdFnPDYCNTCPqqqihc3TD 7WJoQulaETZOCcVpTav/JGzz74qJ8HflSHV5CTwY7EbRb/D/ABdNqokxzAztefXLw8TPxy qO5LhY0xGK38j4rptHTwxQD6AMWkXfSb0LcOO3WpsH4Oj/fyXOcIKNNEngWf+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99f4kBXzxSJ for ; Fri, 26 Jun 2026 22:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2732a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d172933cf69f - stable/15 - kern_event: block the target process from execing for sysctl kern.proc.kqueue 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d172933cf69fb4dc58e07261653481a33cdf1da0 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:54 +0000 Message-Id: <6a3efb46.2732a.7cff5cd0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d172933cf69fb4dc58e07261653481a33cdf1da0 commit d172933cf69fb4dc58e07261653481a33cdf1da0 Author: Konstantin Belousov AuthorDate: 2026-06-16 03:48:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:08 +0000 kern_event: block the target process from execing for sysctl kern.proc.kqueue (cherry picked from commit 79b384bd8fdff4869ce4799edb0342ff5c25b6fa) --- sys/kern/kern_event.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 8c7a0949f024..01bd22fbefd1 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -3381,10 +3382,6 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) if ((u_int)arg2 > 2 || (u_int)arg2 == 0) return (EINVAL); - error = pget((pid_t)name[0], PGET_HOLD | PGET_CANDEBUG, &p); - if (error != 0) - return (error); - td = curthread; #ifdef COMPAT_FREEBSD32 compat32 = SV_CURPROC_FLAG(SV_ILP32); @@ -3392,6 +3389,17 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) compat32 = false; #endif + error = pget((pid_t)name[0], PGET_NOTWEXIT, &p); + if (error != 0) + return (error); + + _PHOLD(p); + execve_block_wait(td, p); + error = p_candebug(td, p); + if (error != 0) + goto out1; + PROC_UNLOCK(p); + s = sbuf_new_for_sysctl(&sm, NULL, 0, req); if (s == NULL) { error = ENOMEM; @@ -3412,7 +3420,11 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) sbuf_delete(s); out: - PRELE(p); + PROC_LOCK(p); +out1: + execve_unblock(td, p); + _PRELE(p); + PROC_UNLOCK(p); return (error); } From nobody Fri Jun 26 22:20:55 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 4gn99h2Zqpz6j2Yx for ; Fri, 26 Jun 2026 22:20:56 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99g6fbdz3mDg for ; Fri, 26 Jun 2026 22:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512455; 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=rsjHEURsZPLHRK9j2nMJc5sHaCHTSttSDoefIQSghIY=; b=JDF8+kzA4fj2q+U6kTBVanI+jgGQB50LIXcJgUZXM8NOCC2lnjyxc4WwU/r3SRtWJT6j2F 7HOw2JF5/o6GcssFIFWVFyjf309LPBj8tngowMHLU8OYYSvQVjCZk7pvYdYdW+Il7PiUlo tLdRcgN7+8Hyc9D2+/GOUUScpgEPTkG7lzJd4EQRZDmxtgQPYLn4LBsrk2OSfd0lQKmxnj XzDlY++LrmVCtDT26knNg/gsRRRpX3eWOnrKTCgsV15xO/anoWuYjE0ekm8olIzMrQYbUY K/Cfs290EvYSrUvCtdVdq+z6I0x4ofUlJvaPl0pXzuSErKOkfZjse4bnQq4oVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512455; a=rsa-sha256; cv=none; b=fp8iHuFYBb94nJ1i1jkD+rCJwVZdSGnHEv00KuD2QLr8nPFv6WCrpxuDyGYkpZUdxuyati rfX52ILGKoclKwvKEJgyxREw/lfnt8PfnBJpvKuUEjUpVTEzquivhDeN74u8Em6FB44f6m 3A1X6o53sWbO8hDTokcv35/CvLztTsTOq3M4Uif7qWuGRz94dwLhNHsWWAd35NG9KS551p dd48WeMy6W3Ts0M4M93ibro4KkdJ+2TamldsWND2lTerIsW9CPCgn/0YssdJKiZj7fT5Yr sh+5BGjMvrW/b0XZTNIOUE0afrEsKbFz+62qxmMKsT/mdieHaZKBsQ9tzh2cbQ== 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=1782512455; 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=rsjHEURsZPLHRK9j2nMJc5sHaCHTSttSDoefIQSghIY=; b=uy9Fb4tY2JZwT/iPk297GmEHXHQ5ZedWq/DBUUG4OHVvuLsmy+f2rScltIq3QJC7BoF5FS cDaTf7RnOPWuzdTZwQ1AILdCRx2NzOEmffX9Go54hCN3rIyuquarii+cDDzuDyj/H1hRIF czoanuJD/UxRWUjEL+QhD/v4k6ul1bv8knMjO3lllDPfgy/vAZPrf3c8HSBFaDKqH6ibBF F95aKA9Tdjb8uUFlFveC2T7WhR2ygtBU9319Q1rdTSTbqnO0LsV29LUCHcsjrogrQb5LN7 N5HF9+9DauLzns6VcSmF5i7v1vqIjTKwna+MEgHf7L6zx1RW0mTbu25MX37QNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99g5YJvzww2 for ; Fri, 26 Jun 2026 22:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27830 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 035f66ff2924 - stable/15 - kern_resource.c: disallow execve around sysctl kern.proc.rlimitusage 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 035f66ff2924808f534df9065388aabf66e77266 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:55 +0000 Message-Id: <6a3efb47.27830.543f9403@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=035f66ff2924808f534df9065388aabf66e77266 commit 035f66ff2924808f534df9065388aabf66e77266 Author: Konstantin Belousov AuthorDate: 2026-06-16 04:34:16 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:09 +0000 kern_resource.c: disallow execve around sysctl kern.proc.rlimitusage (cherry picked from commit 836749817036b90b60af0584fa21f2d9dbd60ff7) --- sys/kern/kern_resource.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 5850d2708a11..e45d3ff82421 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -823,11 +824,11 @@ sys_getrlimit(struct thread *td, struct getrlimit_args *uap) } static int -getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) +getrlimitusage_one(struct proc *p, struct vmspace *vm, u_int which, int flags, + rlim_t *res) { struct thread *td; struct uidinfo *ui; - struct vmspace *vm; uid_t uid; int error; @@ -838,7 +839,6 @@ getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) PROC_UNLOCK(p); ui = uifind(uid); - vm = vmspace_acquire_ref(p); switch (which) { case RLIMIT_CPU: @@ -916,7 +916,6 @@ getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) break; } - vmspace_free(vm); uifree(ui); return (error); } @@ -924,12 +923,15 @@ getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) int sys_getrlimitusage(struct thread *td, struct getrlimitusage_args *uap) { + struct proc *p; rlim_t res; int error; if ((uap->flags & ~(GETRLIMITUSAGE_EUID)) != 0) return (EINVAL); - error = getrlimitusage_one(curproc, uap->which, uap->flags, &res); + p = curproc; + error = getrlimitusage_one(p, p->p_vmspace, uap->which, uap->flags, + &res); if (error == 0) error = copyout(&res, uap->res, sizeof(res)); return (error); @@ -1784,6 +1786,8 @@ sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) { rlim_t resval[RLIM_NLIMITS]; struct proc *p; + struct thread *td; + struct vmspace *vm; size_t len; int error, *name, i; @@ -1793,15 +1797,20 @@ sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) if (req->newptr != NULL) return (EINVAL); - error = pget((pid_t)name[0], PGET_WANTREAD, &p); + td = curthread; + error = pget((pid_t)name[0], PGET_HOLD | PGET_NOTWEXIT, &p); if (error != 0) return (error); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_VISIBILITY, &vm); + if (error != 0) + goto out; if ((u_int)arg2 == 1) { len = sizeof(resval); memset(resval, 0, sizeof(resval)); for (i = 0; i < RLIM_NLIMITS; i++) { - error = getrlimitusage_one(p, (unsigned)i, 0, + error = getrlimitusage_one(p, vm, (unsigned)i, 0, &resval[i]); if (error == ENXIO) { resval[i] = -1; @@ -1812,7 +1821,7 @@ sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) } } else { len = sizeof(resval[0]); - error = getrlimitusage_one(p, (unsigned)name[1], 0, + error = getrlimitusage_one(p, vm, (unsigned)name[1], 0, &resval[0]); if (error == ENXIO) { resval[0] = -1; @@ -1821,6 +1830,8 @@ sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) } if (error == 0) error = SYSCTL_OUT(req, resval, len); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_VISIBILITY, vm); +out: PRELE(p); return (error); } From nobody Fri Jun 26 22:20:58 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 4gn99k2wMvz6j2km for ; Fri, 26 Jun 2026 22:20:58 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99k12KFz3mQF for ; Fri, 26 Jun 2026 22:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512458; 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=OuuDBjkLbZueSExi+794gSsRpnFRXuQDWIAz86h5NFw=; b=BgkuoIJTLLNwaOdvihlJspflqytUEh1ce5UA+SFQvWHwhqjShgRyv30d/0T6ag894MY94q wlTU3qlHHvGSE1U1H8CZyc3RMkNYSNckqI5ZyvceSpk4gIQ/IJpoDJiJfXdzbjnzujrMc3 Mxm+O/bHHsVlYIt0XWg/gBa8T+tu0CGqcuin9Eu+h4+HoVl5j82lEMufonPFH0FmfKUW3R GV1YVrUQoZxNys68wGqUpg81GXffgVhaYmE59Wih7a/p85kaCvXhnnDfRSlT6coJm2ubw5 Yuyu9fEeN4QFiYpwAtXtB+SgmyyTMEvXkDGzYC5jWP/34coBvH2RtcvDQtCBjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512458; a=rsa-sha256; cv=none; b=CqYSq1nnC9y1VnGl/th6V5itGkhyYrqithKysgSyapRNVtyJzkPMj8zZxnTlzkyuIBz2EY nCkKTuqFbMfW7sLy4/WOFIrKrCnbnbbuuxX3xjdMMI23DJv2LXptMv6RTQ86tMwE2Vb609 pG5/OK1WzWEJoWRSoCnCT3hc4EhzXQ5Gs9/sUVvWRpwPohSyvyUFIDJZJC6WGEW6VpoRFy xAc2JBkQg5AD0+VMs8V2elvJf6rmBbrTnjxjSBvbwWpGBGyjpJZUO/bd191Qtefqsq6caa B/GwthcUeVcMxnKj/Ga+PsPR5nl13L0wOss+aB69qxh9VlFiW8NfuuxwnR0PKQ== 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=1782512458; 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=OuuDBjkLbZueSExi+794gSsRpnFRXuQDWIAz86h5NFw=; b=I2xfJssOVSmD0D8O0Vbp3aVr0lbYrSfeZIGlgX0Zgk16S4ZsQ2OWz1eOYyoCV5haKTB/BY xNRCBTqrBvhqtnOKno4+iyPm4iGUYdhdp9iW5xSwka6YTpmuVtX5z18C3lnAyFaz72Ikrj BHxCNd8mcEhKwdofAONN7F0IRyF4grSQffe6M8vxDyjtwKo3Mn8KoQTahf9dcFZTrWCUVv fohNtIfLZmdnrnxrlik18dTnV5TFtHDv329ds8QV9l6UB/dOppaSS+KABjDMbBqFZk3KDF 9PhPI2CJGVkgAih0QrXO8Wg+n1LoxDwnnHY3SyQKJqug/6gXYBMpvpEH5trHRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99k04K0zxK5 for ; Fri, 26 Jun 2026 22:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e9002239571f - stable/15 - linux_prlimit(): block execve for the target 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e9002239571fb1502505ff85061934ef0ebd2e1e Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:58 +0000 Message-Id: <6a3efb4a.30b29.3c147663@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9002239571fb1502505ff85061934ef0ebd2e1e commit e9002239571fb1502505ff85061934ef0ebd2e1e Author: Konstantin Belousov AuthorDate: 2026-06-07 19:21:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:10 +0000 linux_prlimit(): block execve for the target (cherry picked from commit e41c28e67fac9cd22a85b160c5c9d0477ed03600) --- sys/compat/linux/linux_misc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 8eaa6e7831c3..1a4eba5f9d39 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2010,6 +2010,7 @@ linux_prlimit64(struct thread *td, struct linux_prlimit64_args *args) u_int which; int flags; int error; + bool exec_blocked; if (args->new == NULL && args->old != NULL) { if (linux_get_dummy_limit(td, args->resource, &rlim)) { @@ -2037,6 +2038,7 @@ linux_prlimit64(struct thread *td, struct linux_prlimit64_args *args) return (error); } + exec_blocked = false; flags = PGET_HOLD | PGET_NOTWEXIT; if (args->new != NULL) flags |= PGET_CANDEBUG; @@ -2049,6 +2051,14 @@ linux_prlimit64(struct thread *td, struct linux_prlimit64_args *args) error = pget(args->pid, flags, &p); if (error != 0) return (error); + exec_blocked = true; + PROC_LOCK(p); + execve_block_wait(td, p); + error = args->new != NULL ? p_candebug(td, p) : + p_cansee(td, p); + PROC_UNLOCK(p); + if (error != 0) + goto out; } if (args->old != NULL) { PROC_LOCK(p); @@ -2071,6 +2081,11 @@ linux_prlimit64(struct thread *td, struct linux_prlimit64_args *args) error = kern_proc_setrlimit(td, p, which, &nrlim); out: + if (exec_blocked) { + PROC_LOCK(p); + execve_unblock(td, p); + PROC_UNLOCK(p); + } PRELE(p); return (error); } From nobody Fri Jun 26 22:20:56 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 4gn99k09Fwz6j2Z2 for ; Fri, 26 Jun 2026 22:20:58 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99j0k30z3mNN for ; Fri, 26 Jun 2026 22:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512457; 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=G28waci3Uno5HDiqBkonLUxsEZSP6h3h3FTo4KXRuM8=; b=A1LWzqjY9tqx5hBD3cmN9rHeS7MAddBamdskX2uSGYyoo87N12iYqh0NrqyzxfoMxsw1n2 q8GnrODmFps2FfABuoZQrOavUoDDFcAnHgEV3mssj33hzdpKb27YebfFHR140oecHYSId2 tc/q6f9/4LlpQIkmTgb3ZEK20NYTYAyJ5Dhx22/RC2BvfAJWoU7J+sdGbipriTx+cgBqkV u+UR9gvKLTGI2Q3cdPuwwuDA4yPG4bhQ74WobiPYdM8whTi8ow3P6m2GtvH6j4VLmj+csA KZ5NEAOH/QzajLwyZ42brqjP0qW+sdtpDU12i9AC/YwWXt8Zb6GDHlide9C2+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512457; a=rsa-sha256; cv=none; b=FzsZ6EM+1rqAZyz7bLrLGeZ8Xc6JGdRdM8V3CDm/J5q+DVi8+577WQHvNLUGyF+0xmk0tG mpseTcIzrk7moHahhUdMEpyJQpHGuPolhizgPbehec8uMkJJXYxTbLyu3JJPZ7n/EaTqU0 lcHR0o8Z6h3xcpkGMRUeVOATjS7G59D7Dt+EE1c/rsS6liyrU1E4zVvzSUYWBd2man/ReI 7A4WW1VS8neVNZUTP0nI82OBdslhpINSYpYOmMYIpQixqMmpkebbLPVviUAv8u1buAxvTh 59LaVDVDDhJd9c8qdrIgYapYNJm4cE8hAR50pqhpnxXwHbGkqk/gYJ0rR1JqCg== 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=1782512457; 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=G28waci3Uno5HDiqBkonLUxsEZSP6h3h3FTo4KXRuM8=; b=uTPdHErjqunzV0MWggbIFdOJle8TVR861TxpRkz3rFVdXuBTi6jBbFk98wqFolLWez0NV9 w41X/rM5QkqVqPKFmX8pBAy0Jd+X/vfP4vrhFLS+OUuSP3R/A8FeAaJwTe8F7kXLvVcsTE COojqT/iO0GLwijIbbMb03vcTayTsu/eiA6j3AWAHwduBO46DQeD5Zo3pQh3K6NLcwSYOT 1vRS/jN0yqdIKMUMsI2TtHR9KImMNc2zjuDY4Vv1L0zyhLe6fmd8/9hM5nqgtFWhBGlesw Z0JQ1b9ENBIFTdrD2lvWdB476yAHvSSgXOLjNdaX69OE4mMZB3NTS46kSTqx3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99h6PF5zxH7 for ; Fri, 26 Jun 2026 22:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27c4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d80a7fd6e6df - stable/15 - kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d80a7fd6e6df65b4d85e6977557c3fbe8d9ff02e Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:56 +0000 Message-Id: <6a3efb48.27c4f.61d46f60@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d80a7fd6e6df65b4d85e6977557c3fbe8d9ff02e commit d80a7fd6e6df65b4d85e6977557c3fbe8d9ff02e Author: Konstantin Belousov AuthorDate: 2026-06-15 13:32:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:09 +0000 kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace (cherry picked from commit 6a572920f251ac8ac6a80a55d4d039736ea7dd65) --- sys/kern/kern_procctl.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index c8d14aa2f2f6..581b24f21d3c 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -877,22 +878,27 @@ wxmap_ctl(struct thread *td, struct proc *p, void *data) { struct vmspace *vm; vm_map_t map; - int state; + int error, state; PROC_LOCK_ASSERT(p, MA_OWNED); state = *(int *)data; + error = 0; switch (state) { case PROC_WX_MAPPINGS_PERMIT: - p->p_flag2 |= P2_WXORX_DISABLE; PROC_UNLOCK(p); - vm = vmspace_acquire_ref(p); - if (vm != NULL) { + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_DEBUG, &vm); + if (error == 0) { map = &vm->vm_map; vm_map_lock(map); map->flags &= ~MAP_WXORX; vm_map_unlock(map); - vmspace_free(vm); + PROC_LOCK(p); + p->p_flag2 |= P2_WXORX_DISABLE; + PROC_UNLOCK(p); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_DEBUG, vm); } PROC_LOCK(p); break; @@ -900,10 +906,11 @@ wxmap_ctl(struct thread *td, struct proc *p, void *data) p->p_flag2 |= P2_WXORX_ENABLE_EXEC; break; default: - return (EINVAL); + error = EINVAL; + break; } - return (0); + return (error); } static int From nobody Fri Jun 26 22:20:59 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 4gn99l5Clkz6j2cb for ; Fri, 26 Jun 2026 22:20:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99l20Lhz3mWD for ; Fri, 26 Jun 2026 22:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512459; 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=WiHSwBmyepEYgrET//TmNQ0/47q67BCamaOSSUG253M=; b=AApemdS8vl8dQ4gYKu6XRXWbS6+6cg1l+HNT4Dc06lh2mPcBmFduCXwUk7UHW0eb7NHlGv Hv5DhjsXrv1/aXi7IKVVB+COvPvurlmaPevrsGtpAnlGAVp+ZTSJYcD34NVV8IlXKB2vFU M+Fy600ZTGtidFpUfYIDdcL490YRn3fdQ5JMudMBQd60qSJGexCqXb1nhaS5eHyxoyJLLn aDXFffnGfgdQehxl+uG/YqARX1PIhmwo76ZBJs2DZh+nXyOShO0gKDebjqFrqcMDx3eUsw 1dkwHtxt1NqklC/eGOAbAqFC7g1/ZqkiutesV1QQEWiQPPsZZsS4PQiRqQLa3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512459; a=rsa-sha256; cv=none; b=pcZIRq9gFUM9HdBqEYuc/idcVSKeAXKgtZFh47/PD6R46bODSBN4b9JqYQjoOWhgupyENB e+wYHBZO+J1NjrwZmK7lFHOMO1BgPY0XKqVQPxnKn5Ezx/5zQo6Di9yrdQTvzP7uGY+i86 Q0eqPVLxqM6P9PPUVEW9ywKCPHhetphmTPN9JSY769vtT7QlwCJNeKXYhP+LrMqpxX0cpz 4eZl5M8aay6yaAgLtE/kntwlsbC5qAmwPpqLzrw9syVtxmsLzk3QWNzI86v9HYWT1v+f/h P12cpSRmozCC7ikN7iFNmt/IR0GwYqskZMJdYGlWWrm74/SalvKkyrX4Bunk5w== 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=1782512459; 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=WiHSwBmyepEYgrET//TmNQ0/47q67BCamaOSSUG253M=; b=MKypHWMtFfhjTb1BE41EUxenqB5NJ8l/JHGKc+0ALezmG/4qfc/mNSzWLG/wbi9ETwex3j d8JI7FBh0Mesb8lP92U6BZLUFzkmR68/lMkJjUgSmaxH+5AmStQQeoENGUMPvNWT2qSARo H8j9F/wiLxGXoLiWqApjmKLG+DkcKXDkb0h/iGwqQ1xB0WsRHaac+QWjfpQLw31W9i+Pu1 DHbnmHOsFb4o3em1gcXBY6iqbHRyN/4XSmUOxHb7KHzILe+BCuua1LKQYW+MMDF7tCOvvN Qmo81dqsjiqe1JJxwDYh6i+dts8CizTVTtPN9pCK4CNb49lmyNIAoF4GRu+W2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99l0RRMzxH8 for ; Fri, 26 Jun 2026 22:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3083f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1744ce4b052d - stable/15 - pfs_readdir(): block the target process from execing 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1744ce4b052d4aea94c1c3b87fefabd0952e6082 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:59 +0000 Message-Id: <6a3efb4b.3083f.6d377173@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1744ce4b052d4aea94c1c3b87fefabd0952e6082 commit 1744ce4b052d4aea94c1c3b87fefabd0952e6082 Author: Konstantin Belousov AuthorDate: 2026-06-07 19:32:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:10 +0000 pfs_readdir(): block the target process from execing (cherry picked from commit 4c0a0909f928baac982b7de4bfa5b5ca7de5291a) --- sys/fs/pseudofs/pseudofs_vnops.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 8cd092118d0e..6850c3683a2d 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -132,6 +133,7 @@ static int pfs_lookup_proc(pid_t pid, struct proc **p) { struct proc *proc; + struct thread *td; proc = pfind(pid); if (proc == NULL) @@ -141,8 +143,10 @@ pfs_lookup_proc(pid_t pid, struct proc **p) return (0); } _PHOLD(proc); - PROC_UNLOCK(proc); + td = curthread; + execve_block_wait(td, proc); *p = proc; + PROC_UNLOCK(proc); return (1); } @@ -846,6 +850,7 @@ pfs_readdir(struct vop_readdir_args *va) struct pfs_node *pd = pvd->pvd_pn; pid_t pid = pvd->pvd_pid; struct proc *p, *proc; + struct thread *td; struct pfs_node *pn; struct uio *uio; struct pfsentry *pfsent, *pfsent2; @@ -891,11 +896,13 @@ pfs_readdir(struct vop_readdir_args *va) KASSERT(pid == NO_PID || proc != NULL, ("%s(): no process for pid %lu", __func__, (unsigned long)pid)); + td = curthread; if (pid != NO_PID) { PROC_LOCK(proc); /* check if the directory is visible to the caller */ if (!pfs_visible_proc(curthread, pd, proc)) { + execve_unblock(td, proc); _PRELE(proc); PROC_UNLOCK(proc); pfs_unlock(pd); @@ -955,6 +962,7 @@ pfs_readdir(struct vop_readdir_args *va) resid -= PFS_DELEN; } if (proc != NULL) { + execve_unblock(td, proc); _PRELE(proc); PROC_UNLOCK(proc); } From nobody Fri Jun 26 22:21:00 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 4gn99m5Bf5z6j2fh for ; Fri, 26 Jun 2026 22:21: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99m2htdz3mWX for ; Fri, 26 Jun 2026 22:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512460; 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=TF8p193eoX2df3yrpvVelVbySYFDuZthS2qHGKh2iCQ=; b=H4xOuMCVWP3x7hTsXtpz50sfiTk5RvGXeTkl5jbOxHmFIi5cqF51rn4+pTgQ4HKNl2m+04 4mFkPllo3wz8ctjVslxTxzsPdqZwX3KG0oS4umOlZz/TtTVh0IBqyHGydOyUe+QZlUh6Tr YG9nGR96fasI6uUdKLC8nBEDk3KubkDSRhS6wka2PoAxPmI/iKQIpkqoCL4UjQ4al9dyZ0 MhLzgKlfgxqWB4e0EwC3yrI3FZwBGCxCINkbhqKgzyh5+2DRS/Hck0ra1M9pnwwH8oAs9b E/YcjJkqXidbjhjo8KIEExURhv0ehi//bE0/zQqRHCpHTiC6PQSulUfO9MwPZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512460; a=rsa-sha256; cv=none; b=VAOwALNOlTQFfqbvXCf72aDEQ1841jreZs5lYOOCIXD5V9aA6Q0BpvzP/qnvTlxcHSvVqo /rDIrvoxEm0Q021dTMvkRWrpOQMPf1CCf3EUboEGFwCqGktjyetfrrYFk9mRD667KqB+8n TIDcVAfGDbF0n4ERkFoE3bqoBz22tFfr/6zEvna8Bn2UPAbjLZw+P3xPI+7Y3PYSbEz89d Be+RHjUjxE8xOhLoFCWXTjVNIm1sb93WK/scaObx8i9VhtaBgmxUdNyedNk8prtacpXFYl OIIvFPAQuu2R8NkzlfgjF1Vvpv81LKkvQGZdfY92nXDGP8QP19VdHDs0AoM+WA== 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=1782512460; 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=TF8p193eoX2df3yrpvVelVbySYFDuZthS2qHGKh2iCQ=; b=TMjnIuNpbg4d+oTG75NcCFlN+7n/pxUXTu/3L7tEbkX6+pF/EVvBnuXdmsCmHaPsVUpFpZ 3v/JTzRHqSXOfBfMWccw7Ntpmj15rU5MuMyuJyDflHV99fUNJY8uTrpp9a7cf+Jh91wUHn r7DzbrbaVBM7rDxmkqX4ltWgKJvBLN9hlqrRQVEKnCUzWZlmC2gJWjXp37zVyEaeVw5agr 26njLV6E2GF9xAMe9KSnFKoKyvL+Ke95pQRwKSoK/rGs1X1/ikba76OU7q3esfXy+R6nQd 1DvEe/aE6gzfipbwSKe5GpOso3lgHEG6iqTAnalvLZTM40ysefwfsfG6CQVsGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99m0tTszxMt for ; Fri, 26 Jun 2026 22:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27d25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:21:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 277f612073d0 - stable/15 - pseudofs: ensure that the target process vmspace is stable for VOP_READ/WRITE 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 277f612073d0b086604448814867cadaacad4ca8 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:21:00 +0000 Message-Id: <6a3efb4c.27d25.5eef335@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=277f612073d0b086604448814867cadaacad4ca8 commit 277f612073d0b086604448814867cadaacad4ca8 Author: Konstantin Belousov AuthorDate: 2026-06-07 19:39:42 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:10 +0000 pseudofs: ensure that the target process vmspace is stable for VOP_READ/WRITE (cherry picked from commit a4993bac41350e85bc9affb862d2974a1a09bb5e) --- sys/fs/pseudofs/pseudofs_vnops.c | 59 ++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 6850c3683a2d..059e8fd0e8b2 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -676,6 +676,7 @@ pfs_read(struct vop_read_args *va) struct pfs_node *pn = pvd->pvd_pn; struct uio *uio = va->a_uio; struct proc *proc; + struct thread *td; struct sbuf *sb = NULL; int error, locked; off_t buflen, buflim; @@ -694,21 +695,30 @@ pfs_read(struct vop_read_args *va) if (pn->pn_fill == NULL) PFS_RETURN (EIO); + td = curthread; + /* * This is necessary because either process' privileges may * have changed since the open() call. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) + if (!pfs_visible(td, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); - if (proc != NULL) { - _PHOLD(proc); - PROC_UNLOCK(proc); - } vhold(vn); locked = VOP_ISLOCKED(vn); VOP_UNLOCK(vn); + if (proc != NULL) { + _PHOLD(proc); + execve_block_wait(td, proc); + if (!pfs_visible_proc(td, pn, proc)) { + PROC_UNLOCK(proc); + error = EIO; + goto ret; + } + PROC_UNLOCK(proc); + } + if (pn->pn_flags & PFS_RAWRD) { PFS_TRACE(("%zd resid", uio->uio_resid)); error = pn_fill(curthread, proc, pn, NULL, uio); @@ -778,8 +788,12 @@ pfs_read(struct vop_read_args *va) ret: vn_lock(vn, locked | LK_RETRY); vdrop(vn); - if (proc != NULL) - PRELE(proc); + if (proc != NULL) { + PROC_LOCK(proc); + execve_unblock(td, proc); + _PRELE(proc); + PROC_UNLOCK(proc); + } PFS_RETURN (error); } @@ -1087,6 +1101,7 @@ pfs_write(struct vop_write_args *va) struct pfs_node *pn = pvd->pvd_pn; struct uio *uio = va->a_uio; struct proc *proc; + struct thread *td; struct sbuf sb; int error; @@ -1106,36 +1121,44 @@ pfs_write(struct vop_write_args *va) if (uio->uio_resid > PFS_MAXBUFSIZ) PFS_RETURN (EIO); + td = curthread; + /* * This is necessary because either process' privileges may * have changed since the open() call. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) + if (!pfs_visible(td, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); if (proc != NULL) { _PHOLD(proc); + execve_block_wait(td, proc); + if (!pfs_visible_proc(td, pn, proc)) { + PROC_UNLOCK(proc); + error = EIO; + goto out; + } PROC_UNLOCK(proc); } if (pn->pn_flags & PFS_RAWWR) { error = pn_fill(curthread, proc, pn, NULL, uio); - if (proc != NULL) - PRELE(proc); - PFS_RETURN (error); + goto out; } sbuf_uionew(&sb, uio, &error); - if (error) { - if (proc != NULL) - PRELE(proc); - PFS_RETURN (error); - } + if (error != 0) + goto out; error = pn_fill(curthread, proc, pn, &sb, uio); sbuf_delete(&sb); - if (proc != NULL) - PRELE(proc); +out: + if (proc != NULL) { + PROC_LOCK(proc); + execve_unblock(td, proc); + _PRELE(proc); + PROC_UNLOCK(proc); + } PFS_RETURN (error); } From nobody Fri Jun 26 22:21:01 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 4gn99p0VYzz6j2ch for ; Fri, 26 Jun 2026 22:21:02 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99n3fGwz3mgx for ; Fri, 26 Jun 2026 22:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512461; 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=i2c6VP0TgKPfZXnoySRP9dYfm30ysHSXG4pv3cAReF8=; b=RN+XWU77KIYsn2WTpAH9y+z2qCkI5ibxQP+p3ZNdR6LuLFPCCBDQir4YgQnjD3iIX9W58A Aw+uz2SPjQrWE98/zJsUt0M6dHc0ZHxocSys8+a6yfP/tEZ5DCGILVcgM97UAS9+ctYXKH 6W5MB0E0/4XEAPXukBnViJ1/uFvPre7yFKqT2PYiGchfyK30wt+1c/Kp9AgCmx398kWMGl 4wCT6VYeIaAoCY/amaiijeGlAlsyqVebBxtfZLSYSUYyS0y5V2VWBFKPRbdKTdq4AAMUEY E7f40KzN2d9rOxRjm4V+8ZJh/iCnoi8nRg9u38pPxmfT2d6M03r1ixlUUVg9sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512461; a=rsa-sha256; cv=none; b=gIb5CWQIVUkicCrqfagB8M8yw/QDPm0o+zGUstJfqtUxSAx4LUOURp5hqmB/SqjTmtBPtG b7thL3/858CEgxazl0XdVjqgqGQWf84JJTsPslEozWJthjy+tOz6r0dySAFfZPcEoMzON0 f5pmnO2sShfbUm///bnJ50tG4YUIZO7CHPqIgwZt/DW1F9YBP5chAhkKjBRChgwrENjWtT gF4h/tZUr1eisjDzOMyphyp/uSUQAZWHRpvEpQ4d7p+6LZuuVcdNcafdFayxoA+0nn0doc JNAi6FfoGWlXtnKKwnwQGwznqKB0RIikWAtk6F2ae7v/QAVScoGrGC9bqkuQzQ== 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=1782512461; 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=i2c6VP0TgKPfZXnoySRP9dYfm30ysHSXG4pv3cAReF8=; b=DhkLTT/CwMr8cLzrMLSigQvRvGIA3Pwayut45PGwMYpnK2fg+dylyi6gRPdxpFqY6Ga90h S0IV3jLAnS8BWrFTz2xhUDU0cZvtQV+mYB+XiPRPt9TXmpkmXqeZfRZc6ebcQiYOWhW3sy KteMgrgxuqnEAIxg+532uZ+eMXQM5TpLEpLYoa4RylfK8FCpilZlJb+g7HFNaA3+QpQvk5 e+DmfXjEyjIrnAhO4E4HJfkkhRG5P0wwDZTgjAY6Uw4TxFrXJRSNaBakbAuFpCFxAm51Lv C+Bf4T4r1JOClvA6VaTdbXdZET+Jal3SnmP7PC/NOFAqM5LbBM+2VBkzX26F4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99n2JrQzxMv for ; Fri, 26 Jun 2026 22:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30aa3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:21:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 78981848b85f - stable/15 - procfs, linprocfs: ensure target process vmspace stability 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 78981848b85fdd826eb830dfdd6d92c14b0f8bb3 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:21:01 +0000 Message-Id: <6a3efb4d.30aa3.7d83efe@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=78981848b85fdd826eb830dfdd6d92c14b0f8bb3 commit 78981848b85fdd826eb830dfdd6d92c14b0f8bb3 Author: Konstantin Belousov AuthorDate: 2026-06-07 18:48:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:11 +0000 procfs, linprocfs: ensure target process vmspace stability (cherry picked from commit 5db31f1b47b586a5091eb41fc957236f28b78dba) --- sys/compat/linprocfs/linprocfs.c | 16 +++++----------- sys/fs/procfs/procfs_map.c | 17 +++++++---------- sys/fs/procfs/procfs_mem.c | 6 +----- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 786a486b9143..9d0ceaa6245e 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1311,19 +1311,13 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) struct vattr vat; bool private; - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error) - return (error); - if (uio->uio_rw != UIO_READ) return (EOPNOTSUPP); - error = 0; - vm = vmspace_acquire_ref(p); - if (vm == NULL) - return (ESRCH); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, + &vm); + if (error != 0) + return (error); if (SV_CURPROC_FLAG(SV_LP64)) l_map_str = l64_map_str; @@ -1421,7 +1415,7 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG | PRVM_BLOCK_EXEC, vm); return (error); } diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index d4913a7b0f1d..1ed785f1ad90 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/sys/fs/procfs/procfs_map.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -93,15 +94,14 @@ procfs_doprocmap(PFS_FILL_ARGS) bool wrap32; #endif - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error) - return (error); - if (uio->uio_rw != UIO_READ) return (EOPNOTSUPP); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, + &vm); + if (error != 0) + return (error); + #ifdef COMPAT_FREEBSD32 wrap32 = false; if (SV_CURPROC_FLAG(SV_ILP32)) { @@ -111,9 +111,6 @@ procfs_doprocmap(PFS_FILL_ARGS) } #endif - vm = vmspace_acquire_ref(p); - if (vm == NULL) - return (ESRCH); map = &vm->vm_map; vm_map_lock_read(map); VM_MAP_ENTRY_FOREACH(entry, map) { @@ -238,6 +235,6 @@ procfs_doprocmap(PFS_FILL_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, vm); return (error); } diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 824fcd33b2ef..eb692c32923b 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -60,11 +60,7 @@ procfs_doprocmem(PFS_FILL_ARGS) if (uio->uio_resid == 0) return (0); - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error == 0) - error = proc_rwmem(p, uio, 0); + error = proc_rwmem(p, uio, PRVM_CHECK_DEBUG | PRVM_BLOCK_EXEC); return (error); } From nobody Fri Jun 26 22:21:02 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 4gn99p5ZrQz6j2mp for ; Fri, 26 Jun 2026 22:21:02 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99p3QH1z3mdn for ; Fri, 26 Jun 2026 22:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512462; 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=0ecKyqk+TFgFc0eC9TJltzynoRXUgZeSqLrkp/OJOkQ=; b=tKzgyGbtRaTTWXh6VgzdYThJGetqy9UGTScO2tcak2/un+6kRQQs4e9V0eEpagR5c6cv8b I1TM+APq+Id+kjiJxT92mg/hmsnDfECkSMGOLxV6kh5JyEFCECKSg62Y7S45rXUAANOiXg 89iZ13qOSXoeeBHai3sXY0xKZO15HbXAn6n/87Z3iWWZ6cCmQhbO9zB2FoZWOj5Y/oAkcZ S52ZS4orvbpMuPfOmmgWWd4B4OdwzQcgQsq0G44jLSSncFT4ne5AwfsYS2V1M5+NoYE4Fv OhAG6sBR5qCeiChhgmdbhb0cbGCyEVO5xpb51ClDCpv4kWH07bPupjMZsvDFfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512462; a=rsa-sha256; cv=none; b=xzLyUxEhICrcYNacIAhri8RYt0XHfegnyOXoHYBPk3OEj6to/3/RQp2BzPd8FJeBlfwLA4 yP0zkzKQ2owMb90j2Ntdg33YSlh5nthRmSC94DnMP/GuLHBZSNKxhSlMphgC6IZiPyMm48 tBT0k8sxzjurp7RM1p1q3kOgI7suSITpyEhf4JEon8Ork69L/X2kAf4RNJ+c68kRTta1CI igoiJIlnSaSQDxlhsgZHrmIetTjz4+FJfsVmosPBVXtmb9FNzPftpejPhwDXPZzHLY4et5 gKnFuEDnxbKM5G/OwuyDdeJegvXMUkS7+iRbhmoWQ37DWjm2D8F/R/E2ppjqbQ== 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=1782512462; 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=0ecKyqk+TFgFc0eC9TJltzynoRXUgZeSqLrkp/OJOkQ=; b=PQ+DPTUWWXPpvWoqgTUAb/zJR5B1rkkCInAVdqBTGqv799ccQCJNhe0iivV8bYU/YFTK2h nNjCsFeGTAFtStexjghP5SoDEKnsh7xCk579HkyrGOwanm2FzXZvILLFNAMMZJ0fsflSNu cFz4kRsPS2/sjwxARRP9yiY5vtt2tyA6QwSFhN7gIaNC42RhYeHei6pV7+TtJMKDU+8glS VKeTtE/VaohRVGghqY+NK3kgIpvfhKFty+eeJBf/ofN8YvcTsFWSotFZEm3ZRlYjbboZD9 Kj0u+BDaHqGanFMcVH8EV2sZz8kuh6f33OtqvyQq56HZGiN8cRCb95+yybzvaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99p2VXPzxHD for ; Fri, 26 Jun 2026 22:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27330 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:21:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e0492444761b - stable/15 - sys_set*id(9): wait for the execblocks to pass 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e0492444761b638ff072222d39ba5d6088a63370 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:21:02 +0000 Message-Id: <6a3efb4e.27330.68f38302@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e0492444761b638ff072222d39ba5d6088a63370 commit e0492444761b638ff072222d39ba5d6088a63370 Author: Konstantin Belousov AuthorDate: 2026-06-17 19:07:22 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:11 +0000 sys_set*id(9): wait for the execblocks to pass (cherry picked from commit d0384f50dad25d3358d76f7556969ea1d515ba68) --- sys/kern/kern_prot.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 47744f6b07fe..a223a7720844 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -1021,6 +1022,8 @@ sys_seteuid(struct thread *td, struct seteuid_args *uap) newcred = crget(); euip = uifind(euid); PROC_LOCK(p); + execve_block_pass(td); + /* * Copy credentials so other references do not see our changes. */ @@ -1075,6 +1078,7 @@ sys_setgid(struct thread *td, struct setgid_args *uap) AUDIT_ARG_GID(gid); newcred = crget(); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1173,6 +1177,7 @@ sys_setegid(struct thread *td, struct setegid_args *uap) AUDIT_ARG_EGID(egid); newcred = crget(); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1304,6 +1309,7 @@ kern_setgroups(struct thread *td, int *ngrpp, gid_t *groups) newcred = crget(); crextend(newcred, ngrp); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1360,6 +1366,7 @@ sys_setreuid(struct thread *td, struct setreuid_args *uap) euip = uifind(euid); ruip = uifind(ruid); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1439,6 +1446,7 @@ sys_setregid(struct thread *td, struct setregid_args *uap) AUDIT_ARG_RGID(rgid); newcred = crget(); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1509,6 +1517,7 @@ sys_setresuid(struct thread *td, struct setresuid_args *uap) euip = uifind(euid); ruip = uifind(ruid); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1600,6 +1609,7 @@ sys_setresgid(struct thread *td, struct setresgid_args *uap) AUDIT_ARG_SGID(sgid); newcred = crget(); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC From nobody Fri Jun 26 22:21:03 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 4gn99q6bqRz6j2q9 for ; Fri, 26 Jun 2026 22:21:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99q4F8bz3mQt for ; Fri, 26 Jun 2026 22:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512463; 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=mr8hXuV4NRUdmjNS0ky58Pws3EdoiQpZizs3PM2vsbU=; b=SIQCawug4kyi0sqiOFoUcgsuYckC1QCdWVjflWjv3a0V2YmryrX/fEO94KPF2XeIqcq/9E OyV4IhVu7MsbqQ0HNGQMm4wUxdK9q8Rw/MWc/6ox+YuNakdEmIzzoIaHyXnr4ru46AfTha gDIoBNauzNP93UrybYrV9WrHcQe04ulTH1xExU2Na8aR62iMfCg11FkrQyZH0i2xXTHZp8 11wUN/UvLo0OpNNDwF798tSSlFKtTM2Tvjf3N3RV0DRqbjdifuVbV/QMO1v3eqPb4JqDK8 7fBmJG0c73YL1K5wRD/LMIq8WnOyr1JDBh0I3apxmAteCv7PQoaO4+8glPIoyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512463; a=rsa-sha256; cv=none; b=gPqhg66U373ZPovToTAD+o5N5FmvEGMFVoIbKia+5WXpLJv+8/EILicl2/btqTJTvRADle CU0ECj72U9MeMOxwUSpMcuE9M173hlICxZKass2AsZFKD7GxAxE/k5KBEu5IegjPx/Bq3U j0h3h0b7ByXLFl2tKSez2Y2AE9rFQvzaQHun70V80aurfLaZNZLohIruc9XhaamRlqXfYq 5ZpVKBJ809G0UxuSoE5PqXdfnKhYXsR7d2ducUypcC0XzpqhWHOsnoQqJYgbbXhAT86SdU xsrACBi8vmkG4yC8MC2z7FYel4poaZxI9e37rtB9KtmYYKPFEVe825axHmm2XA== 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=1782512463; 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=mr8hXuV4NRUdmjNS0ky58Pws3EdoiQpZizs3PM2vsbU=; b=mRm3eqIFbV55QMqy9TxvCJmWXkZm3m6SVfWGmnEv7vSMnvhdDoX/WtiGYxnHNT1MJwOc0U oTWyf/d3fuHDiZP0NHLkEi8TZknt2IGUX3mL3FgDISBWFLup0ENjqwo/kP5RovfjzS+1Fl G1lvQAcQk+ZJvfgUmHOlcQLTldsghcJCEo6u4YIiRHK+1xZt0fvlNkw4ZJr7YAVMWQGoF1 MdEis6G602BB5+1Qf7h09L69QFoMnIJE8tXDsEgIAYHhCn4l/FIcnpm0n+Ji+DQhfTEfI6 K1shfbvG1I5KOE+qBUk2FQcwDSHxBErvTwjE5O/cnTIwOIJD0F984Dnr6Wb0VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99q3KJrzxV3 for ; Fri, 26 Jun 2026 22:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27836 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:21:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 42d8b0bf7a5a - stable/15 - kern_exec.c: explicitly include sys/limits.h for UINT_MAX 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 42d8b0bf7a5a074c7035585a06dd44aed1b2cbdd Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:21:03 +0000 Message-Id: <6a3efb4f.27836.7232d2fb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42d8b0bf7a5a074c7035585a06dd44aed1b2cbdd commit 42d8b0bf7a5a074c7035585a06dd44aed1b2cbdd Author: Konstantin Belousov AuthorDate: 2026-06-21 14:17:41 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:12 +0000 kern_exec.c: explicitly include sys/limits.h for UINT_MAX (cherry picked from commit f5fce0bcc370a9700249e64901eabf2e0be4ecb0) --- sys/kern/kern_exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index a3c9a4baa787..b60d0c1e8b88 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_capsicum.h" #include "opt_hwpmc_hooks.h" #include "opt_hwt_hooks.h" @@ -46,6 +45,7 @@ #include #include #include +#include #include #include #include From nobody Fri Jun 26 23:02:14 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 4gnB5L2jGLz6j6QD for ; Fri, 26 Jun 2026 23:02:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnB5L2Dk3z3wXC for ; Fri, 26 Jun 2026 23:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782514934; 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=/wRmQ5p/UwGJ7uqGMYP5IQh4hwbrnSa8YBJTUwN/g18=; b=j9J5cVgzv/8zeLvoL9/xtTB+X5MPlG/RU+eLzsn9mM1z1JiBx1Xz98FBHV2CjtpQJ/qysu s+J4MnaLN/RRXOU9d63xitxiGS790DVpP+ALNttcD7wgVxpfMqPKwrgmlbCyhNyMFsJ+G+ DGUo/TJVQ7o2MbC7tAfPUGHoPnrhjt4pg8RwYw3emka04OCa0O4vJsxtvPri5CSt9er5us qLECCYLC/lVjMrDm7YcsSdlqEjqUjUadmQ+ZZr1DXFsYaHv3SpGBc6LoL/V64thYgCVj2t GYcXQ7gSZ2EaS5z0mvzc53zWXG2ikakuV/DSlryabyBPH2XV//zzKHkGZ1w26Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782514934; a=rsa-sha256; cv=none; b=tHsqLyCepotvHrNmk+8bGP8C5WmHAH7m3HRsiTazU/O26TyMhrM1IVyfkWc+e1rI9O6SJr 0XcYdQPVfhtLK/ebCtVSJ5nu5i3ZUBUVJ7uTh3HfrZ9p0WNMbOoFIon4BfcxOmdODQs9sY vjwy/5oSgWOlfHB5pWilTztQkcqCIQlmy1QTo/HOzBuJMo4vMVgpE0gf8iiUqZbbT/zpN3 /ZOC0OL2Z8SL4En5q2i36bkfXAxX0qVwwfWnUhToih0KyX9rgoGROYT4zgjDu/udNZPuZd A9Fw7+laLKptsWNccq8ZHEwVV6goQkudWu1PJggjLMdtnP2YId5u7IMy5mA+dA== 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=1782514934; 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=/wRmQ5p/UwGJ7uqGMYP5IQh4hwbrnSa8YBJTUwN/g18=; b=sNAQ1hlPCgTol/zYlsg6aGw6pZiBEYT1bPY/pyqGxQ+L7M+uRUtMnbwd11PXhVSDnTnjfQ 53+Y6QHBPfT8a68EdgrTU0bgh6NowzMSBYXNe1WnUq/iPHpOFqnjiJQdToNTnfedaqGe85 HrcmlPBlMkjM3vzQ9tlK569Mo2yKDn+t8CGVDRVLz609UGJb8PoSG0B66hccBNTl8yNdB8 00/59C9sYo1+fuz8VBM5ddweFFK5h+R33T8F+IVSBILou04m8AAp3JqLIu4wEMXeBzZR32 nzfO41chYtsqXVN5T+Oq+5W440IkoD3MhO6i5BvlU6WatwGUTWTwNJsje4UGBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnB5L0q08zyZT for ; Fri, 26 Jun 2026 23:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36072 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 23:02:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f95439f6c9d0 - stable/15 - libpfctl: retrieve family id only once 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f95439f6c9d0e0a4af6a834ec7a0c7fb5279406d Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 23:02:14 +0000 Message-Id: <6a3f04f6.36072.383de072@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f95439f6c9d0e0a4af6a834ec7a0c7fb5279406d commit f95439f6c9d0e0a4af6a834ec7a0c7fb5279406d Author: Kristof Provost AuthorDate: 2026-06-11 12:53:31 +0000 Commit: Kristof Provost CommitDate: 2026-06-26 23:02:04 +0000 libpfctl: retrieve family id only once Look up the pfctl family id when we open the handle, rather than for every function call. This saves us a lot of netlink calls, at the expense of storing one extra int in the handle. Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 2a478dfc7f9cd60037939e121026bf26a01e8c41) --- lib/libpfctl/libpfctl.c | 260 +++++++++++++----------------------------------- 1 file changed, 68 insertions(+), 192 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 74d319cd2ad1..a97ca92e5144 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -59,6 +59,7 @@ struct pfctl_handle { int fd; struct snl_state ss; + int family_id; }; const char* PFCTL_SYNCOOKIES_MODE_NAMES[] = { @@ -84,6 +85,10 @@ pfctl_open(const char *pf_device) if (!snl_init(&h->ss, NETLINK_GENERIC)) goto error; + h->family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (h->family_id == 0) + goto error; + return (h); error: if (h->fd != -1) @@ -115,14 +120,9 @@ pfctl_do_netlink_cmd(struct pfctl_handle *h, uint cmd) struct snl_writer nw; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, cmd); + hdr = snl_create_genl_msg_request(&nw, h->family_id, cmd); hdr = snl_finalize_msg(&nw); if (hdr == NULL) @@ -407,16 +407,12 @@ pfctl_get_status_h(struct pfctl_handle *h) struct nlmsghdr *hdr; struct snl_writer nw; uint32_t seq_id; - int family_id; SNL_VERIFY_PARSERS(stat_parser); - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (NULL); - snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_STATUS); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_STATUS); hdr->nlmsg_flags |= NLM_F_DUMP; hdr = snl_finalize_msg(&nw); @@ -1342,14 +1338,10 @@ pfctl_add_rule_h(struct pfctl_handle *h, const struct pfctl_rule *r, struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_ADDRULE); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_ADDRULE); hdr->nlmsg_flags |= NLM_F_DUMP; snl_add_msg_attr_u32(&nw, PF_ART_TICKET, ticket); snl_add_msg_attr_u32(&nw, PF_ART_POOL_TICKET, pool_ticket); @@ -1390,14 +1382,10 @@ pfctl_get_rules_info_h(struct pfctl_handle *h, struct pfctl_rules_info *rules, u struct nlmsghdr *hdr; struct snl_writer nw; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETRULES); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GETRULES); hdr->nlmsg_flags |= NLM_F_DUMP; snl_add_msg_attr_string(&nw, PF_GR_ANCHOR, path); @@ -1716,14 +1704,10 @@ pfctl_get_clear_rule_h(struct pfctl_handle *h, uint32_t nr, uint32_t ticket, struct nlmsghdr *hdr; struct snl_writer nw; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETRULE); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GETRULE); hdr->nlmsg_flags |= NLM_F_DUMP; snl_add_msg_attr_string(&nw, PF_GR_ANCHOR, anchor); @@ -1819,35 +1803,30 @@ static struct snl_attr_parser ap_creators[] = { #undef _OUT SNL_DECLARE_PARSER(creator_parser, struct genlmsghdr, snl_f_p_empty, ap_creators); -static int -pfctl_get_creators_nl(struct snl_state *ss, uint32_t *creators, size_t *len) +int +pfctl_get_creatorids(struct pfctl_handle *h, uint32_t *creators, size_t *len) { - - int family_id = snl_get_genl_family(ss, PFNL_FAMILY_NAME); - size_t i = 0; - struct nlmsghdr *hdr; struct snl_writer nw; + size_t i = 0; - if (family_id == 0) - return (ENOTSUP); - - snl_init_writer(ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETCREATORS); + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GETCREATORS); hdr->nlmsg_flags |= NLM_F_DUMP; hdr = snl_finalize_msg(&nw); if (hdr == NULL) return (ENOMEM); uint32_t seq_id = hdr->nlmsg_seq; - snl_send_message(ss, hdr); + snl_send_message(&h->ss, hdr); struct snl_errmsg_data e = {}; - while ((hdr = snl_read_reply_multi(ss, seq_id, &e)) != NULL) { + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { struct pfctl_creator c; bzero(&c, sizeof(c)); - if (!snl_parse_nlmsg(ss, hdr, &creator_parser, &c)) + if (!snl_parse_nlmsg(&h->ss, hdr, &creator_parser, &c)) continue; creators[i] = c.id; @@ -1861,16 +1840,6 @@ pfctl_get_creators_nl(struct snl_state *ss, uint32_t *creators, size_t *len) return (0); } -int -pfctl_get_creatorids(struct pfctl_handle *h, uint32_t *creators, size_t *len) -{ - int error; - - error = pfctl_get_creators_nl(&h->ss, creators, len); - - return (error); -} - static inline bool snl_attr_get_pfaddr(struct snl_state *ss __unused, struct nlattr *nla, const void *arg __unused, void *target) @@ -2089,14 +2058,9 @@ _pfctl_clear_states_h(struct pfctl_handle *h, const struct pfctl_kill *kill, struct pfctl_nl_clear_states attrs = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, cmd); + hdr = snl_create_genl_msg_request(&nw, h->family_id, cmd); hdr->nlmsg_flags |= NLM_F_DUMP; snl_add_msg_attr_u64(&nw, PF_CS_CMP_ID, kill->cmp.id); @@ -2450,14 +2414,10 @@ _pfctl_table_add_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct p struct nlmsghdr *hdr; uint32_t seq_id; uint32_t added; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_TABLE_ADD_ADDR); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_TABLE_ADD_ADDR); snl_add_msg_attr_table(&nw, PF_TA_TABLE, tbl); snl_add_msg_attr_u32(&nw, PF_TA_FLAGS, flags); @@ -2517,14 +2477,10 @@ _pfctl_table_del_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct p struct nlmsghdr *hdr; uint32_t seq_id; uint32_t deleted; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_TABLE_DEL_ADDR); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_TABLE_DEL_ADDR); snl_add_msg_attr_table(&nw, PF_TA_TABLE, tbl); snl_add_msg_attr_u32(&nw, PF_TA_FLAGS, flags); @@ -2652,14 +2608,10 @@ pfctl_set_statusif(struct pfctl_handle *h, const char *ifname) struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_SET_STATUSIF); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_SET_STATUSIF); snl_add_msg_attr_string(&nw, PF_SS_IFNAME, ifname); @@ -2697,14 +2649,10 @@ pfctl_natlook(struct pfctl_handle *h, const struct pfctl_natlook_key *k, struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_NATLOOK); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_NATLOOK); hdr->nlmsg_flags |= NLM_F_DUMP; snl_add_msg_attr_u8(&nw, PF_NL_AF, k->af); @@ -2738,14 +2686,10 @@ pfctl_set_debug(struct pfctl_handle *h, uint32_t level) struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_SET_DEBUG); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_SET_DEBUG); snl_add_msg_attr_u32(&nw, PF_SD_LEVEL, level); @@ -2770,14 +2714,10 @@ pfctl_set_timeout(struct pfctl_handle *h, uint32_t timeout, uint32_t seconds) struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_SET_TIMEOUT); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_SET_TIMEOUT); snl_add_msg_attr_u32(&nw, PF_TO_TIMEOUT, timeout); snl_add_msg_attr_u32(&nw, PF_TO_SECONDS, seconds); @@ -2814,14 +2754,10 @@ pfctl_get_timeout(struct pfctl_handle *h, uint32_t timeout, uint32_t *seconds) struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_TIMEOUT); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_TIMEOUT); hdr->nlmsg_flags |= NLM_F_DUMP; snl_add_msg_attr_u32(&nw, PF_TO_TIMEOUT, timeout); @@ -2852,14 +2788,10 @@ pfctl_set_limit(struct pfctl_handle *h, const int index, const uint limit) struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_SET_LIMIT); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_SET_LIMIT); snl_add_msg_attr_u32(&nw, PF_LI_INDEX, index); snl_add_msg_attr_u32(&nw, PF_LI_LIMIT, limit); @@ -2896,14 +2828,10 @@ pfctl_get_limit(struct pfctl_handle *h, const int index, uint *limit) struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_LIMIT); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_LIMIT); hdr->nlmsg_flags |= NLM_F_DUMP; snl_add_msg_attr_u32(&nw, PF_LI_INDEX, index); @@ -2945,14 +2873,10 @@ pfctl_begin_addrs(struct pfctl_handle *h, uint32_t *ticket) struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_BEGIN_ADDRS); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_BEGIN_ADDRS); hdr->nlmsg_flags |= NLM_F_DUMP; if ((hdr = snl_finalize_msg(&nw)) == NULL) @@ -2981,14 +2905,10 @@ pfctl_add_addr(struct pfctl_handle *h, const struct pfioc_pooladdr *pa, int whic struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_ADD_ADDR); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_ADD_ADDR); snl_add_msg_attr_u32(&nw, PF_AA_ACTION, pa->action); snl_add_msg_attr_u32(&nw, PF_AA_TICKET, pa->ticket); @@ -3028,14 +2948,10 @@ pfctl_get_addrs(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_ADDRS); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_ADDRS); snl_add_msg_attr_u32(&nw, PF_AA_TICKET, ticket); snl_add_msg_attr_u32(&nw, PF_AA_R_NUM, r_num); @@ -3091,14 +3007,10 @@ pfctl_get_addr(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id =snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_ADDR); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_ADDR); snl_add_msg_attr_u32(&nw, PF_AA_TICKET, ticket); snl_add_msg_attr_u32(&nw, PF_AA_R_NUM, r_num); @@ -3139,14 +3051,10 @@ pfctl_get_rulesets(struct pfctl_handle *h, const char *path, uint32_t *nr) struct nlmsghdr *hdr; struct pfioc_ruleset rs = {}; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_RULESETS); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_RULESETS); snl_add_msg_attr_string(&nw, PF_RS_PATH, path); @@ -3175,14 +3083,10 @@ pfctl_get_ruleset(struct pfctl_handle *h, const char *path, uint32_t nr, struct struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_RULESET); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_RULESET); snl_add_msg_attr_string(&nw, PF_RS_PATH, path); snl_add_msg_attr_u32(&nw, PF_RS_NR, nr); @@ -3236,15 +3140,11 @@ pfctl_get_srcnodes(struct pfctl_handle *h, pfctl_get_srcnode_fn fn, void *arg) struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; int ret; - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); - snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_SRCNODES); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_SRCNODES); if ((hdr = snl_finalize_msg(&nw)) == NULL) return (ENXIO); @@ -3280,14 +3180,10 @@ pfctl_clear_tables(struct pfctl_handle *h, struct pfr_table *filter, struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_CLEAR_TABLES); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_CLEAR_TABLES); snl_add_msg_attr_string(&nw, PF_T_ANCHOR, filter->pfrt_anchor); snl_add_msg_attr_string(&nw, PF_T_NAME, filter->pfrt_name); @@ -3322,14 +3218,10 @@ pfctl_add_table(struct pfctl_handle *h, struct pfr_table *table, struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_ADD_TABLE); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_ADD_TABLE); snl_add_msg_attr_string(&nw, PF_T_ANCHOR, table->pfrt_anchor); snl_add_msg_attr_string(&nw, PF_T_NAME, table->pfrt_name); @@ -3360,14 +3252,10 @@ pfctl_del_table(struct pfctl_handle *h, struct pfr_table *table, struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_DEL_TABLE); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_DEL_TABLE); snl_add_msg_attr_string(&nw, PF_T_ANCHOR, table->pfrt_anchor); snl_add_msg_attr_string(&nw, PF_T_NAME, table->pfrt_name); @@ -3445,15 +3333,11 @@ pfctl_get_tstats(struct pfctl_handle *h, const struct pfr_table *filter, struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; uint32_t seq_id; - int family_id; int ret; - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); - snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_TSTATS); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_GET_TSTATS); snl_add_msg_attr_string(&nw, PF_T_ANCHOR, filter->pfrt_anchor); snl_add_msg_attr_string(&nw, PF_T_NAME, filter->pfrt_name); @@ -3495,14 +3379,10 @@ pfctl_clear_tstats(struct pfctl_handle *h, const struct pfr_table *filter, struct nlmsghdr *hdr; uint64_t zero; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_CLR_TSTATS); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_CLR_TSTATS); snl_add_msg_attr_string(&nw, PF_T_ANCHOR, filter->pfrt_anchor); snl_add_msg_attr_string(&nw, PF_T_NAME, filter->pfrt_name); @@ -3541,14 +3421,10 @@ pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, struct nlmsghdr *hdr; uint64_t del; uint32_t seq_id; - int family_id; - - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); - if (family_id == 0) - return (ENOTSUP); snl_init_writer(&h->ss, &nw); - hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_CLR_ADDRS); + hdr = snl_create_genl_msg_request(&nw, h->family_id, + PFNL_CMD_CLR_ADDRS); snl_add_msg_attr_string(&nw, PF_T_ANCHOR, filter->pfrt_anchor); snl_add_msg_attr_string(&nw, PF_T_NAME, filter->pfrt_name); From nobody Fri Jun 26 23:02:15 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 4gnB5M50tJz6j69t for ; Fri, 26 Jun 2026 23:02:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnB5M39q8z3wRk for ; Fri, 26 Jun 2026 23:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782514935; 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=UPO2grmwuBzo33pK0fCt6+El+KaN6KZKZBSW5yyHLqA=; b=vzEwe7+Ky6mW49lKHbE2B4DG9ESgpD2j9txaojcTd5cY6GqrHGu6OiMCxTFj0gWDU9YFIZ Teco7q3+fMqI4oSX7Crno/wltAr2jD2wHS4cspIN93WHUpQU+GD2HxJD4asRhYxLxVWp5P fAHod0fn2YTq7QH1LqljqtjF+nFgnxrcbm4F1Il4SDUkcpUGkiLfnAoPjxmZChzpaR3xcQ Xvy+tQ28w1upjwp0DVzDA8oo3LqUan48rhAHAlvr8IluNymSLNzfl3dBu11HwvAtl4Ap2u VZiRn6rLwevDG0xerRyU2UbTeZJTbf+2cbzHs5AFbOaSYBopWaZnM2gdujmP3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782514935; a=rsa-sha256; cv=none; b=b/rWq97UFVUAra/zIi8KaVNTwXTpvMJm7cLcjwZ+rOjp7dwU+/d2TdzrSuqYa5ugjq1gok Fmn3l7bVMQux9Ng0HlRsyisdEgXbj9bFv3ZRTkCmxR4+jlOW+ETF1SbN/1Ct2Epb3QWqMr xP21MgS64PhDKk5VdeTqaPHbVpqxyot+mgd2Nvx/7SxPJmWMi49PgRy+FoqmzvillHOBJm SRdT/7HoA3E++5FyfUx+p0NIFH2dkacqjMSOKzSensTJi9hijZXHTkkPNXcmlH1o0JJ96J 3aEng8IFIWLymerJACmu180SuILLN3gOybFVFCsxLuUYNFhI9r4R5oEPTADpEw== 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=1782514935; 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=UPO2grmwuBzo33pK0fCt6+El+KaN6KZKZBSW5yyHLqA=; b=MjezrZVMnOdZpIvgvD/6/jSQ050QKgelfXMbTxa8xx7IKT2LjNhpJPm1oYjQe60BfGG2zP UaeS4U1ym/elM1af+0ip3AotHd6o6ZWyRq4i+56y5oRCajYeYVcRIFR80kdZN6Z7oVgKaV Ns/SeKQWN8mfiucWgb3ZJJYbSIVBsAu28hTOcAFYWAn8piZMFP8gCEpQIBa6Ynvim8VfiG MNUAMmNBLI5astT3Hklb8pcenjtRG5HpOUjB8qfJuHszs+ha7iaa6WesbI5DZ3FB4Wfjx5 l1Ncbw9zXQVsZusA9MtTbNeWIGtzq+dVbqIMpxTB6q/myvWTWDkGY09bZZcxdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnB5M1c97zymJ for ; Fri, 26 Jun 2026 23:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 329ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 23:02:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9de06f27b140 - stable/15 - libpfctl: fix memory leak 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9de06f27b140660933f95ba50db452202cbea7fe Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 23:02:15 +0000 Message-Id: <6a3f04f7.329ea.16ba984@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9de06f27b140660933f95ba50db452202cbea7fe commit 9de06f27b140660933f95ba50db452202cbea7fe Author: Kristof Provost AuthorDate: 2026-06-11 14:58:20 +0000 Commit: Kristof Provost CommitDate: 2026-06-26 23:02:05 +0000 libpfctl: fix memory leak When we snl_init_writer() we allocate memory in the struct snl_state in the struct pfctl_handle. This memory was never released again, leading to a memory leak. We still had a reference to the memory and would release it on pfctl_close() (so valgrind did not detect it as a leak), but long-lived users (e.g. bsnmpd) would eventually run out of memory. Explicitly reset the snl_state when we're done to prevent this. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit fcb31b57112425a4eb64241651a0206108105298) --- lib/libpfctl/libpfctl.c | 434 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 308 insertions(+), 126 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index a97ca92e5144..35d2a31906bf 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -125,15 +125,22 @@ pfctl_do_netlink_cmd(struct pfctl_handle *h, uint cmd) hdr = snl_create_genl_msg_request(&nw, h->family_id, cmd); hdr = snl_finalize_msg(&nw); - if (hdr == NULL) - return (ENOMEM); + if (hdr == NULL) { + e.error = ENOMEM; + goto out; + } seq_id = hdr->nlmsg_seq; - snl_send_message(&h->ss, hdr); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -402,7 +409,7 @@ static const struct snl_hdr_parser *stat_parser[] = { struct pfctl_status * pfctl_get_status_h(struct pfctl_handle *h) { - struct pfctl_status *status; + struct pfctl_status *status = NULL; struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; struct snl_writer nw; @@ -416,17 +423,17 @@ pfctl_get_status_h(struct pfctl_handle *h) hdr->nlmsg_flags |= NLM_F_DUMP; hdr = snl_finalize_msg(&nw); - if (hdr == NULL) { - return (NULL); - } + if (hdr == NULL) + goto out; seq_id = hdr->nlmsg_seq; if (! snl_send_message(&h->ss, hdr)) - return (NULL); + goto out; status = calloc(1, sizeof(*status)); if (status == NULL) - return (NULL); + goto out; + TAILQ_INIT(&status->counters); TAILQ_INIT(&status->lcounters); TAILQ_INIT(&status->fcounters); @@ -437,6 +444,8 @@ pfctl_get_status_h(struct pfctl_handle *h) continue; } +out: + snl_clear_lb(&h->ss); return (status); } @@ -1350,17 +1359,23 @@ pfctl_add_rule_h(struct pfctl_handle *h, const struct pfctl_rule *r, snl_add_msg_attr_pf_rule(&nw, PF_ART_RULE, r); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -1392,18 +1407,24 @@ pfctl_get_rules_info_h(struct pfctl_handle *h, struct pfctl_rules_info *rules, u snl_add_msg_attr_u8(&nw, PF_GR_ACTION, ruleset); hdr = snl_finalize_msg(&nw); - if (hdr == NULL) - return (ENOMEM); + if (hdr == NULL) { + e.error = ENOMEM; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &getrules_parser, rules)) continue; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -1717,12 +1738,16 @@ pfctl_get_clear_rule_h(struct pfctl_handle *h, uint32_t nr, uint32_t ticket, snl_add_msg_attr_u8(&nw, PF_GR_CLEAR, clear); hdr = snl_finalize_msg(&nw); - if (hdr == NULL) - return (ENOMEM); + if (hdr == NULL) { + e.error = ENOMEM; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &getrule_parser, &attrs)) @@ -1732,6 +1757,8 @@ pfctl_get_clear_rule_h(struct pfctl_handle *h, uint32_t nr, uint32_t ticket, memcpy(rule, &attrs.r, sizeof(attrs.r)); strlcpy(anchor_call, attrs.anchor_call, MAXPATHLEN); +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -1806,6 +1833,7 @@ SNL_DECLARE_PARSER(creator_parser, struct genlmsghdr, snl_f_p_empty, ap_creators int pfctl_get_creatorids(struct pfctl_handle *h, uint32_t *creators, size_t *len) { + struct snl_errmsg_data e = {}; struct nlmsghdr *hdr; struct snl_writer nw; size_t i = 0; @@ -1815,13 +1843,18 @@ pfctl_get_creatorids(struct pfctl_handle *h, uint32_t *creators, size_t *len) PFNL_CMD_GETCREATORS); hdr->nlmsg_flags |= NLM_F_DUMP; hdr = snl_finalize_msg(&nw); - if (hdr == NULL) - return (ENOMEM); + if (hdr == NULL) { + e.error = ENOMEM; + goto out; + } + uint32_t seq_id = hdr->nlmsg_seq; - snl_send_message(&h->ss, hdr); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } - struct snl_errmsg_data e = {}; while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { struct pfctl_creator c; bzero(&c, sizeof(c)); @@ -1831,13 +1864,17 @@ pfctl_get_creatorids(struct pfctl_handle *h, uint32_t *creators, size_t *len) creators[i] = c.id; i++; - if (i > *len) - return (E2BIG); + if (i > *len) { + e.error = E2BIG; + goto out; + } } *len = i; - return (0); +out: + snl_clear_lb(&h->ss); + return (e.error); } static inline bool @@ -1951,12 +1988,17 @@ pfctl_get_states_nl(struct pfctl_state_filter *filter, struct snl_state *ss, pfc snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_MASK, &filter->mask.v6); hdr = snl_finalize_msg(&nw); - if (hdr == NULL) - return (ENOMEM); + if (hdr == NULL) { + ret = ENOMEM; + goto out; + } uint32_t seq_id = hdr->nlmsg_seq; - snl_send_message(ss, hdr); + if (! snl_send_message(ss, hdr)) { + ret = ENXIO; + goto out; + } struct snl_errmsg_data e = {}; while ((hdr = snl_read_reply_multi(ss, seq_id, &e)) != NULL) { @@ -1966,11 +2008,15 @@ pfctl_get_states_nl(struct pfctl_state_filter *filter, struct snl_state *ss, pfc continue; ret = f(&s, arg); - if (ret != 0) - return (ret); + if (ret != 0) { + goto out; + } } - return (0); + ret = e.error; +out: + snl_clear_lb(ss); + return (ret); } int @@ -2076,13 +2122,17 @@ _pfctl_clear_states_h(struct pfctl_handle *h, const struct pfctl_kill *kill, snl_add_msg_attr_bool(&nw, PF_CS_KILL_MATCH, kill->kill_match); snl_add_msg_attr_bool(&nw, PF_CS_NAT, kill->nat); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &clear_states_parser, &attrs)) @@ -2092,6 +2142,8 @@ _pfctl_clear_states_h(struct pfctl_handle *h, const struct pfctl_kill *kill, if (killed) *killed = attrs.killed; +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2424,12 +2476,16 @@ _pfctl_table_add_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct p for (int i = 0; i < size; i++) snl_add_msg_attr_pfr_addr(&nw, PF_TA_ADDR, &addrs[i]); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &table_add_addr_parser, &added)) @@ -2439,6 +2495,8 @@ _pfctl_table_add_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct p if (nadd) *nadd = added; +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2487,12 +2545,16 @@ _pfctl_table_del_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct p for (int i = 0; i < size; i++) snl_add_msg_attr_pfr_addr(&nw, PF_TA_ADDR, &addrs[i]); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &table_del_addr_parser, &deleted)) @@ -2502,6 +2564,8 @@ _pfctl_table_del_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct p if (ndel) *ndel = deleted; +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2615,17 +2679,23 @@ pfctl_set_statusif(struct pfctl_handle *h, const char *ifname) snl_add_msg_attr_string(&nw, PF_SS_IFNAME, ifname); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2663,19 +2733,25 @@ pfctl_natlook(struct pfctl_handle *h, const struct pfctl_natlook_key *k, snl_add_msg_attr_u16(&nw, PF_NL_SRC_PORT, k->sport); snl_add_msg_attr_u16(&nw, PF_NL_DST_PORT, k->dport); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &natlook_parser, r)) continue; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2693,17 +2769,23 @@ pfctl_set_debug(struct pfctl_handle *h, uint32_t level) snl_add_msg_attr_u32(&nw, PF_SD_LEVEL, level); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2722,17 +2804,23 @@ pfctl_set_timeout(struct pfctl_handle *h, uint32_t timeout, uint32_t seconds) snl_add_msg_attr_u32(&nw, PF_TO_TIMEOUT, timeout); snl_add_msg_attr_u32(&nw, PF_TO_SECONDS, seconds); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2762,13 +2850,17 @@ pfctl_get_timeout(struct pfctl_handle *h, uint32_t timeout, uint32_t *seconds) snl_add_msg_attr_u32(&nw, PF_TO_TIMEOUT, timeout); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &get_timeout_parser, &to)) @@ -2778,6 +2870,8 @@ pfctl_get_timeout(struct pfctl_handle *h, uint32_t timeout, uint32_t *seconds) if (seconds != NULL) *seconds = to.seconds; +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2796,17 +2890,23 @@ pfctl_set_limit(struct pfctl_handle *h, const int index, const uint limit) snl_add_msg_attr_u32(&nw, PF_LI_INDEX, index); snl_add_msg_attr_u32(&nw, PF_LI_LIMIT, limit); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2836,13 +2936,17 @@ pfctl_get_limit(struct pfctl_handle *h, const int index, uint *limit) snl_add_msg_attr_u32(&nw, PF_LI_INDEX, index); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &get_limit_parser, &li)) @@ -2852,6 +2956,8 @@ pfctl_get_limit(struct pfctl_handle *h, const int index, uint *limit) if (limit != NULL) *limit = li.limit; +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2879,13 +2985,17 @@ pfctl_begin_addrs(struct pfctl_handle *h, uint32_t *ticket) PFNL_CMD_BEGIN_ADDRS); hdr->nlmsg_flags |= NLM_F_DUMP; - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &begin_addrs_parser, &attrs)) @@ -2895,6 +3005,8 @@ pfctl_begin_addrs(struct pfctl_handle *h, uint32_t *ticket) if (ticket != NULL) *ticket = attrs.ticket; +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2921,17 +3033,23 @@ pfctl_add_addr(struct pfctl_handle *h, const struct pfioc_pooladdr *pa, int whic snl_add_msg_attr_pool_addr(&nw, PF_AA_ADDR, &pa->addr); snl_add_msg_attr_u32(&nw, PF_AA_WHICH, which); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -2959,19 +3077,24 @@ pfctl_get_addrs(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, snl_add_msg_attr_string(&nw, PF_AA_ANCHOR, anchor); snl_add_msg_attr_u32(&nw, PF_AA_WHICH, which); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &get_addrs_parser, nr)) continue; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3019,19 +3142,24 @@ pfctl_get_addr(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, snl_add_msg_attr_u32(&nw, PF_AA_NR, nr); snl_add_msg_attr_u32(&nw, PF_AA_WHICH, which); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &get_addr_parser, pa)) continue; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3058,13 +3186,17 @@ pfctl_get_rulesets(struct pfctl_handle *h, const char *path, uint32_t *nr) snl_add_msg_attr_string(&nw, PF_RS_PATH, path); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &ruleset_parser, &rs)) @@ -3073,6 +3205,8 @@ pfctl_get_rulesets(struct pfctl_handle *h, const char *path, uint32_t *nr) *nr = rs.nr; +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3091,13 +3225,16 @@ pfctl_get_ruleset(struct pfctl_handle *h, const char *path, uint32_t nr, struct snl_add_msg_attr_string(&nw, PF_RS_PATH, path); snl_add_msg_attr_u32(&nw, PF_RS_NR, nr); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + } seq_id = hdr->nlmsg_seq; - if (! snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (! snl_parse_nlmsg(&h->ss, hdr, &ruleset_parser, rs)) @@ -3107,6 +3244,8 @@ pfctl_get_ruleset(struct pfctl_handle *h, const char *path, uint32_t nr, struct rs->nr = nr; strlcpy(rs->path, path, sizeof(rs->path)); +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3146,13 +3285,17 @@ pfctl_get_srcnodes(struct pfctl_handle *h, pfctl_get_srcnode_fn fn, void *arg) hdr = snl_create_genl_msg_request(&nw, h->family_id, PFNL_CMD_GET_SRCNODES); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (!snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (!snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { bzero(&sn, sizeof(sn)); @@ -3164,6 +3307,8 @@ pfctl_get_srcnodes(struct pfctl_handle *h, pfctl_get_srcnode_fn fn, void *arg) return (ret); } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3190,19 +3335,25 @@ pfctl_clear_tables(struct pfctl_handle *h, struct pfr_table *filter, snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, filter->pfrt_flags); snl_add_msg_attr_u32(&nw, PF_T_FLAGS, flags); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (!snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (!snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (!snl_parse_nlmsg(&h->ss, hdr, &ndel_parser, ndel)) continue; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3228,19 +3379,25 @@ pfctl_add_table(struct pfctl_handle *h, struct pfr_table *table, snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, table->pfrt_flags); snl_add_msg_attr_u32(&nw, PF_T_FLAGS, flags); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (!snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (!snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (!snl_parse_nlmsg(&h->ss, hdr, &nadd_parser, nadd)) continue; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3262,19 +3419,26 @@ pfctl_del_table(struct pfctl_handle *h, struct pfr_table *table, snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, table->pfrt_flags); snl_add_msg_attr_u32(&nw, PF_T_FLAGS, flags); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + hdr = snl_finalize_msg(&nw); + if (hdr == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (!snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (!snl_parse_nlmsg(&h->ss, hdr, &ndel_parser, ndel)) continue; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3343,13 +3507,17 @@ pfctl_get_tstats(struct pfctl_handle *h, const struct pfr_table *filter, snl_add_msg_attr_string(&nw, PF_T_NAME, filter->pfrt_name); snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, filter->pfrt_flags); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (!snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { struct pfr_tstats tstats = {}; @@ -3362,6 +3530,8 @@ pfctl_get_tstats(struct pfctl_handle *h, const struct pfr_table *filter, break; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3389,13 +3559,17 @@ pfctl_clear_tstats(struct pfctl_handle *h, const struct pfr_table *filter, snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, filter->pfrt_flags); snl_add_msg_attr_u32(&nw, PF_T_FLAGS, flags); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (!snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (!snl_parse_nlmsg(&h->ss, hdr, &tstats_clr_parser, &zero)) @@ -3404,6 +3578,8 @@ pfctl_clear_tstats(struct pfctl_handle *h, const struct pfr_table *filter, *nzero = (uint32_t)zero; } +out: + snl_clear_lb(&h->ss); return (e.error); } @@ -3431,13 +3607,17 @@ pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, filter->pfrt_flags); snl_add_msg_attr_u32(&nw, PF_T_FLAGS, flags); - if ((hdr = snl_finalize_msg(&nw)) == NULL) - return (ENXIO); + if ((hdr = snl_finalize_msg(&nw)) == NULL) { + e.error = ENXIO; + goto out; + } seq_id = hdr->nlmsg_seq; - if (!snl_send_message(&h->ss, hdr)) - return (ENXIO); + if (! snl_send_message(&h->ss, hdr)) { + e.error = ENXIO; + goto out; + } while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { if (!snl_parse_nlmsg(&h->ss, hdr, &clr_addrs_parser, &del)) @@ -3446,6 +3626,8 @@ pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, *ndel = (uint32_t)del; } +out: + snl_clear_lb(&h->ss); return (e.error); } From nobody Sat Jun 27 00:51:04 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 4gnDVx2hxdz6jFHy for ; Sat, 27 Jun 2026 00:51:05 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnDVx0Q2sz49KZ for ; Sat, 27 Jun 2026 00:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782521465; 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=pnyHnx3w+lectYrW/Sj1i8WZzztez/yse0crepFzmyg=; b=itJvg6bUnp0Dp003zTU0fvUEJbXF2bDoZ+m5o/0/pYF1mHsbC4Mk+poS3cawTighETPBEx IUh7h64Nw24ADaR/PHYNt5ZJUyzXn4kHO/l3VF7JCbiOZ0h0Zvne5w8Th/Ws27VcIItOK4 dgfqjFM189GJqhI4M6Jm+lecFXTDWi9Eeac2314FQUUaFV82EXi5JHetlrNnXXo+T2YC25 kNwoF7TJG05O7m4lG4k14muR1Y9pumAc0//FWcdKW7e+oPGAZScuzeMz+6JZse/7cOyUOp QKYlR1x3RNQSZeJ2ZiQ6nD8eLyMaWkCpp6cbNXG2xAeWR0PcSLtAo/X2XSInLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782521465; a=rsa-sha256; cv=none; b=J/6k+Jn/GEmljYtzde47knpjuQjKpBFkSRDD97PNOiSahPCDw0ajdQoOg+pB9LnkN7BE3D oT8u0BVAQnP4bfa6G7E5hMPAn0u5GcNGC9kdMZZCMWrwu3TYsOO6nAzNCVJpZXD9QttwfC 52vp0qF9amvu5sygjuhZA/sVCocEjP1CLtHrt/5VIOnLiSIsNoZ3uikRHbdumG/i7HWhVQ WCWkF/Lgdcub+4pdvhYwDPTK31GfhspxSdmLb3TW3MZUr33dYILTepWBOOgjzyKT2cGoQU SW+CSmTglixMz1q40d/9MKOvTpkpzXulW7DCGmIaa+Ytpo55wHWpBI1+iLNICQ== 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=1782521465; 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=pnyHnx3w+lectYrW/Sj1i8WZzztez/yse0crepFzmyg=; b=R9O4s2s5aWagLsXq1VkuZClUjul2IGIU5Zg3LTblI1IADGUy7ee7jHTiJ11BBnvL2CFVUf dgoKgs2apyLjhonLtQ3OZNqRp/4Uq4xSAvZhAPa9MPYujC9eQRxlSy/rwRe9nyul6XYn9n knqy2oGFWJbV/ClZD2VJ8HbGOqn/hN5SwfIN3wFg+84xnizyoWTpNoxd5xxTsT4+pHrjFE W1S5d03xczLFFdwmLR1Vwj4JGkoEWuR02haeh2kJwR+Y0AeYLDGesnIXpgVbojI5ktXZ3R fyfu7BcatCskXSXw8n6orhNJyN0WT8tQQJkikzplHSWKEI+9qgKl0h3SJSlrfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnDVw6JbLz12HK for ; Sat, 27 Jun 2026 00:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f976 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 00:51:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2b51bd51c2fe - stable/15 - ntsync.4: add the man page 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2b51bd51c2feb82119a881bd76137fabb98e370c Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 00:51:04 +0000 Message-Id: <6a3f1e78.3f976.5d21c32e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2b51bd51c2feb82119a881bd76137fabb98e370c commit 2b51bd51c2feb82119a881bd76137fabb98e370c Author: Konstantin Belousov AuthorDate: 2026-06-19 12:40:03 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-27 00:50:21 +0000 ntsync.4: add the man page (cherry picked from commit f6b37f47c09903413bd980a5ebd4c7c3e19ba8a5) --- share/man/man4/Makefile | 1 + share/man/man4/ntsync.4 | 308 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 309 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 45b64a6cd489..06726e0360a8 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -435,6 +435,7 @@ MAN= aac.4 \ ${_ntb_hw_intel.4} \ ${_ntb_hw_plx.4} \ ${_ntb_transport.4} \ + ntsync.4 \ ${_nda.4} \ ${_if_ntb.4} \ null.4 \ diff --git a/share/man/man4/ntsync.4 b/share/man/man4/ntsync.4 new file mode 100644 index 000000000000..2776a4b0e691 --- /dev/null +++ b/share/man/man4/ntsync.4 @@ -0,0 +1,308 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright 2026 The FreeBSD Foundation +.\" +.\" This documentation was written by Konstantin Belousov +.\" under sponsorship from the FreeBSD Foundation. +.\" +.Dd June 19, 2026 +.Dt NTSYNC 4 +.Os +.Sh NAME +.Nm ntsync +.Nd NT-like synchronization operations device driver +.Sh SYNOPSIS +.In dev/ntsync/ntsync.h +.Sh DESCRIPTION +The +.Nm +device driver provides synchronization primitives that mimic the operations +provided by the Windows NT kernel. +The userspace interface is copied from the identically named driver written +for the Linux kernel, with the goal of helping Wine implement Win32 API. +.Pp +The driver provides the +.Pa /dev/ntsync +special device node that handles +.Xr ioctl 2 +requests of several groups: +.Bl -tag -width "wait operations:" +.It object creation: +among them semaphores, mutexes, and events +.It wait operations: +waiting for the set of objects to become signaled, either all +or any objects in the set can be waited for +.El +.Pp +An +.Xr open 2 +of the +.Pa /dev/ntsync +device returns the file descriptor which represents the synchronization +domain. +Each object created by the +.Xr ioctl 2 +on the ntsync file descriptor belongs to it's domain. +Wait requests must not mix the objects belonging to other domains. +.Pp +The synchronization objects are represented by file descriptors, each +implementing type-specific set of ioctl requests. +.Sh SEMAPHORES +The semaphores operations usually take the +.Bd -literal +struct ntsync_sem_args { + uint32_t count; + uint32_t max; +} +.Ed +as an argument. +The semaphore requests are: +.Bl -tag -width "NTSYNC_IOC_SEM_RELEASE" +.It Dv NTSYNC_IOC_CREATE_SEM +Creates the semaphore and returns the semaphore file descriptor. +Must be issued on the +.Pa /dev/ntsync +file descriptor. +.Pp +Takes the +.Va struct ntsync_sem_args +argument, where +.Dv count +is the initial semaphore count, and +.Dv max +is the maximum allowed count. +.It Dv NTSYNC_IOC_SEM_RELEASE +Releases the semaphore. +Takes the single +.Va uint32_t +value which is used to decrement the semaphore count. +If the semaphore count reaches zero, the semaphore becomes signaled. +.It Dv NTSYNC_IOC_SEM_READ +Returns the current state of the semaphore in the +.Va struct ntsync_sem_args . +.El +.Sh MUTEXES +The mutexes operations usually take the +.Bd -literal +struct ntsync_mutex_args { + uint32_t owner; + uint32_t count; +} +.Ed +as the argument. +.Pp +The mutex requests are: +.Bl -tag -width "NTSYNC_IOC_CREATE_MUTEX" +.It Dv NTSYNC_IOC_CREATE_MUTEX +Creates the mutex and returns the mutex file descriptor. +Must be issued on the +.Pa /dev/ntsync +file descriptor. +.Pp +Takes the +.Va struct ntsync_mutex_args +as the argument. +The +.Dv owner +is an abstract 32bit number that identifies the current mutex owner. +If +.Dv owner +is zero, the mutex is unowned, and +.Dv count +must be zero. +If +.Dv count +is non-zero, indicating the owned mutex, a non-zero +.Dv owner +must be provided. +.It Dv NTSYNC_IOC_MUTEX_UNLOCK +Unlocks the mutex. +Takes the +.Va struct ntsync_mutex_args +argument. +.Pp +The mutex must be owned by the argument's +.Dv owner . +Successful unlock decrements mutex' counter, and makes the mutex +signaled and unowned if the counter reaches zero. +.Pp +The counter value before unlock is returned in the +.Dv count +member of the argument structure. +.It Dv NTSYNC_IOC_MUTEX_KILL +Abandon the mutex. +Takes a single 32bit integer as the argument, indicating the current +mutex owner. +.Pp +The specified owner must be equal to the current mutex owner. +Then, the pending waiters are woken up, and get the +.Ev EOWNERDEAD +result. +The mutex owner and counter are set to zero. +.Pp +The abandoned state is cleared by next successful wait on the mutex. +.It Dv NTSYNC_IOC_MUTEX_READ +Returns the current state of the mutex. +Takes the +.Va struct ntsync_mutex_args +argument where the state is returned. +For abandoned mutexes, the +.Ev EOWNERDEAD +error is returned in addition to the state. +.El +.Sh EVENTS +The events operations usually take the +.Bd -literal +struct ntsync_event_args { + uint32_t manual; + uint32_t signaled; +} +.Ed +.Pp +The events requests are: +.Bl -tag -width "NTSYNC_IOC_CREATE_EVENT" +.It Dv NTSYNC_IOC_CREATE_EVENT +Creates the event and returns the event file descriptor. +Must be issued on the +.Pa /dev/ntsync +file descriptor. +Takes the +.Va struct ntsync_event_args +argument. +.Pp +Events can be of two types: manual and automatic. +Manual events needs to be reset by the request after being set. +Automatic events are reset by the system after a wait is satisfied. +.It Dv NTSYNC_IOC_EVENT_SET +Set (arm) the event. +Takes a 32bit integer argument where the state of the event before +the operation is returned. +.It Dv NTSYNC_IOC_EVENT_RESET +Reset (dis-arms) the event. +Takes a 32bit integer argument where the state of the event before +the operation is returned. +.It Dv NTSYNC_IOC_EVENT_PULSE +Atomically sets and then resets the event. +Takes a 32bit integer argument where the state of the event before +the operation is returned. +.It Dv NTSYNC_IOC_EVENT_READ +Returns the current state of the event. +Takes the +.Va struct ntsync_event_args +argument where the current event state is returned. +.El +.Sh WAIT OPERATIONS +Wait operations take the +.Bd -literal +struct ntsync_wait_args { + uint64_t timeout; + uint64_t objs; + uint32_t count; + uint32_t index; + uint32_t flags; + uint32_t owner; + uint32_t alert; + uint32_t pad; +} +.Ed +as the argument. +.Pp +The signaled state of the objects which cause the wait to +become satisfied are consumed by the operation, +e.g. the semaphore is acquired by incrementing its counter, +the mutex is locked, +and the manual event becomes not signaled. +.Pp +The +.Dv timeout +is in the nanoseconds. +If +.Dv timeout +is zero, the wait request only returns when either the wait +condition is satisfied, or a signal is queued. +Otherwise, if the wait is not satisfied after the specified time, +it is aborted anyway and the +.Er ETIMEDOUT +error is returned. +.Pp +The +.Dv objs +member points to the array of the synchronization object's file +descriptors. +Its size if passed in the +.Dv count +member. +It might be as large as +.Dv NTSYNC_MAX_WAIT_COUNT , +which is 64. +.Pp +The +.Dv alert +if non-zero specifies the event file descriptor, +signaling of which finishes the wait regardless the state of +other objects in the +.Dv objs +array. +.Pp +On non-error return from the wait requests, the +.Dv index +member contains the index of the signaled object that caused +the wait request to be satisfied. +If the object at the index is a semaphore, the +.Dv owner +member reports the owner of the signaled semaphore. +If the +.Dv alert +event was signaled to abort the wait, +.Dv index +is set to +.Dv count . +.Pp +The possible values for the +.Va flags +parameter are +.Bl -tag -width "NTSYNC_WAIT_REALTIME" +.It Dv NTSYNC_WAIT_REALTIME +The specified timeout is for +.Dv CLOCK_REALTIME +absolute value, otherwise it is for +.Dv CLOCK_MONOTONIC , +see +.Xr clock_gettime 2 . +.El +.Pp +The wait requests are: +.Bl -tag -width "NTSYNC_IOC_WAIT_ANY" +.It Dv NTSYNC_IOC_WAIT_ANY +Wait for any of the objects to become signaled. +.It Dv NTSYNC_IOC_WAIT_ALL +Wait for all of the objects to become signaled. +This means that the wait is satisfied only when all objects +can be consumed together, which is done atomically. +.Pp +No duplicate objects are allowed in the +.Dv objs +array. +The +.Dv alert +object is not allowed to be listed in the +.Dv objs +array. +.El +.Sh SEE ALSO +Refer to the file +.Pa Documentation/userspace-api/ntsync.rst +in the Linux kernel sources for the Linux API reference, +that was used for the implementation of the +.Fx +driver. +.Sh HISTORY +The +.Nm +driver and manual page first appeared in +.Fx 15.2 . +.Sh AUTHORS +.An -nosplit +The driver and the manual page were written by +.An Konstantin Belousov Aq Mt kib@FreeBSD.org . From nobody Sat Jun 27 01:11:39 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 4gnDyg26bgz6jH0X for ; Sat, 27 Jun 2026 01:11:39 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnDyg1Cnkz3DKx for ; Sat, 27 Jun 2026 01:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782522699; 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=mfIA0CO2l0Jgn/uzrTr9svnv6N+HbSHSEJY2z4hI+XU=; b=QI0efwC/D5Twr/m3QnWk0OeDKt5HF6cpOaFyDrwPoC0OH3nKNKOFb8qy9seTZMdblAADWf Yri/jfy1SNwEkzZRuCpHO+HF293F8qXa9Y+UI5oH0NkKssfzSkciwxq92PR/pYsQQKu8Bl ZoJKEChuYYL9+8T5P2F/E/j1NLC62E1g3QemA4B5+AF1F/SWi3b54pjaAksL4DuWbuRwY6 LTZrQdBIUUa1gQ444RpJACkr+hE2jh+KoTEAAggC86Ix3TEz5Slnm0KC/slCg9OJQVa7Rg uJ8gTR35J9DJZwg3RP+9drrqUIw+w5BCbnYK06n8iKIk1QxAndTg6Ji83Fl1vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782522699; a=rsa-sha256; cv=none; b=Y5556k4DCUWl+c9NQIKYJmgMrsD2jqgBcOtY1OwqJEkvLJ6BPo67EAliDdXO9Y9ecPaAuA KYjhqniXCqx2PPEu4wOOsHZP8DphER4smtXs6OPQJA5Ml4H2rdKgpmishalOLf8UvkaWIh LpmzPVq3a4Iz8LuFSrAnbX6aCEVdv5K+rhJLsyhnD/SU6FASKCTok8h7DteMx31TXR8ck4 MSBt0ZDgchfknf29/pUShxKWwbbqI0tIM4sJ2yJJPdq6/suuwoZrwUxhDLIQ12OusFmOkF p6auQLt2yIqoiuvfl4kWKRMKC0mfIIPp28i2TqKH7yTYeUSspS1xrD62PmiO1Q== 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=1782522699; 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=mfIA0CO2l0Jgn/uzrTr9svnv6N+HbSHSEJY2z4hI+XU=; b=pE59BTW7qfSCOlQIek5n7TvlMsFv33uifAZLqlTc6dg39suR155qWsweHbfUZiXkDlFFVo xpSxUOckp94jyZ8Rf1ctcTp1RcnpAKwoqYSh0/Xy9bzVgaX8ahfd3iGFrzFIrNkPtql4zE 05m8uYJNEUox9jH2rPWsTe+feuiJdiwbyEiQcGz+uySjpdD+D3Lk0okpvFdiUTvGgSkukt Le/5cmxI/ikvgqHvnIOqm/u1QSScFzOoQ3PW88yfUutFO8ovLRwtQsRI63fKKi7r2X2uCg 1JmOX0zVQqp/+5+8US7HF6dYQtJCmw/56cjT2RuQnQfVjNnHYFAo/WMz0BPWqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnDyg05mMz12PB for ; Sat, 27 Jun 2026 01:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18fcb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 01:11:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: e1f80e4902a4 - stable/15 - daemon(3): Note about environment after calling daemon() 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e1f80e4902a40cc13d4a6e3131bca1fc7c5809d6 Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 01:11:39 +0000 Message-Id: <6a3f234b.18fcb.204bd5af@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=e1f80e4902a40cc13d4a6e3131bca1fc7c5809d6 commit e1f80e4902a40cc13d4a6e3131bca1fc7c5809d6 Author: Aymeric Wibo AuthorDate: 2026-06-17 19:51:39 +0000 Commit: Aymeric Wibo CommitDate: 2026-06-27 01:09:38 +0000 daemon(3): Note about environment after calling daemon() While here, fix missing comma typo. Reviewed by: 0mp, ziaee Approved by: 0mp, ziaee MFC after: 3 days Obtained from: https://github.com/apple-oss-distributions/libc (partially) Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D57384 (cherry picked from commit bb14ba3777bb201abd6d4dfbf67d70b81f9c1e97) --- lib/libc/gen/daemon.3 | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3 index 4619ba3489aa..99a4f685bedb 100644 --- a/lib/libc/gen/daemon.3 +++ b/lib/libc/gen/daemon.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 27, 2023 +.Dd June 1, 2026 .Dt DAEMON 3 .Os .Sh NAME @@ -44,6 +44,13 @@ The .Fn daemon function is for programs wishing to detach themselves from the controlling terminal and run in the background as system daemons. +The +.Xr fork 2 +system call is used; see +.Sx CAVEATS +below about the environment after a +.Fn fork +.Pq without a corresponding call to one of the exec routines . .Pp If the argument .Fa nochdir @@ -89,7 +96,7 @@ and function may fail and set .Va errno for any of the errors specified for the library functions -.Xr fork 2 +.Xr fork 2 , .Xr open 2 , and .Xr setsid 2 . @@ -107,6 +114,21 @@ The function first appeared in .Fx 12.0 . .Sh CAVEATS +In multithreaded programs, the child process after +.Fn fork +inherits copies of all mutexes and other synchronization state, but only the +calling thread survives. +Any locks held by other threads at the time of the call will remain permanently +acquired in the child, causing deadlocks in any code that attempts to +acquire them. +Until one of the +.Xr exec 3 +functions is called, the child should restrict itself to async-signal safe +operations +.Po see +.Xr sigaction 2 +.Pc . +.Pp Unless the .Fa noclose argument is non-zero, From nobody Sat Jun 27 01:11:40 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 4gnDyj0qbMz6jH0b for ; Sat, 27 Jun 2026 01:11:41 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnDyh3HXLz3D5M for ; Sat, 27 Jun 2026 01:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782522700; 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=tPI5xyTKmoxHZ2FVzRlBz8CCVI+JKMlfHyipoJG7WsU=; b=HCEyCT3IxaLGd9Cguzka1XFG3FBe6l84u2ZcHmWQv4t36CMYhld0kV6uGB3MBsEcbIyfzF 3JaeoJeiK2IXSOwXmlGL09pY9ZX3k0HERqjPehW+K7084pAT8/w3/BJWjakF8nOfyXk9hI oBuoiklR2viijKJWoI9w79/4v5eQPtmtsuWE3BVxKgOs4duIV4OZLm+uEdsf0/NqZcZ7r6 ngiiPCP0nyZDj4b2PWmVg177RccXiY8vd8sgZPVAArWIFKhDqIlRskJAAk2VB7fATxY/ox VnOIAN4ION+C5PsbSa14RzW9ONTIG2q0w2/vjtgzdOIiMFLYiUw+lCgTCUCkcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782522700; a=rsa-sha256; cv=none; b=vVQhugoS5Ypz9dZNa/LRZ5GpkdxmKvN6e7oLPNa+JTXlTkdHYGjqKAQUFHe0DnWG4nEAxI a0Y36X95OYr/ggGM8n2XkC8fTLclpG93TE5FQ3dhf+4dm+3JBw1E7mye2qUtK961hgm89B 16xPU7qqIPJtDJzvIGxgvANhn3eeSCFr2mga/CSfkRcrrvOMTOXbmxJCw6r8BJ9319jGMK gSLA+siwDxinV/8iVucmTmpm3L5/ilrYgoi370w1kt51f57WMdzI/lQpVhtuDoz7sWgZF5 pdIxc9EoNMR/YYcwmUS7bPvCzAs2MQTQO4lPBT7ZC0iIsMm4ViFL33XRHEOzkg== 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=1782522700; 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=tPI5xyTKmoxHZ2FVzRlBz8CCVI+JKMlfHyipoJG7WsU=; b=e6lw/U+sF1Qs1Bp8tA7i0fSJXRDGdBRcaHgRcSlpHvdTCE5p7C6KIp9Xkx9WFnhFObtQAs A3iqA3n466dxvrdjkitXxLg7/B5NP3z+GF2O2VJqocsnzPs2FEB3mFD9oCItCSvr8bFcXu YzZlV4Rg0T3dvl6XO1nBP0rFRFD1RICdAXFEGIp1eiDwR/Cz6hLltc1cr4Qfi/Z/2RUb1p inuMuJrxVS+kl3OwG4Pi9917VHH8Z6DgoF1lpcHiEUeiW87Kitkcvs/a0befC0k/Exbejw n2/Yrtm8yPpue+9O8zEpLv8JlEdLpRsdvRqbvyaWUugsPpGNrsMazQNCwLFVJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnDyh0vDmz12Mx for ; Sat, 27 Jun 2026 01:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a4da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 01:11:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: 3d6a475afbf5 - stable/15 - ctermid(3): Fix return values section 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3d6a475afbf5c596c3494a5b40a4ba3545f955ff Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 01:11:40 +0000 Message-Id: <6a3f234c.1a4da.5add5584@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=3d6a475afbf5c596c3494a5b40a4ba3545f955ff commit 3d6a475afbf5c596c3494a5b40a4ba3545f955ff Author: Aymeric Wibo AuthorDate: 2026-06-19 14:21:12 +0000 Commit: Aymeric Wibo CommitDate: 2026-06-27 01:09:41 +0000 ctermid(3): Fix return values section ctermid() doesn't, and has never, set errno. While here, add ctermid_r to the name section and align the parameter name in the source file. Reviewed by: bnovkov Approved by: bnovkov MFC after: 3 days Obtained from: https://github.com/apple-oss-distributions/libc Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D57396 (cherry picked from commit dc24f31b67f5b0bac35cb93470f6f2d065d99f6f) --- lib/libc/gen/ctermid.3 | 25 +++++++++++++++---------- lib/libc/gen/ctermid.c | 14 +++++++------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3 index 2a53412f1b29..daf59f32c157 100644 --- a/lib/libc/gen/ctermid.3 +++ b/lib/libc/gen/ctermid.3 @@ -25,11 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 1, 2011 +.Dd June 2, 2026 .Dt CTERMID 3 .Os .Sh NAME -.Nm ctermid +.Nm ctermid , +.Nm ctermid_r .Nd generate terminal pathname .Sh LIBRARY .Lb libc @@ -78,14 +79,18 @@ If no suitable lookup of the controlling terminal name can be performed, this implementation returns .Ql /dev/tty . .Sh RETURN VALUES -Upon successful completion, a -.Pf non- Dv NULL -pointer is returned. -Otherwise, a -.Dv NULL -pointer is returned and the global variable -.Va errno -is set to indicate the error. +The +.Fn ctermid +function returns +.Fa buf +if it is +.Pf non- Dv NULL , +otherwise it returns the address of a static buffer. +The +.Fn ctermid_r +function always returns +.Fa buf , +even if it is the NULL pointer. .Sh ERRORS The current implementation detects no error conditions. .Sh SEE ALSO diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c index fb117b3c8ded..1ca2401f0c1d 100644 --- a/lib/libc/gen/ctermid.c +++ b/lib/libc/gen/ctermid.c @@ -39,32 +39,32 @@ #define LEN_PATH_DEV (sizeof(_PATH_DEV) - 1) char * -__ssp_real(ctermid)(char *s) +__ssp_real(ctermid)(char *buf) { static char def[sizeof(_PATH_DEV) + SPECNAMELEN]; struct stat sb; size_t dlen; int sverrno; - if (s == NULL) { - s = def; + if (buf == NULL) { + buf = def; dlen = sizeof(def) - LEN_PATH_DEV; } else dlen = L_ctermid - LEN_PATH_DEV; - strcpy(s, _PATH_TTY); + strcpy(buf, _PATH_TTY); /* Attempt to perform a lookup of the actual TTY pathname. */ sverrno = errno; if (stat(_PATH_TTY, &sb) == 0 && S_ISCHR(sb.st_mode)) - (void)sysctlbyname("kern.devname", s + LEN_PATH_DEV, + (void)sysctlbyname("kern.devname", buf + LEN_PATH_DEV, &dlen, &sb.st_rdev, sizeof(sb.st_rdev)); errno = sverrno; return (s); } char * -__ssp_real(ctermid_r)(char *s) +__ssp_real(ctermid_r)(char *buf) { - return (s != NULL ? ctermid(s) : NULL); + return (buf != NULL ? ctermid(buf) : NULL); } From nobody Sat Jun 27 01:11:41 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 4gnDyj5sBtz6jGrB for ; Sat, 27 Jun 2026 01:11:41 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnDyj2ZWZz3DdQ for ; Sat, 27 Jun 2026 01:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782522701; 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=Tp+cjy2dZe+B+EDGvNYiZGfXUP3qyN3CWfc9UkXbVIo=; b=wp8X6Scc3IAPAnQ6M6ANcJKE0B9mr1SWnWmiRL0/KHDqrLvBH2r3oMfOzYOEPkJMbJf9Mt D9/xILadfgWLik+gt0b9seuax4zRTAjYIVwyIRD7viJrEF6OsupJSZHb4DFiidDsPbRwpS 8hBpBfRkf0Eo54JBiP1nkruTS9Owk8A61GIUCI+4XwKfFy9Go0hpbBqP5U9nL2KFy+R5of 5XZ1V36vIuYTXeb01cth5qynINrhnt/pbJ0yxP0bb/33FWJdrl8vFoSap+R+mC/6LqHiK3 mdeuWHI47Ro5GAPCiHKlkWyLGptmXIwSc+KK9PkOO8hWXG80/pTpSdQnry2pdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782522701; a=rsa-sha256; cv=none; b=fTXLlzNj8qvrIQ6yZmclEvuGHER2bmUH6Z1PbgxCO90S+VliWbmxSqmyzsIMCawGyCBade xyiXww8zh+rTYkNnakNKkJRw+o3jByxY7HBdQ2/836WaKbBqC2AwPi6KNO4cDZet/A+q4z 0BgaBVE4bLZgcJf1v9qF26dyILLZa587TfbLByMuf9nvPNnQFoFxDAcghNFEat6fFELk6D fZgQo9F/TNEEUc5HVVZg67rckOUCf816iAp+Uw7lsMMJirVdYFAXV53DiBqzoZucl1RaX8 wDGa/MbEFsGNL8K3TwcEPeBLDbUiqAD8oM3L8Gn2sk730CUMktq8fsf7ZhxxXQ== 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=1782522701; 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=Tp+cjy2dZe+B+EDGvNYiZGfXUP3qyN3CWfc9UkXbVIo=; b=BAdwdw86XMgtGn6zxzS3XPJ+/q19mX0f7gQ/D8PJjwPBOk07Wq1FBYtKOfsqxLPZjYnj49 u80w4VTJTPPrt9deQKFquDH0lT/xo9f5LFgxNGSTWbBMqSPQ/6Y+UGd3o17xq9dIM455O/ MYpMEhBR0RWiKnMGC10C380nGQi03qsCMi/JA1g6BupCJ/RxzvHAJZSx3k8QlL7WYJ3vOX YvMRfuPpP4E2y7UpVlvgns3KwOV+70a2+Voaa9XZkp4AuZfvGyV0n/ZtZCkr382sULn8QT V2X2pbzy4ZO56ny7jKSqpFU/pwuW8EvRc/MivWArBVE7p/Ozztgp8vcHPR5cIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnDyj1dlLz12PC for ; Sat, 27 Jun 2026 01:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 193b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 01:11:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: 0d4b73a3ced9 - stable/15 - ctermid(3): Fix return 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0d4b73a3ced914db10f8f6a2d454a6a9f8fad4bb Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 01:11:41 +0000 Message-Id: <6a3f234d.193b6.778ef463@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=0d4b73a3ced914db10f8f6a2d454a6a9f8fad4bb commit 0d4b73a3ced914db10f8f6a2d454a6a9f8fad4bb Author: Aymeric Wibo AuthorDate: 2026-06-19 14:53:42 +0000 Commit: Aymeric Wibo CommitDate: 2026-06-27 01:09:41 +0000 ctermid(3): Fix return Reported by: bnovkov Fixes: dc24f31b67f5 ("ctermid(3): Fix return values section") Sponsored by: Klara, Inc. (cherry picked from commit d7c110658e0b11fbe7a1f5d9f2b340d1985b9742) --- lib/libc/gen/ctermid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c index 1ca2401f0c1d..add37be1aa1a 100644 --- a/lib/libc/gen/ctermid.c +++ b/lib/libc/gen/ctermid.c @@ -59,7 +59,7 @@ __ssp_real(ctermid)(char *buf) (void)sysctlbyname("kern.devname", buf + LEN_PATH_DEV, &dlen, &sb.st_rdev, sizeof(sb.st_rdev)); errno = sverrno; - return (s); + return (buf); } char * From nobody Sat Jun 27 01:11:42 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 4gnDyk5rpnz6jH0j for ; Sat, 27 Jun 2026 01:11:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnDyk3P16z3DPk for ; Sat, 27 Jun 2026 01:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782522702; 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=j6WCEXxBWysnXidn2cBn5s+og7a0HpQPXoOORdWGCuA=; b=Zcgca2jyHUhv9tCuPK76+wrFcRoSBugy7NsQhWZVX3lO68i2fkaP8qpVvAk26ns0pa/gk4 Xz/DmZiTP0cKyCmnoQGg7F2aY5uViRWcRq/h0iCP+lcjmkOT+obxGmrxMgfxBsqsVxi4Bp 8GNWg8+ybEkAuYV1371aOiECeTDkfr0E4L2oaNIN4lsrgJyc97VAoerhXgB4cs2kWxYXY0 VN25IHMMI9oEYftqTE1lgAgVZvpSAgdO7yW3QTua0if6nyYirjcPALKqQJI8uSbLhiM3AB h3Ls19yELMtQdLaTBeQnpiMUfCtU3yRxSQvOOrgA1OJyIuQcajRMDK93kXQX6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782522702; a=rsa-sha256; cv=none; b=edh1CPD/8uNpvbLXRVtpprezIesfRrWD1RknEWBVTph0kaIPrKe9qv7hGBjXteegRqo+1j rW9GpFq5zgEd3f+9CNYL1mu9dvWI4ljy5LycXTFAMIlC8r0W/8KPHBLXJE28B0ZrcGILSk NJUC7+1G+yLsJcOiUgLDwLYkUOwuCuIIfc8n8AoQTbkT1+3WcSRG208tfnKlw3Dl2ddSVW Fp3+HtMkbM7EuqR+bIFZv+axeR2QVpjKrAmyV1wIiIgnHk0/rf+pBJHu5Md4cR+CioM6N8 W75/V/9fir7qmBmgURxENs/g5jD/6rgZQCsOw6z1drzaMhpKLeAhbw6d7vYBEg== 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=1782522702; 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=j6WCEXxBWysnXidn2cBn5s+og7a0HpQPXoOORdWGCuA=; b=raAuNC+NcP38Vzuf0SNiNyQpyW0v/hKkTCiq1v6EOmACIXXd9NtLAQw/3BPAzf33BErJKz 19gq4WwS/FfowbttC9xRhvkn+u4qePHUPmxH6g3tgUfupp8Qk+LXl0qrab+L5PdzBGYXLy /7La3X7XQdQAj0JeJEfRF2I6M2efIGlK8vRoZJqiKfpuO9Y3VWph5khSODmz5TxNRNsjd8 TgFtRgxmxyNF111NeJuWxIlnW53BpGD12ftcra98Chpc3yjCCR71h8oSSbgSUQjJ6uhumH GqFXXXvc1VZ1ckklq3JRzoLYcwxifNbBhHaYXRRhMROKitEkEjD14Gg6GX2sPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnDyk2Scgz12rM for ; Sat, 27 Jun 2026 01:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 190b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 01:11:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: a6d7347f3042 - stable/15 - virtual_oss.8: Use `.Pa` macro to refer to devices 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a6d7347f3042d72deb6a6a822101e7be36ccf07d Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 01:11:42 +0000 Message-Id: <6a3f234e.190b1.f8e992b@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=a6d7347f3042d72deb6a6a822101e7be36ccf07d commit a6d7347f3042d72deb6a6a822101e7be36ccf07d Author: Aymeric Wibo AuthorDate: 2026-06-24 14:33:41 +0000 Commit: Aymeric Wibo CommitDate: 2026-06-27 01:11:05 +0000 virtual_oss.8: Use `.Pa` macro to refer to devices Suggested by: christos Sponsored by: The FreeBSD Foundation MFC after: 3 days (cherry picked from commit 31461c8bc9c16004feae9cc17b89fd5213a09ae0) --- usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 index b9dc8fd86a3c..14a531c708b4 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd May 7, 2026 +.Dd June 24, 2026 .Dt VIRTUAL_OSS 8 .Os .Sh NAME @@ -142,17 +142,24 @@ The sixth argument gives the amplitude, default is zero or no gain. Set control device name. .It Fl P Ar devname Set playback DSP device only. -Specifying /dev/null is magic and means no playback device. +Specifying +.Pa /dev/null +is magic and means no playback device. Specifying a .Xr sndio 7 -device descriptor prefixed by "/dev/sndio/" is also magic, and will use a sndio -backend rather than an OSS device. +device descriptor prefixed by +.Pa /dev/sndio/ +is also magic, and will use a sndio backend rather than an OSS device. .It Fl O Ar devname Set playback DSP device only which acts as a master device. -This option is used in conjunction with -R /dev/null . +This option is used in conjunction with +.Fl R +.Pa /dev/null . .It Fl R Ar devname Set recording DSP device only. -Specifying /dev/null is magic and means no recording device. +Specifying +.Pa /dev/null +is magic and means no recording device. .It Fl f Ar devname Set both playback and recording DSP device .It Fl w Ar name @@ -166,7 +173,9 @@ Users have to be part of the audio group to access this device. This is a security measure to avoid unintended snooping by unprivileged users. .It Fl L Ar name Create a loopback OSS device which acts as a master device. -This option is used in conjunction with -f /dev/null . +This option is used in conjunction with +.Fl f +.Pa /dev/null . .It Fl F Ar size Set receive filter size in number of samples or ms for the next device to be created. From nobody Sat Jun 27 01:11:43 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 4gnDym0Lfkz6jGxk for ; Sat, 27 Jun 2026 01:11:44 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnDyl4vRXz3Df3 for ; Sat, 27 Jun 2026 01:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782522703; 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=lvfrISEaPFwkeDRi4fxiBlr2pvTIja2p+lyCJJ3MjG0=; b=CQIR7DNfXxItwuZQsAzkXHCCDBqE0VN71EvB9K4bXasNSgL7BnmPzPrfTxT5esRmbWlvBX EDYrmEBEZ0UgDE/yWIGzl8meNeEZ9O7pD9Co+xlQ+yMjvM4kk4opAlMk6MucR19IDU3l73 s4qiE6kj6zz0qkm9vOmVoyrwCIjAXtMUaA7nxhQBz77MXHp+Q2kGAfPnrW9aXNJZX7NcLL 4iZEai6lMgCO6K9+e1+TfD+FI4pA/d0Sz6lfq1nFYLKkDWJwkvxvx/jTAu143zzYVycztd +qW8OLbAeWKNKsascm22R5wZ2RnaP5nsf6U6mW+7seF/mMX2uLpssqPkWbNVtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782522703; a=rsa-sha256; cv=none; b=k2wJfKN4ujZKpfZ/jCopWg3jsB1cGbpl19tpMWQTIX3v0fKXOTYqBixOFapOwtY+B2U/9/ Q2wtHxkHHRKFIIVkV+kmJX8h2JKWEcknqCfj5CfHnKTLxti0nRGAgEpP0ttHHtFNV+FduB 0LZ7urq2znupaZO/aKNgysZB6U8Z+Xv9RAD/9m0dtvckek1NJMMVCPQgvVNdMNGzvLfXbm Ecp01pDEPlKD0biAwmmCqzMecEEGMdoRBi9xKBo7HADL3k0i3K5p54aIzt4BNbF1cguLYv YKE45ywzXEoiJXajP8QRr6GUK/QNxRaXgY6UVNh/kw4ClGLysLfu9eUuNbFHBg== 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=1782522703; 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=lvfrISEaPFwkeDRi4fxiBlr2pvTIja2p+lyCJJ3MjG0=; b=VmaJo51Q99HvCRgZwED2yXlOdwxCk/eVkgQPwrNBH1YSVkCg2PLN1zotcKqp1cYaiRKYVY 3qZ/h333pXkqjm9e/EkTs3J/EGFm9DpNqXzGDqJjV7Hmb2HiS0ODAD1QID6liY2UjtKIfW BYPSaMO855pGVF/2y3DkTZRxQVtqagBzCAdMuBtNbpjyAlVRTQhTjVQQE1eEri7Rel29dt cAH3Z7H/xw1tLvMNm6qxgtBIH3fOiTqVpR6g679ZJBZRok5SWZ/baK4xrrvQ9FUIKHsFjy ShrMCRT0WzIi6y4jirtz7UIv04M+UJw0U+IKE/RT5VUGgqL2EqVnX43YUj43Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnDyl3HzBz12My for ; Sat, 27 Jun 2026 01:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18fcf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 01:11:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: a380d07f4739 - stable/15 - virtual_oss.8: Document `/dev/bluetooth/` prefix magic 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a380d07f4739168a6eae4383ca23c2ed9890d0fe Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 01:11:43 +0000 Message-Id: <6a3f234f.18fcf.7dc0a6bf@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=a380d07f4739168a6eae4383ca23c2ed9890d0fe commit a380d07f4739168a6eae4383ca23c2ed9890d0fe Author: Aymeric Wibo AuthorDate: 2026-06-24 13:54:02 +0000 Commit: Aymeric Wibo CommitDate: 2026-06-27 01:11:23 +0000 virtual_oss.8: Document `/dev/bluetooth/` prefix magic Without this one could be led to believe they should have an actual `/dev/bluetooth/xxx` device in devfs from just reading the examples. Event: Halifax Hackathon 202606 Reviewed by: christos Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57818 (cherry picked from commit 7ecd9afd3b28b9e1a112b5925a8f5902e121b128) --- usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 index 14a531c708b4..3cb407e6c67b 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.8 @@ -150,6 +150,13 @@ Specifying a device descriptor prefixed by .Pa /dev/sndio/ is also magic, and will use a sndio backend rather than an OSS device. +Specifying path prefixed by +.Pa /dev/bluetooth/ +is also magic, and will use Bluetooth audio backend rather than an OSS device. +Suffix after +.Pa /dev/bluetooth/ +is Bluetooth device address or alias as configured in +.Xr bluetooth.hosts 5 . .It Fl O Ar devname Set playback DSP device only which acts as a master device. This option is used in conjunction with @@ -160,8 +167,22 @@ Set recording DSP device only. Specifying .Pa /dev/null is magic and means no recording device. +Specifying path prefixed by +.Pa /dev/bluetooth/ +is also magic, and will use Bluetooth audio backend rather than an OSS device. +Suffix after +.Pa /dev/bluetooth/ +is Bluetooth device address or alias as configured in +.Xr bluetooth.hosts 5 . .It Fl f Ar devname -Set both playback and recording DSP device +Set both playback and recording DSP device. +Specifying path prefixed by +.Pa /dev/bluetooth/ +is magic, and will use Bluetooth audio backend rather than an OSS device. +Suffix after +.Pa /dev/bluetooth/ +is Bluetooth device address or alias as configured in +.Xr bluetooth.hosts 5 . .It Fl w Ar name Create a WAV file format compatible companion device by given name. This option should be specified before the -d and -l options. From nobody Sat Jun 27 09:55:56 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 4gnSbd1G3Wz6jGss for ; Sat, 27 Jun 2026 09:55:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnSbd0fd5z46bc for ; Sat, 27 Jun 2026 09:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782554157; 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=BnaYdpUdtnroxqmnryRl/hpzcVkmbdp28IO8ed6JyK8=; b=AMWvacHPEJJ+7WgNEWOZsUe+VPdQTWvMwJ+1Uduh9eHgReCRD6Y5zzS8Vz2DtzlsDY2sB0 oNvO6QhE5r1PL8U6HBHCXy3XpHpiSmqm9WR8L2jb0zRkefK3Wl95aruh+PyA66NGU8YRkb d9A7++YUrvs/2TEQgjHqy52AeYY8JDp/0E8fK8qjqmg49rUeRt5o+RjqhVBTps82idV7ZT GdUHeHw4cGHQ04yZf73qaa5sWnvzNJ1GLAK3gWeKgPUb34YIzCevQR5CczXGk+pJ5OoTeQ Se9MjSTd+ekivwXMIxu67sBVNwGT/wYlXTyhOf2Z8+qjj+ntBMJujPWQXbaZlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782554157; a=rsa-sha256; cv=none; b=rHWYJXt8xGRXMmvglJ16AmpSRC91uTERKL39vASSFOKZJt9oqT4exg7JP5dJEPS1TynL3B KgjWBZavq6Ia9lirGU8z0+tfDDH+zXW+MukmA2OHky07WoBsmPwYWjkzrcF47LK1lSFRI4 ZvOOGuOtcqHW/TeAR3d+3IAojVxlERQNbcsEv6FQA5MX0OhoGOweln++HZtJ3dlNecSgFI F9uq5oGQbFf2EUiMAmFybX8ysW5f5KfSZL9vjXRJ6WufsMrRDsoetOjG5danPu8feefOtC cKdN0Hs+p4iBULDFLQW3v7DNd912yvA/EtTdgh1aVnIMggvFFDStvSoKxODWEw== 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=1782554157; 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=BnaYdpUdtnroxqmnryRl/hpzcVkmbdp28IO8ed6JyK8=; b=imFzYH0MMDiRg52JJfVWIHXcaYiqBQ8ReRYotiQJwSXC+AdWa4WtC9cU1UtqvzdnRNoSUg myPafe5BjuRPSZ6u92JvdIpzphTMKdOCr34cuETvEqgDIHjXHntfUyqNsf+4gJg+HIpK8G cUmhvnqs4RMGMcuqwRE5DfUYsg3NIHvv8GblqIbC3yrdI7so+2OLecY3kyXIo9dPic/hN3 WyToRwYzdodtNRkPyPl3u0P4RoNym5b1tMxfcRp1QfjS3rWXziinvgiPRXwBuUfaDvG6+u eg8Sj31KtPb2JuXfXhmQa5/I/ws6o/aF/BtbcfEOyu/Ijtew1p9Nk4AHZlsoTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnSbc6LRtz49q for ; Sat, 27 Jun 2026 09:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30eb1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 09:55:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e9df33a044ec - stable/15 - sound: Retire SD_F_VPC and related settings 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e9df33a044ecd34f4b007f70a1416b0d0544321e Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 09:55:56 +0000 Message-Id: <6a3f9e2c.30eb1.59fe67ac@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e9df33a044ecd34f4b007f70a1416b0d0544321e commit e9df33a044ecd34f4b007f70a1416b0d0544321e Author: Christos Margiolis AuthorDate: 2026-06-20 17:32:21 +0000 Commit: Christos Margiolis CommitDate: 2026-06-27 09:55:19 +0000 sound: Retire SD_F_VPC and related settings VPC is enabled by default, and the only way to turn it off is through a loader hint. That being said, there is no benefit to turning it off in the first place, because VPC provides more fine-grained volume control, as well as access to the SNDCTL_DSP_[SET|GET][REC|PLAY]VOL ioctls and dsp_ioctl_channel(). Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit f70a687bb071cdee60dc7420d75fa1dd122af51a) --- share/man/man4/pcm.4 | 22 +--------------------- sys/dev/sound/pcm/dsp.c | 2 +- sys/dev/sound/pcm/feeder_chain.c | 4 ++-- sys/dev/sound/pcm/sound.c | 4 ---- sys/dev/sound/pcm/sound.h | 4 ++-- 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 14d7e52eed5d..7a0059f43f73 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 15, 2026 +.Dd June 20, 2026 .Dt SOUND 4 .Os .Sh NAME @@ -212,26 +212,6 @@ application, without touching the master .Nm volume. This is sometimes referred to as Volume Per Channel (VPC). -The VPC feature is enabled by default. -.Ss Loader Tunables -The following loader tunables are used to set driver configuration at the -.Xr loader 8 -prompt before booting the kernel, or they can be stored in -.Pa /boot/loader.conf -in order to automatically set them before booting the kernel. -It is also possible to use -.Xr kenv 1 -to change these tunables before loading the -.Nm -driver. -The following tunables can not be changed during runtime using -.Xr sysctl 8 . -.Bl -tag -width indent -.It Va hint.pcm.%d.vpc -Set to 1 or 0 to explicitly enable (1) or disable (0) the VPC feature. -This tunable is undefined by default. -VPC is however enabled by default. -.El .Ss Runtime Configuration There are a number of .Xr sysctl 8 diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 7e4b4ae2df24..0557b03484dc 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -542,7 +542,7 @@ dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *ch, int j, left, right, center, mute; d = priv->sc; - if (!PCM_REGISTERED(d) || !(pcm_getflags(d->dev) & SD_F_VPC)) + if (!PCM_REGISTERED(d)) return (-1); PCM_UNLOCKASSERT(d); diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 35bb12a062ec..1dbdf2fcc0e4 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -714,8 +714,8 @@ feeder_chain(struct pcm_channel *c) cdesc.dummy = 1; if ((softfmt & AFMT_CONVERTIBLE) && - (((d->flags & SD_F_VPC) && !(c->flags & CHN_F_HAS_VCHAN)) || - (!(d->flags & SD_F_VPC) && (d->flags & SD_F_SOFTPCMVOL) && + (!(c->flags & CHN_F_HAS_VCHAN) || + ((d->flags & SD_F_SOFTPCMVOL) && !(c->flags & CHN_F_VIRTUAL)))) cdesc.use_volume = 1; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 235142eb5209..101b38367873 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -355,10 +355,6 @@ pcm_init(device_t dev, void *devinfo) cv_init(&d->cv, device_get_nameunit(dev)); i = 0; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "vpc", &i) != 0 || i != 0) - d->flags |= SD_F_VPC; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), "bitperfect", &i) == 0 && i != 0) d->flags |= SD_F_BITPERFECT; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 06de95e461ec..becd787a456a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -101,7 +101,7 @@ struct snd_mixer; #define SD_F_MPSAFE 0x00000010 #define SD_F_REGISTERED 0x00000020 #define SD_F_BITPERFECT 0x00000040 -#define SD_F_VPC 0x00000080 /* volume-per-channel */ +/* unused 0x00000080 */ /* unused 0x00000100 */ #define SD_F_EQ_ENABLED 0x00000200 /* EQ enabled */ /* unused 0x00000400 */ @@ -117,7 +117,7 @@ struct snd_mixer; "\005MPSAFE" \ "\006REGISTERED" \ "\007BITPERFECT" \ - "\010VPC" \ + /* "\010 */ \ /* "\011 */ \ "\012EQ_ENABLED" \ /* "\013 */ \ From nobody Sat Jun 27 09:55:58 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 4gnSbf3VVFz6jGdJ for ; Sat, 27 Jun 2026 09:55:58 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnSbf16nTz46dn for ; Sat, 27 Jun 2026 09:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782554158; 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=ll745av/c8BXtFJ9fn8wDERq6CuQanNc8X5kYEOFGRs=; b=x9b2/eY/yI5qeoliLBMOf4DeEmaQmyie6l0xrYD31HLyQG8z9TVSJhiauXlJJNmFnZq+Hg e/N++TVVh3oLtTb2RFpowJhaGYt06LT+d7ji9inmBkSvZTY7kJmqIoc8guWZIJW6JmW5Th jWZz7inbnTomzTUZ8o/L4xU01VZyf1O6190GYpOJtIPOMImEtNphjjkBbOYWkRhnBhoaTX 6+vWYAtRbKv7fiZrwVj+ITHfkNJqe83+4xKq0Y9Td0IHKTWnhkdXdfSX1fc6oPJXplwqq3 H3QwskYtXDekBAXUfXZFrPDNIZRaZcv+af3EW7Jcp5bB29p26hkN8Wvi7iK7Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782554158; a=rsa-sha256; cv=none; b=qMr1nk9hOtRV3IGHwD+QJrwQJQhAEdf0bJhj2nIjZGlIlSwMLENx7RjY7/1oWuUMSv9lXb 0qz/4Vle8vDvUSrG4cJAaXOpx2YjSUPhqcHmEFErqoinZOjM+1E/pMu6Tx6XnPaZxmOlEa 3f5Oecqn6pWp0x8DNTeI4V0fbw0kfj1qPrd196xprQ5wotY9zIajspsgJ/JwtJ/1Qmq6rW K8EgE+5wK/9bWK2Yy4v8kQlHrnSkOh+9toxvSOCO/Xbtj8wf5Fr/Y2ph58oU+F9Y/uPz8g Wd9iK9fyX4kOqhZltyRWz4ZjEMPenOzupCnpHAzGm4xUx5MZ9pj4YD5UJfgVLg== 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=1782554158; 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=ll745av/c8BXtFJ9fn8wDERq6CuQanNc8X5kYEOFGRs=; b=Tz6LRa+Cxd5876E8FlSlp0gSPPOM0KwbGravDUPW/k7uPiX6xxsWElyrTnmQZHMR1oy3/h SamWpTXpcZv++XVANM+kK6VVBYYvaq5fQ4B8b7PfryaOzbW5dJbryNwevGtoZonlQBrzgW oSdoFHFkG3DEvVc32vjVdk/FUp8725J4ay5vhlobzvYibNwzqxVWdBWPMr5yunxgHGJHJd WhNbDMkCniRVc47Kcz9KcBDUw1YXWzRDURfhiBWFcdDSO3K0g+dHN/X22wyBVN/CtUiqIH Q+tl8+M0tNrDtcA5VNf1mSmdovz8m0DOBFoKYt45TlPZ6K8pMrwI8cIl/c/Kwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnSbf06P8z3Wg for ; Sat, 27 Jun 2026 09:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31e8d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 09:55:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2c21445c6cbb - stable/15 - sound: Use and lock only the appropriate channel in dsp_mmap_single() 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2c21445c6cbbfcd9652d2db282ee6773cd4e0721 Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 09:55:58 +0000 Message-Id: <6a3f9e2e.31e8d.60520ba6@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2c21445c6cbbfcd9652d2db282ee6773cd4e0721 commit 2c21445c6cbbfcd9652d2db282ee6773cd4e0721 Author: Christos Margiolis AuthorDate: 2026-06-12 06:14:05 +0000 Commit: Christos Margiolis CommitDate: 2026-06-27 09:55:21 +0000 sound: Use and lock only the appropriate channel in dsp_mmap_single() dsp_mmap_single() mmaps one of the channels associated with a dsp_cdevpriv, based on the nprot argument. PROT_WRITE and PROT_READ|PROT_WRITE select the output channel for mmaping, and PROT_READ the input one. Instead of locking and modifying the flags of all dsp_cdevpriv channels, do it only for the one we actually use. While here, retire the now unused dsp_lock_chans() and dsp_unlock_chans(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, kib Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/30 (cherry picked from commit bbb37ddf3669f77d78446b9f1e37f58c63dc0a1c) --- sys/dev/sound/pcm/dsp.c | 57 +++++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 40 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 0557b03484dc..31d28245d7a8 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -144,24 +144,6 @@ dsp_destroy_dev(device_t dev) destroy_dev(d->dsp_dev); } -static void -dsp_lock_chans(struct dsp_cdevpriv *priv, uint32_t prio) -{ - if (priv->rdch != NULL && DSP_F_READ(prio)) - CHN_LOCK(priv->rdch); - if (priv->wrch != NULL && DSP_F_WRITE(prio)) - CHN_LOCK(priv->wrch); -} - -static void -dsp_unlock_chans(struct dsp_cdevpriv *priv, uint32_t prio) -{ - if (priv->rdch != NULL && DSP_F_READ(prio)) - CHN_UNLOCK(priv->rdch); - if (priv->wrch != NULL && DSP_F_WRITE(prio)) - CHN_UNLOCK(priv->wrch); -} - static int dsp_chn_alloc(struct snddev_info *d, struct pcm_channel **ch, int direction, int flags, struct thread *td) @@ -1973,7 +1955,7 @@ dsp_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, struct dsp_mmap_handle *handle; struct dsp_cdevpriv *priv; struct snddev_info *d; - struct pcm_channel *wrch, *rdch, *c; + struct pcm_channel *c; int err; if (*offset >= *offset + size) @@ -1987,11 +1969,6 @@ dsp_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, SV_CURPROC_ABI() != SV_ABI_LINUX))) return (EINVAL); - /* - * PROT_READ (alone) selects the input buffer. - * PROT_WRITE (alone) selects the output buffer. - * PROT_WRITE|PROT_READ together select the output buffer. - */ if ((nprot & (PROT_READ | PROT_WRITE)) == 0) return (EINVAL); @@ -2003,27 +1980,27 @@ dsp_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, PCM_GIANT_ENTER(d); - dsp_lock_chans(priv, FREAD | FWRITE); - wrch = priv->wrch; - rdch = priv->rdch; - - c = ((nprot & PROT_WRITE) != 0) ? wrch : rdch; - if (c == NULL || (c->flags & CHN_F_MMAP_INVALID) || - (*offset + size) > c->bufsoft->allocsize || - (wrch != NULL && (wrch->flags & CHN_F_MMAP_INVALID)) || - (rdch != NULL && (rdch->flags & CHN_F_MMAP_INVALID))) { - dsp_unlock_chans(priv, FREAD | FWRITE); + /* + * PROT_READ (alone) selects the input buffer. + * PROT_WRITE (alone) selects the output buffer. + * PROT_WRITE|PROT_READ together select the output buffer. + */ + c = ((nprot & PROT_WRITE) != 0) ? priv->wrch : priv->rdch; + if (c == NULL) { PCM_GIANT_EXIT(d); return (EINVAL); } - if (wrch != NULL) - wrch->flags |= CHN_F_MMAP; - if (rdch != NULL) - rdch->flags |= CHN_F_MMAP; - + CHN_LOCK(c); + if ((c->flags & CHN_F_MMAP_INVALID) || + *offset + size > c->bufsoft->allocsize) { + CHN_UNLOCK(c); + PCM_GIANT_EXIT(d); + return (EINVAL); + } + c->flags |= CHN_F_MMAP; *offset = (uintptr_t)sndbuf_getbufofs(c->bufsoft, *offset); - dsp_unlock_chans(priv, FREAD | FWRITE); + CHN_UNLOCK(c); handle = malloc(sizeof(*handle), M_DEVBUF, M_WAITOK); handle->cdev = cdev; From nobody Sat Jun 27 09:55:59 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 4gnSbg4j3Nz6jH25 for ; Sat, 27 Jun 2026 09:55:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnSbg1h6Tz46rw for ; Sat, 27 Jun 2026 09:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782554159; 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=6+XYEEHe5860hQ5f2v1ZdiiOFiFRcDnvJSQBJ9P0Fek=; b=oTGwhzmY4rpW4PizmrM0c3+NH4sRB2/JsZVwYKZEuKACeq28sUdTkvDm4CZQENgw01qOL0 8ECpKLd+DYpVyZER6LvuthumGWZIbWsq6eHAbMxkgjfe6s/WcdVSVfxJmrBYWZMX1jl4sv l8fij0FH1qf9p9IlP5+i+OF90N2M+DgshH+AozrEkVqgNPpbnnLPGfnLjaZsoHnNDFSCCV e1+9f0kdapGbENc7Br9XES1jxklaUTpfb/KV9k4cksKZ4F3qRO2WxpVC0y7r3DqKMRU8zH LsmUaOFNi3A8G6OGF7DvKhHvddeKyZ2oMzfNplM516X1xx7uPm+XNbAGYaPXMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782554159; a=rsa-sha256; cv=none; b=GGem5y3kHRJAmkXbptZRrhHKor1EOap0vxN2WQHPL9ZMCSMogwU4nG2pFKWm64FTn0xchM ZM3pWtGga3y+qg6bcinTQxR+yOnGoXOimv0hXTzUyCNACxObBKlKQkmzmrEi3JViaCcITO XIncXF/EK8ioUG4gGc5Sf9wembxaz/qpmgiQGa3GxP8laUI9tR//WA2ttGXmM1f+7s6PDw xd8rKB74Gtw5zw+bBOpz2CBshxGyOU/spbcgq8S6DgEfGOKEyjneYMFuC3yX/Lhyzi9MsN hm+Mmktv/EyqWOmqs2YAjJr4tGjxKRqmLCiXtlZ9uBrCHTfRtZJZeaHDtt/NEw== 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=1782554159; 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=6+XYEEHe5860hQ5f2v1ZdiiOFiFRcDnvJSQBJ9P0Fek=; b=K0cGK9E1l7v/62DyKCVqgd3BPQeRrN5NPF2t6OptRAvSMBBuqqTy90rBm4nTlhV/aUXXz3 CcSRHYXzNBhPMP7qqlQwnKSK18ZjL5B/ouo2gZ5z+9vxDmedSuVLa2q4SPbhZL8aRS9aNE EfBGgBYlQ2NDlnm77e/k9h/bIySJs7mz7djBcDwFUnnq5dkIxK/d2k2Lpx3wi9D3vbmGfQ dIAOIfeDCvtgGNSwW0eVUR+DxXF3R/XWFIlZE7BZOwbcL5DjEIVvbhdq/q547rLGs57MgT HwYgAXtNc/cCECJFwtWV2Aws33VBFPNx8wyExA7a5SIp8Ggavg89Bv0u2EOwjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnSbg0Ws8z3wr for ; Sat, 27 Jun 2026 09:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31e91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 09:55:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f3d461cf3220 - stable/15 - sound: Re-arrange a calculation in dsp_mmap_single() 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f3d461cf322000f7784eb42be92282a14d148cfa Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 09:55:59 +0000 Message-Id: <6a3f9e2f.31e91.5fb523ff@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f3d461cf322000f7784eb42be92282a14d148cfa commit f3d461cf322000f7784eb42be92282a14d148cfa Author: Christos Margiolis AuthorDate: 2026-06-12 06:14:57 +0000 Commit: Christos Margiolis CommitDate: 2026-06-27 09:55:21 +0000 sound: Re-arrange a calculation in dsp_mmap_single() This makes it easier to read. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, kib Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/30 (cherry picked from commit 0c8147ae3bc1c7db95098fcc92fc2e86111f59d3) --- sys/dev/sound/pcm/dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 31d28245d7a8..3f0c5d622f99 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1993,7 +1993,7 @@ dsp_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, CHN_LOCK(c); if ((c->flags & CHN_F_MMAP_INVALID) || - *offset + size > c->bufsoft->allocsize) { + c->bufsoft->allocsize < *offset + size) { CHN_UNLOCK(c); PCM_GIANT_EXIT(d); return (EINVAL); From nobody Sat Jun 27 09:56:00 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 4gnSbh4jk6z6jH3F for ; Sat, 27 Jun 2026 09:56: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnSbh2lsvz46dp for ; Sat, 27 Jun 2026 09:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782554160; 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=I3f+RHguTWydA2Hrem3pPYFG7EeXwr0SNkYLjboleR4=; b=WHZV2j04/L7aLKgiQxpqje6vKGSvMzD+wXZUKTrbG9WLtmFpoaRoxwNxQrlDK9SenhLdxX 9RuvW9H8qRETcWPiJS2IS0HvMSc9Siz3GhI0xsdk5cRWjeGjt21Ih3N8KVFKHKBx5QP5ae 4Z1jGThg9JBnTD1mH2rLR66IO8zvzCBP+pFcAqJIPfgfyF/vEf2PnYUPLA1pfXtAa8UDjF YmRIMbn1j+VHvZWnJ1EylWVFhsH2jOG3fqDZGpb9cMSTlY+dGVHKjsC8zHASS3sP9Vti7E Lr1N/3gllY4MKlk4H4K3mp/Ydkgl7MPmoHuK/AtB6HEvDos/ir83VvlCPZ+wEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782554160; a=rsa-sha256; cv=none; b=EyDv7azNPz3uYVED+Suhs6bOjFV/SNV+LKeshOBwazE4+zKtFwvFnoy8zJ/oZmlGt+lvbg Ik6z02c1oox+5jrMpbymOad248F3bvqJmLmdxrbZW4eEMZvjLWUFJbX1Eiclv2hQLh16uY CvepHx9BPb8v+PCXs2RGRPAWppV05498hlSwhMkayM1hu1DYbC502O2YgjzJDXffyy+Nva NXTiQ/u1/rB8CbS7Bqp4QTNK3rJqbcs8CFEap3dq8EWuHzYnKYlQ0K0cMXgnYB6G7xefc9 H8hiwBV2uiSBVI6QJn9nba512fyKoxvZgb/dz3fjrhZlbNRNoqn8PJpFK1/IAw== 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=1782554160; 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=I3f+RHguTWydA2Hrem3pPYFG7EeXwr0SNkYLjboleR4=; b=G2SwpbcmoGUkuyvTj3yQSVmHihP1V1v5XgZ/IzN/3yneEamrgxpuGTxwHe6mk0cu+m6eP7 84573zJuPCoPazeDUQYfGTcxO3fNQJM+/1OaO2IRbVVWndg2cXiPccbZY2aqsl0Q2NGmWn VgKbG38m0IK7MtSXpZWO5LuFqmRZSBWoF/cT+IBJ2O+fw3k4QqDhpzgCuOhjCWHp6PGUiA enPQCOE8l4wSMiYpM26C2sWqJg0dJv3GnGCSKav26AMeSUvQWLHGe4vcKiUPaSQIeHK3vO vgNyHj4cNsCs2DglJJpeem+tzl6tkgDUekNUUr2+t0qKygt2uPuHnJDAt1SRbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnSbh1LXpz3kk for ; Sat, 27 Jun 2026 09:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 09:56:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0f4aac7ed5ae - stable/15 - sound: Handle CHN_F_MMAP_INVALID after cdev_pager_allocate() 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0f4aac7ed5ae5b5cc8bd45597a91b7011067a6ef Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 09:56:00 +0000 Message-Id: <6a3f9e30.31f8b.1bca4ad6@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0f4aac7ed5ae5b5cc8bd45597a91b7011067a6ef commit 0f4aac7ed5ae5b5cc8bd45597a91b7011067a6ef Author: Christos Margiolis AuthorDate: 2026-06-12 06:19:07 +0000 Commit: Christos Margiolis CommitDate: 2026-06-27 09:55:21 +0000 sound: Handle CHN_F_MMAP_INVALID after cdev_pager_allocate() We drop the channel lock to execute cdev_pager_allocate(). By the time we pick up the lock again, CHN_F_MMAP_INVALID might be set, so make sure we fail and free the vm handle. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, kib Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/30 (cherry picked from commit 47efa8128268c35ac8f0a552d7a7ce43cd1c5925) --- sys/dev/sound/pcm/dsp.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 3f0c5d622f99..471db6524aa2 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1957,6 +1957,7 @@ dsp_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, struct snddev_info *d; struct pcm_channel *c; int err; + bool dealloc; if (*offset >= *offset + size) return (EINVAL); @@ -2008,12 +2009,25 @@ dsp_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, *object = cdev_pager_allocate(handle, OBJT_DEVICE, &dsp_dev_pager_ops, size, nprot, *offset, curthread->td_ucred); PCM_GIANT_LEAVE(d); - if (*object == NULL) { + if (*object != NULL) { + err = 0; + dealloc = false; + CHN_LOCK(c); + if (c->flags & CHN_F_MMAP_INVALID) { + c->flags &= ~CHN_F_MMAP; + err = EINVAL; + dealloc = true; + } + CHN_UNLOCK(c); + /* We use a helper bool to keep the channel locking simpler. */ + if (dealloc) + vm_object_deallocate(*object); + } else { free(handle, M_DEVBUF); - return (EINVAL); + err = ENOMEM; } - return (0); + return (err); } static const char *dsp_aliases[] = { From nobody Sat Jun 27 09:56:01 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 4gnSbj75GQz6jHB2 for ; Sat, 27 Jun 2026 09:56:01 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnSbj3B2Nz46bl for ; Sat, 27 Jun 2026 09:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782554161; 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=YLnbRaaCbx1ODmakPT+9W5F+Z687PkWoE6IB58CwgVY=; b=JKmF9ijNeOmDeaHt8NiFbogTEcq6/xp/k4/c1hk4M5sciD1C7vOml88fmgkDZ95E8gR6ux k37Ql7gd2Vho6gNIGYeegwdd7h68nyWpzOE/zLzZ2ayTNhU2Dvgnbf46YAiugJ5NiSLq/p WmOy9/jIonAKeg1U4hcEnfBqajgz9DPXlIIX5rMdV3v+85ut9ks8BElhSGjr+KTWq0UEuu 78ACCxs44EkuvJYu+D6IbpqvdxZSYKG4C0kep415gniObEqVFINxThnlZy866YMaF+fDG+ bIdyVaEron8kwYyQ7DMfKq1RN+ibwGB9STO/rwr7EIlz2N2GytDJTGDBGA3psg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782554161; a=rsa-sha256; cv=none; b=s5vR4fG8yNCTI8f7wEX7JdxYF7/zVjZIMgf8CZ+9Ugd4rdjLPhibMT3vVCelCrwtGY8UpD zvNauxkJrLCifKN41tPGN8zRH96vqvhf0Xssn22ujOUHYNJts/CLyogCC4tlmQ78Gtl6nw cJgEjjmKLkCMxMHYba5P19FhklXe8+AdVPpG/poU/Bwv8BhfFTsDcyWh1CLVxDupg3vKi4 O1Lca9tlATl1eIr54SKoM1E7s+OYA8XPAbZ8jS3L0Ci4rFh12/SugscKVb6Aj4nYAWie1K Htyee7txXef5AVFvzyoXhgSYQclacQLSgs1uUlZ5Uv3kubrR+wPftQKVLt2Uwg== 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=1782554161; 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=YLnbRaaCbx1ODmakPT+9W5F+Z687PkWoE6IB58CwgVY=; b=IygYbZmRU8/ZjoqJ7I1IBWoJhbgT1+PEu6+62u837JtMU/TSXm5XfIkAhqLe1zkXl4lB85 Xlgu4Bi6lFZTImEelofVEPKJQODpGhbBwJgjKHEgWmA7/XjX4uv+bWM1YNLk6SVub98f6S SRMwYZK42vrwO1p2oYLldexSU+D9cpSdPDEn10HPiuzCiLVzlajr/eIFVSAreMX5iQnWLx xkBoJIoHiR4Pl4l3YGvhY3f8b6h5VSaISBoR6ohDNOY2lw6hEgnx768ksKEr8MKKKDITPg TB0AlMHGA6X5R6z3poaGm8D9I36nDWYUSHQdDzQXU6NGi4+IXqOQFU+sgPds0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnSbj27j0z3qp for ; Sat, 27 Jun 2026 09:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 325bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 09:56:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9707d9f01e5c - stable/15 - sound tests: Add PROT_EXEC rejection test 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9707d9f01e5cf4c3ff817f71a95e9ef4c85a1746 Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 09:56:01 +0000 Message-Id: <6a3f9e31.325bb.48315c14@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9707d9f01e5cf4c3ff817f71a95e9ef4c85a1746 commit 9707d9f01e5cf4c3ff817f71a95e9ef4c85a1746 Author: Christos Margiolis AuthorDate: 2026-06-12 06:20:26 +0000 Commit: Christos Margiolis CommitDate: 2026-06-27 09:55:28 +0000 sound tests: Add PROT_EXEC rejection test Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, kib Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/30 (cherry picked from commit 730eaf466493315c1d1164eb6b59b14766f49322) (cherry picked from commit f6b3bd1f3384d262b893af123f3fc2df21c5b9ee) --- tests/sys/sound/mmap.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/sys/sound/mmap.c b/tests/sys/sound/mmap.c index b44b16e7f312..6ebfd2f7dec5 100644 --- a/tests/sys/sound/mmap.c +++ b/tests/sys/sound/mmap.c @@ -102,10 +102,38 @@ ATF_TC_BODY(mmap_buffer_lifetime, tc) ATF_REQUIRE(munmap(buf, len) == 0); } +ATF_TC(mmap_reject_prot_exec); +ATF_TC_HEAD(mmap_reject_prot_exec, tc) +{ + atf_tc_set_md_var(tc, "descr", "mmap PROT_EXEC rejection test"); + atf_tc_set_md_var(tc, "require.kmods", "snd_dummy"); +} + +ATF_TC_BODY(mmap_reject_prot_exec, tc) +{ + uint8_t *buf; + size_t len; + int fd; + + fd = open("/dev/dsp.dummy", O_RDWR); + ATF_REQUIRE_MSG(fd >= 0, FMT_ERR("open")); + + len = 8; + + buf = mmap(NULL, len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_SHARED, + fd, 0); + ATF_REQUIRE_MSG(buf == MAP_FAILED, FMT_ERR("mmap")); + + munmap(buf, len); + + close(fd); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, mmap_offset_overflow); ATF_TP_ADD_TC(tp, mmap_buffer_lifetime); + ATF_TP_ADD_TC(tp, mmap_reject_prot_exec); return (atf_no_error()); } From nobody Sun Jun 28 00:30:02 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 4gnr0B2ws0z6jDRf for ; Sun, 28 Jun 2026 00:30:02 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0B2LRvz3dJS for ; Sun, 28 Jun 2026 00:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606602; 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=mpkeiJLW1C1sxzMC8f2ze7VXSLTiIFn+fDjMXzgBTTQ=; b=ugFAUq34KubXRsoLENPHAJskrajLbymk0Danu5V1K3EMOvIcozkuXIqqwgjPzvQ9siP30d m28pXgl9A/njMO5itOCFV3s0vV1DQzeZEpeavDU9WDRSy53Ui+p6W4J1UtmlvZgQEvN6a5 5mcz4uCuW+B/k0VQvUhfTIaT6/z/vQkHfZDox58EVsgU44cyx2NEPorkhZZwx8sq197XcS +1iHxiDmvlTCMAch/CWSvnkg2WPo9E7kuxFJfpt89J5Yafi3Aq7wKriS2BpAPsizgZNy9u m8+KT3tNplrAeAqltz3c0th3cG1940EmAyc2XNxiWP+ReJo+RdU0HE66Dpjfpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606602; a=rsa-sha256; cv=none; b=T5ZoODZjx3Zwl8ctZWpgv7xmLpg8zUKpzyDpM9KY+KpY93AEHUU+5w2hFk1D+9G2RQvVf9 WvZu1eFI4HZuOdImMGFoFge/3+mo3QzNKiqc0ppMQKh2EEoTJTVHjVi8hxAbChb4TpFm46 8DCFeUCI58T0C47Hc4666lFyIbYjSTLQ6wrNcLEgrAD47i5jKUYc8Gt20f1yP0QYCQEdYs Bau/B/DiwRWDo5nOApIaqVuMTfbyg6WYtveWVAl4kJ5/hLEP3tXraRYWgIkY+d7UlqOM4I 1w3zOu40bMpZloYL22NkaxpEHucRS2ZCl5PiGiXvDw2dsV5Xso7exr/E4+TrPg== 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=1782606602; 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=mpkeiJLW1C1sxzMC8f2ze7VXSLTiIFn+fDjMXzgBTTQ=; b=URr893u6BNAZBdoZ9u8l+RQ1xI0QQzKpZYryjkvSu/d1a25r5UFPhEBDImIM6IyiRr8HLl gPCmC8Pjy5B1XZvpyZv30hLMTVaWnXorzx3SBM9tyOUTV63Xkfqi5dtDWSEm5w6RjKr7cl 0ZkWSdQScx/cPqoLMDs6LKNQV1zQhGunpKQGrBqoyIBuqhUdpR0xMgAtWsdzFjQJM7vXB8 N42KC3HHTrM2AULjExxe8KU+GmQ2Ar67cTRD8w69DmF1o5Ge77nUeJnFFhTWlCTms+RNSO fslFHsebg1tJTJL3+lsq+9634bGCzKAeHVnXeHUpzFcg/83zD/ZdkmISmjqwtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0B0rvCzmD0 for ; Sun, 28 Jun 2026 00:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f0b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: dc94d15a7136 - stable/14 - execve_block(): a mechanism for mutual exclusion with execve() on the process 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dc94d15a7136c4cfe3342c005d8a319f0583ed9a Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:02 +0000 Message-Id: <6a406b0a.3f0b6.66555ae0@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dc94d15a7136c4cfe3342c005d8a319f0583ed9a commit dc94d15a7136c4cfe3342c005d8a319f0583ed9a Author: Konstantin Belousov AuthorDate: 2026-05-26 17:36:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:28:57 +0000 execve_block(): a mechanism for mutual exclusion with execve() on the process (cherry picked from commit e1a84b7708c2514769625c2af6c5034694013b6a) --- sys/kern/kern_exec.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sys/kern/kern_exit.c | 1 + sys/kern/kern_fork.c | 1 + sys/sys/imgact.h | 4 +++ sys/sys/proc.h | 3 ++ 5 files changed, 88 insertions(+) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 349e13915b29..4461b9e4dc11 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -370,6 +370,77 @@ execve_nosetid(struct image_params *imgp) } } +/* + * Returns true if the execblock was obtained, in this case the + * process lock is kept. Returns false if the execblock was not + * obtained, but the function slept and the lock was dropped. + */ +bool +execve_block(struct thread *td, struct proc *p) +{ + PROC_LOCK_ASSERT(p, MA_OWNED); + MPASS(td == curthread); + MPASS(p != td->td_proc || (p->p_flag & P_INEXEC) == 0); + + if (p != td->td_proc && (p->p_flag & P_INEXEC) != 0) { + p->p_flag2 |= P2_INEXEC_WAIT; + msleep(&p->p_execblock, &p->p_mtx, PDROP, "inexec", 0); + return (false); + } + MPASS(p->p_execblock < UINT_MAX); + p->p_execblock++; + return (true); +} + +/* + * Might drop the process lock internally, callers must re-check the + * invariants afterward. + */ +void +execve_block_wait(struct thread *td, struct proc *p) +{ + bool first; + + PROC_ASSERT_HELD(p); + PROC_LOCK_ASSERT(p, MA_OWNED); + + for (first = true;; first = false) { + if (!first) + PROC_LOCK(p); + if (execve_block(td, p)) + return; + } +} + +void +execve_unblock(struct thread *td, struct proc *p) +{ + PROC_LOCK_ASSERT(p, MA_OWNED); + MPASS(td == curthread); + + MPASS(p->p_execblock > 0); + p->p_execblock--; + if (p->p_execblock == 0 && (p->p_flag2 & P2_INEXEC_WAIT) != 0) { + p->p_flag2 &= ~P2_INEXEC_WAIT; + wakeup(&p->p_execblock); + } +} + +void +execve_block_pass(struct thread *td) +{ + struct proc *p; + + MPASS(td == curthread); + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + + while (p->p_execblock != 0) { + p->p_flag2 |= P2_INEXEC_WAIT; + msleep(&p->p_execblock, &p->p_mtx, 0, "exeblk", 0); + } +} + /* * In-kernel implementation of execve(). All arguments are assumed to be * userspace pointers from the passed thread. @@ -425,6 +496,7 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p, PROC_LOCK(p); KASSERT((p->p_flag & P_INEXEC) == 0, ("%s(): process already has P_INEXEC flag", __func__)); + execve_block_pass(td); p->p_flag |= P_INEXEC; PROC_UNLOCK(p); @@ -893,7 +965,11 @@ interpret: * as we're now a bona fide freshly-execed process. */ KNOTE_LOCKED(p->p_klist, NOTE_EXEC); + MPASS(p->p_execblock == 0); + if ((p->p_flag2 & P2_INEXEC_WAIT) != 0) + wakeup(&p->p_execblock); p->p_flag &= ~P_INEXEC; + p->p_flag2 &= ~P2_INEXEC_WAIT; /* clear "fork but no exec" flag, as we _are_ execing */ p->p_acflag &= ~AFORK; @@ -975,7 +1051,10 @@ exec_fail_dealloc: exec_fail: /* we're done here, clear P_INEXEC */ PROC_LOCK(p); + if ((p->p_flag2 & P2_INEXEC_WAIT) != 0) + wakeup(&p->p_execblock); p->p_flag &= ~P_INEXEC; + p->p_flag2 &= ~P2_INEXEC_WAIT; PROC_UNLOCK(p); SDT_PROBE1(proc, , , exec__failure, error); diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index bbd30dfb9480..baa5cad2bdc8 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -325,6 +325,7 @@ exit1(struct thread *td, int rval, int signo) while (p->p_lock > 0) msleep(&p->p_lock, &p->p_mtx, PWAIT, "exithold", 0); + MPASS(p->p_execblock == 0); PROC_UNLOCK(p); /* Drain the limit callout while we don't have the proc locked */ callout_drain(&p->p_limco); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 7731ae4d14f3..d8578f01677b 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -384,6 +384,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * bzero(&p2->p_startzero, __rangeof(struct proc, p_startzero, p_endzero)); + p2->p_execblock = 0; /* Tell the prison that we exist. */ prison_proc_hold(p2->p_ucred->cr_prison); diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h index c1c94a2eabfd..d35f85620ac9 100644 --- a/sys/sys/imgact.h +++ b/sys/sys/imgact.h @@ -122,6 +122,10 @@ int exec_shell_imgact(struct image_params *); int exec_copyin_args(struct image_args *, const char *, char **, char **); int pre_execve(struct thread *td, struct vmspace **oldvmspace); void post_execve(struct thread *td, int error, struct vmspace *oldvmspace); +bool execve_block(struct thread *td, struct proc *p); +void execve_block_wait(struct thread *td, struct proc *p); +void execve_unblock(struct thread *td, struct proc *p); +void execve_block_pass(struct thread *td); #endif #endif /* !_SYS_IMGACT_H_ */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 95a279742300..66b6a35c8d95 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -777,6 +777,7 @@ struct proc { TAILQ_HEAD(, kq_timer_cb_data) p_kqtim_stop; /* (c) */ LIST_ENTRY(proc) p_jaillist; /* (d) Jail process linkage. */ + u_int p_execblock; /* (c) Blockers for execve. */ }; #define p_session p_pgrp->pg_session @@ -890,6 +891,8 @@ struct proc { sync core registered */ #define P2_MEMBAR_GLOBE 0x00400000 /* membar global expedited registered */ +#define P2_INEXEC_WAIT 0x80000000 /* Not same as in HEAD. + Waiters for P_INEXEC/p_execblock */ /* Flags protected by proctree_lock, kept in p_treeflags. */ #define P_TREE_ORPHANED 0x00000001 /* Reparented, on orphan list */ From nobody Sun Jun 28 00:30:03 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 4gnr0C3GHMz6jDFq for ; Sun, 28 Jun 2026 00:30:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0C2dfxz3dJT for ; Sun, 28 Jun 2026 00:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606603; 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=c1lsw2pKlsDvzVEfuo9pPly7qo6Pj/B1FxRUodtN5CQ=; b=sE7oxzMgqkJLw4zzD9IdT3LOGK4WXLN3Wd7/3VAAqASsS2MixXWbPwmQiMrSJBvxOO51BX i53LZwkzoEOtUmKu0SQVMF2FuTn8t2c+8fKRBbtWnLqICYWQGNUKoh/y4MJzhrzrIb3k2K aTf02VHb/+lPPqaHSP3/hl+dn1k0l7QRh7aUDTPxMlm8NhRSQoJReekJNQuWBQFb69u8fm oXDaLx+0aiGqG8/gJhQ5OUlwxgguVD2FUxRevhtEEjULXX+XEj3sAj2U756/w5Gm9XC/9l a1DRWonKDo3qPzwCWSh8nxEpu6PBOMdSCPH+lN5+bbs2cUDMhKd0XlFO0yGxAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606603; a=rsa-sha256; cv=none; b=WzXk3G03Dk/CeSBiTeIZzSeQpODyP5c1SYXlQRDHOYIJSg3qECpplJW2sCINP1CKV8kK0r Fek2S2xQ3LIf43ox0AJIWfD1m+7FpVlhU4xdduNDRHZ4f41FsT1d5m8JpRTC1iJwOM7fEM gYLiS9zvyoBfZHRRIPryDNL2YhE/nN5pNsIOmMXczbJ+oBABJzi2mRoA8brWOObLP+9Ido jcDht0c7UkiG7X/KFFT4oIW9g4BJMdn9goJkKZpF05sZ1ojt4DF0ViQob7bQPFPUKx9vMC sqIPjrandAJ99zNXziDib06/FEi7NOgRSH56ryyqDfVOwxlexj+i6UlNj/kdfw== 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=1782606603; 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=c1lsw2pKlsDvzVEfuo9pPly7qo6Pj/B1FxRUodtN5CQ=; b=tYTIyiAXW4bfLan3KmZc4sRB60Ejv88cxB7+JNDwxO4/F1F34qC+iQVtjYY0SPZ/P506ti NWLjJubJt7rCYA4G6YFon0RlX8NTQ8eUOBdscYkqTrzQ/pjz+6vs4nRYZc8XtaIE0JthSK Gd4qbjlTKYBTY48VxnKonRswWFKmdpI1WxGTKDJvJTh6D15nEwKMl8ckiiUe2+ZTyKjUKM cG9bzJgoP8kfLGYzpLmCxHK0vFKB5RhTF/E3YdkOik1LVIDLf5LYUHV4HJIaruv0htWcLk 29d7TV4UPQ6hTcaf2JBO+L7UOp/ROEdKeyZSi1lczdeRF0f5EXFnqqQpjPVbkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0C1F5CznDY for ; Sun, 28 Jun 2026 00:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f115 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e7578e37d832 - stable/14 - proc: Allow to make proc_rwmem() operate on a consistent address space 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e7578e37d832ecf1eee8cd3fed10df0e0cb1aa7e Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:03 +0000 Message-Id: <6a406b0b.3f115.251a1b5c@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e7578e37d832ecf1eee8cd3fed10df0e0cb1aa7e commit e7578e37d832ecf1eee8cd3fed10df0e0cb1aa7e Author: Konstantin Belousov AuthorDate: 2026-06-07 17:57:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:28:57 +0000 proc: Allow to make proc_rwmem() operate on a consistent address space (cherry picked from commit e1b0d051bbf7e4e730470cbd6622f71a639834c3) --- sys/fs/cuse/cuse.c | 4 +- sys/fs/procfs/procfs_mem.c | 2 +- sys/kern/kern_prot.c | 10 ++-- sys/kern/sys_process.c | 124 ++++++++++++++++++++++++++++++++++++++------- sys/sys/ptrace.h | 15 +++++- 5 files changed, 127 insertions(+), 28 deletions(-) diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index d63a7d4691cf..b9423fd3543d 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -914,7 +914,7 @@ cuse_proc2proc_copy(struct proc *proc_s, vm_offset_t data_s, }; PHOLD(proc_s); - error = proc_rwmem(proc_s, &uio); + error = proc_rwmem(proc_s, &uio, 0); PRELE(proc_s); } else if (proc_cur == proc_s) { @@ -933,7 +933,7 @@ cuse_proc2proc_copy(struct proc *proc_s, vm_offset_t data_s, }; PHOLD(proc_d); - error = proc_rwmem(proc_d, &uio); + error = proc_rwmem(proc_d, &uio, 0); PRELE(proc_d); } else { error = EINVAL; diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index c74954db37d6..50db7d3a0b96 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -65,7 +65,7 @@ procfs_doprocmem(PFS_FILL_ARGS) error = p_candebug(td, p); PROC_UNLOCK(p); if (error == 0) - error = proc_rwmem(p, uio); + error = proc_rwmem(p, uio, 0); return (error); } diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index e2accd7f7729..d6f8faf23814 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -2310,11 +2310,11 @@ p_candebug(struct thread *td, struct proc *p) } /* - * Can't trace a process that's currently exec'ing. - * - * XXX: Note, this is not a security policy decision, it's a - * basic correctness/functionality decision. Therefore, this check - * should be moved to the caller's of p_candebug(). + * Can't trace a process that's currently exec'ing. Otherwise + * the process vmspace might change, and the target might be + * loading a setugid image. The execve_block(9) and + * proc_vmspace_ref(9) allow to get the stable credentials and + * vmspace reference. */ if ((p->p_flag & P_INEXEC) != 0) return (EBUSY); diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 3fb4595bb5f7..def87f8a1cd5 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -345,25 +346,93 @@ proc_sstep(struct thread *td) PROC_ACTION(ptrace_single_step(td)); } +static int +proc_vmspace_check_access(struct thread *td, struct proc *p, int flags) +{ + PROC_ASSERT_HELD(p); + if ((flags & PRVM_CHECK_DEBUG) != 0) + return (p_candebug(td, p)); + if ((flags & PRVM_CHECK_VISIBILITY) != 0) + return (p_cansee(td, p)); + return (0); +} + int -proc_rwmem(struct proc *p, struct uio *uio) +proc_vmspace_ref(struct thread *td, struct proc *p, int flags, + struct vmspace **vmp) +{ + struct vmspace *vm; + int error; + + MPASS((flags & ~(PRVM_BLOCK_EXEC | PRVM_CHECK_VISIBILITY | + PRVM_CHECK_DEBUG)) == 0); + MPASS((flags & (PRVM_CHECK_VISIBILITY | PRVM_CHECK_DEBUG)) != + (PRVM_CHECK_VISIBILITY | PRVM_CHECK_DEBUG)); + + PROC_LOCK(p); + if (p != td->td_proc) { + PROC_ASSERT_HELD(p); + + /* + * Make sure that the vmspace doesn't switch out from + * under us. + */ + if ((flags & PRVM_BLOCK_EXEC) != 0) { + for (;;) { + if (!execve_block(td, p)) { + PROC_LOCK(p); + continue; + } + error = proc_vmspace_check_access(td, p, flags); + if (error != 0) { + execve_unblock(td, p); + PROC_UNLOCK(p); + return (error); + } + break; + } + } else { + error = proc_vmspace_check_access(td, p, flags); + if (error != 0) { + PROC_UNLOCK(p); + return (error); + } + } + } + vm = vmspace_acquire_ref(p); + if (vm == NULL) { + if (p != td->td_proc && (flags & PRVM_BLOCK_EXEC) != 0) + execve_unblock(td, p); + PROC_UNLOCK(p); + return (ESRCH); + } + PROC_UNLOCK(p); + *vmp = vm; + return (0); +} + +void +proc_vmspace_unref(struct thread *td, struct proc *p, int flags, + struct vmspace *vm) +{ + vmspace_free(vm); + if (p != td->td_proc && (flags & PRVM_BLOCK_EXEC) != 0) { + PROC_LOCK(p); + PROC_ASSERT_HELD(p); + execve_unblock(td, p); + PROC_UNLOCK(p); + } +} + +static int +vmspace_rwmem(struct vmspace *vm, struct uio *uio) { vm_map_t map; vm_offset_t pageno; /* page number */ vm_prot_t reqprot; int error, fault_flags, page_offset, writing; - /* - * Make sure that the process' vmspace remains live. - */ - if (p != curproc) - PROC_ASSERT_HELD(p); - PROC_LOCK_ASSERT(p, MA_NOTOWNED); - - /* - * The map we want... - */ - map = &p->p_vmspace->vm_map; + map = &vm->vm_map; /* * If we are writing, then we request vm_fault() to create a private @@ -432,13 +501,30 @@ proc_rwmem(struct proc *p, struct uio *uio) return (error); } -static ssize_t -proc_iop(struct thread *td, struct proc *p, vm_offset_t va, void *buf, +int +proc_rwmem(struct proc *p, struct uio *uio, int flags) +{ + struct vmspace *vm; + struct thread *td; + int error; + + td = curthread; + error = proc_vmspace_ref(td, p, flags, &vm); + if (error != 0) + return (error); + error = vmspace_rwmem(vm, uio); + proc_vmspace_unref(td, p, flags, vm); + return (error); +} + +ssize_t +vmspace_iop(struct thread *td, struct vmspace *vm, vm_offset_t va, void *buf, size_t len, enum uio_rw rw) { struct iovec iov; struct uio uio; ssize_t slen; + int error; MPASS(len < SSIZE_MAX); slen = (ssize_t)len; @@ -452,8 +538,8 @@ proc_iop(struct thread *td, struct proc *p, vm_offset_t va, void *buf, uio.uio_segflg = UIO_SYSSPACE; uio.uio_rw = rw; uio.uio_td = td; - proc_rwmem(p, &uio); - if (uio.uio_resid == slen) + error = vmspace_rwmem(vm, &uio); + if (error != 0 || uio.uio_resid == slen) return (-1); return (slen - uio.uio_resid); } @@ -463,7 +549,7 @@ proc_readmem(struct thread *td, struct proc *p, vm_offset_t va, void *buf, size_t len) { - return (proc_iop(td, p, va, buf, len, UIO_READ)); + return (vmspace_iop(td, p->p_vmspace, va, buf, len, UIO_READ)); } ssize_t @@ -471,7 +557,7 @@ proc_writemem(struct thread *td, struct proc *p, vm_offset_t va, void *buf, size_t len) { - return (proc_iop(td, p, va, buf, len, UIO_WRITE)); + return (vmspace_iop(td, p->p_vmspace, va, buf, len, UIO_WRITE)); } static int @@ -1465,7 +1551,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) goto out; } PROC_UNLOCK(p); - error = proc_rwmem(p, &uio); + error = proc_rwmem(p, &uio, 0); piod->piod_len -= uio.uio_resid; PROC_LOCK(p); break; diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index bb492f60a8ed..3e7c74dba815 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -249,7 +249,20 @@ int proc_write_fpregs(struct thread *_td, struct fpreg *_fpreg); int proc_read_dbregs(struct thread *_td, struct dbreg *_dbreg); int proc_write_dbregs(struct thread *_td, struct dbreg *_dbreg); int proc_sstep(struct thread *_td); -int proc_rwmem(struct proc *_p, struct uio *_uio); + +#define PRVM_BLOCK_EXEC 0x00000001 +#define PRVM_CHECK_VISIBILITY 0x00000002 +#define PRVM_CHECK_DEBUG 0x00000004 + +#include +struct vmspace; +int proc_vmspace_ref(struct thread *_td, struct proc *_p, int _flags, + struct vmspace **_vmp); +void proc_vmspace_unref(struct thread *_td, struct proc *_p, int _flags, + struct vmspace *_vm); +ssize_t vmspace_iop(struct thread *td, struct vmspace *vm, vm_offset_t va, + void *buf, size_t len, enum uio_rw rw); +int proc_rwmem(struct proc *_p, struct uio *_uio, int _flags); ssize_t proc_readmem(struct thread *_td, struct proc *_p, vm_offset_t _va, void *_buf, size_t _len); ssize_t proc_writemem(struct thread *_td, struct proc *_p, vm_offset_t _va, From nobody Sun Jun 28 00:30:04 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 4gnr0D3WTHz6jDFt for ; Sun, 28 Jun 2026 00:30:04 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0D2GZHz3dDQ for ; Sun, 28 Jun 2026 00:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606604; 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=YP96P81NG2tiHAYKqSlTr8rPByDRHfDaEcCFK+i9YF0=; b=oVGXl+7oatqwZ54gx84ZLunknRIgnTVDeRj/wZshNxcotlIGt/Xb6ilT0wYtIcbZd2OFpG qHiOZsX05RuLFLMUtOqBnI2rItKjo5FrRbD/qXc6NAinHSVDIpv2OF5HmzJhrd72azci2D BxrMoRt09GfJsuyVlhc7hQcVjcpSA2JEJnZhGepFhnmAYu/jJWOCBEAAfhri9QLKO0R6wV CUmf2unoGFCw/cMx0EoytnA7/hneZGCcMHqCFTMuhLKabiKNVED8/rol3dYl198MpVhtMz +Q5WQmnSLu45brv+61Cish5YdF+hF8vRrl1r2XMvdK7LE1plTbE/XUNDB1suuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606604; a=rsa-sha256; cv=none; b=rxRn8Tbb+7dAd02BzsbSVJlJwq5kmuAHVVAxHpIrUQaUKQQr6rFv/7oECNeyEvPqyMQ3V7 kpHXAYo9bJ0tFDqhoMqC/SG+wA0xZ3uK2mExBvhc1qW/eZruoUIHvIvT1Ax3eYD8KnfovR S4IHtCqCkjC96x2XMMahCG4HyatHQOt7pQ1IAatSZGwaLdiK2idvTa2LVD+zu7gjDLH/+g tbEdQgftP3mOc2A/AMn8w9xvosA/vs5+doHKC7ojL7HRi9PUmBSVx824UHPK0D0x2iYZcB JpYaV/rUvG+bCWnGr26hwWzp56GODW9EZHhUyDqxjXVmSN71gZxB0p6ptKz/5Q== 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=1782606604; 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=YP96P81NG2tiHAYKqSlTr8rPByDRHfDaEcCFK+i9YF0=; b=jkVLr67nZKjA0WqERy9Qyv+yKCQRWJRhJ9tzOPS4fjevKYMNtjqQdEdgUTkeXgsKXK4y56 NEwJjpe03iDcyr0kTnr0fHQdda5/m6EhDtY6d6F1YH87+zyd8+et+wh1rP89jdxKtTV3Gn 1bQG2e+V+34WpDeaN6Y2w/gaQEvvlRJ0iCn8SvIto3OdI+SeXOzXK/KfhcZTPakvAJeamk nwtu1gzeBDjdwGw8KIFdgUy/DoeyBsw2RTF5pkzi2q4tTI52jjwECPRHpUwlzsxCnjpQsk /vPXh4uVhk1j++/zx4MZfo93TzRxr1FEvwaHSmNZfrCdI2K6UBKulTrT5yiBoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0D1BNTzmK5 for ; Sun, 28 Jun 2026 00:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e82f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1f062247ef4e - stable/14 - kern_proc.c: ensure stability of the vmspace we read the strings from 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f062247ef4e920e7fdd1ebe91b4600d69fe1e91 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:04 +0000 Message-Id: <6a406b0c.3e82f.2a9d0fa3@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1f062247ef4e920e7fdd1ebe91b4600d69fe1e91 commit 1f062247ef4e920e7fdd1ebe91b4600d69fe1e91 Author: Konstantin Belousov AuthorDate: 2026-06-07 19:12:54 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:28:58 +0000 kern_proc.c: ensure stability of the vmspace we read the strings from (cherry picked from commit a22c044cce41864a32af6b8281a3c416a2664d7f) --- sys/kern/kern_proc.c | 60 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 6dd75e21c67e..3ad9e157d622 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1834,8 +1834,8 @@ pargs_drop(struct pargs *pa) } static int -proc_read_string(struct thread *td, struct proc *p, const char *sptr, char *buf, - size_t len) +proc_read_string(struct thread *td, struct vmspace *vm, const char *sptr, + char *buf, size_t len) { ssize_t n; @@ -1844,7 +1844,7 @@ proc_read_string(struct thread *td, struct proc *p, const char *sptr, char *buf, * and is aligned at the end of the page, and the following page is not * mapped. */ - n = proc_readmem(td, p, (vm_offset_t)sptr, buf, len); + n = vmspace_iop(td, vm, (vm_offset_t)sptr, buf, len, UIO_READ); if (n <= 0) return (ENOMEM); return (0); @@ -1860,8 +1860,8 @@ enum proc_vector_type { #ifdef COMPAT_FREEBSD32 static int -get_proc_vector32(struct thread *td, struct proc *p, char ***proc_vectorp, - size_t *vsizep, enum proc_vector_type type) +get_proc_vector32(struct thread *td, struct proc *p, struct vmspace *vm, + char ***proc_vectorp, size_t *vsizep, enum proc_vector_type type) { struct freebsd32_ps_strings pss; Elf32_Auxinfo aux; @@ -1872,8 +1872,8 @@ get_proc_vector32(struct thread *td, struct proc *p, char ***proc_vectorp, int i, error; error = 0; - if (proc_readmem(td, p, PROC_PS_STRINGS(p), &pss, sizeof(pss)) != - sizeof(pss)) + if (vmspace_iop(td, vm, PROC_PS_STRINGS(p), &pss, sizeof(pss), + UIO_READ) != sizeof(pss)) return (ENOMEM); switch (type) { case PROC_ARG: @@ -1896,8 +1896,8 @@ get_proc_vector32(struct thread *td, struct proc *p, char ***proc_vectorp, if (vptr % 4 != 0) return (ENOEXEC); for (ptr = vptr, i = 0; i < PROC_AUXV_MAX; i++) { - if (proc_readmem(td, p, ptr, &aux, sizeof(aux)) != - sizeof(aux)) + if (vmspace_iop(td, vm, ptr, &aux, sizeof(aux), + UIO_READ) != sizeof(aux)) return (ENOMEM); if (aux.a_type == AT_NULL) break; @@ -1913,7 +1913,7 @@ get_proc_vector32(struct thread *td, struct proc *p, char ***proc_vectorp, return (EINVAL); } proc_vector32 = malloc(size, M_TEMP, M_WAITOK); - if (proc_readmem(td, p, vptr, proc_vector32, size) != size) { + if (vmspace_iop(td, vm, vptr, proc_vector32, size, UIO_READ) != size) { error = ENOMEM; goto done; } @@ -1934,8 +1934,8 @@ done: #endif static int -get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp, - size_t *vsizep, enum proc_vector_type type) +get_proc_vector(struct thread *td, struct proc *p, struct vmspace *vm, + char ***proc_vectorp, size_t *vsizep, enum proc_vector_type type) { struct ps_strings pss; Elf_Auxinfo aux; @@ -1945,11 +1945,13 @@ get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp, int i; #ifdef COMPAT_FREEBSD32 - if (SV_PROC_FLAG(p, SV_ILP32) != 0) - return (get_proc_vector32(td, p, proc_vectorp, vsizep, type)); + if (SV_PROC_FLAG(p, SV_ILP32) != 0) { + return (get_proc_vector32(td, p, vm, proc_vectorp, + vsizep, type)); + } #endif - if (proc_readmem(td, p, PROC_PS_STRINGS(p), &pss, sizeof(pss)) != - sizeof(pss)) + if (vmspace_iop(td, vm, PROC_PS_STRINGS(p), &pss, sizeof(pss), + UIO_READ) != sizeof(pss)) return (ENOMEM); switch (type) { case PROC_ARG: @@ -1987,8 +1989,8 @@ get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp, * to the allocated proc_vector. */ for (ptr = vptr, i = 0; i < PROC_AUXV_MAX; i++) { - if (proc_readmem(td, p, ptr, &aux, sizeof(aux)) != - sizeof(aux)) + if (vmspace_iop(td, vm, ptr, &aux, sizeof(aux), + UIO_READ) != sizeof(aux)) return (ENOMEM); if (aux.a_type == AT_NULL) break; @@ -2010,7 +2012,7 @@ get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp, return (EINVAL); /* In case we are built without INVARIANTS. */ } proc_vector = malloc(size, M_TEMP, M_WAITOK); - if (proc_readmem(td, p, vptr, proc_vector, size) != size) { + if (vmspace_iop(td, vm, vptr, proc_vector, size, UIO_READ) != size) { free(proc_vector, M_TEMP); return (ENOMEM); } @@ -2026,6 +2028,7 @@ static int get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, enum proc_vector_type type) { + struct vmspace *vm; size_t done, len, nchr, vsize; int error, i; char **proc_vector, *sptr; @@ -2038,9 +2041,14 @@ get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, */ nchr = 2 * (PATH_MAX + ARG_MAX); - error = get_proc_vector(td, p, &proc_vector, &vsize, type); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_VISIBILITY, &vm); if (error != 0) return (error); + + error = get_proc_vector(td, p, vm, &proc_vector, &vsize, type); + if (error != 0) + goto out; for (done = 0, i = 0; i < (int)vsize && done < nchr; i++) { /* * The program may have scribbled into its argv array, e.g. to @@ -2050,7 +2058,7 @@ get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, if (proc_vector[i] == NULL) break; for (sptr = proc_vector[i]; ; sptr += GET_PS_STRINGS_CHUNK_SZ) { - error = proc_read_string(td, p, sptr, pss_string, + error = proc_read_string(td, vm, sptr, pss_string, sizeof(pss_string)); if (error != 0) goto done; @@ -2067,6 +2075,8 @@ get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, } done: free(proc_vector, M_TEMP); +out: + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_VISIBILITY, vm); return (error); } @@ -2087,11 +2097,17 @@ proc_getenvv(struct thread *td, struct proc *p, struct sbuf *sb) int proc_getauxv(struct thread *td, struct proc *p, struct sbuf *sb) { + struct vmspace *vm; size_t vsize, size; char **auxv; int error; - error = get_proc_vector(td, p, &auxv, &vsize, PROC_AUX); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, + &vm); + if (error != 0) + return (error); + error = get_proc_vector(td, p, vm, &auxv, &vsize, PROC_AUX); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, vm); if (error == 0) { #ifdef COMPAT_FREEBSD32 if (SV_PROC_FLAG(p, SV_ILP32) != 0) From nobody Sun Jun 28 00:30:05 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 4gnr0F4Nr4z6jDTH for ; Sun, 28 Jun 2026 00:30:05 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0F2Z4Zz3dPD for ; Sun, 28 Jun 2026 00:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606605; 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=NIWWyz6GLloDEI8Inh90IBA9HjmOPCAD/fd7pSwiHFk=; b=EaTM08kdYgf45eN1hpn9JviQQI3lRjGAsBZxTl0uDFd25mIkIVu19pGVK4STSUTOdmJSFb WcN7a8fpt89QubVRGZhhDiPK1ZRBj7IoJhCLR2ChF6mBAMdehPm9M6dQS/t2RIN935NW9e yrErB7xVzPJxPj3jia9FPjBECdKxaDKZuMxQdNlO8cWjvPc/e1MwRhp33/1IAbiwCCSpXu p7560Bjbt7+m9gc+Wou3VokjN9/KDOP8bPDxAZL+ATksIyI7v3i3UdUwk4VPNLOEo9OLtD ymbuZcx8PuM+oAEK8yq06Xl7ui8DavSztpaYtbPIAvsDdNyPIPfTmwh//TQrgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606605; a=rsa-sha256; cv=none; b=RWbM1GHAyG+4IM7AkYd/0vD8dr9AYLzTL5rezYT+sojfEslVhJdyLtQKcKgeU2aXuWiHoR Q40YwDwZ4iMrzVo8LFEpNW0JHLpVcBhuY54+gu609ohtFJRjRAOopKhduD2mCABOEDWhBQ pSTy8Brbb39ex5H01zEsyW6i4Az/b0CJE90m+J23yKkngjjKdmv3pvbWTj1rL8J7z6OgB8 Vz7ScaJ8yGyYJSBi+zY2WW1pYXumz3a0yggQCtwEDmlc70ErIgW1ph85iKuJLzs7gnKoxS hyDnp2QjEEPrLAKV8QzAYMIE0oyC9aNJoKJ87uwY+GCbtEh+taKoXyUzyJ9ZWA== 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=1782606605; 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=NIWWyz6GLloDEI8Inh90IBA9HjmOPCAD/fd7pSwiHFk=; b=LnoYYo99DAbfV0GRNAczoVT82yKXFTup/5cJW/NOg1vk+H58YiT3+g9t8jDPKtCStatiJj sMEkfA2+ty4Df9tsXrUkftFoIuOGXE1k+PKEpZMBVGQdnR2z4OglUU1dVpOhZqpw+BKgS+ aAqZlQZIvFrCY6QBCM9IGSnTFLfdVWgAtH1K2fghYFq3bT8ZUp/WySTDDUCxgx0UrwmbXb p69ktiZ13bzyKe8kwxEu4Bh0mIf/+XCwyMsIvhlBeVhF3wpQEEHbUkdmg+6Y/MGXZnvskK 2HY6I1a/NdQk8B1Fpi10prtV+zcj8ACr2tBv3wcE3WgBbf28H3HrYp2p58HSwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0F1cdrznGk for ; Sun, 28 Jun 2026 00:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e2a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e856c10a4d6d - stable/14 - kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vmmap 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e856c10a4d6dfe30a730246b2050d9dd438085db Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:05 +0000 Message-Id: <6a406b0d.3e2a8.555961d9@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e856c10a4d6dfe30a730246b2050d9dd438085db commit e856c10a4d6dfe30a730246b2050d9dd438085db Author: Konstantin Belousov AuthorDate: 2026-06-14 23:49:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:28:58 +0000 kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vmmap (cherry picked from commit 5fe6e08d2db56b530f0df2903ef24cfabab7b8ea) --- sys/kern/kern_proc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 3ad9e157d622..6c010490f43b 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2420,6 +2420,7 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) int error, *name; struct vnode *vp; struct proc *p; + struct thread *td; vm_map_t map; struct vmspace *vm; @@ -2428,11 +2429,12 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) return (EINVAL); name = (int *)arg1; + td = curthread; error = pget((pid_t)name[0], PGET_WANTREAD, &p); if (error != 0) return (error); - vm = vmspace_acquire_ref(p); - if (vm == NULL) { + error = proc_vmspace_ref(td, p, PRVM_CHECK_DEBUG, &vm); + if (error != 0) { PRELE(p); return (ESRCH); } @@ -2544,7 +2546,7 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG, vm); PRELE(p); free(kve, M_TEMP); return (error); @@ -2635,6 +2637,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) struct vmspace *vm; struct cdev *cdev; struct cdevsw *csw; + struct thread *td; vm_offset_t addr; unsigned int last_timestamp; int error, ref; @@ -2646,10 +2649,11 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) _PHOLD(p); PROC_UNLOCK(p); - vm = vmspace_acquire_ref(p); - if (vm == NULL) { + td = curthread; + error = proc_vmspace_ref(td, p, PRVM_CHECK_DEBUG, &vm); + if (error != 0) { PRELE(p); - return (ESRCH); + return (error); } kve = malloc(sizeof(*kve), M_TEMP, M_WAITOK | M_ZERO); @@ -2764,7 +2768,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) if (vp != NULL) { vn_fullpath(vp, &fullpath, &freepath); kve->kve_vn_type = vntype_to_kinfo(vp->v_type); - cred = curthread->td_ucred; + cred = td->td_ucred; vn_lock(vp, LK_SHARED | LK_RETRY); if (VOP_GETATTR(vp, &va, cred) == 0) { kve->kve_vn_fileid = va.va_fileid; @@ -2820,7 +2824,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG, vm); PRELE(p); free(kve, M_TEMP); return (error); From nobody Sun Jun 28 00:30:06 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 4gnr0H19FWz6jDJV for ; Sun, 28 Jun 2026 00:30:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0G3SjVz3dMH for ; Sun, 28 Jun 2026 00:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606606; 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=5HDX6rU9/6zIXP3IKXoyI2DHp5TTTtAIXDMqI+2EuIc=; b=E1YINEqkdNz9xU97DzOZZiJdlMAurKKZVooNQFrhPV6NfuMDN+r+B6ny0PeyJe7IKDZM0q b1WAHQh/HcvxA9rPzIgfpZbUJMvDPy8/SSRPyrp/gNX3PBJMMszDTKcil80GEnQbJ/lrVV E+sWtC2vV4BxZYH8nin8/BlRHut2rrMVxcO6JLUZSSxwMDbdWk7MlYEVKKbQaAb6hRGzKG 6ELL6UvzwRAHGcWuMkgkb3ktjeuyUupzQzoMUcm4nsbaFxINTLGHKIdWZUBVAUtYyZ2GX8 yOjmNoEZTsXKec0hI9xv/hA6Pme8LUjDPpbcnvMDpefaCojcdSII57KS1PMeLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606606; a=rsa-sha256; cv=none; b=wff/c/xUiurawt0lHSvbtqzhIrdQqZCvFhRCViBVVzsOic6jnrjXH6XoPn61lvyshky3yk CPzbhSO5hVDAvYNJhC7hOZZ2IIG0XQksV5ohiPR4+pB24iYy1LDR+s1PND6kcmS/XKvE9t w8Dn8BkI3CwCr5kLsfgeAOmtMTkXMME2tUBtCeS9BhR5P9CbDgFymaJmnl1xeJnVxauJ10 2T0VVsTZQQ2aTOWfLltQs+2PJvbAieWjERlnkCIpeGF5e3SJyLitc0L+xodS//1BbK7yyX 8FEHxzdeObVuLpoJ8cd4WWamNSlAY2VgA/UUpwlDcClQK2ZVhoLO+MaJIng9fA== 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=1782606606; 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=5HDX6rU9/6zIXP3IKXoyI2DHp5TTTtAIXDMqI+2EuIc=; b=KFag3zsDK/saUmvbwcvzrZzNZTQ8bs1vtBnXTEe8zvnO03spNgsk/6u203VR6zaE7NUVuS 9J6++AJ7EqqIgPwSMHJ8b7MOfk/xgv5UpmMlHd0RWsykdg8cs0YplV4h5Uxwo0U8vSIQT0 7eYUbl7AxaBQZOh4YyC5MKv/hdyqvZm+WeeEP2X/qff6VmFiPjwrZSeC+ub1lW026eDxOP 2GrwIcd+ZUDFkeUAYH3l7sh+0TNCjp9B3D/RsF8cfvX1nBAzuRd75yuEw5PA8Bcw2KddMi K9e5hejFdbxLWBOC7Oz0R3TfK21nHdXTSbRox0zxQ8XTacK1vNqW5hXdT4yX8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0G2F4CzmK6 for ; Sun, 28 Jun 2026 00:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e2ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: da1398dd6962 - stable/14 - kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vm_layout 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: da1398dd6962b458fdcf25799fcb512f4d9c070d Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:06 +0000 Message-Id: <6a406b0e.3e2ac.30019a7e@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=da1398dd6962b458fdcf25799fcb512f4d9c070d commit da1398dd6962b458fdcf25799fcb512f4d9c070d Author: Konstantin Belousov AuthorDate: 2026-06-14 23:49:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:28:59 +0000 kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vm_layout (cherry picked from commit 31fa677e4af00b795bf671847b4dc72960c90f14) --- sys/kern/kern_proc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 6c010490f43b..a0a8e0f1f2b5 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -3293,6 +3293,7 @@ sysctl_kern_proc_vm_layout(SYSCTL_HANDLER_ARGS) { struct kinfo_vm_layout kvm; struct proc *p; + struct thread *td; struct vmspace *vmspace; int error, *name; @@ -3300,6 +3301,7 @@ sysctl_kern_proc_vm_layout(SYSCTL_HANDLER_ARGS) if ((u_int)arg2 != 1) return (EINVAL); + td = curthread; error = pget((pid_t)name[0], PGET_CANDEBUG, &p); if (error != 0) return (error); @@ -3311,8 +3313,13 @@ sysctl_kern_proc_vm_layout(SYSCTL_HANDLER_ARGS) } } #endif - vmspace = vmspace_acquire_ref(p); + _PHOLD(p); PROC_UNLOCK(p); + error = proc_vmspace_ref(td, p, PRVM_CHECK_DEBUG, &vmspace); + if (error != 0) { + PRELE(p); + return (error); + } memset(&kvm, 0, sizeof(kvm)); kvm.kvm_min_user_addr = vm_map_min(&vmspace->vm_map); @@ -3364,7 +3371,8 @@ sysctl_kern_proc_vm_layout(SYSCTL_HANDLER_ARGS) #ifdef COMPAT_FREEBSD32 out: #endif - vmspace_free(vmspace); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG, vmspace); + PRELE(p); return (error); } From nobody Sun Jun 28 00:30:07 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 4gnr0J66LXz6jDTK for ; Sun, 28 Jun 2026 00:30:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0H48h7z3dH9 for ; Sun, 28 Jun 2026 00:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606607; 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=O95T1BkzhZoXTrC137ClCMajU3luoCJ+pkXaAsBPwZE=; b=T5JPl5R6v1KLn1Hibq+tHzoQ3V1A2qJsCVgwwzbdKQgARo8zsCp1tCz7n4ehSdPzx8ekI4 OLAnYhDjMZIIR7O6H1swELeYvU9tqmz2eIt4LYXRLx7NhCb3KNUqevDsl6Ceguf/4G4XCe dbjpE8FpFV6C9QRLhDXnjVQieOALRZcoXop5O4jJUXK0jhFOGQOwzeSPCm97CUyZR0vDlD I8toKEoyWBYPIdGCyiFrkq7KB0EqOcOtzUVaWe/e1KiGqYSvIWDFS3cvfN9613FJhBflEw GkKP/BWlXFjicwQQD/1zMuTFc2Pi/jD3bK/In7q0ErHXuHK+Pv2EcW0wYXNl5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606607; a=rsa-sha256; cv=none; b=P0JCmseA1vDz+8tiEbx9+c20OJSs+ghJI1SCY6a8TN1Ajru4QTsyKY8XOF4AXABpvDsWtH apcnMpZsI6QeimJ4Pk1GTHyiOpOCikuilFbPWTi1OnMHV1hEg9uW4brSYdGZT5V4uWro9W OQB9oYL9StXF95SgXOlHPYz34XzXfrWR4wBIfUz2icX+eQ6bbWmub34wfIALdJS4+KbBid DOSTowIfNm77fo15hOX14wWbiFeKa0fxL4/r/J+Os+GV+2APHBDxtE6CgMdV2/Iu/bu9fg Gj3SNRRWWJ90nG3cmy9P7tnOrpjKQW/dLfEELDEi4BLP4VbiN+yv2SZAi3ZoWA== 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=1782606607; 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=O95T1BkzhZoXTrC137ClCMajU3luoCJ+pkXaAsBPwZE=; b=Oa9mmzgi7M5TGtju8gomiF/4xJ3IagHS24FhMx2K0C17L0S8JmKeT4Bp4aIHqoKNwyJcUJ CW4E26jN4QECwGG1aBJIs9a5WAX8In0BW1GEUPA6PYOcttgevwZW1k5F3dlDeQ0fu4c5J0 ge6kMW+pB9x4tdTh3ygWGALvHHk2sW5E//Gpn7wniiSZC4p5lJ/ae2RUx/+88HMhmj5msH uJB/x3JdJGCzgLIjJO3135Pk60OtaIxF9hjEGx2N6pSVm2bqqVnFzUMO75GHRCy9t7r/8b KPg4RVj8KBznm1imLAqui0kOzjTfKfQG5OvapjQh/1N6B3oq5yl2DENLj+nXyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0H2Q7fznGm for ; Sun, 28 Jun 2026 00:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d5f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b3f99ce653d4 - stable/14 - kern_proc.c: make kern.proc.osrel atomic 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b3f99ce653d456c9c829359b0dc83c4867f044b7 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:07 +0000 Message-Id: <6a406b0f.3d5f1.c9c385d@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b3f99ce653d456c9c829359b0dc83c4867f044b7 commit b3f99ce653d456c9c829359b0dc83c4867f044b7 Author: Konstantin Belousov AuthorDate: 2026-06-15 17:28:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:28:59 +0000 kern_proc.c: make kern.proc.osrel atomic (cherry picked from commit 80626f34ee985671bb8c60ee986b89587b7a1511) --- sys/kern/kern_proc.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index a0a8e0f1f2b5..bac8b5c9d1ad 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -3124,39 +3124,38 @@ sysctl_kern_proc_osrel(SYSCTL_HANDLER_ARGS) int *name = (int *)arg1; u_int namelen = arg2; struct proc *p; - int flags, error, osrel; + int flags, error, old_osrel, osrel; if (namelen != 1) return (EINVAL); - if (req->newptr != NULL && req->newlen != sizeof(osrel)) - return (EINVAL); - - flags = PGET_HOLD | PGET_NOTWEXIT; - if (req->newptr != NULL) + flags = PGET_NOTWEXIT; + if (req->newptr != NULL) { + if (req->newlen != sizeof(osrel)) + return (EINVAL); + error = SYSCTL_IN(req, &osrel, sizeof(osrel)); + if (error != 0) + return (error); + if (osrel < 0) + return (EINVAL); flags |= PGET_CANDEBUG; - else + } else { flags |= PGET_CANSEE; + } error = pget((pid_t)name[0], flags, &p); if (error != 0) return (error); - - error = SYSCTL_OUT(req, &p->p_osrel, sizeof(p->p_osrel)); - if (error != 0) - goto errout; - - if (req->newptr != NULL) { - error = SYSCTL_IN(req, &osrel, sizeof(osrel)); - if (error != 0) - goto errout; - if (osrel < 0) { - error = EINVAL; - goto errout; - } - p->p_osrel = osrel; + if ((p->p_flag & P_INEXEC) != 0) { + error = EBUSY; + } else { + old_osrel = p->p_osrel; + if (req->newptr != NULL) + p->p_osrel = osrel; } -errout: - PRELE(p); + PROC_UNLOCK(p); + + if (error == 0) + error = SYSCTL_OUT(req, &old_osrel, sizeof(old_osrel)); return (error); } From nobody Sun Jun 28 00:30:08 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 4gnr0J6Zjpz6jDMZ for ; Sun, 28 Jun 2026 00:30:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0J47tFz3dFN for ; Sun, 28 Jun 2026 00:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606608; 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=bAmxPPNHT4Oo7neaUYmQRRxD31cFQ8UMfhqMyIqigkk=; b=vtnnWOns5JGgypHRPYKXm2qkBHCsN1HyJH3Tr/rp7Q7MUqUby4zRaGHpSZSW8Y7uUDQi42 OYVyrbTfwlXf3raT3GGh3KXJL3j8TBVvM4Wdi3ouIbrBxEHujL/xm9A7vLdzbWcsBFKMF6 KGf1y+9YC2Yg//FrIHBcp84mzfNUiYKsEgtBjO5XPEnNffw5pgTJGREjdEphzb9UMuNYd9 40HRkuLqWylxkZmc4lVTsr6P5h6VZppr07/TDMzhwwA778z41i3c58w6TJuf7u7ylUGrWv b5bmOVBstX61foabOUDbP4RoZVwZeohFNWW+stKgCAXPsUxuBI4WpeXErMCB7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606608; a=rsa-sha256; cv=none; b=P2XTx+/BqOm+uw+gidoeAFJk9bTue7d1ZRkDYIs9GrihDfkUiUVLxmaMgexlwYpXv6dPof BSCzlpSyzkcll72vZw1oXZLi8spcJDpO50B0jm3S0QdXff/kdKJROrdD3rCPUjxcJjvETQ osALyGr57jCO2dK/4QwBKVwNlRbwhpNEl0LxRS0P7dCJEvvupjp8TE6B62Yq2R8wJfeCE7 wtuMwTdPd+ARbvNACD9KV6FU0y8QId2IlcAmbXNx/U83xjigpqQeUMAP8RjmBo4Q3UzB3Z GZW63Ykn+dZzvOK5r3ctiway9xJEgLFf3QL/VQRymvpvegz/Gl9FiWWioBPdbA== 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=1782606608; 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=bAmxPPNHT4Oo7neaUYmQRRxD31cFQ8UMfhqMyIqigkk=; b=IrcBP8WDPj9DJW7Lq12NkZNO3gDP1t+PYP22/cyGyMWWNe1pbWLHGJVAFM864JBuo+iDlC dP+oHGNW+d0PaMuE+A7ny7sM/SCNe8GCnse5Crjn2lpo9U2OyUvAnkj83AzeO/N5GeOgfP snEQcuyqh4beDTfDxLAZ/2Zy5QzaD8ooJCbTpkTZaYrU2fm85x0cEz0R06iD3K4kDEU5Ys GGNDkJ8xRyffz5s1q3iCqUzl5kePHL+s/BPbdotPEI7juXjqhClDkZBtMOJmh7lWzCn5DR bEXLlyCbUGhpRnGu21UrcIj4u7S9VpSzpU2bQO8O/RQE7yzkG5dDh9bNAk6NcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0J2qVlznDd for ; Sun, 28 Jun 2026 00:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e2b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 197f367cdda7 - stable/14 - kern_proc.c: disallow execve around sysctl kern.proc.kstacks 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 197f367cdda7919578d15b1562225d6db462c5ad Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:08 +0000 Message-Id: <6a406b10.3e2b0.3bbbbc49@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=197f367cdda7919578d15b1562225d6db462c5ad commit 197f367cdda7919578d15b1562225d6db462c5ad Author: Konstantin Belousov AuthorDate: 2026-06-15 17:57:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:00 +0000 kern_proc.c: disallow execve around sysctl kern.proc.kstacks (cherry picked from commit 8b5abd9027b8b1f6290c756730ee3adebed007f4) --- sys/kern/kern_proc.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index bac8b5c9d1ad..91c9d4473d76 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -2863,7 +2864,7 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) struct kinfo_kstack *kkstp; int error, i, *name, numthreads; lwpid_t *lwpidarray; - struct thread *td; + struct thread *td, *ctd; struct stack *st; struct sbuf sb; struct proc *p; @@ -2874,7 +2875,8 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) return (EINVAL); name = (int *)arg1; - error = pget((pid_t)name[0], PGET_NOTINEXEC | PGET_WANTREAD, &p); + ctd = curthread; + error = pget((pid_t)name[0], PGET_WANTREAD, &p); if (error != 0) return (error); @@ -2883,6 +2885,14 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) lwpidarray = NULL; PROC_LOCK(p); + execve_block_wait(ctd, p); + error = p_candebug(ctd, p); + if (error != 0) { + execve_unblock(ctd, p); + _PRELE(p); + PROC_UNLOCK(p); + return (error); + } do { if (lwpidarray != NULL) { free(lwpidarray, M_TEMP); @@ -2895,15 +2905,6 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) PROC_LOCK(p); } while (numthreads < p->p_numthreads); - /* - * XXXRW: During the below loop, execve(2) and countless other sorts - * of changes could have taken place. Should we check to see if the - * vmspace has been replaced, or the like, in order to prevent - * giving a snapshot that spans, say, execve(2), with some threads - * before and some after? Among other things, the credentials could - * have changed, in which case the right to extract debug info might - * no longer be assured. - */ i = 0; FOREACH_THREAD_IN_PROC(p, td) { KASSERT(i < numthreads, @@ -2938,7 +2939,10 @@ sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS) if (error) break; } - PRELE(p); + PROC_LOCK(p); + execve_unblock(ctd, p); + _PRELE(p); + PROC_UNLOCK(p); if (lwpidarray != NULL) free(lwpidarray, M_TEMP); stack_destroy(st); From nobody Sun Jun 28 00:30:09 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 4gnr0L15FLz6jDNr for ; Sun, 28 Jun 2026 00:30:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0K4h6Jz3dS1 for ; Sun, 28 Jun 2026 00:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606609; 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=xuyFIlmMMGO902bDqRfAwRqH0mvHEE4la1BtUT64ffU=; b=Gq54uZz2UattL2tstgCAO89byP1TqOjIb6DehFQZhobz/yv5JLhfpq9PKmZEBA8AtJH6gL LgVx5UqwdoRAaOGpnyLWY4to8DJxyCXCXLJQzlZpp5ZsCqOf7Ecn+gGn47y37QUxEivgJQ z27NPZb/ApkAfKaBnkmnJBr2R50Yc7K/CGprLOqQglEbqRsElh3mbZ8c/4448g2CRsGuaJ uczKC+OjbhFvrZwREwWLMlebQ0hX4lFmIsrWWWXGEVRlucV7HQ3J8eYF8t3TwFb5f6BfLx WHfT7OvZi3fdcobBgJfJ0tKGvsZ+HRQYkrhKIDHHD9jwB13an4yXCRjeLAPjzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606609; a=rsa-sha256; cv=none; b=WlMHZrNSaNLMuFNMkYwW+zE49JySlnwU6p3aVDP3DlCIh1g7dsALVu8e4WTHGgENtrZCUc LFwRmcqWHT0BopZW5FyzV7IM21uLy8R5PhW2IWjky/wU0et8OnPmxWaJhACCctQIquMJEi wXSjs74MTX5mMkPK7eOicu6UcrZfDKh9HFWumy/RiqGgw1Nc061M3tRHy2QAVxySBxxo/S 6eDnuAGZg8PYN1xIuucVQ0Y/bzcgCO0cSQ14vZEfAt7FVzbhTr0jQOml643VwvMqQCmBC/ hnDMTxAY0YfWN3MHLev0LxfS9dYsKcOoiQrz3bNDqiaK4tt1zkYSc//51Ch4jQ== 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=1782606609; 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=xuyFIlmMMGO902bDqRfAwRqH0mvHEE4la1BtUT64ffU=; b=JD/qlOKvE8ev7aGXyNVwAATUdOR1ITZf52GSOKoCjWjqZG39ZN9fRiroCVLpLvKbIhE6yt Bbqs6EYH4py19neio7MLgDNSZkFKGI+KQ9P4no8Qhee+rYOzHXLi4EYkSb+U38T/8xPExh /JAMvTypkEnRaH3VKR91LKuDbL5dxiNFoPgOmJq/B65uEIAq1HY817NNiQWqQ3Le06xA1p GPk14LJJFNZnfEThjW8iWBybO4fqNEENvilcqOI95IDYSo23OIIp+nKwlHPK1lpa/8DZBS gAscHHs+8AUCGVyk7OFAWAqF+CfaXuxoCcilG+NF1FAaYBt+h1QLGWT5WBoaXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0K3DvLznC6 for ; Sun, 28 Jun 2026 00:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f045 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 35b95beb06ca - stable/14 - kern_proc.c: disallow execve around sysctl kern.proc.rlimit 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35b95beb06cab0b10a7e3a697931851315fe3dc2 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:09 +0000 Message-Id: <6a406b11.3f045.7a23c729@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=35b95beb06cab0b10a7e3a697931851315fe3dc2 commit 35b95beb06cab0b10a7e3a697931851315fe3dc2 Author: Konstantin Belousov AuthorDate: 2026-06-16 04:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:00 +0000 kern_proc.c: disallow execve around sysctl kern.proc.rlimit (cherry picked from commit 5a91fa5a7656c99e527fe7e6f6bf6bd9e85ab589) --- sys/kern/kern_proc.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 91c9d4473d76..a722bac6185a 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2995,8 +2995,9 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) u_int namelen = arg2; struct rlimit rlim; struct proc *p; + struct thread *td; u_int which; - int flags, error; + int error; if (namelen != 2) return (EINVAL); @@ -3008,23 +3009,24 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) if (req->newptr != NULL && req->newlen != sizeof(rlim)) return (EINVAL); - flags = PGET_HOLD | PGET_NOTWEXIT; - if (req->newptr != NULL) - flags |= PGET_CANDEBUG; - else - flags |= PGET_CANSEE; - error = pget((pid_t)name[0], flags, &p); + td = curthread; + error = pget((pid_t)name[0], PGET_NOTWEXIT, &p); if (error != 0) return (error); + _PHOLD(p); + execve_block_wait(td, p); + error = req->newptr != NULL ? p_candebug(td, p) : p_cansee(td, p); + if (error != 0) + goto errout1; /* * Retrieve limit. */ if (req->oldptr != NULL) { - PROC_LOCK(p); lim_rlimit_proc(p, which, &rlim); - PROC_UNLOCK(p); } + PROC_UNLOCK(p); + error = SYSCTL_OUT(req, &rlim, sizeof(rlim)); if (error != 0) goto errout; @@ -3039,7 +3041,11 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) } errout: - PRELE(p); + PROC_LOCK(p); +errout1: + _PRELE(p); + execve_unblock(td, p); + PROC_UNLOCK(p); return (error); } From nobody Sun Jun 28 00:30:11 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 4gnr0N1mfzz6jDCv for ; Sun, 28 Jun 2026 00:30:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0M65Hsz3dXn for ; Sun, 28 Jun 2026 00:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606611; 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=1l308AY5ssqhlqfWEn6Z5Q9z/HP3lH1ONis9+x2wQEk=; b=CsO3S+9oZ1dxGrccYIaTWALP9/ntxhbGdwe8vxeNPtt1rYT0hVkIlARs8BnWS9Dnr7UFxI heiQuncHlH76CL9jYiBc7VGT79iDM5itscGiwvy8YuTMyPeFzMdlf7mvSlGmdyjJ5hW99h vjNv5CA/sT4Eum3PPqNTddM7xPQawYKpcwWnvUagVMnHv8VBXpeq+FdtR+aYn4sYIbIsVb w2LVijBrsB1JcAl0dJz8Y47fiT/xyHTTEi2J10yJL6hqFsUUaS9xiBTgOQWn4gafx1Poih jl+Vd8gHHlnLDz7+65ANFq0QrdXznj/5StSLklNvfQb7UmQsb/LPxdxGadvZiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606611; a=rsa-sha256; cv=none; b=JaHuj1C+qVKGfbRckoaiCbwB0Zuk3C29RrLeddANGFykHNpL9XjKCo3Tl+FsYit1AWm4S/ Ws1E4uxpIWxArijqP6ElkoYTzW4VKuhLC/HbsQV/+bZYqyV1IsGy9eXC5FKcXHMN5kZRXK w/e0vFCnUR21dns/MZIdaTlffeiVJl3/7zti3YcE2TrRfS3jsq+lYwh8xFGEBs9QnLiAsS sWYlSSmF0Pzize4IKzvUBZZmQFRKs1wuHtKXRu1RhoWz8grje3LcFc6S6eaxxXH9BS7yQF JcvUBfa55rxsa9Z6fNYL2N2YSnRIMpGE+3RCYE5ljVTD3nXZhiUcDGK0uoMu2Q== 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=1782606611; 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=1l308AY5ssqhlqfWEn6Z5Q9z/HP3lH1ONis9+x2wQEk=; b=nYikT/efexVmizRRDHc81K4r8A2h/Hw/1/ZF8wH+Zd2pcVUuCipiCKzLJIvtVLqW7wboMQ 3DioaeKSZElZUQlNvBZueKfR2G1yyYXCZvEgJjEZayEvwj4oUgYQ9uHyPw3RcRiXg3s9EC +uuFgKNkznMfMVCclCO+TOKh0jwIW+8T/LvXGEs4OPnMyiHPaHRQtbl8UtCT7KY50HrfgF rZ3QISDInOGSUabOgmKdwS/jCzXQd54wIgXXBIuZNrUkN3nzB2oJHTCUlo21V3prd/s2HC r6/jihwmI3pD+Bg46/LldTWexGrKrLmVChbck0xIZ21uQWtgRx00cHF8SYkdCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0M44RlznDf for ; Sun, 28 Jun 2026 00:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f11e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 190d6677b11a - stable/14 - kern_resource.c: disallow execve around sysctl kern.proc.rlimitusage 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 190d6677b11a1deed6bd0ef14fd4f990eea20f5b Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:11 +0000 Message-Id: <6a406b13.3f11e.77e29ac5@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=190d6677b11a1deed6bd0ef14fd4f990eea20f5b commit 190d6677b11a1deed6bd0ef14fd4f990eea20f5b Author: Konstantin Belousov AuthorDate: 2026-06-16 04:34:16 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:01 +0000 kern_resource.c: disallow execve around sysctl kern.proc.rlimitusage (cherry picked from commit 836749817036b90b60af0584fa21f2d9dbd60ff7) --- sys/kern/kern_resource.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 9729bf987aa6..80f3588f2614 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -810,11 +811,11 @@ sys_getrlimit(struct thread *td, struct getrlimit_args *uap) } static int -getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) +getrlimitusage_one(struct proc *p, struct vmspace *vm, u_int which, int flags, + rlim_t *res) { struct thread *td; struct uidinfo *ui; - struct vmspace *vm; uid_t uid; int error; @@ -825,7 +826,6 @@ getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) PROC_UNLOCK(p); ui = uifind(uid); - vm = vmspace_acquire_ref(p); switch (which) { case RLIMIT_CPU: @@ -903,7 +903,6 @@ getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) break; } - vmspace_free(vm); uifree(ui); return (error); } @@ -911,12 +910,15 @@ getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) int sys_getrlimitusage(struct thread *td, struct getrlimitusage_args *uap) { + struct proc *p; rlim_t res; int error; if ((uap->flags & ~(GETRLIMITUSAGE_EUID)) != 0) return (EINVAL); - error = getrlimitusage_one(curproc, uap->which, uap->flags, &res); + p = curproc; + error = getrlimitusage_one(p, p->p_vmspace, uap->which, uap->flags, + &res); if (error == 0) error = copyout(&res, uap->res, sizeof(res)); return (error); @@ -1750,6 +1752,8 @@ sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) { rlim_t resval[RLIM_NLIMITS]; struct proc *p; + struct thread *td; + struct vmspace *vm; size_t len; int error, *name, i; @@ -1759,15 +1763,20 @@ sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) if (req->newptr != NULL) return (EINVAL); - error = pget((pid_t)name[0], PGET_WANTREAD, &p); + td = curthread; + error = pget((pid_t)name[0], PGET_HOLD | PGET_NOTWEXIT, &p); if (error != 0) return (error); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_VISIBILITY, &vm); + if (error != 0) + goto out; if ((u_int)arg2 == 1) { len = sizeof(resval); memset(resval, 0, sizeof(resval)); for (i = 0; i < RLIM_NLIMITS; i++) { - error = getrlimitusage_one(p, (unsigned)i, 0, + error = getrlimitusage_one(p, vm, (unsigned)i, 0, &resval[i]); if (error == ENXIO) { resval[i] = -1; @@ -1778,7 +1787,7 @@ sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) } } else { len = sizeof(resval[0]); - error = getrlimitusage_one(p, (unsigned)name[1], 0, + error = getrlimitusage_one(p, vm, (unsigned)name[1], 0, &resval[0]); if (error == ENXIO) { resval[0] = -1; @@ -1787,6 +1796,8 @@ sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) } if (error == 0) error = SYSCTL_OUT(req, resval, len); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_VISIBILITY, vm); +out: PRELE(p); return (error); } From nobody Sun Jun 28 00:30:10 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 4gnr0L6Rg2z6jDGG for ; Sun, 28 Jun 2026 00:30:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0L4tpVz3dHZ for ; Sun, 28 Jun 2026 00:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606610; 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=DSruYqfX0XpaHymE9b1PEM/JSr1OEO7dB99IUzNS1Tk=; b=WbjKPQuGIo0Arlz7EjAad4YRR4el+aGwApagDgakgQoZ1HUZXexXRVJcj4QzidENdlzXul Ip5/Oggh4DSHQNlRM5EUQLx2t1Wkjmt32Y90TPb1JFBzcaA+Phti4oIHwgKIu0cy5aenjL 3dNeaL1pyqJNI3aCnKS1YsxqAqzJGU/dcIrn9SVccHyadNWEJRc6E8i8MR8qHfRpsKJnS/ MiDLQX8JLVp1VVFafigHj75afbc/dc0+5328wXHw+wu9gtltspETEMsm/yfbjl3rNK7gEo lQFSVARAwZkSpq9EaJE6xBxZgMB4EJBzCYnaQPbPXxy7DSJy2E/5XOtG4ZV/0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606610; a=rsa-sha256; cv=none; b=Fj4Wy9AYvujIz1aFdOtUdaR9AgksmvuvWvPSxJZozzyLgO31pzLDLj2Eh4vHwubB58Qd7/ LdLiwhraSsP7SqugxHvxLH+94tlxznKFNiKYBCnJz2r62p1ORYYmqvx1ReRBGhQ1T/jbN0 aUQ+bL6HMjActG1a4psstz9cdvfPsKo314yVocoLLrq4J0XM4QDolBaekjnDR1yZiCZ7QD +D460NwXx9OL7157fEaa7QOTa0CiNtcwi8yuiM1n4iP5mQVuQtoFXR2lBepplqB3/aqi9E D3O1efHbHnqqP+b7kJybf1/ub6XTm9CUCtzCHUQvfKdAIuk36I//RQEGXIt/4w== 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=1782606610; 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=DSruYqfX0XpaHymE9b1PEM/JSr1OEO7dB99IUzNS1Tk=; b=ksyhnW6lQYdfDo/3gamKN1KSGRyxcIKlHcf3Z2Lzz4SfxjYguD6CQKq2KI3GcZS//HUb7r 9hLZ2XH/TRZCYz3NLM4A6FzuWl9Wut+hd0DPrw0mDBtsgnuQp+B4XlCPP3ca845Boueg3P tGsL2WojbEP4GXqTanjHCxzSH/MFEb3mVf3FjjY+C7E+CQ2RLGLYiuXaTFnqjMqux5/YIL B4mYnLCyzRGmFUEUitG/X21DyrD6nMsraTumLPRkSZFf8mNBUvYxezMGox49J7gvfHv/Fi JoKn7MrPbbZDLdzZ38ioO7lYFWYyuG+HS2Uq1gmEFWSmOkvVBoomvQAW+QpwUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0L3gvXzmD1 for ; Sun, 28 Jun 2026 00:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ea3d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: adb14791b752 - stable/14 - kern_event: block the target process from execing for sysctl kern.proc.kqueue 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: adb14791b752cf0f07dce44d840f01340aa6d6cb Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:10 +0000 Message-Id: <6a406b12.3ea3d.3477a509@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=adb14791b752cf0f07dce44d840f01340aa6d6cb commit adb14791b752cf0f07dce44d840f01340aa6d6cb Author: Konstantin Belousov AuthorDate: 2026-06-16 03:48:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:00 +0000 kern_event: block the target process from execing for sysctl kern.proc.kqueue (cherry picked from commit 79b384bd8fdff4869ce4799edb0342ff5c25b6fa) --- sys/kern/kern_event.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 7c31a2f551ab..aaffbfce432c 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -3070,10 +3071,6 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) if ((u_int)arg2 > 2 || (u_int)arg2 == 0) return (EINVAL); - error = pget((pid_t)name[0], PGET_HOLD | PGET_CANDEBUG, &p); - if (error != 0) - return (error); - td = curthread; #ifdef COMPAT_FREEBSD32 compat32 = SV_CURPROC_FLAG(SV_ILP32); @@ -3081,6 +3078,17 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) compat32 = false; #endif + error = pget((pid_t)name[0], PGET_NOTWEXIT, &p); + if (error != 0) + return (error); + + _PHOLD(p); + execve_block_wait(td, p); + error = p_candebug(td, p); + if (error != 0) + goto out1; + PROC_UNLOCK(p); + s = sbuf_new_for_sysctl(&sm, NULL, 0, req); if (s == NULL) { error = ENOMEM; @@ -3101,7 +3109,11 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) sbuf_delete(s); out: - PRELE(p); + PROC_LOCK(p); +out1: + execve_unblock(td, p); + _PRELE(p); + PROC_UNLOCK(p); return (error); } From nobody Sun Jun 28 00:30:12 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 4gnr0P2NNQz6jDGh for ; Sun, 28 Jun 2026 00:30:13 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0N6Jv6z3dbT for ; Sun, 28 Jun 2026 00:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606612; 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=EWqYYofbAIehwMdWV94fK9KsD2UutYtVo1B3VLDPPTM=; b=BqQ+vUjeRlfCeg6EGJYPo0BRPpkgt28p6i6+CvLmjl2qqXJ8Krws5sgyEmTgl8ezFvTVWi lsqZn3U48AT85bPoeZVtCUNudAvfVHpCcq3C/WIoeYOVU7ay5+4lzPDCAKDSyltSIZW/QD 2Mxwy5N0LpL4ao2uddh+X7gNxKqIuZEPAQXGw5XETtx1Ksov+/ya6FaIqhlv5JR9ITziDk etSsl3JEiMhzqkKPPdy7jQR8MWTYCXBH6DH64jaCr34C7JYjBExV7zYXUGmUK1GyWXw4BM U8fbuhUoB3c0DVZb2XE8Vr/zgK5bgbXUnNb76rvGHlsHMfD7ga8xuR3WB2QHLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606612; a=rsa-sha256; cv=none; b=IOeAJOq4ieWxc/7WAv+e+3+5QCChxd+WWFQbfjPTwgYZXWwH0iwq8P+tDueQW5oT9sD6CO sRrF+5Ngp/27p/MPdGMe6Z8X0DrxBT+VGnzmuFGH3rCQsg1WiA3OI38tEtA4m6Y1OpJIFf XvegZmhCWQWLdXfNkHR8UvPGghrHSx7tQwWFp46/1FIwZ+EC5DrzTMAkdMErSH/bdwsP1R nshfu3YGsNcEOmrZGz4z6Br9OYFr5tWOpzwP5WysOT4Y8JC8cmddfrtNppSU+bN7J4Cq0n +0VCNVBdGm1tv4SfJSdnmGl0nKUMeNPPB0B7Siv0Nqy8a0thkWsYx50D9r0Q2g== 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=1782606612; 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=EWqYYofbAIehwMdWV94fK9KsD2UutYtVo1B3VLDPPTM=; b=gofRMM4yb1FzZx0t51jZiKekeV/EQ0ywjGEr+dp00B03zrSWVnJEWDJQysf8dylBEHE+eW JWDaNG6sw7JHDxUcD1Adj7sLw6yGsMxrUlTluRb7z8L/zjbu7KhW0/0bRUtx94FZ5VBC3e fNyMOspZBUt/jvmUaGCBXpAH2t/dXo/4B8VQP7vq4YHvnD5pAH8rf5KO7SlwAHW9Hrgnfd dthGCNzhs42rOf/u/LaEiA3lld44gW7zNhvfu+D013Msikw+KxNS2qIyMy0+1dc217XFXY 5ItNrCKW/aveMe9SjuZ4ykEQBjcVRWtwxSWk0McsO/gqlDetzTXS3KevTTRQow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0N4TxKznDg for ; Sun, 28 Jun 2026 00:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f122 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 23ebf0c97ac5 - stable/14 - kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23ebf0c97ac5fcd6adb6cda8a8707b99257721a6 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:12 +0000 Message-Id: <6a406b14.3f122.509aa70d@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=23ebf0c97ac5fcd6adb6cda8a8707b99257721a6 commit 23ebf0c97ac5fcd6adb6cda8a8707b99257721a6 Author: Konstantin Belousov AuthorDate: 2026-06-15 13:32:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:02 +0000 kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace (cherry picked from commit 6a572920f251ac8ac6a80a55d4d039736ea7dd65) --- sys/kern/kern_procctl.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 23b3403fec4f..bdcb4d544cc6 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -872,37 +873,41 @@ wxmap_ctl(struct thread *td, struct proc *p, void *data) { struct vmspace *vm; vm_map_t map; - int state; + int error, state; PROC_LOCK_ASSERT(p, MA_OWNED); if ((p->p_flag & P_WEXIT) != 0) return (ESRCH); state = *(int *)data; + error = 0; switch (state) { case PROC_WX_MAPPINGS_PERMIT: - p->p_flag2 |= P2_WXORX_DISABLE; - _PHOLD(p); PROC_UNLOCK(p); - vm = vmspace_acquire_ref(p); - if (vm != NULL) { + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_DEBUG, &vm); + if (error == 0) { map = &vm->vm_map; vm_map_lock(map); map->flags &= ~MAP_WXORX; vm_map_unlock(map); - vmspace_free(vm); + PROC_LOCK(p); + p->p_flag2 |= P2_WXORX_DISABLE; + PROC_UNLOCK(p); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_DEBUG, vm); } PROC_LOCK(p); - _PRELE(p); break; case PROC_WX_MAPPINGS_DISALLOW_EXEC: p->p_flag2 |= P2_WXORX_ENABLE_EXEC; break; default: - return (EINVAL); + error = EINVAL; + break; } - return (0); + return (error); } static int From nobody Sun Jun 28 00:30:13 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 4gnr0Q0gdVz6jDZ6 for ; Sun, 28 Jun 2026 00:30:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0P5zGPz3dVm for ; Sun, 28 Jun 2026 00:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606613; 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=BwxZtNFWeCp4zBnTeTXQSQBEB5UumC7E5z+X/JiVIDs=; b=QNMoi5dutiS+dgq8XvCnNT1s67h3Dx07ayDJjyO9FhrAsp9AMoy87zCox8x1wYehYmtwKJ +EDDriSxsUzhbTp7MEQqR3d9dFiWfx3pFgMi5TfyuZDM8M1y1D+IyN8lrWRUFf77oZMGtH dZopfN8FCQIOC1rPtLX/lX4RDuVRfshDiKibyVJyRrN6Ee/ReoMuetprM0V2TolMNdu3WE OwPprPpwVaxad2wkP7VFLoIkDiK4j8rn9WucBzNNTxdhJD2p2tl37Yt1OxXmRiIp8BUE6w bc+vuNBo3vflJAtCmRy/PIeBS0YGGjuKnRCUMrv+SLTxLENYF72aG4lxgxFTOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606613; a=rsa-sha256; cv=none; b=iCq68pIkccSYWPjYN13gD4v/XSfeGKtSSET9NR7nz140AYgReZ4Bt25k+khsQf1Oi6t/KS QkvSAs4x2exgReduGOcYSdF2Ky4KWkjOfd9oepV+Y+gaCJB55cSButBqgurk34CVzjAVkV qQWb1cvHme5Yuf74++7xPQRQMU5Hvn5s/iIN6bOdlsj4c1dlR7vBNLsW/vSvUpHLOhZE2C 0zK8aRVANS2OY0c2qU6bE7sS9xGwzO2X79uv575IfngTtSwEbXdIBDUTd1flNSs78JqySH fVepswpmyDnmCeqYwZ6Rzf5uocQvWxvmVyK+Ulc9fe/m1P9NqZVw8AOXE+tVig== 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=1782606613; 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=BwxZtNFWeCp4zBnTeTXQSQBEB5UumC7E5z+X/JiVIDs=; b=rIBFC4H0gOCxDixHfA+LCoZ65tm4f+VPL3RqET8rxUmrEZtKiqSGFfGEpVyN7YW8cal2ig Op44pvUAVX2KU/UTnmtemvW0aXbNLSEmPldrxx4BnfGLURi/LCWRvPsF2vp5G0UjqoNi9v AwU+Bxf+rsVjbKXTs7BblT82V2w+36K6O3MoWJ9ct//u/dd76wBVGglOhtYFmTJnjtgy0b i1hRREapZGcuQJGjS9jaxBQtIOi+mOWQF7E7vCY8sn5yeQtBPtjnI7aE9lrAta/Ia8h3rU gSda/F33n/dUV/Yyl6B1En1Qzm67B6XunaQQEpltwK6uoZb0excqnjaku1RRWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0P4xQ4znGr for ; Sun, 28 Jun 2026 00:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e3fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a11c4f036c11 - stable/14 - linux_prlimit(): block execve for the target 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a11c4f036c1136ba90fbfda5d2025d18116562d8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:13 +0000 Message-Id: <6a406b15.3e3fb.25d70b3b@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a11c4f036c1136ba90fbfda5d2025d18116562d8 commit a11c4f036c1136ba90fbfda5d2025d18116562d8 Author: Konstantin Belousov AuthorDate: 2026-06-07 19:21:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:02 +0000 linux_prlimit(): block execve for the target (cherry picked from commit e41c28e67fac9cd22a85b160c5c9d0477ed03600) --- sys/compat/linux/linux_misc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 00ab48e8781b..008f695de36b 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2007,6 +2007,7 @@ linux_prlimit64(struct thread *td, struct linux_prlimit64_args *args) u_int which; int flags; int error; + bool exec_blocked; if (args->new == NULL && args->old != NULL) { if (linux_get_dummy_limit(args->resource, &rlim)) { @@ -2034,6 +2035,7 @@ linux_prlimit64(struct thread *td, struct linux_prlimit64_args *args) return (error); } + exec_blocked = false; flags = PGET_HOLD | PGET_NOTWEXIT; if (args->new != NULL) flags |= PGET_CANDEBUG; @@ -2046,6 +2048,14 @@ linux_prlimit64(struct thread *td, struct linux_prlimit64_args *args) error = pget(args->pid, flags, &p); if (error != 0) return (error); + exec_blocked = true; + PROC_LOCK(p); + execve_block_wait(td, p); + error = args->new != NULL ? p_candebug(td, p) : + p_cansee(td, p); + PROC_UNLOCK(p); + if (error != 0) + goto out; } if (args->old != NULL) { PROC_LOCK(p); @@ -2068,6 +2078,11 @@ linux_prlimit64(struct thread *td, struct linux_prlimit64_args *args) error = kern_proc_setrlimit(td, p, which, &nrlim); out: + if (exec_blocked) { + PROC_LOCK(p); + execve_unblock(td, p); + PROC_UNLOCK(p); + } PRELE(p); return (error); } From nobody Sun Jun 28 00:30:14 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 4gnr0R2DX4z6jDMq for ; Sun, 28 Jun 2026 00:30:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0Q6hXVz3dNv for ; Sun, 28 Jun 2026 00:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606615; 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=swXsb4vwqw29YiD400gyNyQEith+iAmr21+8m5pIqCo=; b=PUKTGBqv9ehbPil94pDuwBRrt/MRJOzda9UcOGpy5WHGIVjloTm1bzBRiIxlFUp01EKCpg 5uPNV04ukmftp/ydIDVzCIrtPPaDNNCRQQFSdZj4J9QQ6nkLAlKZRhP2jH/z/s87Wph51X LuFmKWPqDckTMipG706mdL5EJ6lo3oqqowUlW7+ZykbiT9sygsRmjbDnjZ0zZH0KXRlkD7 tiIdshDwLPbFITuoLnlP0N2+tVAojTzFc/4XuBMyRgaNtTZwIoKneEIZGVB3AUc0C9IWfA TnBYDyHHtnAg1kuJqufwG1sxQY1cSOJOd+xZg1/bAuucXCVyQIJCOWnCl/1ODA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606615; a=rsa-sha256; cv=none; b=LeU122whndHdAk8+v2ZnWqtchQhheLN9ZEKocQU6VoKgHQVdF7SjaAvC1x1d/pqtgUvkNu Kc0Z1Duvy4AbVRZb9bIjhiTpTCyYxuNJLt+gWV5i2FogXBsyrBf6jk9FkGQzebvL98+CEj pX54ffL9S29gFcEtT5LAielkckkqahYFrhVT3zHVAbADHjAPSWjkUD9X2SoJtWDsOlRODF fuMEBivUDDTAclJQ8z+wWF6xt9Hk1oUf2pO8qhfU+osDUzQsdfhV4ZrjTHwix5/Pk+M4Iz 8LCo6Zuh1aGYH9j0UHensbk61F2yWKgKCRdko4RUlu9HluahsDc+Wwoz6Upi2A== 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=1782606615; 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=swXsb4vwqw29YiD400gyNyQEith+iAmr21+8m5pIqCo=; b=vag+OdYjRR+x8JhJM9mc8ZIN4iFbmVZZmvfJKbpT/b+O7gEwPdw9ewlOzIKQlOsLViXvSJ hHl9XO4EVwmaJ0MjptQTg+aBI3c8SJNqRSHghlZr4egzxfnDSnU+D6td3t4EmYfwwamqrY IzBw5QyEWYDve7nUMbtc2rQvkIO+eH8v6+VBnBQO+Hqp+7W8ZxRdn/ai5aKs7t0O3uRXJB rFyQTQKb4Pc4yuHkR8Gf/xbXpK57SvfI7B9xFhAYFKcOTQTglxqZQUqjIFLlQN35dbUw5a QzZStVZmgyBwszT6WoXzybVQh7D/q1N8lco3MpOlilN4QZ5fdY+Z5l9FAHLUhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0Q5HpXzmq4 for ; Sun, 28 Jun 2026 00:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f189 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: caa2e5cf7cfb - stable/14 - pfs_readdir(): block the target process from execing 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: caa2e5cf7cfb07c115d143023ffb21546a60556a Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:14 +0000 Message-Id: <6a406b16.3f189.1aec936d@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=caa2e5cf7cfb07c115d143023ffb21546a60556a commit caa2e5cf7cfb07c115d143023ffb21546a60556a Author: Konstantin Belousov AuthorDate: 2026-06-07 19:32:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:02 +0000 pfs_readdir(): block the target process from execing (cherry picked from commit 4c0a0909f928baac982b7de4bfa5b5ca7de5291a) --- sys/fs/pseudofs/pseudofs_vnops.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 8cd092118d0e..6850c3683a2d 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -132,6 +133,7 @@ static int pfs_lookup_proc(pid_t pid, struct proc **p) { struct proc *proc; + struct thread *td; proc = pfind(pid); if (proc == NULL) @@ -141,8 +143,10 @@ pfs_lookup_proc(pid_t pid, struct proc **p) return (0); } _PHOLD(proc); - PROC_UNLOCK(proc); + td = curthread; + execve_block_wait(td, proc); *p = proc; + PROC_UNLOCK(proc); return (1); } @@ -846,6 +850,7 @@ pfs_readdir(struct vop_readdir_args *va) struct pfs_node *pd = pvd->pvd_pn; pid_t pid = pvd->pvd_pid; struct proc *p, *proc; + struct thread *td; struct pfs_node *pn; struct uio *uio; struct pfsentry *pfsent, *pfsent2; @@ -891,11 +896,13 @@ pfs_readdir(struct vop_readdir_args *va) KASSERT(pid == NO_PID || proc != NULL, ("%s(): no process for pid %lu", __func__, (unsigned long)pid)); + td = curthread; if (pid != NO_PID) { PROC_LOCK(proc); /* check if the directory is visible to the caller */ if (!pfs_visible_proc(curthread, pd, proc)) { + execve_unblock(td, proc); _PRELE(proc); PROC_UNLOCK(proc); pfs_unlock(pd); @@ -955,6 +962,7 @@ pfs_readdir(struct vop_readdir_args *va) resid -= PFS_DELEN; } if (proc != NULL) { + execve_unblock(td, proc); _PRELE(proc); PROC_UNLOCK(proc); } From nobody Sun Jun 28 00:30:15 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 4gnr0S3cRSz6jDZG for ; Sun, 28 Jun 2026 00:30:16 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0R6pWXz3dSx for ; Sun, 28 Jun 2026 00:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606616; 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=WuqEVqk1bYHzysfAzK4djt/n1gGDAwYYmrtLbt/CLTc=; b=lNK06XxsrEME0dH85xSarh6XyxZ2U/AwrocJ4SVs4QIagTiFtXfR6GoDhPWhmgeNxOf5pq 9OruJ3NPpueojnIIonYEsoJ6mICzhPqvrOfgnp06AhfaTQ01A8xO5NAJaBdu7k2GYb0Fsz GHrVn7WLSJ0456Ks0Y1EU7uJcgmiFfvtqYA3ibTzwUrD6AgAx1V1mFsPb+WWzkBqXDoxFF qdBq90aezCiyoQKNXDw0ebQ5Xr+QlZdTi0WxzhL5g8waCG2E/02dW5jog8Xe2YojflvQpB nUGRQKV6miAMbhoBWtN3O+NLmjfGjpcQp9jpCxkyofAePqNWPpub1JJqeHzfMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606616; a=rsa-sha256; cv=none; b=LB3cNZxrwdS79EWdKGrLHoA5T5z2IkO9l1p/CMNYExZV6WyKgOLypuAJdzEk09ryWrSCLY 7ovyPLOKpBRmWBVm9mNYvSlZGuWhsinnQZTO7BA4+xRYWpqbGI51XD67Jxp7f4tY/TkT5n tWfLEw85NIK6+XGMqtmjJPLMsNYX3uL6OWSdlWXSWJMl2VrGB+sVqxUlNU2zpJyQd1N3st PSEu5tO0Ari1m15H7SLXvRIbp/VsL75J036bh7SKVFCZURckSAI+37+sVSpiBB0rDyaJai kUS38cN9kWHFlJLfclQRPYSbZFVhtNlQkDCrHg/IbNdqf5r7OFS6ubYoBiXRzA== 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=1782606616; 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=WuqEVqk1bYHzysfAzK4djt/n1gGDAwYYmrtLbt/CLTc=; b=W46QWnbMMCW83bNCpYFVdX1GgL3qE59TYOlea9xp2StQImJv4RmJloBYuqUmcSwm5ndSwA iegD1RZnVOl+STF6APk4fGrKRjoU9Irf9QM7RUPpCxzEhh1J9Qerw91fiGBVJyh9SVG3vm 7eOjSzO4/RdjOesEviJBT0VuhJDcN7MtoKUai/12lchRUTQzq3AD8JZTj8TD4fc6khInk3 dl0o3TEboGBHsVR+ju90WaQYfR+TbFwqQK4Nb2LFofDwfJWSmVd60/WPJUo1Yc/AHNtazR BoMafdYR4U/524OcNafC7E1+XNyYwzO0u3YJTcDjLMPa3gSKFFoSw1bfqrCQ+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0R5jnqzmq5 for ; Sun, 28 Jun 2026 00:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f325 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ec0d7d01d6c4 - stable/14 - pseudofs: ensure that the target process vmspace is stable for VOP_READ/WRITE 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ec0d7d01d6c45eff4043cf178addf65d1933d62a Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:15 +0000 Message-Id: <6a406b17.3f325.6bb8dde6@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ec0d7d01d6c45eff4043cf178addf65d1933d62a commit ec0d7d01d6c45eff4043cf178addf65d1933d62a Author: Konstantin Belousov AuthorDate: 2026-06-07 19:39:42 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:03 +0000 pseudofs: ensure that the target process vmspace is stable for VOP_READ/WRITE (cherry picked from commit a4993bac41350e85bc9affb862d2974a1a09bb5e) --- sys/fs/pseudofs/pseudofs_vnops.c | 59 ++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 6850c3683a2d..059e8fd0e8b2 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -676,6 +676,7 @@ pfs_read(struct vop_read_args *va) struct pfs_node *pn = pvd->pvd_pn; struct uio *uio = va->a_uio; struct proc *proc; + struct thread *td; struct sbuf *sb = NULL; int error, locked; off_t buflen, buflim; @@ -694,21 +695,30 @@ pfs_read(struct vop_read_args *va) if (pn->pn_fill == NULL) PFS_RETURN (EIO); + td = curthread; + /* * This is necessary because either process' privileges may * have changed since the open() call. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) + if (!pfs_visible(td, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); - if (proc != NULL) { - _PHOLD(proc); - PROC_UNLOCK(proc); - } vhold(vn); locked = VOP_ISLOCKED(vn); VOP_UNLOCK(vn); + if (proc != NULL) { + _PHOLD(proc); + execve_block_wait(td, proc); + if (!pfs_visible_proc(td, pn, proc)) { + PROC_UNLOCK(proc); + error = EIO; + goto ret; + } + PROC_UNLOCK(proc); + } + if (pn->pn_flags & PFS_RAWRD) { PFS_TRACE(("%zd resid", uio->uio_resid)); error = pn_fill(curthread, proc, pn, NULL, uio); @@ -778,8 +788,12 @@ pfs_read(struct vop_read_args *va) ret: vn_lock(vn, locked | LK_RETRY); vdrop(vn); - if (proc != NULL) - PRELE(proc); + if (proc != NULL) { + PROC_LOCK(proc); + execve_unblock(td, proc); + _PRELE(proc); + PROC_UNLOCK(proc); + } PFS_RETURN (error); } @@ -1087,6 +1101,7 @@ pfs_write(struct vop_write_args *va) struct pfs_node *pn = pvd->pvd_pn; struct uio *uio = va->a_uio; struct proc *proc; + struct thread *td; struct sbuf sb; int error; @@ -1106,36 +1121,44 @@ pfs_write(struct vop_write_args *va) if (uio->uio_resid > PFS_MAXBUFSIZ) PFS_RETURN (EIO); + td = curthread; + /* * This is necessary because either process' privileges may * have changed since the open() call. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) + if (!pfs_visible(td, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); if (proc != NULL) { _PHOLD(proc); + execve_block_wait(td, proc); + if (!pfs_visible_proc(td, pn, proc)) { + PROC_UNLOCK(proc); + error = EIO; + goto out; + } PROC_UNLOCK(proc); } if (pn->pn_flags & PFS_RAWWR) { error = pn_fill(curthread, proc, pn, NULL, uio); - if (proc != NULL) - PRELE(proc); - PFS_RETURN (error); + goto out; } sbuf_uionew(&sb, uio, &error); - if (error) { - if (proc != NULL) - PRELE(proc); - PFS_RETURN (error); - } + if (error != 0) + goto out; error = pn_fill(curthread, proc, pn, &sb, uio); sbuf_delete(&sb); - if (proc != NULL) - PRELE(proc); +out: + if (proc != NULL) { + PROC_LOCK(proc); + execve_unblock(td, proc); + _PRELE(proc); + PROC_UNLOCK(proc); + } PFS_RETURN (error); } From nobody Sun Jun 28 00:30:16 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 4gnr0T55Kfz6jDXF for ; Sun, 28 Jun 2026 00:30:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0S75dxz3dfX for ; Sun, 28 Jun 2026 00:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606617; 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=8jIXvlEDaw9psJ5GmqijAXfIf6zssxnS3N3BS5jrAhA=; b=WDM0t5jRS/6aljpHb7a/AzVbdU1WzybWf8l3fg8y483GcQUlJeBFpFuN6TD77xgVgrUNwa 8T0l2Bn/2o55n/f9ThZvST/DnXZgSB3+ieu3Rf2ntuGRNv2z8fTyvzauoCcNQgw6xypMbD 55KWSp3L2cM5QSwPHZ6OWBLPv8TBn7Vy7cuzPQBRpqt+4xeiqEaaTcvhVIwaVjMguLEjye 4uxglcuhTzZZUaqHFKD/3/nbX91EbPbjOAYqSCEQsB/FqaZswyP5oMa/nLuDs3OH2AkLyp cr1Jy9DT8ReTqkoY+p4qAyg3qeicxw3ytRwDG64k6n5s66qt6SoQxhNL15G45w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606617; a=rsa-sha256; cv=none; b=UtebBMDiLS8P0TsK+FYrCzopzQlcaIMaMz4pVFkNt9dX9M3tp4KXVPtz+2vO7PVDICFuES UIjDJl3qpVbl5OZYRacGI2GJDZ6wfRSNAZ3REhzC4j9heAokemJRahleqhjMJvt6wXrXTo OnoN6sEWkfLBl3/sgkOUoDeed1lJ4PdH+cgdUMaB+wweJzqxjn1zz6LaycbIez4G9KODdN F8HqqlHw+cx66NHSM8jncm4Lr/m4UXD3OvxSvJh1jG3UbYEn8nejGM775ThfTMwPsuaKsS 2PQqngyTmhl29Shjh4XrGDhYMPk8kymnkxdRWf4IWz7bPv6XSMJyC+8mphhcfw== 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=1782606617; 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=8jIXvlEDaw9psJ5GmqijAXfIf6zssxnS3N3BS5jrAhA=; b=cmfhk33aBPjRNxGKlhQ0AO11KntIu3MP0iK1gPJgxHdnje0q0FrBCkwkF9wUhn9qu3d6T4 uq8r8Lmq+7LhPVFuByFGsjPIpVbdeg4HgP1iEuU/9rVPtxS4YC5OdvI1APurU4XzKCdbQw 5FKfybxQPFrbJ7/OKb80+sPPUGbjqDOZIrBiBEFNfJa+0u0zYNp4hOrfpdDeNsaUrXGJ9q R6rqiIlT0xE6vFx4WFwLvvmGYIl2G/CKaW8iCj7eteacOPzII1x8+rRm3u78yXPAKb5Av+ rw9tL1s5zZ2Axvmh0BOvGUCKR8408YAvMPWyLm9xLYzoIdCuNZz91hL6j63yZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0S68dzzmgK for ; Sun, 28 Jun 2026 00:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d7d5337291c9 - stable/14 - procfs, linprocfs: ensure target process vmspace stability 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d7d5337291c983ba969e24c95df0bcab46b44621 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:16 +0000 Message-Id: <6a406b18.3e9fd.7ce9870c@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d7d5337291c983ba969e24c95df0bcab46b44621 commit d7d5337291c983ba969e24c95df0bcab46b44621 Author: Konstantin Belousov AuthorDate: 2026-06-07 18:48:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:04 +0000 procfs, linprocfs: ensure target process vmspace stability (cherry picked from commit 5db31f1b47b586a5091eb41fc957236f28b78dba) --- sys/compat/linprocfs/linprocfs.c | 16 +++++----------- sys/fs/procfs/procfs_map.c | 17 +++++++---------- sys/fs/procfs/procfs_mem.c | 6 +----- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 1171e2c98342..f2dd38576205 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1313,19 +1313,13 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) struct vattr vat; bool private; - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error) - return (error); - if (uio->uio_rw != UIO_READ) return (EOPNOTSUPP); - error = 0; - vm = vmspace_acquire_ref(p); - if (vm == NULL) - return (ESRCH); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, + &vm); + if (error != 0) + return (error); if (SV_CURPROC_FLAG(SV_LP64)) l_map_str = l64_map_str; @@ -1423,7 +1417,7 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG | PRVM_BLOCK_EXEC, vm); return (error); } diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index db6b225f6426..5ccef979856b 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/sys/fs/procfs/procfs_map.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -95,15 +96,14 @@ procfs_doprocmap(PFS_FILL_ARGS) bool wrap32; #endif - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error) - return (error); - if (uio->uio_rw != UIO_READ) return (EOPNOTSUPP); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, + &vm); + if (error != 0) + return (error); + #ifdef COMPAT_FREEBSD32 wrap32 = false; if (SV_CURPROC_FLAG(SV_ILP32)) { @@ -113,9 +113,6 @@ procfs_doprocmap(PFS_FILL_ARGS) } #endif - vm = vmspace_acquire_ref(p); - if (vm == NULL) - return (ESRCH); map = &vm->vm_map; vm_map_lock_read(map); VM_MAP_ENTRY_FOREACH(entry, map) { @@ -240,6 +237,6 @@ procfs_doprocmap(PFS_FILL_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, vm); return (error); } diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 50db7d3a0b96..5fc0c1acf140 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -61,11 +61,7 @@ procfs_doprocmem(PFS_FILL_ARGS) if (uio->uio_resid == 0) return (0); - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error == 0) - error = proc_rwmem(p, uio, 0); + error = proc_rwmem(p, uio, PRVM_CHECK_DEBUG | PRVM_BLOCK_EXEC); return (error); } From nobody Sun Jun 28 00:30:18 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 4gnr0W5Bygz6jDZV for ; Sun, 28 Jun 2026 00:30:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0W1NPqz3dYk for ; Sun, 28 Jun 2026 00:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606619; 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=Min/D6RgJ3Q5E+T+3XoGBwWf5WyNh9sjYCeCLRplEaU=; b=SL5p7C4BGkFm6KsVIMp9Dhgsk8ygLQ/D7eFoAn7MCVC1J7VjDqKksdTxRsDlmQs8UWztnG 2+Jkxp9SCv6ZUbTMo45z2vcV/V0UfVX6pt2sNvvah9Gt2o3J844U0Wwbn3FTSffSbVokcC RIWY4a/O1xrdMMUJ3Qt+sWocxkXH90iORBXgHkUV6kJNhhCw1sckfXRRIuFzeSK/pC92Ic J+iqBIvfbbSNuINqcdnOW2220Pz8IyUqwotgCH9tUZOSYHhEvNurYiX0sSb43tIa1U4yvr JurGrCdbMLWib2EFl/CrYNQpFnkZncBYSy1awJuQ9NH3Q8zjV8TWCTaE3M39fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606619; a=rsa-sha256; cv=none; b=DvDxceL/Lq2y9rK7ifuWJxj60BklwHFJTOOqaQm6CzgAb7Ju8rj3oFZRzbwKOe5Setl955 DnqtNxbdfC9yutrTIIaZmfyI7f2xpB1vmMuqCHoEXjFET2NWb7+Iy6sp23987V3X89OHNx aij4nbJMYbKwYkNagC+WOpUGYNCNeI2dHAFJmeCnpPlO47gftAfyYEqbJUHlW2WKKShTwF tcACM/lbytJVp+jT5He0r2RJgLhLfJe22F0/hAG6gif/AuGZE0OyxdTsTyunaBzVg0pnHc Hj5H9FwIjWFrFEFZVLogLC2Fr2sLC5LhD4edceqkM89DUapngWCQwDgvly4lAw== 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=1782606619; 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=Min/D6RgJ3Q5E+T+3XoGBwWf5WyNh9sjYCeCLRplEaU=; b=J4AhE6oj4ooTHUq/xW9cOjAKUtEbXciZkjaP4netGCDfLiB9SGM6IF6W45pqFndqt6o4DV Hu7dW78X1lbkTGF2zCp/CRrF3SifIxrEdTbxyHYlWTt73p/zlEi0tlP/l+q2oy2tGQOr+x 392uA3ce3Tg+EH01lOWQEnJgvgYGJatdckSmdpsmtqvRso90kSmv+te1ii5aWXrI7X6Iv9 hVcucnoXobknW49RgG09SCxMLMEFvgxuDnOtWSL3t8ia2yLBEmqKBy+fgbqFr5OZV3Y9n0 jPSHzgiRHayv0v8jO1/VJPsXmtB14OvEWMfvzyk5l4PiQPIj91xc2t6HBD6Hog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0V73ylzmK7 for ; Sun, 28 Jun 2026 00:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f702 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bb1154f3ea20 - stable/14 - kern_exec.c: explicitly include sys/limits.h for UINT_MAX 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb1154f3ea20291b0c02821743084a6f1a7dd844 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:18 +0000 Message-Id: <6a406b1a.3f702.326507a7@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bb1154f3ea20291b0c02821743084a6f1a7dd844 commit bb1154f3ea20291b0c02821743084a6f1a7dd844 Author: Konstantin Belousov AuthorDate: 2026-06-21 14:17:41 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:05 +0000 kern_exec.c: explicitly include sys/limits.h for UINT_MAX (cherry picked from commit f5fce0bcc370a9700249e64901eabf2e0be4ecb0) --- sys/kern/kern_exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 4461b9e4dc11..3cedf7ee36f5 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_capsicum.h" #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" @@ -45,6 +44,7 @@ #include #include #include +#include #include #include #include From nobody Sun Jun 28 00:30:17 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 4gnr0V2Xxcz6jDD9 for ; Sun, 28 Jun 2026 00:30:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnr0V0hBMz3dWn for ; Sun, 28 Jun 2026 00:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606618; 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=HJKZJfeIgK+rZcwyRImwaLrj5sOlTKOiIgpNDlRCPoE=; b=aM9QrmbUb5s90XmloPrQH1sPoAyNDpupbnf4Xamm2xR0AFKfrpkptPY/tTi6fFXuHk4asS 7ZiNDXAHlRyqT66ShSZxj5HYoU3+BOB/nkrXSl8S36iJyT2FGnG7NovAlUm5+MCejcLvRa 197VFvx6qrYlqxYVhkwGPqLLqZEEbs4M0jbqIXtwhg1xTEHfRn0m/Lf5XbC0UzcF/hNBgg wFyyU6/Q53fG7wMxVZtJ++0QJEpEkT+qnKAVag0YsS0UbGRfE1XQDaGpoXysREguYI5V+T ITYDLNlOy2AKsCb94m0fJOgMDJpOTTu84tHGq2QY/fftwk2U3+wFqigCVFl7bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606618; a=rsa-sha256; cv=none; b=Mpblu6P9n/dtSZ3FvrG2W4gwxY9DuLw7qAJx6hwjiIw0Yc9oiahBD0iWlp073JLTniOALP OQOV2IfvMvGdvLvlssf4mNdCWEjuAVjY1KMwjTWAOE3pH7Bh76vNrG/mdvARml0bUCYfet g3D7fWvGg099jbp0c61etAvfLZAW0af+Hbns7AXcbLmd20+KO6LRgsIX+YjJ5KJpZswYS2 vAEQbkmXgowz3rLZS3ICVuqaOvo9Io6Tzp1P7a0y/axdICn+koNcunjCUXRHVCk2U3kUSw JI5O/yvvtJdXY+xV3lS7rLytsNh1okTfraRQSs8HJKiOIdGKPTsTCx+QnSuL4Q== 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=1782606618; 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=HJKZJfeIgK+rZcwyRImwaLrj5sOlTKOiIgpNDlRCPoE=; b=krgdhuNhzZH7fky//cYnKCTy0mNwmaEIASQg4i6nKgJXtnaLrdNetkNYqTi1tXzJAoqA/K jA6LyhKSTbR5YjJYM3W5z5wFapdFp7epOFvAZgRKYBlH1ubL4+jtaDXPo5dTizz/wLmxD7 ySdauvIx3z7pun09OVkATfzS1RTeT2bqpINaz46tXhdvZj8vQpOzYbsZsbBgPV3WLpcPjI c40QwO0rsv8KOIXVTF4fpbVKh0Q3Vi/fcFQFnkWQXoOiSoitu3Jc96N353aOROgSHHREC4 AQVH3t2R+6mksiXkWGvxXUUe2aF/QrDKnMdleWV0Meu1EPJBYlnKEotJnAOmWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0T6hWlzn3W for ; Sun, 28 Jun 2026 00:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e7f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 34b95f53e7ac - stable/14 - sys_set*id(9): wait for the execblocks to pass 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34b95f53e7ac3a055b3d866d101a79e85d0022c4 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:17 +0000 Message-Id: <6a406b19.3e7f7.1f1192c0@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=34b95f53e7ac3a055b3d866d101a79e85d0022c4 commit 34b95f53e7ac3a055b3d866d101a79e85d0022c4 Author: Konstantin Belousov AuthorDate: 2026-06-17 19:07:22 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:04 +0000 sys_set*id(9): wait for the execblocks to pass (cherry picked from commit d0384f50dad25d3358d76f7556969ea1d515ba68) --- sys/kern/kern_prot.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index d6f8faf23814..8b5e06820b2c 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -1010,6 +1011,8 @@ sys_seteuid(struct thread *td, struct seteuid_args *uap) newcred = crget(); euip = uifind(euid); PROC_LOCK(p); + execve_block_pass(td); + /* * Copy credentials so other references do not see our changes. */ @@ -1064,6 +1067,7 @@ sys_setgid(struct thread *td, struct setgid_args *uap) AUDIT_ARG_GID(gid); newcred = crget(); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1162,6 +1166,7 @@ sys_setegid(struct thread *td, struct setegid_args *uap) AUDIT_ARG_EGID(egid); newcred = crget(); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1257,6 +1262,7 @@ kern_setgroups(struct thread *td, int *ngrpp, gid_t *groups) if (ngrp != 0) crextend(newcred, ngrp); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1319,6 +1325,7 @@ sys_setreuid(struct thread *td, struct setreuid_args *uap) euip = uifind(euid); ruip = uifind(ruid); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1398,6 +1405,7 @@ sys_setregid(struct thread *td, struct setregid_args *uap) AUDIT_ARG_RGID(rgid); newcred = crget(); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1468,6 +1476,7 @@ sys_setresuid(struct thread *td, struct setresuid_args *uap) euip = uifind(euid); ruip = uifind(ruid); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC @@ -1559,6 +1568,7 @@ sys_setresgid(struct thread *td, struct setresgid_args *uap) AUDIT_ARG_SGID(sgid); newcred = crget(); PROC_LOCK(p); + execve_block_pass(td); oldcred = crcopysafe(p, newcred); #ifdef MAC From nobody Sun Jun 28 00:44:13 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 4gnrJY6v78z6jF84 for ; Sun, 28 Jun 2026 00:44:13 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnrJY3mktz3lLJ for ; Sun, 28 Jun 2026 00:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782607453; 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=lsI/xkKNU81AVctyhRBoWOVPMONrwCfOg+Wydsd+MEc=; b=r7++OaB/5eXjGPZL0Utud/LzhsvoePezcwJHrfunhz/Fx8GyxRC1DHJcXqvQH0vjrf9dzq s/UHNgMIopDykXYVjGMwjRCsTHugH7dpVDx+aSrsd4iXVl0+XmRiaV7IZGKOgjUCsv92st EHeTKtqi72UtXZVRxXjkfgzqRzgpxfXSepgN26BwxNhROTUEm6tGcslZgPkI2bXDcf+9o/ fem62O2P8QL/rGGhEvXHTfr865/PBJNFAcd37uCmObA+rLyfXqMz1JS/WKMyLBkntnOqSI UpjmTR0TQJYsasurnnMxZku8erYsqXsfxWpDh2B10/Xe2+xM1zTIroM6ik7fnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782607453; a=rsa-sha256; cv=none; b=PEsyPsA/9AijfwGBk4/Hg8VahSnabSGXE9ylWEuuODWn0zqNGe3pKA+swu3+sLC4Lh54FW 28seDPSHYBPO9y9iq7D1VQ4LVUJN7SdCLJZcGr0IQHDbbAWEBSzA1wthW4rmzlNSuH0p+Z WcQJEosYpKsAr4aFDFlhf+obNiGBkM6ZB+ukLU3Bq5gh4jpKwOSuU3l4pu7uW4//AC+oCf 35Q7WswdrP6fW9KGqb9heZAIS4AHO4FpSYOqZvzXdpeM5XTVikp4PEw2OI2azQHctBvQxk CjSMONCk2UaiQNeAgO4k42oKPnteYKBZXcy08fQqznNPwqK0m18J8PQww7Mtww== 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=1782607453; 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=lsI/xkKNU81AVctyhRBoWOVPMONrwCfOg+Wydsd+MEc=; b=UBdPJ9NKgD4cgUBocro5a++uQr39pD0zNpzCShgAPFkYe8oS7rkK7g6qA6+n5n/0m8wCwl 9ATsZaOLrcbdn+PZvHbeK/VFkf/+UqxNL2wkHlDfYHwdphaeG6eCVYuIE8Mo5xmNUNzzMl /0GvS/8VV6mHVHI4O3jB9yzSjN+DnHdhwvGrzxaiV+ha/HhsbFALG5bu1izH53t1liEOMe X0OWNbJBdXqv2FVmfVRdRxM5boR0ZaobVICMLrxTM4JLO6vDi0QrJa9IDQrbqeHqfAHaK+ jCxIR2kILAXxUScecpobnXtHE1w5+uKGZTRp16H9Q0iBAaClfr36tjdaIstNPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnrJY2599zmDv for ; Sun, 28 Jun 2026 00:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f1c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:44:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 4016f9d5fedd - stable/15 - mdoc.7: Revert upstream changes to Lb/LIBRARY 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4016f9d5feddfb13bcb8cbf6a70378e4d0cb6049 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:44:13 +0000 Message-Id: <6a406e5d.3f1c1.a1ca438@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=4016f9d5feddfb13bcb8cbf6a70378e4d0cb6049 commit 4016f9d5feddfb13bcb8cbf6a70378e4d0cb6049 Author: Alexander Ziaee AuthorDate: 2026-05-22 18:09:23 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-28 00:36:10 +0000 mdoc.7: Revert upstream changes to Lb/LIBRARY Since this manual describes the mdoc syntax throughout the ecosystem, I had to blend what we had before with what upstream is doing now. Thanks: adrian MFC after: 3 days (we shipped this doc in 15.0/14.4) Reviewed by: ivy, mhorne, des, adrian Discussed with: arch@ Differential Revision: https://reviews.freebsd.org/D56153 (cherry picked from commit 4e2bf6e90a65bee317e4dd379e098ba2eb5d8c0d) --- contrib/mandoc/mdoc.7 | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/contrib/mandoc/mdoc.7 b/contrib/mandoc/mdoc.7 index 90f5600c59a7..7346cf25da65 100644 --- a/contrib/mandoc/mdoc.7 +++ b/contrib/mandoc/mdoc.7 @@ -196,8 +196,14 @@ and .Ic \&Nd . .It Em LIBRARY The name of the library containing the documented functions. -Using this section is no longer recommended. -If any +The syntax for this is as follows: +.Bd -literal -offset indent +\&.Lb libm +.Ed +.Pp +Using this section is no longer recommended outside +.Fx . +If writing for other operating systems, and any .Ic \&Lb macro is needed, put it at the beginning of the .Em SYNOPSIS @@ -223,7 +229,7 @@ Commands should be ordered alphabetically. .Pp For the second, function calls (sections 2, 3, 9): .Bd -literal -offset indent -\&.Lb libname \e" unless the functions are in libc +\&.Lb libname \e" unless on FreeBSD or the functions are in libc \&.In header.h \&.Vt extern const char *global; \&.Ft char * @@ -1880,7 +1886,30 @@ See also .Tg Lb .It Ic \&Lb Cm lib Ns Ar name Op Cm lib Ns Ar name ... Specify one or more libraries to link against. -Putting this macro at the beginning of the +.Pp +If used in the +.Em LIBRARY +section, the +.Ar name +parameter may be a system library, such as +.Cm z +or +.Cm pam , +in which case a small library description is printed next to the linker +invocation; or a custom library, in which case the library name is +printed in quotes. +This is most commonly used in the +.Em LIBRARY +or +.Em SYNOPSIS +sections, as described in +.Sx MANUAL STRUCTURE. +.Pp +Examples: +.Dl \&.Lb libz +.Dl \&.Lb libmandoc +.Pp +In other operating systems, putting this macro at the beginning of the .Em SYNOPSIS section is recommended, in which case it prints this comment: .D1 /* Fl l Ns Ar name Oo Fl l Ns Ar name ... Oc */ From nobody Sun Jun 28 00:44:14 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 4gnrJb0MKLz6jF85 for ; Sun, 28 Jun 2026 00:44:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnrJZ49F8z3ljP for ; Sun, 28 Jun 2026 00:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782607454; 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=KB/2AMQhNxEt6J18fmT4WZCkQ3k5MbR+K3/xbNqPKRI=; b=MB6x0w6z0xwKJv30e1lx1AsYtm/Y+pDzcdI1pvcHxTg2KYp6beDg1rkpF5ufwvMZ9DtrkN k+a98dRgHIVfc0Ifb9/bsfYDhSPjHyWTFxxiRhLveYUpSsfpegpMYHYfMhwWGI32cItVuY LfDdurWxNMTEPFgCkJnLNIlUYJ+GvbFcc4yowchJHSr1tlbnId8s6gB7H5t8yj8V9tCoWi stgeEpieabEdcX4ZL1r3pkm8LQRzPDlmHbWGlgjJf7aEUeWaK8fG7kiH5WsyxGk7IY2QRN lEjhLg1EwpSlNBocBfIuAUC/bMVR/RGY2SseeWWwUMYQMaln5F8peDOqZOxhww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782607454; a=rsa-sha256; cv=none; b=Lbu0M57ft4YWpsNQgpUtsQBOS7A3Pjyb/aYOkODecSqKRDlj/+8JbGBlWt4BY+AY+C4F3s 4wrZxz/ROFAlyGWijmR/8rnGf34uHbxrcTn2czSHHq7iGLigPFivNN9QTDqQ05766jQeH8 J/0lh2e7WdAGRkEZoKemi4XNkN9E0pHuyzR1yG7lvuG4o/rAVLvp6jsG+rSiW4HDFFuAs0 JURzf3PSOpa4I7u1nRITvdoR64IeUO1zubizfcXRcXzTmkXEt6og6tR9SCh5O5ZbEgeKRH 3sRYJFlEb5vo5jZrRK/pW2e9PxbhxHsWKUo4XaCOTe4oPfgxBo/1dOCG53bAmg== 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=1782607454; 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=KB/2AMQhNxEt6J18fmT4WZCkQ3k5MbR+K3/xbNqPKRI=; b=WRegOsba6EJga7LQE85Spg/zxr1S7a0MJTLyVt2QRAIOCzdSUHyT+eHNpokJdY1PzhAEtg Ufpaei2yLb9kkUjyftav/0JeBMwagpdpEtpgf2GGxfS/EtWnRBhDEekOS5rfmLPBVA4UN7 HoXs8BLHjVJessqCq8j36g/EaGhc6GgQ2jfJOM1LdE/6QY78c0zPEfRJY2ya/Pyg50MBl6 WP8V8at0tGq9DdPyP+aCKXL6zQnOxToUcHg+UQkaVP+3653BM+ZQvGSev+5RWEq8nmetyY G0n/ohBfQRrmTLMICVfFdfvgHUzyJEvEHmYYHVGpj4A2fb9IpyS7SXuw2+R5+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnrJZ2tQvznPB for ; Sun, 28 Jun 2026 00:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 183de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:44:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: c19c83b0c76d - stable/15 - mount_udf.8: Alphabetize and align options 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c19c83b0c76db44c776ada8d16c924fe4c4848c6 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:44:14 +0000 Message-Id: <6a406e5e.183de.720a91bb@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c19c83b0c76db44c776ada8d16c924fe4c4848c6 commit c19c83b0c76db44c776ada8d16c924fe4c4848c6 Author: Alexander Ziaee AuthorDate: 2026-06-08 22:22:32 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-28 00:36:10 +0000 mount_udf.8: Alphabetize and align options While here, remove "The following UDF specific options are available:". It is unused and does not appear to have ever been used. MFC after: 3 days (cherry picked from commit 05f132adc530cd53203b9cd09d7e1b211d2babc4) --- sbin/mount_udf/mount_udf.8 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sbin/mount_udf/mount_udf.8 b/sbin/mount_udf/mount_udf.8 index 505582746550..75882cf6562d 100644 --- a/sbin/mount_udf/mount_udf.8 +++ b/sbin/mount_udf/mount_udf.8 @@ -45,7 +45,11 @@ to the global file system namespace at the location indicated by .Ar node . .Pp The options are as follows: -.Bl -tag -width indent +.Bl -tag -width "-C charset" +.It Fl C Ar charset +Specify local +.Ar charset +to convert Unicode file names. .It Fl o Options are specified with a .Fl o @@ -53,13 +57,8 @@ flag followed by a comma separated string of options. See the .Xr mount 8 man page for possible options and their meanings. -The following UDF specific options are available: .It Fl v Be verbose about mounting the UDF file system. -.It Fl C Ar charset -Specify local -.Ar charset -to convert Unicode file names. .El .Sh SEE ALSO .Xr cdcontrol 1 , From nobody Sun Jun 28 00:44:15 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 4gnrJc1shCz6jF86 for ; Sun, 28 Jun 2026 00:44:16 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnrJb54gkz3lN9 for ; Sun, 28 Jun 2026 00:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782607455; 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=PIvsI4wAZYdsEh+dHr2Yup477Zv0bsh7ipZyOBM6658=; b=ck4kx4r4xbmWNnogxb9uwkBV4CaXPT9edcXWk9YHOyxJRjrQm1qJI1o7EoNiC3EgXLbdSJ nwlOHjCEBBR4XIWl4D62mf2BmnjEUo4oBJ8Kfy+eOjDVIIU8jvkMUvtHsW7qJo20gYUAUG 7e1hax7V62Bw7ocbjVOCYiO4C13CYl8+ynEP7DMzNjaJ2yyRVeWnC3CUie4R8MIU72b4pE AQlEV5QMtEcQVmOv8Soe41aYcSHHOx3BOf4lE3LoZ8N4qQOxLusC3+kTZEHSSNb4Rtk0wi Fz/nwcE+cllGA77nHe7dSr6aCHIdeMLlGmQ78zB+gzdmw2M6to0qFwM5AyCHUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782607455; a=rsa-sha256; cv=none; b=ZU68QEvHEO2SFN6ZGH4lioYNV3PrLXC+JpW7QzUuB1gRiJxbWL8aLg9bGVprFoH8XFrIO/ vRVA56Dy+GeGqbSKORXJ3ob0lek59IXAa3zGU4hpB6sy5WBkAGhQ7KW6gDwxMQvL+vLcfo X9YtTqCpzwrZfRdTeycJMI4BF8vN8+A0EWEQLulv3VTafZfAt7AZJT3a1+b1r+2Aq0JR9y UoUgvb8Q8jWm+O/CdA3VT97W6hbDMqxpemLI99qBLJWkmC7frW44k5TSi2E1KuUAVexBWB azklgHgksg3M3/YE7QTKY5SolozvE0TtffEnFfqq9exRFB/jOVP+CEPIaSNi5Q== 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=1782607455; 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=PIvsI4wAZYdsEh+dHr2Yup477Zv0bsh7ipZyOBM6658=; b=WtjtcplPaKkNkrJUzdusMPWpunCRbtawHPsMpb2rfmEcwGaXhnd03gvrBE5jM9BljKVuPJ 8uTw2MC0/2eyhoKw2Dtr3Mm4JlyvFSQUBrgJx+HkTv0h2u5t8+ln0LlMrusjp95+TSl0Es dOm+lY89iIxNR7GgscjuGXcTg0ncdLB2FJO7ux1cK6fy2ZokIY2t1AM1phfnXF6QlOqmV6 TdpmdFa5wbWd+r9q4LGMuvLTVGHfyiSiXTQCEPrfW2EnhvdEmY/6UrC2Hc0i+VoLAD2cFY wQhTrECfaTZVXqPmdUO93hjlHcLJZlWhCHJMfJZ2+aT2nn1h6H+lC8vOyLszbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnrJb3cj3znGG for ; Sun, 28 Jun 2026 00:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f1c5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:44:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 9e6c043af191 - stable/15 - symlink.7: Clean up markup and tag SPDX 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9e6c043af1910cab8f18350d8be9eea48b64b371 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:44:15 +0000 Message-Id: <6a406e5f.3f1c5.73c03769@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=9e6c043af1910cab8f18350d8be9eea48b64b371 commit 9e6c043af1910cab8f18350d8be9eea48b64b371 Author: Alexander Ziaee AuthorDate: 2026-06-12 15:47:54 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-28 00:36:10 +0000 symlink.7: Clean up markup and tag SPDX Also unwind some parentheticals. MFC after: 3 days (cherry picked from commit e821152cc71dbd09f5bd28be86499165c553f3ae) --- bin/ln/symlink.7 | 92 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 43 deletions(-) diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7 index db251e1d2985..5cb883efed36 100644 --- a/bin/ln/symlink.7 +++ b/bin/ln/symlink.7 @@ -1,4 +1,6 @@ -.\"- +.\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 1992, 1993, 1994 .\" The Regents of the University of California. All rights reserved. .\" @@ -68,9 +70,9 @@ in which case the links are dereferenced until an object that is not a symbolic link is found, a symbolic link which references a file which does not exist is found, or a loop is detected. -(Loop detection is done by placing an upper limit on the number of +Loop detection is done by placing an upper limit on the number of links that may be followed, and an error results if this limit is -exceeded.) +exceeded. .Pp There are four separate areas that need to be discussed. They are as follows: @@ -84,11 +86,11 @@ Mount options to ignore symbolic links. Symbolic links specified as command line arguments to utilities that are not traversing a file tree. .It -Symbolic links encountered by utilities that are traversing a file tree -(either specified on the command line or encountered as part of the -file hierarchy walk). +Symbolic links encountered by utilities that are traversing a file tree, +either specified on the command line or encountered as part of the +file hierarchy walk. .El -.Ss System calls. +.Ss System calls The first area is symbolic links used as file name arguments for system calls. .Pp @@ -182,19 +184,26 @@ system call was added later when the limitations of the new became apparent. .Ss Mount options .Fx -has a +has a .Xr mount 8 -option nosymfollow. When this option is enabled, the kernel -does not follow symlinks on the mounted file system and return EACCES. +option +.Cm nosymfollow . +When this option is enabled, the kernel +does not follow symlinks on the mounted file system and return +.Er EACCES . You can still create or remove symlinks, or read the value of a symbolic link. .Pp This option is intended to be used when mounting file systems from -untrusted external storage systems or public writable /tmp file systems +untrusted external storage systems or public writable +.Pa /tmp +file systems to prevent symlink-based privilege escalation and sandbox escape attacks. .Pp -The mount option nosymfollow first appeared in +The mount option +.Cm nosymfollow +first appeared in .Fx 3.0 -.Ss Commands not traversing a file tree. +.Ss Commands not traversing a file tree The second area is symbolic links, specified as command line file name arguments, to commands which are not traversing a file tree. .Pp @@ -215,7 +224,7 @@ optionally traverse file trees, e.g.\& the command is included in this rule, while the command .Dq Li "chown -R file" is not. -(The latter is described in the third area, below.) +The latter is described in the third area, below. .Pp If it is explicitly intended that the command operate on the symbolic link instead of following the symbolic link, e.g., it is desired that @@ -242,20 +251,20 @@ and .Xr rm 1 commands do not follow symbolic links named as arguments, but respectively attempt to rename and delete them. -(Note, if the symbolic link references a file via a relative path, +Note, if the symbolic link references a file via a relative path, moving it to another directory may very well cause it to stop working, -since the path may no longer be correct.) +since the path may no longer be correct. .Pp The .Xr ls 1 command is also an exception to this rule. For compatibility with historic systems (when -.Nm ls +.Xr ls 1 is not doing a tree walk, i.e., the .Fl R option is not specified), the -.Nm ls +.Xr ls 1 command follows symbolic links named as arguments if the .Fl H or @@ -267,14 +276,14 @@ or if the or .Fl l options are not specified. -(The -.Nm ls +The +.Xr ls 1 command is the only command where the .Fl H and .Fl L options affect its behavior even though it is not doing a walk of -a file tree.) +a file tree. .Pp The .Xr file 1 @@ -292,11 +301,11 @@ The system differs from historical .Bx 4 systems in that the -.Nm chown +.Sy chown and -.Nm chgrp +.Sy chgrp commands follow symbolic links specified on the command line. -.Ss Commands traversing a file tree. +.Ss Commands traversing a file tree The following commands either optionally or always traverse file trees: .Xr chflags 1 , .Xr chgrp 1 , @@ -328,7 +337,7 @@ as well as any symbolic links encountered in the tree traversal of .Dq Li directory , because symbolic links may be removed. In no case will -.Nm rm +.Xr rm 1 affect the file which .Dq Li slink references in any way. @@ -342,22 +351,21 @@ This is often referred to as a .Dq physical walk, as opposed to a .Dq logical -walk (where symbolic links referencing directories are followed). +walk where symbolic links referencing directories are followed. .Pp As consistently as possible, you can make commands doing a file tree walk follow any symbolic links named on the command line, regardless of the type of file they reference, by specifying the .Fl H -(for -.Dq half\-logical ) +.Pq Dq half-logical flag. This flag is intended to make the command line name space look like the logical name space. -(Note, for commands that do not always do file tree traversals, the +Note, for commands that do not always do file tree traversals, the .Fl H flag will be ignored if the .Fl R -flag is not also specified.) +flag is not also specified. .Pp For example, the command .Dq Li "chown -HR user slink" @@ -380,16 +388,15 @@ walk follow any symbolic links named on the command line, as well as any symbolic links encountered during the traversal, regardless of the type of file they reference, by specifying the .Fl L -(for -.Dq logical ) +.Pq Dq logical flag. This flag is intended to make the entire name space look like the logical name space. -(Note, for commands that do not always do file tree traversals, the +Note, for commands that do not always do file tree traversals, the .Fl L flag will be ignored if the .Fl R -flag is not also specified.) +flag is not also specified. .Pp For example, the command .Dq Li "chown -LR user slink" @@ -398,19 +405,18 @@ will change the owner of the file referenced by If .Dq Li slink references a directory, -.Nm chown +.Xr chown 1 will traverse the file hierarchy rooted in the directory that it references. In addition, if any symbolic links are encountered in any file tree that -.Nm chown +.Xr chown 1 traverses, they will be treated in the same fashion as .Dq Li slink . .Pp As consistently as possible, you can specify the default behavior by specifying the .Fl P -(for -.Dq physical ) +.Pq Dq physical flag. This flag is intended to make the entire name space look like the physical name space. @@ -439,11 +445,11 @@ and .Xr rm 1 commands have exceptions to these rules. The -.Nm rm +.Xr rm 1 command operates on the symbolic link, and not the file it references, and therefore never follows a symbolic link. The -.Nm rm +.Xr rm 1 command does not support the .Fl H , .Fl L @@ -453,7 +459,7 @@ options. .Pp To maintain compatibility with historic systems, the -.Nm ls +.Xr ls 1 command acts a little differently. If you do not specify the .Fl F , @@ -461,12 +467,12 @@ If you do not specify the or .Fl l options, -.Nm ls +.Xr ls 1 will follow symbolic links specified on the command line. If the .Fl L flag is specified, -.Nm ls +.Xr ls 1 follows all symbolic links, regardless of their type, whether specified on the command line or encountered in the tree walk. From nobody Sun Jun 28 00:44:16 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 4gnrJd0VvSz6jFBv for ; Sun, 28 Jun 2026 00:44:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnrJc5dzfz3lfT for ; Sun, 28 Jun 2026 00:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782607456; 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=y7UvuL0noqZZh+u2V3/GLp87tNWznVOaHegV1BDfGxw=; b=JCAGMcs5vGVIfFErQTTM6v4RFeb+t03KHtFn8IwbP9A4J5qmrWHXn6lONjSGGei0Ch1gyE KSrfQD9Hqn1/1GwLrhdWefrRocRfwpoXBZpMgvnmHP/jrmX0VwFQn11CIPobNDkFLpiBGA BPTxtpOPR3Hi0Jy9AGEsTPXB3Yu8wgePSb7m3PSu5LZjmLrL8J82zqwK31BveSkwbdGICn ufbHC5NeWgjJ5ckEDt7Fprda771mlnnTSkYLDsnlzTDAUkULip1NlvVnaOyu7n0UX3f4kL riwdSs037OUcAtsYceIk5cus6yYFGoTrp9mHsaqq80WBRNC3687tjh67cOPzGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782607456; a=rsa-sha256; cv=none; b=kUd0lHvozBZkXTBu9ikM8oBmA9Dvg35qb0l+I8PbF0XFctcgVYgi4QJ/jwSgv7QhhE5rof ZwgwvmX1HMBQ8BS4qOE+R9ajRVIIPwmubAJWqowNgfE8ikeDfonGodO9bvSxsL+ysjJ7fi xgsWjeo57+6fTeb45S3taTS0tsSwEfM7mDnEg0O9lQTujxZPqI4ckUHS3pCeb3fNglfVrx CJ7gT6jXH2fnYyCTX+FEXBsr8PCeDtfoqvwv8B75Mc/GjxoTKuZTRW16TTccUmqUReCFsF utrfV35pQrKwIs4kIs9UCFInV/KKoS/Yk9FhF3FCPHA2thrU3tF2RtyidmDkjw== 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=1782607456; 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=y7UvuL0noqZZh+u2V3/GLp87tNWznVOaHegV1BDfGxw=; b=UH9b7efq38vcgYDwd+8BMnwzO5HKoRW+vkKJBBXtya7k1+5j/C4MQBW9gow0gCyelNLIlO q9a0/8kZvK7vy2VW+Qqt4pHg1cLcXjdCsKe2e5JmZts2CwpBfLOmDibf5HrhTjmCzakZBq dWGmDwFafT6+w+YE8Sms6FsFHtQTlhDp6XkaJtspxAyHDmXzY1ho4YedDodCLV9Xj5sZCW k68qeo4B69PeHDsCmLLaFvtcv38OJJS1vtmtzYYbHYO81aiMT+cUl5tcEiEXnRKceZzwZp oB0yr/x74kvaw5Rg8XWx8k1jaIgFzbt8iPIk0viUuutrx7Oq9Z5mmh/+r8oxZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnrJc4RnVznZL for ; Sun, 28 Jun 2026 00:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f2e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:44:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Caleb Harper From: Alexander Ziaee Subject: git: fa550b255e95 - stable/15 - loader.efi.8: hw.uart.console is explained in uart 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fa550b255e957a3ec0707cf1308eac92cf4b2e08 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:44:16 +0000 Message-Id: <6a406e60.3f2e5.43cc06e3@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=fa550b255e957a3ec0707cf1308eac92cf4b2e08 commit fa550b255e957a3ec0707cf1308eac92cf4b2e08 Author: Caleb Harper AuthorDate: 2026-06-15 22:51:05 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-28 00:36:10 +0000 loader.efi.8: hw.uart.console is explained in uart PR: 295944 MFC to: 15 MFC after: 3 days (cherry picked from commit a641aa1c80f80e44cd9212b95e6584db9533712c) --- stand/man/loader.efi.8 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index 8ddc869e0a27..1f55342e0ef7 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -152,9 +152,8 @@ The kernel will look at the .Dv hw.uart.console variable to set its serial console. -Its format should be described in -.Xr uart 4 -but is not. +Its format is described in +.Xr uart 4 . Set it to .Dq io:0x3f8,br:115200 with the proper port address. From nobody Sun Jun 28 00:44:17 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 4gnrJf1HxSz6jFFN for ; Sun, 28 Jun 2026 00:44:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnrJd6KgRz3ljR for ; Sun, 28 Jun 2026 00:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782607457; 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=Ly8gZgdX7l6Uydv/y1pGJybS5Y31GGs6mOMAaaZM23U=; b=rjv+afVt0if7zIXYsNQhefCH7N2llzgrEnfUV099qj0cdtKGgxGPs28kzlYODUsEKiGDgW LmHEuRYGEeEUX9l7oAwwSoCdhf74HWTnRDEema29hAH4U3SkOvRskcEbJyp0rLRhIjOGnT 80Cf9vHDqWk9Y7yXmVafPAIeR+pvUZbeGNUObpjRBM0DL8Jff+ydWqGGVta85FsAtSUa9+ DvMYLoytGxhAUG6ftZTkUD3c/YjLJB09xV07mpGL9rG3tYHq4m+JY2tfp42bqhnNRPBKUz l97mY9XUggCO47FNJiG6w68rLwTVkRrwNo1Xjz6xfqhCEo/7pbT4czRAuDV1MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782607457; a=rsa-sha256; cv=none; b=SIq1GGcDIak/SAZ5RHcLUX/f8H7xMeTHmPvwwsgYSXUioFPzrP/mZRww/PnLE0B8bnZH9o SbiCrZKUKyDCpPgHjT5v3UwkVZ+qRVQ7b++K5ARZGquyzfAl0kmF3udGwaKzxKmz2ral8e oi8VIWtW3o6tvpPAHpomNkOrprbQEjBHSMCw0bNtxq2QWWyM0DVaMrEzMTwWN9YOO7YSbE UU+v3hB0zOeKt6fY6leL7ZlIjP2UjPhWKZTE8Pi+ON5sTECNsX/nV2B0al3i5iszRMq9XF LBMJAdmeX99T+mM2vD7s1KccQfMVY/dOKLip6GF/udEYDLZcc0yqrR3LJ1pNkg== 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=1782607457; 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=Ly8gZgdX7l6Uydv/y1pGJybS5Y31GGs6mOMAaaZM23U=; b=MjCNkIzkc0q+zTfkPpVlOnwsdnPA3HFSw8113WoyUTToTgIPBEEPE9QiyDOCS6LUuG5e6N gpvTl3mhnCPToGieJFDEqwoOQ4UtXWoCieTondlqr/jHHj3PHvEhDVkeBnyP5v/miy4Rq+ 1W3OFeVYNr/4nRYiWt/kzepRq9WrZlvGRVXmhEDDoe+6ai7nkmHC0eQ2VbCjcI80tI4H1U 07rLmp/nTo4lafb0d6EbrgAz4tzJ4xCrRx9UZBV0ah+qZAra7eY7t58tZ02s2FwHUxmokZ pMFHjLUxXgfu7/itO+cHQQSHucuLVCQxajRB+xtr/2/HJ25RU4NC1sqbgS7shA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnrJd591zznZM for ; Sun, 28 Jun 2026 00:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f96b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:44:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Matteo Riondato From: Alexander Ziaee Subject: git: 1744efc43640 - stable/15 - tcp.fastopen.client_enable: Fix documented default 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1744efc43640773c5d04c16a56e1ee6002569c31 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:44:17 +0000 Message-Id: <6a406e61.3f96b.77f3f199@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1744efc43640773c5d04c16a56e1ee6002569c31 commit 1744efc43640773c5d04c16a56e1ee6002569c31 Author: Matteo Riondato AuthorDate: 2026-06-17 14:59:01 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-28 00:36:11 +0000 tcp.fastopen.client_enable: Fix documented default The default value has been 1 since June 2018, but the docs were not updated to reflect the change. MFC after: 3 days Reviewed by: ziaee Fixes: af4da5865557 (Enable TCP_FASTOPEN by default) Signed-off-by: Matteo Riondato Closes: https://github.com/freebsd/freebsd-src/pull/2285 (cherry picked from commit 0bc852cc62afcd79fc776f784623c3f2b7691d27) --- share/man/man4/tcp.4 | 4 ++-- sys/netinet/tcp_fastopen.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 8bc1eb858a07..425c1a6e5e89 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 17, 2026 +.Dd June 17, 2026 .Dt TCP 4 .Os .Sh NAME @@ -589,7 +589,7 @@ On the transition from enabled to disabled, the client cookie cache is cleared and disabled. The transition from enabled to disabled does not affect any active TFO connections in progress; it only prevents new ones from being established. -The default is 0. +The default is 1. .It Va fastopen.keylen The key length in bytes. Read-only. diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index 609637b83df3..106fee90b2cd 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -84,7 +84,7 @@ * net.inet.tcp.fastopen.ccache_list (RO) * Print the client cookie cache. * - * net.inet.tcp.fastopen.client_enable (RW, default 0) + * net.inet.tcp.fastopen.client_enable (RW, default 1) * When zero, no new active (i.e., client) TFO connections can be * created. On the transition from enabled to disabled, the client * cookie cache is cleared and disabled. The transition from enabled to From nobody Sun Jun 28 00:44:18 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 4gnrJg6C89z6jFKh for ; Sun, 28 Jun 2026 00:44:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnrJg4cx0z3lcc for ; Sun, 28 Jun 2026 00:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782607459; 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=gWCFElBTw36iW7QLAA8esaXtKMLh1SFFnHkDIsLjp2Y=; b=sUhQm4NDK2wU58ZM+snkQ3qkSXzN2MGXovxVVqmGF8hv/8ktIKBAnBXUhrjJjLBGWJ2cXt m97QIXEI4tpLhbzmzuK9erwLFuGFfhgWZ0ZBTVz5k+zbZd1mePUnrcaXGiRw7kuu0ANzF1 X92pFj+4YvEvQvs5OwRlUOuF7c7ShPlB6VK2jHCOZ3V/p+hvdtW7afpD48o5g+n5G8eKod wtOeDbSdnhggBosra5ll9EtzrYUffynxYqIkU6+8ThhiDHlwQFYgKDpjGsushiEs1YsCE1 SSu/2B+XqrXSVALIzDZbBZ5RiNirfiC0Xer2DUV/EECXBIAhnwyNj004Db5lDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782607459; a=rsa-sha256; cv=none; b=RqrQHtJ3zNjEcHaJ0BqzbqYSoepki8JJjWSCvF5IpoTDEmfIJLKxujCAGsAIp3aiSlbUEe a3hpqxboI2j2YTM4YVJM/H87bPzGsOBAZsSzScB/XjTlsW2vRLH3MIu5HT8DBWN19UCVO9 cDeQt70UNuWB9XsgnXFPuGKfLBQksu8a2WmWwzPRl0iEeS4mzcK4cmr3//Z3VG0f4nGNBY Ihi+di/++LYe/y6ImltJbQ+QDZWKd8J5neXDd+Yd+XdMlj/VWuUBnbRZJvE06/us991wxE lNl2vHd8yEka/KCY3BSt0uSBxaheoc+o6raCAtv8/JN78dwaqgPn9RWvz3xHxw== 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=1782607459; 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=gWCFElBTw36iW7QLAA8esaXtKMLh1SFFnHkDIsLjp2Y=; b=hnbhS9ZmODYcyOXHpH4aLlZcjH11e5YciqsmBGX6VllvYsngttEJsjcqxybGNVjMFRbRCQ 6StwbQDO6ofPCBHXPigD3rWQPA47qDUfPguT5/D1YhZOetxR3Pdfub9GD3O26mcQ0mItp0 sk1CDtHAQAamhM9URfXT6mpzwmd+O6jnRI/qkCVLn18MqL8pGI2v+NJ5G+VC6y8KhY3QN8 GrqwqRHMYiSdDAW7Vcah+NXhnJ4q9CYIRyMIfgudPat6t6Ydw4fANH1+QtaC6+WPEpEV5o +6JG0Q/3CJ6DsvWl+NaQh6LoQMBQGZynuVzbf8YKRBE1SZtGYVm0PJ8qHGSipg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnrJf5w8BznWx for ; Sun, 28 Jun 2026 00:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fb6a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:44:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mathias Eggers From: Alexander Ziaee Subject: git: 62551ae38bf2 - stable/15 - iostat.8: Expand -w description 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 62551ae38bf201654ebf2ffd59cb320ac75107a0 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:44:18 +0000 Message-Id: <6a406e62.3fb6a.2363e8f1@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=62551ae38bf201654ebf2ffd59cb320ac75107a0 commit 62551ae38bf201654ebf2ffd59cb320ac75107a0 Author: Mathias Eggers AuthorDate: 2026-06-23 20:09:24 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-28 00:38:12 +0000 iostat.8: Expand -w description PR: 194781 MFC after: 3 days Reviewed by: ziaee Event: Halifax Hackathon 202606 (cherry picked from commit 4d299a767acce2841ded288e789a9c36620b57d7) --- usr.sbin/iostat/iostat.8 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index 11f0ef6fbeb6..09ca269f3b94 100644 --- a/usr.sbin/iostat/iostat.8 +++ b/usr.sbin/iostat/iostat.8 @@ -246,9 +246,14 @@ specified by the user. Pause .Ar wait seconds between each display. +If a repeat count +.Pq Fl c +is not specified and a wait interval is specified, +the default repeat count is infinity. If .Fl w -is not specified, the default interval is 1 second. +is not specified and a repeat count is specified, +the default interval is 1 second. .Pp The .Nm From nobody Sun Jun 28 09:43:51 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 4gp4HC5snNz6jvwG for ; Sun, 28 Jun 2026 09:43:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HC5Gs0z3dcP for ; Sun, 28 Jun 2026 09:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639831; 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=PtC8O4RAPo+i0DyxYkvGnKj7H4om5ew8F8IvGSbFEFQ=; b=USqal0KWnYLqdVgNpDEiPznRnnsTgrVQUqQWNLrKDUqOoEF70po9Sm04aOkBb6PR+I2t5n AyP02KKwrx1Dvqtk4Yotk4cLOGfxQPEJuubwsYWfg4xuW/MbX00DRr8wiYuar+gxtRXfYi HeHsqW8WW0pVRx2Enkbh66gG2S1m7sMF3SoTWfh1rKVTHmseewh+OvRFiSD4Frj6F0aXDE GZv9QxUQSVTrvzewV4NstkXSE+XQMob55oHUTFgMNNehNLeZ+4XG48ejZxTAXVkSGE3M1N 0o1lLBVkdDGR6YcafRPe9XllCIsLRXUbAeIdvplPOopS7dopXOcwJ+xleNXPfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639831; a=rsa-sha256; cv=none; b=PoHVvffUl9+64VSO++2OkwNPuKXRxjnCRY2KAqpMBnpDgBJfMIcygc0LDQlZdhq9QvzTPZ +CXYmZc8+ZoDqS9Xo5U8zl0Y1PsaK/Y00vMLDuLKFVyFPYHn6CWkRePgYDCB2RCWqF47XJ iUHaje8OgL+RhK1+AulFX/dkNb2niplbowWUjeQXFdlbwvB2hxA4jgAFI6XJ8ng1cbIfDS GbocS87cznFQHeu/LWFJinlHHYBa6ULiXIUvtIJkxzxtouB970bjBZLqWwI7XIMhZ3dvsv JARC4KWJHbayizjCSV058LV5H5npFrsjpDiYQZpjWLG2DAHuyxo/bG6K9H/QmA== 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=1782639831; 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=PtC8O4RAPo+i0DyxYkvGnKj7H4om5ew8F8IvGSbFEFQ=; b=OKcZVS4qbKTxEptEQNo8zObp3+k+mxZrCOOc6Wzg++rrs5YIcF8/+9Ya4zb9GjhB846V0O OwHwPdHBa7AycgCjkVrCmVnLAWXjE6PlxMgqZTwhYnkno7+T3J78SQHtwr1zTRujsrP/IF i2/l+3pXD7UFd7/DYfsjQZrsxl8hRINaHo5aIVN7QVXL+UEZ5itYJlFKPHV5DeGgMPlbso eW2GHTPh/MVnURa1XC+8p6frrNktcv6UtUfh/dUV9SyEW0679p69Q1gDiZkDMrxjkwRvTX 2BoWZJemAIwc+PTWWCGDq59jTeMB7qXNCHPdtUXocDjlo0Mfltqvc8CHI3ECqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HC45rzz14hg for ; Sun, 28 Jun 2026 09:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31964 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 8f59fdb65239 - stable/15 - rc: Fix improper use of load_kld 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8f59fdb652395e148905073ea214e335160977d8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:51 +0000 Message-Id: <6a40ecd7.31964.1751f990@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8f59fdb652395e148905073ea214e335160977d8 commit 8f59fdb652395e148905073ea214e335160977d8 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:39 +0000 rc: Fix improper use of load_kld Fix scripts that needlessly used -e when the simpler -m would work, or that used -m when the module and file name are the same, or, in one particularly egregious case, used -m with the wrong name when using nothing at all would have worked just fine. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57705 (cherry picked from commit cfe1962a19259fea8f51673f4da6c96656776486) --- libexec/rc/rc.d/bthidd | 6 +++--- libexec/rc/rc.d/cfumass | 2 +- libexec/rc/rc.d/linux | 8 ++++---- libexec/rc/rc.d/mountcritremote | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libexec/rc/rc.d/bthidd b/libexec/rc/rc.d/bthidd index 4b230406c4d5..275106a53d1e 100755 --- a/libexec/rc/rc.d/bthidd +++ b/libexec/rc/rc.d/bthidd @@ -35,9 +35,9 @@ bthidd_prestart() if evdev_enabled; then load_kld -m uinput uinput fi - load_kld -m kbdmux kbdmux - load_kld -m vkbd vkbd - load_kld -m ng_btsocket ng_btsocket + load_kld kbdmux kbdmux + load_kld vkbd vkbd + load_kld ng_btsocket return 0 } diff --git a/libexec/rc/rc.d/cfumass b/libexec/rc/rc.d/cfumass index 7d1117d7c388..b3ddd2ceedc8 100755 --- a/libexec/rc/rc.d/cfumass +++ b/libexec/rc/rc.d/cfumass @@ -74,7 +74,7 @@ cfumass_start() return "${err}" fi - load_kld -e cfumass cfumass + load_kld -m ctlcfumass cfumass # If the template is already switched to Mass Storage, then reset # it to -1 to force the host to reenumerate it; otherwise it might diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux index d419920acaca..52a465a85b94 100755 --- a/libexec/rc/rc.d/linux +++ b/libexec/rc/rc.d/linux @@ -31,14 +31,14 @@ linux_start() case `sysctl -n hw.machine_arch` in aarch64) - load_kld -e 'linux64elf' linux64 + load_kld -m linux64elf linux64 ;; amd64) - load_kld -e 'linuxelf' linux - load_kld -e 'linux64elf' linux64 + load_kld -m linuxelf linux + load_kld -m linux64elf linux64 ;; i386) - load_kld -e 'linuxelf' linux + load_kld -m linuxelf linux ;; esac diff --git a/libexec/rc/rc.d/mountcritremote b/libexec/rc/rc.d/mountcritremote index 99becaefb10f..df8ab01b1dd0 100755 --- a/libexec/rc/rc.d/mountcritremote +++ b/libexec/rc/rc.d/mountcritremote @@ -26,7 +26,7 @@ mountcritremote_precmd() case "`mount -d -a -t nfs 2> /dev/null`" in *mount_nfs*) # Handle absent nfs client support - load_kld -m nfs nfscl || return 1 + load_kld nfscl || return 1 ;; esac return 0 From nobody Sun Jun 28 09:43:52 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 4gp4HF06n4z6jw6Y for ; Sun, 28 Jun 2026 09:43:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HD66H2z3dv4 for ; Sun, 28 Jun 2026 09:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639832; 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=C45v9a8OvFxO1rcsXvl0tXjPRGJeDT3MmvwcgIiAu5w=; b=SkZ0Tz3wwx/YMSZErd1MnJRxdJVB1zECZP3V0ag1TbLHSNmuk/Hu3l9bJssQSErkMqy3fi rjcxgMxFjjYiOAhKyZ1qooYgUFTRIFvm4TqVlHyWfTLxLMBkaaHQFAidD5zppHARb/9fEk MT2wfqzlFdeEsj09L1brqbQcNMFIFT10na+15Y3zIInq19AWOAkcOfuZo2f7D4f1aGZONg 2X+S2d2jc4M+cHyglDoUBHP7wpvpSC48k7liwMe4W1BS89NDiucbLBCop9OxqJ+embDWhy n0zGEGpMD0DXf6HNpPiY5GW8VGsLam0uqX0YUGQxK91JJHRavfjhYAsnRYwMoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639832; a=rsa-sha256; cv=none; b=oqBTX8t1+z96g/5dhDVoSgo2r3LYWpwHmEOQfSQujFJGtLGJsy5eZeVEb1m0TTYMhOaJvc tdMMrL7+1s3uAc8bcMLXA6nVlKUrz543KbGhbRJxHbGZB2jqdTy8QoASWu/Hm9+AlYBxP+ u+VWYuJRvaZuX5euTOW/6vsGwjDaPc9cieeFoNJGqer8hsRiTLWZHcv7AS1KNur0ZybNpB CCTv3CNSi8p5Bs0LEldNMP6b/ZbrasI/qhBsAARY9kag9bFY88CsUl7YgZ6PSiJtbnXvpn TDvUujYAYrsquZCH0lFepCB154zkex0hpjzS65qbtcltp9c8YfS5TsXZkPtLGQ== 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=1782639832; 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=C45v9a8OvFxO1rcsXvl0tXjPRGJeDT3MmvwcgIiAu5w=; b=IkvtDTjfkGwZ4lguwP6taZYorIp3YDpW9oKrbFoCnNA3qPn1rgMvut/mkOAu8bMpCFSds9 0HaoYCXnBBhu7JWaJrjAyBM0A8NZmV3DTsfOWVG1ZYHi6yNeMiZ/R1HDRxdDSvLJTA6NMD nLeRGw5QQszhoD6lvMJ9fEgaGqKhvCCitOFQ9J6t+Zhi/l5IyFKxKwS9zt+zXdLwb2SkYw fYmUhLVizNQPo87ruREWQpmX1XpaSSaR5lJgxJx6b+FA51GNLpyeyrH1sw8dOm/pyBzJph 5AV1lNKfz476d907wt5P9EgbxK/Da/Hfferju3A1wRh4cMfPdLoyQsINEvZr0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HD4Yzsz13l0 for ; Sun, 28 Jun 2026 09:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3026c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2baf97f3305a - stable/15 - rc: Improve load_kld 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2baf97f3305a89c1211566c6ba38815e0af5412f Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:52 +0000 Message-Id: <6a40ecd8.3026c.6b04f785@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2baf97f3305a89c1211566c6ba38815e0af5412f commit 2baf97f3305a89c1211566c6ba38815e0af5412f Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:39 +0000 rc: Improve load_kld * Centralize the usage message. * Document and enforce that -e and -m are mutually exclusive; previously, speficying both would result in only -e being applied. * If -e was not specified, and -m was not specified or did not match, fall back to `kldstat -n file` which will always work for modules that aren't built into the kernel. This means the kld and ntpd scripts can now rely on load_kld to dtrt. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57706 (cherry picked from commit a95d324dd3107afcbc16767d183acca7a57ebca9) --- libexec/rc/rc.d/kld | 6 ++++-- libexec/rc/rc.d/ntpd | 2 +- libexec/rc/rc.subr | 27 ++++++++++++++------------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index 37b14255abb9..851db5dd6a32 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,10 +44,12 @@ kld_start() local _kld - echo 'Loading kernel modules:' $kld_list + startmsg -n "Loading kernel modules:" for _kld in $kld_list ; do - load_kld -e ${_kld}.ko $_kld + load_kld $_kld + startmsg -n " ${_kld}" done + startmsg "." } load_rc_config $name diff --git a/libexec/rc/rc.d/ntpd b/libexec/rc/rc.d/ntpd index e7e42da8acc7..a46a32144cce 100755 --- a/libexec/rc/rc.d/ntpd +++ b/libexec/rc/rc.d/ntpd @@ -67,7 +67,7 @@ can_run_nonroot() # the policy module if not already present, then check whether the # policy has been disabled via tunable or sysctl. [ -n "$(sysctl -qn security.mac.version)" ] || return 1 - sysctl -qn security.mac.ntpd >/dev/null || kldload -qn mac_ntpd || return 1 + load_kld mac_ntpd || return 1 [ "$(sysctl -qn security.mac.ntpd.enabled)" == "1" ] || return 1 # On older existing systems, the ntp dir may by owned by root, change diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 4e19d10f5e4e..451521c038d8 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -2413,37 +2413,38 @@ mount_md() # Code common to scripts that need to load a kernel module # if it isn't in the kernel yet. Syntax: -# load_kld [-e regex] [-m module] file +# load_kld [-e regex | -m module] file # where -e or -m chooses the way to check if the module # is already loaded: -# regex is egrep'd in the output from `kldstat -v', -# module is passed to `kldstat -m'. -# The default way is as though `-m file' were specified. +# -e greps the output from `kldstat -v', +# -m uses `kldstat -m module'. +# The default way is as though `-m file` was specified. load_kld() { - local _loaded _mod _opt _re + local _loaded _mod _opt _re _x + _x=0 while getopts "e:m:" _opt; do case "$_opt" in e) _re="$OPTARG" ;; m) _mod="$OPTARG" ;; - *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; + *) _x=999 ;; esac + _x=$((_x + 1)) done shift $(($OPTIND - 1)) - if [ $# -ne 1 ]; then - err 3 'USAGE: load_kld [-e regex] [-m module] file' + if [ $# -ne 1 ] || [ $_x -gt 1 ]; then + err 3 'USAGE: load_kld [-e regex | -m module] file' fi - _mod=${_mod:-$1} _loaded=false if [ -n "$_re" ]; then if kldstat -v | egrep -q -e "$_re"; then _loaded=true fi - else - if kldstat -q -m "$_mod"; then - _loaded=true - fi + elif kldstat -q -m "${_mod:-$1}"; then + _loaded=true + elif kldstat -q -n "$1"; then + _loaded=true fi if ! $_loaded; then if ! kldload "$1"; then From nobody Sun Jun 28 09:43:53 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 4gp4HG3WwJz6jw6c for ; Sun, 28 Jun 2026 09:43:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HF6JJtz3dt0 for ; Sun, 28 Jun 2026 09:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639833; 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=HJEtq6tp80ocrxNFXewRLzc3fedPadD25RtrgQ/zPt0=; b=bIL60nd19lFl0c75OfxVryhURdedJJ9zwa0svNqWbjdRLsM7CJkGu0XpuY2B4/QUqQ8Qdz Gxtvmh/tvB7/C7/yBv1gwlhG9s4X/eaesLsoOmVLwibOg8yoAuPfJBY8WO3ATkesn5cI6A vZZIfcVKd72A4xaKfsWBRZw6S8KEEao4JxsqryH0HAU6eCy5MGXXfm0qBrqDkUMAiPIHVf 6rpGKRIRg1+wW70JgGCdp2BU9QjVjjEWzqFmcJT/DDGOhTq3mQcT7TytS9GoK0Ps9TI3p/ IbDfDQC8NOFeSA91agEePDk7vIOuN8ZnuMaVESaIfZeebRRxsz0Ec9e+Vg1Ndw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639833; a=rsa-sha256; cv=none; b=HfGCK2sd6UVQ+cB/9qYdhr13foEP58Y2zjCXMQYVh0fkCS1MCDMOeAOl5fAU7mlDU45U7G cfBLbFDY48DsLZArr6x1zslVaxy9B/9377hquejJ3HTj3eUV2qMruAu7AJmTt8UJnKtm2L ybPZSoDlyWJW7a530G3Mpyj2IGbPMIcJdx+yNK2AVMzvzcdwcv4b+tnt30/kTXE6V/iYum 9JWUq1WZFfp/eMMsac0b+FWC3nREls9wyCWoInnewB3jy3AkhBWXz59H3blDbDcoiAiPYx 0R2PrOoJpzM+uuxbdkZkp7GTibnHB9lUsCvGlaFV/W4iewWO3EVvOTPrI5VWRA== 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=1782639833; 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=HJEtq6tp80ocrxNFXewRLzc3fedPadD25RtrgQ/zPt0=; b=xx/8irshOzXWaMDKLoBPqBQndwaKyvCnO2xyR8TwAYujGWlJ3o3dAkqNmtynB2mDli72/j UyKm0XCO9nHen25tQBYMZ1X2N5FgOuAe6IrBmsn5ghnlXeYsd9LDV+UU2SVwqFf3eBT9/g NUWp40e3NQoKjSqzJX8JFPho6JQST/7ePEi4De+Ee/MypYhCbLqXoOwNcgYPOQhEKG8kVX achwBmJBZ4eMAB0Pku5LB85WgOvBk/fXgJv3f7j9Lircaj8abIEbJEN+ihFNaYamOBG+m9 S2IWw78JEbQQosz+ayaES/BArZfmjhqD2vFNC/oicOB30bORklMPCkgwc9cKog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HF5FfFz14hh for ; Sun, 28 Jun 2026 09:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31aa7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d67aa8bd9c5a - stable/15 - rc: Make devmatch use load_kld 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d67aa8bd9c5a544386bfa852135399abd6249fec Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:53 +0000 Message-Id: <6a40ecd9.31aa7.685c6b92@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d67aa8bd9c5a544386bfa852135399abd6249fec commit d67aa8bd9c5a544386bfa852135399abd6249fec Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:40 +0000 rc: Make devmatch use load_kld The default behavior of load_kld is now robust enough for devmatch. Switching means settings from /etc/sysctl.kld.d are now properly applied when the corresponding modules are loaded by devmatch. While here, reduce the amount of output produced by devmatch from one line per module to a single line. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57707 (cherry picked from commit b9f616d031566e94e6967a2c533b8aa7f36123b9) --- libexec/rc/rc.d/devmatch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch index 7a8726de5677..6038092d9055 100755 --- a/libexec/rc/rc.d/devmatch +++ b/libexec/rc/rc.d/devmatch @@ -67,6 +67,7 @@ devmatch_start() # names with .ko devctl freeze + startmsg -n "Autoloading modules:" x=$(echo "#${devmatch_blocklist:-${devmatch_blacklist}}#$(kenv -q devmatch_blocklist)#" | \ sed -e "s/ /#/g;s/\.ko#/#/g") for m in ${list}; do @@ -74,9 +75,10 @@ devmatch_start() case "${x}" in *"#${m}#"*) continue ;; esac - kldstat -q -n ${m} || \ - (echo "Autoloading module: ${m}"; kldload -n ${m}) + load_kld ${m} + startmsg -n " ${m}" done + startmsg "." devctl thaw } From nobody Sun Jun 28 09:43:55 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 4gp4HJ1gM5z6jvwL for ; Sun, 28 Jun 2026 09:43:56 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HH1g2cz3d4b for ; Sun, 28 Jun 2026 09:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639835; 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=wWrULjPs9tKjO6z6Y+FvmwsPWQEEn3UmvxAnFVjgKVI=; b=D1QetdSSme71w9n4l66rsjPizkKZYZi6hKhlJxWzKEe1ct6AW5zoXSmV9ybjf/IxWxazLw mP/F1Ea55nR/5D95jjo9sgZqGUQo97rGDN748HIjgCuaFUSUV9Yz4MVPjjvek+lWdrPKXW TOL8l1TRzVnqzBEpSlHZnWPEhh+10moKYr8DV2zXnPn0NdTgmFDiZrx7PqfdEbeWK7gJpm EymDAv0ia9pfJ2z/tdCEDhdFp8YVxV1GF8lt45MVyyYTIxtHMpAD2JtOVM8GnHmprWKBXm Rc6NfZjriJbHvu3PERGVJGPf38YTGF1hrkA1r0E1dUktH8zvdkZ3kzNOoMFR+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639835; a=rsa-sha256; cv=none; b=gx+2wPTqVme6TLZqi5UFx2tMvMn8jPpWDiBAS6Ktd64FfSMU1qdnk+N3XjKnQP7CQh0JPk LMGmbObOOuGxRNqlYSqlxVRzWrwb/FGWCKKViBuEPzALgGxLY+DB/qNgt6c0USzehmASLd f3s5/AA2kffZ8vtXeTAiVKzPcLauXj/u0QhzhgNcO+GS2GbS3sJV9qEi5BdfWOhtfugQTV dyFPDvRFFsaC+dDp+wBP8s4ZvXxfFL+2MJl6cr/529XT9VQnhVonQ6f9gi40A8iomRkFVT V0IMX3byeyWlxWhVpsTAN/bsaOVlNC0yqo5AqWBa0/yF+BPJbw7sEDJoTliKqg== 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=1782639835; 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=wWrULjPs9tKjO6z6Y+FvmwsPWQEEn3UmvxAnFVjgKVI=; b=QbwH5We4OiL1AhGugO7P4nibE4Nt8MSM30jf5/pJouB5Vu78AcNuxzxJQb4D+P5f/N4bsk h/8edv5SJtDRo3VNX92OQ5kELKBej1T3dDc1Iuu71lkHN8Dkf0LfreYjAgbpKnL5j1fJn/ m6wiKS9VMu0IknuL7kuQnwM0Fqu8TS+cI0Jd06+l8Jtbkrly3+h4jC4ubUnhodZmAoBt8O tlua7abU+YmGNZobaNkrKsJ6zB3ADPrggYgCJrGl3frZRvLGFJWnpb4OqnHvbhHBxM16Qy cFecYvOnPLDXYpmV6KXhsqIdiBs+gNBy83qnZon434E3OYS3jbKk2X/JCJO/bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HH0hYTz14TL for ; Sun, 28 Jun 2026 09:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27de6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 19cba6662468 - stable/14 - rc: Fix improper use of load_kld 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 19cba66624689b5ed628a641cf5da4b2b76203c9 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:55 +0000 Message-Id: <6a40ecdb.27de6.12e22794@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=19cba66624689b5ed628a641cf5da4b2b76203c9 commit 19cba66624689b5ed628a641cf5da4b2b76203c9 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:43 +0000 rc: Fix improper use of load_kld Fix scripts that needlessly used -e when the simpler -m would work, or that used -m when the module and file name are the same, or, in one particularly egregious case, used -m with the wrong name when using nothing at all would have worked just fine. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57705 (cherry picked from commit cfe1962a19259fea8f51673f4da6c96656776486) --- libexec/rc/rc.d/bthidd | 6 +++--- libexec/rc/rc.d/cfumass | 2 +- libexec/rc/rc.d/linux | 8 ++++---- libexec/rc/rc.d/mountcritremote | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libexec/rc/rc.d/bthidd b/libexec/rc/rc.d/bthidd index ec7da8181ca3..624b2b1be00f 100755 --- a/libexec/rc/rc.d/bthidd +++ b/libexec/rc/rc.d/bthidd @@ -35,9 +35,9 @@ bthidd_prestart() if evdev_enabled; then load_kld -m uinput uinput fi - load_kld -m kbdmux kbdmux - load_kld -m vkbd vkbd - load_kld -m ng_btsocket ng_btsocket + load_kld kbdmux kbdmux + load_kld vkbd vkbd + load_kld ng_btsocket return 0 } diff --git a/libexec/rc/rc.d/cfumass b/libexec/rc/rc.d/cfumass index 79c9b0ae63d4..3ca40883725e 100755 --- a/libexec/rc/rc.d/cfumass +++ b/libexec/rc/rc.d/cfumass @@ -74,7 +74,7 @@ cfumass_start() return "${err}" fi - load_kld -e cfumass cfumass + load_kld -m ctlcfumass cfumass # If the template is already switched to Mass Storage, then reset # it to -1 to force the host to reenumerate it; otherwise it might diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux index 1c6a97f606fe..3669bfeb1e55 100755 --- a/libexec/rc/rc.d/linux +++ b/libexec/rc/rc.d/linux @@ -31,14 +31,14 @@ linux_start() case `sysctl -n hw.machine_arch` in aarch64) - load_kld -e 'linux64elf' linux64 + load_kld -m linux64elf linux64 ;; amd64) - load_kld -e 'linuxelf' linux - load_kld -e 'linux64elf' linux64 + load_kld -m linuxelf linux + load_kld -m linux64elf linux64 ;; i386) - load_kld -e 'linuxelf' linux + load_kld -m linuxelf linux ;; esac diff --git a/libexec/rc/rc.d/mountcritremote b/libexec/rc/rc.d/mountcritremote index b2e0f9cfec49..298d6cfbf074 100755 --- a/libexec/rc/rc.d/mountcritremote +++ b/libexec/rc/rc.d/mountcritremote @@ -26,7 +26,7 @@ mountcritremote_precmd() case "`mount -d -a -t nfs 2> /dev/null`" in *mount_nfs*) # Handle absent nfs client support - load_kld -m nfs nfscl || return 1 + load_kld nfscl || return 1 ;; esac return 0 From nobody Sun Jun 28 09:43:54 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 4gp4HJ0sWcz6jvwK for ; Sun, 28 Jun 2026 09:43:56 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HG71jmz3d4Z for ; Sun, 28 Jun 2026 09:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639835; 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=9maRlEpVioed9ASz3jn6nYvlq1FWkOA6j7Lim7Hz4zM=; b=SNwvwyruNqZ5YLYz+RLP96DEXN2dUFUew5hrPP3Q9LM26owAXyy0SIwetpmPhVOzBoydTX Ht/yrNmRTSxvuPtUqefjderXEqav3GemRIXFBnhEEFg3q1HYyo+JLLlRZr8k9G98yTnTDA lgN1mh1x+WPHR1yax3Bc4iPcVb/tCwzZ4Lz/YlXpn/kUgPSoPbWRL3AAzXGmPpwROBdf32 Cl63kRi4HNDcSDZsnX2KExc+diRzAFSRjLwu57aBn9Mrt1AWk1qckLhYFP1pIkCl54ngnm XRFl6QVb6HFz0r0ymMfx7Z9KtMQQ95ROeMIv3rAe94zpwEY22TV6gxR2X0L+nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639835; a=rsa-sha256; cv=none; b=UuMeNxJCuExBYII/EFTde1dGZa5FqnpfMRVUHJy+rAsC9EjbW20DUJQhM4NieG7IR6hC7W 0H5vAv5fJqk/2un0afzz72CwZ+Q+79EZUpGdaIH0KGI9DVoOD9JiZGD4cK8wB4pWG3Teol vhQ9Uim1k3l0oGARcAEWgBBOxkmmZcNSNJEs8DF70yV1nbCs9jKd3UpozxRKvcgFulIeTo gvxJRe/YUXTO6LHOFpsVIwsOFqz8co/0p8Wrakp3qH15MjxMdzuyaGpl458yqsla+77UTi hPZNhDVeduQRBubjeLYh8XGsB5DwUp86OLPGzX+BC80NplCz6JHPJaizxbcCMQ== 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=1782639835; 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=9maRlEpVioed9ASz3jn6nYvlq1FWkOA6j7Lim7Hz4zM=; b=w1Z7aYVATgbzmoZFNyPMcWkVEosiXmkAhfyPCsEo5F5OjbQSeXubZmBr4s0ge/htY64Ko+ Dvuc1nJax2Bpx/g1YsrNzTmxEBfd6VpD3NelZCaloOEalX95uryhxUQtQKbZY2v8rWilKL cwTX3X2S+aG8wX22O5vW7cQw04yLkqGhPonfkkd0G7Q/RxC8kULwlg2FyhpLe5UegNyYh4 nkKJZs+20P8LEVoq0qygs6SSuuyUfcHgXr4xB0yPH4rWAtirI/HNV4YgWUhxAfGus4B8Yg 83x/vdbIi1roJw+20JJCp0WzlTa8RBOzS2+hBr6DxqH9rqeSJ7IgWLlWI/xEgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HG5pxTz144q for ; Sun, 28 Jun 2026 09:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 59573a006c69 - stable/15 - adduser: Normalize supplemental groups 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 59573a006c6901f39b16bc9bff484feebccaf37e Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:54 +0000 Message-Id: <6a40ecda.314c6.69169@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=59573a006c6901f39b16bc9bff484feebccaf37e commit 59573a006c6901f39b16bc9bff484feebccaf37e Author: Dag-Erling Smørgrav AuthorDate: 2026-06-25 03:05:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:40 +0000 adduser: Normalize supplemental groups Rather than insist on a space-separated list, normalize the input so that any number of spaces, commas, colons, or semicolons are accepted. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D57774 (cherry picked from commit 65fba082f44cb9451d2b12bcd99c3287d0a47acc) --- usr.sbin/adduser/adduser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index ecac7478befd..7db5fafcce62 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -580,7 +580,7 @@ get_groups() { fi read _input - [ -n "$_input" ] && ugroups="$_input" + [ -n "$_input" ] && ugroups="$(echo "$_input" | tr -s ',:;' ' ')" } # get_expire_dates From nobody Sun Jun 28 09:43:56 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 4gp4HK0NrXz6jvy1 for ; Sun, 28 Jun 2026 09:43:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HJ2Km2z3dZK for ; Sun, 28 Jun 2026 09:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639836; 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=aDWVbSfhkuWfkzjr4Lmr+wO5pfX/WLJJke+4T8P7qsc=; b=GXBEKqfwSyxdQpbOFfl3Qd38tSRFUQyUvUYqH60mUs+xq03CjW9GCen+pK68W9rCR1ifck CmiTJwzUS92rGMgU+U0VpqWlJaMuyGfOaWPBq/OJvcHbncxwBQQ+ni7269j9eFBeIUrMCF tGr0b58Wl0tyQCMyU96OvoyzspysXroNPZXYrlYozrrfXglUBIN8aRceWkb5qDoyS+T3Bo m3LqSPfRyAmDPwj+Dsv9lu3x+azt9fQkQ/wn03Lk3iRismjcu+/3nL398R+Zml5DPEfwso 1lQW+xhNZ3EZgHd7LwLIbmyVdVD8wCFJFS/RPHNrG6n4BafUltJfCiI5wYPtVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639836; a=rsa-sha256; cv=none; b=LY1uwNWnQrNXFQ9YkGLCHT7Ue8gye8xJTE8rnJhig0iCPDsmoH7cRnYoKozKyaUSHO+q55 aPMd/93OMQzX61uhx77mkuhrz6vFT+nCzaDg45pNHgA1PS6ajOSq3zqRcr3pCWJ7uoiXSS c/RkV8Cvxt3AkIbBGKy4oGEkVWpeO305rY0z8d7d4FhxNHOi5JHbQ2udUGEza3k7a4NaTG lFqvG/xh9Z4yHVFH6zHkhSlDCH5epXohEV7AOk7ECoe89nnrCstItUFr/Z1jV+dH/XeNjX 3MC0RBS8lwrAXuoNuZzhb12PxFuNGqMiiMOic4K1rYhzocykMa+d7GDMui3KOA== 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=1782639836; 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=aDWVbSfhkuWfkzjr4Lmr+wO5pfX/WLJJke+4T8P7qsc=; b=T+8xLTLnozKRM1jMawc/HIP42QnOqgMkzpxAXDayJuOuxQPOPBNKUmu8SiFsJ1UMDzidim jP3Ca5BNgkkuEYB7e1mIUgvqeq/m+teazLB+AfIM8BJbeTiKmLtmjlWqfHYsC6u4ExGi29 O+8e8MYhVnC6s3sGd8tbeEqnX7OFv3fC8fAarcimiD3IEb/PdJH6MDg8e03BgnjT5LOIS7 Il/a9wYGOutVUZB2fFaeyv025J5yYexOfwoOiGLu7XAxla4P945+BWU7+kBqmvo0nKy23E JQNBHlyY0az2x9uVheGTME675vuOZhDRQLtLb3M9sVdLoob4J7IxiF/uOreI1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HJ17wtz140s for ; Sun, 28 Jun 2026 09:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 10ae3fc0b06a - stable/14 - rc: Improve load_kld 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10ae3fc0b06af407b31d00778836ae9844b8b0b1 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:56 +0000 Message-Id: <6a40ecdc.31b1c.340f543b@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=10ae3fc0b06af407b31d00778836ae9844b8b0b1 commit 10ae3fc0b06af407b31d00778836ae9844b8b0b1 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:43 +0000 rc: Improve load_kld * Centralize the usage message. * Document and enforce that -e and -m are mutually exclusive; previously, speficying both would result in only -e being applied. * If -e was not specified, and -m was not specified or did not match, fall back to `kldstat -n file` which will always work for modules that aren't built into the kernel. This means the kld and ntpd scripts can now rely on load_kld to dtrt. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57706 (cherry picked from commit a95d324dd3107afcbc16767d183acca7a57ebca9) --- libexec/rc/rc.d/kld | 6 ++++-- libexec/rc/rc.d/ntpd | 2 +- libexec/rc/rc.subr | 27 ++++++++++++++------------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index ccfffe3091a6..c7f667107e8f 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,10 +44,12 @@ kld_start() local _kld - echo 'Loading kernel modules:' $kld_list + startmsg -n "Loading kernel modules:" for _kld in $kld_list ; do - load_kld -e ${_kld}.ko $_kld + load_kld $_kld + startmsg -n " ${_kld}" done + startmsg "." } load_rc_config $name diff --git a/libexec/rc/rc.d/ntpd b/libexec/rc/rc.d/ntpd index 76d83149ae1a..75bed16413ea 100755 --- a/libexec/rc/rc.d/ntpd +++ b/libexec/rc/rc.d/ntpd @@ -64,7 +64,7 @@ can_run_nonroot() # the policy module if not already present, then check whether the # policy has been disabled via tunable or sysctl. [ -n "$(sysctl -qn security.mac.version)" ] || return 1 - sysctl -qn security.mac.ntpd >/dev/null || kldload -qn mac_ntpd || return 1 + load_kld mac_ntpd || return 1 [ "$(sysctl -qn security.mac.ntpd.enabled)" == "1" ] || return 1 # On older existing systems, the ntp dir may by owned by root, change diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index bef364af0843..2cc664cf473d 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1957,37 +1957,38 @@ mount_md() # Code common to scripts that need to load a kernel module # if it isn't in the kernel yet. Syntax: -# load_kld [-e regex] [-m module] file +# load_kld [-e regex | -m module] file # where -e or -m chooses the way to check if the module # is already loaded: -# regex is egrep'd in the output from `kldstat -v', -# module is passed to `kldstat -m'. -# The default way is as though `-m file' were specified. +# -e greps the output from `kldstat -v', +# -m uses `kldstat -m module'. +# The default way is as though `-m file` was specified. load_kld() { - local _loaded _mod _opt _re + local _loaded _mod _opt _re _x + _x=0 while getopts "e:m:" _opt; do case "$_opt" in e) _re="$OPTARG" ;; m) _mod="$OPTARG" ;; - *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; + *) _x=999 ;; esac + _x=$((_x + 1)) done shift $(($OPTIND - 1)) - if [ $# -ne 1 ]; then - err 3 'USAGE: load_kld [-e regex] [-m module] file' + if [ $# -ne 1 ] || [ $_x -gt 1 ]; then + err 3 'USAGE: load_kld [-e regex | -m module] file' fi - _mod=${_mod:-$1} _loaded=false if [ -n "$_re" ]; then if kldstat -v | egrep -q -e "$_re"; then _loaded=true fi - else - if kldstat -q -m "$_mod"; then - _loaded=true - fi + elif kldstat -q -m "${_mod:-$1}"; then + _loaded=true + elif kldstat -q -n "$1"; then + _loaded=true fi if ! $_loaded; then if ! kldload "$1"; then From nobody Sun Jun 28 09:43:58 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 4gp4HM1RjDz6jvy5 for ; Sun, 28 Jun 2026 09:43:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HL3cVXz3dqB for ; Sun, 28 Jun 2026 09:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639838; 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=C7RtUN8kFRAQr2kzYH8gqnnXHV1uJaAcONGOLuuRr1s=; b=lQ5eR2e7ZGwpbRjdb+lHCOAHCsSQzXAylRam8rnHiCNd27ujZLGW/b+adgFraslFsuhGuM t5g3dX0e3d1CWGAHFlc/NmG7BPyKnTUpiGE+pyH9RC50YnyCRde9hXccMkJ9imO6B04q6V EAyl+qUyaopqtbS+KtfOzG/BDMKsch4XfGafJKVaTjJbnHRSB0R1byiR6C5Xb4DXcycdCb 7LhLsEKZFs8Zfn+BUoNPfcUHTxQWSDKqfmRDPz7M5sMmlNFlB5JrRgGd9LP0xtxAIzokg1 oAT7tVqfGJeSvOpz5E/oti4qDsynGPJT5tZYnfyxkWAChduKMbfnFn2F/qcAuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639838; a=rsa-sha256; cv=none; b=sipc168W3i+UPeBD46euNZUH5FvMC2k4GGL+gUZ8bc2k4rWAgFonOBUrg72QQVJPU2YUzd KvS6Q2v3RpPmFAmtEpjPLMqMNQ9eJRSDRAWN934mUWoi5Kf9UxqPVv3aIB53pUgIAvAWRQ C1FCxWei2DpW/02oQbSMDdnkC5xy3wNVU5HlJ5Yp6Ljv/r1B3SrIj3T1m/RxzyB2lI6AMl dHLhv4xzMl3uvaqDXVCawb25EpxfqrmUkZRVdZGeBonvdr9s0RlJOhNf8JzHL/WOu7vwyv oz189WzeKK16CTirq2927MZYk5iGrpYXwxQdc3O3bXTnvR/O5xxtibdKrXrXbw== 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=1782639838; 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=C7RtUN8kFRAQr2kzYH8gqnnXHV1uJaAcONGOLuuRr1s=; b=qzpt6i519dB13uz58dHK5Yz0fWwpDf4pQJ/bdXLGPX7RDWSIziQxh0pT0NrchH7wxiYgPi kq7mBtRh7nbxbsrRQpaaFd5i1WqFlB6ZJVZpyWe1EDk8iiV7zHZM8e9wDnrKgpZfwyZxWp 1qj4IDilTEEoxS1txbZNTdKcwF0P4Oe2Dch9AXQR7ZmrJYAP10g6VAlQjVT5zOTRVX3Hvv mA/uR6hDPRsCL1jiPEpS0vuobZPtvr7do++KRMZeOoDnSkeRNWuXTmyYLmESEL/sEHPqN3 Y7fZIeY6NdyHdexY93FAmz76mEw2G4dcjQynivXQ1JOKSw2iqThtZzbf6qEh8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HL2bqCz14kr for ; Sun, 28 Jun 2026 09:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27b74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d4e539bbf0ad - stable/14 - adduser: Normalize supplemental groups 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4e539bbf0ad21dc8131e0525320b39372b97588 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:58 +0000 Message-Id: <6a40ecde.27b74.7a425b67@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d4e539bbf0ad21dc8131e0525320b39372b97588 commit d4e539bbf0ad21dc8131e0525320b39372b97588 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-25 03:05:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:44 +0000 adduser: Normalize supplemental groups Rather than insist on a space-separated list, normalize the input so that any number of spaces, commas, colons, or semicolons are accepted. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D57774 (cherry picked from commit 65fba082f44cb9451d2b12bcd99c3287d0a47acc) --- usr.sbin/adduser/adduser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index ecac7478befd..7db5fafcce62 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -580,7 +580,7 @@ get_groups() { fi read _input - [ -n "$_input" ] && ugroups="$_input" + [ -n "$_input" ] && ugroups="$(echo "$_input" | tr -s ',:;' ' ')" } # get_expire_dates From nobody Sun Jun 28 09:43:57 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 4gp4HK4bS1z6jvwT for ; Sun, 28 Jun 2026 09:43:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp4HK2j0Lz3dZT for ; Sun, 28 Jun 2026 09:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782639837; 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=JxfIRTwPdXyGXgLia808Cw3pLHJAMW/BPOc2DHwSF2E=; b=ZTZcJxxi8JCOV65Ro6NOaFJBG6Y28du1kTO91oYFTuv1unl16jGmBoiEnW15IMpVbgmgEO 4jmXVsqhEXol6PjjLQx+j9SclKwLvPzHKV8/v7Yve/eKG/jzCPAYlyJXPtmccWHjivlu+V EFbLZRchzmtjpgXGIYWmOedCxLQPnH1VBJRkXODAwHL7CfB8mWnixAi024ECRskujPASPg xZE8kW4Gr5FqSoIzaDEHtlEUTY6L7KD9SWR+lpXSC2l9x4XPAOcnASxvTUtIid4TUIBLdd xit5v9QkmUPHZzMrb7rsq9mzhkW78QjcJAG9IGLdnRNtsdcjMKm6fj29IHXIgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782639837; a=rsa-sha256; cv=none; b=RzDTcv2juo+J7E1HOD4iBst4yK7UnIi/srV9yhrhriSyjEazn1WHcjSLuMfbg1n6dKMpTo xQSKk1fswEsZInyIVdrZ/SXIwamCGIxvbtzNl9kzioG2P+JpfOTj2CzyS0OP1mCNEtTZVX kMP7NsdTbH5ngQV/QPJFjJ+/0oAlCfrY2WljYUgndGm34fXfrzSoIF8dDEqWEIJQvxcou0 9lcRN21boJ2OjHGO7P14XmMdZXqwWlaRzqkCD0YQPXaGg9D9H5qMJNyBvpwLEwi47UxQM+ EgYul2IUBwaAwPhUmbYRJA/AKBXhQUlP7gLfDkhyWaCj4gsWnHw8EFDx7LlnNw== 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=1782639837; 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=JxfIRTwPdXyGXgLia808Cw3pLHJAMW/BPOc2DHwSF2E=; b=JcmHsJdVzZv5RcoGkoEA3FmcGy0sogVd8/ebb1RoCbW+HiVY3pjaSvcCJSpNchUp6AagB/ 0XGny7yzlcJjSdeSjfaEee9ELAViqfXBWYC37ap/9b0X14kYmVktCCnMCm2DuXdWhDsZ5u Za4peul8fSH+1TGS4zcClXlALtHl2kYs8Rbvnel5J5RqeY2Gwi+2fCSfnO2R5pgp/TfLN9 tXpIbdHJvZdTpgbGj6oU/8zNQY253fzVG9AlQZhxgWPEIOCsEw9y0XlYPqyZ5EspDYcvV2 InHDKYn6jBRHF3Sequ5Iaq/BtQTQbYSYJwOP9+TGbrBTjAN0cmk2ItANVRrtyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp4HK1gk9z14kq for ; Sun, 28 Jun 2026 09:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31968 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 09:43:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: efd399675286 - stable/14 - rc: Make devmatch use load_kld 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efd39967528612ec6240737b6405687adc7a359a Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 09:43:57 +0000 Message-Id: <6a40ecdd.31968.1febf8f0@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=efd39967528612ec6240737b6405687adc7a359a commit efd39967528612ec6240737b6405687adc7a359a Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 15:23:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-28 09:43:43 +0000 rc: Make devmatch use load_kld The default behavior of load_kld is now robust enough for devmatch. Switching means settings from /etc/sysctl.kld.d are now properly applied when the corresponding modules are loaded by devmatch. While here, reduce the amount of output produced by devmatch from one line per module to a single line. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57707 (cherry picked from commit b9f616d031566e94e6967a2c533b8aa7f36123b9) --- libexec/rc/rc.d/devmatch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch index 37c4772cfcb7..9a16ab894379 100755 --- a/libexec/rc/rc.d/devmatch +++ b/libexec/rc/rc.d/devmatch @@ -64,6 +64,7 @@ devmatch_start() # names with .ko devctl freeze + startmsg -n "Autoloading modules:" x=$(echo "#${devmatch_blocklist:-${devmatch_blacklist}}#$(kenv -q devmatch_blocklist)#" | \ sed -e "s/ /#/g;s/\.ko#/#/g") for m in ${list}; do @@ -71,9 +72,10 @@ devmatch_start() case "${x}" in *"#${m}#"*) continue ;; esac - kldstat -q -n ${m} || \ - (echo "Autoloading module: ${m}"; kldload -n ${m}) + load_kld ${m} + startmsg -n " ${m}" done + startmsg "." devctl thaw } From nobody Sun Jun 28 16:08:07 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 4gpDpc0jpHz6jVSv for ; Sun, 28 Jun 2026 16:08:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpDpb6S7fz3D3j for ; Sun, 28 Jun 2026 16:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782662887; 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=7Y1jEk5D2aLaOgrgr+y+0awyJWQmb7g05L/5b0Nj8qQ=; b=Of0SZeZJKI/OYXO2YwC2sGARtvBzPmVcK6DnPMt4p7vu+ZqYscxgcCnvt++qQJdH4u4rcZ NeQiFTUrKieQo4gscJ3F7ld0hcOUl7RmoeQmxpRfwb3JevDxXHYYdNppEJPP1sK9ngWueR ChWyWrZ+OaWFQxAp06UxNS5CKn6WthP87seTkQ8krPnAeSrnqtxpdIXpgpGC10ns5H0LF7 isL4H4dZB/kdkVKvBzwgL3wuq7jJoOS52K73xDR4XhT6luy0ubfgvSZPKNdj+/4q7N3nU3 cmB7xsWdCELMG3Runrgen7BzbMU9sAV36Q3AayEi0e7CnfBfKOVPkzoEXheymQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782662887; a=rsa-sha256; cv=none; b=tSglHpiUq1lq0AlDT+Cox5u/Z8O7J1iotQBNlRQRN6JGiMaiTlj1QagYOyKbr63eS59Yo+ 1s/4clRYfMJ6yRdlECS26csmQ64U2B2jVScc3zYObCynIMvYFc3fRwyJD4I98ceLrHnOHk ryosNRiY6kGFC/4a44GJhu6M7gQKvugtdgJz9fyhimcOzo1tkevIGxLiWMrLKtwMk9mEBD RaBtPcQGxBhyjNkEocEI6gRK5yEqxucYbGvB9ebLhmtpXHktopDCXEa3OKYqQDGAz8pRNZ KDy+9qQbaSozh4+jISRTSv36SoMAlJvzDRDpULMe/lNRbjhsaMN3rT02xQG9Qw== 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=1782662887; 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=7Y1jEk5D2aLaOgrgr+y+0awyJWQmb7g05L/5b0Nj8qQ=; b=GSablAHnwHjIQkGcvtv0i1tf+c+IjS33mdw2oIKJ46Q2Fe71FHh3lDZMMCBvCg+cvsS8CF +l7OA0MHIwLdHA6uD3qqgwj7liw/WOhsEc+kmVeUAVY1frUpiXIYHp2P6bQl8idyNMaXGa BjVM35IhGn90od/Ldb2k222pt0jJN6eAPFfJfyuDxXOUW25EmhPXeXRE7uFb5UTV+Qd5af PcsF5mXq4A4axO2dt/PUckY8r8/eO/e9w6j/OCn7BS/iQJad50Y6gGElGjtZlfs9OqHpsx krqxD086x0NmeXo4qmNOAhKHOG5GHzRuNFzNy41rcDJILxm+tpwmEBLuRbfn3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpDpb5B73z2st for ; Sun, 28 Jun 2026 16:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32797 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 16:08:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 8f14ea499fc6 - stable/15 - jail: clean up locking around do_jail_attach 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8f14ea499fc67f9b6a6c0f53a6dc3a081c3b4080 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 16:08:07 +0000 Message-Id: <6a4146e7.32797.39d52724@gitrepo.freebsd.org> The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=8f14ea499fc67f9b6a6c0f53a6dc3a081c3b4080 commit 8f14ea499fc67f9b6a6c0f53a6dc3a081c3b4080 Author: Jamie Gritton AuthorDate: 2026-06-25 03:21:18 +0000 Commit: Jamie Gritton CommitDate: 2026-06-28 16:07:28 +0000 jail: clean up locking around do_jail_attach jail_attach_jd passed PD_DEREF to do_jail_attach, assuming it would take care of freeing the held prison. This is not true, as do_jail_attach immediately cleared that flag, leaving the jail stock in dying state when it is later removed. Reported by: markj Reviewed by: markj Differential Revision: (cherry picked from commit 3584cde63e416d150214192721cead4b735ca0b5) --- sys/kern/kern_jail.c | 75 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 72ccbdf77550..8a6c3e1d3fd0 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -154,7 +154,7 @@ int lastdeadid = 0; static int get_next_prid(struct prison **insprp); static int get_next_deadid(struct prison **insprp); -static int do_jail_attach(struct thread *td, struct prison *pr, int drflags); +static int do_jail_attach(struct thread *td, struct prison *pr, int *drflagsp); static void prison_complete(void *context, int pending); static void prison_deref(struct prison *pr, int flags); static void prison_deref_kill(struct prison *pr, struct prisonlist *freeprison); @@ -2238,11 +2238,12 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) pr->pr_state = PRISON_STATE_ALIVE; } - /* Attach this process to the prison if requested. */ + /* + * Attach this process to the prison if requested. This will + * unlock allprison_lock, meaning changes are now user-visible. + */ if (flags & JAIL_ATTACH) { - error = do_jail_attach(td, pr, - prison_lock_xlock(pr, drflags & PD_LOCK_FLAGS)); - drflags &= ~(PD_LOCKED | PD_LIST_XLOCKED); + error = do_jail_attach(td, pr, &drflags); if (error) { vfs_opterror(opts, "attach failed"); goto done_deref; @@ -2934,27 +2935,32 @@ int sys_jail_attach(struct thread *td, struct jail_attach_args *uap) { struct prison *pr; - int error; + int drflags, error; error = priv_check(td, PRIV_JAIL_ATTACH); if (error) return (error); sx_slock(&allprison_lock); + drflags = PD_LIST_SLOCKED; pr = prison_find_child(td->td_ucred->cr_prison, uap->jid); if (pr == NULL) { - sx_sunlock(&allprison_lock); - return (EINVAL); + error = EINVAL; + goto done; } + drflags |= PD_LOCKED; /* Do not allow a process to attach to a prison that is not alive. */ if (!prison_isalive(pr)) { - mtx_unlock(&pr->pr_mtx); - sx_sunlock(&allprison_lock); - return (EINVAL); + error = EINVAL; + goto done; } - return (do_jail_attach(td, pr, PD_LOCKED | PD_LIST_SLOCKED)); + error = do_jail_attach(td, pr, &drflags); + + done: + prison_deref(pr, drflags); + return (error); } /* @@ -2971,40 +2977,43 @@ sys_jail_attach_jd(struct thread *td, struct jail_attach_jd_args *uap) sx_slock(&allprison_lock); drflags = PD_LIST_SLOCKED; + pr = NULL; error = jaildesc_find(td, uap->fd, &pr, &jdcred); if (error) - goto fail; + goto done; drflags |= PD_DEREF; error = priv_check_cred(jdcred, PRIV_JAIL_ATTACH); crfree(jdcred); if (error) - goto fail; - mtx_lock(&pr->pr_mtx); - drflags |= PD_LOCKED; + goto done; /* Do not allow a process to attach to a prison that is not alive. */ if (!prison_isalive(pr)) { error = EINVAL; - goto fail; + goto done; } - return (do_jail_attach(td, pr, drflags)); + error = do_jail_attach(td, pr, &drflags); - fail: + done: prison_deref(pr, drflags); return (error); } +/* + * Attach the current process to a prison. On entry, the allprison + * lock should be at least shared. On exit, both it and the prison + * itself will be unlocked, which will be refelected in *drflagsp. + */ static int -do_jail_attach(struct thread *td, struct prison *pr, int drflags) +do_jail_attach(struct thread *td, struct prison *pr, int *drflagsp) { struct proc *p; struct ucred *newcred, *oldcred; - int error; + int drflags, error; - mtx_assert(&pr->pr_mtx, MA_OWNED); sx_assert(&allprison_lock, SX_LOCKED); - drflags &= PD_LOCK_FLAGS; + KASSERT(prison_isvalid(pr), ("Attaching to invalid prison %p", pr)); /* * XXX: Note that there is a slight race here if two threads * in the same privileged process attempt to attach to two @@ -3013,16 +3022,22 @@ do_jail_attach(struct thread *td, struct prison *pr, int drflags) * a process root from one prison, but attached to the jail * of another. */ - if (!(drflags & PD_DEREF)) { - prison_hold(pr); - drflags |= PD_DEREF; - } + + /* + * Note the caller's locking state, but gain and track our own + * references. The caller will see that locks have been + * dropped (which isn't true now, but will be after OSD calls). + */ + prison_hold(pr); refcount_acquire(&pr->pr_uref); - drflags |= PD_DEUREF; - mtx_unlock(&pr->pr_mtx); - drflags &= ~PD_LOCKED; + drflags = PD_DEREF | PD_DEUREF | (*drflagsp & PD_LOCK_FLAGS); + *drflagsp &= PD_OP_FLAGS; /* Let modules do whatever they need to prepare for attaching. */ + if (drflags & PD_LOCKED) { + mtx_unlock(&pr->pr_mtx); + drflags &= ~PD_LOCKED; + } error = osd_jail_call(pr, PR_METHOD_ATTACH, td); if (error) goto e_revert_osd; From nobody Sun Jun 28 18:40:12 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 4gpJB44T4Gz6jkQ4 for ; Sun, 28 Jun 2026 18:40:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJB43zxSz3XGy for ; Sun, 28 Jun 2026 18:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672012; 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=5nLQnrUG9o/4tqqDtkE+L+ir6SrbiZa8LCrpXKOprAE=; b=r6kiOgrJsYSs1T2A6zguSJ9/ZmTu7Mm0QOdCcneTgrmq62+OXd+Evw6IM+zOE4l8EXNshV Huz63b93SQdsrOr01F1C1pDVGvpK+aQLaU8ArRYoO9oRbziQNp5k4klWv66AlvHAC0pWhg Wjm9vD6Ba5ghhkX9u5yaGhIPo2DMP/0fKnbbDVXo3H2/j0E7dLAYKCK3kx47NbPjvG+Jc/ sbbsVAVfDRWh6i+QoJm/pXzOn2aNEvwWa9ZZNboj6/j35lDOu9jH+BO07aTcl9JPgK6V9V uZdFX0KFnMWLgsuVQfR9lKLOBIs0QZaxsouRYK/9cClV35HqIFzXRsRBDOazdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672012; a=rsa-sha256; cv=none; b=yR1pKt4wVVGSAp1GDjPiwtienoFzNZn5QluB+sbadfxy9WJrmpNUtFZbOCPqB+6uPMHMSK /EV/Esi3zqSCgqrgsweyKnti5ExWjtFQeIJ9wJXDWtzymrv2+JKFA9XE0uL3uPNkBdfDBo OxxSlILRAgtUgtX4t0VPN8/T8eSkJTs7gfPQB2yAQe71ZoZBbwLK+JToidULMtKlbJyz1V HffczoUj703z+sIGmYaTJJ5ki83pTH/bGBq+K6/EgjxEMy0x5kmY32GTGCxSfQ/pMzeiuY O0SWQcCDWkkJ5oOS57UkwZWp/EY8eyDjmTWz2QTJaZYxE0fQ3yi9Y3QYwgo24A== 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=1782672012; 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=5nLQnrUG9o/4tqqDtkE+L+ir6SrbiZa8LCrpXKOprAE=; b=A+c1veiUwbsW/k43VpriQsRtI2eqqYmoRWrGEm2lLbMvCtYS2Al5K+RsYbwDYMPb56Y7pA mRzWwxNpRi9yMunr8mo9/N5qA6fUYnAMWcV/ryNhOiqBXJ0cgQAmOmRVeGDjsfz3dSySv/ AxDoiHb4EksucHREenOoWwZK98qyTb8TmChQdTyZnBilfyAKIZK2GBr8DvpOFHLWLRjyVw /5UeIHXhds8P2RMVDfGuUjOLSPlciTnIjhtYEbdQIpIhmBIsiIfW4F06SgbQd6DS5NFOdC 1XeBTXSosyOiPVR4esqQtSfSoRdutTx/b7IDd2woPtYmVkdTc2s16iTXPbZ2Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJB4270jz75f for ; Sun, 28 Jun 2026 18:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bcd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: bc3e0c6afdb9 - stable/15 - init: allow to specify a custom path for rc(8) 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bc3e0c6afdb9adbe49f2efe8739580782bf6244b Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:12 +0000 Message-Id: <6a416a8c.1bcd6.421ed633@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bc3e0c6afdb9adbe49f2efe8739580782bf6244b commit bc3e0c6afdb9adbe49f2efe8739580782bf6244b Author: Baptiste Daroussin AuthorDate: 2026-05-05 12:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:23 +0000 init: allow to specify a custom path for rc(8) This is useful for testing alternative service managers without modifying /etc/rc MFC After: 1 weeks Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56828 (cherry picked from commit 9f2ad7c09709e01ff6b856df0315e91ddc20df32) --- sbin/init/init.8 | 10 +++++++++- sbin/init/init.c | 18 +++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 85b1db2ddf06..f562efde0b51 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 22, 2021 +.Dd May 5, 2026 .Dt INIT 8 .Os .Sh NAME @@ -396,6 +396,14 @@ back to the default, so that the .Pa /etc/rc script is executed with the standard shell .Pa /bin/sh . +.It Va init_rc +If set to a valid file name in the root file system, +overrides the default path to +.Xr rc 8 +.Pq Pa /etc/rc . +This is useful for testing alternative service managers +without modifying the default +.Pa /etc/rc . .It Va init_path Specifies the path used to search for the init binary. More than one binary can be listed in the string, diff --git a/sbin/init/init.c b/sbin/init/init.c index d28501053c7f..db680c7f73bd 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1025,11 +1025,23 @@ static state_func_t runcom(void) { state_func_t next_transition; + char runcom_path[PATH_MAX]; + const char *rc_script; - BOOTTRACE("/etc/rc starting..."); - if ((next_transition = run_script(_PATH_RUNCOM)) != NULL) + /* + * Allow overriding /etc/rc via the init_rc kenv variable. + * This is useful for testing alternative service managers + * without modifying /etc/rc. + */ + if (kenv(KENV_GET, "init_rc", runcom_path, sizeof(runcom_path)) > 0) + rc_script = runcom_path; + else + rc_script = _PATH_RUNCOM; + + BOOTTRACE("%s starting...", rc_script); + if ((next_transition = run_script(rc_script)) != NULL) return next_transition; - BOOTTRACE("/etc/rc finished"); + BOOTTRACE("%s finished", rc_script); runcom_mode = AUTOBOOT; /* the default */ return (state_func_t) read_ttys; From nobody Sun Jun 28 18:40:13 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 4gpJB56MpJz6jkYB for ; Sun, 28 Jun 2026 18:40:13 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJB53QxNz3XPm for ; Sun, 28 Jun 2026 18:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672013; 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=vlYKadxC8Goy8/USlLVJX756sNWEwplnv5PJj3uqwEQ=; b=WLrahgkqQ2+Er5XAGF0QqcOVODEebBFbvzAlhGPpt1O9Y0NRZjL2NlyUF+FwF3h05Fi75m X0ZJfqSO19GIdB1h5h/3uRD1SZL0OTSENWQwr36XNl3piPP6hQZyciy6nytKpvr3hCCU67 MC4safKp2zB2lWg/RA8aUzXAXOD7KoVZVNtFwhFmKir7GOi3cJUDUrD/MYzc0LRn9l6t0F 8SEvZiUrbJ2ZpCvcgsa6vsnQl3lpY+ku0uWcvOgQ7oAbtchY7KAYhbwwNa489xzaUvtwOu ida5RqfbegAtB2f/UcS6TNMbOWmmVmKYqzkVvnm8CnnAE1V4zuFPkqK4BAOUGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672013; a=rsa-sha256; cv=none; b=EQMjcoDUVNzdVSMg0DqD/BdyZW63ZdlxRtSY1RW5wEoOO9i6U6g3R0jlhMgVwNxchW77CE JvYsi5arCbCfjXvKOV7ODgydFIspZYdTIqVzYbTFLDS2l8whHgNIUw4iUSmRpd2rhMHl/P 5V60XJs6qd7S+Zz8V4uiqiiUS7s2lCWUwJM25wubnE2SIbtqoV8O3Qek+VXoGeVBrLau2P TDkVyNzv+ghiyVwSGK42lty/LqtYOkOCIZA7ERHpJw2T60wUFgm3IrhhObJUpO16crP8xq eU1Jk5JNAEbdf3JaTVBf8vBjVNSxSc27G7INZ8C/Fk5fHflp2q7o6Oep/3PoXQ== 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=1782672013; 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=vlYKadxC8Goy8/USlLVJX756sNWEwplnv5PJj3uqwEQ=; b=K/LxgX5DapvNGZXqgM6JCOI9GZsBw9btTu5/sbAJbjLYh5Th+z0+Yzu0xetbvDiJ7+eIQj H9yq9Xdi+VS/bnJPAjgJkYxXDBFCl4yk0AqosFude7P3HEk7QBS4U3TAgt94pmXro8gZlS h6l5/yksZD8LHWk3vN4M0sI+kEA+muEd2+Pw3Kp6+JychVwpYAtUi66BYkaIgZDRx2C3DT RIZF020NNZ1whiMyrQoxm1U9/7wkmg3jEKiBSDr854iivVJVRwr5E4GSS82jb8beZ/hcn2 KI7BYY4GfjFSN1CjATOAFddiNuC27Av3UmBavvcFn81uTo8oLY3n/f5r2HWJAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJB51yWXz6yy for ; Sun, 28 Jun 2026 18:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c738 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 5c7627e96f22 - stable/15 - devmatch: read linker.hints from all module paths 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5c7627e96f22127c1cc9176662431ecdd4dc3264 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:13 +0000 Message-Id: <6a416a8d.1c738.2c5cfa86@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5c7627e96f22127c1cc9176662431ecdd4dc3264 commit 5c7627e96f22127c1cc9176662431ecdd4dc3264 Author: Baptiste Daroussin AuthorDate: 2026-05-06 13:11:16 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:23 +0000 devmatch: read linker.hints from all module paths Previously, devmatch would stop at the first linker.hints file found in kern.module_path. This meant modules installed in /boot/modules/ were invisible to devmatch if /boot/kernel/ contained a linker.hints file (which it always does). Merge hints from all directories in kern.module_path. This allows third-party or out-of-tree kernel modules in /boot/modules/ to be auto-loaded by devmatch just like built-in modules. Reviewed by: imp Differential Revivion: https://reviews.freebsd.org/D56847 (cherry picked from commit 748402ebf2d7a08b13d0b21694afdaad55cfa9cd) --- sbin/devmatch/devmatch.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 4a5a300ca313..3cd150fe19d2 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -100,6 +100,9 @@ read_linker_hints(void) size_t buflen, len; if (linker_hints == NULL) { + void *all_hints = NULL; + size_t all_len = 0; + if (sysctlbyname("kern.module_path", NULL, &buflen, NULL, 0) < 0) errx(1, "Can't find kernel module path."); modpath = malloc(buflen); @@ -109,13 +112,39 @@ read_linker_hints(void) errx(1, "Can't find kernel module path."); p = modpath; while ((q = strsep(&p, ";")) != NULL) { + void *h; + snprintf(fn, sizeof(fn), "%s/linker.hints", q); - hints = read_hints(fn, &len); - if (hints == NULL) + h = read_hints(fn, &len); + if (h == NULL) continue; - break; + if (len < sizeof(int) || + *(int *)(intptr_t)h != LINKER_HINTS_VERSION) { + free(h); + continue; + } + if (all_hints == NULL) { + all_hints = h; + all_len = len; + } else { + void *merged; + + merged = realloc(all_hints, all_len + len - sizeof(int)); + if (merged == NULL) { + free(h); + continue; + } + all_hints = merged; + memcpy((char *)all_hints + all_len, + (char *)h + sizeof(int), + len - sizeof(int)); + all_len += len - sizeof(int); + free(h); + } } - if (q == NULL) { + hints = all_hints; + len = all_len; + if (hints == NULL) { if (quiet_flag) exit(EX_UNAVAILABLE); else From nobody Sun Jun 28 18:40:14 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 4gpJB65xx3z6jkPF for ; Sun, 28 Jun 2026 18:40:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJB64Z2bz3XcH for ; Sun, 28 Jun 2026 18:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672014; 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=wL1FyQ9D6HQCS2pwW1PvDOrhkXaMX0WuMXgtomgZQwY=; b=rbqDPe1rwJwuC+NRzxuS0Z41kV5eKahxRDa8AN0U+g5tanGeT+an6lYY9XWV8iWAwTNsZr d3lxezl9O+K+7KQYZgXndekSV2PAj+Z7wfAn/ju4FQP6px8i99eoYVU0WEFCEJq6PHLbuY bcYiJA3Sn/lssBBwe0ZYgIbUHiTDExidTYbQY1vt5FXPTlxBIW0Gqabqc1esUcowoGIG10 tFbSZjIxiYe1EJgf9IIRfCPyqpxzTkz/xIMH2LohULNGtNmU1JRNxJXUDQPOm/PjX/Bejp kBtEnJhNIbHtrhfKMiS9Oaxdipp51ZXGuiFcOEcv4n8HeJN13BXAWQk/vI0sLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672014; a=rsa-sha256; cv=none; b=mn8RsxyqJdDOWpiV/xtHVVjS1CYhShW8C4kDKmltbbScAf6WIFV/8Wx00hY3EJvgpVr1Wo qw5EMkfS5oI6u+1dp8JTYbqPfA4wra51uf5a/YlfSuw/Xk7V1ItoP21Tq3FRIdJjaYNohr oewZP19Cte+4oiQgU7+wnrSn1B1y21Z3GD67dpPF79ebI6h9NGcLY4dr1kcd3dzaIoeVXK k/9a1cwCmXOtg+Kq6WwkrSL/OM/Ahv/l6OmRtJYFi337mMwzVNWDIny6mgjcF0M/IMbr+V d+Cg4SYhdWfTus69xAxt4ZfDM0eRAwNwb6Hx5udGtkxNDqxNRLzTGdbuAfCDlA== 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=1782672014; 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=wL1FyQ9D6HQCS2pwW1PvDOrhkXaMX0WuMXgtomgZQwY=; b=cR4X7rd46M98jVusjHvJTtSyzcUYiziiGGlBOUZMuDn+uptAPeQr26YhQhXChaBpFXVzap 1FwzKpSkC2Ylis2W2s+lCHrNKo3TtWFxaqXLzMgp/VI48EHbqpe1ksDN+59/+7+Y2nRMsi HwtNKjWfZ9DUL+8HiRfn97mORL8OY+MVAjJytJ4dNS73rfuVIoRQ1rviVpwlOViciFP/85 i77fSjKygDgCI+lvax13QIeixhj6oWrEQDfgKhNwTgbf3hLnDMaH/Vor7iwb7eexPPEjDz bpG5iZnr0b8tDMFwayyVYjLFpPTYVTpbDqZoSv640Ahhv+MJ8UCkpoPKwS43jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJB63DjVz6nW for ; Sun, 28 Jun 2026 18:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c861 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 413258a547df - stable/15 - nuageinit: add decode_base64 tests 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 413258a547dfaca24b22087715220370b6c8a676 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:14 +0000 Message-Id: <6a416a8e.1c861.17364e90@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=413258a547dfaca24b22087715220370b6c8a676 commit 413258a547dfaca24b22087715220370b6c8a676 Author: Baptiste Daroussin AuthorDate: 2026-05-07 17:17:56 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:23 +0000 nuageinit: add decode_base64 tests (cherry picked from commit 68fd0feacb8ce5da9c47deea5505b3241b2ba6ec) --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/decode_base64.lua | 61 +++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 8 ++++ 3 files changed, 70 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index dc8997717b59..feca49784c9e 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -18,5 +18,6 @@ ${PACKAGE}FILES+= sethostname.lua ${PACKAGE}FILES+= settimezone.lua ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua +${PACKAGE}FILES+= decode_base64.lua .include diff --git a/libexec/nuageinit/tests/decode_base64.lua b/libexec/nuageinit/tests/decode_base64.lua new file mode 100644 index 000000000000..0951d77f0ed7 --- /dev/null +++ b/libexec/nuageinit/tests/decode_base64.lua @@ -0,0 +1,61 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +-- decode_base64 is not exported, test via addfile + +local function test_decode(input, expected) + local r, err = n.addfile({ + content = input, + encoding = "base64", + path = "/tmp/nuage_test_b64" + }, false) + if not r then + n.err(err) + end + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if not root then + root = "" + end + local f = assert(io.open(root .. "/tmp/nuage_test_b64", "r")) + local str = f:read("*all") + f:close() + if str ~= expected then + n.err("base64 decode failed: expected '" .. expected + .. "' got '" .. str .. "'") + end +end + +-- empty input +test_decode("", "") + +-- single byte: 'a' +test_decode("YQ==", "a") + +-- two bytes: 'ab' +test_decode("YWI=", "ab") + +-- three bytes: 'abc' +test_decode("YWJj", "abc") + +-- newline in base64 +test_decode("YmxhCg==", "bla\n") + +-- spaces should be ignored +test_decode("Y Q = =", "a") + +-- b64 alias +local r, err = n.addfile({ + content = "YQ==", + encoding = "b64", + path = "/tmp/nuage_test_b64_b64" +}, false) +if not r then + n.err("b64 encoding alias should work: " .. tostring(err)) +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 57d83b62928a..1c8d717a5b67 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -14,6 +14,7 @@ atf_test_case adduser atf_test_case adduser_passwd atf_test_case addgroup atf_test_case addfile +atf_test_case decode_base64 settimezone_body() { @@ -90,6 +91,12 @@ addfile_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/addfile.lua } +decode_base64_body() +{ + mkdir tmp + atf_check /usr/libexec/flua $(atf_get_srcdir)/decode_base64.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -98,4 +105,5 @@ atf_init_test_cases() atf_add_test_case adduser_passwd atf_add_test_case addgroup atf_add_test_case addfile + atf_add_test_case decode_base64 } From nobody Sun Jun 28 18:40:15 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 4gpJB75y1Qz6jkFc for ; Sun, 28 Jun 2026 18:40:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJB73j8Vz3XSj for ; Sun, 28 Jun 2026 18:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672015; 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=86IMBOxPu/FNW+TMciaREwmSKIxQ24YjnIR/7kiSTEk=; b=PJy4htDtk/4d9xzV0Xb5A7OM63cl+r/kxF6AaAFlcSpVUH0WDOISxPPVH9EmrmN2VxaUsB AELLFzvWpMMbjO2wFOUZwt3EZad31NirjdUbOezIDpP5kFk/IVQkBXtQsmnIQi1FNgf1Sf VJwoBkMVyIsj3AazwpdKJsFUarm9KhJb3zKOwnOl10B/VwQivVlZjgAQzHl54APspOpadZ Xye+09dFQvmGZ5vudayePfFgKugPY4hflm0teLHBm3XxAXQ8u2JIg0n0BqDQf6dd/Tu9UC /JkD8DmAhwUmnVeVBnAbJPOEP42w/s1NxcXPaD1fDPCuyS8vEORu90z96Yhojg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672015; a=rsa-sha256; cv=none; b=c5guwOBZ1k6a7J/lyG3QX/Tet5k06qqWY5DCEA6pl3qhVr9pmEBSs8my0axsd6KVPKuwzB wwU0j4ML0/19b/PikwkaI9LIjRCiLmF73CGWyta/DUzXHxUkcue/4o/IZC81tdcJ9KB0XX szLT2YW0Bn0U01delhg3c4KvWC7Io/1DNnnkQeY8kBw9LLkdudTRCLUP8Diol0gU5oqqcd EdowPei7CmKwTrMnjfzNaIhLriS8rN4tpAxaG/LYw85DmfSHT/WAdTWJo20JNP57DFBhMc Cxp9EBKnxpKaoAYqb+5dLng/bfuaxPVRb4+FtQpr62JKHwiFelWvYzGt9m3TPA== 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=1782672015; 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=86IMBOxPu/FNW+TMciaREwmSKIxQ24YjnIR/7kiSTEk=; b=KPpQ/Z6AlBv6DBXbcDi0s1NIBxQz71nyYeldlmXpg1QieLNEoi8k60Ve0h4+DRv0/+I4vY hbyn/NiOe5gDwsWpWhFhVc2aNoYWM6MVvHKDZzK2l6OUq27CNE7S0Fj6ceEaZop4JPHrQ7 ieTIPRjJGbDjcxe+fwtGlfpfb7fL5gNV+KfSTFV3Hmwwqeg5rHh79KoPZKoG1Fp/b36VeS qnjj923s/7gQN4BAfV2apjcuvfB3bKHfJajblV/V0F1SUjbl8TzwBubRIpjkbyeJjcj6Ya ZBDbKOklbu7TgC8Tvs3anrmwRNztldMzlUvB8Ny26oEsg2YHfBrVv89erhLazA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJB72f3Zz6Yk for ; Sun, 28 Jun 2026 18:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c73c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3a0732153ebd - stable/15 - nuageinit: add addsudo tests 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3a0732153ebd636f82ff5ff999ecb73ebc7e5b1a Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:15 +0000 Message-Id: <6a416a8f.1c73c.1f97a9bd@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3a0732153ebd636f82ff5ff999ecb73ebc7e5b1a commit 3a0732153ebd636f82ff5ff999ecb73ebc7e5b1a Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:47 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:23 +0000 nuageinit: add addsudo tests (cherry picked from commit a49b3b10aae2db1f4a4ecf310fdedc80eb6bb7e2) --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/addsudo.lua | 61 +++++++++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 7 +++++ 3 files changed, 69 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index feca49784c9e..d13ad14f1d8f 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -19,5 +19,6 @@ ${PACKAGE}FILES+= settimezone.lua ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua +${PACKAGE}FILES+= addsudo.lua .include diff --git a/libexec/nuageinit/tests/addsudo.lua b/libexec/nuageinit/tests/addsudo.lua new file mode 100644 index 000000000000..7fc5865d83f4 --- /dev/null +++ b/libexec/nuageinit/tests/addsudo.lua @@ -0,0 +1,61 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local function get_localbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local lb = f:read("*l") + f:close() + if lb == nil or lb:len() == 0 then + lb = "/usr/local" + end + return lb +end + +local function read_sudoers() + local path = root .. get_localbase() .. "/etc/sudoers.d/90-nuageinit-users" + local f = io.open(path, "r") + if not f then + return nil + end + local content = f:read("*a") + f:close() + return content +end + +-- test with a single string rule +n.addsudo({ name = "testuser", sudo = "ALL=(ALL) NOPASSWD:ALL" }) +local content = read_sudoers() +if not content then + n.err("sudoers file not created") +end +if content ~= "testuser ALL=(ALL) NOPASSWD:ALL\n" then + n.err("unexpected sudoers content for string rule: '" .. content .. "'") +end + +-- remove file for next test +os.remove(root .. get_localbase() .. "/etc/sudoers.d/90-nuageinit-users") + +-- test with a table of rules +n.addsudo({ + name = "testuser", + sudo = { "ALL=(ALL) NOPASSWD:/usr/sbin/pw", "ALL=(ALL) ALL" } +}) +content = read_sudoers() +if not content then + n.err("sudoers file not created for table") +end +if content ~= "testuser ALL=(ALL) NOPASSWD:/usr/sbin/pw\ntestuser ALL=(ALL) ALL\n" then + n.err("unexpected sudoers content for table: '" .. content .. "'") +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 1c8d717a5b67..9e3442281c15 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -15,6 +15,7 @@ atf_test_case adduser_passwd atf_test_case addgroup atf_test_case addfile atf_test_case decode_base64 +atf_test_case addsudo settimezone_body() { @@ -97,6 +98,11 @@ decode_base64_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/decode_base64.lua } +addsudo_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/addsudo.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -106,4 +112,5 @@ atf_init_test_cases() atf_add_test_case addgroup atf_add_test_case addfile atf_add_test_case decode_base64 + atf_add_test_case addsudo } From nobody Sun Jun 28 18:40:16 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 4gpJB86ZDgz6jkSV for ; Sun, 28 Jun 2026 18:40:16 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJB84dhXz3XMG for ; Sun, 28 Jun 2026 18:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672016; 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=hg8ofyhmjRKjbwUq6a1iF+773dmpH40SXcUSOawIIo4=; b=QUxHxSOnZZxC2DyjQ45k9/kItkySDrscwXJ97Yd2TfjLiGalrOvKtq5WVQ2arNeC+3an49 greMjpZKgjRuSWrmm4ero+Vp75h0luwqzJy0HVyJRO0fPPbCGqVP4SATz8c8P8tErNVQCy c3SjoFT9vzhod0NoiZviMXRAvkk2DujraDlP1Q6oQR873+hFbMu7brv18WD2QB3K9kdIG4 lapAW5UzUDrRC9P9B33daZg1mxPVoXqWsoYr8KE9SRZ9TWpxByXPRk86nPMFfu6dXVudTT +JuNDudY8BIv3YQK+w4wmpDTJFOsb/+HTXKji8Muurxe+ucnar9cTUzCDrordQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672016; a=rsa-sha256; cv=none; b=m2t13wOPDG113CbJMHpPPGjmDpnV4qckz4bW6xCVYrIL+KaQpMaEP3zqM2Pdff1dDBtbzI LcZodP9leiNE7DuMfJ/KEgclxfgWxxS3FS7C7rXovKdPelqkdRzO4u5LK6XP58+Ka9YXp5 wee5ZcjmwuKIYBPKdc5gzu+ZD65pXtmEnYWSx+MQV3qcyGx9A28/sEtG1KQBWrn2COeim4 oKg/N5LBlA/kwj8CDJoePb0Fw0uSioh2VJhDtv0kgt8soQayuAe0IxFgXVPV/iSoIPLq6q VPf6hezbL5cIi6LwA72T8GhdJwl+lbQPSF9gfJKV9zR6qn+QRDt+cLOI+KeYlQ== 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=1782672016; 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=hg8ofyhmjRKjbwUq6a1iF+773dmpH40SXcUSOawIIo4=; b=wGPnKyZJWO18xSySu5P/PpIslvxyTp+WmxKh0j1bif8vpgFRRHloVxHO3ScCY59AXbrReW AWEGKwMj36nl3vB61aJEdZqlQivDiKjeHgcFBiztBnLlNiDyI989nv4m7tp3+iIvtCdUjL QMMNlNuB4JkokTmgfSfPR7TvOiOJtmXG8HalA5pUBon60GKgxKRuysko/Y+7YUOL7J/9Or yPe+GY6aU19OscbRWdlpoDJGVSR7nxExit/ZujukzhsPomFihKjaeoHDfrvgS4VTepdrwZ 6u8HovRCiQzUuEQWYw/Voa7QJkKhEHRpF7WS9MSog4YZjSffuW1AF/WSgfXlew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJB82yDDz700 for ; Sun, 28 Jun 2026 18:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c324 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3b91e432616d - stable/15 - nuageinit: add adddoas tests 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3b91e432616da67c0e54f53c0c9564498a68fe44 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:16 +0000 Message-Id: <6a416a90.1c324.10471765@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3b91e432616da67c0e54f53c0c9564498a68fe44 commit 3b91e432616da67c0e54f53c0c9564498a68fe44 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:23 +0000 nuageinit: add adddoas tests (cherry picked from commit 0f92bee2b3e08ffa34720a2eeffbce01af3f19f9) --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/adddoas.lua | 64 +++++++++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 7 ++++ 3 files changed, 72 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index d13ad14f1d8f..4c99f8e31ce3 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -20,5 +20,6 @@ ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua ${PACKAGE}FILES+= addsudo.lua +${PACKAGE}FILES+= adddoas.lua .include diff --git a/libexec/nuageinit/tests/adddoas.lua b/libexec/nuageinit/tests/adddoas.lua new file mode 100644 index 000000000000..d4bab41ecc3d --- /dev/null +++ b/libexec/nuageinit/tests/adddoas.lua @@ -0,0 +1,64 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local function get_localbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local lb = f:read("*l") + f:close() + if lb == nil or lb:len() == 0 then + lb = "/usr/local" + end + return lb +end + +local function read_doasconf() + local path = root .. get_localbase() .. "/etc/doas.conf" + local f = io.open(path, "r") + if not f then + return nil + end + local content = f:read("*a") + f:close() + return content +end + +-- test with a single string rule with %u substitution +n.adddoas({ name = "testuser", doas = "permit persist %u as root" }) +local content = read_doasconf() +if not content then + n.err("doas.conf not created") +end +if content ~= "permit persist testuser as root\n" then + n.err("unexpected doas.conf content with %u: '" .. content .. "'") +end + +-- remove file for next test +os.remove(root .. get_localbase() .. "/etc/doas.conf") + +-- test with a table of rules +n.adddoas({ + name = "testuser", + doas = { + "deny %u as foobar", + "permit persist %u as root cmd whoami" + } +}) +content = read_doasconf() +if not content then + n.err("doas.conf not created for table") +end +if content ~= "deny testuser as foobar\npermit persist testuser as root cmd whoami\n" then + n.err("unexpected doas.conf content for table: '" .. content .. "'") +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 9e3442281c15..01c4612eb8ec 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -16,6 +16,7 @@ atf_test_case addgroup atf_test_case addfile atf_test_case decode_base64 atf_test_case addsudo +atf_test_case adddoas settimezone_body() { @@ -103,6 +104,11 @@ addsudo_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/addsudo.lua } +adddoas_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/adddoas.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -113,4 +119,5 @@ atf_init_test_cases() atf_add_test_case addfile atf_add_test_case decode_base64 atf_add_test_case addsudo + atf_add_test_case adddoas } From nobody Sun Jun 28 18:40:17 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 4gpJB9720Dz6jkPf for ; Sun, 28 Jun 2026 18:40:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJB95RH8z3XMY for ; Sun, 28 Jun 2026 18:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672017; 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=Dls9Uguaga6kAxbxm8viXBCNLofbkWckYvGE8BABq9U=; b=xhYP9cifLTLvGBZbjGDziVBFH1PWSjr2QGG1Oac38wvlf1kiAMmYVPELX6VJ8hHKH9jKb6 G5pUIfx5/EhGtfxMLFGoADI/o9EuvOiBHdDobH46120heeMvfjXYFJUViyBWPYDqhjlSLJ e8KBjgYuaxEkVdH1kj7iPA4GDwPT78EHoEokZ2V2xkSFkbC9pGaLh2PK3tYxXvuqjTmMvC Og4h6cMv3hRTaAosjlA80llTnYRfacpoJVSlZHnWauXCzbdL6o3WyThLxMojAj4B+Ni5X9 2bzTn/iDpj8qYJGLi6FcWBxKOn3gKHfNcKGgdTDCsxyf0RH0fcn4QNIrD2c6mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672017; a=rsa-sha256; cv=none; b=Ll5ByO+m2osCPR8cvNctJoAW51mWMdrnsj0xCQevk6zAl7XTU6xiCUBZP7Vn0OR/zbRN6T /xN1x7yTa3Y3cVx0XuukO+93/7lvkNowZ36RqHw9EqiOZy3bydG9gTHpd67m7mRybAeBu1 CYNX8o2HAH+mS/B7qqpDR3sGz2494cvBcfEm6b+98RV+JoG5Szbhh3ajwpRXDq2Jf8vwNl NhfzD7UhNRDy8sao3uM7Z7VUB8tpmN7FK5FD4LNopLUsTmtWILjxJbeFlVt6d4dHbaxAla rfNzbRT8ixYNXVPpQpLn731DzTdeQZxBgNxyNgjPhStlVPjKND2VdayNHwtfmg== 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=1782672017; 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=Dls9Uguaga6kAxbxm8viXBCNLofbkWckYvGE8BABq9U=; b=IVHyU44zgw0jG2U6IJpvNr5Way6mVRVb4fNmFJOw+YBKxZ+LCH6MBrRmDILM9cAzIWisYL neCvZgnA4eLhqRR6J6loPcze9khbqTulqM/67+wkphUlCOWmwsYuuxHpOK1fRyLEfjHbBg rDEtceKmLyD7DZfyKI4sFEBiJ497EFkAE7efDm6NtiqNEkMcyvvPIRCuMXBAvGgf5SKXKB JgT+p59GSve31YotvrkeymG92VPpfVweCeTbVYNKATJcoj/7rYy4IjSTiXu1l3Qx1XuiAO fbW99b+RnbLxRGyBhx2PWoRmAq3AgoVpOJZsiklkOeCVzjr228d3x3GXvR6toQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJB93HK0z734 for ; Sun, 28 Jun 2026 18:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c328 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 43184397e6c4 - stable/15 - nuageinit: add update_sshd_config tests 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 43184397e6c4e157280605b9742767ea9bf28ec4 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:17 +0000 Message-Id: <6a416a91.1c328.35e0b898@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=43184397e6c4e157280605b9742767ea9bf28ec4 commit 43184397e6c4e157280605b9742767ea9bf28ec4 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:23 +0000 nuageinit: add update_sshd_config tests (cherry picked from commit 8b03193289e87fd243acc50c5128c80459792667) --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/nuage.sh | 8 +++ libexec/nuageinit/tests/update_sshd_config.lua | 73 ++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index 4c99f8e31ce3..fc7765268660 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -21,5 +21,6 @@ ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua ${PACKAGE}FILES+= addsudo.lua ${PACKAGE}FILES+= adddoas.lua +${PACKAGE}FILES+= update_sshd_config.lua .include diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 01c4612eb8ec..348a8d93ba09 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -17,6 +17,7 @@ atf_test_case addfile atf_test_case decode_base64 atf_test_case addsudo atf_test_case adddoas +atf_test_case update_sshd_config settimezone_body() { @@ -109,6 +110,12 @@ adddoas_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/adddoas.lua } +update_sshd_config_body() +{ + mkdir -p etc/ssh + atf_check /usr/libexec/flua $(atf_get_srcdir)/update_sshd_config.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -120,4 +127,5 @@ atf_init_test_cases() atf_add_test_case decode_base64 atf_add_test_case addsudo atf_add_test_case adddoas + atf_add_test_case update_sshd_config } diff --git a/libexec/nuageinit/tests/update_sshd_config.lua b/libexec/nuageinit/tests/update_sshd_config.lua new file mode 100644 index 000000000000..ac56c29986ac --- /dev/null +++ b/libexec/nuageinit/tests/update_sshd_config.lua @@ -0,0 +1,73 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local sshd_config = root .. "/etc/ssh/sshd_config" + +local function setup(content) + local dir = root .. "/etc/ssh" + n.mkdir_p(dir) + local f = assert(io.open(sshd_config, "w")) + f:write(content) + f:close() +end + +local function read_config() + local f = assert(io.open(sshd_config, "r")) + local content = f:read("*a") + f:close() + return content +end + +-- Key not found: appended +setup("SomeOtherKey yes\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "SomeOtherKey yes\nPasswordAuthentication yes\n" then + n.err("Key not found: should be appended") +end + +-- Key with same value: no change +setup("PasswordAuthentication yes\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Same value: should not change") +end + +-- Key with different value: changed +setup("PasswordAuthentication no\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Different value: should change") +end + +-- Key with comment +setup("PasswordAuthentication no # keep this\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Comment stripped: '" .. read_config() .. "'") +end + +-- Case insensitive key matching +setup("passwordauthentication no\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Case insensitive matching failed") +end + +-- Extra spaces +setup(" PasswordAuthentication no \n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Extra spaces handling failed: '" .. read_config() .. "'") +end + +os.exit(0) From nobody Sun Jun 28 18:40:19 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 4gpJBD3Nr1z6jkYQ for ; Sun, 28 Jun 2026 18:40: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBC5tMXz3Xh1 for ; Sun, 28 Jun 2026 18:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672019; 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=dmwDLJv5sY3nzq/hNz7PCWh3MB4HcaklErZVFzPzfRc=; b=gbMwXARgB/CrxFZ0N1KenmjQrv/pOWgnjeVz4QvEiSuaFTP+cy7ls1odm2qhJ61CH5E2EA 0rMLAWGrvL+zqxVkv0ForYa0m6nTbXjGeVUjoaW8NX4AmL2lvKQOS9M7jg8PBN+fVL+ihK SyBgDCfSKDNjWtjV5FtcVkAkhqKUjtg0jA7BeNuAiZmhfqEuGo3tUZ5VcFjNHhJF9Gp/NR pyewh0u2DoqfD4P3fNMR3ETDF5B4So2DC8v7xDzNoKrd5LFHSlZfZYFfYyqaux/Qo5R+8d 4D1mwdJsJeJIKD6r1r3BwfLe9g9F8x8BAJwujxKyQJ3fJa8kw5oMABIEqCyBKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672019; a=rsa-sha256; cv=none; b=TRzDBJ8HrZHxOfy6RmK9lkQ3hwnp3+yONQpjvhfyYuiBiEKJCB4w1UFfOFKCkeqFjd9Znl mHNoncAi+mn4l9S36ngNT3Sw/pDwyOkOQv5ZK9SmqMsJRnGQqo/9wyhTYxVrwuXJd7XOQU nRjNGzYitxizkX7Eyv988Svw4nHtGlfZfAJlTADCGqZkm7b63VbKwa1cB4lLztjDZdg3J6 XJ5v1Xsma8IZ6Are1bSzrddC4RVsHWRWI7qsqLCehSKUvpn2fK1jCrj+axbn2h/+Y7WXi1 ZG5VaeeYdYukyNuVesNtAL68hAq34MMmWlTlHwpi9TEwk+1f7UUcs2NCmHxC4g== 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=1782672019; 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=dmwDLJv5sY3nzq/hNz7PCWh3MB4HcaklErZVFzPzfRc=; b=XrcoyAFcK9rr9Y1HsjUAy1nkesUTlzjWGGHdCvDhGPFTU3aIAXVYRDroIEjid7cyMn+kFR YnmMli5CujYVQLDnyFJ/0gdVZ1JnmouxJgEHRLS2AA5V/R7vk366E427TdV2v/m0luLNUw GW8ybXK/MD/Yp6qUWtuo9ZnOm2Y/SBjT1Oiz6B/7d+aLy4HO7OGcrXqO8b9DflSMKv0kDU avHarzEl18GXJgWeA4Qvp5MO+R3JJtSPIoFRPE+M7p3JhTcOg44tgwF0Bq4VM7tczKsTrG LkePJlyX/FfT9U/6Zs0zDynvlWX4bfEV/DG72onCw/09BijxLp7g1wLxxcuj+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBC4cVqz736 for ; Sun, 28 Jun 2026 18:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c799 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: fb06f62c7060 - stable/15 - nuageinit: add dirname edge case tests 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fb06f62c7060aeb8fb7464487b93e9c263b958bf Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:19 +0000 Message-Id: <6a416a93.1c799.2877ae02@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=fb06f62c7060aeb8fb7464487b93e9c263b958bf commit fb06f62c7060aeb8fb7464487b93e9c263b958bf Author: Baptiste Daroussin AuthorDate: 2026-06-04 17:24:45 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:24 +0000 nuageinit: add dirname edge case tests (cherry picked from commit 5f58d9207469dcd2d3fa24db7f5276a681df91e5) --- libexec/nuageinit/tests/dirname.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libexec/nuageinit/tests/dirname.lua b/libexec/nuageinit/tests/dirname.lua index 7e3a2c835502..9d76aed0ac11 100644 --- a/libexec/nuageinit/tests/dirname.lua +++ b/libexec/nuageinit/tests/dirname.lua @@ -1,11 +1,34 @@ #!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin local n = require("nuage") print(n.dirname("/my/path/path1")) + +-- relative path with no directory component: nil if n.dirname("path") then n.err('Expecting nil for n.dirname("path")') end + +-- nil input: nil if n.dirname() then n.err("Expecting nil for n.dirname") end + +-- root path: returns "/" +if n.dirname("/") ~= "/" then + n.err('Expecting "/" for n.dirname("/"), got: ' .. tostring(n.dirname("/"))) +end + +-- top-level directory: returns "/" +if n.dirname("/foo") ~= "/" then + n.err('Expecting "/" for n.dirname("/foo")') +end + +-- deep path +if n.dirname("/foo/bar/baz") ~= "/foo/bar/" then + n.err('Expecting "/foo/bar/" for n.dirname("/foo/bar/baz")') +end From nobody Sun Jun 28 18:40:18 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 4gpJBC6MrXz6jkFq for ; Sun, 28 Jun 2026 18:40:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBB63Gsz3Xmc for ; Sun, 28 Jun 2026 18:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672018; 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=4GlHQjueSxq+QvjdCqp89VmqdLo2BXvBAWWw5J1ySbU=; b=SeO7IpUeHHwhFcZICWlakHwJQXnsVA8BuZ3LZ0SEfKArOz2LM38PjU23/SXpyJH9s5uvIN /sQ+KS11IOu+JRQV2wSKxRWvaKZ/xxBD4F/97mw5P3zYIBhCb+F4yOG2lrWbLsUxbdXgjy p5VhDBwE7PLwm4n24tXnKceypfjZZJkpZexFc8pHtwAS6Q/XOpFZw8IJMggXv2Qg70emm3 tcEwr+3oKmY6R9cu4MskrIZAmtslyjz8YDrrU276vKVIsbYMv0Fa2zFw9n091vHsnZx77p b2S50yrdHWb3P76I2Q9t0ESsPEisZl5NnalfHVLoz3GZ+5GQEzBfoJ2xyvtyvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672018; a=rsa-sha256; cv=none; b=JHLSOdcbBs8WAf6l9O9cv0zjFuBx/7/42kji5dN6u5ZQk1O0fGO7RFLohHJeAnt3qgJPzZ SWVzLpng9uJ+O3JlweUirVr7qgFjjbekkN+FPio2/I9Xj8okXr3y6oekJ7WBDSHxtBJkpI 6cAz68EZdP1NERGHoRehxyF/s9zYsimA87S25f3k60smqFpMXdoKJbAuTRGzCZqMd0GxsN yVZ38kS7MG6CNIXg03HgztZtuF+sFKe8m3wrNOrLRTrVeVOZjMe13T+UV7LeDvehi4wZ2H VoHgXA20Iq2DV72GDzaerRfuzUuhiJ8QK7EAiSYHJx3LE/bIK1RC2/fB+Ks23A== 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=1782672018; 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=4GlHQjueSxq+QvjdCqp89VmqdLo2BXvBAWWw5J1ySbU=; b=uyVQyZE4XhPvmJQj+LMPRoubs9bfyBl6cpypE9Dr41yUkFncrYuPyuFe8K+uP/dUHKvI0c WOAGKIzSLxzTHrTFimNybanIK6PsiXCTDT4InyfadrSPFN0zK6TruXviujm7WBTfCCUOk0 orBkqwneAdv0Gmf7/s+fZH1VM6vQkCI9Arr8w+SS8ej7eFS7a5ekgtmsbgyqoI+QEc8ZcZ vcz8tfRlJ6ALrE3u+MAcflVxSbFEStxK2sA+c6pYNpRigwYiLYuz9/e30g+zzKDb/W5WlV VjDrGXWVML83nleUXZrXsfYVVcl4NpxG02XvSFMlQOqripVnGSumeRxJohUIRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBB3gl6z75j for ; Sun, 28 Jun 2026 18:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c436 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 4baa3af22f78 - stable/15 - nuageinit: fix dirname('/') returning nil instead of '/' 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4baa3af22f78e5aec939df526d57c64e5ede4dbc Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:18 +0000 Message-Id: <6a416a92.1c436.49011e6d@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4baa3af22f78e5aec939df526d57c64e5ede4dbc commit 4baa3af22f78e5aec939df526d57c64e5ede4dbc Author: Baptiste Daroussin AuthorDate: 2026-06-04 16:44:31 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:24 +0000 nuageinit: fix dirname('/') returning nil instead of '/' (cherry picked from commit b813e46e153327b66db4791ec0003b7e7cc51214) --- libexec/nuageinit/nuage.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index f3c23a7c3eb8..839cf3588021 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -93,6 +93,9 @@ local function dirname(oldpath) end local path = oldpath:gsub("[^/]+/*$", "") if path == "" then + if oldpath:sub(1, 1) == "/" then + return "/" + end return nil end return path From nobody Sun Jun 28 18:40: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 4gpJBF2Vydz6jkYY for ; Sun, 28 Jun 2026 18:40:21 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBD5mNCz3Xn7 for ; Sun, 28 Jun 2026 18:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672020; 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=860hJABYvy/hsgAh+cA16tXelkwfIGlYfRx4ceNdkiA=; b=YlgRMBZ/Zaoz2Z6V2mmAHsYZ0w2USpDutjefhEcde9wFjwS7sZsnYCY5JY2t9vMEUEQYaZ Ap6lYUVjOC576FPrb+Ur1srckHjMkpFtvjcY7UWP5EY8sG5bO9SgV6QGwP4Qm29VfnVeDT p/OV7IqUkotcz/niQBC4PGQu38J1Y1/Cx5WPxotLmXhMKcOwRbvZB1OqU5Y3LKziiKkGm7 RfHhZNt5y2Q2kZX2qpQVZak/pIr1lB1oXgArjVfSTUP7G+6/X37vZUwyuPeq4d/Jmt+FnX dG/RxQ0JDlD3VtocsEMTE/x3WBiWgCuT14SZKtKGGWWukJhWhO637qpnm/3H7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672020; a=rsa-sha256; cv=none; b=KGToDy84TzECoIHpOVCf7u4KOw0d1AvEfCikBRPPDkQIxyk5hajo1B0B65EU7bWpOjqNif aE5UqMMEI0uK+pSyZ5pmJ7Ft2HZMJ8gZuKESl31GIcOnEW3EBUdoHyZF3wcbsbJCBeAciT z9y6dzCB4VJs85kmTjsY6Y6se0CUqZAAghf+/pmPtyAgBVlLBomtDiMWtRwjvkHoLCE8PI apijzR7MVcdSLqoCoKZBCd/Tj603oNg7HmpHQRUqLhzjjC0Jw9/QZEYatXjqiDOT6d4dq9 csUAjDM5MeInwJ7ERxCAx6QbE+nmQT8sc0HzFG+h/nnik3EMxvTgn1znsXaatw== 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=1782672020; 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=860hJABYvy/hsgAh+cA16tXelkwfIGlYfRx4ceNdkiA=; b=mr544kKJtVy0dT+MpA54u56HUPCcmw1ILzuvpfMQ9XD3xW2QiRf8s3b6n0RlS6BcXBbZxI vZ1dL7TfrZJirWggOfxVOA7Pi2nn1+qXX/HJJ/LBkdBZc9H4g8dQYrJlaoLvJOsysTCcES BWismUFYsPpXxjeEfpv5/yQO3uy/3Q2HSjK2mWi6mj1wNJ6lKIgEu4NPWqz3EymWt5rle3 YHEKU90R3+afAxeDLiYpkd7Tnuy1a3oHppXKHT+oiYKZVeqltf1DXQza7wy6a1K27/6y0v AnFIm2MD8tTvF2KMaI++aTd0ns04rw63jZBk3ObXbyJxcKi4wtKSyP4qO7QuGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBD4bzhz7D4 for ; Sun, 28 Jun 2026 18:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 933551cdfd08 - stable/15 - nuageinit: add config2_network DNS services test 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 933551cdfd08c2148f6af1c041c40f6e25ca28b3 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:20 +0000 Message-Id: <6a416a94.1c5d6.3780603f@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=933551cdfd08c2148f6af1c041c40f6e25ca28b3 commit 933551cdfd08c2148f6af1c041c40f6e25ca28b3 Author: Baptiste Daroussin AuthorDate: 2026-06-04 17:48:32 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:24 +0000 nuageinit: add config2_network DNS services test (cherry picked from commit 9459465308ff17a11cad1c3d1987951055f114d6) --- libexec/nuageinit/tests/nuageinit.sh | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 89207fdf0aca..b68aa6017d0a 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -19,6 +19,7 @@ atf_test_case config2_pubkeys_user_data atf_test_case config2_pubkeys_meta_data atf_test_case config2_network atf_test_case config2_network_static_v4 +atf_test_case config2_network_dns atf_test_case config2_ssh_keys atf_test_case nocloud_userdata_cloudconfig_ssh_pwauth atf_test_case nocloud_userdata_cloudconfig_chpasswd @@ -460,6 +461,51 @@ EOF atf_check -o file:routing cat "${PWD}"/etc/rc.conf.d/routing } +config2_network_dns_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + mynetworks=$(ifconfig -l ether) + if [ -z "$mynetworks" ]; then + atf_skip "a network interface is needed" + fi + set -- $mynetworks + myiface=$1 + myaddr=$(ifconfig $myiface ether | awk '/ether/ { print $2 }') +cat > media/nuageinit/network_data.json << EOF +{ + "links": [ + { + "ethernet_mac_address": "$myaddr", + "id": "iface0", + "mtu": null + } + ], + "networks": [ + { + "id": "network0", + "link": "iface0", + "type": "ipv4_dhcp" + } + ], + "services": [ + { + "type": "dns", + "address": "9.9.9.9" + }, + { + "type": "dns", + "address": "149.112.112.112" + } + ] +} +EOF + atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -o inline:'name_servers="9.9.9.9 149.112.112.112"\n' \ + cat "${PWD}"/etc/resolvconf.conf +} + config2_ssh_keys_head() { atf_set "require.user" root @@ -938,6 +984,7 @@ atf_init_test_cases() atf_add_test_case config2_pubkeys_meta_data atf_add_test_case config2_network atf_add_test_case config2_network_static_v4 + atf_add_test_case config2_network_dns atf_add_test_case config2_ssh_keys atf_add_test_case nocloud_userdata_cloudconfig_ssh_pwauth atf_add_test_case nocloud_userdata_cloudconfig_chpasswd From nobody Sun Jun 28 18:40:22 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 4gpJBH1TgZz6jkYd for ; Sun, 28 Jun 2026 18:40:23 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBG6nWPz3Y1v for ; Sun, 28 Jun 2026 18:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672022; 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=vpDB5iMaPidi6iFUkS4cojUR9F/hxGV6DRT7Mbqu4Z0=; b=QwGTjcGCr8gvRdgsMUKjAMhjaJvf8JPs8nx3fsVWOt+ct6zrnGWrIY8+AUMUv/pyuXH0li 2tEGrraHZ563hCm9mRr96fhMHtTzY5MqCJFoWusayscFyKmzfRuzYF2EOE/bjD0cWJD6+B TCHmCpd+bR8JByYmBjpIpX52Mrx28lYYp7KxVvmElXUtH93mOxUEjD34wo+oXO4V8pfReW 7UKB/mB/JWjhUyY5xx27baFhA1VW9xrOrDi5YUtdEsYS1+Ux/T1WP5+k4u19/QDT2QO26r cMwKHVTG0cLlSj2R8KeLhg//Jqt2z7e2aLU0gU9SCxqa3EpjoB2bjIg80yQEbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672023; a=rsa-sha256; cv=none; b=Hx7HKy9o8OmoRImwhQeC0sU8Yi2p6BOXklYBF8aIFTTqoli32JkRH2qp0n8e9lA89dBRpX qaeMpYxqk9/f+zCn3uDvdRl9KNYLNSWsoqOXrWRTgDXUfAgVqpE78Z52CreJPcRfAmTIqs ViIf+HuaIliDn9dpWIw3KFCT6JtI3TD9gAkcD9feU67g2Tw3e5iT2hpTML/us82QSLcnqH GHkoOvfqn+Zf+4n0oKSss76jIbjY9hiUGv+rJZaQla/PuZ+QgUgCD0A5fpx+9edCHv36YH iYJseMm9kpAH98uq2IlIr8Mw06wq4cJnoOQzhoAmDR30A2BKO4A+BM3IhVmJ4A== 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=1782672023; 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=vpDB5iMaPidi6iFUkS4cojUR9F/hxGV6DRT7Mbqu4Z0=; b=I8NyJ6nVxCjPYex67q2MKBeTwcsL9H+XdoZR3IYwLn8ttFHaSuSEjVItcUIiYg+M/qp0B9 IIQB7b7FbHuHWslUYoX6Z4xld+6w/RSGvGk/IJYPe9elW9gCTlqwgZswNW8fy4NzX7nVwR Lk+jRSAqz8DyUCKJDXwjw/dqHGrZtPwg+j5nVIJiGt6i0eeC6Fkcp0s+I+X4pbzpUXO8Bt reCnycFqdBUgsVZW3HsXmyA/fFePZc8/htmQC+wBMhbAk+I8MpaJDdXiDmnUZ1fNya6cby E8Fe0/vEJXp/ML20ECQGRaWjaTNeFNJ2ObFk0fYyXm1IZ/TxwC+2fDt1emTPyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBG5rkDz6nb for ; Sun, 28 Jun 2026 18:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2ebdc0a782a6 - stable/15 - nuageinit: add hostname validation (RFC 952/1123) to sethostname() 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2ebdc0a782a6c4ca7d6ab0ad8ead61d580921df1 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:22 +0000 Message-Id: <6a416a96.1cb4b.2024d3fc@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2ebdc0a782a6c4ca7d6ab0ad8ead61d580921df1 commit 2ebdc0a782a6c4ca7d6ab0ad8ead61d580921df1 Author: Baptiste Daroussin AuthorDate: 2026-06-04 18:26:49 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:24 +0000 nuageinit: add hostname validation (RFC 952/1123) to sethostname() Validate hostnames before writing them: - Reject empty hostnames - Reject hostnames longer than 253 characters - Reject hostnames with invalid characters - Reject hostnames starting or ending with dot/hyphen - Reject labels longer than 63 characters - Reject labels starting or ending with hyphen Expand the sethostname test to cover all rejection cases. Update nuage.sh sethostname_body to ignore stderr (warnings). (cherry picked from commit 46d1758aa7a2af37a356a93812b492a406c6ffd4) --- libexec/nuageinit/nuage.lua | 27 +++++++++++++ libexec/nuageinit/tests/nuage.sh | 2 +- libexec/nuageinit/tests/sethostname.lua | 68 +++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 4f25e79ccefc..a491ca8d9df6 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -119,6 +119,33 @@ local function sethostname(hostname) if hostname == nil then return end + -- Basic hostname validation (RFC 952/1123) + if #hostname == 0 then + warnmsg("hostname is empty, ignoring") + return + end + if #hostname > 253 then + warnmsg("hostname too long (" .. #hostname .. " > 253), ignoring") + return + end + if hostname:match("[^a-zA-Z0-9%.%-]") then + warnmsg("hostname contains invalid characters: " .. hostname) + return + end + if hostname:match("^[%.%-]") or hostname:match("[%.%-]$") then + warnmsg("hostname must not start or end with a dot or hyphen: " .. hostname) + return + end + for label in hostname:gmatch("[^.]+") do + if #label > 63 then + warnmsg("hostname label too long (" .. #label .. " > 63): " .. label) + return + end + if label:match("^-") or label:match("-$") then + warnmsg("hostname label starts or ends with hyphen: " .. label) + return + end + end local root = os.getenv("NUAGE_FAKE_ROOTDIR") if not root then root = "" diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 348a8d93ba09..97c5224c7813 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -29,7 +29,7 @@ settimezone_body() sethostname_body() { - atf_check /usr/libexec/flua $(atf_get_srcdir)/sethostname.lua + atf_check -e ignore /usr/libexec/flua $(atf_get_srcdir)/sethostname.lua if [ ! -f etc/rc.conf.d/hostname ]; then atf_fail "hostname not written" fi diff --git a/libexec/nuageinit/tests/sethostname.lua b/libexec/nuageinit/tests/sethostname.lua index 47632497b545..0bc7eb2c4475 100644 --- a/libexec/nuageinit/tests/sethostname.lua +++ b/libexec/nuageinit/tests/sethostname.lua @@ -1,5 +1,73 @@ #!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin local n = require("nuage") +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local hostnamepath = root .. "/etc/rc.conf.d/hostname" + +local function check_hostname(expected) + local f = io.open(hostnamepath, "r") + if not f then + n.err("hostname file not found, expected: " .. expected) + end + local content = f:read("*a") + f:close() + local expected_content = 'hostname="' .. expected:gsub('"', '\\"') .. '"\n' + if content ~= expected_content then + n.err("hostname mismatch: got '" .. content .. + "', expected '" .. expected_content .. "'") + end +end + +local function check_no_hostname() + if io.open(hostnamepath, "r") then + n.err("hostname file should not exist") + end +end + +-- nil hostname: no-op +n.sethostname(nil) +check_no_hostname() + +-- Empty hostname: invalid +n.sethostname("") +check_no_hostname() + +-- Hostname too long (>253 chars): invalid +n.sethostname(string.rep("a", 254)) +check_no_hostname() + +-- Invalid characters: invalid +n.sethostname("host;name") +check_no_hostname() + +-- Starts with dot: invalid +n.sethostname(".hostname") +check_no_hostname() + +-- Ends with hyphen: invalid +n.sethostname("hostname-") +check_no_hostname() + +-- Label too long (>63 chars): invalid +n.sethostname(string.rep("a", 64) .. ".example.com") +check_no_hostname() + +-- Label starts with hyphen: invalid +n.sethostname("myhost.-label.com") +check_no_hostname() + +-- Valid simple hostname +n.sethostname("myhostname") +check_hostname("myhostname") + +-- Final: set a valid hostname for the shell test n.sethostname("myhostname") From nobody Sun Jun 28 18:40:21 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 4gpJBG2cJVz6jkVt for ; Sun, 28 Jun 2026 18:40:22 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBF6c0Bz3Xw3 for ; Sun, 28 Jun 2026 18:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672021; 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=8GYQvP0cUhUHLM1B1qEc0FRQSFdtrmfdKe9xwq9oqIM=; b=KmHkH1jmWhScIFhuLixrtI4o3ZUXklM/H9EE42hrXGPlD6kbGKispuqIBCOV3IXgA4PEUQ dnBAm9+tRp8SUUHi/aOjOgXcO7W6EqqI61ehnzvQ8W8mIGOoauB0fvE9HaVfrzq9H+recP yPtDF5zolTpq01FC/MhbidWcE/a56QNp7m2/HLHr0luUkr9l/QvDE5iYdZ6lfdMsZuyauW /jpJE6Waaus/oAYS+CEYsV61F5ci8nY1SnTmd6ij/Ke0OKeOFfdxUscrfN5IZ6NT1iL4N4 hi2XSfnd9ExjS2zrkevdFAK/RblgpYxJ/MlJocOW7xzec0S9RsE3C5SnbjDmLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672021; a=rsa-sha256; cv=none; b=bqqtycOQpYZnjqtwN9Ro6rdHU4Nz+kX9XcsIDzS0EoDjBAlqpxyLN6a0+3GDWBOKh0vykw /gKE9PIBaAbyo0DPaE5Epx8q4Cr6jNp0W9kB3WKku/XlR4uucLYPIUBx4EfETUkDkYlE4/ E2OheHa2PT8HpJrynvRPUsarONOUwgvnpNUSqFPxl6+UPs59W2ez9sRDtFvrC6dk1bzQj5 DvBHsD4TKMYHoH5xECgMcJ/y/AuV4b36ZtLfc/Cn/M/IuyZ45vadUzu2apf/AAcXXE7IIe JvoA4kzVvpmnaJWMgHpxlV6kcUYvgY7YLRjjlNcksTdwub53YrJVuXhm8Bfz9Q== 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=1782672021; 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=8GYQvP0cUhUHLM1B1qEc0FRQSFdtrmfdKe9xwq9oqIM=; b=Pyasf+PqV1qA1yPgPFKmYKtZr/Sa8lUDec3s6FhXC04vA08Cs4M0AbX3hEE8TYcvnBECF9 X/1BGx3+RGMtRHc9WVTsuVUZUmrzeLTB8lyP6UVbHQx+47Ydje/MFmUxaFEhE/JREZkdIl mSg5Q/k4wKSEftoiPfrvxp3ENENIrnAJRKYg7ZtQ0aHUB6TvspKohxHfe5AwPAz0hqSqNP J+H1fdsscKy0SGfjcVzU2t+slzks3e4RoydBZSVlJBUwr9WaWVCh+aivuaE6M7iBb23sqc z+5u1uoxPRPaxqmaW1Ve0VeGGvj4bap3ml74Xrfjo5YzcoOzdJA2fduY0CgGTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBF510Xz6Ym for ; Sun, 28 Jun 2026 18:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c992 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 6fcafba9b365 - stable/15 - nuageinit: add nil/empty guard to decode_base64() 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6fcafba9b365878f9ba37bfb34ca819c8c848cea Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:21 +0000 Message-Id: <6a416a95.1c992.1a5871c3@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6fcafba9b365878f9ba37bfb34ca819c8c848cea commit 6fcafba9b365878f9ba37bfb34ca819c8c848cea Author: Baptiste Daroussin AuthorDate: 2026-06-04 18:09:06 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:24 +0000 nuageinit: add nil/empty guard to decode_base64() Return an empty string when input is nil or zero-length instead of processing it through the decoding loop. (cherry picked from commit 57807f389a9e42774d944e256b499f5fd82ff855) --- libexec/nuageinit/nuage.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 839cf3588021..4f25e79ccefc 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -20,6 +20,9 @@ local function getlocalbase() end local function decode_base64(input) + if input == nil or #input == 0 then + return "" + end local b = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' input = string.gsub(input, '[^'..b..'=]', '') From nobody Sun Jun 28 18:40:23 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 4gpJBJ36Rnz6jkVx for ; Sun, 28 Jun 2026 18:40:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBJ0GQMz3Xwc for ; Sun, 28 Jun 2026 18:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672024; 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=Hx5T5LAh3/b9OL6a5wddAP3RsMlbEeMqVDiAWUZXx7Q=; b=gMxa4r/NNJbg4Un5cvn6NWnG5iu7ZJNnnVpNH/tY5dp/6STk5NTVPtw223Xg0CZKV6GwOT ZBlFPUaL/R7y6RS2AJ0cjzE2wkh8OGGYkKBz3phVpjNWxiB/OUO/bqwYTw1J/CZf/5evHr Qnx6k4AgBg2+PjeMq8ueHKAS/Hz/W0jOOauUzMfIpZl3Yh/wNyxijq9GRCMOv0HZai5N6V niBlD0ji9uH/EdqEQtXswpwvcID59mUoAYFOIMr3xjCsYynCDvvWeWY0Yw27Sg22bHvHU1 rgaBwA5zSGYMT6f4Z16lE2kBYOepMyImSliAjiGpy92bSS6Cev7xiNtRSAdMYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672024; a=rsa-sha256; cv=none; b=jM3lEOCgRjZ57CfleIIsA62yMo388HZaj1J2eBsoTKG1ZG/a7RfsowITdatwrCZEqHZjCk QO0ZHL35wYvDvygVzbOB+7by0Xv2MutJBN1xkGhwM8ZKnw4vsCdt5x7yuYrJXOAK70rmS4 i4LU5KXzk5evE82DNPpzsAceNJZG0AjPgKMs+4QigLe/U9KJC6/nb6Pxu6kQETVnCK2Xqk AZv+ypzLaFMieKfAzyra6ln2RDRCSTMLO780+MdzAdu4glyeM2ENe1AaTugEbj03tG4Sg8 2RxL/CAk0143/iR2O7tv1IAooEIAaKQAc1+hx9FLzv+lPgOJXn4SyUlnd3yOUQ== 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=1782672024; 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=Hx5T5LAh3/b9OL6a5wddAP3RsMlbEeMqVDiAWUZXx7Q=; b=Y4rtkAABAMaZ/IpXOPokaNB6+52EKxLIX1oAeOcYe50/mU7vLmVWFTSozybrsxphK+Bgop kGAW6njpijuMJELclUSl1/osa7Cv+I1bCMP0gVHT1ZB3a58ZDj4K80vBdKtU7qdKP6KAuB VOqczH023pX9qBDDO8uNba5fprllZR7W9ycQei9Xr9qzdjp6Jk9qyPjZYTb0jhxbZ1gFT+ EfOTPLikEsz40B7yJ3+nLEnFGk/FP6tYtvzllgvYFRpe8VydreJPhxgxs4vv6BOSuTmyZz IQKDon/SnTfeNP88iJ8Ojf01kzIpqb95t48gKGg+sUiMf2M95S5uIBYlYBCavA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBH6QSZz7CF for ; Sun, 28 Jun 2026 18:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cd40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f34a21ba0ada - stable/15 - nuageinit: remove dead checkgroup(), inline check in purge_group() 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f34a21ba0ada7ddfcce2ba382d2000f030ef21f5 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:23 +0000 Message-Id: <6a416a97.1cd40.789f38cd@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f34a21ba0ada7ddfcce2ba382d2000f030ef21f5 commit f34a21ba0ada7ddfcce2ba382d2000f030ef21f5 Author: Baptiste Daroussin AuthorDate: 2026-06-04 18:32:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:24 +0000 nuageinit: remove dead checkgroup(), inline check in purge_group() Call getgroups() once instead of N times per call. Inline the membership check directly, removing the now-unused checkgroup() helper function. (cherry picked from commit 852504a5fa5eb6b4dea98bd7abdb89f1c7bab2b0) --- libexec/nuageinit/nuage.lua | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index a491ca8d9df6..c443d6711b14 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -200,23 +200,19 @@ local function getgroups() return splitlines(groups) end -local function checkgroup(group) - local groups = getgroups() - - for _, group2chk in ipairs(groups) do - if group == group2chk then - return true - end - end - - return false -end - local function purge_group(groups) + local existing = getgroups() local ret = {} for _, group in ipairs(groups) do - if checkgroup(group) then + local found = false + for _, eg in ipairs(existing) do + if group == eg then + found = true + break + end + end + if found then ret[#ret + 1] = group else warnmsg("ignoring non-existent group '" .. group .. "'") From nobody Sun Jun 28 18:40:27 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 4gpJBM4rJlz6jkYv for ; Sun, 28 Jun 2026 18:40:27 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBM2lCBz3Xlv for ; Sun, 28 Jun 2026 18:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672027; 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=QEVPKIAX/mVYtAk/ejGBiSrbDTzYEq2zLjh1AFhfiqQ=; b=IaH5HdBeX4TWplM/K7P49NPnp0stJBaiCDmwU0ambUizuz460GvPi3cB2lE306uUKHRqdo MBgwrMGESbpL/jIjt3nd4Qkp8c7d5k/SHdP22RpjDlsYfS8mV39/MyQMe3F2R9yG1krhD5 omYWk00iD2ge3ZgHvYU02mxmkk+dsR6EnvhzzhjSq2IrmTClB2lOq1iRH6HxX/nUlIy4of YwngRSEM/XBEgZJIR7HGr3rLkoCNc+0pFsyvFu/PSgEs6BTYqdinxJy+i7eFkHQMJBsef2 Vajhuu56hAjRPZQHgDV6s7oPlQgyhFzoWb24aCm7jcF45rEwY2iqkhoqn9uweA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672027; a=rsa-sha256; cv=none; b=oXM9iJM2WyuE29TpMw2K3TJvV2Xhdkq01/vD05IjA1XVuHSIQRNcfcxTCsRDJthpFrgWMs FM4LUSKkeE7OD5Apz7Q+5dF/rKDAPmomZkbUiNrm5wfs7ZQIbXP9jvhkrpbiLwbxhLHFiP mXROkxgnHy7rokK+lEiI8d8RV9dV6rIKST6K+UMwF/nRHM4cW7men+DEaz8BCCv21ckSWw PsX+ySwkCSzMvhcXVYaDiXdPpS5Hu+w0+Bt1v+7yKxYvqrRgPK2DTWneI74HHozLfPxQaw e/4OPRsN8iFPqEx77QqsadJdQ60vhEyQ2G6NI+oV4HJSaBwCM4DgADATMuY5EA== 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=1782672027; 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=QEVPKIAX/mVYtAk/ejGBiSrbDTzYEq2zLjh1AFhfiqQ=; b=CLtAzZDyiiBDrMh2uG0Y02Zzfeh8vwOcaNW2TeCABmZT/hb6ozq22vTXHuWHT63SP0gcsx pX2lvKnklShEKz2X4HgoC/wLOsmgUH28I6Dl2hcVvRQEvcaIl9+p+eGEW5sZSQF1M9M+rW sDtUvXBF1gBWZKPhlfoKY6s35NctsIXRSKyufIhJFw5vpq9xX7XyrzLqDCPwR+w9HAWEog McDjy+i8hqscpPEuYtzF/R8TWlCp68nPFgab0WNpanh1qgph7uHw/T4n9L6Nftpof+s3BH 9/GAfgeed0Bv+7zhHA49t+b7m2GvKPNtHWECQwg3pQAUhiIVHUXJJKT+F7p2ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBM1ncPz707 for ; Sun, 28 Jun 2026 18:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c8ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 41fc76cd796d - stable/15 - nuageinit: fix update_sshd_config crash when file does not exist 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 41fc76cd796d8e324673c769a267e3858941bac6 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:27 +0000 Message-Id: <6a416a9b.1c8ea.6fba50ac@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=41fc76cd796d8e324673c769a267e3858941bac6 commit 41fc76cd796d8e324673c769a267e3858941bac6 Author: Baptiste Daroussin AuthorDate: 2026-06-04 19:10:37 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:25 +0000 nuageinit: fix update_sshd_config crash when file does not exist Previously update_sshd_config() would assert-fail if sshd_config did not exist. Now it creates a new file with the given key/value. Also replace the fragile simultaneous r+ + temp file approach with a cleaner read-then-write pattern: read all lines into memory, modify as needed, then write to a temp file and rename. All assert() calls replaced with proper error handling via warnmsg(). Add test case for missing file creation. (cherry picked from commit 0ba9b7b7f815b57f1c121b0f78eaee02d2cdd414) --- libexec/nuageinit/nuage.lua | 43 +++++++++++++++++++------- libexec/nuageinit/tests/update_sshd_config.lua | 7 +++++ 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 56d1ccf9d52e..bdd4bf60007e 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -493,30 +493,49 @@ local function update_sshd_config(key, value) if root then sshd_config = root .. sshd_config end - local f = assert(io.open(sshd_config, "r+")) - local tgt = assert(io.open(sshd_config .. ".nuageinit", "w")) + local f = io.open(sshd_config, "r") + if not f then + -- File does not exist, create it with the given key/value + f = io.open(sshd_config, "w") + if not f then + warnmsg("Unable to open " .. sshd_config .. " for writing") + return + end + f:write(key .. " " .. value .. "\n") + f:close() + return + end + -- Read existing content + local lines = {} local found = false local pattern = "^%s*"..key:lower().."%s+(%w+)%s*#?.*$" - while true do - local line = f:read() - if line == nil then break end + for line in f:lines() do local _, _, val = line:lower():find(pattern) if val then found = true - if val == value then - assert(tgt:write(line .. "\n")) + if val ~= value then + table.insert(lines, key .. " " .. value) else - assert(tgt:write(key .. " " .. value .. "\n")) + table.insert(lines, line) end else - assert(tgt:write(line .. "\n")) + table.insert(lines, line) end end + f:close() if not found then - assert(tgt:write(key .. " " .. value .. "\n")) + table.insert(lines, key .. " " .. value) end - assert(f:close()) - assert(tgt:close()) + -- Write back + f = io.open(sshd_config .. ".nuageinit", "w") + if not f then + warnmsg("Unable to open " .. sshd_config .. ".nuageinit for writing") + return + end + for _, l in ipairs(lines) do + f:write(l .. "\n") + end + f:close() os.rename(sshd_config .. ".nuageinit", sshd_config) end diff --git a/libexec/nuageinit/tests/update_sshd_config.lua b/libexec/nuageinit/tests/update_sshd_config.lua index ac56c29986ac..95aea59bd993 100644 --- a/libexec/nuageinit/tests/update_sshd_config.lua +++ b/libexec/nuageinit/tests/update_sshd_config.lua @@ -70,4 +70,11 @@ if read_config() ~= "PasswordAuthentication yes\n" then n.err("Extra spaces handling failed: '" .. read_config() .. "'") end +-- File does not exist: should be created with key/value +os.remove(sshd_config) +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Missing file: should create: '" .. read_config() .. "'") +end + os.exit(0) From nobody Sun Jun 28 18:40:26 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 4gpJBL5LYPz6jkW4 for ; Sun, 28 Jun 2026 18:40:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBL276qz3Xhq for ; Sun, 28 Jun 2026 18:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672026; 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=Jf3OMNG899wWqzQ3ytssUndHazpCYjTT6Eb7BXnGWi8=; b=TtxCZ6ZDPsapvs4DyS2tRJj9dYWZoaeYjVu/Q3UU8W0vuKARWIHQtDXUdbRkk1WOLiI8BB 1BWUwWIzmvzjN7PADbczfW7BQxOYZTfCj98BuWHuoDSad5TvaLGQUGf5BpoEqpGzGZMp41 EgtqmLl4tmIMczW+CHryIfTT42wOQluzcOGuvrjmcXWsJpxTZObJf95nbeBt/fz5/cxzv9 3ecJ1Bu8uOLgSmnUd8uSWg74k/FJ5SmSWwL+Wh+As27mFv7/5hTE96MFjXgjMc0TGS5n6v GPf80RboNEwKhvOs/1ax7/nWYOTKK3HeIaEXNJX6nfXBhmzv0jzUA8k6GFwK1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672026; a=rsa-sha256; cv=none; b=asRZIVZLU86eLy7pAgskQN6wlJgNQJxKOZyher69Naxfjq2hhDADjBloYb9kFSjxYBfxS2 6TNtgkZvG1ZzpfS3+Nf3ISMjE9dtFJjBD2HpRiackCuW1aTIDR1gnv8O7XLcVjNG9QNo2p 03MGEChW393Ty4WkMr/IKz/10J08glxeXNawx4DJAQROlZ+uA7DfvBeMJBCbwlgugqI2/P 01KjCRSK19rv8U+SIZ8NpwrMe75ewut/8DUABHnlbx6A/hRNsj/DhTugt3LNqkGWWFRi5I 7+8D+6kjBn+B8RzfjhXAqeWUL5Y3zsleH3l4q7XGO5CaQ022ZtLRv9jdMXd2lQ== 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=1782672026; 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=Jf3OMNG899wWqzQ3ytssUndHazpCYjTT6Eb7BXnGWi8=; b=EQNmVGC8ApfUsr3+rEBN8bZRb1STr90fhi3XyBu8EGd/P99BW7YmyneVAWptgnNI/C4FhU BPIWnInjJPP0oISn64DTYONeYUx7mzCNSx4GRp4fkGZMnT6W/pHJbfZ8f7fmpejcd4JM2g 4OFrHOZajEslc7A6D3WQOobgJnsjB4mGqir68wvftYCmMKLxS85Ib3rozV6aL8FUEVOf9N 1NxNPJCDGE79hK2Z5uirEpROrUBuiMWswVKCtezONiQ0qDhZ4Tsd+M8fUkqjFXGozSy0z4 ue7T8Oet9Jnhcq/Ex5FuPejZjCOelY9eR6xggyvvJLs2d6P83g0Cfm2i23KjkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBL0yHQz75m for ; Sun, 28 Jun 2026 18:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c2ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 481f6208e26a - stable/15 - nuageinit: fix TOCTOU in addsshkey, adddoas, addsudo 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 481f6208e26a9c4315a68dcba39ddecab9bba35d Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:26 +0000 Message-Id: <6a416a9a.1c2ae.73a171e1@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=481f6208e26a9c4315a68dcba39ddecab9bba35d commit 481f6208e26a9c4315a68dcba39ddecab9bba35d Author: Baptiste Daroussin AuthorDate: 2026-06-04 19:06:35 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:25 +0000 nuageinit: fix TOCTOU in addsshkey, adddoas, addsudo Replace check-then-create patterns with direct creation: - addsshkey: check what exists before creation, use mkdir_p() for .ssh directory, handle errors with warnmsg() instead of assert(). Apply chmod/chown only on newly created files/directories. - adddoas: same pattern for doas.conf and the etc directory. - addsudo: same pattern for the sudoers file and sudoers.d directory. All three functions now use warnmsg() for error handling instead of returning nil,err or using assert(). (cherry picked from commit cf5722ed60cf271e516927684c90464debb37496) --- libexec/nuageinit/nuage.lua | 92 +++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 7e7b2a64305f..56d1ccf9d52e 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -349,25 +349,33 @@ local function addgroup(grp) end local function addsshkey(homedir, key) - local chownak = false - local chowndotssh = false local root = os.getenv("NUAGE_FAKE_ROOTDIR") if root then homedir = root .. "/" .. homedir end local ak_path = homedir .. "/.ssh/authorized_keys" local dotssh_path = homedir .. "/.ssh" - local dirattrs = lfs.attributes(ak_path) - if dirattrs == nil then - chownak = true - dirattrs = lfs.attributes(dotssh_path) - if dirattrs == nil then - assert(lfs.mkdir(dotssh_path)) - chowndotssh = true - dirattrs = lfs.attributes(homedir) + + -- Check what already exists before creating anything + local ak_exists = lfs.attributes(ak_path) ~= nil + local dotssh_exists = lfs.attributes(dotssh_path) ~= nil + + -- Ensure .ssh directory exists + if not dotssh_exists then + local r, err = mkdir_p(dotssh_path) + if not r then + warnmsg("cannot create " .. dotssh_path .. ": " .. err) + return end end + -- Get homedir attributes for ownership + local dirattrs = lfs.attributes(homedir) + if not dirattrs then + warnmsg("cannot get attributes for " .. homedir) + return + end + local f = io.open(ak_path, "a") if not f then warnmsg("impossible to open " .. ak_path) @@ -375,19 +383,19 @@ local function addsshkey(homedir, key) end f:write(key .. "\n") f:close() - if chownak then + + -- Set permissions and ownership on newly created files/dirs + if not ak_exists then chmod(ak_path, "0600") chown(ak_path, dirattrs.uid, dirattrs.gid) end - if chowndotssh then + if not dotssh_exists then chmod(dotssh_path, "0700") chown(dotssh_path, dirattrs.uid, dirattrs.gid) end end local function adddoas(pwd) - local chmodetcdir = false - local chmoddoasconf = false local root = os.getenv("NUAGE_FAKE_ROOTDIR") local localbase = getlocalbase() local etcdir = localbase .. "/etc" @@ -395,18 +403,19 @@ local function adddoas(pwd) etcdir= root .. etcdir end local doasconf = etcdir .. "/doas.conf" - local doasconf_attr = lfs.attributes(doasconf) - if doasconf_attr == nil then - chmoddoasconf = true - local dirattrs = lfs.attributes(etcdir) - if dirattrs == nil then - local r, err = mkdir_p(etcdir) - if not r then - return nil, err .. " (creating " .. etcdir .. ")" - end - chmodetcdir = true + + local doasconf_exists = lfs.attributes(doasconf) ~= nil + local etcdir_exists = lfs.attributes(etcdir) ~= nil + + -- Ensure etc directory exists + if not etcdir_exists then + local r, err = mkdir_p(etcdir) + if not r then + warnmsg("cannot create " .. etcdir .. ": " .. err) + return end end + local f = io.open(doasconf, "a") if not f then warnmsg("impossible to open " .. doasconf) @@ -424,17 +433,17 @@ local function adddoas(pwd) end end f:close() - if chmoddoasconf then + + -- Set permissions on newly created files/dirs + if not doasconf_exists then chmod(doasconf, "0640") end - if chmodetcdir then + if not etcdir_exists then chmod(etcdir, "0755") end end local function addsudo(pwd) - local chmodsudoersd = false - local chmodsudoers = false local root = os.getenv("NUAGE_FAKE_ROOTDIR") local localbase = getlocalbase() local sudoers_dir = localbase .. "/etc/sudoers.d" @@ -442,18 +451,19 @@ local function addsudo(pwd) sudoers_dir= root .. sudoers_dir end local sudoers = sudoers_dir .. "/90-nuageinit-users" - local sudoers_attr = lfs.attributes(sudoers) - if sudoers_attr == nil then - chmodsudoers = true - local dirattrs = lfs.attributes(sudoers_dir) - if dirattrs == nil then - local r, err = mkdir_p(sudoers_dir) - if not r then - return nil, err .. " (creating " .. sudoers_dir .. ")" - end - chmodsudoersd = true + + local sudoers_exists = lfs.attributes(sudoers) ~= nil + local sudoers_dir_exists = lfs.attributes(sudoers_dir) ~= nil + + -- Ensure sudoers.d directory exists + if not sudoers_dir_exists then + local r, err = mkdir_p(sudoers_dir) + if not r then + warnmsg("cannot create " .. sudoers_dir .. ": " .. err) + return end end + local f = io.open(sudoers, "a") if not f then warnmsg("impossible to open " .. sudoers) @@ -467,10 +477,12 @@ local function addsudo(pwd) end end f:close() - if chmodsudoers then + + -- Set permissions on newly created files/dirs + if not sudoers_exists then chmod(sudoers, "0440") end - if chmodsudoersd then + if not sudoers_dir_exists then chmod(sudoers_dir, "0750") end end From nobody Sun Jun 28 18:40:25 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 4gpJBK4nVqz6jkbm for ; Sun, 28 Jun 2026 18:40: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBK1X0qz3Xhj for ; Sun, 28 Jun 2026 18:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672025; 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=MqYTvOYsfGM0fPobdBpAmazBxyIxQGGdIOSNMbTN2B8=; b=eX9d2xLTfQCe+vycrA2VJM/aVC4/7+pFQU34fd8KQFSel0nGgNw+GXEr4dnCsxTS97Z2Ma 5/e+OPdEOw0e2C61zsKWCMzKeWxL4dRdIUvfoTjW0HpKq2HE1mwlFOkISC2uCOyuXnsdcd CZbW7Ci5SC4yoizVACaSOJ92SdFoQ9RwziyGxIrd0KXw4bAdFLiG/ZxQ3RKDgXqzgc7qJu 6BhCZ6Z8cfzMaOaTKonF+1xV10tYLgf1bSHSVqkGZzgKv6PJe7OQnJ3bgqh2X3Q+MweKBz my7DGpnh8iML2YblnUON4bbv8Nm88ekstVfD+JTCEOUziiVj4+/hRQvm+E18lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672025; a=rsa-sha256; cv=none; b=QdP3xYBp0wQziG1pa+oVGTvWOCyFUA0AUqbLhKBoFvMHhbsHJTmGs9Qr0DxjC1GJSpqpFV BV0pxx5NsBYX3ivEmLmLmRBnuMcRZXee+ZmEGyBpsxOe9GH805pZTPbLEgPYRDTABOzUR3 DyMPuYGG6FbRRQjrjWqoRBVElNzUEGhSmu1/DBJMn/uy8YtMk4DdefEF4gSNgLv9nv1LiD TK7I3IDwCcc2JkgntBCjABWIrDVn/g8Vwb+wvVT99SJqjcRhLjsNe2uoKxMIWRIBpzE/iz 6GRoIs14t6QoJD+yoK5xsMAr4ljt/voR414Tvy/FVxBPLDDz184qOj2PRdGR8g== 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=1782672025; 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=MqYTvOYsfGM0fPobdBpAmazBxyIxQGGdIOSNMbTN2B8=; b=w4m5VPKkh/JaH/2cN5K6cdrwU8jGy4xKNzqfc/eR9Om9qyPVaekAdeaGfQ9WjavHuPkLOP Oy+CLf1sUrd3s/+GMfwMSmln27GG4Uw6o7sw+5U3qKUqJLdXIiV5Qbrp31dKK2guuZAY2/ exaxsUV/V2H6RLRGAiSKPc/cu0MX1EMj7f31YI0Tq2uemZrmNb7U7GKbvlJyQDFe/6nKxe 0JiAl8v+FdeHiTfoEVicpD/L+f4NmPqrxIpKOBEMDgfZM1TuhnqcMTDRjzVkOBK/F4hEn3 fRvxIMbQ/vZzRROSWTtMVgRntJpO4B5W6gJ+4XQ7JgA3m79b8o3wJUxso4sPYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBK07PCz705 for ; Sun, 28 Jun 2026 18:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c993 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 985f74ce766e - stable/15 - nuageinit: fix non-standard f:close(cmd) and remove dead precmd 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 985f74ce766e975029341add15d6e4afca148c9c Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:25 +0000 Message-Id: <6a416a99.1c993.33118146@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=985f74ce766e975029341add15d6e4afca148c9c commit 985f74ce766e975029341add15d6e4afca148c9c Author: Baptiste Daroussin AuthorDate: 2026-06-04 18:59:30 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:25 +0000 nuageinit: fix non-standard f:close(cmd) and remove dead precmd - f:close(cmd) -> f:close() in adduser() and exec_change_password(): the 'cmd' argument is not standard Lua and is silently ignored. - Remove dead 'precmd' variable in adduser(). (cherry picked from commit fdff89256fd921e40f2fa532895315b1dab6f5e6) --- libexec/nuageinit/nuage.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index c443d6711b14..7e7b2a64305f 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -271,7 +271,6 @@ local function adduser(pwd) if not pwd.shell then pwd.shell = "/bin/sh" end - local precmd = "" local postcmd = "" local input = nil if pwd.passwd then @@ -281,7 +280,7 @@ local function adduser(pwd) input = pwd.plain_text_passwd postcmd = " -h 0" end - cmd = precmd .. "pw " + cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end @@ -293,7 +292,7 @@ local function adduser(pwd) if input then f:write(input) end - local r = f:close(cmd) + local r = f:close() if not r then warnmsg("fail to add user " .. pwd.name) warnmsg(cmd) @@ -536,7 +535,7 @@ local function exec_change_password(user, password, type, expire) f:write(input) end -- ignore stdout to avoid printing the password in case of random password - local r = f:close(cmd) + local r = f:close() if not r then warnmsg("fail to change user password ".. user) warnmsg(cmd) From nobody Sun Jun 28 18:40:28 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 4gpJBP1J81z6jkQk for ; Sun, 28 Jun 2026 18:40:29 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBN3cySz3Y2t for ; Sun, 28 Jun 2026 18:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672028; 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=1LsmJDz1A3tLE9sHGbTzum+v59HW/WZKGyJxGFTV6ng=; b=PJTqhQWJk48Ugy1JZksYS+amLGcnf9IqVSEG41k1fvgiuIND7+7dx5EkpXvxm+mjKkruc1 qHqTSR2VT+4FO4+rwymyXfMFp9DC6PbkiyJH6pnGddeEw4XQ9H0acfx5VtyL5N6RFP0nbp 77jP7El9xBrOCGr7BTygvTZ+zGc9N0pCMDTUr7kWdB7g1VQ+h/NpmCwGNfh0XE+nc5g80j 3kDzMxCxTJLGMBdXTHBy3EWbnJUK7mII/jeM9ajqKH4I1zHG9tONBUfes1a1NquMpyab8h UrP0MOD1CFP1/grmffO/Bq9hmJ2wwhxMvcEMQBbQAp1n53wi2uWKLsJyhoR+3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672028; a=rsa-sha256; cv=none; b=fyCCi41DLZtki6J/KK58wHGNU7f0oieYuofLHfHQc/Kb25cKCtuY2DtkjHUiWCgB6EB1cO ysdX6tSkOC7R8VAH9GED6T2PrS2HrzPjnIIAL2n58JeQksrz5DiJ4uaShcZUETzZuEokSY DA0U3IMO5p/6TpzwOr1imkv22i71se70UW62Vs01mSYt6uHzwdoylxy9PfQuRTSa9qskpQ PvRW3SkC0bgn2UuWxBsx76ucfrPfY4wCv1ta0yi9bT4kUTbWR8TPiY7/BALOLcNyy+1kby I4T9iJaQpMd+vfxTxvDkDEMYHoh6shtlEUH4YLlSVwaNOj+3GO88cvybynqqOw== 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=1782672028; 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=1LsmJDz1A3tLE9sHGbTzum+v59HW/WZKGyJxGFTV6ng=; b=ZxIZxXxj98gzywe8nNyk0PiL/UNLCoiAYRN0Sq4PltkgcWpL2pwvr2XNruTzt4o2hx27r1 epjIz+60F/FW6FYLcF9redlj3kUA1t7vlVznowNJGjIpAke+aXtAj0NLEqNn+KM0W0FFrJ eCFfgVPKpLerh8arlIB1lcMaN94HV+3mOuRn2/JotgF4qdNm3+VQj8vrutGNZRjw2XPQkM 9Fd23n9MzMfckkFi/wjVQkfB4vnv72/3C+M9dlKbbQH4f9y8PChnGoBQyFsTYAxISqfI1I Pi7quEkxzra3UGuc8Ntae4bsvnHdU852DtqPgudPR93ncqC5gfN1Z331yqXhbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBN2P0lz6T4 for ; Sun, 28 Jun 2026 18:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c511 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 53906065f040 - stable/15 - nuageinit: refactor goto abuse in chpasswd() 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 53906065f040141e5a9eae664292fd6eb285e375 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:28 +0000 Message-Id: <6a416a9c.1c511.2eea6615@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=53906065f040141e5a9eae664292fd6eb285e375 commit 53906065f040141e5a9eae664292fd6eb285e375 Author: Baptiste Daroussin AuthorDate: 2026-06-04 20:02:58 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:25 +0000 nuageinit: refactor goto abuse in chpasswd() Replace goto next/list pattern with proper elseif/else control structure. The goto-based flow was fragile and hard to follow; the elseif chain makes the validation logic explicit and linear. (cherry picked from commit ea0932d71aa7a2d25b178f1593bfad194d8c7929) --- libexec/nuageinit/nuage.lua | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index bdd4bf60007e..e2db27bc7e85 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -605,26 +605,20 @@ local function chpasswd(obj) if obj.users ~= nil then if type(obj.users) ~= "table" then warnmsg("Invalid type for chpasswd.users, expecting a list, got a ".. type(obj.users)) - goto list - end - for _, u in ipairs(obj.users) do - if type(u) ~= "table" then - warnmsg("Invalid chpasswd.users entry, expecting an object, got a " .. type(u)) - goto next - end - if not u.name then - warnmsg("Invalid entry for chpasswd.users: missing 'name'") - goto next - end - if not u.password then - warnmsg("Invalid entry for chpasswd.users: missing 'password'") - goto next + else + for _, u in ipairs(obj.users) do + if type(u) ~= "table" then + warnmsg("Invalid chpasswd.users entry, expecting an object, got a " .. type(u)) + elseif not u.name then + warnmsg("Invalid entry for chpasswd.users: missing 'name'") + elseif not u.password then + warnmsg("Invalid entry for chpasswd.users: missing 'password'") + else + exec_change_password(u.name, u.password, u.type, expire) + end end - exec_change_password(u.name, u.password, u.type, expire) - ::next:: end end - ::list:: if obj.list ~= nil then warnmsg("chpasswd.list is deprecated consider using chpasswd.users") if type(obj.list) == "string" then From nobody Sun Jun 28 18:40:29 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 4gpJBP6RQkz6jkWD for ; Sun, 28 Jun 2026 18:40:29 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBP4KfGz3Xtk for ; Sun, 28 Jun 2026 18:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672029; 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=m86Zjs6kZ7ri/cYc2NFNQO2wTxFl8V636yb+2SYpedQ=; b=O1TxUxF0YQWUAhYc3zLheaYE2QE8ljSGHtNOFpEAZb1t1++4C3shWHHb3H8buBOttGwMz3 1zeNZolxvHojOhahiuIBiVX7seygp7YjwsrO5oZO6qlh35GXaMR/y4t3ZBGV5fMO1h4q6K QsPLLMsW88KXEA6+9GMUJSrjBHA2bLu9t1YRVlo3AC8Xth29NTB3qFifXYwSnM5I+UZ4gS 6NMFMIWXc/j1q9cfmd7QaL7D2xT4Oa8haxjbiWtWHwVB4WKabViILe6uec5PknPg0oAA2P HAr2qhmVEjDWUvFc6w+n/ireinkNodLQWrbMshtto7JKBKMWJt/5TFBAgYBWpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672029; a=rsa-sha256; cv=none; b=wqvnZVn3qfVvu3v8l7+/fhBvCJeA1NCpekZ1yJ6anSuGfFMU+hZKQAJ3XYenrvRxzpxzD+ WKTjqIQyixcf3U+8EZxWAnyXsjCChrVN66WoJ3Ei1VRM79PPVNh22D2jTjt4beKU6Xr447 UkGWU3XRmWg0YqmqMfBsDoKRQYPhI5m0RxkfLO1EkBXzpaxBbzpk+iF5PC3fiCg/q662PA FgnNtSlZORYGO+Gjqbao5EoheOsWXD3fboH+5C3sExBLlTwMJcCh2tXmctEM4qIxHFDu4I pPWL2ZWxyipdbEQXnfPLKyGT1PRZPUYxXIyQSL1y4U/XUanBlg8CCVY+VETtBA== 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=1782672029; 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=m86Zjs6kZ7ri/cYc2NFNQO2wTxFl8V636yb+2SYpedQ=; b=HQUFejA1DCGt2UMdAEZeALjZ95iHuLovcgfxk8I1lCkyxSrNMUgpmNt/sJF2MtEj8Zb1vB PecCscQj/4BLmw9fWgBWkb4npbKBhdRVsdCRxrvCwpI7Hgc/E6El4ApeJJKCR7JHlg+FyF H6kqTX9aeO27Y1MfrecY8XK19xmfeVd3ZctHOdwMWF2yqc42SFxFUJTh74WHkLunJ0HTAz YwFhvQZSBP8Sy+qnojC5iy4bETEjhUGVAZWx98vSlkTrJbdH6ATy79UuI8eIDlVZIiJshY VjJQ6BkicNmkxcYr9Q9zA2kO6TF9GetU/uN01Q+znegU6YX5AVtS0KtWK5tC6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBP37qMz70B for ; Sun, 28 Jun 2026 18:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 190d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: a67656ff5e78 - stable/15 - nuageinit: complete SSH support with ssh_deletekeys and disable_root 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a67656ff5e78542afa177d953a74e2233875fe0f Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:29 +0000 Message-Id: <6a416a9d.190d8.1d0ee924@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a67656ff5e78542afa177d953a74e2233875fe0f commit a67656ff5e78542afa177d953a74e2233875fe0f Author: Baptiste Daroussin AuthorDate: 2026-06-04 20:17:03 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:25 +0000 nuageinit: complete SSH support with ssh_deletekeys and disable_root Add missing SSH cloud-config options from cloud-init spec: - ssh_deletekeys: remove existing SSH host keys on first boot so new ones are generated automatically by sshd(8). Implemented as delete_ssh_host_keys() in nuage.lua using lfs.dir() with a directory existence guard via lfs.attributes(). - disable_root: set PermitRootLogin to 'no' (or a custom value via disable_root_opts) in /etc/ssh/sshd_config. - disable_root_opts: optional string or array to override the PermitRootLogin value used when disable_root is true. Only the first array element is used. (cherry picked from commit 22c1f5d0ec215e36dd4448b9128b856b5441d21c) --- libexec/nuageinit/nuage.lua | 14 ++++++++++++++ libexec/nuageinit/nuageinit | 24 ++++++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index e2db27bc7e85..7cce4c9bece1 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -539,6 +539,19 @@ local function update_sshd_config(key, value) os.rename(sshd_config .. ".nuageinit", sshd_config) end +local function delete_ssh_host_keys(root) + local ssh_dir = root .. "/etc/ssh" + local attrs = lfs.attributes(ssh_dir) + if not attrs or attrs.mode ~= "directory" then + return + end + for entry in lfs.dir(ssh_dir) do + if entry:match("^ssh_host_.*key") or entry:match("^ssh_host_.*key%.pub") then + os.remove(ssh_dir .. "/" .. entry) + end + end +end + local function exec_change_password(user, password, type, expire) local root = os.getenv("NUAGE_FAKE_ROOTDIR") local cmd = "pw " @@ -761,6 +774,7 @@ local n = { addgroup = addgroup, addsshkey = addsshkey, update_sshd_config = update_sshd_config, + delete_ssh_host_keys = delete_ssh_host_keys, chpasswd = chpasswd, pkg_bootstrap = pkg_bootstrap, install_package = install_package, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index fc8d9582b9c6..166c3503735a 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -502,6 +502,28 @@ local function ssh_pwauth(obj) nuage.update_sshd_config("PasswordAuthentication", value) end +local function ssh_deletekeys(obj) + if obj.ssh_deletekeys == nil then return end + if obj.ssh_deletekeys then + nuage.delete_ssh_host_keys(root) + end +end + +local function disable_root(obj) + if obj.disable_root == nil then return end + if obj.disable_root then + local value = "no" + if obj.disable_root_opts then + if type(obj.disable_root_opts) == "string" then + value = obj.disable_root_opts + elseif type(obj.disable_root_opts) == "table" then + value = obj.disable_root_opts[1] + end + end + nuage.update_sshd_config("PermitRootLogin", value) + end +end + local function runcmd(obj) if obj.runcmd == nil then return end local f = nil @@ -776,8 +798,10 @@ elseif line == "#cloud-config" then settimezone, groups, create_default_user, + ssh_deletekeys, ssh_keys, network_config, + disable_root, ssh_pwauth, runcmd, write_files_not_deferred, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 9651abba868f..08a64b11ff58 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -164,6 +164,12 @@ will be used as the name of the group, the .Qq Ar value is expected to be a list of members (array), specified by name. .El +.It Ic ssh_deletekeys +Boolean which determines if the existing SSH host keys in +.Pa /etc/ssh +should be removed on first boot. +New host keys will be generated automatically by +.Xr sshd 8 . .It Ic ssh_keys An object of multiple key/values, .Qq Cm keys @@ -183,6 +189,30 @@ boolean which determines the value of the .Qq Ic PasswordAuthentication configuration in .Pa /etc/ssh/sshd_config +.It Ic disable_root +Boolean which determines if root login via SSH should be disabled. +If set to +.Ar true , +sets +.Qq Ic PermitRootLogin +to +.Ar no +.Pq or the value specified in Ic disable_root_opts +in +.Pa /etc/ssh/sshd_config . +.It Ic disable_root_opts +String or array of options used to set the value of +.Qq Ic PermitRootLogin +in +.Pa /etc/ssh/sshd_config , +when +.Ic disable_root +is set to +.Ar true . +If not specified, defaults to +.Ar no . +.Pp +Only the first value is used when an array is provided. .It Ic network Network configuration parameters. .Pp @@ -410,6 +440,8 @@ package_update: true package_upgrade: true runcmd: - logger -t nuageinit "boot finished" +ssh_deletekeys: true +disable_root: true ssh_keys: ed25519_private: | -----BEGIN OPENSSH PRIVATE KEY----- From nobody Sun Jun 28 18:40:31 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 4gpJBR6jn2z6jkc7 for ; Sun, 28 Jun 2026 18:40:31 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBR59gpz3XjV for ; Sun, 28 Jun 2026 18:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672031; 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=kKVO8b8+P5vBGiH2OIUb5+0TubbEFNWtZS0NIlAqGoY=; b=ysJUGeSa8nu+Vfr7KLwO/+LS/J+EU1S6DnqzbQyf0zfxxm/EI1Cq3uY/BHNHj+YJreoXv5 rQ9tirTV8ugulw61Ee53lYRwjv+KFe2/klOiEmegbgc84vo8LHyE3HgbYk+ewxwpnMrX0j azCdmIl/XsQzA4pFxsEqwFBuLIDQqK4td2onkHeB5sBM61NQY1KHAap7WeiStR/PUBI67M jCRnqyHIxtYzVlwSoSF8WwKjnQA5uAVVUon+BG0shtMMXlZ3xJK2viWYMvv6TVhUTSt22M 1c9nj68ch8XTSNg7Q45WsLJDFz1xkPfZMJ9QU1++2s3VAd7jkBQVUM6a2d5bdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672031; a=rsa-sha256; cv=none; b=unom005J55qtqgbxo5oniRr8YEHW5LBGZcAQPu7rsHn3g/DXOD5e3F7Yckakxy/wfL1mc0 0eWzElbflNTZV4Wz/VCXqlnCgVy52wp/06eAXO8TOxhUulmGeTZiUb/zWPkJ8kvivQVz1s VUNzy9yRJevCtWFGvgpaDmbeUODhTap3Ps7BXw/yNgBEDenagnqugTu82hTPBhzsQoJX2k 0RtEZNHZ3N8uX/ySOWsnLmJzdxlQg104ldIlkKRcvx+ZUYLc2RyJQq6OvUmyQvkSgKPmcK 7/glifGU14xOfVqe9vGlpRxCAyCrfofwtdd6NP2CAtt8p1SvHaGwn3AMwfx9eQ== 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=1782672031; 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=kKVO8b8+P5vBGiH2OIUb5+0TubbEFNWtZS0NIlAqGoY=; b=jw6+JM69Md3aBxtI+RRUeqnNuasXvYrA+OCAAnwsjKkKxG98nAAz1iK5nKX60M7HxZO6Xs FlP7dyGjxAxt7+OlZfoElC6774t+Rtj6Zr9Tvi7lk4XeG2+q+oxOCKbUqICbdGEuGDHTRK mR93BwFVJlcv7vU3Q5RTamRV7azxPNsnxNWqnTcuWz9PLKoMh1g6srWQ3vCelh/MeugMZw 7a4uixjXhqKPdqWZWv6LK33lYgfZkEG4DzU/1M48EKUBb0MRppvZ2EnF1jAKkjx+JeUIG9 1WyDgZIiLVqnecmObf7HQb5uYQwbamY2HzyzQQeEYG3AiRP4TQAmhezwyHY++A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBR4FFZz7CH for ; Sun, 28 Jun 2026 18:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 85a943339f2d - stable/15 - nuageinit: implement manage_etc_hosts support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 85a943339f2df12c2ccc501c54c95afcf4c59e76 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:31 +0000 Message-Id: <6a416a9f.1cb4f.6066be74@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=85a943339f2df12c2ccc501c54c95afcf4c59e76 commit 85a943339f2df12c2ccc501c54c95afcf4c59e76 Author: Baptiste Daroussin AuthorDate: 2026-06-05 05:49:16 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:26 +0000 nuageinit: implement manage_etc_hosts support Add support for adding the instance hostname to /etc/hosts on the 127.0.0.1 and ::1 localhost lines, matching cloud-init's default behaviour (manage_etc_hosts: true). create a revolve_hostname helper to avoid code duplucation. (cherry picked from commit ba58e8ad726318ed59b6cc5934435dbddbe23dac) --- libexec/nuageinit/nuage.lua | 62 +++++++++++++++++++++++++++++++++++++++++++ libexec/nuageinit/nuageinit | 30 ++++++++++++++++----- libexec/nuageinit/nuageinit.7 | 13 +++++++++ 3 files changed, 99 insertions(+), 6 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 7cce4c9bece1..45e14ef0ce21 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -162,6 +162,67 @@ local function sethostname(hostname) f:close() end +local function update_etc_hosts(root, hostname) + if hostname == nil or hostname == "" then + return + end + local hosts_path = root .. "/etc/hosts" + local lines = {} + local already_present = false + + local f = io.open(hosts_path, "r") + if not f then + -- File doesn't exist, create a minimal one + local nf = io.open(hosts_path, "w") + if not nf then + warnmsg("unable to create " .. hosts_path) + return + end + nf:write("::1\t\tlocalhost " .. hostname .. "\n") + nf:write("127.0.0.1\t\tlocalhost " .. hostname .. "\n") + nf:close() + return + end + + for line in f:lines() do + if line:find(hostname, 1, true) then + already_present = true + end + table.insert(lines, line) + end + f:close() + + if already_present then + return + end + + -- Not present, append to localhost lines + local new_lines = {} + local found_localhost = false + for _, line in ipairs(lines) do + if (line:match("^127%.0%.0%.1%s") or line:match("^::1%s")) and line:find("localhost", 1, true) then + table.insert(new_lines, line .. " " .. hostname) + found_localhost = true + else + table.insert(new_lines, line) + end + end + + if not found_localhost then + table.insert(new_lines, "127.0.0.1\t\tlocalhost " .. hostname) + end + + f = io.open(hosts_path, "w") + if not f then + warnmsg("unable to open " .. hosts_path .. " for writing") + return + end + for _, line in ipairs(new_lines) do + f:write(line .. "\n") + end + f:close() +end + local function splitlist(list) local ret = {} if type(list) == "string" then @@ -775,6 +836,7 @@ local n = { addsshkey = addsshkey, update_sshd_config = update_sshd_config, delete_ssh_host_keys = delete_ssh_host_keys, + update_etc_hosts = update_etc_hosts, chpasswd = chpasswd, pkg_bootstrap = pkg_bootstrap, install_package = install_package, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index bfe5f893756e..9d2f3c6024c4 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -99,16 +99,23 @@ local function get_ifaces_by_mac() return myifaces end -local function sethostname(obj, metadata) - -- always prefer fqdn if specified over hostname +local function resolve_hostname(obj, metadata) if obj and obj.fqdn then - nuage.sethostname(obj.fqdn) + return obj.fqdn elseif obj and obj.hostname then - nuage.sethostname(obj.hostname) + return obj.hostname elseif metadata["local-hostname"] then - nuage.sethostname(metadata["local-hostname"]) + return metadata["local-hostname"] elseif metadata["hostname"] then - nuage.sethostname(metadata["hostname"]) + return metadata["hostname"] + end + return nil +end + +local function sethostname(obj, metadata) + local hostname = resolve_hostname(obj, metadata) + if hostname then + nuage.sethostname(hostname) end end @@ -541,6 +548,16 @@ local function bootcmd(obj) end end +local function manage_etc_hosts(obj, metadata) + if obj.manage_etc_hosts == false then + return + end + local hostname = resolve_hostname(obj, metadata) + if hostname then + nuage.update_etc_hosts(root, hostname) + end +end + local function runcmd(obj) if obj.runcmd == nil then return end local f = nil @@ -813,6 +830,7 @@ elseif line == "#cloud-config" then local pre_network_calls = { bootcmd, sethostname, + manage_etc_hosts, settimezone, groups, create_default_user, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 3cc0eceeb2ae..66a72324f414 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -146,6 +146,19 @@ Specify a fully qualified domain name for the instance. Specify the hostname of the instance if .Qq Ic fqdn is not set. +.It Ic manage_etc_hosts +Boolean which determines whether the hostname should be added to +.Pa /etc/hosts +on the +.Qq 127.0.0.1 +and +.Qq ::1 +localhost lines. +Defaults to +.Ar true . +Set to +.Ar false +to skip this behaviour. .It Ic timezone Sets the system timezone based on the value provided. .Pp From nobody Sun Jun 28 18:40:30 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 4gpJBR0lBzz6jkSx for ; Sun, 28 Jun 2026 18:40:31 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBQ4kdQz3Xv2 for ; Sun, 28 Jun 2026 18:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672030; 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=3Lwf1PGQ9GxM1g0DUS4DwfblUJsCH2IDbymLwqkIZBQ=; b=bMuVKVd97qbDdAbyMACluTEF7fO2FQ33avSATRdNYmaIhYftNTpdcDCuGPGybjs/tF1PFb Bc/GcJ5RG+xiUAP2dBUCw2qjgApwX4gjcOjc1detLYCntlCJ1Rwo0+i04ekUkj0wA22+CF u9JiawQR6mOh+3eGT2AbOx9S+kadKFBcQ4k/o3tf0vlK/8T7+9ytG6unm91Z71AZPAKZwu QnSWK4q3IheNSQYZBzGFQMWKDpWCBHIKX2G2g9oJaVsI1UpW5gk3p16J9t6koRLDEldr9b j+LgsnQ4Yr5rrbRTbBP01VS0FxbE6I1xtRN2rdrS1Syv63Q94m1EE0w2FcN3uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672030; a=rsa-sha256; cv=none; b=q4YefUZv+VlsOJbUsvx1HrNhKgurjyvyjH5B72q6Wp47Gfq4sfTkplRKfRq8BUsy0Id8If 4Q4jBVK3Pl+Vp50mgxRLxqIwVzQ71MrnxwEReWPC2EPXyeAKl4bbr1mxp+FpLWGISZGxFU U2ect6rfqsFojRGt+Vv/Bmxyv8h1TrV0EnxtG7414LvFNJKx4D6DQ40eskQkWuwBJHzvzg czoPVh31keDg8EBchLZu5tFbEgYXjsA6Pu+EXn33lQrkI3VrQfgr/Bqr21p4AP3ptCb8F1 tGn2gjpyAq5sCqR8iXVYAHQr34EyvJwHwYfNDOdlKnfCcI3v4LR8TUHnVLwTyA== 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=1782672030; 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=3Lwf1PGQ9GxM1g0DUS4DwfblUJsCH2IDbymLwqkIZBQ=; b=bILHFwkBBB0/cm0wqEksRatJ2wOJgPzBxOk0Eyfec/nbqdqxf4pNbMssCpwumeDABP0kTZ ZJn+k6ydxmlnPZKsFAV3fhq4w6oR4BDOCk9tiGpldnHM3VXRDcekpvuc2crKOhlYhxKKZi 5Es+bXh77TUoDsXN6kfuLde4bti4r+pHZffxkbxsR4i3tGDt8IhPyv5KDGKLdi3ShDzd3M fQ2VtXbN8aKidIieuBvfM7ClzjZi466pLGokErBF7Aoa6Sibu97Xe69ijbRmFlZuQzNTTD ova9jMKXeLoMpS5whh9tl6h8tJXx0I7e8W0QHTbdjEqnWNeU6t+Cc0/dqIEWOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBQ3fyyz738 for ; Sun, 28 Jun 2026 18:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19efd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 178f400cf643 - stable/15 - nuageinit: implement bootcmd support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 178f400cf643280daa982a1ca70dfccc17ba1137 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:30 +0000 Message-Id: <6a416a9e.19efd.dd68da6@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=178f400cf643280daa982a1ca70dfccc17ba1137 commit 178f400cf643280daa982a1ca70dfccc17ba1137 Author: Baptiste Daroussin AuthorDate: 2026-06-05 05:00:00 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:26 +0000 nuageinit: implement bootcmd support Add support for the 'bootcmd' cloud-config directive, which allows running commands very early in the boot process, before the hostname is set and before the network is configured. - nuageinit: bootcmd() function follows the same pattern as runcmd(), writing commands to /var/cache/nuageinit/bootcmds instead of runcmds. It is the first entry in the pre_network_calls table. - rc.d/nuageinit: execute /var/cache/nuageinit/bootcmds immediately after /usr/libexec/nuageinit completes, before unmounting the config drive. This ensures bootcmd runs before NETWORKING per cloud-init spec. (cherry picked from commit b9be7608cd13888a32815bfb2263e20855706969) --- libexec/nuageinit/nuageinit | 18 ++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 5 +++++ libexec/rc/rc.d/nuageinit | 4 ++++ 3 files changed, 27 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 166c3503735a..bfe5f893756e 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -524,6 +524,23 @@ local function disable_root(obj) end end +local function bootcmd(obj) + if obj.bootcmd == nil then return end + local f = nil + for _, c in ipairs(obj.bootcmd) do + if f == nil then + nuage.mkdir_p(root .. "/var/cache/nuageinit") + f = assert(io.open(root .. "/var/cache/nuageinit/bootcmds", "w")) + f:write("#!/bin/sh\n") + end + f:write(c .. "\n") + end + if f ~= nil then + f:close() + nuage.chmod(root .. "/var/cache/nuageinit/bootcmds", "0755") + end +end + local function runcmd(obj) if obj.runcmd == nil then return end local f = nil @@ -794,6 +811,7 @@ if line == nil then -- YAML user-data elseif line == "#cloud-config" then local pre_network_calls = { + bootcmd, sethostname, settimezone, groups, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 08a64b11ff58..3cc0eceeb2ae 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -362,6 +362,9 @@ does not automatically install them. Ensure the relevant command is listed in your .Nm packages section. +.It Ic bootcmd +An array of commands to be run early in the boot process, +before the hostname is set and before the network is configured. .It Ic chpasswd Change the passwords for users, it accepts the following keys: .Bl -tag -width "expire" @@ -424,6 +427,8 @@ Here is an example of a YAML configuration for .Nm : .Bd -literal #cloud-config +bootcmd: + - kldload if_bridge fqdn: myhost.mynetwork.tld users: - default diff --git a/libexec/rc/rc.d/nuageinit b/libexec/rc/rc.d/nuageinit index 259ce3c138e5..e2f0a85bc3bc 100755 --- a/libexec/rc/rc.d/nuageinit +++ b/libexec/rc/rc.d/nuageinit @@ -89,6 +89,10 @@ nuageinit_start() /usr/libexec/nuageinit /media/nuageinit $citype 2>&1 | tee -a /var/log/nuageinit.log ;; esac + if [ -x /var/cache/nuageinit/bootcmds ]; then + echo "Executing 'bootcmd'" | tee -a /var/log/nuageinit.log + /var/cache/nuageinit/bootcmds 2>&1 | tee -a /var/log/nuageinit.log + fi if [ -n "$drive" ]; then umount /media/nuageinit rmdir /media/nuageinit From nobody Sun Jun 28 18:40:32 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 4gpJBT4DFRz6jkR4 for ; Sun, 28 Jun 2026 18:40:33 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBS5lbPz3Xs0 for ; Sun, 28 Jun 2026 18:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672032; 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=puIU8iD7ui1SpZCkoMUKe8GK0gGrqbYouonW1z1xNlE=; b=fDQvOEbAEz4+aXuugxb3aztouBiDVbHsDcR8Eq8i6RhVwPa9GUrScfVnYO8f4YGTOxu0eQ AuoxDl5X+o/VICNZcTLTZkechsqjvKr374e8uSkdWY+weADsz94CYcHAXthR12nnLkqZG8 ByH8bq5FZth+dY2o8lZURgQjOklBOHPk7Q7tzPAVrOG/tnTWYOqhFpAH5TU3+omwg2erTU o3By+pc+j5/Y/9DKzdSJXupSODfyPQWMBKI8u7FW6zZb6Mv4WpSQwmUJ+3Ne5qNDXrcjxf FI5uF1O8BwjAd6FWcMXfn16HeNTqcVQoGg5+XHh2de1/6hyROaMYf7NweJzAJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672032; a=rsa-sha256; cv=none; b=PI0IMtbnUsBxX3HT5NFuPMKvXXZHMtB+41Ddi6GbqkCeTlKDe37sfqBPdMV6PABA3Bw7Lm XXcT/gbgm/2MHyQF02hbsdZeoEY7u/BUptqA43u7peio6zokMiF4DifxRuXzK64sygwlMW xvxEFTUgjXN0WUTJFkX62bWEaDFmtUe4GqYon1cMfoJpngUDcEX09mDrORIz4ZJ2q+aRz4 qgy25OI9/eLnh1y1mY87dIFP2J3q5RhkN7ZnpRd8MElKhTDV3QvnEp42ObaC/QmNAZAgUL K8+SS1/R84QOSa5c8OCHz2di6BchqYa0m94k2bA7bYL4ISyTEGABnADzizscXg== 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=1782672032; 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=puIU8iD7ui1SpZCkoMUKe8GK0gGrqbYouonW1z1xNlE=; b=QiPwHSsRgBFaf1fOSDsx6Ly2qiXOQ0GJxwUp7Z01j3LDczq2Prl4L95hdSEFC22BnOH7rh Zj93eGTspCWrXGVlsG5A6lgCufaHxe7ap+tnXiNkTZhBsXVC25wsyXCjcEoaysdcI4C3DW 294/Fqu6Vx3Vo0gFupY30CebiB4VUWrJndAR5w/hcnRYyqf9HFzfzK7AK949pEor7Slo6V hAv4VxhnqWF3z3xbdD9N9TPQCsAJjkAXafZ+9GUTWLH8wcQstAdp9OLXOhCwLOW+pbln40 ZDVEcAFustcszwJAvYex/++uQpYDWQTf/J0sIQyXbl57qDApKS9Sypf0sdhNNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBS4dVJz6T6 for ; Sun, 28 Jun 2026 18:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c619 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 543348190b7d - stable/15 - pw: remove duplicate pw_user_add declarations 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 543348190b7db9c91e8494d3e683bd8c7de59ae4 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:32 +0000 Message-Id: <6a416aa0.1c619.6822a7b7@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=543348190b7db9c91e8494d3e683bd8c7de59ae4 commit 543348190b7db9c91e8494d3e683bd8c7de59ae4 Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:12:19 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:26 +0000 pw: remove duplicate pw_user_add declarations (cherry picked from commit 1cc5684b3216dd0198c4fe83cdbcaed8d874c99c) --- usr.sbin/pw/pw.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h index ceb843d79503..6be667f166fb 100644 --- a/usr.sbin/pw/pw.h +++ b/usr.sbin/pw/pw.h @@ -81,9 +81,6 @@ int pw_group_mod(int argc, char **argv, char *name); int pw_group_next(int argc, char **argv, char *name); int pw_group_show(int argc, char **argv, char *name); int pw_user_add(int argc, char **argv, char *name); -int pw_user_add(int argc, char **argv, char *name); -int pw_user_add(int argc, char **argv, char *name); -int pw_user_add(int argc, char **argv, char *name); int pw_user_del(int argc, char **argv, char *name); int pw_user_lock(int argc, char **argv, char *name); int pw_user_mod(int argc, char **argv, char *name); From nobody Sun Jun 28 18:40:35 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 4gpJBX31rdz6jkRV for ; Sun, 28 Jun 2026 18:40:36 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBW71BMz3YDD for ; Sun, 28 Jun 2026 18:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672036; 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=Nwzx/A8KAx0ewRtZuRDYBfxqYFOq2s7fX1Npb2I9osg=; b=aa6xRgxeUe3iupjmW7o6ZJtxIfBPY0WfKdQL+qakd83cat2+JCOO1HmwzeBHzSchatoRSI s48Nybs46AERncf03gdrNt1BFWIGBxkkYMQm8b8CUGA70UyPdCd60PJ7L9nHvL3D6wBGSB eTW+0+/Sl18bx4ggLFsNT/aJAkl43T1VqTNv3OKA6wkxleufpWJAEOI4AG27gOTRyYoZwd +ikMIAU6Tgbrf2LYiYQM6YwRnD4zdMVufbYDxS5OAXnTiRzYNdECzv2VDtqxLMCgsG5qzs a72ZaUn7ZHkPcAxMO28uBxm2E80+4Ru0gIpFi3/c3XpTOPVSrRA7ayWDnjL/Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672036; a=rsa-sha256; cv=none; b=GdZKMjmSLpXa7pwLVZQ/SaEzNTlRbBaaiz8tSSn1t2d7BvDHVFhbYXFirc+IF7SGWcyg7H /tjhbF5mLeXNUzSlq/9zSn+dBBv22ovcD19z3BIdqcu9F870bQD9hV3RUa+2QnBculVRnz a5hfB/2DzsHALYSq+efdq9IrOPHuG+uKjD7Lkb5B10kBqE3Ucw7pcv3kuLX9O9o+zMN2hv zv+LQaNLoFGOKRUxOZWrYmOiiOS7qf0Ai3mrRMFGHiadkZqwgjzlOeeGpHpxC2ADjcS/tH cjoeqljxTp23Tc54loVv3H0fTbDPlx3INv8V9qzMqdlilzMl6YIp37w6R5AyIg== 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=1782672036; 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=Nwzx/A8KAx0ewRtZuRDYBfxqYFOq2s7fX1Npb2I9osg=; b=vRxDOgi7fbMpKYgzeqV1mCg11T3dGUWaNBiU3HCmlnZXECXXmWtrsr00H7rDHRCf5pMlNc IL1BV8Qt9jvjsVNfUFXsvorzPX+sAsbm9J35YU11kt2Z65jTGJ4Kb+6STiA+8oZQ5nIrXY cq/QEobKjTlb8sVp/YoFlFPBXUAbrhFqjaZxl3worrub8VAHsuB0uR68+xGq0BkV5CLTAs 0i36ydZMBkTYFfnZMFhQW4czeuEanNzHppwb9Nv6bMRiE6mAFfYwT28tgXw2MZCy9+oJ9+ KQkBjsgL1n5hXpEBUmjtVyVMRfQ0RVC0f0w3fPLfFd5ZSzilhXGJuf3oPt7wFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBW6636z7CK for ; Sun, 28 Jun 2026 18:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c228 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ae577a78a80a - stable/15 - pw: fix const qualification in unquote() 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae577a78a80a4de85698b3ed7b4af1fb19f6abb5 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:35 +0000 Message-Id: <6a416aa3.1c228.1244ec1a@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ae577a78a80a4de85698b3ed7b4af1fb19f6abb5 commit ae577a78a80a4de85698b3ed7b4af1fb19f6abb5 Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:13:23 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:27 +0000 pw: fix const qualification in unquote() The unquote() function took a const char * parameter but modified the string in-place (removing quote characters). Change the parameter to char * and update callers that passed const char * to cast explicitly. (cherry picked from commit 5f9c8f142d1702f5810618e02534054d28d22fa5) --- usr.sbin/pw/pw_conf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c index e9042b15b321..21c4824ead93 100644 --- a/usr.sbin/pw/pw_conf.c +++ b/usr.sbin/pw/pw_conf.c @@ -156,22 +156,22 @@ static char const *kwds[] = }; static char * -unquote(char const * str) +unquote(char * str) { if (str && (*str == '"' || *str == '\'')) { char *p = strchr(str + 1, *str); if (p != NULL) *p = '\0'; - return (char *) (*++str ? str : NULL); + return (*++str ? str : NULL); } - return (char *) str; + return (str); } int boolean_val(char const * str, int dflt) { - if ((str = unquote(str)) != NULL) { + if ((str = unquote((char *)str)) != NULL) { int i; for (i = 0; booltrue[i]; i++) @@ -187,7 +187,7 @@ boolean_val(char const * str, int dflt) int passwd_val(char const * str, int dflt) { - if ((str = unquote(str)) != NULL) { + if ((str = unquote((char *)str)) != NULL) { int i; for (i = 0; booltrue[i]; i++) @@ -228,7 +228,7 @@ newstr(char const * p) { char *q; - if ((p = unquote(p)) == NULL) + if ((p = unquote((char *)p)) == NULL) return (NULL); if ((q = strdup(p)) == NULL) From nobody Sun Jun 28 18:40:33 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 4gpJBV5T8Dz6jkRC for ; Sun, 28 Jun 2026 18:40:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBT6Sn0z3YCn for ; Sun, 28 Jun 2026 18:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672033; 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=O13VnYFdgW3ziPvPCzs5mk0OQI9WIIfDs7idv1GfILg=; b=yOrvOhyUeIBBKSDAu5ppNXK//T7cFQUbWRpYHaSHjWwldhV6m1gL8s3gGlRPA15cT3YJqk t804a5j7Yq4kFSFktXXJPIBGlW/S8ukZMENwY/gOmCboY7/0tMBv5J1GzCDoH+H7rtZFoR 3YvLWoDFfJsyE/N3gNCk6IYf07BBQb5QllBjySG8erkLKt4PjuoK9fBVoj6eIqrz4FuC/v iqE4m7DnUw1KAfKqJ+kd3JCDzv3KXE3GsfYo6OJnoLZCc9Dq6/scrAsxvw1aqzJO9+Z1xY qix+Qq1rWwox1yMzfLlOeD5HzEotDhyWpnMlGb0K8UySv4v8ooxiVTqLq3/Vng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672033; a=rsa-sha256; cv=none; b=muwNmpE0kGz0fkGEWd06ELhQlGyXaUeO4b4ojae6RLpCMam4dt8BDhkrlOBYfmY1PyIPAD SJtdqNde657a77p5clHDU2fAvoO4MEOQoniUxavklu4mYRvFhPK0guRaa9KqN8Y54vakdQ Voqjz9xGrNSRaLWfH0Vd/2aaNDYd74Vzr07Dq4d/pR3pxSiqiSFVy7vH3mHLlylS6hA9tc b9iGp/gh+re6yl4l+warhqlwMwJ03ke1rTSoAiXb2lmFd+JTcq6gPz97Ce5Pz89xh1aE5c qby74N9/3YLOBhoeyXE2Cf3DEG84QmHia+/f3IFWwB6UMgBv6VUyZPzM3ueNPQ== 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=1782672033; 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=O13VnYFdgW3ziPvPCzs5mk0OQI9WIIfDs7idv1GfILg=; b=WsPHiyxWxGY7hAdPMOm9lVfjD8q9qhqOAQRPcnMuNAJHY7UwBGv1LqUd1E7wnB9efgXPMT BNBDno9FfyX1ZODi674GA/7rFaaVstXkp43Z+QDT88WdMYkovHem2uli8IitwCNajRJu3L UsioWLBmEqTdGjSX55v3LS6c4HaGdSPGL+4m9ixvYc7GfxNjXBVLxbmOGYFpqLeHKUAEGd 7xAs3lCCha6dMCKDDWKS8BGc2dNKNe3lP6FzK2frLhqKdc4CItBCX/6qlKV01BloW5NP0e 3v282Vrklcuf+bTs4mUUgBAYGvKDZITwJsCd3+CizhJKhN+2Fgpv7eCZYo1UQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBT50XQz6nh for ; Sun, 28 Jun 2026 18:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c43b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3973c36d1f86 - stable/15 - pw: fix uninitialized name pointer in pw_group_del 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3973c36d1f86653bd65025ddbd4f05f3ef4b5b1f Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:33 +0000 Message-Id: <6a416aa1.1c43b.2dc7dc7a@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3973c36d1f86653bd65025ddbd4f05f3ef4b5b1f commit 3973c36d1f86653bd65025ddbd4f05f3ef4b5b1f Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:12:24 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:26 +0000 pw: fix uninitialized name pointer in pw_group_del The 'name' variable could be left uninitialized if neither the positional argument nor -n is supplied, leading to undefined behavior when passed to getgroup(). (cherry picked from commit 13f4a37b536b60d559c766b3ec4f2d5d25279ea3) --- usr.sbin/pw/pw_group.c | 2 +- usr.sbin/pw/tests/pw_groupdel_test.sh | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c index 1941c03aa2c5..2840e972af59 100644 --- a/usr.sbin/pw/pw_group.c +++ b/usr.sbin/pw/pw_group.c @@ -367,7 +367,7 @@ pw_group_del(int argc, char **argv, char *arg1) { struct userconf *cnf = NULL; struct group *grp = NULL; - char *name; + char *name = NULL; const char *cfg = NULL; intmax_t id = -1; int ch, rc; diff --git a/usr.sbin/pw/tests/pw_groupdel_test.sh b/usr.sbin/pw/tests/pw_groupdel_test.sh index fa51b3814205..0fb5651944f3 100755 --- a/usr.sbin/pw/tests/pw_groupdel_test.sh +++ b/usr.sbin/pw/tests/pw_groupdel_test.sh @@ -18,6 +18,20 @@ group_do_not_delete_wheel_if_group_unknown_body() { } +atf_test_case group_delete_by_gid cleanup +group_delete_by_gid_head() { + atf_set "descr" "Test deleting a group by gid without providing a name" +} +group_delete_by_gid_body() { + populate_etc_skel + ${PW} groupadd testgroup -g 1000 || atf_fail "Creating test group" + atf_check -s exit:0 -o inline:"testgroup:*:1000:\n" \ + -x ${PW} groupshow 1000 + ${PW} groupdel -g 1000 || atf_fail "Deleting group by gid" +} + + atf_init_test_cases() { - atf_add_test_case group_do_not_delete_wheel_if_group_unknown + atf_add_test_case group_do_not_delete_wheel_if_group_unknown + atf_add_test_case group_delete_by_gid } From nobody Sun Jun 28 18:40:34 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 4gpJBW3fKZz6jkRQ for ; Sun, 28 Jun 2026 18:40:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBV6cKfz3YGS for ; Sun, 28 Jun 2026 18:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672034; 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=Qwuuba8nRKgM2XLHyIpo4WgXj1WXK7CAtXg3TFFra4s=; b=I49de1cgALbfpPMZ3vU1B6UNhns1ChIEigsnNFzsRAT22Y3CED3bYJD6S1/XVDFVQ/mRJT w5bOybmPjQxS9zq4OdnbM+qbfKDXhF6YLxA+V7gc+NLkmM6LqLyVnlu76ISDpcI5yHwrgD +6ykSQTdZVirHvFQKf49E+umNzGwQj8I0mrF9CJvklQthUYz/ndnAJVk1V95JJyaE8Ztuw sBcYkd5+q6gtcigOGVgE+ebYSojY6/q8CULhRF19JzKs+gqVH+J2SSEMjr7D45cFGgq6NJ 9Ru3pmGQtix957svygJc89JCk1ryQkreJJaIFgpyJ454vF1iIWcpLdzcNR4Wfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672034; a=rsa-sha256; cv=none; b=sywukdhJk/3WOv4NutAdK/jXAX5p4zgdkJvl7kxtRkvyBsL1i/LSwbQyvWoB8jcLl3zwua zjNwQ+E2FCoG5IjJE49VgiYvTo4HR/4PqByEPVkfOAmS/DcgcrscptIXWoLcg/3Q6W/zee aF9+BeT+GottANq0Wh8VRofcPFKTufg7QI5gW1do+aSDcDMsSrUSxjNtEUqQyDdzJXwOh5 HTr8YUJsk1h+FL0w6oP/xHQxwgm/LZAo3SOU61+vnM7QP11m4cEsgI97xqehW+ivQBphfH pYRdwxh2JAe/NEgKhsV4qyLdm4/ASXFD0tUUxZ66MwCLYFrAlBefWeDXLnA23Q== 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=1782672034; 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=Qwuuba8nRKgM2XLHyIpo4WgXj1WXK7CAtXg3TFFra4s=; b=sQE26ngXE7Ww3L+d3VMET45qoknl3E0bLc3Z1BFFaSuVXiQ35i0WfY8nuf0LnPHgLTjqa4 eH+vB3yQLExAEJV3V9qcz/kaKEGLKcHwFda0lq3oXJC9mI9PMagAtfjN9K5XjG6+eLrE1C PcRtYZPQE44zSsGdaCzByHSj4ASFxlqkH8nyX4Eyu2ockNPt7hJD+3LKFspv99lfsA49gh vvwQs+Et69bWlip/OORrOaJPtJl3lAhOmbUSrej+ey90xcHCBJ+7bMKJ7werJs8if7I8Sq yu+CDCEcqUT/BT49FFc0Zc8TNmSad4LZR8MN38mEMgpvORtcrClghPfUVw3zNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBV5X22z73C for ; Sun, 28 Jun 2026 18:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cd82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2dd4c50deeaf - stable/15 - pw: fix inverted condition in shell_path error handling 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2dd4c50deeaf9007c181ccaf063bac298c8ae78d Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:34 +0000 Message-Id: <6a416aa2.1cd82.4121dab@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2dd4c50deeaf9007c181ccaf063bac298c8ae78d commit 2dd4c50deeaf9007c181ccaf063bac298c8ae78d Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:12:35 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:26 +0000 pw: fix inverted condition in shell_path error handling (cherry picked from commit 4fd8a69ec6623da5ef33818be134efffebe37f75) --- usr.sbin/pw/pw_user.c | 2 +- usr.sbin/pw/tests/pw_useradd_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index 413eac4882cc..dcf870ca1edc 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -464,7 +464,7 @@ shell_path(char const * path, char *shells[], char *sh) return shellpath; } } - if (sh == NULL) + if (sh != NULL) errx(EX_OSFILE, "can't find shell `%s' in shell paths", sh); errx(EX_CONFIG, "no default shell available or defined"); return NULL; diff --git a/usr.sbin/pw/tests/pw_useradd_test.sh b/usr.sbin/pw/tests/pw_useradd_test.sh index 75e96a64ba8e..4b0778759203 100755 --- a/usr.sbin/pw/tests/pw_useradd_test.sh +++ b/usr.sbin/pw/tests/pw_useradd_test.sh @@ -402,7 +402,7 @@ user_add_bad_shell_body() { populate_etc_skel atf_check -s exit:0 ${PW} useradd foo -s sh - atf_check -s exit:78 -e ignore ${PW} useradd bar -s badshell + atf_check -s exit:72 -e inline:"pw: can't find shell \`badshell' in shell paths\n" ${PW} useradd bar -s badshell } atf_test_case user_add_already_exists From nobody Sun Jun 28 18:40:36 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 4gpJBY5Dhzz6jkcL for ; Sun, 28 Jun 2026 18:40:37 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBY0lbJz3YGl for ; Sun, 28 Jun 2026 18:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672037; 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=tU2oUngAvkAAYEUDQ4eoeNj4jxthUYvAuoecz67yIlQ=; b=Us0FEJ3HgFWoovXnwxKL8ewV4CiYwr+A0lhyK5ZH/rQDOFc3NZTvNWUuKS1FZ8OytfAfmk XQ83CjUP4r7haA3o1D5Gww9WrG08FB8h4WDpCZw+ZHMUNZscpDROm6I0W+2t/hjjZ4h5ZD 0WbMlX4d0H17yUkNbxSD66cIFlQTZZmVJU76UcJMsM4UXCW5bBKsVQyBmj1yJjYTVuNum0 U6Wg7g3/r8ckflnh+1YOBkasCviPiWSV060QMH2ncjflEeZGoz8TMZYDJf37RNgWaTemqH DlAnulfYrAZM421qUv7jSDw6ZLiMdtX3eJ9xOvIOkjb5kmpin5GzCF2NWT4RzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672037; a=rsa-sha256; cv=none; b=mjmITwD/d/Zl5oNw1gK6sCVzV7W82AgzQ/mryvzUfVmtAIPzPqkfLWEZQAiDdwnPJ5rwUJ P5rZmkaCEFTvnzcxgzO3TF14nT36c2E7i5Lh4GnMBjShy8CwyBoujo8xhXQ01w2rDh7jLj Ylr3gbXhnFhPZWAcQ5AzH7xsXoirQ8XV7+5t8wHKwKrOhdb/cqUgyuutfFXg1NBV7ctZ4M M0CSEwvgfHSHkpMZZ8wLEaX8x6gRInghBNqFmOC5ouwAqtCoRSyMXvOpcYgKrTPk+Pqgx0 jd+nb3RF8MLjWJoKnk5IBeEZf/eMP+NTZXc1865DXwvxYHaUEQRT0u7r4brKCQ== 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=1782672037; 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=tU2oUngAvkAAYEUDQ4eoeNj4jxthUYvAuoecz67yIlQ=; b=nggww1WTF0JpyT0nmcg2gLTBW1Ifamv9iKr4bC6HLOmddkedE2XxQOg3DEaxzVjsJ6AyBc TXPH8Hi1s8kHCRkYQvX8FZ3jFLt4f+DeHUR+pAQs/RGrochE9mNwhAOUCkgIdFhV8J6N3U arPKSQf2lWGBM9XxOqpO7QgNvR0QyhmSvt3JN6pzCrhR3I49Lsx+vMAVMqILhJQ3k2m7HE hDOM2PSL6UOXfC7kjNUw/sM5M52bnIbAC84BguIXO80YXfIv24+7JAg3tnCL0q/H08EsbP Y0CI6OsKgIMnnIWO4wsIm5ZUZiBsOu6chB7yKefea5HJZzocY0HN1KXkL+4A8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBX6sxWz70F for ; Sun, 28 Jun 2026 18:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d2ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c552051fb08f - stable/15 - pw: fix setmode(NULL) crash when homemode is a boolean value 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c552051fb08fdb3c599f9c1d5ab0af52169a73c8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:36 +0000 Message-Id: <6a416aa4.1d2ee.51716b5b@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c552051fb08fdb3c599f9c1d5ab0af52169a73c8 commit c552051fb08fdb3c599f9c1d5ab0af52169a73c8 Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:13:52 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:27 +0000 pw: fix setmode(NULL) crash when homemode is a boolean value (cherry picked from commit fe1e912d5a394565e9adfbc443555ae0b3f087e5) --- usr.sbin/pw/pw_conf.c | 14 ++++++++++---- usr.sbin/pw/tests/pw_config_test.sh | 12 ++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c index 21c4824ead93..7e8fdd375395 100644 --- a/usr.sbin/pw/pw_conf.c +++ b/usr.sbin/pw/pw_conf.c @@ -298,10 +298,16 @@ read_userconfig(char const * file) ? "/home" : newstr(q); break; case _UC_HOMEMODE: - modeset = setmode(q); - config.homemode = (q == NULL || !boolean_val(q, 1)) - ? _DEF_DIRMODE : getmode(modeset, _DEF_DIRMODE); - free(modeset); + if (q == NULL || !boolean_val(q, 1)) { + config.homemode = _DEF_DIRMODE; + } else { + modeset = setmode(q); + if (modeset == NULL) + errx(1, "Invalid mode: '%s'", q); + config.homemode = getmode(modeset, + _DEF_DIRMODE); + free(modeset); + } break; case _UC_SHELLPATH: config.shelldir = (q == NULL || !boolean_val(q, 1)) diff --git a/usr.sbin/pw/tests/pw_config_test.sh b/usr.sbin/pw/tests/pw_config_test.sh index e9209190dc5e..4087653fd4bb 100755 --- a/usr.sbin/pw/tests/pw_config_test.sh +++ b/usr.sbin/pw/tests/pw_config_test.sh @@ -19,7 +19,19 @@ modify_config_uid_gid_boundaries_body() { cat ${HOME}/foo.conf } +atf_test_case homemode_boolean_no_crash +homemode_boolean_no_crash_head() { + atf_set "descr" "Verify that homemode = yes in config gives a clean error" +} +homemode_boolean_no_crash_body() { + echo 'homemode = yes' > ${HOME}/bad.conf + populate_etc_skel + atf_check -s exit:1 -e inline:"pw: Invalid mode: 'yes'\n" \ + ${PW} useradd -D -C ${HOME}/bad.conf +} + atf_init_test_cases() { atf_add_test_case generate_config atf_add_test_case modify_config_uid_gid_boundaries + atf_add_test_case homemode_boolean_no_crash } From nobody Sun Jun 28 18:40:37 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 4gpJBZ307yz6jkcM for ; Sun, 28 Jun 2026 18:40:38 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBZ17vyz3Y5l for ; Sun, 28 Jun 2026 18:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672038; 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=RKtqsrPL9unqfQ+5VCNKdX+N5EpmvQsSMmen7B1+4Fk=; b=YwrfVC3d7C+iCZQai6qWY/hWOKuK+fd8mhjxlNdrbbWIdSLCX50v8BjXkAWFIDpEchJnPs BbEYpWNz5oXtLuj4fEWbXG+Mr8Qn4lmGx1CHtsArP8KnHi33tJdE7wPtpdwlGUSXGdsAAW ohURHcc95dTokW0PqWitPufyRTBDGdKtA741SXpJttfWQqgcllf50EAfmfawcZj/KIfoJz 93ySUWFigrKOnKbE6CYiyGtWi8r9IV+28How9tGRpuFn1lJg9pDC0J7rVo2iwhzcSNBDR0 5tOq2g0C5RhaxrtEF2zdPIsC3IXAu6EduqULVPPQCUytVN3QLFhih9+4n2lOQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672038; a=rsa-sha256; cv=none; b=Fw7l0piFCUrrbFZLgh8tkL8ejV4uWYP8LNZHEIwtd8H6cmkEiIV859Taxx5eZ9804GaDGc 19zsjCWXlqExVL9ygStraEZ8BIJfKYfXAHgs/AhHOab1Dm2Db4uM93zncJfZzdfgSxL1h2 G5hSzf2lik6QhTaI60vZvryhaMi0JIhua3hdvkh4aWYwiQaoZnE8GLhudxSyqgPnV0FXJk kwld3Q1D/9fyQ0KDL5h9QkbuZ3zT9T6/LaLb7WgsYfQ6S/t+a8t1Mf6aGosQ6SgG6/9Kcw B48dSrTT1qMu7xgiVdcsqTncO/WsGOurNwKYrE7mfYJhY4WHY5sUvsza7CHzJQ== 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=1782672038; 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=RKtqsrPL9unqfQ+5VCNKdX+N5EpmvQsSMmen7B1+4Fk=; b=By+EtcSvnJf11C5vnvRgM+iN9C77WwS/gcYY2koQzLO4dVSpQoXZXRTchZy2qpVIUI5euj U4gspS8X8Ij2GwKy5XiSnZck91tSH3rHOrrSgdsrLtntmZzmS+tF1pmfYi000ebq3hUSDO E9Xpi9mXZd5jyUZtMerEp55EHZSPaKOykWTe9BgiirSbu/KWb3t+8XgPmHOa47JgvrS2Vy hK/6u3bsvYd4K6p8uzcv8R0/jRs/QjF6zlAIM6BFse/ByO2bUG9136VXpGwSzx6/MG1JgM JN63adk9Q1IWVxbec0hn8DpRCIV7FtsNtP7Y17hQBMRhdBRfsNo7IMK01KRGqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBZ00D9z73F for ; Sun, 28 Jun 2026 18:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ccc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ed54170f89bb - stable/15 - pw: fix incorrect metalog path in mkdir_home_parents 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ed54170f89bb481ee8fe9878e8591eaf6d761e8d Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:37 +0000 Message-Id: <6a416aa5.1ccc3.3c5f4371@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ed54170f89bb481ee8fe9878e8591eaf6d761e8d commit ed54170f89bb481ee8fe9878e8591eaf6d761e8d Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:19:54 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:27 +0000 pw: fix incorrect metalog path in mkdir_home_parents (cherry picked from commit ab478de1f9b3f73036ee05004fb2d503a0f339bc) --- usr.sbin/pw/pw_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index dcf870ca1edc..abb8a09ce468 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -123,7 +123,7 @@ mkdir_home_parents(int dfd, const char *dir) dirs); if (fchownat(dfd, dirs, 0, 0, 0) != 0) warn("chown(%s)", dirs); - metalog_emit(dir, + metalog_emit(dirs, (_DEF_DIRMODE | S_IFDIR) & ~pumask, 0, 0, 0); } From nobody Sun Jun 28 18:40:39 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 4gpJBc1TKgz6jkRx for ; Sun, 28 Jun 2026 18:40:40 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBb1y9Bz3YDq for ; Sun, 28 Jun 2026 18:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672039; 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=iIWfkMshDG5D4b6izbnsbAXdRqUj8CQh7SaJLIALbpc=; b=bbaWPYxeTSh92YZqHpP1HUBCeMohbH0/U0fKHLmRCE/SMyGhSdUVJ/LsqQLVbNmHZbBUwU Ebu4c068S7vm7SO9Xu9xcpoA0RcPgTRy8f3vXGy9lzg+rGOl3JF4QU0X/j2iCte7Cgtr6h T3JLOe9gD/eFZhUFP/DoOwDVa3PTa8WwEHfdSVbsPrtaclycQwcy5qOQiHO3KaQvHaqRh/ p9ut4iJGZsgBr/gkKGF4EGuSnhQUEpK/yp1qREq2YtaYEMDoGOWXjW34nzsI8kb/YxKMEc pec9AYP7da5sAHrg6DtGPMuV3IvmDje7NyClwgS1OAgKTRjER8BL4JT7YofHgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672039; a=rsa-sha256; cv=none; b=SMZZGjKs782Gfy2vuhgKHzer47FAqcM0iuAN1CAh8SzQV7uHW6FOFIu711Lfi8NhaHMMfO 3FAlikVRqmxzOG3Pb5C17UZxST0NF7CroD1GkZArjO3S7mCpIUIYteBwlvWbu3PvsOzZuh wTQp5dEiMmf+BSaQvYC+wCpzaU+fzUele8w2bBgEj17RML92rzoZ5JlBOH2il+kxhEc3D+ fK5BqGUepHpAuSUVg0mQpvYpNu5pX80NniHKGgwbtWD1mf3mfI4+7ykp0CoRV7ols/YVS8 PCETSbMPoxhbIAKXqEpYhPYo8KEMAwBfOaUNJJ79WhXDTQ1GGzaTT4SxeZoLKA== 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=1782672039; 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=iIWfkMshDG5D4b6izbnsbAXdRqUj8CQh7SaJLIALbpc=; b=YLkmqIWN+C1kUFTsB/zzQhJKNduqL/S5NnjA3dzWf9Y+2qMHxHLnLZrMU6eaYbOK2wwsfz RvYkfPHc+ji8lqEB0CTSu1K59AnBtF1ski24AsBqBzykEQfleP66KXkio4IStRU0lTtwI4 5xubLHaqaqpk/siuFhNx2AdEBayMFPAAxgkG1M1RalqA2RLU7Pu1egndwcknd8zUZC2f6u 4XWPKF/9BqAPuUa5uLYYIRhVDPsuNUiDTwoEmEPOG9c2aRDXbvGEa9wSsrnvkzjUbyCe9A Y7Qxc7a3RPf6BiCYoNGftfJ1OGjtqpBp1i0btfvoFwbz8tmwnh+65jETUTJq6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBb0fzDz70G for ; Sun, 28 Jun 2026 18:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c5755b769724 - stable/15 - nuageinit: add tests for bootcmd, ssh_deletekeys, disable_root, manage_etc_hosts 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c5755b769724976b722315f94838a0c930ca9170 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:39 +0000 Message-Id: <6a416aa7.1a5d7.25d2982a@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c5755b769724976b722315f94838a0c930ca9170 commit c5755b769724976b722315f94838a0c930ca9170 Author: Baptiste Daroussin AuthorDate: 2026-06-05 06:38:33 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:27 +0000 nuageinit: add tests for bootcmd, ssh_deletekeys, disable_root, manage_etc_hosts (cherry picked from commit 6e54d00867dd2b979d2dc097c710613e6b9bd33b) --- libexec/nuageinit/tests/nuageinit.sh | 167 +++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index b68aa6017d0a..ac7086183d86 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -30,6 +30,10 @@ atf_test_case config2_userdata_packages atf_test_case config2_userdata_update_packages atf_test_case config2_userdata_upgrade_packages atf_test_case config2_userdata_shebang +atf_test_case config2_userdata_ssh_deletekeys +atf_test_case config2_userdata_disable_root +atf_test_case config2_userdata_bootcmd +atf_test_case config2_userdata_manage_etc_hosts atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -950,6 +954,165 @@ EOF atf_check -o inline:"bob" cat foo } +config2_userdata_ssh_deletekeys_head() +{ + atf_set "require.user" root +} +config2_userdata_ssh_deletekeys_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data < media/nuageinit/meta_data.json + cat > media/nuageinit/user_data < media/nuageinit/user_data < media/nuageinit/user_data < media/nuageinit/user_data < etc/ssh/sshd_config + atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -o inline:"PermitRootLogin yes\n" cat etc/ssh/sshd_config +} + +config2_userdata_bootcmd_head() +{ + atf_set "require.user" root +} +config2_userdata_bootcmd_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data < media/nuageinit/user_data < media/nuageinit/user_data < media/nuageinit/meta_data.json + # Test 1: manage_etc_hosts adds hostname when /etc/hosts does not exist + cat > media/nuageinit/user_data < etc/hosts < media/nuageinit/user_data < etc/hosts < media/nuageinit/user_data < etc/hosts < media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:40 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBc2KlHz3YDx for ; Sun, 28 Jun 2026 18:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672040; 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=0iWKJDhZppN1Z9+tbDO896cqiYTr7gZ43g5B/IaIgHk=; b=xYWZNdOxHD/6xrhtgRIwq7n5VQbSxtDsR1Bj+8XsEiym0BVtthSbCa/Nqf0XNNdYO3d0uO vB1OAmFxCV8mvYWAsjrQx9u37nSOzkfjwssFnnxRSoM0TxTx5grKbh/U3E+q3eqbwbeveu pXynuGjD5BwbfBpq+LCFPCUdp6tAiVh6hvOYPIOVFMolkMbKpzlbwmZ0zhBz57LLcNLr1z wUTBNlmC16uotOBIMwxgNEDkL6Cqdh0WVEM6wFNYZjKMO4MDhH/lILjiMyG9Tm9maxHFoR JHlSJIVw7RnHEDalw/GrAFQrH4d6rlHUE9/MVymKrxBTMkdWg3U89rdNW8dx0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672040; a=rsa-sha256; cv=none; b=qqhmeqdTEglJpfgDIMwx4r7fF2y8lz2HQA4FFj/GZHJppE7uFnCmdauwXzoiXHXSD32ibw HF55TQO1tBq6xdQ41AD40/LWzlXOc4+OJkP2nkH9+QS4KlCWxtoggjyNZTKVzqhjWkbiJT 7DO2gR/lc6XTvP5AVi+Y6avp7RKKRyPjCfGUf5R0VS3eFAMSKB9oY+lA88mdG41TIVCfZA 6SV0ZQBBhdEM7v0iaEer3lcnZ54d1rU2ih47j5UIp5e8BNKJsBg8+ACpjhkDDskjpxp38G leZCFxL8/5Hdadz72RHBqowq6GOLmSPowjnlnjDEXMRTOgt7kacp3Fc6Qhdzcw== 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=1782672040; 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=0iWKJDhZppN1Z9+tbDO896cqiYTr7gZ43g5B/IaIgHk=; b=N0BjwYpLJ0Tnm8WQ/wfOwlqJef+wG0uibGiPmX0P1ZTsQI7ZQq7SXaIkC5ZRhaktm9tfRx 0o9QgELxkPa5K1UpNtqyyakGNp2yGdjPaWjj4HgE3jY71xFBqDS973F8XDy3oHSPVvkdld t3Emxw/8uzID+O6HVwkCABTeaBq9JWd2+VBhMgRNLG3DaLG/aRlu18tkzVKAj1WaqYlgTh nW1gsNVdm2DNCb6bbiK3F9YRndVGPTYgDp9D9u+um4XCwgqwQjSt1goymlcvTInqxWpZvw HnK3MK2jQlDmsqLjPzBLTZJqLRukrHRiYHpPZei2skRtl8Pf0AOK4drPW1uPLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBc1NHYz6nn for ; Sun, 28 Jun 2026 18:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a1f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e3d8f73cf2f6 - stable/15 - nuageinit: implement mounts support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e3d8f73cf2f6bd7fff0f6643206bc14657573570 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:40 +0000 Message-Id: <6a416aa8.1a1f6.257a4c27@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e3d8f73cf2f6bd7fff0f6643206bc14657573570 commit e3d8f73cf2f6bd7fff0f6643206bc14657573570 Author: Baptiste Daroussin AuthorDate: 2026-06-05 10:05:08 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:27 +0000 nuageinit: implement mounts support Add support for the 'mounts' cloud-config key which configures mount points by appending entries to /etc/fstab and creating the corresponding directories. (cherry picked from commit 797dad91ff468a9bd6cd5d4f720eb4bbac1f454a) --- libexec/nuageinit/nuage.lua | 48 +++++++++++++++++++++++++++++++++++- libexec/nuageinit/nuageinit | 33 +++++++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 36 +++++++++++++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 28 +++++++++++++++++++++ 4 files changed, 144 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 45e14ef0ce21..34cf8c9fc090 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -821,6 +821,50 @@ local function addfile(file, defer) return true end +local function add_fstab_entry(root, device, mount_point, fstype, options, dump_freq, passno) + local fstab_path = root .. "/etc/fstab" + local f = io.open(fstab_path, "a") + if not f then + warnmsg("unable to open " .. fstab_path .. " for writing") + return false + end + options = options or "rw" + dump_freq = dump_freq or 0 + passno = passno or 0 + f:write(string.format("%s\t\t%s\t\t%s\t\t%s\t\t%d\t\t%d\n", + device, mount_point, fstype, options, dump_freq, passno)) + f:close() + return true +end + +local function remove_fstab_entry(root, mount_point) + local fstab_path = root .. "/etc/fstab" + local f = io.open(fstab_path, "r") + if not f then + return + end + local lines = {} + for line in f:lines() do + local fields = {} + for field in line:gmatch("%S+") do + table.insert(fields, field) + end + if fields[2] ~= mount_point then + table.insert(lines, line) + end + end + f:close() + local nf = io.open(fstab_path, "w") + if not nf then + warnmsg("unable to open " .. fstab_path .. " for writing") + return + end + for _, line in ipairs(lines) do + nf:write(line .. "\n") + end + nf:close() +end + local n = { shell_escape = shell_escape, warn = warnmsg, @@ -844,7 +888,9 @@ local n = { upgrade_packages = upgrade_packages, addsudo = addsudo, adddoas = adddoas, - addfile = addfile + addfile = addfile, + add_fstab_entry = add_fstab_entry, + remove_fstab_entry = remove_fstab_entry, } return n diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 9d2f3c6024c4..f56d1207cf01 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -531,6 +531,38 @@ local function disable_root(obj) end end +local function mounts(obj) + if obj.mounts == nil then return end + for _, m in ipairs(obj.mounts) do + local device, mount_point, fstype, options, dump_freq, passno + if type(m) == "table" then + if m[1] then + -- List format: [device, mount_point, fstype, options, dump_freq, passno] + device = m[1] + mount_point = m[2] + fstype = m[3] + options = m[4] + dump_freq = tonumber(m[5]) or 0 + passno = tonumber(m[6]) or 0 + else + -- Dict format + device = m.name or m.device or m.spec + mount_point = m.mount_point or m.mountpoint + fstype = m.type or m.filesystem or m.fstype + options = m.options or m.opts + dump_freq = tonumber(m.dump) or 0 + passno = tonumber(m.passno) or tonumber(m.pass_no) or 0 + end + end + if device and mount_point and fstype then + nuage.mkdir_p(root .. mount_point) + nuage.add_fstab_entry(root, device, mount_point, fstype, options, dump_freq, passno) + else + warnmsg("Invalid mount entry, skipping") + end + end +end + local function bootcmd(obj) if obj.bootcmd == nil then return end local f = nil @@ -828,6 +860,7 @@ if line == nil then -- YAML user-data elseif line == "#cloud-config" then local pre_network_calls = { + mounts, bootcmd, sethostname, manage_etc_hosts, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 66a72324f414..c2981669acb7 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -159,6 +159,42 @@ Defaults to Set to .Ar false to skip this behaviour. +.It Ic mounts +A list of mount points to configure. +Each entry is written to +.Pa /etc/fstab +and the mount point directory is created. +.Pp +Each entry can be specified as a list: +.Bd -literal -offset indent +[ device, mountpoint, fstype ] +.Ed +.Pp +or as an object: +.Bd -literal -offset indent +{ device: "...", mountpoint: "...", type: "...", options: "..." } +.Ed +.Pp +The following keys are recognized: +.Bl -tag -width "options" +.It device (or name, spec) +The device to mount. +.It mountpoint (or mount_point) +The mount point directory. +.It type (or fstype, filesystem) +The filesystem type. +.It options (or opts) +The mount options, defaults to +.Qq rw . +.It dump +The dump frequency for +.Xr dump 8 , +defaults to 0. +.It passno +The pass number for +.Xr fsck 8 , +defaults to 0. +.El .It Ic timezone Sets the system timezone based on the value provided. .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index ac7086183d86..11d34fcd98ea 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -34,6 +34,7 @@ atf_test_case config2_userdata_ssh_deletekeys atf_test_case config2_userdata_disable_root atf_test_case config2_userdata_bootcmd atf_test_case config2_userdata_manage_etc_hosts +atf_test_case config2_userdata_mounts atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1113,6 +1114,32 @@ EOF atf_check -o inline:"::1\t\tlocalhost\n127.0.0.1\t\tlocalhost\n" cat etc/hosts } +config2_userdata_mounts_head() +{ + atf_set "require.user" root +} +config2_userdata_mounts_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBd2zlQz3YBq for ; Sun, 28 Jun 2026 18:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672041; 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=g8SBiTlaCAPsuFePCrgg8Om45SJTHzeC3XkqTN6hsdc=; b=opWBdn7jz5CsSCS+663pLDGqwHNUf+flmKfpeF27d8g92mxnrBnLqaAxHBnDDUhe6qMhuX Uda/iXUMxVp2BSJVaRT5ra1mbW9vuO7/KgYohLD0ltsVoFBnA4iLePZuCQWgoUtdOUNiA9 vy98y6EqjnJ7+vAF9hh8ULFkNft98N58z31mM/+w1aFAhZ+Odsv7QNQdVV6vgj5bLxkNWe 4qONdb9teUfF0SVpp46Ju87LccEQuu1hISkC6HRflb4ba/3iFbQdK5bH8rcTTJC6LoGOJf PilI2h2Do0653G2gWHdCcHyTv1hLFpk87s4m30vkLoy99nk6z00UjKrY5gTp5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672041; a=rsa-sha256; cv=none; b=RBm6coAQpC8Z8PnvGHsXmeiPVpXgGDN0z2RnQHLkdlP4CYCxU/0V3C3JA8H+rMrd/h7ZS8 hGQ/OBQVtPCfhkcTIeX1PIBoKh6J8jshgr5yTzn4UvLd1++IkZ0CoDq92rwXewQL5HbTc/ kkohpqmqD7bRCRzd3RM0XmEfaJF+RwnLvgfyFIBnMJvOV1TpgEyQiDUWarWZeDr5x3nBox cCMIev2n8NJGXD7O6f3Y5m4VYJwieqFYf45k+hNXnlPU58E7EPv1m8nhP+5mnfZpR5rA6W G3dIJ/XGQYZgoIkYEkSTFObaBJeQTAXQrtSYDyGou+OMGoFUWMgnerp/JhWhpA== 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=1782672041; 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=g8SBiTlaCAPsuFePCrgg8Om45SJTHzeC3XkqTN6hsdc=; b=wkrOGWqUOrhftIgMZmy40aLwDH1jJ5TdfmsvAsS3RtX90pbBDiSkQpGVDNWWw+t8C2UlLB vTTL0l5l3GpIk5T/0Wk9HjT/lIIZ3MjQsSCZDAVSOmro/CWi3G86CdwisNwCEnkPL53cRM efmpDVX82C3gh6E+uZsT9nLj/jwgvaZ7Crv+q1K9022Z6l+BEDxLMM62Lls2f0AsnKRB/p pUHJ+697pg4+fL1gawJx/tpLUMnCs2yscjuRtO+Vj/zuq3d+E0rhvliGgitG5yoLQQjpIn MWTY3o0ZWkwijUjYSAyXuIBVlP5CzAjjTUYj1KP9c+0JBQ03dQBz6j3D8Mq3SA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBd1phlz73G for ; Sun, 28 Jun 2026 18:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 04b8103810c7 - stable/15 - nuageinit: implement resolv_conf support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 04b8103810c7c48041a8e958cb507be568ddda27 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:41 +0000 Message-Id: <6a416aa9.1cb9a.2a457a02@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=04b8103810c7c48041a8e958cb507be568ddda27 commit 04b8103810c7c48041a8e958cb507be568ddda27 Author: Baptiste Daroussin AuthorDate: 2026-06-05 10:06:02 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:27 +0000 nuageinit: implement resolv_conf support Add support for the 'resolv_conf' cloud-config key which writes directly to /etc/resolv.conf. (cherry picked from commit 4662263c246fd9c31cf0f03089845140114445bc) --- libexec/nuageinit/nuage.lua | 32 ++++++++++++++++++++++++++++++++ libexec/nuageinit/nuageinit | 6 ++++++ libexec/nuageinit/nuageinit.7 | 17 +++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 34cf8c9fc090..7fde2d936f1b 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -837,6 +837,37 @@ local function add_fstab_entry(root, device, mount_point, fstype, options, dump_ return true end +local function write_resolv_conf(root, config) + local path = root .. "/etc/resolv.conf" + local f = io.open(path, "w") + if not f then + warnmsg("unable to open " .. path .. " for writing") + return + end + if config.domain then + f:write("domain " .. config.domain .. "\n") + end + if config.searchdomains then + f:write("search " .. table.concat(config.searchdomains, " ") .. "\n") + end + if config.sortlist then + f:write("sortlist " .. table.concat(config.sortlist, " ") .. "\n") + end + if config.options then + local opts = {} + for k, v in pairs(config.options) do + table.insert(opts, k .. ":" .. v) + end + f:write("options " .. table.concat(opts, " ") .. "\n") + end + if config.nameservers then + for _, ns in ipairs(config.nameservers) do + f:write("nameserver " .. ns .. "\n") + end + end + f:close() +end + local function remove_fstab_entry(root, mount_point) local fstab_path = root .. "/etc/fstab" local f = io.open(fstab_path, "r") @@ -891,6 +922,7 @@ local n = { addfile = addfile, add_fstab_entry = add_fstab_entry, remove_fstab_entry = remove_fstab_entry, + write_resolv_conf = write_resolv_conf, } return n diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f56d1207cf01..8fef3bb662d1 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -531,6 +531,11 @@ local function disable_root(obj) end end +local function resolv_conf(obj) + if obj.resolv_conf == nil then return end + nuage.write_resolv_conf(root, obj.resolv_conf) +end + local function mounts(obj) if obj.mounts == nil then return end for _, m in ipairs(obj.mounts) do @@ -870,6 +875,7 @@ elseif line == "#cloud-config" then ssh_deletekeys, ssh_keys, network_config, + resolv_conf, disable_root, ssh_pwauth, runcmd, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index c2981669acb7..8ef9d8b284ea 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -195,6 +195,23 @@ The pass number for .Xr fsck 8 , defaults to 0. .El +.It Ic resolv_conf +An object configuring the content of +.Pa /etc/resolv.conf . +.Pp +The following keys are recognized: +.Bl -tag -width "nameservers" +.It nameservers +A list of IP addresses for DNS name servers. +.It searchdomains +A list of search domains. +.It domain +A single domain name. +.It sortlist +A list of IP/netmask sortlist entries. +.It options +A dictionary of resolver options. +.El .It Ic timezone Sets the system timezone based on the value provided. .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 11d34fcd98ea..0f758bcac1cd 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -35,6 +35,7 @@ atf_test_case config2_userdata_disable_root atf_test_case config2_userdata_bootcmd atf_test_case config2_userdata_manage_etc_hosts atf_test_case config2_userdata_mounts +atf_test_case config2_userdata_resolv_conf atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1140,6 +1141,36 @@ EOF true } +config2_userdata_resolv_conf_head() +{ + atf_set "require.user" root +} +config2_userdata_resolv_conf_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:43 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBf3NPDz3YC1 for ; Sun, 28 Jun 2026 18:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672042; 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=21p4huA7ZuSVjn2UeyR0I4L+Of4qbYah+xleDWdI4Hg=; b=fkL5CS9d1OOdIrppsdF0UUdxAJ1S9f6CpwIofFO2z5OxtHszpQowIGq4v7bW8bUpLEpBwQ v9nre2xEZs9EvbXpySYPExerzkvl1EE5Nqe9Y68uLv47aC0qmP3SWkpxxXl1jV65O8NfeN /PjF/gcjVrT2jXh14Ytw0ACWU0wRMHFu3m2m34s+wFQWg/KsLAI4SEFvU757jc3tPnqDDN EM0GTw0lbqKcpt6epB0vzUtwfl6vPq1WuMSlAfVFW1KIa9EouEE9+hM00T0LOrGliHD7Sy WHgVjpJSkIQgFk0Cr4Z9jvtLewh97r8hZRfQUIwC/EG1zKyIdL+llUpu1YuDaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672042; a=rsa-sha256; cv=none; b=iHIDITOWq751bsSP6l+dackrVqyNV0cM33LMmF/GpxCejphiYgimm5igqJ+wJ0qiWSf38t 3134CdeVo4ll9fKtpJ35suqvSPOxO/JvmAbQEXYUzjnb9qhKqMHpOgUtDKmvMh6uL4O/cb qGm8++N14DTayDtfch9iJ1VadKdBl+s9zx7EcmJlLr6AjIAQERzq0WVClRlkJ8CoV/nfgs 9J6cXgahIG+tl/aSHY98992sPO3nHVoe+JY8bBX/IJ3VxrEvxsskBLt4UX4FlTkUDgdzt+ mVVzKmBhMU7TjGcrxUlKyuGjUKBJqao3bU3McuJDmzZ3rgd+pf+QMgUghIFecw== 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=1782672042; 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=21p4huA7ZuSVjn2UeyR0I4L+Of4qbYah+xleDWdI4Hg=; b=TejTgN+qvu/2kr3wpwjn6QGTWgTdSZ6y6nkCm9EhI0PBTA7gua7ZYjzW7MjHc5E8H8NoeX DWtSj6trVG88KRfcm4k67OGMWtlfOgPUlK+vIXbs0ifdS0DYQnjvucANEgbl9Ql5VVNUT7 MmGdeyW6N0qEfUX6NFkbjc+rhYlMH1LKmAq5Ho09TfermJ3A4cgSoq+UQOEK+uU9qsYikb TQMJ1mk56pt1DFjTypECjPesNnpuAl0UEee+hVmWGVODU8UOdOckwCbPwpKcWWtBjpnnkM H4uHSVeUmSyM0LQUdl7z5CAKrapFn5BSKZNZrY0BE7vRtI9EfjEPzbf2RekBjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBf2RKrz6TC for ; Sun, 28 Jun 2026 18:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c43e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8c4d8934cc00 - stable/15 - nuageinit: implement keyboard support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8c4d8934cc00e085e87b6e6ee719b70b9294b79c Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:42 +0000 Message-Id: <6a416aaa.1c43e.6083ca53@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8c4d8934cc00e085e87b6e6ee719b70b9294b79c commit 8c4d8934cc00e085e87b6e6ee719b70b9294b79c Author: Baptiste Daroussin AuthorDate: 2026-06-05 10:09:51 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:28 +0000 nuageinit: implement keyboard support (cherry picked from commit 58184a301a1f0ef0858689f8dcc608cb468d4644) --- libexec/nuageinit/nuageinit | 24 ++++++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 20 ++++++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 30 +++++++++++++++++++++++++++++- 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 8fef3bb662d1..033aa7861f6b 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -536,6 +536,29 @@ local function resolv_conf(obj) nuage.write_resolv_conf(root, obj.resolv_conf) end +local function keyboard(obj) + if obj.keyboard == nil then return end + local layout = obj.keyboard.layout + local variant = obj.keyboard.variant + if layout == nil then + warnmsg("keyboard: missing layout") + return + end + local keymap = layout + if variant then + keymap = layout .. "." .. variant + end + local path = root .. "/etc/rc.conf.d/keymap" + nuage.mkdir_p(root .. "/etc/rc.conf.d") + local f = io.open(path, "w") + if not f then + warnmsg("unable to open " .. path .. " for writing") + return + end + f:write('keymap="' .. keymap .. '"\n') + f:close() +end + local function mounts(obj) if obj.mounts == nil then return end for _, m in ipairs(obj.mounts) do @@ -876,6 +899,7 @@ elseif line == "#cloud-config" then ssh_keys, network_config, resolv_conf, + keyboard, disable_root, ssh_pwauth, runcmd, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 8ef9d8b284ea..9a20df0787ba 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -212,6 +212,26 @@ A list of IP/netmask sortlist entries. .It options A dictionary of resolver options. .El +.It Ic keyboard +An object configuring the keyboard layout. +.Pp +Sets the +.Va keymap +variable in +.Pa /etc/rc.conf.d/keymap . +.Pp +The following keys are recognized: +.Bl -tag -width "variant" +.It layout +The keyboard layout (e.g., +.Qq fr , +.Qq de , +.Qq us ) . +.It variant +The keyboard variant (e.g., +.Qq acc , +.Qq nodeadkeys ) . +.El .It Ic timezone Sets the system timezone based on the value provided. .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 0f758bcac1cd..22b002ae2440 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -36,6 +36,7 @@ atf_test_case config2_userdata_bootcmd atf_test_case config2_userdata_manage_etc_hosts atf_test_case config2_userdata_mounts atf_test_case config2_userdata_resolv_conf +atf_test_case config2_userdata_keyboard atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1167,7 +1168,33 @@ resolv_conf: - 192.168.1.0/255.255.255.0 EOF atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o inline:"domain mydomain.local\nsearch example.com test.local\nsortlist 192.168.1.0/255.255.255.0\noptions timeout:1 attempts:2\nnameserver 9.9.9.9\nnameserver 149.112.112.112\n" cat etc/resolv.conf + atf_check -o match:"domain mydomain.local" cat etc/resolv.conf + atf_check -o match:"search example.com test.local" cat etc/resolv.conf + atf_check -o match:"sortlist 192.168.1.0/255.255.255.0" cat etc/resolv.conf + atf_check -o match:"nameserver 9.9.9.9" cat etc/resolv.conf + atf_check -o match:"nameserver 149.112.112.112" cat etc/resolv.conf + atf_check -o match:"options.*timeout:1" cat etc/resolv.conf + atf_check -o match:"options.*attempts:2" cat etc/resolv.conf + true +} + +config2_userdata_keyboard_head() +{ + atf_set "require.user" root +} +config2_userdata_keyboard_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:43 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBg4MHlz3Y8K for ; Sun, 28 Jun 2026 18:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672043; 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=yIDYP8v+R22RJq8L0TbHnLkaKf+QZO9SEUUkM+UMRIg=; b=hyKllyfczSgCiXpyu1pIv44A74Gn6auT8fILttCIM2EGvX6H/4dWe+2JaPy+5uJV4BvneY KCQ3zbK0Z4VgDl8VF/ymdF8PFjMCcOQm/Nl68QIP/rpP3BeMG6uKAfKRTxHQQ3C6OSPUo2 2N3tmct8e80oKbnmdItkMWh55MKcaOl7idk0UTyg0LBvv5HqNMddIyyA855BLYNsZagxk+ Wz5Nnd/r+Jz4zYoc/QE+fu9gq2AXvG/DhwdDIPOqF1kJxMRIjm/fRhnbiF/KB13t2MX25O WaJh276ixLtBuDrhl/+AVoFRYQlq5KZI8xr2xYRQ+XCJGrcGrmEdeT5PMAq8gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672043; a=rsa-sha256; cv=none; b=NPGGzlkk3hsBdfUckxQInnCBf5DqwacK4xjIhmh0CmyiuAspn9y8wj2miYcui0pjps0uFo sW081jmePN6sXKbEL2iTYJcr/An2oDcT0U5tXmFYskEmugWwfSAoNyDlH/ZDvrnXrPK1+A uL2XvAUPZ/0GETtaBXuCfeSzlk96rA5P45ZUrCxGxAM8iFjV1ltGVW9TmfeYZ0liz5Eyrj i22i46AJQpvvT3rBablwJs1x/CwRHrX5Rw6aug4HUPUUlZsxmdlFbpvosj0fsivZv3nueM QS2tRCfgV5W9vbsA61JFfyXID2St1ROK10Fbc14eDIWPArurWNmICrhnQI8A5g== 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=1782672043; 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=yIDYP8v+R22RJq8L0TbHnLkaKf+QZO9SEUUkM+UMRIg=; b=aT5dYjSVloOjU0/5vD+eQhAhm61hnD1E4UBCf94KUytfO/NW7GDXIvemFCcAGyCqUom5g+ JUJbF9VpR0dFP8DwJqvm4w8EKf3IjRJAKGFrMsFA/9gFj3du8Hqlo2Ywmvh/drYQMfTPHU uNJ25mZagXWMQIG6AS/di/9pCJT/JpQx07It06nFoXkgqQHqS4IdO+90Fy3ijoy2kT5u4T tVwt9cUNH4/aR6PJi5Hi0dxN3BTuHOLO6UjD5fFUpdnk2Do+xOpm1BFyQvDnrQWFISnDDu cBqinBeYAGGuMH6Zfc+GaXBPQOEo2c75X1R2qrg48Ttc5ZZOcDorMOpk8txJxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBg2qH7z70J for ; Sun, 28 Jun 2026 18:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d2f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: a4a46e6ec8e0 - stable/15 - nuageinit: implement ssh_authkey_fingerprints support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a4a46e6ec8e0a6a8ed6f7ea66034ca0f08d3a6cc Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:43 +0000 Message-Id: <6a416aab.1d2f2.5bd5642d@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a4a46e6ec8e0a6a8ed6f7ea66034ca0f08d3a6cc commit a4a46e6ec8e0a6a8ed6f7ea66034ca0f08d3a6cc Author: Baptiste Daroussin AuthorDate: 2026-06-05 10:38:06 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:28 +0000 nuageinit: implement ssh_authkey_fingerprints support Add support for the 'ssh_authkey_fingerprints' cloud-config key which logs SSH host key fingerprints to the console via ssh-keygen. (cherry picked from commit d7984912385cc5a191547dc6c2d73acba25e2239) --- libexec/nuageinit/nuageinit | 24 ++++++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 5 +++++ libexec/nuageinit/tests/nuageinit.sh | 21 +++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 033aa7861f6b..8e2658f2cd13 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -509,6 +509,29 @@ local function ssh_pwauth(obj) nuage.update_sshd_config("PasswordAuthentication", value) end +local function ssh_authkey_fingerprints(obj) + if obj.ssh_authkey_fingerprints ~= true then return end + local ssh_dir = root .. "/etc/ssh" + local attrs = lfs.attributes(ssh_dir) + if not attrs or attrs.mode ~= "directory" then + return + end + for entry in lfs.dir(ssh_dir) do + if entry:match("^ssh_host_.*_key$") then + local keypath = ssh_dir .. "/" .. entry + local f = io.popen("ssh-keygen -l -f " .. + nuage.shell_escape(keypath), "r") + if f then + local fingerprint = f:read("*a") + f:close() + if fingerprint and fingerprint ~= "" then + io.stderr:write(fingerprint) + end + end + end + end +end + local function ssh_deletekeys(obj) if obj.ssh_deletekeys == nil then return end if obj.ssh_deletekeys then @@ -897,6 +920,7 @@ elseif line == "#cloud-config" then create_default_user, ssh_deletekeys, ssh_keys, + ssh_authkey_fingerprints, network_config, resolv_conf, keyboard, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 9a20df0787ba..200eb2524fe6 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -232,6 +232,11 @@ The keyboard variant (e.g., .Qq acc , .Qq nodeadkeys ) . .El +.It Ic ssh_authkey_fingerprints +Boolean which determines whether fingerprints of SSH host keys +should be logged to the console. +Defaults to +.Ar false . .It Ic timezone Sets the system timezone based on the value provided. .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 22b002ae2440..44c681e18046 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -37,6 +37,7 @@ atf_test_case config2_userdata_manage_etc_hosts atf_test_case config2_userdata_mounts atf_test_case config2_userdata_resolv_conf atf_test_case config2_userdata_keyboard +atf_test_case config2_userdata_ssh_authkey_fingerprints atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1198,6 +1199,25 @@ EOF true } +config2_userdata_ssh_authkey_fingerprints_head() +{ + atf_set "require.user" root +} +config2_userdata_ssh_authkey_fingerprints_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + mkdir -p etc/ssh + ssh-keygen -t ed25519 -f etc/ssh/ssh_host_ed25519_key -N "" -q 2>/dev/null + cat > media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:46 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBj5bSRz3YFt for ; Sun, 28 Jun 2026 18:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672045; 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=RlnbqVy90T3RiVsg7UqnaO+rzaBrMGoJSvKmQOjaf1g=; b=IgdcDwmVeogvTUdaY4WAKM7RasWwRP5/TfEbq9j49SiGSe75YTFGzrRkWX0OUqPzCfaxNU Uo+jbKneBw2ocsTMeSqm7LyYVbmxCf0TFVfeIA/NJeWFTEFw2a3bjlK7G7F+rn8e+B/Rsr 1tlFpSZEQIlZjhUuK2EgyAi2iAqFQYXqOz8KRN+3I5TM7/AtKZ7v1FVgv+tAx/SLvU7kto PolSoD+vZnkiHivZAWpGDSgAuf2lJP4oBk85ZPiT3tfONRtjxomNRAsM8nOC7YpqcwnQKM 0UW55cS3CHA1Echm7YRE/i9NaT6vU5cvU5Zp8r76urtsOe/TjmraOUhDgHasbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672045; a=rsa-sha256; cv=none; b=uN4dJu4feOhwyK9UWURQqTkKFA51HSOQQcjivZPpCrzTNbYGZMqJCyeKlWaQ0Dje5xHdu+ jO1KC5jG6W/ajkQR+wwOdtBIx7Auxp4tjajN/LWY7bAYhpKT8csrqqqApAQoQ8DppQPbcF p8E9IBzft7su6OXsxM+xhErCijs4URIbL1ZG7zlD1TiBtOh5d1h1eveSPOHUUCucScrxnA OvsHXhEGyUF7PzeGNJoVDNUVRXxWhKPbCl8vdnjbZbd5zW0XwC0m7PasAKwcIaXqlBxgs8 9WmsuWCwBiQ/caLv96t/xA9l0mQTCs5JtK8/VNQoKElLYM7eDc31/JxlCpz0MA== 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=1782672045; 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=RlnbqVy90T3RiVsg7UqnaO+rzaBrMGoJSvKmQOjaf1g=; b=eB5SD6Wu0kgEyeXE3jov96/owxA3xGg7Cpiutr9S4EmeXXdpdlLp9tLFr4a74IO5Gn1FX2 K7iuOHdncUPoMlJ/oQSKg+JpLekhFUnAzQkk+O/7TgLDuAZBdLwG3wsZtZ4wfdSlCszFsu 0dsnHJ8eYPxgKyzpl2H9Wc8V+fpMtY9DFUbq3CikKfOO/DFxj4HrRm0oZuXYk/HTEpgSi4 hFecl2ln+T1db+2c34FjN6ZCFQOKvUzgzTiNlxymcMdyJrUPUtRCLqBb+BNvUxpMto5de9 BHV/4Gw9CfizNR5RnruvaLJNihd0SpLwCbjq2uZlvBUQnMmmPYpLZYh0aOP5Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBj4Mp1z6Yy for ; Sun, 28 Jun 2026 18:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f0fa0c599330 - stable/15 - nuageinit: implement ca_certs support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0fa0c599330cd01ebe8ef18c07846ad29bbf04f Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:45 +0000 Message-Id: <6a416aad.1a5df.1286387d@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f0fa0c599330cd01ebe8ef18c07846ad29bbf04f commit f0fa0c599330cd01ebe8ef18c07846ad29bbf04f Author: Baptiste Daroussin AuthorDate: 2026-06-05 20:27:07 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:28 +0000 nuageinit: implement ca_certs support Add support for the 'ca_certs' cloud-config key which manages CA certificates by writing them to /etc/ssl/certs/ and running certctl rehash. (cherry picked from commit b56f029add4825b21b2957f19ccfbb219a3f96cb) --- libexec/nuageinit/nuageinit | 20 ++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 17 +++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 30 ++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 19681b54810f..f5a018a00793 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -568,6 +568,25 @@ local function ntp(obj) f:close() end +local function ca_certs(obj) + if obj.ca_certs == nil then return end + local trusted = obj.ca_certs.trusted + if trusted == nil or #trusted == 0 then return end + local certdir = root .. "/etc/ssl/certs" + nuage.mkdir_p(certdir) + for i, cert in ipairs(trusted) do + local certpath = certdir .. "/nuageinit-" .. i .. ".pem" + local f = io.open(certpath, "w") + if f then + f:write(cert .. "\n") + f:close() + else + warnmsg("unable to write " .. certpath) + end + end + os.execute("certctl rehash 2>/dev/null") +end + local function ssh_deletekeys(obj) if obj.ssh_deletekeys == nil then return end if obj.ssh_deletekeys then @@ -947,6 +966,7 @@ if line == nil then -- YAML user-data elseif line == "#cloud-config" then local pre_network_calls = { + ca_certs, mounts, bootcmd, sethostname, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index ae8e9446bde5..fcccf1bef4f0 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -258,6 +258,23 @@ to skip NTP configuration. Alternatively, .Ic ntp can be a list of server addresses (legacy format). +.It Ic ca_certs +An object managing CA certificates. +.Pp +The following keys are recognized: +.Bl -tag -width "remove_defaults" +.It trusted +A list of PEM-encoded CA certificates to add to the system trust store. +Certificates are written to +.Pa /etc/ssl/certs/ +and +.Xr certctl 8 +rehash is executed. +.It remove_defaults +Boolean, if +.Ar true , +remove the default CA certificates. +.El .It Ic timezone Sets the system timezone based on the value provided. .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 63366f79486a..8f746599f14f 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -39,6 +39,7 @@ atf_test_case config2_userdata_resolv_conf atf_test_case config2_userdata_keyboard atf_test_case config2_userdata_ssh_authkey_fingerprints atf_test_case config2_userdata_ntp +atf_test_case config2_userdata_ca_certs atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1245,6 +1246,34 @@ EOF true } +config2_userdata_ca_certs_head() +{ + atf_set "require.user" root +} +config2_userdata_ca_certs_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data <<'EOF' +#cloud-config +ca_certs: + trusted: + - | + -----BEGIN CERTIFICATE----- + dGVzdGNlcnQx + -----END CERTIFICATE----- + - | + -----BEGIN CERTIFICATE----- + dGVzdGNlcnQy + -----END CERTIFICATE----- +EOF + atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -o match:"dGVzdGNlcnQx" cat etc/ssl/certs/nuageinit-1.pem + atf_check -o match:"dGVzdGNlcnQy" cat etc/ssl/certs/nuageinit-2.pem + true +} + config2_userdata_fqdn_and_hostname_body() { mkdir -p media/nuageinit @@ -1299,6 +1328,7 @@ atf_init_test_cases() atf_add_test_case config2_userdata_keyboard atf_add_test_case config2_userdata_ssh_authkey_fingerprints atf_add_test_case config2_userdata_ntp + atf_add_test_case config2_userdata_ca_certs atf_add_test_case config2_userdata_fqdn_and_hostname atf_add_test_case config2_userdata_write_files } From nobody Sun Jun 28 18:40:44 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 4gpJBj31Qyz6jkgq for ; Sun, 28 Jun 2026 18:40:45 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBh4Y48z3Y8Y for ; Sun, 28 Jun 2026 18:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672044; 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=S+ugGMOwipq+P5HqE4gIliDvCJuwgtonhUeUU7lz9Ls=; b=VAiWhZCHc4NndnmoM+2z+/9LKhsIcuYtCLMJoyHHgkhE595Kfx6cob3BhYj/6loSvTwIce ooI+ZOPaiKTuM35k7HsyPv4NTPcM+AvXLW3yp4DnKAjekoUXRJai+MHNbpopOodcngTtiP dRkXVXusumJNp1317COypbJqwft4dMmmcbxVUimrCHU32X7a+z6xGIIrntbALKlt912kTj Y4PuOuc9qnR2RLpyzs2MnJv9vRe4dXckTxWNIFDvVr0uEOa5REJCAE4o7td3MCD4kqR/aC Edn+1Xw7AlxN5kZoCzGZdJ9243UP1QM/6MhPKzZR3iOjxuuHMdPmak9Cqha3Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672044; a=rsa-sha256; cv=none; b=vEmOEBBJGvNRzn9Cc86+IvSrw6Qq+2fNZcsruW0/m7s9R26IVDs64L0z5RHG4JnRq16sQv cLd3XpcTCkM3iNYHibPK0AKAvfSHNZBzsmu/nyYSBifq9ZOQ1gkF/ye/5wLZg0zHbey3hA 4S3aRZMA5O3SXKbQnZrLZY2zEc0ahR+bIKeAgczeYQC8QGzS5Q5DEevtDDPIK2WuEFT3uY 2mSQoazKX8ou63fkfhDyukIILWwMULPfmBqpMz2JasEFgm/V845PaJ20vzz9tzccOQxE1F fw/HxTgn4GGTOu+Wq2YmLXX7NVUxcFAwWNu2ychTliz/fkZQA+iWqxeNYFb7FA== 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=1782672044; 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=S+ugGMOwipq+P5HqE4gIliDvCJuwgtonhUeUU7lz9Ls=; b=E8lrmrZNC40OVf4xhgLnA6+gOsy1s0PatuHbKQZas177+1l0jSQevj8g8AOEuyhIouDK/+ UtJoI8dWhD5Xh6Yi80MIpbcLbMFnMkcGAXwS7yewfAaS/YCG6C6Ugoj+vnSujFquffhhXu XQbkq9yMdBNCX+nokVO8YR+1q68zPT36aGa5vZjScLhiv81+/LyXP7oVh2mecAVLC4OK1+ I4KkAD4hRRy8CoanxaBGophtSUb15ctRxf38rCgLQ6g9sslHTKIeZLyXwhic4fbYDkDDAc LaJNSSubJKaGrKpArfHvpmbI4h/WTx6CEVHlEpdvYiZzPC/BCJT81OWOnS46FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBh3Zb1z7CP for ; Sun, 28 Jun 2026 18:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 9835838d76d5 - stable/15 - nuageinit: implement ntp support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9835838d76d5cf1338400a86747a8404606fde87 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:44 +0000 Message-Id: <6a416aac.1a5db.492907c8@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9835838d76d5cf1338400a86747a8404606fde87 commit 9835838d76d5cf1338400a86747a8404606fde87 Author: Baptiste Daroussin AuthorDate: 2026-06-05 20:25:29 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:28 +0000 nuageinit: implement ntp support Add support for the 'ntp' cloud-config key which configures NTP by writing /etc/ntp.conf with server and pool entries. (cherry picked from commit 6d27d52ccd35d1980e99bc2fc4dae602334d28af) --- libexec/nuageinit/nuageinit | 37 ++++++++++++++++++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 21 ++++++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 28 +++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 8e2658f2cd13..19681b54810f 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -532,6 +532,42 @@ local function ssh_authkey_fingerprints(obj) end end +local function ntp(obj) + if obj.ntp == nil then return end + if type(obj.ntp) == "table" and obj.ntp.enabled == false then + return + end + local servers = {} + if type(obj.ntp) == "table" then + if obj.ntp[1] then + servers = obj.ntp + else + for _, s in ipairs(obj.ntp.servers or {}) do + table.insert(servers, "server " .. s .. " iburst") + end + for _, p in ipairs(obj.ntp.pools or {}) do + table.insert(servers, "pool " .. p .. " iburst") + end + end + elseif type(obj.ntp) == "string" then + table.insert(servers, "server " .. obj.ntp .. " iburst") + end + if #servers == 0 then return end + local path = root .. "/etc/ntp.conf" + local f = io.open(path, "w") + if not f then + warnmsg("unable to open " .. path .. " for writing") + return + end + for _, line in ipairs(servers) do + f:write(line .. "\n") + end + f:write("leapfile /var/db/ntpd.leap-seconds.list\n") + f:write("restrict default limited kod nomodify notrap nopeer noquery\n") + f:write("restrict source limited kod nomodify notrap noquery\n") + f:close() +end + local function ssh_deletekeys(obj) if obj.ssh_deletekeys == nil then return end if obj.ssh_deletekeys then @@ -931,6 +967,7 @@ elseif line == "#cloud-config" then } local post_network_calls = { + ntp, packages, users, chpasswd, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 200eb2524fe6..ae8e9446bde5 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -237,6 +237,27 @@ Boolean which determines whether fingerprints of SSH host keys should be logged to the console. Defaults to .Ar false . +.It Ic ntp +An object configuring the NTP daemon by writing +.Pa /etc/ntp.conf . +.Pp +The following keys are recognized: +.Bl -tag -width "enabled" +.It servers +A list of NTP server addresses. +.It pools +A list of NTP pool addresses. +.It enabled +Boolean, defaults to +.Ar true . +Set to +.Ar false +to skip NTP configuration. +.El +.Pp +Alternatively, +.Ic ntp +can be a list of server addresses (legacy format). .It Ic timezone Sets the system timezone based on the value provided. .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 44c681e18046..63366f79486a 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -38,6 +38,7 @@ atf_test_case config2_userdata_mounts atf_test_case config2_userdata_resolv_conf atf_test_case config2_userdata_keyboard atf_test_case config2_userdata_ssh_authkey_fingerprints +atf_test_case config2_userdata_ntp atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1218,6 +1219,32 @@ EOF true } +config2_userdata_ntp_head() +{ + atf_set "require.user" root +} +config2_userdata_ntp_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBl6L2Kz3YND for ; Sun, 28 Jun 2026 18:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672047; 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=DIFjwp8fXHJMA6M7CwUwgKl7MNpTECIMRIeZwfuFOwA=; b=i9cXabHAxGHWtkyUOM/dK/BVeSZByrxlnd5NxabbjpLSwrG1+Nu9HKuhOxu1SggutGYE6z xdr2zTWS8GfiKLKtQNVbxgqBEpFWSB4lq6oD0iQDCRTZNDYPUzC7pQ5KpmDrYWafWjjtb2 UZ65s+0/zcjkgVD16nuuzsYyDQj35G8/hPFpUXDXWXzU6QM2IZwQw45I+GYDWWl06LCg08 iKj4KRW505U8YOu4MtewLhsl7wt1gHsylzDFn+ysqPejzqym0zJ+oRi1K3/xtru6t4stOx /BsaSXhvf7vWw12HLyP4MnxT7mp3HXX4yBUjG6t3uqhmua1oFXlDByag8hCssA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672047; a=rsa-sha256; cv=none; b=C9U9BTEB5zQOhWMW1Jnf1WrYJ4Ynhb6VWXA2o4wWd/GiKv4oEf62SysQFUf6x2jmZxRzv7 ITiGLQqzxKQoFitC1AHMeUuQOLWm3QbPBg+U6sKG1fM8Bpty0lzpmxmJ5Q2wlBJayqj8w7 1ChEATc51SZrU4V+VvFYLEifN6Rxj44497bDpxlZNpqdWBsL49+LCAkbrJWLQeJmGQI/B1 93JKPuw+vvxhIBR7asUCFKEvczkOCsuk/q16VQfQ1rFt5EFjIG0xodwLuEuGCZOs3GSdwU 0soL+sjArB3wqnNa7695Xlm+X1R4COT9Jz9EIi+4x7pzsxQlkQFQPRhH5JEWCw== 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=1782672047; 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=DIFjwp8fXHJMA6M7CwUwgKl7MNpTECIMRIeZwfuFOwA=; b=mWLum7XDc/EW7eTZs63ncCmOWdUMfemwV/NIAjJhAMS+gRqzvlwkIupBE6qMzKj1npejeg vzCpVHvjCtafaj63OwLTl3s1vn2cWWWkWo5tCUJIoJee72+FoskMmi0zgmCePSlGVaRuUk ElF53Wj027ZvWN/iVbBgDABIX1kODifh+imYfXjlq6VJLiRuxrC9c4djAl0jI52xtlhqAJ BAmpU8TZFfRBb5vmLBYXkswgjTIyFWLMVJYLvIF6OdeLFel0HR5Ou/oVxL8zWpCsOnGx1V ga7s+PSyWcZnfKW6mdZOSqc+kLEj0Redk1qOB9psl4QjNZv4RwXgkA6M21R7ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBl58mDz7GT for ; Sun, 28 Jun 2026 18:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a16b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 202ae0114a15 - stable/15 - nuageinit: implement power_state_change and locale support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 202ae0114a15ef59990fc50cbd4b419e3f893658 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:47 +0000 Message-Id: <6a416aaf.1a16b.2c6acf1c@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=202ae0114a15ef59990fc50cbd4b419e3f893658 commit 202ae0114a15ef59990fc50cbd4b419e3f893658 Author: Baptiste Daroussin AuthorDate: 2026-06-05 20:48:18 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:28 +0000 nuageinit: implement power_state_change and locale support (cherry picked from commit 328a76d17f85ff6aa6228035c4c4b989eb7534f8) --- libexec/nuageinit/nuageinit | 61 ++++++++++++++++++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 49 +++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 56 +++++++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index bd72f02d4503..8a9c5c022862 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -637,6 +637,28 @@ local function keyboard(obj) f:close() end +local function locale(obj) + if obj.locale == nil then return end + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if not root then root = "" end + local profile_path = root .. "/etc/profile" + local f = io.open(profile_path, "a") + if not f then + nuage.warn("unable to open " .. profile_path .. " for writing") + return + end + if type(obj.locale) == "string" then + f:write("export LANG=" .. obj.locale .. "\n") + elseif type(obj.locale) == "table" then + for k, v in pairs(obj.locale) do + f:write("export " .. k .. "=" .. v .. "\n") + end + else + nuage.warn("locale: invalid type " .. type(obj.locale) .. ", expecting string or object") + end + f:close() +end + local function mounts(obj) if obj.mounts == nil then return end for _, m in ipairs(obj.mounts) do @@ -725,6 +747,43 @@ local function packages(obj) end end +local function power_state_change(obj) + if obj.power_state == nil then return end + local ps = obj.power_state + local delay = ps.delay or "now" + local mode = ps.mode or "poweroff" + local message = ps.message + local condition = ps.condition + if condition == nil then condition = true end + + -- Evaluate condition + if condition == false then return end + if type(condition) == "string" then + local ret = os.execute(condition) + if not ret then return end + end + + -- Map mode to shutdown flag + local mode_map = {poweroff = "p", reboot = "r", halt = "h"} + local flag = mode_map[mode] + if not flag then + nuage.warn("power_state: invalid mode '" .. mode .. "', using poweroff") + flag = "p" + end + + -- Build shutdown command + local cmd = "shutdown -" .. flag .. " " .. delay + if message then + cmd = cmd .. " " .. nuage.shell_escape(message) + end + + if os.getenv("NUAGE_RUN_TESTS") then + print(cmd) + return + end + os.execute(cmd) +end + local function chpasswd(obj) if obj.chpasswd == nil then return end nuage.chpasswd(obj.chpasswd) @@ -1018,6 +1077,7 @@ elseif line == "#cloud-config" then network_config, resolv_conf, keyboard, + locale, disable_root, ssh_pwauth, runcmd, @@ -1030,6 +1090,7 @@ elseif line == "#cloud-config" then users, chpasswd, write_files_deferred, + power_state_change, } local calls_table = pre_network_calls diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index b4be4e4b2d58..6d0f8ae2f41c 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -212,6 +212,16 @@ A list of IP/netmask sortlist entries. .It options A dictionary of resolver options. .El +.It Ic locale +Set the system locale by appending +.Qq Cm export +statements to +.Pa /etc/profile . +.Pp +If the value is a string, it is used as the +.Dq Cm LANG +value. +If the value is an object mapping, each key-value pair is exported. .It Ic keyboard An object configuring the keyboard layout. .Pp @@ -442,6 +452,45 @@ List of packages to be installed. Update the remote package metadata. .It Ic package_upgrade Upgrade the packages installed to their latest version. +.It Ic power_state +An object controlling the power state of the instance after configuration. +The following keys are recognized: +.Bl -tag -width "condition" +.It Ic delay +Time to wait before the action. +Can be +.Qq now +or a time accepted by +.Xr shutdown 8 +(e.g., +.Qq +5 +for five minutes). +Defaults to +.Qq now . +.It Ic mode +The action to take: +.Qq poweroff , +.Qq reboot , +or +.Qq halt . +Defaults to +.Qq poweroff . +.It Ic message +Optional message to display to users. +.It Ic timeout +Not supported on +.Fx , +silently ignored. +.It Ic condition +Boolean or command string. +If +.Qq false , +the action is skipped. +If a string, it is run as a command; the action is only taken if the command +succeeds. +Defaults to +.Qq true . +.El .It Ic users Specify a list of users to be created: .Bl -tag -width "ssh_authorized_keys" diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 4b751dd2ca43..21cd2e8f17c5 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -41,6 +41,8 @@ atf_test_case config2_userdata_ssh_authkey_fingerprints atf_test_case config2_userdata_ntp atf_test_case config2_userdata_ca_certs atf_test_case config2_userdata_multipart +atf_test_case config2_userdata_power_state +atf_test_case config2_userdata_locale atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1308,6 +1310,58 @@ EOF true } +config2_userdata_power_state_head() +{ + atf_set "require.user" root +} +config2_userdata_power_state_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + export NUAGE_RUN_TESTS=1 + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data < media/nuageinit/meta_data.json + cat > media/nuageinit/user_data < media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBk5j7jz3Y8t for ; Sun, 28 Jun 2026 18:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672046; 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=EnxLKLYTuBFm3h9HJ+ATCbHsrsuXOZx/668gw0Typl4=; b=rCiLEcpMb62uoZAdcRGxAz2evMAmUOeQ0ReXDv/wuJOoMDpaNURarnJkEm2LXODN9osQNx N4gSCBRkFnE88nD1sJaSKLkYakUk9tDpbha+VTQGPATXUuRDjX0Zm4uHK8fbUqt8KdWG2o TX8LuxfYW0VODbrVddI9MVdWAIhidjxPYFU/KZQq9oi7sVdqmAdL6FP+USwocmxU3vWvwC buXst0D1BQfdcPFFAUGp4v3Ur9N22Oc2IlT2xeGgdAlC/8Z9vY94cu6LJtt1GjbFmCFIBW IPeXzit1sS9CJLNGW2I0slVtaGQto98s+JXfaQF8nphJgebGaEx3DTngFfTffQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672046; a=rsa-sha256; cv=none; b=Ow4p5n3U11WjrN277VTIQ/fRWSYT1zJICAZGXBDX/kYJlx8ixhqXQ/jK6v/YM3q1OwCdo7 XG8t6JlCz4awqJiAoQORz7XBw2y1OJKYl4FGxLw/upitSHKGRuoWtDwjIN+sHxc4uvVpl0 BLyYbvekvioHFcGth4TvFmP0ojCS8783Tcdn6YesWXJoCa9N9BWMBcYVAVgKbH5yqJprAa infi9+jqk9ecF+IT/EqlfZ2g+p2WiiKCNmiErRvMS2CT+87ZvFSDVQgcDfm8WdMbVLeMds Bkh7ApT9mz4z1Vt1Fcbe0NFg4WYSDcLMMYL0Lh9Oi9yHanE54IJrBmKe+eAuqQ== 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=1782672046; 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=EnxLKLYTuBFm3h9HJ+ATCbHsrsuXOZx/668gw0Typl4=; b=lgYOb9ZwX7+3QndarmFp0bH1O4Mws8Xv4V6eLiYW4pRpFjUrSDFb3gCeS0KWmKfSSMvTYu 7b4z8/ulycu4wVzJj/IAhcg0XsilnqX3o5YYkSaNO0TJixOAObl71tPp2rsiJ/bKmihJVc X9EX/etllynDPuozDFcDMgo2K2C8EduuGC1fuPP7GIr89qeyZV3ilEqyQ9nPUj0xtiaxPH /ShqxMGbAz3PgUYDVu4jLozp9qoDJKr0zHn4ZVlk6UHq5zoyLt8GMxfzRtbZfVoYyE0ojJ owyE7Sc+ZAMthfouykzkHarI7oUwCoW1yR/12/lud1F/WUeQs05DteqgfjRVLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBk4m8Zz7GR for ; Sun, 28 Jun 2026 18:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: bf026697c6d8 - stable/15 - nuageinit: implement MIME multipart user-data support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bf026697c6d84b027678c7a9019b2b890556a6ca Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:46 +0000 Message-Id: <6a416aae.1cb9e.52d7d9c3@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bf026697c6d84b027678c7a9019b2b890556a6ca commit bf026697c6d84b027678c7a9019b2b890556a6ca Author: Baptiste Daroussin AuthorDate: 2026-06-05 20:45:54 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:28 +0000 nuageinit: implement MIME multipart user-data support Add support for MIME multipart/mixed user-data, allowing a single user-data blob to contain multiple parts with different content types. (cherry picked from commit be711ade6f66506fb2cae9fd33b142ce910f0346) --- libexec/nuageinit/nuage.lua | 45 ++++++++++++++++++++++++++++++++++++ libexec/nuageinit/nuageinit | 38 ++++++++++++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 14 +++++++++++ libexec/nuageinit/tests/nuageinit.sh | 35 ++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 7fde2d936f1b..6cef5d2dd904 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -896,6 +896,50 @@ local function remove_fstab_entry(root, mount_point) nf:close() end +local function parse_mime_multipart(data) + local boundary = data:match("boundary=\"([^\"]+)\"") + if not boundary then + boundary = data:match("boundary=([^%s;]+)") + end + if not boundary then + return nil + end + local parts = {} + local pos = data:find("\n") or 1 + local first = data:find("--" .. boundary, pos, true) + if not first then + return nil + end + pos = data:find("\n", first) + if not pos then return nil end + pos = pos + 1 + while true do + local nextb = data:find("--" .. boundary, pos, true) + if not nextb then break end + local part = data:sub(pos, nextb - 1) + part = part:gsub("^\r?\n", ""):gsub("\r?\n$", "") + local header_end = part:find("\r?\n\r?\n") + local headers_str, body + if header_end then + headers_str = part:sub(1, header_end - 1) + body = part:sub(header_end + 2):gsub("^\r?\n", ""):gsub("\r?\n$", "") + else + body = part + end + local ct = "text/plain" + if headers_str then + local m = headers_str:match("[Cc]ontent%-[Tt]ype:%s*([^%s;]+)") + if m then ct = m:lower() end + end + table.insert(parts, {content_type = ct, body = body}) + local after = data:sub(nextb + 2 + #boundary, nextb + 3 + #boundary) + if after == "--" then break end + pos = data:find("\n", nextb) or nextb + if pos then pos = pos + 1 end + end + return parts +end + local n = { shell_escape = shell_escape, warn = warnmsg, @@ -923,6 +967,7 @@ local n = { add_fstab_entry = add_fstab_entry, remove_fstab_entry = remove_fstab_entry, write_resolv_conf = write_resolv_conf, + parse_mime_multipart = parse_mime_multipart, } return n diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f5a018a00793..bd72f02d4503 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -915,6 +915,44 @@ local function load_userdata() f:close() return end + if line:match("^Content%-Type: multipart/") then + local rest = f:read("*a") + f:close() + local full = line .. "\n" .. rest + local parts = nuage.parse_mime_multipart(full) + if parts then + local cc_body = nil + for _, p in ipairs(parts) do + if p.content_type == "text/cloud-config" then + cc_body = p.body + elseif p.content_type:match("x%-shellscript") or p.content_type:match("x%-sh") then + if citype ~= "postnet" then + nuage.mkdir_p(root .. "/var/cache/nuageinit") + local spath = root .. "/var/cache/nuageinit/multipart_script" + local sf = io.open(spath, "w") + if sf then + sf:write(p.body .. "\n") + sf:close() + nuage.chmod(spath, "0755") + end + end + end + end + if cc_body then + local obj = yaml.load(cc_body) + if obj then + if citype ~= "postnet" then + nuage.mkdir_p(root .. "/var/cache/nuageinit") + local tof = assert(io.open(root .. "/var/cache/nuageinit/user_data", "w")) + tof:write("#cloud-config\n" .. cc_body) + tof:close() + end + return "#cloud-config", obj + end + end + end + return nil, nil + end if citype ~= "postnet" then local content = f:read("*a") if not content or #string.gsub(content, "^%s*(.-)%s*$", "%1") == 0 then diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index fcccf1bef4f0..b4be4e4b2d58 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -551,6 +551,20 @@ A boolean to specify that the files should be created after the packages are installed and the users are created. .El .El +.Pp +Additionally, user-data can be provided as a MIME multipart message +with content type +.Qq multipart/mixed . +Each part is handled according to its +.Qq Content-Type +header. +Supported part types: +.Bl -tag -width "text/x-shellscript" +.It text/cloud-config +Processed as a cloud-config YAML document. +.It text/x-shellscript +Saved as an executable script for later execution. +.El .Sh EXAMPLES Here is an example of a YAML configuration for .Nm : diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 8f746599f14f..4b751dd2ca43 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -40,6 +40,7 @@ atf_test_case config2_userdata_keyboard atf_test_case config2_userdata_ssh_authkey_fingerprints atf_test_case config2_userdata_ntp atf_test_case config2_userdata_ca_certs +atf_test_case config2_userdata_multipart atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1274,6 +1275,39 @@ EOF true } +config2_userdata_multipart_head() +{ + atf_set "require.user" root +} +config2_userdata_multipart_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data <<'EOF' +Content-Type: multipart/mixed; boundary="==BOUNDARY==" + +--==BOUNDARY== +Content-Type: text/cloud-config; charset="us-ascii" + +#cloud-config +hostname: multipart-host + +--==BOUNDARY== +Content-Type: text/x-shellscript + +#!/bin/sh +echo "multipart script executed" + +--==BOUNDARY==-- +EOF + atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -o inline:"hostname=\"multipart-host\"\n" cat etc/rc.conf.d/hostname + atf_check -o inline:"#!/bin/sh\necho \"multipart script executed\"\n" cat var/cache/nuageinit/multipart_script + test -x var/cache/nuageinit/multipart_script || atf_fail "multipart_script not executable" + true +} + config2_userdata_fqdn_and_hostname_body() { mkdir -p media/nuageinit @@ -1329,6 +1363,7 @@ atf_init_test_cases() atf_add_test_case config2_userdata_ssh_authkey_fingerprints atf_add_test_case config2_userdata_ntp atf_add_test_case config2_userdata_ca_certs + atf_add_test_case config2_userdata_multipart atf_add_test_case config2_userdata_fqdn_and_hostname atf_add_test_case config2_userdata_write_files } From nobody Sun Jun 28 18:40:48 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 4gpJBn22Ghz6jkd9 for ; Sun, 28 Jun 2026 18:40: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBn06KXz3YR6 for ; Sun, 28 Jun 2026 18:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672049; 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=Z+v1Rmgn1yCtStJLjb9041h5u5TYrpCS9v5jpXwUdkk=; b=D7Q6OcTi/K7clH+RiBAkoH/xoOArRLIejmXa/OkMYjutsNQwBp7FwSoWb9kzjI6wNiLr/W mOX2t9mKTYQKoRhlIrl9YdZpbP0g8KF53gXXRuYqJmRe4KhTamPwu9tIZOMkRRrzrTDnvU lLD78TSTnQxKKuFxH3EJbsldVyo1qcRekPGfNyw8JduA55pnKMSFFa/sIH3pXu5FoDsaTD Bm6gQWgKEeio9LN/rw9wq4J3//qEO0Bt+fTOCiVwDMPNKSZZSngPIcI+lb2I9oZVYtJMh7 gk+kWv2nm05Ov8fLIVU99NW6s/A8kKqybvYpxRlYEKqpT5mKip1C67L23Byycg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672049; a=rsa-sha256; cv=none; b=HSw41LA1O/Qn4F47diHjiATeLrwTDJVJ5i7QpiM+F0dwP4/+CtlhkW2HIvkzKKHcc/MIVm ZxnSENsSnC50gNUpARrG1OscSRTrt/GKcDdmww5VmEHUgJCu6VK1PgY4RTZ8JKAls7fq61 9wlnB4Jyb4mqrQ2rufG+PC0CjNpEjLfzfgasA07dsTqCr9OzWFR44LEtvIOrdUxJ4JXFwI ufsf3DaNjpDxfgmLE7S6kAlEdU7ICmtJLhtC8ZAog7VHHOQgUCHJ7hi6ik2SThlfG950CH rLzCBEhZ2SFBxbhK4vSwJ9kHp9/qQJxjmYQaH21cPh74ILssWVcA94xXtzQtaQ== 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=1782672049; 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=Z+v1Rmgn1yCtStJLjb9041h5u5TYrpCS9v5jpXwUdkk=; b=L/NoQerL2VLvvuB6lL7XYn9NnU+6tGXm6OT9Ey1qajW3xZTPtHh5GlnPWJVtfEqW0p9MHR qmE3j1kGln3wg7bsvkT7PVyhdK6715q9He8XL2KiY9x+8elZHOnXd3nUNn6/DxQvnmcrRT iTSLqKBwnT9SLDUoM+YZyIiawFOqT58QQI0nPN2Nr3Czaa3K3K85jgNgUuh3TpiyjzN3WD de+A4q8L0st+JUIHaBm8exoyzh+LEovKqYMR3bRiVddAU5MOQpLORmEA1u5dOzope6IUgb QH7talSJOPFjL6IHGIpgijFzyKV5LmrO40x8YhwibhzPuRYZIvLWId1PmxSZ0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBm5bL0z70M for ; Sun, 28 Jun 2026 18:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cba2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: eb677a598e68 - stable/15 - nuageinit: implement final_message support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eb677a598e68f3e52066089a4d2a6f7b06fb43b8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:48 +0000 Message-Id: <6a416ab0.1cba2.3158f4ec@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=eb677a598e68f3e52066089a4d2a6f7b06fb43b8 commit eb677a598e68f3e52066089a4d2a6f7b06fb43b8 Author: Baptiste Daroussin AuthorDate: 2026-06-05 21:03:45 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:34:06 +0000 nuageinit: implement final_message support (cherry picked from commit e01f202ecf9344bd6658869a869f36c5b3790384) --- libexec/nuageinit/nuageinit | 25 +++++++++++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 8a9c5c022862..1391aff13bd6 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -784,6 +784,30 @@ local function power_state_change(obj) os.execute(cmd) end +local function get_uptime() + -- Get system uptime in seconds + local f = io.popen("sysctl -n kern.boottime 2>/dev/null") + local boottime = f:read("*a") + f:close() + local sec = boottime:match("sec = (%d+)") + if sec then + return os.time() - tonumber(sec) + end + return 0 +end + +local function final_message(obj) + if obj.final_message == nil then return end + local msg = obj.final_message + if type(msg) ~= "string" then + nuage.warn("final_message must be a string") + return + end + local uptime = tostring(math.floor(get_uptime())) + msg = msg:gsub("%$UPTIME", uptime) + nuage.warn(msg, false) +end + local function chpasswd(obj) if obj.chpasswd == nil then return end nuage.chpasswd(obj.chpasswd) @@ -1090,6 +1114,7 @@ elseif line == "#cloud-config" then users, chpasswd, write_files_deferred, + final_message, power_state_change, } diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 21cd2e8f17c5..2b4d316fd5ff 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -45,6 +45,8 @@ atf_test_case config2_userdata_power_state atf_test_case config2_userdata_locale atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files +atf_test_case config2_userdata_encode_base64 +atf_test_case config2_userdata_final_message setup_test_adduser() { @@ -1382,6 +1384,38 @@ EOF atf_check -o inline:"hostname=\"host\"\n" cat ${PWD}/etc/rc.conf.d/hostname } +config2_userdata_encode_base64_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + atf_check -o inline:"dGVzdA==\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('test'))" + atf_check -o inline:"dA==\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('t'))" + atf_check -o inline:"dGU=\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('te'))" + # Roundtrip test + atf_check -o inline:"hello world\n" \ + /usr/libexec/flua -e "print(require('nuage').decode_base64(require('nuage').encode_base64('hello world')))" + # Empty input + atf_check -o inline:"\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64(''))" +} + +config2_userdata_final_message_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + export NUAGE_RUN_TESTS=1 + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data << 'EOF' +#cloud-config +final_message: "System ready after $UPTIME seconds" +EOF + atf_check -e match:"System ready after [0-9]+ seconds" \ + /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet +} + atf_init_test_cases() { atf_add_test_case args @@ -1422,4 +1456,6 @@ atf_init_test_cases() atf_add_test_case config2_userdata_locale atf_add_test_case config2_userdata_fqdn_and_hostname atf_add_test_case config2_userdata_write_files + atf_add_test_case config2_userdata_encode_base64 + atf_add_test_case config2_userdata_final_message } From nobody Sun Jun 28 18:40:49 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 4gpJBp3J4Rz6jkwq for ; Sun, 28 Jun 2026 18:40:50 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBp0DHTz3YJd for ; Sun, 28 Jun 2026 18:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672050; 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=p+doNStKm4rxa1xv8yqbYsvCb8F2BSXxmf9g3KnYNew=; b=lhfBk/G5B/r1fJ/+rb64rs6RKDUEPP5FJH3xQXFsaQQHy9SNUUJ42ahf/6WqEAgr6tgFPs xNmDBlqrIw6mVCfco50sXtfLjt00DYv2haYEmPkJeshoU1oA/Nvkhfa8my4ThFDYQjzQ9G hjKgY8GF2ZUWXJ9D/OJOvuXTgpe88uJgUjEEwMcwIv/LLL8O0OJ/TjV9zMg8MS8Vw3siWy 7vwOkio15RXzUASgPN7iKaj3fd7RNSu/9Ciffz1PpkFn6qiUV79gg5GiBNodUhM2oK+e8B 55wpvpLgD9iYzBWdOXDTrAgKBbq3oj8VIySI9ky2qvx4Nue43/M4fNbCD49SWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672050; a=rsa-sha256; cv=none; b=S+ljhOtnL0nh7I1J0oVJT+fuSqzpT5qYrBAdvgGpLFZMtkEW7qRLdcczaR4OS3rlhACbje V0HCvo+M9BbqAIbLBayg0I13HIQd22CpjDNJaUtFOTvs3hWQbNnM00Qi5vhp9wHdAKS995 UyhWCVsRrbQZ5R/JykroI43m5sdBq0h5Jv5dSjX7NSjJ7FrvFMJq7h7jcOq72hKMAm32hB YBYYbGW9FQYspFVSvyGCzrfAsuIrgKMRfjidg6Jhg/5sQZKKx0QJ93QuYcAm8sc/6ZSZYO IKSmMtakqkoFWi7OJ+s0/NPqxAD1wOA9OKW6hgC6DRMKJ8tlanlq5LyP7g6UaQ== 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=1782672050; 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=p+doNStKm4rxa1xv8yqbYsvCb8F2BSXxmf9g3KnYNew=; b=apwOgmDdD3qRxTxVttLJxFqsO9ecUl85yDCAYsUd+MddIiatDrojVfUYRQtn+quGHzf1N6 J3PEFDvLK/6/CoDFpBqVqUA/luZINXhOBd2YyW54UEJorRgIwpVjR/MtTUyd3mwkl9t5Uv e1aASMKJf1rk7eyf4NlhDpHrr4OCgig7ywHT4Ftv7ZA4DghGIJRLSGQSmGmXypGer1RRr6 YquIMIy0fKwpfdxoa+kjfpQXXyRQhB0GC+pegL+7x0v11JmQuuXgfsEmHqWFTQPZdg99Fl 1syXkaL5c6S/kogTYmrnhIK4IaATl6bb2w1mI9a+zx/03KsXKcRSZT3y5WihPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBn60G1z75v for ; Sun, 28 Jun 2026 18:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ccc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 35ea67ebc0b6 - stable/15 - nuageinit: implement phone_home support 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 35ea67ebc0b6f1be6435cf54b5663c130a9d4df8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:49 +0000 Message-Id: <6a416ab1.1ccc7.1d2aebf7@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=35ea67ebc0b6f1be6435cf54b5663c130a9d4df8 commit 35ea67ebc0b6f1be6435cf54b5663c130a9d4df8 Author: Baptiste Daroussin AuthorDate: 2026-06-05 21:28:25 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:35:19 +0000 nuageinit: implement phone_home support Posts instance data (hostname, instance_id, public keys) to a URL using fetch(1). Supports: - url: target URL - post: list of data items to send, or 'all' - tries: number of retry attempts (default 1) (cherry picked from commit 58653bf4d0fb8ccd5de146d671ec101a1df0ede0) --- libexec/nuageinit/nuageinit | 91 +++++++++++++++++++++++++++++++++++- libexec/nuageinit/tests/nuageinit.sh | 33 +++++++++++++ 2 files changed, 122 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 1391aff13bd6..8e207cae0a15 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -808,6 +808,79 @@ local function final_message(obj) nuage.warn(msg, false) end +local function phone_home(obj, metadata) + if obj.phone_home == nil then return end + local ph = obj.phone_home + if type(ph) ~= "table" then + nuage.warn("phone_home must be an object") + return + end + if not ph.url then + nuage.warn("phone_home.url is required") + return + end + local url = ph.url + local tries = ph.tries or 1 + if type(tries) ~= "number" or tries < 1 then + tries = 1 + end + + -- Collect data to post + local data = {} + local post = ph.post + if post == "all" then + post = {"pub_key_rsa", "pub_key_ecdsa", "pub_key_ed25519", + "instance_id", "hostname", "fqdn"} + end + if type(post) == "table" then + for _, key in ipairs(post) do + if key == "hostname" then + if metadata.hostname then + table.insert(data, "hostname=" .. metadata.hostname) + end + elseif key == "fqdn" then + if metadata.hostname then + table.insert(data, "fqdn=" .. metadata.hostname) + end + elseif key == "instance_id" then + if metadata.uuid then + table.insert(data, "instance_id=" .. metadata.uuid) + end + elseif key:match("^pub_key_") then + local algo = key:match("^pub_key_(.+)$") + if metadata.public_keys then + for _, k in ipairs(metadata.public_keys) do + if algo == "rsa" and k:match("^ssh%-rsa ") then + table.insert(data, key .. "=" .. nuage.encode_base64(k)) + elseif algo == "ecdsa" and k:match("^ecdsa%-") then + table.insert(data, key .. "=" .. nuage.encode_base64(k)) + elseif algo == "ed25519" and k:match("^ssh%-ed25519 ") then + table.insert(data, key .. "=" .. nuage.encode_base64(k)) + end + end + end + end + end + end + local post_data = table.concat(data, "&") + local cmd = "fetch -q -o /dev/null --post-data " .. nuage.shell_escape(post_data) + cmd = cmd .. " " .. nuage.shell_escape(url) + + if os.getenv("NUAGE_RUN_TESTS") then + print(cmd) + return + end + for i = 1, tries do + if os.execute(cmd) then + break + end + if i < tries then + -- wait 1 second before retrying + os.execute("sleep 1") + end + end +end + local function chpasswd(obj) if obj.chpasswd == nil then return end nuage.chpasswd(obj.chpasswd) @@ -973,10 +1046,23 @@ local function load_metadata(citype) nuage.err("error parsing nocloud meta-data") end return obj - elseif citype ~= "postnet" then + elseif citype == "postnet" then + -- reload metadata: try config-2 format first, then nocloud + local parser = ucl.parser() + local res, err = parser:parse_file(ni_path .. "/meta_data.json") + if res then + return parser:get_object() + end + local f = io.open(ni_path .. "/meta-data") + if f then + local obj = yaml.load(f:read("*a")) + f:close() + if obj then return obj end + end + return {} + else nuage.err("Unknown cloud init type: " .. citype) end - return {} end local function load_userdata() @@ -1114,6 +1200,7 @@ elseif line == "#cloud-config" then users, chpasswd, write_files_deferred, + phone_home, final_message, power_state_change, } diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 2b4d316fd5ff..b225289718e6 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -47,6 +47,7 @@ atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files atf_test_case config2_userdata_encode_base64 atf_test_case config2_userdata_final_message +atf_test_case config2_userdata_phone_home setup_test_adduser() { @@ -1416,6 +1417,37 @@ EOF /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } +config2_userdata_phone_home_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + export NUAGE_RUN_TESTS=1 + printf '{"hostname": "myhost", "uuid": "abc-123", "public_keys": ["ssh-rsa AAAAB...", "ssh-ed25519 AAAAC..."]}' > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data << 'EOF' +#cloud-config +phone_home: + url: "http://example.com/endpoint" + post: + - hostname + - instance_id + tries: 1 +EOF + atf_check -o match:"fetch -q -o /dev/null --post-data 'hostname=myhost&instance_id=abc-123' 'http://example.com/endpoint'" \ + /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + + # Test "all" post + printf '{"hostname": "myhost"}' > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data << 'EOF' +#cloud-config +phone_home: + url: "http://example.com/endpoint" + post: all + tries: 1 +EOF + atf_check -o match:"fetch -q -o /dev/null --post-data 'hostname=myhost&fqdn=myhost' 'http://example.com/endpoint'" \ + /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet +} + atf_init_test_cases() { atf_add_test_case args @@ -1458,4 +1490,5 @@ atf_init_test_cases() atf_add_test_case config2_userdata_write_files atf_add_test_case config2_userdata_encode_base64 atf_add_test_case config2_userdata_final_message + atf_add_test_case config2_userdata_phone_home } From nobody Sun Jun 28 18:40:50 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 4gpJBq3LNsz6jkVG for ; Sun, 28 Jun 2026 18:40:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBq0hFmz3YRh for ; Sun, 28 Jun 2026 18:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672051; 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=6iBfMPFQOFmY1CrJbnKo2Br1F2tK/JvVFW9AVzZWeEw=; b=Hz+ub+1mU3SQjX8BMGovsk3hL3do6zGQihAg2x4yF8yqtwiawmEDYMRtOUpnTGT4nY8fmf dWIjo8sZ9+nXQK6qOGEe9UBLpGIK3qq+o6FTZOGKu6/oeNfgT+fA+vLaymu/P3egf9NJAs 9FQxdOZFMsjrg9bu2BSt6vD3BamukVYdYU+ZlJHE3DbWZ9Kcn49XuVJ5a2BRhnzqn6N4e0 zI7d5kSeq5rGQW647pm1mQ0t3R8jSlF6oF8MxmtBL6FTNgiIdZaQMLuqbdSXLdXA6ax4My sZ7PWnMqUZeecPCxTZAjnDctqLaWJ7HgyVesDyITxo2zkKU2Ce63MEvHDirVaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672051; a=rsa-sha256; cv=none; b=aFkHD1LlDRqiWX12El8wcs7FoGeUVTL3XVamhLkN+q9JyfeGq5F3V/CBLeCR2lBWmNqfFi tEX1E1Nyzja62zu+Z5JvCinFgsoQkYQvmTGZPvbbhgLDvtG0ghbT8ekVA1+ngTZrQsYHeT 8+wQb9Uq/kE6QDpH8wUbfn4sukUyL5ZfehhgQ+jQrGdnFLgnTOOa8pWffdIDez8Zecv5ca zvKtbjca3p865kkA2TyKQogNLLIt+NH4FzcVFFcEM55KB39+KOgjWlufSvkQVhpAxw+FAo SNkHnFkkCyOmxlXRxq0XjAqNQzDqSBI0Z2C55cZi0yXzACro5RgVTwIMw65tBQ== 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=1782672051; 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=6iBfMPFQOFmY1CrJbnKo2Br1F2tK/JvVFW9AVzZWeEw=; b=Hb5SekrNVpaRxWdzrDYHhiCL2VLKILG+nRiEqkyrgh1NVpM2rh1H5s2I8oRpJoWo/fNj6i xNQFHLFhbXMmvExAp1PVkFYo3OjRO2yuC0xtbddKuYDoTmRDxt9MmhXFyy9vO1pwqm8zNl sRPoHNn5NXYjgM71najVjyrxg3+TYu3ralo5DiYzAVgjcxTdn/5ECXy5N9Uv8fJpv7i45+ Mx8rDvkbk9QThPtsUtQj/jmceVcstmCy8kMHGP9F+iGyszUBlIdV157es3ysncUv30Ymon pJVwzYh2FKCsQVKjFe1n/ZuLIDZsavsPjLN4y+4glnrSUrCQT6zfXdjES05p0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBp6c4pz7GV for ; Sun, 28 Jun 2026 18:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb55 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 25f255d45f2d - stable/15 - nuage.lua: add encode_base64 helper 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 25f255d45f2dabf38fe50659ef9c4c5f5fe36dce Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:50 +0000 Message-Id: <6a416ab2.1cb55.2e5ca909@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=25f255d45f2dabf38fe50659ef9c4c5f5fe36dce commit 25f255d45f2dabf38fe50659ef9c4c5f5fe36dce Author: Baptiste Daroussin AuthorDate: 2026-05-07 21:53:04 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:36:23 +0000 nuage.lua: add encode_base64 helper (cherry picked from commit 71e8122b3f6efdaac23ac219312dfe270731b495) --- libexec/nuageinit/nuage.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 6cef5d2dd904..3f614dba2b22 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -55,6 +55,35 @@ local function decode_base64(input) return table.concat(result) end +local function encode_base64(input) + if input == nil or #input == 0 then + return "" + end + local b = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' + local result = {} + local pos = 1 + local padding = "" + while pos <= #input do + local a = string.byte(input, pos) + local bb = pos + 1 <= #input and string.byte(input, pos + 1) or 0 + local c = pos + 2 <= #input and string.byte(input, pos + 2) or 0 + table.insert(result, string.sub(b, math.floor(a / 4) + 1, math.floor(a / 4) + 1)) + table.insert(result, string.sub(b, math.floor(a % 4 * 16 + bb / 16) + 1, math.floor(a % 4 * 16 + bb / 16) + 1)) + if pos + 1 <= #input then + table.insert(result, string.sub(b, math.floor(bb % 16 * 4 + c / 64) + 1, math.floor(bb % 16 * 4 + c / 64) + 1)) + else + table.insert(result, "=") + end + if pos + 2 <= #input then + table.insert(result, string.sub(b, math.floor(c % 64) + 1, math.floor(c % 64) + 1)) + else + table.insert(result, "=") + end + pos = pos + 3 + end + return table.concat(result) +end + local function shell_escape(s) return "'" .. string.gsub(s, "'", "'\\''") .. "'" end @@ -964,6 +993,7 @@ local n = { addsudo = addsudo, adddoas = adddoas, addfile = addfile, + encode_base64 = encode_base64, add_fstab_entry = add_fstab_entry, remove_fstab_entry = remove_fstab_entry, write_resolv_conf = write_resolv_conf, From nobody Sun Jun 28 18:40:51 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 4gpJBr3yWFz6jkyD for ; Sun, 28 Jun 2026 18:40:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBr0yPfz3Yj3 for ; Sun, 28 Jun 2026 18:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672052; 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=CbeSm4JKg6IUwJRLa6fInTWCC3gO++UcrlQWzuHBU7c=; b=h3jHCqMqEf4dTRAJR9YLF7uXi3Cd5iWBj1xYNvgM75Cn6KpmbmEtpsw7rW4+8c4XpcVR5f dduZKGHb9geaCcqqOHinkDqZ8tVOX9XfrgN7CjuQl4SVK9iC14GBKJfZN2WYF/DnJWhyLI 37o4qy68Bm3pYjST0G03jVpX6cVwCaXYMH79vFDIDRX5S+cWNrFNPMg0RuAw6++iJb7DiQ 0/LEzmAoPewUXu9Z410c2lwsDddPxh1nqe3CHYsZKxamjmOgp+Z8LdS/tQ23MIUbZpoYii LLBPiy/fc2xyVdwyiffZVdQc/H5JlwEaAskvBHkvUW/r3VDoQgMvuAa8/5LqAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672052; a=rsa-sha256; cv=none; b=mUgJ2hvIkCViRrbmEZQ561AXlDZnXafqB9Xr8Xk9UAwkWeShQaMVbGpWWf22u4u6WWEah2 WB2I6FMyYzOzpz4rNDM/E09h2zjC56ma6byMwu491uw0hpLc0NV0gUzsiYqgG9vwjOvp2x YhlPwqgChfKFUcJU7Rq/wPm2yFAdzA6hqKdzUWXYy+B54KqpyAxx+etd32ypOqZNosm44N INTtHKR612WovH45uQ5YkI682lK49ZfJD8b6keF6e9z5PyEZV3Y6lmxlEdVkcl9f/DMbDo hWbT9deDj+JwELu1+Odp5rhVUW34Rusz4mE8gDdZ0QVLWhDLxPP51cHlJFpKLg== 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=1782672052; 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=CbeSm4JKg6IUwJRLa6fInTWCC3gO++UcrlQWzuHBU7c=; b=GG6oF3oD/KtykiEpDUmuIN74SNjL3QE3AnPm3jO/sopAd3AZr2ENFCTe+3m17l9fIrd1dl /y+SReHKfY653Ob4XERbhD2mAxDt/VfUD0XMIFkTYUo0beStqzBGe3T410sFou06Hf1lV8 KVyXcJ3l5drzUU69n9IfNC4/miMLlpg2h9o9ZKGbiVxw0pPaif+689Oj0dsjvp5fClvj+U ctkRXig/c53SF656+ZpJI5G/Mn2szeGLfQgry6okAr/rwDJ99tRINIeiICS9l5hA7NN2Iw sN8rr9U8nCWXt6oNbt2oLW/kU2G0KOl9Bkj4XtBLt36y1spMQc2bSRLy6r/i7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBq71SCz70N for ; Sun, 28 Jun 2026 18:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c99a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 167ddf97da60 - stable/15 - nuageinit: expose decode_base64 to fix tests 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 167ddf97da603398d6726692694a6f39c4228932 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:51 +0000 Message-Id: <6a416ab3.1c99a.3cc672e6@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=167ddf97da603398d6726692694a6f39c4228932 commit 167ddf97da603398d6726692694a6f39c4228932 Author: Baptiste Daroussin AuthorDate: 2026-06-06 06:05:50 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:55 +0000 nuageinit: expose decode_base64 to fix tests (cherry picked from commit 68e60bb8b6c968fe615f81ccc8afd2a30ff78003) --- libexec/nuageinit/nuage.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 3f614dba2b22..a554553b3e61 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -993,6 +993,7 @@ local n = { addsudo = addsudo, adddoas = adddoas, addfile = addfile, + decode_base64 = decode_base64, encode_base64 = encode_base64, add_fstab_entry = add_fstab_entry, remove_fstab_entry = remove_fstab_entry, From nobody Sun Jun 28 18:40:53 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 4gpJBs6hk4z6jkdV for ; Sun, 28 Jun 2026 18:40:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBs1rwhz3Ycp for ; Sun, 28 Jun 2026 18:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672053; 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=GvVYotpF7ej+5c4ygbE0XkhxWGctJrXp5mtyMaJ1bRU=; b=iraUcvCgWQjDo7/LO/InPyO+prnw8LTXEWtZLxABfWe/sRKCWxeM2QKle7T8PeQIVlD1mm KduyziyEfQvFXb1S7cne6ZXvq11pyXPJYkC2dh9Hm9exS08P0oG39UuB6BfPgo6WTmnDui /HUyB+dM/hiGESY/QSHT/6Z6BKSVbHZC3vgwholxbAvdgrwzVjpidbFhH4hrfewwwQ3BvI tGeUs4+qqwmUTtUPGtdp2GZaOBlZVuwd6wuXj5gjuos5bkB4I76k6Dv7QuyDfUNpAIm0pb fD80rcJJbDu2dI+kCUnxa1mR4bR1J5b+lN8ALE5KMAg/IwBdZOYXfkDtcJbHHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672053; a=rsa-sha256; cv=none; b=dekHi356i6Dm8iIIEOuOpah+KsjrQ5FazhyOodk3Q6LfOTfMAAMWFZGLDt3/0XIEafRGSQ V4AcKhAhB0hOigXF0bumgi6a2wXqdhYW6qyG76XlVcK6auWoZn25pG0pOrI2zM+1Lm2730 0hRHeSGho69l/clepoXFfS/ZTop37QI4fPEhGsYYX5VN1WGWfZV8rNbcucgJ1zX9FAGCiu Yjm4iGjwVnkMHeeRDBycwesHI8YggHPY+6BT1S+arcvoT2MDV9/c/EbCb1zWr7SVxleIJf +mjU2MNI1aLC7d2LSM0UCvMXId3p+tp8olvJiYTDd9sCYSGG/dFZvPkG42Fu0w== 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=1782672053; 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=GvVYotpF7ej+5c4ygbE0XkhxWGctJrXp5mtyMaJ1bRU=; b=DrI/IsZzZex+tS9psZt8CmD19SjSfU2W14iV4p4GevuwLjcYOMmZB/SLid47QGf80wkUhn vX32enfTdHovTjQXszOZWNkIS4bwR3L1paaUATKq0GAZ8SaooMcpN5lQgHxnmAvKhlTaDJ 88m5HNqwE2uaNLX4IdNrHbMtpyYa2HYLBUIrriawDcTryV8jquoN3cE6XKN5d7w1AEe2iO DxZM1cE9gjcsj/KzbYwT+U+4AZEHb2p4TtTzvPjpZcVIRqQPf4KoV1aJ6P8Y491dRuvpf4 hBf+IZOK+9soUY/KFiEZHDOF3+EbXUeOKDVB4QauhIrl6hynz4r81MMIQjT8xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBs0gfcz7GX for ; Sun, 28 Jun 2026 18:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cccb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 48bf144ac4a2 - stable/15 - nuageinit: update documentation for phone_home and final_message 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 48bf144ac4a2ae8d55ac32f855e295ca54237f04 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:53 +0000 Message-Id: <6a416ab5.1cccb.1bf61827@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=48bf144ac4a2ae8d55ac32f855e295ca54237f04 commit 48bf144ac4a2ae8d55ac32f855e295ca54237f04 Author: Baptiste Daroussin AuthorDate: 2026-06-06 06:17:04 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:55 +0000 nuageinit: update documentation for phone_home and final_message (cherry picked from commit bad3c15dffea69ea84f95489d26a86ad0498d942) --- libexec/nuageinit/nuageinit.7 | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 6d0f8ae2f41c..0bd652ae4fd5 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -3,7 +3,7 @@ .\" Copyright (c) 2025 Baptiste Daroussin .\" Copyright (c) 2025 Jesús Daniel Colmenares Oviedo .\" -.Dd February 26, 2026 +.Dd June 6, 2026 .Dt NUAGEINIT 7 .Os .Sh NAME @@ -491,6 +491,37 @@ succeeds. Defaults to .Qq true . .El +.It Ic phone_home +An object configuring the posting of instance data to a URL. +.Pp +The following keys are recognized: +.Bl -tag -width "tries" +.It Ic url +The target URL to which the data will be posted. +.It Ic post +A list of data items to send, or the string +.Qq all +to send all supported items. +Supported items are: +.Qq hostname , +.Qq fqdn , +.Qq instance_id , +.Qq pub_key_rsa , +.Qq pub_key_ecdsa , +and +.Qq pub_key_ed25519 . +.It Ic tries +Number of retry attempts. +Defaults to 1. +.El +.Pp +The data is posted using +.Xr fetch 1 . +.It Ic final_message +A string message to be displayed at the end of the boot process. +The placeholder +.Qq $UPTIME +is replaced with the system uptime in seconds. .It Ic users Specify a list of users to be created: .Bl -tag -width "ssh_authorized_keys" From nobody Sun Jun 28 18:40:54 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 4gpJBt3PW5z6jkjK for ; Sun, 28 Jun 2026 18:40:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBt2JHdz3YjL for ; Sun, 28 Jun 2026 18:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672054; 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=QLCRtaGGiDnrswM/s2aXA4f0ZwBvVBjsiLUPn7fUqPk=; b=Jor3QFMNa6Q9z5xUm6k4LOHSeAw8MCRjFfeN0rcNmUvtrU5hzJce0+DRsCYmsK/kl+RIFr 3I7I5MMemHzhchq16OFO+jI9DuGS+Xe9KE7ztFuxM7p4cTQdSYrOS67Hgab8+duKLF85At HBWtzNA/ovdZmktVKcI8BnnTdLGuZXScfMuMfMRO8v+AYL8MGnQPCjHzK/AmvT5XdmriHA 8CfarpDvyXZ/ROTMdD4vwuDkkEzpewuZeAaQFt378u9etoxeveqsVqmlpUbKwP1c98d5oN zcMgXkFI19mGhCgS0AeosLREPejgY53ljs24BH7M0eHyKrEWfaaXVXAIbXjJRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672054; a=rsa-sha256; cv=none; b=MwpoRvPsAoY8EInOa9TN13AI0LKib0JUY21FYbdedLOo3Ma1u0EBQiytwWkEsZTz6uUSMu FqpwjlPnTaA8BtLEPi6vgwv0Ci/rLgef+3eMWpLL8Z8OBPdeSg1lxs9uaETDOJdM+ctiHZ a3/U+ki3y52S5K29TjUz/X2dmw7sz4tPWa5Ur9gOBC1zerz6bG7ikXlrClIGt8hechLb6h vzvnxTT0hjK3i+7NUuNYN1gpltiimBV9Epn1PCI8hkDtxP71fzYbfEkvAW8EXDso5FYdhM LHdnNUUV6RIIZRZ8T572WhCye7m8KQyomuPSXTikzKPG01U+0MATU49YQsXSeg== 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=1782672054; 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=QLCRtaGGiDnrswM/s2aXA4f0ZwBvVBjsiLUPn7fUqPk=; b=Wj0VPcLsjS3Tm9E7yfafUXBPiat9crlxCalfX5I99yUV2nT3sbNpLzR7UulsNr5VCiDILV YXXE3vt31Kxek07EwPnwIM5SBngfVxxBPyuB8RwAJtWIBw1KO1cdO82kWRcGypiLsd/xT9 gaCYKh6XrddbAEWx7Y/qJWhNPZmxXCoPFMNlRDngfWB6BqBJHbtIyIj5zKo4z/m/4oBgpx 5RZxsoxpq72TNPgpcPjrJ2QFPgUTbXqP3juuYtR9yDD2zTpRmXNO7GnW2L33cqCPTiOw4O wXmnICewRTlsZrDsTr6kW36NXglXZ0VvWgPnj8wv2hr2ukyuLT5ecWXTIexkOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBt1DYDz7GY for ; Sun, 28 Jun 2026 18:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c518 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7aefe34615c3 - stable/15 - nuageinit: install certs in /usr/share/certs/trusted 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7aefe34615c33ef8b6136a998e87fa13bf272e05 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:54 +0000 Message-Id: <6a416ab6.1c518.2956efad@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7aefe34615c33ef8b6136a998e87fa13bf272e05 commit 7aefe34615c33ef8b6136a998e87fa13bf272e05 Author: Baptiste Daroussin AuthorDate: 2026-06-06 19:30:53 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:56 +0000 nuageinit: install certs in /usr/share/certs/trusted Suggested by: kevans (cherry picked from commit e5ef12ccd01f8ec6c519bf2a56cac2808f78c51a) --- libexec/nuageinit/nuageinit | 2 +- libexec/nuageinit/nuageinit.7 | 2 +- libexec/nuageinit/tests/nuageinit.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 8e207cae0a15..9a0399ad4862 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -572,7 +572,7 @@ local function ca_certs(obj) if obj.ca_certs == nil then return end local trusted = obj.ca_certs.trusted if trusted == nil or #trusted == 0 then return end - local certdir = root .. "/etc/ssl/certs" + local certdir = root .. "/usr/share/certs/trusted" nuage.mkdir_p(certdir) for i, cert in ipairs(trusted) do local certpath = certdir .. "/nuageinit-" .. i .. ".pem" diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 0bd652ae4fd5..e1c4b9d61382 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -276,7 +276,7 @@ The following keys are recognized: .It trusted A list of PEM-encoded CA certificates to add to the system trust store. Certificates are written to -.Pa /etc/ssl/certs/ +.Pa /usr/share/certs/trusted/ and .Xr certctl 8 rehash is executed. diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index b225289718e6..798ac235e122 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -1275,8 +1275,8 @@ ca_certs: -----END CERTIFICATE----- EOF atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o match:"dGVzdGNlcnQx" cat etc/ssl/certs/nuageinit-1.pem - atf_check -o match:"dGVzdGNlcnQy" cat etc/ssl/certs/nuageinit-2.pem + atf_check -o match:"dGVzdGNlcnQx" cat usr/share/certs/trusted/nuageinit-1.pem + atf_check -o match:"dGVzdGNlcnQy" cat usr/share/certs/trusted/nuageinit-2.pem true } From nobody Sun Jun 28 18:40:55 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 4gpJBv5ZFbz6jkln for ; Sun, 28 Jun 2026 18:40:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBv31DTz3YlQ for ; Sun, 28 Jun 2026 18:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672055; 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=JETq3li/AqCoZF758ebEjeykPC0eOkW9AKlDA7Tv/UU=; b=CxwjkSJQ1V/d9pjLYaot5I5GDVRi0UAO+MPJ9yuYgkHXDQHgvINfNldKvXqRzwhNcW4987 vU7E2uzUwrqwuZtnckqmXcBErORziUDjC1rxWfc6Lb76ce8HGQnV4RiiXK1CoegW1XjbXP 3a6+lTd3c0iLWwn/BEnlRNkMbPmxKKmXveBmkeZwB8Yi1h5DncqZm3RTpGo+aAjW/1PoDv ywWdBiWufo53EZ7Y66hUSFbMJF61u7ehrfMU/tJiuE5ko3JEMbQqYNlo6SEU6172Unk8xu d3sORLoyZs98EcO0N+NpQlXsYkmYWZb8ikJsAalm5/w2e1sg9/RWybUbh+iMCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672055; a=rsa-sha256; cv=none; b=Px/0nEwW+qjDTNDQG6dA6sTIewEGQfIU0kWDWgB0eJi6RuqPng1412cM+a+uJe3tnni2hq iMSN/IJk7I+Mas+ybrygASnU8hNcEknYpNmctcR3vefC4s4Baw2FwLeibItvH/d7bDWEzs /V8U8V85lde393wAaTR1SUctv+uiwHiCRBL9XQjoqE0LBK5F+QwTdknYdHRXm70ge6aoLG YwqrVr1a3vrFZKaqLiQ6FpAXZtSNr/19V2hClwvhY2ZIzIvlUB4hKB4TGnTxTBUezS00Ub DBBvr8bXrfGq+81tRsmGpZ92wY5pAxXxF3IIRHUTKEZIZFzFjs4XAgUqzycnzg== 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=1782672055; 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=JETq3li/AqCoZF758ebEjeykPC0eOkW9AKlDA7Tv/UU=; b=cRW2jRZ9NpmWcOX8VQHiJvdur2PQc7k71t3dZXY4XXKQOIp5mkvX2OGYfgngaARXx6PNv3 5KfpWe1VbcdvjPkqET7hxRbAuu6PApg7oLvdrYTrmB6OrXForgsoHb3i4Fg1TUB0F/0Hu7 rKePorHVCqu/KbQwp3N01tmP/85I71sSkC+6qcmgAXUvXvM2R4pTDgPZvIZNsrZVqrFWap 78vMmWWXoont/UgVeporIEHR2h3lkihotq5ob32W7b/PplqUcjN6FX4i45e7WiQDdv6dEP SpSk7Mpnd9cVLbTyWs+bU/LkGKmuf3K3D5H+2TZye1SgTvcQX8fRvrgoZExThQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBv22TKz7CS for ; Sun, 28 Jun 2026 18:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c691 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3bb20f3c2837 - stable/15 - nuageinit: use single-quote shell escaping for hostname in rc.conf.d 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3bb20f3c28373db0236ebfb9e2cccc63333c8f7a Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:55 +0000 Message-Id: <6a416ab7.1c691.4c7c2a0a@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3bb20f3c28373db0236ebfb9e2cccc63333c8f7a commit 3bb20f3c28373db0236ebfb9e2cccc63333c8f7a Author: Baptiste Daroussin AuthorDate: 2026-06-09 14:04:18 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:56 +0000 nuageinit: use single-quote shell escaping for hostname in rc.conf.d The hostname value was written inside double quotes in /etc/rc.conf.d/hostname. POSIX shell performs command substitution inside double quotes, so a hostname containing $() or backticks would be executed when the file is sourced (e.g., by rc(8)). Switch to using the existing shell_escape() helper, which wraps values in single quotes. In POSIX shell, single-quoted strings are completely literal — no expansion or substitution of any kind is performed. While the hostname is already validated to contain only [a-zA-Z0-9.-], this change provides defense-in-depth so the output format is safe regardless of future validation changes. Reported by: Yazdan Soltani (cherry picked from commit da3890fdccfa7d540ea746182248299b81f95345) --- libexec/nuageinit/nuage.lua | 2 +- libexec/nuageinit/tests/nuage.sh | 2 +- libexec/nuageinit/tests/nuageinit.sh | 12 ++++++------ libexec/nuageinit/tests/sethostname.lua | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index a554553b3e61..523bfc65a579 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -187,7 +187,7 @@ local function sethostname(hostname) warnmsg("Impossible to open " .. hostnamepath .. ":" .. err) return end - f:write('hostname="' .. hostname:gsub('"', '\\"') .. '"\n') + f:write("hostname=" .. shell_escape(hostname) .. "\n") f:close() end diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 97c5224c7813..1e08c990eacd 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -33,7 +33,7 @@ sethostname_body() if [ ! -f etc/rc.conf.d/hostname ]; then atf_fail "hostname not written" fi - atf_check -o inline:"hostname=\"myhostname\"\n" cat etc/rc.conf.d/hostname + atf_check -o inline:"hostname='myhostname'\n" cat etc/rc.conf.d/hostname } addsshkey_body() diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 798ac235e122..3f3e2843c35d 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -80,13 +80,13 @@ nocloud_body() atf_check -s exit:1 -e match:"nuageinit: error parsing nocloud.*" /usr/libexec/nuageinit "${PWD}"/media/nuageinit/ nocloud printf "instance-id: iid-local01\nlocal-hostname: cloudimg\n" > "${PWD}"/media/nuageinit/meta-data atf_check -s exit:0 /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud - atf_check -o inline:"hostname=\"cloudimg\"\n" cat etc/rc.conf.d/hostname + atf_check -o inline:"hostname='cloudimg'\n" cat etc/rc.conf.d/hostname cat > media/nuageinit/meta-data << EOF instance-id: iid-local01 hostname: myhost EOF atf_check -s exit:0 /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud - atf_check -o inline:"hostname=\"myhost\"\n" cat etc/rc.conf.d/hostname + atf_check -o inline:"hostname='myhost'\n" cat etc/rc.conf.d/hostname } nocloud_userdata_script_body() @@ -250,7 +250,7 @@ config2_body() } EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o inline:"hostname=\"cloudimg\"\n" cat etc/rc.conf.d/hostname + atf_check -o inline:"hostname='cloudimg'\n" cat etc/rc.conf.d/hostname } config2_pubkeys_head() @@ -1307,7 +1307,7 @@ echo "multipart script executed" --==BOUNDARY==-- EOF atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o inline:"hostname=\"multipart-host\"\n" cat etc/rc.conf.d/hostname + atf_check -o inline:"hostname='multipart-host'\n" cat etc/rc.conf.d/hostname atf_check -o inline:"#!/bin/sh\necho \"multipart script executed\"\n" cat var/cache/nuageinit/multipart_script test -x var/cache/nuageinit/multipart_script || atf_fail "multipart_script not executable" true @@ -1376,13 +1376,13 @@ fqdn: host.domain.tld hostname: host EOF atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o inline:"hostname=\"host.domain.tld\"\n" cat ${PWD}/etc/rc.conf.d/hostname + atf_check -o inline:"hostname='host.domain.tld'\n" cat ${PWD}/etc/rc.conf.d/hostname cat > media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBw4Vfgz3YZh for ; Sun, 28 Jun 2026 18:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672056; 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=HB1mDH2xJDDN0nmwAvk3XQ2g/Vd0Aw1FVUfWSDEdazM=; b=BdUlg5MtqGLbHXzvlEW2TWFTd6v84HvLjoBoB0j5ksRJusQrWiexe/fS+GvC7TB+IFOi9h J+L5jFwj9BldV6qWsD1q9gJkUXcFsFsbrADuczqVwt7VweyYka8UGMk7Qm+Ogvs1w6bjAu ksccmrvI1wMe/KpqNuba7WR1AYp9UFRZL7a4AKyPGPnFkpvrvrK2Z6UpL8O5Ys2AlYmElg Y/daIiVVE5AE5ArWUM+ruLEGlRxP1ozn4Ym8XMVm7MfT6bn2cMREFSs6d+iz6HJVzDT1qM WEBuBN89dJVptCga/d33dpcX7cvUlKk+jcTt6WpYTxmlKe2Z7ZENOV4VMPEWyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672056; a=rsa-sha256; cv=none; b=vI/XQu0F8B59E5qqPjINft7jMiFDAxIvLoTr21WJfHVZJr8DXiULIBhrzrcV4Aw5rPIP4+ tbF06zm6teu1Azmkmm1PU1rfHABvvF04hADCUyx10GaB0jof4tDgb//DrWVdR+IZCfacMn eB3T916fgmSCPWtWjodMJU69qS34FeQkUsfE/3ZwK+7tQJl8BvPg9NTshHS2SWA7l3rQUr CPdxpIxkUZQ6KASve6QtTXX9pITxOEfRz+iKukXHq7FlvMgB7EFNhWXCJaNhBeB0c2qgP2 HaGQm6ei6mC1Zgh9BQEha73DoXUCMv57MuKh5fsTTp0hBbQPwkjHxkiVT8B3Zg== 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=1782672056; 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=HB1mDH2xJDDN0nmwAvk3XQ2g/Vd0Aw1FVUfWSDEdazM=; b=JGqh3S2h+E38vmPNkYpLmnmHCfk/YLjt5uA6FIRsEfJ+MjiSoUYXyNURRdIMazQ7z2mX9s IA+6j5QGUssufqW18+HZ7vftEB7qTNs9NRf1tMBshVCxOFKh2PLDsz8U68SRvIFjKnkPuY mv2NwYNTbTObfwn0/J8EU5Fe3FAisNReqAkilxjERN8zSxJz0fmb47Xw8dt4aaUYF2Hj6D CebN9OGAOs+GRklwmubPixyZPpf5gxYZuESKi3XkVmB7Wc8fRvpzGBKuTtUFIQx1MiFSF8 wE15DtQ9u2aIIdUKS2ixyVhW6l5Jre7NG+0gQRHxfefwV5ARLVAhmc1l6x/CMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBw2xHQz7GZ for ; Sun, 28 Jun 2026 18:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c99e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3654d0c7e0a5 - stable/15 - nuageinit: fix shell command injection in multiple rc.conf.d writes 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3654d0c7e0a5a4928f8587d84ebf65857c955224 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:56 +0000 Message-Id: <6a416ab8.1c99e.434db5cc@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3654d0c7e0a5a4928f8587d84ebf65857c955224 commit 3654d0c7e0a5a4928f8587d84ebf65857c955224 Author: Baptiste Daroussin AuthorDate: 2026-06-09 14:16:44 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:56 +0000 nuageinit: fix shell command injection in multiple rc.conf.d writes (cherry picked from commit 0211c8722ff2ac9367565e526e62837745bb2cce) --- libexec/nuageinit/nuageinit | 89 ++++++++++++------------------------ libexec/nuageinit/tests/nuageinit.sh | 46 +++++++++---------- 2 files changed, 53 insertions(+), 82 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 9a0399ad4862..6e900e01df4e 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -240,37 +240,11 @@ local function nameservers(interface, obj) local resolvconf_conf_handler = open_resolvconf_conf() if obj.search then - local with_space = false - - resolvconf_conf_handler:write('search_domains="') - - for _, d in ipairs(obj.search) do - if with_space then - resolvconf_conf_handler:write(" " .. d) - else - resolvconf_conf_handler:write(d) - with_space = true - end - end - - resolvconf_conf_handler:write('"\n') + resolvconf_conf_handler:write("search_domains=" .. nuage.shell_escape(table.concat(obj.search, " ")) .. "\n") end if obj.addresses then - local with_space = false - - resolvconf_conf_handler:write('name_servers="') - - for _, a in ipairs(obj.addresses) do - if with_space then - resolvconf_conf_handler:write(" " .. a) - else - resolvconf_conf_handler:write(a) - with_space = true - end - end - - resolvconf_conf_handler:write('"\n') + resolvconf_conf_handler:write("name_servers=" .. nuage.shell_escape(table.concat(obj.addresses, " ")) .. "\n") end resolvconf_conf_handler:close() @@ -455,18 +429,18 @@ local function network_config(obj) local ifaces = get_ifaces_by_mac() local matched = ifaces[v.match.macaddress] if matched and matched == interface then - network:write("ifconfig_" .. interface .. '_name=' .. v["set-name"] .. '\n') + network:write("ifconfig_" .. interface .. "_name=" .. nuage.shell_escape(v["set-name"]) .. "\n") interface = v["set-name"] end end if v.dhcp4 then - network:write("ifconfig_" .. interface .. '="DHCP"' .. extra_opts .. '\n') + network:write("ifconfig_" .. interface .. "=" .. nuage.shell_escape("DHCP" .. extra_opts) .. "\n") elseif v.addresses then for _, a in pairs(v.addresses) do if a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then - network:write("ifconfig_" .. interface .. '="inet ' .. a .. extra_opts .. '"\n') + network:write("ifconfig_" .. interface .. "=" .. nuage.shell_escape("inet " .. a .. extra_opts) .. "\n") else - network:write("ifconfig_" .. interface .. '_ipv6="inet6 ' .. a .. extra_opts .. '"\n') + network:write("ifconfig_" .. interface .. "_ipv6=" .. nuage.shell_escape("inet6 " .. a .. extra_opts) .. "\n") ipv6[#ipv6 + 1] = interface end end @@ -476,24 +450,22 @@ local function network_config(obj) end if set_defaultrouter and v.gateway4 then set_defaultrouter = false - routing:write('defaultrouter="' .. v.gateway4 .. '"\n') + routing:write("defaultrouter=" .. nuage.shell_escape(v.gateway4) .. "\n") end if v.gateway6 then if set_defaultrouter6 then set_defaultrouter6 = false - routing:write('ipv6_defaultrouter="' .. v.gateway6 .. '"\n') + routing:write("ipv6_defaultrouter=" .. nuage.shell_escape(v.gateway6) .. "\n") end - routing:write("ipv6_route_" .. interface .. '="' .. v.gateway6) - routing:write(" -prefixlen 128 -interface " .. interface .. '"\n') + routing:write("ipv6_route_" .. interface .. "=" .. nuage.shell_escape(v.gateway6 .. " -prefixlen 128 -interface " .. interface) .. "\n") end end end ::next:: end if #ipv6 > 0 then - network:write('ipv6_network_interfaces="') - network:write(table.concat(ipv6, " ") .. '"\n') - network:write('ipv6_default_interface="' .. ipv6[1] .. '"\n') + network:write("ipv6_network_interfaces=" .. nuage.shell_escape(table.concat(ipv6, " ")) .. "\n") + network:write("ipv6_default_interface=" .. nuage.shell_escape(ipv6[1]) .. "\n") end network:close() routing:close() @@ -633,7 +605,7 @@ local function keyboard(obj) warnmsg("unable to open " .. path .. " for writing") return end - f:write('keymap="' .. keymap .. '"\n') + f:write("keymap=" .. nuage.shell_escape(keymap) .. "\n") f:close() end @@ -648,10 +620,14 @@ local function locale(obj) return end if type(obj.locale) == "string" then - f:write("export LANG=" .. obj.locale .. "\n") + f:write("export LANG=" .. nuage.shell_escape(obj.locale) .. "\n") elseif type(obj.locale) == "table" then for k, v in pairs(obj.locale) do - f:write("export " .. k .. "=" .. v .. "\n") + if not k:match("^[a-zA-Z_][a-zA-Z0-9_]*$") then + nuage.warn("locale: invalid variable name '" .. k .. "', skipping") + else + f:write("export " .. k .. "=" .. nuage.shell_escape(v) .. "\n") + end end else nuage.warn("locale: invalid type " .. type(obj.locale) .. ", expecting string or object") @@ -920,14 +896,14 @@ local function config2_network(p) for _, v in pairs(obj["networks"]) do local interface = mylinks[v["link"]] if v["type"] == "ipv4_dhcp" then - network:write("ifconfig_" .. interface .. '="DHCP"\n') + network:write("ifconfig_" .. interface .. "=" .. nuage.shell_escape("DHCP") .. "\n") end if v["type"] == "ipv4" then network:write( - "ifconfig_" .. interface .. '="inet ' .. v["ip_address"] .. " netmask " .. v["netmask"] .. '"\n' + "ifconfig_" .. interface .. "=" .. nuage.shell_escape("inet " .. v["ip_address"] .. " netmask " .. v["netmask"]) .. "\n" ) if v["gateway"] then - routing:write('defaultrouter="' .. v["gateway"] .. '"\n') + routing:write("defaultrouter=" .. nuage.shell_escape(v["gateway"]) .. "\n") end if v["routes"] then for i, r in ipairs(v["routes"]) do @@ -936,11 +912,10 @@ local function config2_network(p) goto next end if r["network"] == "0.0.0.0" then - routing:write('defaultrouter="' .. r["gateway"] .. '"\n') + routing:write("defaultrouter=" .. nuage.shell_escape(r["gateway"]) .. "\n") goto next end - routing:write("route_" .. rname .. '="-net ' .. r["network"] .. " ") - routing:write(r["gateway"] .. " " .. r["netmask"] .. '"\n') + routing:write("route_" .. rname .. "=" .. nuage.shell_escape("-net " .. r["network"] .. " " .. r["gateway"] .. " " .. r["netmask"]) .. "\n") ipv4[#ipv4 + 1] = rname ::next:: end @@ -949,11 +924,10 @@ local function config2_network(p) if v["type"] == "ipv6" then ipv6[#ipv6 + 1] = interface ipv6_routes[#ipv6_routes + 1] = interface - network:write("ifconfig_" .. interface .. '_ipv6="inet6 ' .. v["ip_address"] .. '"\n') + network:write("ifconfig_" .. interface .. "_ipv6=" .. nuage.shell_escape("inet6 " .. v["ip_address"]) .. "\n") if v["gateway"] then - routing:write('ipv6_defaultrouter="' .. v["gateway"] .. '"\n') - routing:write("ipv6_route_" .. interface .. '="' .. v["gateway"]) - routing:write(" -prefixlen 128 -interface " .. interface .. '"\n') + routing:write("ipv6_defaultrouter=" .. nuage.shell_escape(v["gateway"]) .. "\n") + routing:write("ipv6_route_" .. interface .. "=" .. nuage.shell_escape(v["gateway"] .. " -prefixlen 128 -interface " .. interface) .. "\n") end -- TODO compute the prefixlen for the routes --if v["routes"] then @@ -988,17 +962,14 @@ local function config2_network(p) end if #ipv4 > 0 then - routing:write('static_routes="') - routing:write(table.concat(ipv4, " ") .. '"\n') + routing:write("static_routes=" .. nuage.shell_escape(table.concat(ipv4, " ")) .. "\n") end if #ipv6 > 0 then - network:write('ipv6_network_interfaces="') - network:write(table.concat(ipv6, " ") .. '"\n') - network:write('ipv6_default_interface="' .. ipv6[1] .. '"\n') + network:write("ipv6_network_interfaces=" .. nuage.shell_escape(table.concat(ipv6, " ")) .. "\n") + network:write("ipv6_default_interface=" .. nuage.shell_escape(ipv6[1]) .. "\n") end if #ipv6_routes > 0 then - routing:write('ipv6_static_routes="') - routing:write(table.concat(ipv6, " ") .. '"\n') + routing:write("ipv6_static_routes=" .. nuage.shell_escape(table.concat(ipv6, " ")) .. "\n") end network:close() routing:close() diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 3f3e2843c35d..ce574a350ecc 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -223,15 +223,15 @@ network: EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud cat > network << EOF -ifconfig_${myiface}="inet 192.0.2.2/24" -ifconfig_${myiface}_ipv6="inet6 2001:db8::2/64" -ipv6_network_interfaces="${myiface}" -ipv6_default_interface="${myiface}" +ifconfig_${myiface}='inet 192.0.2.2/24' +ifconfig_${myiface}_ipv6='inet6 2001:db8::2/64' +ipv6_network_interfaces='${myiface}' +ipv6_default_interface='${myiface}' EOF cat > routing << EOF -defaultrouter="192.0.2.1" -ipv6_defaultrouter="2001:db8::1" -ipv6_route_${myiface}="2001:db8::1 -prefixlen 128 -interface ${myiface}" +defaultrouter='192.0.2.1' +ipv6_defaultrouter='2001:db8::1' +ipv6_route_${myiface}='2001:db8::1 -prefixlen 128 -interface ${myiface}' EOF atf_check -o file:network cat "${PWD}"/etc/rc.conf.d/network atf_check -o file:routing cat "${PWD}"/etc/rc.conf.d/routing @@ -406,15 +406,15 @@ cat > media/nuageinit/network_data.json << EOF EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 cat > network << EOF -ifconfig_${myiface}="DHCP" -ifconfig_${myiface}_ipv6="inet6 2001:db8::3257:9652/64" -ipv6_network_interfaces="${myiface}" -ipv6_default_interface="${myiface}" +ifconfig_${myiface}='DHCP' +ifconfig_${myiface}_ipv6='inet6 2001:db8::3257:9652/64' +ipv6_network_interfaces='${myiface}' +ipv6_default_interface='${myiface}' EOF cat > routing << EOF -ipv6_defaultrouter="fd00::1" -ipv6_route_${myiface}="fd00::1 -prefixlen 128 -interface ${myiface}" -ipv6_static_routes="${myiface}" +ipv6_defaultrouter='fd00::1' +ipv6_route_${myiface}='fd00::1 -prefixlen 128 -interface ${myiface}' +ipv6_static_routes='${myiface}' EOF atf_check -o file:network cat "${PWD}"/etc/rc.conf.d/network atf_check -o file:routing cat "${PWD}"/etc/rc.conf.d/routing @@ -466,12 +466,12 @@ cat > media/nuageinit/network_data.json << EOF EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 cat > network << EOF -ifconfig_${myiface}="inet 10.184.0.244 netmask 255.255.240.0" +ifconfig_${myiface}='inet 10.184.0.244 netmask 255.255.240.0' EOF cat > routing << EOF -route_cloudinit1_${myiface}="-net 10.0.0.0 11.0.0.1 255.0.0.0" -defaultrouter="23.253.157.1" -static_routes="cloudinit1_${myiface}" +route_cloudinit1_${myiface}='-net 10.0.0.0 11.0.0.1 255.0.0.0' +defaultrouter='23.253.157.1' +static_routes='cloudinit1_${myiface}' EOF atf_check -o file:network cat "${PWD}"/etc/rc.conf.d/network atf_check -o file:routing cat "${PWD}"/etc/rc.conf.d/routing @@ -518,7 +518,7 @@ cat > media/nuageinit/network_data.json << EOF } EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o inline:'name_servers="9.9.9.9 149.112.112.112"\n' \ + atf_check -o inline:"name_servers='9.9.9.9 149.112.112.112'\n" \ cat "${PWD}"/etc/resolvconf.conf } @@ -1203,7 +1203,7 @@ keyboard: variant: acc EOF atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o inline:'keymap="fr.acc"\n' cat etc/rc.conf.d/keymap + atf_check -o inline:"keymap='fr.acc'\n" cat etc/rc.conf.d/keymap true } @@ -1351,7 +1351,7 @@ config2_userdata_locale_body() locale: fr_FR.UTF-8 EOF atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o inline:"export LANG=fr_FR.UTF-8\n" cat etc/profile + atf_check -o inline:"export LANG='fr_FR.UTF-8'\n" cat etc/profile cat > media/nuageinit/user_data <; Sun, 28 Jun 2026 18:40:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBy5jF7z3YPp for ; Sun, 28 Jun 2026 18:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672058; 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=/O6aF/95us8D7hXUijaMu6njy6u8u200zYcwqQHWlCM=; b=LvYyHiUGCACJ8iqHpKG+STs20QHeAwUnD17RRA6XaolWJxjb1Rf4WwE8Jk+Skxpjd9PoKv TNggl/PD0Th/iB0pRvHBNyL7tmrAXq82OkPPbVLYzy5FbrE4VWOSYKUrr9mA5bTKDMLbqz s9CPbu9F9Dw5FVWtztB8lNDmewSE594VZYHJpZ7iypQhwV1xdX+EX9Z6EFdv9xHjoCcDgq Co6c23uwttO8//vBAu8Xq3NFacqLNC/2NoJFLFbIEzjyZyj217IKwKtEpiUo0MQYJ2Hk1E qw8FcxhKgOmRJmEpoKxYpIkDeggdG3uqXT2B8KBzgN6nZuzlcpyL+hAlMc5a6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672058; a=rsa-sha256; cv=none; b=jiszlWb9hJbUvVrHIR+479yCZfxKOYXfmrr3ao1ftAcpeVxwu6LOxFqxdq54HLDsHPwSEH ZnfMDq02Urfm09jJWAUqFdrb4Qv/gy0NOSHnj4yJ1y9CpeqRgGLd9evy+rY6Hr620gZ+E8 QLGC7gZAprx8uMerB1Jf7aibbwstfZTXjUKLupaYwtHK0OVsG3Esq0aHcpA7fkQId4tb+4 yjijYTJIv4/EThXqZmnXFjiz6u+CHVN6bNHkpIphqyX4o1246SImobws1wM0CtYWNLz9Yw Y2wzl5kkKscYig4aYT8bnXDXJ9o6x+ukzMIwKoY7leenvmpyYC+mVB8KFfiD7g== 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=1782672058; 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=/O6aF/95us8D7hXUijaMu6njy6u8u200zYcwqQHWlCM=; b=hmkjEYWT/Lw5pXa4AiBm3V8p4Y5HtEiCFtCdUkip8PSvfbf/ytQ48ZY+7n7GBYnnlQE+xW GoAeGImETzrkX2ze5F3Xkb9pOQuoKEghyfsQbs9IWq3OZN5DUmWHLtRx+IbeXCnaTsMyHu LaNtu9sVJSvYZyJs4j+vVatO0dvdEP7cgTxLXgdWdIPkSbZikGbsI/6yDT6ddOfYIzS6ze ewhgFdHfZUJtGFP+fvHKLar1dT3QpTkbgECn5HiFmkxrtD1UvRZWWZJ7pRPFzZRej0RHix fOsYpKSSLXflTF85YLhP/41/PNXEg+qxHxzz+mkfytS43uxyWAi0kDe74PjMoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBy4fGbz7DK for ; Sun, 28 Jun 2026 18:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2bb8d7c7ecb2 - stable/15 - nuageinit: validate set-name to prevent shell injection in variable names 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2bb8d7c7ecb200257f4eb71f4c35f00a0cf89df7 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:58 +0000 Message-Id: <6a416aba.1a5f0.4b3a8b3f@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2bb8d7c7ecb200257f4eb71f4c35f00a0cf89df7 commit 2bb8d7c7ecb200257f4eb71f4c35f00a0cf89df7 Author: Baptiste Daroussin AuthorDate: 2026-06-09 14:24:56 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:56 +0000 nuageinit: validate set-name to prevent shell injection in variable names Shell variable names cannot be safely quoted with shell_escape() — only alphanumeric characters are valid. Add validation that set-name only matches [a-zA-Z0-9]+; invalid values are rejected with a warning and the rename is skipped entirely. (cherry picked from commit 13fb6dbc738f4ba30e78a8fb21efa1382c520d33) --- libexec/nuageinit/nuageinit | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 8ca1a2c558c8..ba26f504effb 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -429,8 +429,12 @@ local function network_config(obj) local ifaces = get_ifaces_by_mac() local matched = ifaces[v.match.macaddress] if matched and matched == interface then - network:write("ifconfig_" .. interface .. "_name=" .. nuage.shell_escape(v["set-name"]) .. "\n") - interface = v["set-name"] + if not v["set-name"]:match("^[a-zA-Z0-9]+$") then + nuage.warn("set-name contains invalid characters, ignoring: " .. v["set-name"]) + else + network:write("ifconfig_" .. interface .. "_name=" .. nuage.shell_escape(v["set-name"]) .. "\n") + interface = v["set-name"] + end end end if v.dhcp4 then From nobody Sun Jun 28 18:40:57 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 4gpJBx6yPPz6jl1h for ; Sun, 28 Jun 2026 18:40:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBx4qmhz3YPc for ; Sun, 28 Jun 2026 18:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672057; 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=bNrqow6nVRYKHzb0OzLxbxFZrZcp8Fi1YtH9diIluWE=; b=t+FEHnb7phGVUKzRZLddaUP9zscVlhrcaa/iE0jsS4g1WsTsvqxVkqIjR1wVdmuW5vagOP DjIDEVQrPssyHFR+3ltDwlz6ih5aBz1kJACj6+alubvysZcvTG4UDdZhKs5f1zaZG/yPDg 96d+ZhS6QE+9UWpRdu2lOdo1kVhQqR5ARgl+vt+FkJ6NcTEMoi5LUlPsZGOVtr+pdnwIRI PcAGB4SuYeBLu7gU709krviuX/XMidSQuWhNN5re3FnVOuTvnwxLdA3EeG//gXwhHsyUSB ybSOhecBUkdfZlH+m1voJ+Xb6+pcPB0rWewvjkWCYSEgqNeDnnxhAfgvFeUl0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672057; a=rsa-sha256; cv=none; b=CqTzXRCqjVqSxzMIFKZv1IEXh3FfB/4K/2pPi/Vb/tQge7sUrWoEwRJWmt0JNGgJwyIQtu lF816pDLICi0DerfYjQ7ngmPMXU9l+BxQzcoVJvs5tiE8Y94l3Ju5MJNdeWoRs3FEgSnxP 1EYJucCBLXRqzJYfA+b+aofCr0AZ8LT78Os8GgRvOx8VHzFZ7kacpfOhRMxH0T/H22OfuN oF11E29sy+niIPpY5hVXLeeyllye76CfTW3N5InSlOWvN25R+g463a29DDtnTKyXVV8tMO jdCgYvmgtMSbhh8b9MN1XpAqaSIMsRQ1J4te21DzhvmB22SFIou4olIyGwAZCQ== 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=1782672057; 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=bNrqow6nVRYKHzb0OzLxbxFZrZcp8Fi1YtH9diIluWE=; b=dgHNGDIbAxBGqvohCsgUoZETHvyjbaVZtJ1oaZwJKGZbsV36UDApBKT2pYpU8m4tI6Td1U AD1y21Kg8bNpQitzJYpRjEaJ3J3JulDOij1KlSOIbaz9fpZwZyCCOBOJsm8AeoKqBJaL9B Nu9EW4ScSJ/JG5ytkx42hj1yTnK5f60ya3haDTwqgLVdlTUn2VepqbNiNgMvuVmLKFBvj2 nXmsWxQZ7spQcy2iOOR18TUjPEXCXQ1HdGKXhYaHaakLBDLcNieAELbi8Ctx0qjQpQHE3E UQo/HLL3iQYggc0q1s61xIMlb2U5Y3GGjnhl5HvWQ9HjKf6uYVXQVzq/W8foVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBx3p1Wz6p1 for ; Sun, 28 Jun 2026 18:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 1561d31aa0f9 - stable/15 - nuageinit: fix shell injection in power_state_change delay and add test 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1561d31aa0f9fe1b44be855c12fc15cf92b95983 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:57 +0000 Message-Id: <6a416ab9.1c5db.6fdf3e8c@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1561d31aa0f9fe1b44be855c12fc15cf92b95983 commit 1561d31aa0f9fe1b44be855c12fc15cf92b95983 Author: Baptiste Daroussin AuthorDate: 2026-06-09 14:19:56 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:56 +0000 nuageinit: fix shell injection in power_state_change delay and add test (cherry picked from commit 09d068e52722dee0ed65eb88c5ea5bff4bb2ba06) --- libexec/nuageinit/nuageinit | 2 +- libexec/nuageinit/tests/nuageinit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 6e900e01df4e..8ca1a2c558c8 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -748,7 +748,7 @@ local function power_state_change(obj) end -- Build shutdown command - local cmd = "shutdown -" .. flag .. " " .. delay + local cmd = "shutdown -" .. flag .. " " .. nuage.shell_escape(delay) if message then cmd = cmd .. " " .. nuage.shell_escape(message) end diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index ce574a350ecc..ab9e697076e1 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -1332,7 +1332,7 @@ power_state: timeout: 30 condition: true EOF - atf_check -o inline:"shutdown -r +5 'Rebooting after configuration is complete'\n" \ + atf_check -o inline:"shutdown -r '+5' 'Rebooting after configuration is complete'\n" \ /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet true } From nobody Sun Jun 28 20:18:31 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 4gpLMd1FCWz6jt0s for ; Sun, 28 Jun 2026 20:18:37 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpLMc6hqMz3x9x for ; Sun, 28 Jun 2026 20:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782677916; 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=jKcpRks/o6n6XaTo4kS3dWz/yayCUy7Hir+FZs00ayM=; b=kaSRnKPz2w0ffXitxToSEU/wIN5WOeNO4yyqG3xj8k8IatVHU14vcpiQJDsGTYuRiwDhhr a2Ljks0IcdbDGGYuG56MmgkaTWMcVzFJ+QdjlPP3aneuS3cw7xflr5P4ujJOOMZI+ZEnbc YslbF1LbGfHxTyCWEdBehiDexue+gF05KrydOKBINcamIEos7yU7t9Vo9dTLBXT8CcER0t artnJR1+eAc97OyBg66gexQ7W/KeXWQygjQj/PgqRaSZ/ZzkSzKpSgwPvrsUkE2mGsN9jq OOOvinZ4kDntosjAXg2P3pr1NvgJj5o7T+XVBk3xSm1c2nlcQQgHqblV9WcA9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782677916; a=rsa-sha256; cv=none; b=oss4VYsAjOCjh06KAhaqLK400wTWhz9pTRIqqhFEKk30bLSwvmviN2ZkbCzqzyW5qy2Vdh FMTPo+RnxFjuH9vmh2SLZlSAb+QbIHfSknugz47FsDU92wyupWs9Ar+KqjuOaZNhAaFmIe KnTutJCn6ZwvFBNg1b+n8n7yKPc+/S/lxuqyylTFqUd81EEa7LcK6zHYoJjxjzDPpRlIph LynQyopsAaNaXM1ipTjEJKn1NsLuD3NkA1dy9piCfBxlY0awb+yI05DRpqo9qb96aNXS9D DoRuau+F2UcnZDXwhLtKXLE43tVC7H/+p2TyPg+smErTKH+JSl9bW7g9P74cSw== 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=1782677916; 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=jKcpRks/o6n6XaTo4kS3dWz/yayCUy7Hir+FZs00ayM=; b=xl2JdmtdLQvmQSiC6jMCjI/tOFFDWuYI/CUpLPwmK4tJSOCufkC8vR+UfCtHC9u7GO+Mcj bj1umdHurcd/Gqz2wQco38zx8Bdstqxsoz5PGBG0anZZVZ5aSibHns/Y5z8AweMvdXcFi+ ysd8cD0ULWi7aT/GUEL4afA7Dz0eE+7IBfYnwWdQgH3j9qGv8oVyEeKHx87JLsQqFtxS9n U4tdvVkSYEtWXEx/Y+XCPBIRwTw3QLJqtk6857icjRP3pQQlBH9koFoR+adEBDvlgqlO7Q LjG9ZZVQnZpAoZvZeWtVHIUTQpxNlsuq1BpqeyDeDnfCyTwCLeMg7kf+z9rz6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpLMc4tDPz9kc for ; Sun, 28 Jun 2026 20:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23eff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 20:18:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andre Albsmeier From: Michael Osipov Subject: git: 624e0bf29d72 - stable/15 - periodic/security: Introduce $security_status_loginfail_ignore for 800.loginfail 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: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 624e0bf29d72c008c6cdd641d6e47a44599660b1 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 20:18:31 +0000 Message-Id: <6a418197.23eff.128f66e8@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=624e0bf29d72c008c6cdd641d6e47a44599660b1 commit 624e0bf29d72c008c6cdd641d6e47a44599660b1 Author: Andre Albsmeier AuthorDate: 2026-06-19 13:50:00 +0000 Commit: Michael Osipov CommitDate: 2026-06-28 20:17:47 +0000 periodic/security: Introduce $security_status_loginfail_ignore for 800.loginfail Introduce a new variable "security_status_loginfail_ignore" to filter unwanted login failure messages from the daily security checks. Co-authored-by: Michael Osipov Co-authored-by: Joseph Mingrone PR: 295191 Reviewed by: jrm MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D57671 (cherry picked from commit 6a7c8c92245562cfd9b900dedacab99a13d5ca86) --- share/man/man5/periodic.conf.5 | 6 +++++- usr.sbin/periodic/etc/security/800.loginfail | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index 8910895d9b89..568493154558 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 9, 2024 +.Dd June 19, 2026 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -1036,6 +1036,10 @@ Set to either .Dq Li monthly or .Dq Li NO . +.It Va security_status_loginfail_ignore +.Pq Vt str +Set to an extended regular expression to filter out unwanted messages. +By default, no messages are filtered. .It Va security_status_tcpwrap_enable .Pq Vt bool Set to diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 91564185b653..562201439794 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -65,6 +65,7 @@ then echo "" echo "${host} login failures:" n=$(catmsgs | egrep -ia "${prefix}.*\b(fail(ures?|ed)?|invalid|bad|illegal|auth.*error)\b" | + grep -Eva "${security_status_loginfail_ignore-^\$}" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0 fi From nobody Sun Jun 28 20:22:10 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 4gpLRk4dW6z6jt27 for ; Sun, 28 Jun 2026 20:22:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpLRk32Y0z40c2 for ; Sun, 28 Jun 2026 20:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782678130; 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=nfRPz3X6hDjx8CSqmxDV0H1pWwwMrAZqeZSgm5o+Wqo=; b=GK3tnjfqJhFsVOPlPbhjlNjrBuS8hPsCPWbvp6Yb8qw1aB2+uK0+jNABm/fM6QQUvvOM59 7Aeg93khJNPAo2iYeRZB9VMoly1Q4MgPNHyEHC5cMZNdoL7tyJBY+0lwf7iaDHv8vQiS1P bidD24Td9DqCSOQx72ka4Sb4OxPzpJOx0x4jrQWcMjgTuqWEEs9HXjZBQTs+Z5uCeprx0J KctAfi0Aynpa5TSFufgwYzVDsgnK/+Esm2SpCwnj4DDYUbk33vKBEGSLOgf3kiS+egSNVR YqcNfVzS0C7K1rneIWJltamCQnUUzf5SxGSrdrPDV63X9i/3jd+reUw2NF4rVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782678130; a=rsa-sha256; cv=none; b=hKZlICU4UTAtMlCs5ZY8xrKRaR3mP7di0Vq1S72XYDRHvB4Mg1iIzz05Th2o2sPGnqCGEN IAd8o1sR2/BZinFr6LcsmcemrVTpAzZBA+kzRy4YJsh8XTmI+rITSzF0NsJlZsJPRmSR+i lNicF/uTHf1RBxB6pMifzRDARUkGEkyj0Lh/ShcJTMbXyJyVugQcVtZokPBzlSMxlg3OBR HseH0msMYAcWFysLQoFuqn43Y0KEZq9bjo+s8EJqXZQ8Tf5WIqfQxe1GcOfCxmE/PI8KR3 F/+27hKrAzw6rATaZK8ZdJE+36tWxpscIHsfCbSLB4SSdefQTFZwuK+Cnl8NCQ== 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=1782678130; 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=nfRPz3X6hDjx8CSqmxDV0H1pWwwMrAZqeZSgm5o+Wqo=; b=OlQqMqqe1fit4rfpBQCIEZXtxenNeZdGGINlc4j+OkXxBlwTVP6/vAcAaAaOkLk+4gX71H WIWvlG0aGyGSD+ICfshWiGR+pGuv2H6eQxJ/BKBTtaWHbHyu4RoejdWF7qRzl0XU0FbhhQ IkMhLd2SN0HFoyLzZ0be5x9nXxKypPharqfsEVt7Cg4p0FRc6rvAPR2MNIGiuSXy+wieNG ocmMzGFOWUjoir/6+LUZBuTttAyJ9WvypsCzEZMQiVr3mgJ3Mx3IakUVpyLZ2wzup3jxGH mQiLniUptXL80SJihLJdZQ1KCjo02LNLgh15yJMLQPUbe5emwiJBnkunYQXXUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpLRk23Wcz99r for ; Sun, 28 Jun 2026 20:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25e33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 20:22:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andre Albsmeier From: Michael Osipov Subject: git: 1807800b7986 - stable/14 - periodic/security: Introduce $security_status_loginfail_ignore for 800.loginfail 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: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1807800b7986ad9ba9d517d06d9d77f1797fbbab Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 20:22:10 +0000 Message-Id: <6a418272.25e33.1b8c7025@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=1807800b7986ad9ba9d517d06d9d77f1797fbbab commit 1807800b7986ad9ba9d517d06d9d77f1797fbbab Author: Andre Albsmeier AuthorDate: 2026-06-19 13:50:00 +0000 Commit: Michael Osipov CommitDate: 2026-06-28 20:21:28 +0000 periodic/security: Introduce $security_status_loginfail_ignore for 800.loginfail Introduce a new variable "security_status_loginfail_ignore" to filter unwanted login failure messages from the daily security checks. Co-authored-by: Michael Osipov Co-authored-by: Joseph Mingrone PR: 295191 Reviewed by: jrm MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D57671 (cherry picked from commit 6a7c8c92245562cfd9b900dedacab99a13d5ca86) --- share/man/man5/periodic.conf.5 | 6 +++++- usr.sbin/periodic/etc/security/800.loginfail | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index a2ed2b09d772..77942368cb54 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 9, 2024 +.Dd June 19, 2026 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -1036,6 +1036,10 @@ Set to either .Dq Li monthly or .Dq Li NO . +.It Va security_status_loginfail_ignore +.Pq Vt str +Set to an extended regular expression to filter out unwanted messages. +By default, no messages are filtered. .It Va security_status_tcpwrap_enable .Pq Vt bool Set to diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 91564185b653..562201439794 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -65,6 +65,7 @@ then echo "" echo "${host} login failures:" n=$(catmsgs | egrep -ia "${prefix}.*\b(fail(ures?|ed)?|invalid|bad|illegal|auth.*error)\b" | + grep -Eva "${security_status_loginfail_ignore-^\$}" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0 fi From nobody Sun Jun 28 23:51:28 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 4gpR5D5Hd7z6jRvJ for ; Sun, 28 Jun 2026 23:51: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpR5D2qygz3Sh4 for ; Sun, 28 Jun 2026 23:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782690688; 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=N3Tg05frAAWfG2XODYwwkNpDihXrdS5ki+BDeYoZzKs=; b=ZH007f1EF7yUJDpisKvoMVOxa44PYPcGu6y4HMnEZF2WOa20Ahd2eK23N4zAHGVApRYLbq n63mkKCaW3OyM+Xg5IM5KRc8bixjhie9nfEb3rPwmWZHJxOTVHMML31b7U1YcGMyuxUsoc CrkJgd8d3m8yBu40KMUFlMMY3HY/CSQbX2vqzjENBv81V0wteOSu4J/b4cv0kQxmn6SWnD oX8DeSyG5vNfrjv7efSW88Y0KOJAdjc2tT+BAxdRGOorhlPVQojlPupzlBpDCYhAZWRxgk wTRi0VkY/TVNRFZmj1ExEh2bKT3GUHmJT3zsk4WN8XNKCgp/Ez0A7+x39xOW3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782690688; a=rsa-sha256; cv=none; b=esrGtbd9yAl5991Be/Q2PNMX/F45c2+27pJomfrZ8G44sUVqvdvlGZKWRJdi03YSZY1un+ fO07X50Y06fbgVZavniZMt7E/T8S/m6S9DYPjgpXojcfS7o198cfEY1D6HLNf7tHRmFUq/ 1cDI3pSwRGtH3SglnPCFPX51XVvdMCcwizXRTgI1C60QyM4C5Hl85vrdsJBU8gT+px/dPH cX+GEnXIeztXmhHdYjUKQxyEBY3Fwpgs9B/f1sen0NtQnEGWgmXzglrjrzBA1BYvT+b3fq EeXhsOrrR350NSexp98q+wNhXGaY3YIYbL1lUpMMNIWTTDMGoA7wSgpGdV7Hfg== 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=1782690688; 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=N3Tg05frAAWfG2XODYwwkNpDihXrdS5ki+BDeYoZzKs=; b=dawJ3/HuA/vf6K27htV8hyf1tIF1Drf2+D2TgfdSXVeSdXrt9C10E8+XaygEV5SA+HNK/Z LBU6DN+xb2FG8Hgy6nnTYAQfgvP1e8pBrUOG65GMHsIktKzTTtSjkjQkxKnAvaF8BaFvnD FYiadyo/8jfI3FQ5KXENGejU7eUW2LpQoOryy0TgRd+6qTE2PIU3GpzoJTWaUvb9QoZAST mpF9T3TbNv3S2eIMJ6/Z9VOxTqfxCCOiIOj+GApaRmzU9gyz1fsxTtUifsEfigCHp5GBN/ SGFsTeAu2SFDed8ANsR7dZ6RHy1u+pMKqWmQgUfPl9vYYB+qtCT5zY/AGQBbgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpR5D1FN2zYwT for ; Sun, 28 Jun 2026 23:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4387e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 23:51:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 59667b7653a3 - stable/14 - amd64: do not restore fsbase/gsbase for 32bit processes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 59667b7653a36da41a647d279461f8721cd66e6e Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 23:51:28 +0000 Message-Id: <6a41b380.4387e.47a7477d@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=59667b7653a36da41a647d279461f8721cd66e6e commit 59667b7653a36da41a647d279461f8721cd66e6e Author: Konstantin Belousov AuthorDate: 2026-06-16 21:44:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 23:48:26 +0000 amd64: do not restore fsbase/gsbase for 32bit processes (cherry picked from commit c7e5802ab6e6230a5782a09c914585d055eb5223) --- sys/amd64/amd64/exception.S | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 797b2fe748f3..3617bc4c9192 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -1161,12 +1161,15 @@ do_segs: .globl ld_fs ld_fs: movw %ax,%fs + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz after_ld_fsbase movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx .globl ld_fsbase ld_fsbase: wrmsr +after_ld_fsbase: /* Restore %gs and gsbase */ movw TF_GS(%rsp),%si pushfq @@ -1179,6 +1182,8 @@ ld_fsbase: .globl ld_gs ld_gs: movw %si,%gs + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz ld_gsbase_32 /* Restore kernel %gs base */ movl %r12d,%eax movl %r13d,%edx @@ -1194,6 +1199,8 @@ ld_gs: .globl ld_gsbase ld_gsbase: wrmsr /* May trap if non-canonical, but only for TLS. */ + +after_ld_gsbase: .globl ld_es ld_es: movw TF_ES(%rsp),%es @@ -1241,6 +1248,30 @@ ld_regs: doreti_iret: iretq + /* + * 32bit gsbase path. + * The KGSBASE is not loaded from the pcb_gsbase, instead we move + * the GSBASE value into KGSBASE right after loading user %gs, then + * restore kernel gsbase. + */ +ld_gsbase_32: + /* Read the user gsbase into %r14d:%r15d. */ + movl $MSR_GSBASE,%ecx + rdmsr + movl %eax,%r14d + movl %edx,%r15d + /* Restore kernel %gs base */ + movl %r12d,%eax + movl %r13d,%edx + wrmsr + popfq + /* Load the user gsbase into KGSBASE. */ + movl $MSR_KGSBASE,%ecx + movl %r14d,%eax + movl %r15d,%edx + wrmsr + jmp after_ld_gsbase + set_segs: movw $KUDSEL,%ax movw %ax,TF_DS(%rsp) From nobody Sun Jun 28 23:59:12 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 4gpRG85c41z6jSHC for ; Sun, 28 Jun 2026 23:59:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpRG83RCqz3Th1 for ; Sun, 28 Jun 2026 23:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782691152; 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=7HlFSCM1S1kvBEI6PUcv0HP6wPBZLhANjGfeEfdRlpw=; b=qjINP8xXmyA0Vg3BMUMU0wzY7azRFElJd9j9nU+mjmVy5UcsR9Z7nfbHxc1nZD2hqnZlIB ECnoZwj/TamBCkY1LWRM8uitDtXQacF5yempCO00AIqvs9v2TIBkk2TPkHThy0pyXp7iLM ZNUG/Uh2N7/Orf/Jr+IKsBqT5n6k+BGMk21igqO31P7+QhdJCQ9TqfBlZc+eL6k0cyVBWQ HalFi4fBRxyqjIgXOYVLwBEOLygjixVUxG5lxRN7dbUlwIT7+BUeLgyibVga7NwS+eie9p i3v4pdLqXYhE1odRaf97aidA4J//S53+4SDF6GYDbO26PvAdm7M8cCmZ3GHEmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782691152; a=rsa-sha256; cv=none; b=mUYJvr9bB6isI4qnQnR5srxHj8dZh+vplAEV9GpsDJ8/ZahV+C73kEpO85uF6bsYGwPvCQ BoJ3st8Sk0ZNvGlldYI7IZ77ym8gCrxSKcauM/T2IA40mdsjxGfV2YnOiQ/e2TBa5jiOYf B7O3/F/aOkdcimeeBYJFCBwIOnx2gErb0TQf/QmfqmYWUIwW791caLwtbjG7wiFej6M59H vw0dJcndiuJp+MiteNRWHgkSBOOiA6d6iVPEmYu5lQaFlFU0EhxoEPHIXZ1qzUKjpIKVMn D+Y+66fp17tRgW5cgkALpA/eZr9DTcWusVZw+6Kmt8CP3TKGBjIjaiA2nUSaPA== 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=1782691152; 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=7HlFSCM1S1kvBEI6PUcv0HP6wPBZLhANjGfeEfdRlpw=; b=yH94XHIEUi538EJaTH1v511ZFduUZSKIPs7xdGVVhk9jPp6q4C+HS4GGo1jaKohSV+D4Pk 7ckV4+bGNEwMpBjX4H7+BuWq7p2M6FsAhgMC3Hl7AX4TnJvKf2HPNgUFQCmDScs7yYYQQ8 avt9PjBitWp/qdQ87G01AoIr09Hu7MVTs6q7NzS+OvNMrayvpjWxC1GWDYB67UERsXk4UM geWaHL3KqSGy99KdAMY3dN1ByNAOL04As5YcDrHqMKEuE8m51PSi0+x5rmIjWcmvzVueVy LxSO39+AeJYBg3jkMq8eKvt/N2zBqvnr5G3znbAEoAotxf/KXtWbYBhjIo7nQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpRG81WM4zYtk for ; Sun, 28 Jun 2026 23:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43b47 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 23:59:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 30fff269ad1c - stable/15 - linuxkpi ioctl handler: restore the user data pointer 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 30fff269ad1c046d38469ad66f211334d2034982 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 23:59:12 +0000 Message-Id: <6a41b550.43b47.52ab1bb4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=30fff269ad1c046d38469ad66f211334d2034982 commit 30fff269ad1c046d38469ad66f211334d2034982 Author: Konstantin Belousov AuthorDate: 2026-06-16 22:12:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 21:43:27 +0000 linuxkpi ioctl handler: restore the user data pointer (cherry picked from commit 91413e8e6311b4d4891dc2299d144feb31e04628) --- sys/compat/linuxkpi/common/src/linux_compat.c | 48 ++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 2fd502990eb3..e93963428195 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -926,19 +927,39 @@ linux_file_ioctl_sub(struct file *fp, struct linux_file *filp, struct task_struct *task = current; unsigned size; int error; + bool direct; size = IOCPARM_LEN(cmd); /* refer to logic in sys_ioctl() */ + direct = false; if (size > 0) { /* * Setup hint for linux_copyin() and linux_copyout(). * - * Background: Linux code expects a user-space address - * while FreeBSD supplies a kernel-space address. + * Background: Linux kernel code expects to operate on + * userspace addresses, but FreeBSD's kern_ioctl() + * will generally provide a kernel address. For the + * native process ABI, where we know how to find the + * original address, we reach directly into the system + * call args to get it. Then, if the Linux driver + * copied out to that address, we copy the whole block + * back into the kernel buffer allocated by + * kern_ioctl() so that kern_ioctl() itself doesn't + * clobber the driver's data. + * + * Otherwise, fall back to the LINUX_IOCTL_MIN_PTR + * hack. */ task->bsd_ioctl_data = data; task->bsd_ioctl_len = size; - data = (void *)LINUX_IOCTL_MIN_PTR; + if ((td->td_pflags & TDP_KTHREAD) == 0 && + SV_PROC_ABI(td->td_proc) == SV_ABI_FREEBSD && + td->td_sa.code == SYS_ioctl) { + direct = true; + data = (void *)(uintptr_t)td->td_sa.args[2]; + } else { + data = (void *)LINUX_IOCTL_MIN_PTR; + } } else { /* fetch user-space pointer */ data = *(void **)data; @@ -968,11 +989,30 @@ linux_file_ioctl_sub(struct file *fp, struct linux_file *filp, error = ENOTTY; } } + if (error == 0 && size > 0 && (cmd & IOC_OUT) != 0 && direct) { + void *xdata; + int error1; + + /* + * Ensure that the copyout in sys_generic.c copies + * over the data which is possibly modified by the + * driver. A possible error from the copyin() is + * ignored since it is formally possible for the memory + * to become unaccessible in the meantime. Do the copying + * through the intermediate buffer instead of copying + * directly to bsd_ioctl_data, to ensure atomicity of + * the change with respect to the error. + */ + xdata = malloc(size, M_TEMP, M_WAITOK); + error1 = copyin(data, xdata, size); + if (error1 == 0) + memcpy(task->bsd_ioctl_data, xdata, size); + free(xdata, M_TEMP); + } if (size > 0) { task->bsd_ioctl_data = NULL; task->bsd_ioctl_len = 0; } - if (error == EWOULDBLOCK) { /* update kqfilter status, if any */ linux_file_kqfilter_poll(filp, From nobody Sun Jun 28 23:59:13 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 4gpRG94MRsz6jSHF for ; Sun, 28 Jun 2026 23:59:13 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpRG93hzxz3TMw for ; Sun, 28 Jun 2026 23:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782691153; 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=DHF0c/z75jzldQ8amdxA2fFYJ3xay0NFf2MToP15A6E=; b=w9PSRZwjAtl2yJjFQ696RYIsbR8ZAY2ubrXfCoPJPsclP1M+lAirP4O925yWXUvAgzDYsn ho0mE0dHByNKIG+kg8qScLALai9fPD2Lk/ogUH4qiUyh6TvKbUR+kpuu4C3DGuV0xCiTEc pe3ZVTIDhHUTCBaUQwrBphKg5gs8tzTlJQ9q8A4olRQoeJ+LjQQvfi1PpGwQ3BrJVUBHuC kDM5tB0mSdl/K1HfGrleFv4erfjYqmaqsqskp74O6XAELFivDeLTtmlGPuGNEhOHcDs2hG IxOfYhsmKsqaLZEgSIIUm+IYDVnKPPrh0zZDoYH78/S57hWquVVAhOTYPbkCZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782691153; a=rsa-sha256; cv=none; b=BlaCuy+iHo3mJdmZuT6lF7z18iwDc6x0F0fHlFnTVLqO8C0GL+lD0HZIiJqUSkjErHUcYU 33BcbmnCNzY/68rstPA/+u671/07TaM7Q5y3LXFl+P2zx/FcbE5jvY63gDwC1Ry3xODBca DMWbvitvUFx7W/gNkl5Vjz9xGByzLmjdf/qK8RPnzfNRDycX+IkexDLT7opt5UH/RZSUyd 8LcwRH2p23z8ers5ik1ku/Bu/CKdUsdJCd2lETQbnjJxkQBV/70x0UXxk862lqsA1Xu23s qDoWRdctwB7XTF8UyR6K5RzVmetRA2Ii6qNZwLtTTdspT6jK0jcf8qjlHJCXzg== 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=1782691153; 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=DHF0c/z75jzldQ8amdxA2fFYJ3xay0NFf2MToP15A6E=; b=cxgNLGiRGJkZLvPT/VMM2MfSMQPrE/Swb7lwwN68m3QLpV68C+cdlESHDvGGLMumrf4Ht5 6s8A1Zw/kj9zVxezUIgHc63iZtXhFdyYGmMLTSGc+IDj5Fmcc94aWkJxF2U6AOhfAKRNiL r4/yhihittryO88sPb8uJ2Rh2AzGmFxPlB9gI8JJv0aJ8etvl8bKB12WGgLNqJLHj4/nem IYC6Q+EJkT8CIzL5a3zFCcuBClXFUexl1DSTcIfAUW0GyDjIBCVttbSrNykSoF750w1kuA hrF/zZ4MxY+25aDHmyGfh7Wdq6Z5Ew4w4UxVOgMWBkTEiJoMCSc+4mTak6Bdgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpRG91y7dzZKd for ; Sun, 28 Jun 2026 23:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44699 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 23:59:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d3d1095b0db1 - stable/15 - vfs: rename vop_mmapped() to vop_update_atime() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d3d1095b0db12fd17805b081aa1f93868dd4a67a Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 23:59:13 +0000 Message-Id: <6a41b551.44699.3ba5e8cb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d3d1095b0db12fd17805b081aa1f93868dd4a67a commit d3d1095b0db12fd17805b081aa1f93868dd4a67a Author: Konstantin Belousov AuthorDate: 2026-06-19 19:52:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 21:43:28 +0000 vfs: rename vop_mmapped() to vop_update_atime() (cherry picked from commit 8177936ac293210251390e44d109ece0f3868df9) --- sys/kern/kern_exec.c | 2 +- sys/kern/vnode_if.src | 3 ++- sys/ufs/ffs/ffs_inode.c | 2 +- sys/ufs/ffs/ffs_softdep.c | 2 +- sys/ufs/ufs/ufs_extern.h | 2 +- sys/ufs/ufs/ufs_vnops.c | 42 ++++++++++++++++++++++++++++-------------- sys/vm/vm_mmap.c | 2 +- 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index b60d0c1e8b88..89141c979d07 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1035,7 +1035,7 @@ interpret: /* Set values passed into the program in registers. */ (*p->p_sysent->sv_setregs)(td, imgp, stack_base); - VOP_MMAPPED(imgp->vp); + VOP_UPDATE_ATIME(imgp->vp, NULL); SDT_PROBE1(proc, , , exec__success, args->fname); diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 78ba1aa7afda..d20ff39b314e 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -214,8 +214,9 @@ vop_setattr { %% mmapped vp L L L -vop_mmapped { +vop_update_atime { IN struct vnode *vp; + IN struct timespec *ts; }; diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index f47cfd08f75a..3b2e7846b085 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -100,7 +100,7 @@ ffs_update(struct vnode *vp, int waitfor) int flags, error; ASSERT_VOP_ELOCKED(vp, "ffs_update"); - ufs_itimes(vp); + ufs_itimes(vp, NULL); ip = VTOI(vp); if ((ip->i_flag & IN_MODIFIED) == 0 && waitfor == 0) return (0); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index b5212ce5875f..dd879b97e58c 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -6896,7 +6896,7 @@ softdep_journal_freeblocks( * from reaching the disk while we are eliminating those that * have been truncated. This is a partially inlined ffs_update(). */ - ufs_itimes(vp); + ufs_itimes(vp, NULL); ip->i_flag &= ~(IN_LAZYACCESS | IN_LAZYMOD | IN_MODIFIED); dbn = fsbtodb(fs, ino_to_fsba(fs, ip->i_number)); error = ffs_breadz(ump, ump->um_devvp, dbn, dbn, (int)fs->fs_bsize, diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index 111fb1cb40b3..7b9215654e03 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -73,7 +73,7 @@ int ufs_lookup_ino(struct vnode *, struct vnode **, struct componentname *, int ufs_getlbns(struct vnode *, ufs2_daddr_t, struct indir *, int *); int ufs_inactive(struct vop_inactive_args *); int ufs_init(struct vfsconf *); -void ufs_itimes(struct vnode *vp); +void ufs_itimes(struct vnode *vp, struct timespec *tsa); int ufs_lookup(struct vop_cachedlookup_args *); int ufs_need_inactive(struct vop_need_inactive_args *); int ufs_readdir(struct vop_readdir_args *); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 4abbd4ee807f..1d04e1b2785f 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -111,7 +111,7 @@ static vop_ioctl_t ufs_ioctl; static vop_link_t ufs_link; static int ufs_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *, const char *); -static vop_mmapped_t ufs_mmapped; +static vop_update_atime_t ufs_update_atime; static vop_mkdir_t ufs_mkdir; static vop_mknod_t ufs_mknod; static vop_open_t ufs_open; @@ -143,7 +143,7 @@ static struct odirtemplate omastertemplate = { }; static void -ufs_itimes_locked(struct vnode *vp) +ufs_itimes_locked(struct vnode *vp, struct timespec *tsa) { struct inode *ip; struct timespec ts; @@ -166,8 +166,13 @@ ufs_itimes_locked(struct vnode *vp) UFS_INODE_SET_FLAG(ip, IN_LAZYACCESS); vfs_timestamp(&ts); if ((ip->i_flag & IN_ACCESS) != 0) { - DIP_SET(ip, i_atime, ts.tv_sec); - DIP_SET(ip, i_atimensec, ts.tv_nsec); + if (tsa != NULL) { + DIP_SET(ip, i_atime, tsa->tv_sec); + DIP_SET(ip, i_atimensec, tsa->tv_nsec); + } else { + DIP_SET(ip, i_atime, ts.tv_sec); + DIP_SET(ip, i_atimensec, ts.tv_nsec); + } } if ((ip->i_flag & IN_UPDATE) != 0) { DIP_SET(ip, i_mtime, ts.tv_sec); @@ -184,7 +189,7 @@ out: } void -ufs_itimes(struct vnode *vp) +ufs_itimes(struct vnode *vp, struct timespec *tsa) { struct inode *ip; @@ -193,7 +198,7 @@ ufs_itimes(struct vnode *vp) return; VI_LOCK(vp); - ufs_itimes_locked(vp); + ufs_itimes_locked(vp, tsa); VI_UNLOCK(vp); } @@ -356,7 +361,7 @@ ufs_close( { struct vnode *vp = ap->a_vp; - ufs_itimes(vp); + ufs_itimes(vp, NULL); return (0); } @@ -523,7 +528,7 @@ ufs_stat(struct vop_stat_args *ap) return (error); VI_LOCK(vp); - ufs_itimes_locked(vp); + ufs_itimes_locked(vp, NULL); if (I_IS_UFS1(ip)) { sb->st_atim.tv_sec = ip->i_din1->di_atime; sb->st_atim.tv_nsec = ip->i_din1->di_atimensec; @@ -584,7 +589,7 @@ ufs_getattr( struct vattr *vap = ap->a_vap; VI_LOCK(vp); - ufs_itimes_locked(vp); + ufs_itimes_locked(vp, NULL); if (I_IS_UFS1(ip)) { vap->va_atime.tv_sec = ip->i_din1->di_atime; vap->va_atime.tv_nsec = ip->i_din1->di_atimensec; @@ -829,9 +834,10 @@ out: #endif /* UFS_ACL */ static int -ufs_mmapped( - struct vop_mmapped_args /* { +ufs_update_atime( + struct vop_update_atime_args /* { struct vnode *a_vp; + struct timespec *a_ts; } */ *ap) { struct vnode *vp; @@ -842,8 +848,16 @@ ufs_mmapped( ip = VTOI(vp); mp = vp->v_mount; - if ((mp->mnt_flag & (MNT_NOATIME | MNT_RDONLY)) == 0) - UFS_INODE_SET_FLAG_SHARED(ip, IN_ACCESS); + if ((mp->mnt_flag & (MNT_NOATIME | MNT_RDONLY)) == 0) { + VI_LOCK(vp); + if ((ip->i_flag & IN_ACCESS) == 0) { + ip->i_flag |= IN_ACCESS; + vlazy(vp); + } + if (ap->a_ts != NULL) + ufs_itimes_locked(vp, ap->a_ts); + VI_UNLOCK(vp); + } /* * XXXKIB No UFS_UPDATE(ap->a_vp, 0) there. */ @@ -3006,7 +3020,7 @@ struct vop_vector ufs_vnodeops = { .vop_ioctl = ufs_ioctl, .vop_link = ufs_link, .vop_lookup = vfs_cache_lookup, - .vop_mmapped = ufs_mmapped, + .vop_update_atime = ufs_update_atime, .vop_mkdir = ufs_mkdir, .vop_mknod = ufs_mknod, .vop_need_inactive = ufs_need_inactive, diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 8d71bce67d58..6ddfa02bda9e 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -1391,7 +1391,7 @@ vm_mmap_vnode(struct thread *td, vm_size_t objsize, *objp = obj; *flagsp = flags; - VOP_MMAPPED(vp); + VOP_UPDATE_ATIME(vp, NULL); done: if (error != 0 && *writecounted) { From nobody Sun Jun 28 23:59:14 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 4gpRGB5KBPz6jSmP for ; Sun, 28 Jun 2026 23:59:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpRGB47yyz3TdB for ; Sun, 28 Jun 2026 23:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782691154; 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=+GYQe29acKbdt7YMtqLQ8SpPIgY+BhzFLPq4MwR9/TI=; b=RHNcWgu7Bl6a+AN7vVxBTkiHfEMuU+igKQBmXtzwbzul/k3ncGscgNqOiyY7GTGpSheBJI h9ap9yKwZFzVNN9zM/s+3q6w/VItaSn9/AfOjjTxvom/nIuEu9VyYKaZpVrARYU67ODlzQ qQUwzRItI5aQA2Y1HVsBMCYDPTgFovj7SsvQTmT7OvcouF+hksk+TRRl02DRFHf0cD3bR7 Z2t1dqqTmKN3Hcem+XGUL9JjCBDQPDQh1ZutFOH3DEE3FlnCLjLgnVF41nGh0kvWX/BvGo 8cjLkjmu3uPfVkVnhXH3uAFfJSmqs68PkpdxkFf/I7w5YRXmoNpCTAO9lJkWLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782691154; a=rsa-sha256; cv=none; b=ukK3he4+/MyEBaY5V9aJB5XbbJAJJQBiesLYe+th2By7Sr9j6FGuKxtVpDqNxb2QjVFhkd AwLjM5BSHRzxAWfyzFVydccFnieVJFC/AM5BgOpbkBZy2FO9istuGIydCeFU5LxzXugLXl EaiI9huYrEymmpTKNZA/il2fmX7Qr4AJKfZG6ZtRDkCqHE1mC7g6ukFJ92qFTbCL+cdKCs zq+jHN/1ZurYQoqBnXkPf+C4X3ZbkvHdbENw/IFEIKF2tOgFwjWhOUN0OtE7KQoNB3lQLD dARjtgSaB5NSd0L5OjS1ECfNaqpPud54DnccHl/sZixL2m6eFxCgjRSkx9P9FQ== 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=1782691154; 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=+GYQe29acKbdt7YMtqLQ8SpPIgY+BhzFLPq4MwR9/TI=; b=rDTI3z0R/hJ/a00SPA4xIREYTIQMSTRomZ7XtG9+fnuviy7BD4lay8HsaYKu7N++kxlHoO odBBAJ8y3m6+sQJkF6NLiv3gsZTA7lLbOOBol/dCIrsEOoDWkTyCGw1PX1fctKx9LSO2lv E585Wnw4wIABFz1KtPIyLlZNhsA7XsPY8OSWCgOQPF40yoN3OQHv5Fsu/X+lfq7bkC/Mc7 V3gzO48IncZigSmcHGOUFwUEicCVD3HEaJiWfwc0f73IsR316DWsEWRkI0Dgxo6iS9RQ5k fKEzWZjf3cBUptXtR9UbIgSASG6WmzWsPLD9LZmu21qnmMYeA3U6qqsrE1fKqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpRGB2nFjzZ9d for ; Sun, 28 Jun 2026 23:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45521 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 23:59:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4d8f2d291299 - stable/15 - build.7: explain how to build KBI-compatible standalone module 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d8f2d2912997fc2403c723704888335d2efdb68 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 23:59:14 +0000 Message-Id: <6a41b552.45521.57d400b7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4d8f2d2912997fc2403c723704888335d2efdb68 commit 4d8f2d2912997fc2403c723704888335d2efdb68 Author: Konstantin Belousov AuthorDate: 2026-06-26 00:21:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 21:43:29 +0000 build.7: explain how to build KBI-compatible standalone module (cherry picked from commit d946a88e0ce347a9a6fdbfdae0b23ef192b9bddc) --- share/man/man7/build.7 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 4995400f70dc..07f28daa7041 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -1102,6 +1102,46 @@ Rebuild and reinstall a single loadable kernel module, in this case cd /usr/src/sys/modules/sound make all install clean cleandepend KMODDIR=/boot/kernel .Ed +.Pp +Important detail is that the kernel binary interface is affected +by its configuration. +Modules build outside of the regular kernel build procedure still +must be built against the target kernel configuration, which is +defined by the set of the +.Pa opt_*.h +headers generated by +.Xr config 8 . +Use the +.Va KERNBUILDDIR +variable to point the module build to the configured kernel. +There is no need to actually build the configured kernel in +that directory, module build only consumes the headers from it. +.Pp +Additionally, the +.Va SYSDIR +environment variable may be useful to point to specific kernel source +tree used to build the target kernel, since the kernel headers +define the binary interface for modules. +.Pp +Assuming that the +.Fx +sources are located in the +.Pa /home/user/src +directory, the used kernel config is named +.Vd MY_KERNEL +and that the module sources are in +.Pa my-module +directory, the following sequence of the commands would populate +.Pa /home/user/my-kernel-builddir +directory with the +.Pa opt_*.h +headers and then build the module compatible with +.Vd MY_KERNEL . +.Bd -literal -offset -indent +config -d /home/user/my-kernel-builddir -s /home/user/src/sys/amd64/conf MY-KERNEL +cd my-module +make all KERNBUILDDIR=/home/user/my-kernel-builddir SYSDIR +.Ed .Ss Example 5: Quickly rebuild a kernel in place Quickly rebuild and reinstall the kernel, only recompiling the files changed since last build; note that this will only work if the full