From nobody Mon Nov 3 05:31:43 2025 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 4d0Kvh0Zrxz6GM5h; Mon, 03 Nov 2025 05:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Kvg5P55z3SM1; Mon, 03 Nov 2025 05:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6e6cbm2ASIrgNqP+k/myTw2j6a4MQGLL0cOPfFzXs60=; b=IhOQU/DnLWTwZPzAEJ4IKYcTBUzeHv0DUaBAEZXVZ1N35MeoPmIjuL8kXXNY+g1539WajY 9oKOnCI+cCZk9R9ATrfAAFPkDsvs/Ky0fjIIFw1+fsB3QomyDDvfo34hxdBu0DSFigAxyD t9V5m2MQBOappZXx7zAfVijMFS+OlSIVPvuZtCnHdn0AgSPGfQzVf8U6GOS/f3HXY5aM3p fRHRAWKwnUAoN2SoVJVQcWZfgGhZv+e1FQMClqdb08vzUZliXjwVfCixFyJDbyrcEcXChQ OnoZJDyYRnuk68OaDEGa2fl0++joxIMeh90FiJgStJ0Cvj+eLgJ6fvmKQEwkVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6e6cbm2ASIrgNqP+k/myTw2j6a4MQGLL0cOPfFzXs60=; b=kbL/WWJJHQIJUj99TpCTMvO1MdTIBT6bZnntPV3Z3T4PW3Raxp6mXRjhGPKK1Kzp3XpAcv nA6mFBAyfk8stvwqYrCf/GnriSgnacZO3azu5qewT7NCHM6C3cdvqecuFhcR97JTnaOLJt WT2Rw/JSRoIK3dx/7Vb+EMDgEghlTsBOxo4G0uMhW/MwlyPutE5suI+FnOatptDOv0oE4a ujWaH/m2c4h/1/U18rhujCSQQluHo9HrgePHUTxJsbj4vSYpV78iDmWdtQhDF7AXL/GHjS OlodHALrOkX7xJvg3weESI49FTS9eqrtgKZHRQhjk7x/J6Azrg47LihWG4gq1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762147903; a=rsa-sha256; cv=none; b=sYk7Mo5xL3nq4JWRVxrD6fyXaPCRmS2Z8ZfnA+Ir50nNmgoIHPvkiITg3KRgB4IhwZRVBW 7LXKVzMKzsc16MIN6t2kOI9AIPtIIqX1jbKDyJZpLO+sn42F0CsQrhQqw3GLCmg7YwgDzt fH9xPf7ISf51Us6RCS2YAXeEb/kV2idvP7FKW/+5MVLAAoMCTaCAKweVw02P9R1YufYjMH ItHtIGGp9cJrSbLX9oB3nmjuF/44E46XHedwKLwc3hVYs95wMReQDx3JjoMa+KYqIEhSxD WN9FgN0/jlduAjXOYxJtPsf58dUgkacp9HsZ6EaZ7Lmpxq/8H6RU+Q6v+gl6bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Kvg4L7hzxvy; Mon, 03 Nov 2025 05:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A35Vh4G071089; Mon, 3 Nov 2025 05:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A35VhvI071086; Mon, 3 Nov 2025 05:31:43 GMT (envelope-from git) Date: Mon, 3 Nov 2025 05:31:43 GMT Message-Id: <202511030531.5A35VhvI071086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 8a873a86059f - stable/15 - unionfs: fix NULL deref on closing an fd passed through SCM_RIGHTS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8a873a86059f13c829315b7867e188d27e314b51 Auto-Submitted: auto-generated The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=8a873a86059f13c829315b7867e188d27e314b51 commit 8a873a86059f13c829315b7867e188d27e314b51 Author: Jason A. Harmening AuthorDate: 2025-10-13 20:40:46 +0000 Commit: Jason A. Harmening CommitDate: 2025-11-03 04:32:50 +0000 unionfs: fix NULL deref on closing an fd passed through SCM_RIGHTS If the last reference to an open file is contained in an SCM_RIGHTS message in a UNIX domain socket, and that message is discarded without being read out by the receiver, VOP_CLOSE will ultimately be called with ap->a_td == NULL. Change unionfs_close() to check for this condition instead of blindly passing the thread to unionfs_find_node_status() which will try to dereference it. Also add relevant asserts on the node status lookup paths. PR: 289700 Reported by: asomers Reviewed by: asomers, olce Differential Revision: https://reviews.freebsd.org/D53079 (cherry picked from commit 880d180bb21c764aec6bd5bc8c0a6b07b8c2e199) --- sys/fs/unionfs/union_subr.c | 2 ++ sys/fs/unionfs/union_vnops.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index edcc6716b674..f99d9fe9ca35 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -587,6 +587,7 @@ unionfs_find_node_status(struct unionfs_node *unp, struct thread *td) struct unionfs_node_status *unsp; pid_t pid; + MPASS(td != NULL); pid = td->td_proc->p_pid; ASSERT_VOP_ELOCKED(UNIONFSTOV(unp), __func__); @@ -612,6 +613,7 @@ unionfs_get_node_status(struct unionfs_node *unp, struct thread *td, struct unionfs_node_status *unsp; pid_t pid; + MPASS(td != NULL); pid = td->td_proc->p_pid; KASSERT(NULL != unspp, ("%s: NULL status", __func__)); diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 03130f0ca949..0a91d1d5ed02 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -814,7 +814,7 @@ unionfs_close(struct vop_close_args *ap) unp = VTOUNIONFS(vp); lvp = unp->un_lowervp; uvp = unp->un_uppervp; - unsp = unionfs_find_node_status(unp, td); + unsp = (td != NULL) ? unionfs_find_node_status(unp, td) : NULL; if (unsp == NULL || (unsp->uns_lower_opencnt <= 0 && unsp->uns_upper_opencnt <= 0)) { From nobody Mon Nov 3 05:31:44 2025 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 4d0Kvj0KsSz6GLw2; Mon, 03 Nov 2025 05:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Kvh6Bchz3S9T; Mon, 03 Nov 2025 05:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKpF0Pt7v4CpbWjdnH2RBDznf3FPswe8HCpgJM2fGxQ=; b=c97GaJNlEETRwYwLb7qZOi5d9cezI2fLqyIpgGQC847oJKnm0qeK/ARvEXTcvyL5W6ThIM v57zzWtA5AK8mA8EKs8UdU8GN1BKDO4c15EXYFPS8fj8DaZkSuiIR2PaoCLRlrrPiw6ee/ oBTDqG7YUMZSPiS5QK8lCNQdksqTEBen0TEVu/cvCMzLknVaKJVj4/OvLv3hv3Oqjqws/Z oHHJ8soK4z9J0Gau0vMjTHVl0c49hS4yoMMSEGWJnbGqenU76mIiHbK/D7hucXRkryhPks K/qpXPcMW8RvS8PRXK1vf9vMnvCYTy3/m86dcCfQWf6jBY/JPa4/fn7ozd2OVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKpF0Pt7v4CpbWjdnH2RBDznf3FPswe8HCpgJM2fGxQ=; b=eGR5RwnKIWRgokttLZE3T4lUrrlUgIwWFaOv/2NswCk9stIHInigZaSacag7qCkFrq10Lf GcId442ME3m4qxlbW3gN4xysI0r5m/PqdqNhuBAUCj+4k6/8NDYyLwerIUxaaWnPt+O96A nc00OPlC4IcL7GRSIbJo0dw2wbECG/45JA81dyVtJd7OpPvo3D2Vk2hrubxyOz7z4v98vh seYsinoe3OXHPT3VgWJFc2UK2ectfgWLfwsWAXuFu6/3SLe7Ge/v4RwrSiDPM/ECUQTVUL XLfKNhXV7PhvXFOcugw4+OH4gXZCDkKI0BLBLAiHqvzxbHDBgfIf1PYgZZ2Q9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762147904; a=rsa-sha256; cv=none; b=PS9wAJNTAMcESxkCwKjvJ14H/1eN+T1dsVSvne+xiMBOGIMKRcfvcH0e5UbVA5VV8CM6hM vwqfPckhQO2iVuVvWZaUNaOzbeLf5p/2X0SCjXU/rI6MutOaXfTNiViJ+5XIOKDuEUy8cO sKz7POQxC/6FuXxNxpkhLJSLrpCSsikD60pJFMdTPFURpQpgoBaZSvYUCTMiAakD1bLSAU 2F0e57lVrZrGQhv6+8BQ9IoQGId1V8o9mgnn7m3hcy2PYsu9OSXzCrPslbo0ksmgcpeysR 8AwsGJ8lHM7XERz3eOAFnXmPOihpl6/XkJ5P+1A9F7zWlBASIxocEk47zFmlkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Kvh50w6zyBk; Mon, 03 Nov 2025 05:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A35VibJ071125; Mon, 3 Nov 2025 05:31:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A35Ving071123; Mon, 3 Nov 2025 05:31:44 GMT (envelope-from git) Date: Mon, 3 Nov 2025 05:31:44 GMT Message-Id: <202511030531.5A35Ving071123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: e0e72e797347 - stable/15 - unionfs: avoid vdrop()ing a locked but doomed vnode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e0e72e797347f51888645a2e3c2e21c51f5a355c Auto-Submitted: auto-generated The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=e0e72e797347f51888645a2e3c2e21c51f5a355c commit e0e72e797347f51888645a2e3c2e21c51f5a355c Author: Jason A. Harmening AuthorDate: 2025-10-14 19:40:39 +0000 Commit: Jason A. Harmening CommitDate: 2025-11-03 04:33:32 +0000 unionfs: avoid vdrop()ing a locked but doomed vnode unionfs_lock() unconditionally calls vdrop() on the target vnode after locking it, but it's possible this vnode may be doomed. In that case, vdrop() may free the vnode, which in certain cases requires taking the vnode lock. Commit a7aac8c20497d added an assert to this effect, which unionfs_lock() now trips over. Fix this by lightly reworking the flow of unionfs_lock() so that the target vnode is vdrop()ed after being unlocked in the case where the unionfs lock operation needs to be restarted (which will happen if the unionfs vnode has been doomed, which is a prerequisite for the target vnode in the underlying filesystem to have been doomed). While here, get rid of a superfluous vhold/vdrop sequence in unionfs_unlock() that was probably inherited from nullfs and whose nullfs equivalent was recently removed. Reviewed by: kib, markj, olce Tested by: pho Differential Revision: https://reviews.freebsd.org/D53107 (cherry picked from commit a498c5e1a111ae8c48b8e7028daff861785c2bf2) --- sys/fs/unionfs/union_vnops.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 0a91d1d5ed02..410ab413b172 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -2208,7 +2208,6 @@ unionfs_lock_restart: vholdnz(tvp); VI_UNLOCK(vp); error = VOP_LOCK(tvp, flags); - vdrop(tvp); if (error == 0 && (lvp_locked || VTOUNIONFS(vp) == NULL)) { /* * After dropping the interlock above, there exists a window @@ -2234,6 +2233,7 @@ unionfs_lock_restart: unp = VTOUNIONFS(vp); if (unp == NULL || unp->un_uppervp != NULLVP) { VOP_UNLOCK(tvp); + vdrop(tvp); /* * If we previously held the lock, the upgrade may * have temporarily dropped the lock, in which case @@ -2249,6 +2249,7 @@ unionfs_lock_restart: goto unionfs_lock_restart; } } + vdrop(tvp); return (error); } @@ -2259,7 +2260,6 @@ unionfs_unlock(struct vop_unlock_args *ap) struct vnode *vp; struct vnode *tvp; struct unionfs_node *unp; - int error; KASSERT_UNIONFS_VNODE(ap->a_vp); @@ -2271,11 +2271,7 @@ unionfs_unlock(struct vop_unlock_args *ap) tvp = (unp->un_uppervp != NULL ? unp->un_uppervp : unp->un_lowervp); - vholdnz(tvp); - error = VOP_UNLOCK(tvp); - vdrop(tvp); - - return (error); + return (VOP_UNLOCK(tvp)); } static int From nobody Mon Nov 3 05:31:45 2025 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 4d0Kvk1sGSz6GM5l; Mon, 03 Nov 2025 05:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Kvk0RNxz3S9Z; Mon, 03 Nov 2025 05:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5RCrKQuZj7QzW1qWifbIxGAe19bR656pT8z/92acdek=; b=TpXH4ZwNioivQxxb73W+9CoDQhVc9BkWqNuSU4qWimKxkpw3IJF8EQAaoLRHHcX4FSTVWr s21XE53LD362KGydm9vSRh3etN7im/Qj5cfl9G01riwE+0mVk0PaHUNOyDU2JH/N0+lLo+ pm+qJm+YJFuoCxGKzdko73GpyDNn/zevzc+KiQzGEZfkukluNYcnKhlMaobV9RQR1S7i9o m2JIy4zxuWSxqy41IQnGCU7rM20AGEntReiW5Eg9hGfhwPfM876b+aSjX9947o+gMrZ/UR EHapD6klPpPlHk1b3tttpde9xP3GWTtQ9oZRYZNyuUNRSQ61zu1wObemNzF6RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5RCrKQuZj7QzW1qWifbIxGAe19bR656pT8z/92acdek=; b=iMDT5U/vvQ7/AmzEZ4vmvml5XMU55U56wdyThkiPG2+tNSIE8I7u+w8JiBmYewpv1cKp79 F8aiAWL9m1hpN61QJjK8Cl9ROUo6JusTOoPeqCDkQvU5hShjKhYgMwY0U0LU+sPUzpdQos zbbgV3BwrlDOQMLBvhk+qYw840w8VMmzLE7mKm+iD6uhdeoivTUpM6cOga1CVN0PtrT2je pqNbYNjNZLjcMWwjwrWjRhdeK2IJjw0n9+pPZoASh+4KB0xkUp05zsf3GZUunsRZTRSAAV BMErWOSlONQqRfD52h5fdveWoV0rnKJ5/CWlP2XgtgwjU6bKzpSHzfnl2HL1NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762147906; a=rsa-sha256; cv=none; b=xEjIX4MCiZEnodRxBIxknJSgjbNdptRjF3AJiPe4UdQjuR/mUifvCRLOW8DD4QGQ1bAB9Y pvNntrzy5irMQKizYviWmA1FYcu/6vF3ByuvNE0mhAI1NREhwfSpttzPKN1Jy9CoyYgFL8 0OT/ZhrldLJriwgCFw7B1bmk3+B2/nl7s1ErHypYmJ+aymS/0KVOt4zkkXocV7Eh4HIGBo sY2YlU7wEVaHsaWiSlxsN90h6OUi7M6fTeXkamRHiGSx8kVrlxftqnrORBY+wl7RzSnP95 CgyaNvHZy3Nhwo5F7hj+gMXlZ1FBIdjWKyEFm/0Ajup1z/QVK1Js27fih48AIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Kvj64kLzy9M; Mon, 03 Nov 2025 05:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A35Vj7b071164; Mon, 3 Nov 2025 05:31:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A35Vj6j071161; Mon, 3 Nov 2025 05:31:45 GMT (envelope-from git) Date: Mon, 3 Nov 2025 05:31:45 GMT Message-Id: <202511030531.5A35Vj6j071161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 3c1fad12ee6d - stable/15 - VOP_OPENCLOSE.9: note that td may be NULL for VOP_CLOSE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3c1fad12ee6dd0d4906ddb6c5695d93821b641f3 Auto-Submitted: auto-generated The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=3c1fad12ee6dd0d4906ddb6c5695d93821b641f3 commit 3c1fad12ee6dd0d4906ddb6c5695d93821b641f3 Author: Jason A. Harmening AuthorDate: 2025-10-16 15:25:51 +0000 Commit: Jason A. Harmening CommitDate: 2025-11-03 04:34:04 +0000 VOP_OPENCLOSE.9: note that td may be NULL for VOP_CLOSE Reviewed by: asomers, olce Differential Revision: https://reviews.freebsd.org/D53137 (cherry picked from commit 8a1d6d6da5cfe0b69c08f20e52817aa9920efe87) --- share/man/man9/VOP_OPENCLOSE.9 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/share/man/man9/VOP_OPENCLOSE.9 b/share/man/man9/VOP_OPENCLOSE.9 index 9a4f7069962d..672f9faa92f5 100644 --- a/share/man/man9/VOP_OPENCLOSE.9 +++ b/share/man/man9/VOP_OPENCLOSE.9 @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 2, 2009 +.Dd October 17, 2025 .Dt VOP_OPEN 9 .Os .Sh NAME @@ -78,6 +78,17 @@ The access mode is a set of flags, including .Dv FWRITE , .Dv O_NONBLOCK , .Dv O_APPEND . +.Pp +The thread +.Fa td +passed to +.Fn VOP_CLOSE +may be +.Ql NULL +if the last reference to the open file is released from a kernel context, e.g., +the destruction of a socket buffer containing the file reference in a +.Dv SCM_RIGHTS +message. .Sh LOCKS .Fn VOP_OPEN expects From nobody Mon Nov 3 05:31:46 2025 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 4d0Kvl3DpDz6GLfG; Mon, 03 Nov 2025 05:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Kvl0hjNz3SDD; Mon, 03 Nov 2025 05:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=krctFDPbJm3Yxb6e+1uGlL+NUUhdYFENlLuebdx3jbs=; b=P/avO0CXkGuTWKbzh9yyG3IIegGReqh7UZgulS5z2oS+7pDgHylxLSnsnft4GZMeaviE5x 9IunxJcJErhozOkTSeqLDR2JF5JRCp92LRJpxYZA6EfT3+NqnpbtqxMY1Pq6DmIj5oiT7O J2dlGC+yb36P8lbGwYXjuklUS7HzCGngsEZmab8hHgHXD3DCoaB0Qug1pmJdVKa8nLn0qg /HCl4oXxG8W0ecjosZgXGe7dSri4N4oaDU78imxuc/7F8a29khPyKYot5d7Xj66D5gYlFl VXr4eF/1GsYu+uLfJMTfteDqgfFg3knZyNTQzTSm+MM/RPdX8zlhc0u9lPEaGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=krctFDPbJm3Yxb6e+1uGlL+NUUhdYFENlLuebdx3jbs=; b=ROToUx8OR21xx5N0eb6A246RYOkS+DrxqzsFZAhgF5ngXQejkFwtfi2TzF1F7Z1ei4oArz fJxmZg1a8hA592iv/g5ZpkZZTui5F0rP+iyfDIWNSHcIpqx9IzYVU0Ri9yfbmhmJfRV8U5 SJ24miIZo0j8U6QeLTkT1EskW33hQeyEp2qYjZnGDn1th+OYflw2IcEXtSwY8+jueuIY8+ AhrWYkiqIsySZxebJKuc5Y4ksbL6bEcJqL3HSc2j1BMMf55dikBT/p0iwqnO8bF8hQEku4 HPWtTQa6BpaZcgNbilP+hBwQa/efX/SNKy8KLPK7hvogyZifevzquCYyzyNVbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762147907; a=rsa-sha256; cv=none; b=D17UCG7emSZqH5fT0M2WGM2pkL79mbp7AjDBQt6KbO2QGXSePrgXX56qvvKu9KWfzxeyVg b3nNKeUFbfKcI1mAP10DKd016kI7KyXrzJCa/f+Soc1nMIbFTmL7fVTT3wV3cwFy7M3Kbo wm5U65eCP12dcZ1XJpO4CJE7+lzn10gThLu9Pm2UaHHTIh4aFvefWJggaketja3M/CTePU zsXquPTS4LrQRPx5BEaQ4xfmSbd2CaPrflvkKRL3eEq3zG7Kcme/it+rVHmu66H7dW4x6l +8ydxHPnuM2D8u2pqd14TjRcMrUhJBSyXdu6FHDQw7tP1q4FdhPCcyCRZN8P5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Kvk72G5zy9P; Mon, 03 Nov 2025 05:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A35VkZk071205; Mon, 3 Nov 2025 05:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A35VkcQ071202; Mon, 3 Nov 2025 05:31:46 GMT (envelope-from git) Date: Mon, 3 Nov 2025 05:31:46 GMT Message-Id: <202511030531.5A35VkcQ071202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: b67bcababa9d - stable/15 - AMD IOMMU: fix per-device IOMMU bypass when IR is enabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b67bcababa9dbbe567548ef0fa300a151837d8fe Auto-Submitted: auto-generated The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=b67bcababa9dbbe567548ef0fa300a151837d8fe commit b67bcababa9dbbe567548ef0fa300a151837d8fe Author: Jason A. Harmening AuthorDate: 2025-10-20 01:53:08 +0000 Commit: Jason A. Harmening CommitDate: 2025-11-03 04:34:28 +0000 AMD IOMMU: fix per-device IOMMU bypass when IR is enabled When interrupt remapping (IR) is enabled, the device table entry (DTE) for a given device will likely be initialized by amdiommu_ir_find() during MSI configuration. This function directly calls amdiommu_get_ctx_for_dev() with id_mapped=false, which means that any attempt to disable DMA remapping for the device (e.g. by setting hw.busdma.pciD.B.S.F='bounce' in the loader tunables) will effectively be ignored as the paging mode field in the DTE will not be set to 0 as required for identity mapping. This will ultimately produce an unusable device, because busdma will later observe the bounce configuration through iommu_instantiate_ctx() and will employ the non-translated 'bounce' busdma methods for the device, while the DTE remains configured to enable translation. Fix this by tweaking iommu_instantiate_ctx() to always return the relevant per-device context object even if translation is disabled, and adopt it in amdiommu_ir_find() instead of directly calling amdiommu_get_ctx_for_dev(). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53209 (cherry picked from commit 35170408a7b86a879d7e2ffb5ddb70fe75951d89) --- sys/dev/iommu/busdma_iommu.c | 7 +++++-- sys/x86/iommu/amd_intrmap.c | 9 ++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index 668ccf056463..82f73d469585 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -295,7 +295,6 @@ iommu_instantiate_ctx(struct iommu_unit *unit, device_t dev, bool rmrr) } else { iommu_free_ctx_locked(unit, ctx); } - ctx = NULL; } return (ctx); } @@ -303,6 +302,7 @@ iommu_instantiate_ctx(struct iommu_unit *unit, device_t dev, bool rmrr) struct iommu_ctx * iommu_get_dev_ctx(device_t dev) { + struct iommu_ctx *ctx; struct iommu_unit *unit; unit = iommu_find(dev, bootverbose); @@ -313,7 +313,10 @@ iommu_get_dev_ctx(device_t dev) return (NULL); iommu_unit_pre_instantiate_ctx(unit); - return (iommu_instantiate_ctx(unit, dev, false)); + ctx = iommu_instantiate_ctx(unit, dev, false); + if (ctx != NULL && (ctx->flags & IOMMU_CTX_DISABLED) != 0) + ctx = NULL; + return (ctx); } bus_dma_tag_t diff --git a/sys/x86/iommu/amd_intrmap.c b/sys/x86/iommu/amd_intrmap.c index f8900fe0561f..cce4f57ca323 100644 --- a/sys/x86/iommu/amd_intrmap.c +++ b/sys/x86/iommu/amd_intrmap.c @@ -223,9 +223,9 @@ static struct amdiommu_ctx * amdiommu_ir_find(device_t src, uint16_t *ridp, bool *is_iommu) { devclass_t src_class; - device_t requester; struct amdiommu_unit *unit; struct amdiommu_ctx *ctx; + struct iommu_ctx *ioctx; uint32_t edte; uint16_t rid; uint8_t dte; @@ -255,10 +255,9 @@ amdiommu_ir_find(device_t src, uint16_t *ridp, bool *is_iommu) error = amdiommu_find_unit(src, &unit, &rid, &dte, &edte, bootverbose); if (error == 0) { - error = iommu_get_requester(src, &requester, &rid); - MPASS(error == 0); - ctx = amdiommu_get_ctx_for_dev(unit, src, - rid, 0, false /* XXXKIB */, false, dte, edte); + ioctx = iommu_instantiate_ctx(AMD2IOMMU(unit), src, false); + if (ioctx != NULL) + ctx = IOCTX2CTX(ioctx); } } if (ridp != NULL) From nobody Mon Nov 3 06:23:56 2025 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 4d0M3w2MPwz6DwtJ; Mon, 03 Nov 2025 06:23: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0M3w1Q6wz3Wpv; Mon, 03 Nov 2025 06:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762151036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGsKIml+TiHNFE3GGqCP9j4lGxNgiKV2+lIRNjRA/g0=; b=gf1MjcxGIcy2vgIsXMdSMBSk22LYF0L358cOwnx47Ct9CIuhXY9ChHCvjh1ZbRPR96Cyue rJrRNcgbJJEEme82l0H0SEsuxWufC0b2MPbJR9VO7TgVQt1Sh4XU4ssbmxZvQc4hapY3LT iGTiJn8SwFIzFlViKIbjz6p0bxNnS3BCa12DZvpsxIpKZvycsCYRYWb2fAyJvPkqYpQz+P kLQgIZvlc6Nlwg8402vchQdXHMn94DbdkwPr0XF/bNQLjlaXXFmP6DU24EXReTeC+BDqCd MMt1RdxE0AgkFjZyeUNXvnhk/uT/3WKBRdOqNKs+KyVchZ2NU/EIbe3MKW3MGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762151036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGsKIml+TiHNFE3GGqCP9j4lGxNgiKV2+lIRNjRA/g0=; b=SkYbIA1GLQfyG2ul2UC1Xtw1qkU94I3n9sdU5afu0ImX1hMKFhPrb6n8AqxbNx2pO/ae7F GZZrk1aeSSkptJ655UhqvEiHoPBNjMV5fnciGHEc5Z93Xruvcjgy4+MxzzycE41OWXxpPP 5Hin5j1WCmpeDBmm1T+D43pfreplNcPZN/ZqrTVl7d5x39oz5RSa68RhaNoAc1300pPoSQ VKBy8WBVg48jTxpE2XBwmdLC/bggC8yBQ00mR+mpcrujjiXpt02buWnddlzxT/pao/cn95 Mp/RlXF2VL/egD9zCe1sXWD/uZDDuDWdy7qI56uyT2Kt/PB+5xVx1f3Wq2E8JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762151036; a=rsa-sha256; cv=none; b=aUlePHZqVopIHWpTuQpIMqbX4+dJ+99OPbDbS1L5yHKH4SWiRdtM0gnNuU6BFqBJImPTil 4PTMjE4Q2Eg6iCxllFcqWX+bS6ffAMP8wJvQ0XFcL5BDm+ywdQGyi9yYtusFXhFwJ1L1CA EfRRd/YsUhv5nvzYXelYV83rptFzaXHL4zywiNV+LDDMBidiy0J/m/KKNmCxeU3LpKVXoa ZSvT35t2ft5v6OUIy1xmAdcLrYnfvLFuv0dd//gIQf4atKHv+hX41370opBnE1qy9EVsnb LcQJw4zVajMaAD48pUMpym8956yRjWza+bC88rylrM4QO2d7vfjLdQuaz098dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0M3w11Jpz10Qg; Mon, 03 Nov 2025 06:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A36NuZT068916; Mon, 3 Nov 2025 06:23:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A36Nuq4068913; Mon, 3 Nov 2025 06:23:56 GMT (envelope-from git) Date: Mon, 3 Nov 2025 06:23:56 GMT Message-Id: <202511030623.5A36Nuq4068913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Cochard Subject: git: 36098bbfbcaa - stable/15 - tests/ipfw: Update regression tests to match new 32-bit size rule numbers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 36098bbfbcaa49bacb52216ae3d1eb29c23f56e2 Auto-Submitted: auto-generated The branch stable/15 has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=36098bbfbcaa49bacb52216ae3d1eb29c23f56e2 commit 36098bbfbcaa49bacb52216ae3d1eb29c23f56e2 Author: Olivier Cochard AuthorDate: 2025-10-03 10:56:27 +0000 Commit: Olivier Cochard CommitDate: 2025-11-03 06:21:13 +0000 tests/ipfw: Update regression tests to match new 32-bit size rule numbers Commit 4a77657cbc01 increased the size of several opcodes to ipfw_insn_u32. Approved by: ae Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D52876 (cherry picked from commit 01d5a6f30ce8f5006bd9d5528a487ef4d79c48c3) --- sbin/ipfw/tests/test_add_rule.py | 25 +++++++++++++------------ tests/atf_python/sys/netpfil/ipfw/insns.py | 19 +++++++++++-------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/sbin/ipfw/tests/test_add_rule.py b/sbin/ipfw/tests/test_add_rule.py index 60c8cebaceaa..c2c4bf0b360c 100755 --- a/sbin/ipfw/tests/test_add_rule.py +++ b/sbin/ipfw/tests/test_add_rule.py @@ -36,6 +36,7 @@ from atf_python.sys.netpfil.ipfw.insns import InsnProb from atf_python.sys.netpfil.ipfw.insns import InsnProto from atf_python.sys.netpfil.ipfw.insns import InsnReject from atf_python.sys.netpfil.ipfw.insns import InsnTable +from atf_python.sys.netpfil.ipfw.insns import InsnU32 from atf_python.sys.netpfil.ipfw.insns import IpFwOpcode from atf_python.sys.netpfil.ipfw.ioctl import CTlv from atf_python.sys.netpfil.ipfw.ioctl import CTlvRule @@ -152,8 +153,8 @@ class TestAddRule(BaseTest): NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), ], "insns": [ - InsnTable(IpFwOpcode.O_IP_SRC_LOOKUP, arg1=1), - InsnTable(IpFwOpcode.O_IP_DST_LOOKUP, arg1=2), + InsnU32(IpFwOpcode.O_IP_SRC_LOOKUP, u32=1), + InsnU32(IpFwOpcode.O_IP_DST_LOOKUP, u32=2), InsnEmpty(IpFwOpcode.O_ACCEPT), ], }, @@ -182,7 +183,7 @@ class TestAddRule(BaseTest): ], "insns": [ InsnIp(IpFwOpcode.O_IP_DST, ip="1.2.3.4"), - Insn(IpFwOpcode.O_EXTERNAL_ACTION, arg1=1), + InsnU32(IpFwOpcode.O_EXTERNAL_ACTION, u32=1), Insn(IpFwOpcode.O_EXTERNAL_DATA, arg1=123), ], }, @@ -199,8 +200,8 @@ class TestAddRule(BaseTest): ], "insns": [ InsnIp(IpFwOpcode.O_IP_DST, ip="1.2.3.4"), - Insn(IpFwOpcode.O_EXTERNAL_ACTION, arg1=1), - Insn(IpFwOpcode.O_EXTERNAL_INSTANCE, arg1=2), + InsnU32(IpFwOpcode.O_EXTERNAL_ACTION, u32=1), + InsnU32(IpFwOpcode.O_EXTERNAL_INSTANCE, u32=2), ], }, }, @@ -227,7 +228,7 @@ class TestAddRule(BaseTest): ], "insns": [ InsnComment(comment="test comment"), - Insn(IpFwOpcode.O_CHECK_STATE, arg1=1), + InsnU32(IpFwOpcode.O_CHECK_STATE, u32=1), ], }, }, @@ -241,9 +242,9 @@ class TestAddRule(BaseTest): NTlv(IpFwTlvType.IPFW_TLV_STATE_NAME, idx=1, name="OUT"), ], "insns": [ - Insn(IpFwOpcode.O_PROBE_STATE, arg1=1), + InsnU32(IpFwOpcode.O_PROBE_STATE, u32=1), Insn(IpFwOpcode.O_PROTO, arg1=6), - Insn(IpFwOpcode.O_KEEP_STATE, arg1=1), + InsnU32(IpFwOpcode.O_KEEP_STATE, u32=1), InsnEmpty(IpFwOpcode.O_ACCEPT), ], }, @@ -259,7 +260,7 @@ class TestAddRule(BaseTest): ], "insns": [ Insn(IpFwOpcode.O_PROTO, arg1=6), - Insn(IpFwOpcode.O_KEEP_STATE, arg1=1), + InsnU32(IpFwOpcode.O_KEEP_STATE, u32=1), InsnEmpty(IpFwOpcode.O_ACCEPT), ], }, @@ -370,7 +371,7 @@ class TestAddRule(BaseTest): ), pytest.param(("pipe 42", Insn(IpFwOpcode.O_PIPE, arg1=42)), id="pipe_42"), pytest.param( - ("skipto 42", Insn(IpFwOpcode.O_SKIPTO, arg1=42)), id="skipto_42" + ("skipto 42", InsnU32(IpFwOpcode.O_SKIPTO, u32=42)), id="skipto_42" ), pytest.param( ("netgraph 42", Insn(IpFwOpcode.O_NETGRAPH, arg1=42)), id="netgraph_42" @@ -386,7 +387,7 @@ class TestAddRule(BaseTest): ), pytest.param(("tee 42", Insn(IpFwOpcode.O_TEE, arg1=42)), id="tee_42"), pytest.param( - ("call 420", Insn(IpFwOpcode.O_CALLRETURN, arg1=420)), id="call_420" + ("call 420", InsnU32(IpFwOpcode.O_CALLRETURN, u32=420)), id="call_420" ), # TOK_FORWARD pytest.param( @@ -400,7 +401,7 @@ class TestAddRule(BaseTest): ), pytest.param(("reass", InsnEmpty(IpFwOpcode.O_REASS)), id="reass"), pytest.param( - ("return", InsnEmpty(IpFwOpcode.O_CALLRETURN, is_not=True)), id="return" + ("return", InsnU32(IpFwOpcode.O_CALLRETURN, is_not=True)), id="return" ), ], ) diff --git a/tests/atf_python/sys/netpfil/ipfw/insns.py b/tests/atf_python/sys/netpfil/ipfw/insns.py index 12f145f49393..f8a56de901ae 100644 --- a/tests/atf_python/sys/netpfil/ipfw/insns.py +++ b/tests/atf_python/sys/netpfil/ipfw/insns.py @@ -510,7 +510,7 @@ class InsnIp6(Insn): insn_attrs = prepare_attrs_map( [ - AttrDescr(IpFwOpcode.O_CHECK_STATE, Insn), + AttrDescr(IpFwOpcode.O_CHECK_STATE, InsnU32), AttrDescr(IpFwOpcode.O_ACCEPT, InsnEmpty), AttrDescr(IpFwOpcode.O_COUNT, InsnEmpty), @@ -521,16 +521,19 @@ insn_attrs = prepare_attrs_map( AttrDescr(IpFwOpcode.O_COUNT, InsnEmpty), AttrDescr(IpFwOpcode.O_QUEUE, Insn), AttrDescr(IpFwOpcode.O_PIPE, Insn), - AttrDescr(IpFwOpcode.O_SKIPTO, Insn), + AttrDescr(IpFwOpcode.O_SKIPTO, InsnU32), AttrDescr(IpFwOpcode.O_NETGRAPH, Insn), AttrDescr(IpFwOpcode.O_NGTEE, Insn), AttrDescr(IpFwOpcode.O_DIVERT, Insn), AttrDescr(IpFwOpcode.O_TEE, Insn), - AttrDescr(IpFwOpcode.O_CALLRETURN, Insn), + AttrDescr(IpFwOpcode.O_CALLRETURN, InsnU32), AttrDescr(IpFwOpcode.O_SETFIB, Insn), AttrDescr(IpFwOpcode.O_SETDSCP, Insn), AttrDescr(IpFwOpcode.O_REASS, InsnEmpty), - AttrDescr(IpFwOpcode.O_SETMARK, Insn), + AttrDescr(IpFwOpcode.O_SETMARK, InsnU32), + + AttrDescr(IpFwOpcode.O_EXTERNAL_ACTION, InsnU32), + AttrDescr(IpFwOpcode.O_EXTERNAL_INSTANCE, InsnU32), @@ -545,11 +548,11 @@ insn_attrs = prepare_attrs_map( AttrDescr(IpFwOpcode.O_IP_DST, InsnIp), AttrDescr(IpFwOpcode.O_IP6_DST, InsnIp6), AttrDescr(IpFwOpcode.O_IP6_SRC, InsnIp6), - AttrDescr(IpFwOpcode.O_IP_SRC_LOOKUP, InsnTable), - AttrDescr(IpFwOpcode.O_IP_DST_LOOKUP, InsnTable), + AttrDescr(IpFwOpcode.O_IP_SRC_LOOKUP, InsnU32), + AttrDescr(IpFwOpcode.O_IP_DST_LOOKUP, InsnU32), AttrDescr(IpFwOpcode.O_IP_SRCPORT, InsnPorts), AttrDescr(IpFwOpcode.O_IP_DSTPORT, InsnPorts), - AttrDescr(IpFwOpcode.O_PROBE_STATE, Insn), - AttrDescr(IpFwOpcode.O_KEEP_STATE, Insn), + AttrDescr(IpFwOpcode.O_PROBE_STATE, InsnU32), + AttrDescr(IpFwOpcode.O_KEEP_STATE, InsnU32), ] ) From nobody Mon Nov 3 08:38:59 2025 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 4d0Q3l5qMGz6F9wH; Mon, 03 Nov 2025 08:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Q3l4zLcz3kVM; Mon, 03 Nov 2025 08:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lYYt3DboVTey0SfLEKbTQvxDlLR2Nka/59ExiKQPPVA=; b=QlnaFsT14w2NkLH+3nvpFi+PiWoZ0ICcxeHHMF5Grn2+0KfErxfg9oFzB3TbRC+OjtB+2V ByUt6iRZ/UGvDkGnUgGi7ujjFMMlf24gG6f9igCCM3xBcjespz4MiCgl1tKSEtJJqegyw6 QTP8h0nB7CSHVloppbq+M1P8a428GQqu8jhLBQqayjgy6/6yGLWLzivnRwIfc/mAylD3P2 P6Q0Qkv9HwQsU5oPORRnTorr9Pdv99ZYJkJ6i95z9OHc9tBmZaq/HLkUtDDLRHUzAJysZc qnfVjMpNCn95I0NtXOZPv+7yQnZKFAmV8fzoSDCYBDawS/6f9YdgZijJad7pmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lYYt3DboVTey0SfLEKbTQvxDlLR2Nka/59ExiKQPPVA=; b=xs4Ww53p4KwuXq7ZPnGUcGVlvBhP0sb5lSPTnJ+rSEZH7jE/9/ioOMMM4rnSYUthGWFhSn e7zqYxWcrG0F4QBSW1R78DujR/gXVogpkQrKMm/K3Scl5289Ug2J9rjCYYMPMaZHohkyc9 90rkXdZbHGZz1KLACuAbOlxfFXLCELi4EFshzIeHKX7m+7HUTRyDsATR6NCbtppF5Fvg70 r7noM7M7JtUWB+8qhZANzPBPB2p0tei/81bi+PBx4J+OsIMbhNmOC/DrJRFs64e8ZzwG1P VjQSGF13JzM6EXeD+0povYZ4wgcXuyz1pE6nwQG5dhY10m0WSYReS3Ezc110GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159139; a=rsa-sha256; cv=none; b=v+x/RZxDX/Ou/sf0eyMg70h2eExFiWncj2xbhdeaIeHEDDed5ErJjsF00fYXe6IEYIcCd7 9jbqcsl0qHsxbUoBNKa0cf0J4GwBXcFKF2MuXHCln15AZGKkvAf2510cCgCJM/Nmbk5Uou RR/7sey3YAxVGTAn9/oUXWc0fgq2fGjN4LjrexHgKYO19f3oUpvZtYdSs97tft5Or+B1tP C8Y/s2u49+jjje5imZ1wM8dBvsVcuGHzgzolADDO188nirY5Qd9RW12AVBeWKFQ3CuUIeZ QxoE/MOWhR8BemKQvkYMuTySMgymmVyJG7nenpsWxUT0lz/8GoE9eJ/A2V2JGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Q3l4PnCz13XV; Mon, 03 Nov 2025 08:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A38cxLH016366; Mon, 3 Nov 2025 08:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A38cx4H016362; Mon, 3 Nov 2025 08:38:59 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:38:59 GMT Message-Id: <202511030838.5A38cx4H016362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ba198fe8a03b - stable/13 - pf: improve add state validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/13 X-Git-Reftype: branch X-Git-Commit: ba198fe8a03bbe1e11efcd651d7ef7c83837efbe Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ba198fe8a03bbe1e11efcd651d7ef7c83837efbe commit ba198fe8a03bbe1e11efcd651d7ef7c83837efbe Author: Kristof Provost AuthorDate: 2025-10-29 10:40:52 +0000 Commit: Kristof Provost CommitDate: 2025-11-03 08:34:26 +0000 pf: improve add state validation Both for the DIOCADDSTATE ioctl and for states imported through pfsync packets. Add a test case to exercise this code path. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit faacc0d968816cf8714c974b6d8df6191cfb0e0d) --- sys/netpfil/pf/if_pfsync.c | 3 +++ tests/sys/netpfil/pf/ioctl/validation.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index e071197f17ce..c43cb59d8705 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -475,6 +475,9 @@ pfsync_state_import(struct pfsync_state *sp, u_int8_t flags) PF_RULES_RASSERT(); + if (strnlen(sp->ifname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + if (sp->creatorid == 0) { if (V_pf_status.debug >= PF_DEBUG_MISC) printf("%s: invalid creator id: %08x\n", __func__, diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index 1ce8999dcb91..152a9678812b 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -894,6 +895,29 @@ ATF_TC_CLEANUP(rpool_mtx2, tc) } +ATF_TC_WITH_CLEANUP(addstate); +ATF_TC_HEAD(addstate, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(addstate, tc) +{ + struct pfioc_state st; + + COMMON_HEAD(); + + memset(&st, 'a', sizeof(st)); + st.state.timeout = PFTM_TCP_FIRST_PACKET; + + ATF_CHECK_ERRNO(EINVAL, ioctl(dev, DIOCADDSTATE, &st) == -1); +} + +ATF_TC_CLEANUP(addstate, tc) +{ + COMMON_CLEANUP(); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, addtables); @@ -918,6 +942,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, tag); ATF_TP_ADD_TC(tp, rpool_mtx); ATF_TP_ADD_TC(tp, rpool_mtx2); + ATF_TP_ADD_TC(tp, addstate); return (atf_no_error()); } From nobody Mon Nov 3 08:39:00 2025 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 4d0Q3m4Vysz6F9jF; Mon, 03 Nov 2025 08:39: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Q3m2m82z3klp; Mon, 03 Nov 2025 08:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ACFBasQk3TeolNQWjXEjGCEuRTQ88+AmPfoY9BNLa8=; b=X952IttmPzaOMXdPMBoW/DCXzDimJxcblKNonUjlKLinedB56XqfRL6znoj/Ig2tNwhSm2 iwcEel7n3Sah1BP9gvhovYKSA5/GIVe2y0BxSYq8SVgPzlGCx9wisolw+kC2byH6g7iTBS WXLBJmU0M4LJL7jMELyDQkZPrXMCxWBmiTfOcGVA521JlCh+bCZ5G2QSPm58AhwPiAl13K qwyKDHRf//W+sM/dfnfN9CoNwJaJOmqaPGPnuQoIu6CYXSdxTmrB93J7Tu7EjgfnmM8lGn m1FxhvHHqlk4AihiSQTHTGbeK/opVU798o5Fi8Sr60jqlld4ThVjrreOVmNpZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ACFBasQk3TeolNQWjXEjGCEuRTQ88+AmPfoY9BNLa8=; b=e77bFsetGWmFA1wOGRf2FHGw4PHSdbaELGH+RZZaA84uu0JXx+hN0VjVv2Y1cPOCfl7ebs Z6CAdGiPYHM8mHYFKvC7ozGoxJ+gqXEqZDIpT+UzrKzaBvbBlZJErvj26TTX6xCVkvCOOa PF/1jU8PygskVKpiXDzkCNF8HKL33UylLIg/YO8ZPldO394CaXSSQkY/L3L3yjw0bSHgiK JQKCAbvwRAVNwwjrmJENvjuRywFseG+Rbdp/3sLC95UwbOSXbzbfXkt8okvqoetZYgWO8v ojV+TAb5q69jlZDpmsICS0X1F34LTSIZNVu3cMxccIeV4Wr/tsFtxj0EEAfxNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159140; a=rsa-sha256; cv=none; b=Ak+MxG58CqohnjKcBeY7PIiXgfMuYkknbA+MzDRoILqsUMnXA26cHlk91eZIXvELx1vkTm TDjNuTEatVBy+d367Oalwn6sPVDIXL6B7UvcCk4jV9DJTu8/xJ8ddOpRiyY6SMBxeeOl+x P0rj8geLPyEF3eDGX9M08qlQH16nqoEVUXe0fksXE8kHXeIemL5eJp17ghMk51T2ep2ouZ FLhueABV9bQ4AL72USg/Q2uLMAwQALqd9+QfezolEeLSwqjEypYyF6DMYIOaPRPmiJudLQ 0bOl7o6dvcjt9dRAWt3GpQTHoNnKAjKpFbUXQvOQrW8XXevTdmu0qpwz41sPvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Q3m2JsXz13XW; Mon, 03 Nov 2025 08:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A38d0Qw016411; Mon, 3 Nov 2025 08:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A38d0So016408; Mon, 3 Nov 2025 08:39:00 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:39:00 GMT Message-Id: <202511030839.5A38d0So016408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 909528f8a130 - stable/15 - pf: improve DIOCRCLRTABLES validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 909528f8a13004e15c08c4793a6a349716f90447 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=909528f8a13004e15c08c4793a6a349716f90447 commit 909528f8a13004e15c08c4793a6a349716f90447 Author: Kristof Provost AuthorDate: 2025-10-29 08:28:59 +0000 Commit: Kristof Provost CommitDate: 2025-11-03 08:28:53 +0000 pf: improve DIOCRCLRTABLES validation Unterminated strings in the anchor or name could cause crashes. Validate them, and add a test case. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1da3c0ca5b1decaa9cf55859cd134bdcd1218116) --- sys/netpfil/pf/pf_ioctl.c | 11 +++++++++++ tests/sys/netpfil/pf/ioctl/validation.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index d7bb62977afb..856bbd6cb9cb 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -4788,6 +4788,17 @@ DIOCCHANGEADDR_error: error = ENODEV; goto fail; } + if (strnlen(io->pfrio_table.pfrt_anchor, MAXPATHLEN) + == MAXPATHLEN) { + error = EINVAL; + goto fail; + } + if (strnlen(io->pfrio_table.pfrt_name, PF_TABLE_NAME_SIZE) + == PF_TABLE_NAME_SIZE) { + error = EINVAL; + goto fail; + } + PF_RULES_WLOCK(); error = pfr_clr_tables(&io->pfrio_table, &io->pfrio_ndel, io->pfrio_flags | PFR_FLAG_USERIOCTL); diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index ff3f1bbcdadc..7a1d2b3800cd 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -193,6 +193,38 @@ ATF_TC_CLEANUP(gettables, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(clrtables); +ATF_TC_HEAD(clrtables, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pf"); +} + +ATF_TC_BODY(clrtables, tc) +{ + struct pfioc_table io; + struct pfr_table tbl; + int flags; + + COMMON_HEAD(); + + flags = 0; + + memset(&io, '/', sizeof(io)); + io.pfrio_flags = flags; + io.pfrio_buffer = &tbl; + io.pfrio_esize = 0; + io.pfrio_size = 1; + + if (ioctl(dev, DIOCRCLRTABLES, &io) == 0) + atf_tc_fail("Request with unterminated anchor name succeeded"); +} + +ATF_TC_CLEANUP(clrtables, tc) +{ + COMMON_CLEANUP(); +} + ATF_TC_WITH_CLEANUP(gettstats); ATF_TC_HEAD(gettstats, tc) { @@ -957,6 +989,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, addtables); ATF_TP_ADD_TC(tp, deltables); ATF_TP_ADD_TC(tp, gettables); + ATF_TP_ADD_TC(tp, clrtables); ATF_TP_ADD_TC(tp, getastats); ATF_TP_ADD_TC(tp, gettstats); ATF_TP_ADD_TC(tp, clrtstats); From nobody Mon Nov 3 08:39:00 2025 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 4d0Q3n0dc5z6F9qv; Mon, 03 Nov 2025 08:39: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Q3m63YQz3kVQ; Mon, 03 Nov 2025 08:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159140; h=from:from:reply-to:subject:subject: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+uEW8SGYLWqRsQ5Mfd8BFzrRAD4a2+1dAYZ3ll18xs=; b=FbDVydWRk71XZp4qIUMIOnY8YWIcFmkDpI8JEivGPT5oywXRPIWAcG/1uCEH08PBItOWV8 8mK7EL+2dv2eGPZudourXIUQPLWRrz1MaRh4965nfBLg2S837o4uPsta4r5P46jhpxnV07 dfjmekNpwfddiKWmlsaslbKGQyyE57vw6yOAookmxKw+Wa9SOcHWJxlxeVdKaIsQri0h0c d3cHeohBdrH+DWXTuCYVvrdWxvpHazrTa8UgGEQqu+jkhiz/uhVA3wr0TJUDtgXnd656jM pUb3NA4I1x6JOb6s7r+AGTtVRatSDlE1cf5nS0aHiC6GnzHNlVVL2EIQxWRbsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159140; h=from:from:reply-to:subject:subject: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+uEW8SGYLWqRsQ5Mfd8BFzrRAD4a2+1dAYZ3ll18xs=; b=gFm7ksL3FmYZov71dh4VjdHfAhABqZ3qQ8xhiyDyYaaGyR0AGXc5NKeqzqS/NNdd84bQgX T/H5/d66pr75xBLIh44PI2diSJ6JPto5gt9GWzLk+zhMsk+PI4VRPDBB33YQproR/JYky7 1ywGWC7iDIy23L+But0LNI1Gn2Jxq42DMYwuKXjkxIppIL8rjYjN4yiThNwIRaJuaVPGWK WgNbneuK0pT1anwl6FwFaR8/iePfVsVvGXwSnVpAZD8zHUtcH9PsdIAaxTf5nv0HarUwUg SNt6n1jMbNvoviHFLeijjvVBs01b0pEKR4WdUXwrh6sgpEV1JrqlrK5FsVe3OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159140; a=rsa-sha256; cv=none; b=cFV5fNVaKGCO6rzt6/c95/fgSThGqnypVIrykTxTa3yrkLQC9DEnb5oafC0LWBQfTovifv 9dzjpNyXKlESmjQeE+35FLtJN5qfzb3UY7Rixj8/TcqbpsaXvCBhCDNn4PqP03lFQQUTsP fuo51h6gcyhAT30X3MGJ+2PzOgB2B6iq29K2RF/USUqDK4rBe/eJeMiS0YfJNKZVxap94A fM9osqalkMwWArpet/W55aNxHCpKoW2PH8Xp9w+JOfXYwyRLirHfxTDFp/fxgGMqfmbezw F4mLizfZRACcE07TTfm6kphu3jHUyMb/ALUKHKfLk9TK4h+0OYt+uKMh1lieug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Q3m5LK8z13tk; Mon, 03 Nov 2025 08:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A38d0Xi016446; Mon, 3 Nov 2025 08:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A38d0Kq016443; Mon, 3 Nov 2025 08:39:00 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:39:00 GMT Message-Id: <202511030839.5A38d0Kq016443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 8f92db3cf540 - stable/13 - pf: improve DIOCRCLRTABLES validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/13 X-Git-Reftype: branch X-Git-Commit: 8f92db3cf5405e38f565591d878c7b1b409dc055 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8f92db3cf5405e38f565591d878c7b1b409dc055 commit 8f92db3cf5405e38f565591d878c7b1b409dc055 Author: Kristof Provost AuthorDate: 2025-10-29 08:28:59 +0000 Commit: Kristof Provost CommitDate: 2025-11-03 08:34:27 +0000 pf: improve DIOCRCLRTABLES validation Unterminated strings in the anchor or name could cause crashes. Validate them, and add a test case. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1da3c0ca5b1decaa9cf55859cd134bdcd1218116) --- sys/netpfil/pf/pf_ioctl.c | 11 +++++++++++ tests/sys/netpfil/pf/ioctl/validation.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 6fe84b1be489..cdb0059a5e0e 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -3849,6 +3849,17 @@ DIOCCHANGEADDR_error: error = ENODEV; break; } + if (strnlen(io->pfrio_table.pfrt_anchor, MAXPATHLEN) + == MAXPATHLEN) { + error = EINVAL; + goto fail; + } + if (strnlen(io->pfrio_table.pfrt_name, PF_TABLE_NAME_SIZE) + == PF_TABLE_NAME_SIZE) { + error = EINVAL; + goto fail; + } + PF_RULES_WLOCK(); error = pfr_clr_tables(&io->pfrio_table, &io->pfrio_ndel, io->pfrio_flags | PFR_FLAG_USERIOCTL); diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index 152a9678812b..0adfaf59bb8b 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -193,6 +193,37 @@ ATF_TC_CLEANUP(gettables, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(clrtables); +ATF_TC_HEAD(clrtables, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(clrtables, tc) +{ + struct pfioc_table io; + struct pfr_table tbl; + int flags; + + COMMON_HEAD(); + + flags = 0; + + memset(&io, '/', sizeof(io)); + io.pfrio_flags = flags; + io.pfrio_buffer = &tbl; + io.pfrio_esize = 0; + io.pfrio_size = 1; + + if (ioctl(dev, DIOCRCLRTABLES, &io) == 0) + atf_tc_fail("Request with unterminated anchor name succeeded"); +} + +ATF_TC_CLEANUP(clrtables, tc) +{ + COMMON_CLEANUP(); +} + ATF_TC_WITH_CLEANUP(gettstats); ATF_TC_HEAD(gettstats, tc) { @@ -923,6 +954,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, addtables); ATF_TP_ADD_TC(tp, deltables); ATF_TP_ADD_TC(tp, gettables); + ATF_TP_ADD_TC(tp, clrtables); ATF_TP_ADD_TC(tp, getastats); ATF_TP_ADD_TC(tp, gettstats); ATF_TP_ADD_TC(tp, clrtstats); From nobody Mon Nov 3 08:39:03 2025 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 4d0Q3q5zWpz6F9qx; Mon, 03 Nov 2025 08:39: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Q3q300Qz3kWw; Mon, 03 Nov 2025 08:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaMq+U+hlRXfP9Yvj9ctmehou0is1nP6aDrV4lwMO+0=; b=OqEv0UGawR66jEZi+bVIE9S03XJZPRJoXSs3Q1P/YrJFWi/LKKlCmHl1ZerFC4EG9zX3q4 N+Cx9+MxDWNLBl0myMmxmy20Oc7pCyDLyd+jB84EZXybhyR/R80YQxpuSICheSKODZ3HEI 6ToP6Mxo+Mxk8dR/UK/2bg+/4j82lCQtcm5zCN+HwUkLzPT4uUBhZ6BkSVg/07/IIYtY5D Y1rl4U2Hshb2RoqKMmyaNCPgG4ixjNKvu0ih5qZe0wDAyKPsS4gL3nFVcTmpSxi5o2vXpc 96DyfeO6eSddE3Nm7BxZThGsutf/JgTVxSRIJ1aKqKj5ebMG2QXUeIVFDJMDUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaMq+U+hlRXfP9Yvj9ctmehou0is1nP6aDrV4lwMO+0=; b=mtkogXeTGSC3TClcWvtOUJvoRJJz4KveFrgrCYRRkrTp9w9Synokhum8G75G0Oj5lBz8UM kAEwjyeMETLKH4v3wskkjsClzj624+GOIMnWAR41PA5X5nq/jRFxNa+OCywv6zNAtIIDMv +ua+FUsSLkLlWn1BVRKIOFIP1AAGkr01jQbTniq33GRbPf+aIdzGMH7EwNasPHn0j4KQsd a6+bN4O3kWM1cWGWeNvoq7w92c7Dehji+FU45CU/szJVJhalycokp4txVHKZvqcC+Iu8/V WghkAVXkr8OuOSkIwCsAnreUe5zibOLr1YPXksKuKbYMwQA7odrwvP3yCXGJow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159143; a=rsa-sha256; cv=none; b=tlBjnYfjTwOmcv8j+rB8bA9T+oXI7ps6lwJZ21hKMtCbsxCtT3WTrad9yV3q9J56KFhr91 EFRtJnEAXlXo82F/pKiC/AGAhIA6QM2KrzIgWW9BWASQ+XLp7RrEwbZN3njm225fctP5ZU a9a1ZnD7Qj+qzB6VZvNT0ydl92Fh/9X/Z5l6turx59kbu+KByTW/jWbtwyh03D6YS3aSEV XFNOQoLqL5c9og17Ko5dhNd02gkrSYiFidHlVUqM2wdeHIOyCa9dNuIr4aEXasOHyRdhi1 np02QFkyjvfPBkXvPrAJx+FlNkPv5DojvIWkq1mvhvbzVbj33j334engV51LcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Q3q1tQLz13xT; Mon, 03 Nov 2025 08:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A38d3Xi016611; Mon, 3 Nov 2025 08:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A38d3nv016608; Mon, 3 Nov 2025 08:39:03 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:39:03 GMT Message-Id: <202511030839.5A38d3nv016608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 70154de06926 - stable/14 - pf: improve add state validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 70154de06926aadf7efb50591e21a82aaf1b619a Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=70154de06926aadf7efb50591e21a82aaf1b619a commit 70154de06926aadf7efb50591e21a82aaf1b619a Author: Kristof Provost AuthorDate: 2025-10-29 10:40:52 +0000 Commit: Kristof Provost CommitDate: 2025-11-02 14:06:44 +0000 pf: improve add state validation Both for the DIOCADDSTATE ioctl and for states imported through pfsync packets. Add a test case to exercise this code path. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit faacc0d968816cf8714c974b6d8df6191cfb0e0d) --- sys/netpfil/pf/if_pfsync.c | 3 +++ tests/sys/netpfil/pf/ioctl/validation.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 8c080b472653..2a5cb0612d36 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -530,6 +530,9 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) PF_RULES_RASSERT(); + if (strnlen(sp->pfs_1301.ifname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + if (sp->pfs_1301.creatorid == 0) { if (V_pf_status.debug >= PF_DEBUG_MISC) printf("%s: invalid creator id: %08x\n", __func__, diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index 1ce8999dcb91..b18e30e5e6af 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -894,6 +895,30 @@ ATF_TC_CLEANUP(rpool_mtx2, tc) } +ATF_TC_WITH_CLEANUP(addstate); +ATF_TC_HEAD(addstate, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pfsync"); +} + +ATF_TC_BODY(addstate, tc) +{ + struct pfioc_state st; + + COMMON_HEAD(); + + memset(&st, 'a', sizeof(st)); + st.state.timeout = PFTM_TCP_FIRST_PACKET; + + ATF_CHECK_ERRNO(EINVAL, ioctl(dev, DIOCADDSTATE, &st) == -1); +} + +ATF_TC_CLEANUP(addstate, tc) +{ + COMMON_CLEANUP(); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, addtables); @@ -918,6 +943,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, tag); ATF_TP_ADD_TC(tp, rpool_mtx); ATF_TP_ADD_TC(tp, rpool_mtx2); + ATF_TP_ADD_TC(tp, addstate); return (atf_no_error()); } From nobody Mon Nov 3 08:39:04 2025 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 4d0Q3r5vTQz6F9jL; Mon, 03 Nov 2025 08:39: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Q3r3jwLz3kkF; Mon, 03 Nov 2025 08:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWA4oM+rXCWFICGdwP+/ovhP0VHsgqdbM1BXdWZx++E=; b=oBkXkgKQakToHAR9kRXe20zFHMZushMwzcNasxyfaZbfaV0fG779wHEtkrxdXkjXigoM8B 12n7CnfmND+Y0Tvy3ATC45wYC1bhG0+t0kAYE5oq1dS/VybIfZv/su3IxeRMRuoluEp5vm 5QhBWzubkn4b+ZIIOTmtOxQMncBfgrZ1VxME6KNp11F/jKrp18tILJmVX1Q8nwRwcjtb/6 LspmSF60skWX9PnVVaj+lHQxwx8Xfmu7WrvtuVuzdv6ylqYqm4NUKVRpG7h3GG8+KnIkVH NC/c68CM2hOeOa5XzDSsv3KF21zGN31hatgQfT6p8uXbV/AnkJQZY4EAhfyOGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWA4oM+rXCWFICGdwP+/ovhP0VHsgqdbM1BXdWZx++E=; b=meF007foVr7BJ8gVJa9MJyFQuqRRZDFss+iza1WpoM9fQ3E3ZM1AU3d8og6IF6HTjy1X9p JopSVd31u2SVmXwKqoNIbk9JNHzC3laM98S3efwNSm9d3YTOVMT7NDhINwM6U1pIKER79x 00ZVs9tZMzVzyauW1YOstfSr6v0kxcQCPm3Ix6WWdoZclv7hPlVmQZfocLIMFLRqGaaGtz IHT3k7ZFGwunaH2N9NHKBfLnnAo5R/vRYdexo+61mpZmkvGGwzGo1wCQUwM+IhujWXpU12 1uYZ6OnI4pk83x9y7g4XXS83nfQZau4s2ST0aO9TzeGfctDU+mCCMfuOYMgdTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159144; a=rsa-sha256; cv=none; b=u3CYYx3/l24knfRdTM9/rlks4N3Hkoy1T6Oygu81+LWJjPqBufteE/XsEgeWVXLzc7NYwg ABRbfaeKndgkQzIhHhZOFsUtHsZTf08gBjC4YrGfzOULK2lvIhBrg+N6z19tPv2SBc2chw dRBWXCFXGdvIUkOpC+yY4NeMqFoS9tTDHweSbvw7tZpcMoXfthKu34zNDXq/Wj+OLqr+qC ZICPG156Ntb+XL6IzYNPolP3tn/TykH/l1fAACC9eLCbSpJCVGx/F4ZoY5i3tpFoKQlyWt 01JIfA7eKTNjdrth3pwhz/OCCnxwFVXNm7hEmOpfCzexfae1qLPY7vWCH7ASsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Q3r2Z19z13Jj; Mon, 03 Nov 2025 08:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A38d4Q1016646; Mon, 3 Nov 2025 08:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A38d4wd016643; Mon, 3 Nov 2025 08:39:04 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:39:04 GMT Message-Id: <202511030839.5A38d4wd016643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: d481c3db42dc - stable/14 - pf: improve DIOCRCLRTABLES validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: d481c3db42dc59bbe679ecc5aead161a8739466b Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d481c3db42dc59bbe679ecc5aead161a8739466b commit d481c3db42dc59bbe679ecc5aead161a8739466b Author: Kristof Provost AuthorDate: 2025-10-29 08:28:59 +0000 Commit: Kristof Provost CommitDate: 2025-11-02 14:06:45 +0000 pf: improve DIOCRCLRTABLES validation Unterminated strings in the anchor or name could cause crashes. Validate them, and add a test case. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1da3c0ca5b1decaa9cf55859cd134bdcd1218116) --- sys/netpfil/pf/pf_ioctl.c | 11 +++++++++++ tests/sys/netpfil/pf/ioctl/validation.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index d95f36d06ee3..cf53ea638095 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -4645,6 +4645,17 @@ DIOCCHANGEADDR_error: error = ENODEV; break; } + if (strnlen(io->pfrio_table.pfrt_anchor, MAXPATHLEN) + == MAXPATHLEN) { + error = EINVAL; + goto fail; + } + if (strnlen(io->pfrio_table.pfrt_name, PF_TABLE_NAME_SIZE) + == PF_TABLE_NAME_SIZE) { + error = EINVAL; + goto fail; + } + PF_RULES_WLOCK(); error = pfr_clr_tables(&io->pfrio_table, &io->pfrio_ndel, io->pfrio_flags | PFR_FLAG_USERIOCTL); diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index b18e30e5e6af..651e6837acd7 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -193,6 +193,38 @@ ATF_TC_CLEANUP(gettables, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(clrtables); +ATF_TC_HEAD(clrtables, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pf"); +} + +ATF_TC_BODY(clrtables, tc) +{ + struct pfioc_table io; + struct pfr_table tbl; + int flags; + + COMMON_HEAD(); + + flags = 0; + + memset(&io, '/', sizeof(io)); + io.pfrio_flags = flags; + io.pfrio_buffer = &tbl; + io.pfrio_esize = 0; + io.pfrio_size = 1; + + if (ioctl(dev, DIOCRCLRTABLES, &io) == 0) + atf_tc_fail("Request with unterminated anchor name succeeded"); +} + +ATF_TC_CLEANUP(clrtables, tc) +{ + COMMON_CLEANUP(); +} + ATF_TC_WITH_CLEANUP(gettstats); ATF_TC_HEAD(gettstats, tc) { @@ -924,6 +956,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, addtables); ATF_TP_ADD_TC(tp, deltables); ATF_TP_ADD_TC(tp, gettables); + ATF_TP_ADD_TC(tp, clrtables); ATF_TP_ADD_TC(tp, getastats); ATF_TP_ADD_TC(tp, gettstats); ATF_TP_ADD_TC(tp, clrtstats); From nobody Mon Nov 3 09:29:44 2025 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 4d0RBJ4j3lz6FGKj; Mon, 03 Nov 2025 09:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0RBJ4QBCz3rHZ; Mon, 03 Nov 2025 09:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762162184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXOUs1yu0Jh76qk25gAOGs9HGRqZvBF+cmraR0pYONk=; b=h3Ct6NhDKrhW9xj7lYjFVGLjRZXBBvRoc+DkrX8Y6v9aWdHWqt8ZS4EFd2cAx9EXNBbfs6 Nhz3SbLHKxc3R/v6McMY8P3wdld2pL9ZmP13VY4ImBiQITwyfbn8MeEnHsB6H6E8f+wB1H wLOf4WFtJkc3MASYkVarhkiBtlSmbfApk9wghJJhojJVc2i8mD8SDa6E40i5/7ZxQ49tAD 6SakBhrH0ZIPRW14+YM5MZ8uQaL6mMZk7b0A4LmfXkxWDVd2RO2pyU00pWRKE0N4AwDQyh DAl3/2CH5KapIu8DjMmGkhiz5MkbU3nA1saJ4m4rM9iqxLTGMwsF6CqfXxJC5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762162184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXOUs1yu0Jh76qk25gAOGs9HGRqZvBF+cmraR0pYONk=; b=AuHwVlV5HBCiWWOlk8OUVY2HZLJO4wfQdum6YVRDh+kHoCEt97zVaGJ3jYbcFBvuNm3Sph aCDOIP4h7gfZOUKhaiwdRFNgFA1KQBMRVpBUgWtO45bAT8U31GNdX2tbxlNUglX0ub8IEG x5+LXl94nk0reKu4Ulf5bSfcJTdn9JJGuJtAl1KcBdhhMIq5Ff/3TaKpy3lnukgE8/anu7 KcCUpECvmyJBK/ez6Fyp/pGQVCFJihj5X/9e8yWBZ106K6S2N6gQVnLu8Pvgfdqi/NdJry TbaHH4QzoH8pO6gMFyD2UWhEVixhCeDBcYVg9pnWwFv2D0QjgpXIzSJKbqZukQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762162184; a=rsa-sha256; cv=none; b=NnTvQGvvZrNl6EI0QxjHS4fprBz7pXdXFdusd2ou83ITunirF6XHdQOwOXLZzeou6amxPP cJo6Qz2ARlWXbsG2N4tn0AV6g+YB1xNX8U9RoakrxrA/4zrvvxRPlxUGMrkgxNiSc7H3W4 xaZjscGOauHYc82Q4Jq/FdRXvWOHGNKUm0bsCpvYdEVCjstp5dXYUEBmH5ALAy2hIXV8vo QVMws1YpxNOQrmFAnrvs4mQ5W1x4PlFSKESon8+8A+fJ4aBkGWKIfI/yCsPH1LjW/tNU75 XIizOox795DjTBQnAXXOyrPNV0zTvHrlybfNQ29pXPPbHCuKXu1J/m+8t94MIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0RBJ41CTz15Dl; Mon, 03 Nov 2025 09:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A39TiMY010934; Mon, 3 Nov 2025 09:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A39TiPM010931; Mon, 3 Nov 2025 09:29:44 GMT (envelope-from git) Date: Mon, 3 Nov 2025 09:29:44 GMT Message-Id: <202511030929.5A39TiPM010931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 1955c8f6293f - stable/14 - libarchive: merge from vendor branch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1955c8f6293fd8188c208bf03debc67b0ad7c615 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=1955c8f6293fd8188c208bf03debc67b0ad7c615 commit 1955c8f6293fd8188c208bf03debc67b0ad7c615 Author: Martin Matuska AuthorDate: 2025-10-21 14:10:15 +0000 Commit: Martin Matuska CommitDate: 2025-11-03 09:29:25 +0000 libarchive: merge from vendor branch Update libarchive to 3.8.2 Important bugfixes: #2477 tar writer: fix replacing a regular file with a dir for ARCHIVE_EXTRACT_SAFE_WRITES #2659 lib: improve filter process handling #2664 zip writer: fix a memory leak if write callback error early #2665 lib: archive_read_data: handle sparse holes at end of file correctly #2668 7zip: Fix out of boundary access #2670 zip writer: fix writing with ZSTD compression #2672 lib: fix error checking in writing files #2678 zstd write filter: enable Zstandard's checksum feature #2679 lib: handle possible errors from system calls #2707 lib: avoid leaking file descriptors into subprocesses #2713 RAR5 reader: fix multiple issues in extra field parsing function #2716 RAR5 reader: early fail when file declares data for a dir entry #2717 bsdtar: Allow filename to have CRLF endings #2719 tar reader: fix checking the result of the strftime (CVE-2025-25724) #2737 tar reader: fix an infinite loop when parsing V headers #2742 lib: parse_date: handle dates in 2038 and beyond if time_t is big enough Obtained from: libarchive Vendor commit: 7f53fce04e4e672230f4eb80b219af17975e4f83 Security: CVE-2025-25724 PR: 290303 (exp-run, main) (cherry picked from commit 401026e4825a05abba6f945cf1b74b3328876fa2) --- contrib/libarchive/NEWS | 2 + contrib/libarchive/SECURITY.md | 2 +- .../github_actions/install-macos-dependencies.sh | 3 + contrib/libarchive/cat/bsdcat.c | 15 +- contrib/libarchive/cat/cmdline.c | 2 +- contrib/libarchive/cpio/cmdline.c | 2 +- contrib/libarchive/cpio/cpio.c | 14 +- contrib/libarchive/cpio/test/test_owner_parse.c | 2 +- contrib/libarchive/libarchive/archive.h | 4 +- contrib/libarchive/libarchive/archive_acl.c | 23 +++ .../libarchive/libarchive/archive_check_magic.c | 9 +- contrib/libarchive/libarchive/archive_cryptor.c | 8 +- .../libarchive/archive_cryptor_private.h | 11 +- contrib/libarchive/libarchive/archive_entry.h | 2 +- .../libarchive/libarchive/archive_entry_paths.3 | 2 +- contrib/libarchive/libarchive/archive_entry_stat.c | 6 +- contrib/libarchive/libarchive/archive_parse_date.c | 4 +- contrib/libarchive/libarchive/archive_platform.h | 10 -- .../libarchive/libarchive/archive_platform_stat.h | 45 ++++++ contrib/libarchive/libarchive/archive_private.h | 1 + contrib/libarchive/libarchive/archive_read.c | 7 +- .../libarchive/archive_read_disk_entry_from_file.c | 12 +- .../libarchive/archive_read_disk_posix.c | 157 ++------------------- .../libarchive/libarchive/archive_read_open_fd.c | 23 +-- .../libarchive/libarchive/archive_read_open_file.c | 16 ++- .../libarchive/archive_read_open_filename.c | 31 ++-- .../libarchive/archive_read_set_format.c | 32 ++--- .../archive_read_support_filter_program.c | 7 +- .../libarchive/archive_read_support_format_7zip.c | 7 +- .../libarchive/archive_read_support_format_mtree.c | 23 ++- .../libarchive/archive_read_support_format_rar.c | 8 +- .../libarchive/archive_read_support_format_rar5.c | 66 +++++++-- .../libarchive/archive_read_support_format_tar.c | 70 ++++++--- .../libarchive/archive_read_support_format_warc.c | 2 +- .../libarchive/archive_read_support_format_xar.c | 2 +- .../libarchive/archive_read_support_format_zip.c | 4 +- contrib/libarchive/libarchive/archive_string.c | 5 +- .../libarchive/libarchive/archive_string_sprintf.c | 2 +- contrib/libarchive/libarchive/archive_util.c | 38 ++++- contrib/libarchive/libarchive/archive_write.c | 30 ++-- .../libarchive/archive_write_add_filter_bzip2.c | 4 + .../libarchive/archive_write_add_filter_gzip.c | 55 +++++--- .../libarchive/archive_write_add_filter_program.c | 11 +- .../libarchive/archive_write_add_filter_zstd.c | 2 + .../libarchive/archive_write_disk_posix.c | 16 ++- .../libarchive/libarchive/archive_write_open_fd.c | 2 +- .../libarchive/archive_write_open_file.c | 14 +- .../libarchive/archive_write_open_filename.c | 3 +- .../libarchive/archive_write_set_format_7zip.c | 2 +- .../libarchive/archive_write_set_format_mtree.c | 19 ++- .../libarchive/archive_write_set_format_xar.c | 6 +- .../libarchive/archive_write_set_format_zip.c | 25 +++- contrib/libarchive/libarchive/filter_fork_posix.c | 37 ++++- contrib/libarchive/libarchive/test/test_acl_nfs4.c | 7 + .../libarchive/libarchive/test/test_acl_posix1e.c | 5 + .../libarchive/test/test_archive_parse_date.c | 2 + .../test/test_archive_string_conversion.c | 10 ++ contrib/libarchive/libarchive/test/test_entry.c | 11 ++ .../test/test_read_filter_gzip_recursive.c | 4 +- .../libarchive/test/test_read_format_7zip.c | 81 +++++++---- .../libarchive/test/test_read_format_rar5.c | 66 +++++++++ .../test/test_read_format_rar5_dirdata.rar.uu | 6 + ...rmat_rar5_invalid_hash_valid_htime_exfld.rar.uu | 6 + .../test_read_format_rar5_only_crypt_exfld.rar.uu | 7 + .../test_read_format_rar5_unsupported_exfld.rar.uu | 6 + .../test/test_read_format_tar_V_negative_size.c | 48 +++++++ .../test_read_format_tar_V_negative_size.tar.uu | 20 +++ .../libarchive/test/test_read_set_format.c | 7 +- .../libarchive/test/test_write_filter_bzip2.c | 29 ++++ .../libarchive/test/test_write_filter_gzip.c | 12 +- .../test/test_write_filter_gzip_timestamp.c | 7 +- .../libarchive/libarchive_fe/{err.c => lafe_err.c} | 2 +- .../libarchive/libarchive_fe/{err.h => lafe_err.h} | 0 contrib/libarchive/libarchive_fe/line_reader.c | 2 +- contrib/libarchive/libarchive_fe/passphrase.c | 2 +- contrib/libarchive/tar/bsdtar.c | 7 +- contrib/libarchive/tar/bsdtar.h | 8 +- contrib/libarchive/tar/cmdline.c | 2 +- contrib/libarchive/tar/creation_set.c | 2 +- contrib/libarchive/tar/read.c | 2 +- contrib/libarchive/tar/subst.c | 2 +- contrib/libarchive/tar/test/test_crlf_mtree.c | 74 ++++++++++ .../libarchive/tar/test/test_option_safe_writes.c | 5 +- contrib/libarchive/tar/util.c | 7 +- contrib/libarchive/tar/write.c | 29 +++- contrib/libarchive/test_utils/test_common.h | 10 +- contrib/libarchive/test_utils/test_main.c | 156 +++++--------------- contrib/libarchive/unzip/bsdunzip.c | 15 +- contrib/libarchive/unzip/cmdline.c | 2 +- contrib/libarchive/unzip/test/test_C.c | 4 + contrib/libarchive/unzip/test/test_L.c | 4 + contrib/libarchive/unzip/test/test_P_encryption.c | 12 +- contrib/libarchive/unzip/test/test_basic.c | 4 + contrib/libarchive/unzip/test/test_d.c | 8 ++ contrib/libarchive/unzip/test/test_doubledash.c | 4 + contrib/libarchive/unzip/test/test_glob.c | 4 + contrib/libarchive/unzip/test/test_j.c | 4 + contrib/libarchive/unzip/test/test_n.c | 4 + contrib/libarchive/unzip/test/test_o.c | 4 + contrib/libarchive/unzip/test/test_p.c | 4 + contrib/libarchive/unzip/test/test_q.c | 4 + contrib/libarchive/unzip/test/test_singlefile.c | 4 + contrib/libarchive/unzip/test/test_t.c | 4 + contrib/libarchive/unzip/test/test_x.c | 12 ++ lib/libarchive/tests/Makefile | 6 + usr.bin/bsdcat/Makefile | 2 +- usr.bin/cpio/Makefile | 2 +- usr.bin/cpio/tests/Makefile | 2 +- usr.bin/tar/Makefile | 2 +- usr.bin/tar/tests/Makefile | 1 + usr.bin/unzip/Makefile | 2 +- usr.bin/unzip/tests/Makefile | 2 +- 112 files changed, 1119 insertions(+), 546 deletions(-) diff --git a/contrib/libarchive/NEWS b/contrib/libarchive/NEWS index caca7d5cbdb9..f2dd4102fa04 100644 --- a/contrib/libarchive/NEWS +++ b/contrib/libarchive/NEWS @@ -1,3 +1,5 @@ +Oct 15, 2026: libarchive 3.8.2 released + Jun 01, 2026: libarchive 3.8.1 released May 20, 2025: libarchive 3.8.0 released diff --git a/contrib/libarchive/SECURITY.md b/contrib/libarchive/SECURITY.md index 6ca188b603fe..f2f60e792a57 100644 --- a/contrib/libarchive/SECURITY.md +++ b/contrib/libarchive/SECURITY.md @@ -16,4 +16,4 @@ Please provide the following information in your report: - How to reproduce the issue This project is maintained by volunteers on a reasonable-effort basis. As such, we ask -that you give me 90 days to work on a fix before public exposure. +that you give us 90 days to work on a fix before public exposure. diff --git a/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh b/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh index 2aa4823fc3d0..b33aed5e5562 100755 --- a/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh +++ b/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh @@ -5,6 +5,9 @@ set -eux #brew update > /dev/null #brew upgrade > /dev/null +# Workaround for cmake in local/pinned tap issue +brew uninstall cmake + # This does an upgrade if the package is already installed brew install \ autoconf \ diff --git a/contrib/libarchive/cat/bsdcat.c b/contrib/libarchive/cat/bsdcat.c index 731621fa9b75..2e78870ae50e 100644 --- a/contrib/libarchive/cat/bsdcat.c +++ b/contrib/libarchive/cat/bsdcat.c @@ -7,6 +7,9 @@ #include "bsdcat_platform.h" +#ifdef HAVE_SIGNAL_H +#include +#endif #include #ifdef HAVE_STDLIB_H #include @@ -22,7 +25,7 @@ #include #include "bsdcat.h" -#include "err.h" +#include "lafe_err.h" #define BYTES_PER_BLOCK (20*512) @@ -105,6 +108,16 @@ main(int argc, char **argv) bsdcat = &bsdcat_storage; memset(bsdcat, 0, sizeof(*bsdcat)); +#if defined(HAVE_SIGACTION) && defined(SIGCHLD) + { /* Do not ignore SIGCHLD. */ + struct sigaction sa; + sa.sa_handler = SIG_DFL; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sigaction(SIGCHLD, &sa, NULL); + } +#endif + lafe_setprogname(*argv, "bsdcat"); bsdcat->argv = argv; diff --git a/contrib/libarchive/cat/cmdline.c b/contrib/libarchive/cat/cmdline.c index 8ecd74aa95e4..5a5fcaf0263f 100644 --- a/contrib/libarchive/cat/cmdline.c +++ b/contrib/libarchive/cat/cmdline.c @@ -22,7 +22,7 @@ #endif #include "bsdcat.h" -#include "err.h" +#include "lafe_err.h" /* * Short options for bsdcat. Please keep this sorted. diff --git a/contrib/libarchive/cpio/cmdline.c b/contrib/libarchive/cpio/cmdline.c index c67519947dbc..db06c03c011d 100644 --- a/contrib/libarchive/cpio/cmdline.c +++ b/contrib/libarchive/cpio/cmdline.c @@ -26,7 +26,7 @@ #endif #include "cpio.h" -#include "err.h" +#include "lafe_err.h" /* * Short options for cpio. Please keep this sorted. diff --git a/contrib/libarchive/cpio/cpio.c b/contrib/libarchive/cpio/cpio.c index 2bf1bfa2985a..262db510568b 100644 --- a/contrib/libarchive/cpio/cpio.c +++ b/contrib/libarchive/cpio/cpio.c @@ -60,7 +60,7 @@ #endif #include "cpio.h" -#include "err.h" +#include "lafe_err.h" #include "line_reader.h" #include "passphrase.h" @@ -124,13 +124,21 @@ main(int argc, char *argv[]) cpio->buff_size = sizeof(buff); -#if defined(HAVE_SIGACTION) && defined(SIGPIPE) - { /* Ignore SIGPIPE signals. */ +#if defined(HAVE_SIGACTION) + { struct sigaction sa; sigemptyset(&sa.sa_mask); sa.sa_flags = 0; +#ifdef SIGPIPE + /* Ignore SIGPIPE signals. */ sa.sa_handler = SIG_IGN; sigaction(SIGPIPE, &sa, NULL); +#endif +#ifdef SIGCHLD + /* Do not ignore SIGCHLD. */ + sa.sa_handler = SIG_DFL; + sigaction(SIGCHLD, &sa, NULL); +#endif } #endif diff --git a/contrib/libarchive/cpio/test/test_owner_parse.c b/contrib/libarchive/cpio/test/test_owner_parse.c index dfc78ca77aec..bd68f21cec9b 100644 --- a/contrib/libarchive/cpio/test/test_owner_parse.c +++ b/contrib/libarchive/cpio/test/test_owner_parse.c @@ -7,7 +7,7 @@ #include "test.h" #include "../cpio.h" -#include "err.h" +#include "lafe_err.h" #if !defined(_WIN32) #define ROOT "root" diff --git a/contrib/libarchive/libarchive/archive.h b/contrib/libarchive/libarchive/archive.h index 002190a24663..98d7674e18f1 100644 --- a/contrib/libarchive/libarchive/archive.h +++ b/contrib/libarchive/libarchive/archive.h @@ -34,7 +34,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3008001 +#define ARCHIVE_VERSION_NUMBER 3008002 #include #include /* for wchar_t */ @@ -177,7 +177,7 @@ __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.8.1" +#define ARCHIVE_VERSION_ONLY_STRING "3.8.2" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); diff --git a/contrib/libarchive/libarchive/archive_acl.c b/contrib/libarchive/libarchive/archive_acl.c index 9e71f5ee5610..362e3308f43f 100644 --- a/contrib/libarchive/libarchive/archive_acl.c +++ b/contrib/libarchive/libarchive/archive_acl.c @@ -270,6 +270,19 @@ acl_new_entry(struct archive_acl *acl, { struct archive_acl_entry *ap, *aq; + /* Reject an invalid type */ + switch (type) { + case ARCHIVE_ENTRY_ACL_TYPE_ACCESS: + case ARCHIVE_ENTRY_ACL_TYPE_DEFAULT: + case ARCHIVE_ENTRY_ACL_TYPE_ALLOW: + case ARCHIVE_ENTRY_ACL_TYPE_DENY: + case ARCHIVE_ENTRY_ACL_TYPE_AUDIT: + case ARCHIVE_ENTRY_ACL_TYPE_ALARM: + break; + default: + return (NULL); + } + /* Type argument must be a valid NFS4 or POSIX.1e type. * The type must agree with anything already set and * the permset must be compatible. */ @@ -822,6 +835,9 @@ append_entry_w(wchar_t **wp, const wchar_t *prefix, int type, wname = NULL; id = -1; break; + default: + **wp = '\0'; + break; } *wp += wcslen(*wp); *(*wp)++ = L':'; @@ -878,6 +894,7 @@ append_entry_w(wchar_t **wp, const wchar_t *prefix, int type, wcscpy(*wp, L"alarm"); break; default: + *(*wp) = L'\0'; break; } *wp += wcslen(*wp); @@ -1057,6 +1074,9 @@ append_entry(char **p, const char *prefix, int type, name = NULL; id = -1; break; + default: + **p = '\0'; + break; } *p += strlen(*p); *(*p)++ = ':'; @@ -1112,6 +1132,9 @@ append_entry(char **p, const char *prefix, int type, case ARCHIVE_ENTRY_ACL_TYPE_ALARM: strcpy(*p, "alarm"); break; + default: + *(*p) = '\0'; + break; } *p += strlen(*p); } diff --git a/contrib/libarchive/libarchive/archive_check_magic.c b/contrib/libarchive/libarchive/archive_check_magic.c index d12f0c496e27..6b8e0c5595f4 100644 --- a/contrib/libarchive/libarchive/archive_check_magic.c +++ b/contrib/libarchive/libarchive/archive_check_magic.c @@ -30,6 +30,7 @@ #endif #include +#include #ifdef HAVE_STDLIB_H #include #endif @@ -54,8 +55,14 @@ errmsg(const char *m) while (s > 0) { written = write(2, m, s); - if (written <= 0) + if (written == 0) return; + if (written < 0) + { + if (errno == EINTR) + continue; + return; + } m += written; s -= written; } diff --git a/contrib/libarchive/libarchive/archive_cryptor.c b/contrib/libarchive/libarchive/archive_cryptor.c index 1825af4dc510..9f03f9ca6dd0 100644 --- a/contrib/libarchive/libarchive/archive_cryptor.c +++ b/contrib/libarchive/libarchive/archive_cryptor.c @@ -151,7 +151,7 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt, (void)rounds; /* UNUSED */ (void)derived_key; /* UNUSED */ (void)derived_key_len; /* UNUSED */ - return -1; /* UNSUPPORTED */ + return CRYPTOR_STUB_FUNCTION; /* UNSUPPORTED */ } #endif @@ -439,14 +439,14 @@ aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len) (void)ctx; /* UNUSED */ (void)key; /* UNUSED */ (void)key_len; /* UNUSED */ - return -1; + return CRYPTOR_STUB_FUNCTION; } static int aes_ctr_encrypt_counter(archive_crypto_ctx *ctx) { (void)ctx; /* UNUSED */ - return -1; + return CRYPTOR_STUB_FUNCTION; } static int @@ -469,7 +469,7 @@ aes_ctr_update(archive_crypto_ctx *ctx, const uint8_t * const in, (void)out; /* UNUSED */ (void)out_len; /* UNUSED */ aes_ctr_encrypt_counter(ctx); /* UNUSED */ /* Fix unused function warning */ - return -1; + return CRYPTOR_STUB_FUNCTION; } #else diff --git a/contrib/libarchive/libarchive/archive_cryptor_private.h b/contrib/libarchive/libarchive/archive_cryptor_private.h index 4b3c6c161433..1dbc5c17a01a 100644 --- a/contrib/libarchive/libarchive/archive_cryptor_private.h +++ b/contrib/libarchive/libarchive/archive_cryptor_private.h @@ -43,7 +43,7 @@ int __libarchive_cryptor_build_hack(void); #ifdef __APPLE__ # include # if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -# define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto +# define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto 1 # endif #endif @@ -144,9 +144,15 @@ typedef struct { #else +#if defined(ARCHIVE_CRYPTO_MD5_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA1_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA256_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA384_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA512_WIN) #if defined(_WIN32) && !defined(__CYGWIN__) && !(defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA) #define ARCHIVE_CRYPTOR_USE_WINCRYPT 1 #endif +#endif #define AES_BLOCK_SIZE 16 #define AES_MAX_KEY_SIZE 32 @@ -172,6 +178,9 @@ typedef int archive_crypto_ctx; #define archive_encrypto_aes_ctr_release(ctx) \ __archive_cryptor.encrypto_aes_ctr_release(ctx) +/* Stub return value if no encryption support exists. */ +#define CRYPTOR_STUB_FUNCTION -2 + /* Minimal interface to cryptographic functionality for internal use in * libarchive */ struct archive_cryptor diff --git a/contrib/libarchive/libarchive/archive_entry.h b/contrib/libarchive/libarchive/archive_entry.h index 2b917b3fde8e..344f33bffac2 100644 --- a/contrib/libarchive/libarchive/archive_entry.h +++ b/contrib/libarchive/libarchive/archive_entry.h @@ -28,7 +28,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3008001 +#define ARCHIVE_VERSION_NUMBER 3008002 /* * Note: archive_entry.h is for use outside of libarchive; the diff --git a/contrib/libarchive/libarchive/archive_entry_paths.3 b/contrib/libarchive/libarchive/archive_entry_paths.3 index 0f849c9ebb35..f739b172308d 100644 --- a/contrib/libarchive/libarchive/archive_entry_paths.3 +++ b/contrib/libarchive/libarchive/archive_entry_paths.3 @@ -64,7 +64,7 @@ Streaming Archive Library (libarchive, -larchive) .Ft void .Fn archive_entry_copy_hardlink "struct archive_entry *a" "const char *path" .Ft void -.Fn archive_entry_copy_hardlink_w "struct archive_entry *a "const wchar_t *path" +.Fn archive_entry_copy_hardlink_w "struct archive_entry *a" "const wchar_t *path" .Ft int .Fn archive_entry_update_hardlink_utf8 "struct archive_entry *a" "const char *path" .Ft void diff --git a/contrib/libarchive/libarchive/archive_entry_stat.c b/contrib/libarchive/libarchive/archive_entry_stat.c index c4906838ed0f..345d3d29b2f2 100644 --- a/contrib/libarchive/libarchive/archive_entry_stat.c +++ b/contrib/libarchive/libarchive/archive_entry_stat.c @@ -38,6 +38,7 @@ const struct stat * archive_entry_stat(struct archive_entry *entry) { + int64_t size; struct stat *st; if (entry->stat == NULL) { entry->stat = calloc(1, sizeof(*st)); @@ -74,7 +75,10 @@ archive_entry_stat(struct archive_entry *entry) st->st_ino = (ino_t)archive_entry_ino64(entry); st->st_nlink = archive_entry_nlink(entry); st->st_rdev = archive_entry_rdev(entry); - st->st_size = (off_t)archive_entry_size(entry); + size = archive_entry_size(entry); + st->st_size = (off_t)size; + if (st->st_size < 0 || (int64_t)st->st_size != size) + st->st_size = 0; st->st_mode = archive_entry_mode(entry); /* diff --git a/contrib/libarchive/libarchive/archive_parse_date.c b/contrib/libarchive/libarchive/archive_parse_date.c index cda0b11a555f..d9e968387d34 100644 --- a/contrib/libarchive/libarchive/archive_parse_date.c +++ b/contrib/libarchive/libarchive/archive_parse_date.c @@ -703,9 +703,7 @@ Convert(time_t Month, time_t Day, time_t Year, Year += 1900; DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 29 : 28; - /* Checking for 2038 bogusly assumes that time_t is 32 bits. But - I'm too lazy to try to check for time_t overflow in another way. */ - if (Year < EPOCH || Year >= 2038 + if (Year < EPOCH || (sizeof(time_t) <= 4 && Year >= 2038) || Month < 1 || Month > 12 /* Lint fluff: "conversion from long may lose accuracy" */ || Day < 1 || Day > DaysInMonth[(int)--Month] diff --git a/contrib/libarchive/libarchive/archive_platform.h b/contrib/libarchive/libarchive/archive_platform.h index f30df1104c83..33dc5582b7ed 100644 --- a/contrib/libarchive/libarchive/archive_platform.h +++ b/contrib/libarchive/libarchive/archive_platform.h @@ -183,16 +183,6 @@ #define CAN_RESTORE_METADATA_FD #endif -/* - * glibc 2.24 deprecates readdir_r - * bionic c deprecates readdir_r too - */ -#if defined(HAVE_READDIR_R) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)) && (!defined(__ANDROID__)) -#define USE_READDIR_R 1 -#else -#undef USE_READDIR_R -#endif - /* Set up defaults for internal error codes. */ #ifndef ARCHIVE_ERRNO_FILE_FORMAT #if HAVE_EFTYPE diff --git a/contrib/libarchive/libarchive/archive_platform_stat.h b/contrib/libarchive/libarchive/archive_platform_stat.h new file mode 100644 index 000000000000..5432b2f6433a --- /dev/null +++ b/contrib/libarchive/libarchive/archive_platform_stat.h @@ -0,0 +1,45 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Tobias Stoeckmann + * All rights reserved. + */ + +/* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */ + +#ifndef ARCHIVE_PLATFORM_STAT_H_INCLUDED +#define ARCHIVE_PLATFORM_STAT_H_INCLUDED + +#ifndef __LIBARCHIVE_BUILD +#error This header is only to be used internally to libarchive. +#endif + +#if defined(_WIN32) && !defined(__CYGWIN__) +/* We use _lseeki64() on Windows. */ +typedef int64_t la_seek_t; + +struct la_seek_stat { + int64_t st_mtime; + ino_t st_ino; + unsigned short st_mode; + uint32_t st_nlink; + gid_t st_gid; + la_seek_t st_size; + uid_t st_uid; + dev_t st_dev; + dev_t st_rdev; +}; +typedef struct la_seek_stat la_seek_stat_t; + +#define la_seek_fstat(fd, st) __la_seek_fstat((fd), (st)) +#define la_seek_stat(fd, st) __la_seek_stat((fd), (st)) + +#else +typedef off_t la_seek_t; +typedef struct stat la_seek_stat_t; + +#define la_seek_fstat(fd, st) fstat((fd), (st)) +#define la_seek_stat(fd, st) stat((fd), (st)) +#endif + +#endif /* !ARCHIVE_PLATFORM_STAT_H_INCLUDED */ diff --git a/contrib/libarchive/libarchive/archive_private.h b/contrib/libarchive/libarchive/archive_private.h index 050fc63c0b2e..3a926c6886ad 100644 --- a/contrib/libarchive/libarchive/archive_private.h +++ b/contrib/libarchive/libarchive/archive_private.h @@ -158,6 +158,7 @@ int __archive_check_magic(struct archive *, unsigned int magic, __LA_NORETURN void __archive_errx(int retvalue, const char *msg); void __archive_ensure_cloexec_flag(int fd); +int __archive_get_tempdir(struct archive_string *); int __archive_mktemp(const char *tmpdir); #if defined(_WIN32) && !defined(__CYGWIN__) int __archive_mkstemp(wchar_t *templates); diff --git a/contrib/libarchive/libarchive/archive_read.c b/contrib/libarchive/libarchive/archive_read.c index 50db87017706..c9b9d5981516 100644 --- a/contrib/libarchive/libarchive/archive_read.c +++ b/contrib/libarchive/libarchive/archive_read.c @@ -575,8 +575,7 @@ choose_filters(struct archive_read *a) return (ARCHIVE_OK); } - filter - = calloc(1, sizeof(*filter)); + filter = calloc(1, sizeof(*filter)); if (filter == NULL) return (ARCHIVE_FATAL); filter->bidder = best_bidder; @@ -834,7 +833,9 @@ archive_read_data(struct archive *_a, void *buff, size_t s) r = archive_read_data_block(a, &read_buf, &a->read_data_remaining, &a->read_data_offset); a->read_data_block = read_buf; - if (r == ARCHIVE_EOF) + if (r == ARCHIVE_EOF && + a->read_data_offset == a->read_data_output_offset && + a->read_data_remaining == 0) return (bytes_read); /* * Error codes are all negative, so the status diff --git a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c index 19d049770b78..42af4034b07e 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c +++ b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c @@ -338,7 +338,7 @@ setup_mac_metadata(struct archive_read_disk *a, int ret = ARCHIVE_OK; void *buff = NULL; int have_attrs; - const char *name, *tempdir; + const char *name; struct archive_string tempfile; (void)fd; /* UNUSED */ @@ -357,13 +357,11 @@ setup_mac_metadata(struct archive_read_disk *a, if (have_attrs == 0) return (ARCHIVE_OK); - tempdir = NULL; - if (issetugid() == 0) - tempdir = getenv("TMPDIR"); - if (tempdir == NULL) - tempdir = _PATH_TMP; archive_string_init(&tempfile); - archive_strcpy(&tempfile, tempdir); + if (__archive_get_tempdir(&tempfile) != ARCHIVE_OK) { + ret = ARCHIVE_WARN; + goto cleanup; + } archive_strcat(&tempfile, "tar.md.XXXXXX"); tempfd = mkstemp(tempfile.s); if (tempfd < 0) { diff --git a/contrib/libarchive/libarchive/archive_read_disk_posix.c b/contrib/libarchive/libarchive/archive_read_disk_posix.c index a7a98e9cb1cd..54a8e66188f8 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_posix.c +++ b/contrib/libarchive/libarchive/archive_read_disk_posix.c @@ -168,9 +168,6 @@ struct filesystem { int synthetic; int remote; int noatime; -#if defined(USE_READDIR_R) - size_t name_max; -#endif long incr_xfer_size; long max_xfer_size; long min_xfer_size; @@ -203,10 +200,6 @@ struct tree { DIR *d; #define INVALID_DIR_HANDLE NULL struct dirent *de; -#if defined(USE_READDIR_R) - struct dirent *dirent; - size_t dirent_allocated; -#endif int flags; int visit_type; /* Error code from last failed operation. */ @@ -869,7 +862,7 @@ next_entry(struct archive_read_disk *a, struct tree *t, tree_enter_initial_dir(t); return (ARCHIVE_FATAL); case TREE_ERROR_DIR: - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, + archive_set_error(&a->archive, t->tree_errno, "%s: Couldn't visit directory", tree_current_path(t)); tree_enter_initial_dir(t); @@ -1578,9 +1571,6 @@ setup_current_filesystem(struct archive_read_disk *a) # endif #endif int r, xr = 0; -#if !defined(HAVE_STRUCT_STATFS_F_NAMEMAX) - long nm; -#endif t->current_filesystem->synthetic = -1; t->current_filesystem->remote = -1; @@ -1647,35 +1637,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -#if defined(HAVE_STRUCT_STATFS_F_NAMEMAX) - t->current_filesystem->name_max = sfs.f_namemax; -#else -# if defined(_PC_NAME_MAX) - /* Mac OS X does not have f_namemax in struct statfs. */ - if (tree_current_is_symblic_link_target(t)) { - if (tree_enter_working_dir(t) != 0) { - archive_set_error(&a->archive, errno, "fchdir failed"); - return (ARCHIVE_FAILED); - } - nm = pathconf(tree_current_access_path(t), _PC_NAME_MAX); - } else - nm = fpathconf(tree_current_dir_fd(t), _PC_NAME_MAX); -# else - nm = -1; -# endif - if (nm == -1) - t->current_filesystem->name_max = NAME_MAX; - else - t->current_filesystem->name_max = nm; -#endif - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif /* USE_READDIR_R */ return (ARCHIVE_OK); } @@ -1863,19 +1824,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -#if defined(HAVE_STATVFS) - t->current_filesystem->name_max = svfs.f_namemax; -#else - t->current_filesystem->name_max = sfs.f_namelen; -#endif - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif return (ARCHIVE_OK); } @@ -1953,15 +1901,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ - t->current_filesystem->name_max = svfs.f_namemax; - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif return (ARCHIVE_OK); } @@ -1975,9 +1914,6 @@ static int setup_current_filesystem(struct archive_read_disk *a) { struct tree *t = a->tree; -#if defined(_PC_NAME_MAX) && defined(USE_READDIR_R) - long nm; -#endif t->current_filesystem->synthetic = -1;/* Not supported */ t->current_filesystem->remote = -1;/* Not supported */ t->current_filesystem->noatime = 0; @@ -1987,40 +1923,6 @@ setup_current_filesystem(struct archive_read_disk *a) t->current_filesystem->min_xfer_size = -1; t->current_filesystem->incr_xfer_size = -1; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -# if defined(_PC_NAME_MAX) - if (tree_current_is_symblic_link_target(t)) { - if (tree_enter_working_dir(t) != 0) { - archive_set_error(&a->archive, errno, "fchdir failed"); - return (ARCHIVE_FAILED); - } - nm = pathconf(tree_current_access_path(t), _PC_NAME_MAX); - } else - nm = fpathconf(tree_current_dir_fd(t), _PC_NAME_MAX); - if (nm == -1) -# endif /* _PC_NAME_MAX */ - /* - * Some systems (HP-UX or others?) incorrectly defined - * NAME_MAX macro to be a smaller value. - */ -# if defined(NAME_MAX) && NAME_MAX >= 255 - t->current_filesystem->name_max = NAME_MAX; -# else - /* No way to get a trusted value of maximum filename - * length. */ - t->current_filesystem->name_max = PATH_MAX; -# endif /* NAME_MAX */ -# if defined(_PC_NAME_MAX) - else - t->current_filesystem->name_max = nm; -# endif /* _PC_NAME_MAX */ - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif /* USE_READDIR_R */ return (ARCHIVE_OK); } @@ -2112,8 +2014,11 @@ tree_dup(int fd) } #endif /* F_DUPFD_CLOEXEC */ new_fd = dup(fd); - __archive_ensure_cloexec_flag(new_fd); - return (new_fd); + if (new_fd != -1) { + __archive_ensure_cloexec_flag(new_fd); + return (new_fd); + } + return (-1); } /* @@ -2235,11 +2140,16 @@ tree_reopen(struct tree *t, const char *path, int restore_time) * so try again for execute. The consequences of not opening this are * unhelpful and unnecessary errors later. */ - if (t->initial_dir_fd < 0) + if (t->initial_dir_fd < 0) { t->initial_dir_fd = open(".", o_flag | O_CLOEXEC); + if (t->initial_dir_fd < 0) + return NULL; + } #endif __archive_ensure_cloexec_flag(t->initial_dir_fd); t->working_dir_fd = tree_dup(t->initial_dir_fd); + if (t->working_dir_fd < 0) + return NULL; return (t); } @@ -2449,12 +2359,11 @@ tree_dir_next_posix(struct tree *t) size_t namelen; if (t->d == NULL) { -#if defined(USE_READDIR_R) - size_t dirent_size; -#endif #if defined(HAVE_FDOPENDIR) - t->d = fdopendir(tree_dup(t->working_dir_fd)); + int fd = tree_dup(t->working_dir_fd); + if (fd != -1) + t->d = fdopendir(fd); #else /* HAVE_FDOPENDIR */ if (tree_enter_working_dir(t) == 0) { t->d = opendir("."); @@ -2470,45 +2379,12 @@ tree_dir_next_posix(struct tree *t) t->visit_type = r != 0 ? r : TREE_ERROR_DIR; return (t->visit_type); } -#if defined(USE_READDIR_R) - dirent_size = offsetof(struct dirent, d_name) + - t->filesystem_table[t->current->filesystem_id].name_max + 1; - if (t->dirent == NULL || t->dirent_allocated < dirent_size) { - free(t->dirent); - t->dirent = malloc(dirent_size); - if (t->dirent == NULL) { - closedir(t->d); - t->d = INVALID_DIR_HANDLE; - (void)tree_ascend(t); - tree_pop(t); - t->tree_errno = ENOMEM; - t->visit_type = TREE_ERROR_DIR; - return (t->visit_type); - } - t->dirent_allocated = dirent_size; - } -#endif /* USE_READDIR_R */ } for (;;) { errno = 0; -#if defined(USE_READDIR_R) - r = readdir_r(t->d, t->dirent, &t->de); -#ifdef _AIX - /* Note: According to the man page, return value 9 indicates - * that the readdir_r was not successful and the error code - * is set to the global errno variable. And then if the end - * of directory entries was reached, the return value is 9 - * and the third parameter is set to NULL and errno is - * unchanged. */ - if (r == 9) - r = errno; -#endif /* _AIX */ - if (r != 0 || t->de == NULL) { -#else t->de = readdir(t->d); if (t->de == NULL) { r = errno; -#endif closedir(t->d); t->d = INVALID_DIR_HANDLE; if (r != 0) { @@ -2747,9 +2623,6 @@ tree_free(struct tree *t) if (t == NULL) return; archive_string_free(&t->path); -#if defined(USE_READDIR_R) - free(t->dirent); -#endif free(t->sparse_list); for (i = 0; i < t->max_filesystem_id; i++) free(t->filesystem_table[i].allocation_ptr); diff --git a/contrib/libarchive/libarchive/archive_read_open_fd.c b/contrib/libarchive/libarchive/archive_read_open_fd.c index dc7c9e52c6f6..c85a62a3e2d7 100644 --- a/contrib/libarchive/libarchive/archive_read_open_fd.c +++ b/contrib/libarchive/libarchive/archive_read_open_fd.c @@ -48,6 +48,7 @@ #endif #include "archive.h" +#include "archive_platform_stat.h" struct read_fd_data { int fd; @@ -65,12 +66,12 @@ static int64_t file_skip(struct archive *, void *, int64_t request); int archive_read_open_fd(struct archive *a, int fd, size_t block_size) *** 3269 LINES SKIPPED *** From nobody Mon Nov 3 10:50:42 2025 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 4d0Szk6zFQz6FNnG; Mon, 03 Nov 2025 10:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Szk6ZlXz3wTf; Mon, 03 Nov 2025 10:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762167042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H50oBDdxzey08IkI60peyj2w1S+A0+HdB46P2RK6m5c=; b=xKYdqgy18t/hYHDvvZPdnWRQGgOKvCRHp0Fb2F8DnxuEhuLG+L5rINNjQqKcwygIXHGIdX az2mNebixg3+O47m543oepbB/Wvb7qHoVub2Ut0owzcgZtoWdIch6tS7KWDOfLl7Gn61i0 NUXDfgNl6s7Zg4zkhsBbVtTZSDcbwpwF49dz4xvITutkH/UYGGnVOKfq6MbEZXD9eh2AXJ Qg/zoavtZNQ66yLAGiuA9KDGi0hC87VpIdog/LuqYIAjSLrM2yBlJqwcn1R5c7H/4UkSt1 lNQ/0/TrnERIqx0WCbTEhFwkfM7fsmhV1TrmbRJoINYwVAaadkI9rvds0ml0gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762167042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H50oBDdxzey08IkI60peyj2w1S+A0+HdB46P2RK6m5c=; b=NOPwi1jFmeKZiU9q3rDGeEsJZG+qyy1TnNEsC12TMiusxe2WpJjX9ks5kDSVjFTQmTiOEg oqOalIwnrVucqBPKmEeTda4dE1B3rIqGkjYsQPiLbtfbtEXt8ooW/cl9UAmu/jzhmq7Z3k rZcLp19a03ITAOaSwCtRmSIgPruN1yFjwDCrVMq/2+ithKUTy8BsBYnCrP875PipfpItax U3ufzEBWuZA9Srkzu1WfpDLPeCJ3grj4zI9W6zzS9kPasINIO3aGe82Mv3pVoRcBNbvDTk AHljEK0Ot6YMYUoG7ej5im+RpnFw57cutIl2Zc41BfsxeT9xvWz0BridV6kjCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762167042; a=rsa-sha256; cv=none; b=CQwI0rC1mN6mYQI43e5f92PUo7s6J+IdrMpb6w4NSLnnm59u9jCBo6dZuPjyn92Nx+RYWt 80JXsm76maLxY7oTJ5H4UKlVnmhmGlAgj0Dbzfo1FdYExtHNCBGM5oDGKtPmOWOdhwxy/S 26u+tkqH5o0MKC74wMks4+u/Ac0su8d6sjeSMy7SzpTjjwQ17rucD7sBIPrcTd1duCRGmd TMvDYPNNj5IzxlPRxP7bpLWQqLcVMYvgPC5vGFnLuPFpjvyNRhFd9n8wLzN5fN7TY60Pl9 rNU1hpPSW6lgT07QFccfcnTzrNFEZr18LlQig9bQWcaXtOlJytRXaGzNnfFn6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Szk5n6Wz171y; Mon, 03 Nov 2025 10:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3Aogsc069142; Mon, 3 Nov 2025 10:50:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3AogrD069139; Mon, 3 Nov 2025 10:50:42 GMT (envelope-from git) Date: Mon, 3 Nov 2025 10:50:42 GMT Message-Id: <202511031050.5A3AogrD069139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 1b969a57d0d1 - stable/13 - libarchive: merge from vendor branch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b969a57d0d1cd8d4505984820a365f721e6efc6 Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=1b969a57d0d1cd8d4505984820a365f721e6efc6 commit 1b969a57d0d1cd8d4505984820a365f721e6efc6 Author: Martin Matuska AuthorDate: 2025-10-21 14:10:15 +0000 Commit: Martin Matuska CommitDate: 2025-11-03 09:30:24 +0000 libarchive: merge from vendor branch Update libarchive to 3.8.2 Important bugfixes: #2477 tar writer: fix replacing a regular file with a dir for ARCHIVE_EXTRACT_SAFE_WRITES #2659 lib: improve filter process handling #2664 zip writer: fix a memory leak if write callback error early #2665 lib: archive_read_data: handle sparse holes at end of file correctly #2668 7zip: Fix out of boundary access #2670 zip writer: fix writing with ZSTD compression #2672 lib: fix error checking in writing files #2678 zstd write filter: enable Zstandard's checksum feature #2679 lib: handle possible errors from system calls #2707 lib: avoid leaking file descriptors into subprocesses #2713 RAR5 reader: fix multiple issues in extra field parsing function #2716 RAR5 reader: early fail when file declares data for a dir entry #2717 bsdtar: Allow filename to have CRLF endings #2719 tar reader: fix checking the result of the strftime (CVE-2025-25724) #2737 tar reader: fix an infinite loop when parsing V headers #2742 lib: parse_date: handle dates in 2038 and beyond if time_t is big enough Obtained from: libarchive Vendor commit: 7f53fce04e4e672230f4eb80b219af17975e4f83 Security: CVE-2025-25724 PR: 290303 (exp-run, main) (cherry picked from commit 401026e4825a05abba6f945cf1b74b3328876fa2) --- contrib/libarchive/NEWS | 2 + contrib/libarchive/SECURITY.md | 2 +- .../github_actions/install-macos-dependencies.sh | 3 + contrib/libarchive/cat/bsdcat.c | 15 +- contrib/libarchive/cat/cmdline.c | 2 +- contrib/libarchive/cpio/cmdline.c | 2 +- contrib/libarchive/cpio/cpio.c | 14 +- contrib/libarchive/cpio/test/test_owner_parse.c | 2 +- contrib/libarchive/libarchive/archive.h | 4 +- contrib/libarchive/libarchive/archive_acl.c | 23 +++ .../libarchive/libarchive/archive_check_magic.c | 9 +- contrib/libarchive/libarchive/archive_cryptor.c | 8 +- .../libarchive/archive_cryptor_private.h | 11 +- contrib/libarchive/libarchive/archive_entry.h | 2 +- .../libarchive/libarchive/archive_entry_paths.3 | 2 +- contrib/libarchive/libarchive/archive_entry_stat.c | 6 +- contrib/libarchive/libarchive/archive_parse_date.c | 4 +- contrib/libarchive/libarchive/archive_platform.h | 10 -- .../libarchive/libarchive/archive_platform_stat.h | 45 ++++++ contrib/libarchive/libarchive/archive_private.h | 1 + contrib/libarchive/libarchive/archive_read.c | 7 +- .../libarchive/archive_read_disk_entry_from_file.c | 12 +- .../libarchive/archive_read_disk_posix.c | 157 ++------------------- .../libarchive/libarchive/archive_read_open_fd.c | 23 +-- .../libarchive/libarchive/archive_read_open_file.c | 16 ++- .../libarchive/archive_read_open_filename.c | 31 ++-- .../libarchive/archive_read_set_format.c | 32 ++--- .../archive_read_support_filter_program.c | 7 +- .../libarchive/archive_read_support_format_7zip.c | 7 +- .../libarchive/archive_read_support_format_mtree.c | 23 ++- .../libarchive/archive_read_support_format_rar.c | 8 +- .../libarchive/archive_read_support_format_rar5.c | 66 +++++++-- .../libarchive/archive_read_support_format_tar.c | 70 ++++++--- .../libarchive/archive_read_support_format_warc.c | 2 +- .../libarchive/archive_read_support_format_xar.c | 2 +- .../libarchive/archive_read_support_format_zip.c | 4 +- contrib/libarchive/libarchive/archive_string.c | 5 +- .../libarchive/libarchive/archive_string_sprintf.c | 2 +- contrib/libarchive/libarchive/archive_util.c | 38 ++++- contrib/libarchive/libarchive/archive_write.c | 30 ++-- .../libarchive/archive_write_add_filter_bzip2.c | 4 + .../libarchive/archive_write_add_filter_gzip.c | 55 +++++--- .../libarchive/archive_write_add_filter_program.c | 11 +- .../libarchive/archive_write_add_filter_zstd.c | 2 + .../libarchive/archive_write_disk_posix.c | 16 ++- .../libarchive/libarchive/archive_write_open_fd.c | 2 +- .../libarchive/archive_write_open_file.c | 14 +- .../libarchive/archive_write_open_filename.c | 3 +- .../libarchive/archive_write_set_format_7zip.c | 2 +- .../libarchive/archive_write_set_format_mtree.c | 19 ++- .../libarchive/archive_write_set_format_xar.c | 6 +- .../libarchive/archive_write_set_format_zip.c | 25 +++- contrib/libarchive/libarchive/filter_fork_posix.c | 37 ++++- contrib/libarchive/libarchive/test/test_acl_nfs4.c | 7 + .../libarchive/libarchive/test/test_acl_posix1e.c | 5 + .../libarchive/test/test_archive_parse_date.c | 2 + .../test/test_archive_string_conversion.c | 10 ++ contrib/libarchive/libarchive/test/test_entry.c | 11 ++ .../test/test_read_filter_gzip_recursive.c | 4 +- .../libarchive/test/test_read_format_7zip.c | 81 +++++++---- .../libarchive/test/test_read_format_rar5.c | 66 +++++++++ .../test/test_read_format_rar5_dirdata.rar.uu | 6 + ...rmat_rar5_invalid_hash_valid_htime_exfld.rar.uu | 6 + .../test_read_format_rar5_only_crypt_exfld.rar.uu | 7 + .../test_read_format_rar5_unsupported_exfld.rar.uu | 6 + .../test/test_read_format_tar_V_negative_size.c | 48 +++++++ .../test_read_format_tar_V_negative_size.tar.uu | 20 +++ .../libarchive/test/test_read_set_format.c | 7 +- .../libarchive/test/test_write_filter_bzip2.c | 29 ++++ .../libarchive/test/test_write_filter_gzip.c | 12 +- .../test/test_write_filter_gzip_timestamp.c | 7 +- .../libarchive/libarchive_fe/{err.c => lafe_err.c} | 2 +- .../libarchive/libarchive_fe/{err.h => lafe_err.h} | 0 contrib/libarchive/libarchive_fe/line_reader.c | 2 +- contrib/libarchive/libarchive_fe/passphrase.c | 2 +- contrib/libarchive/tar/bsdtar.c | 7 +- contrib/libarchive/tar/bsdtar.h | 8 +- contrib/libarchive/tar/cmdline.c | 2 +- contrib/libarchive/tar/creation_set.c | 2 +- contrib/libarchive/tar/read.c | 2 +- contrib/libarchive/tar/subst.c | 2 +- contrib/libarchive/tar/test/test_crlf_mtree.c | 74 ++++++++++ .../libarchive/tar/test/test_option_safe_writes.c | 5 +- contrib/libarchive/tar/util.c | 7 +- contrib/libarchive/tar/write.c | 29 +++- contrib/libarchive/test_utils/test_common.h | 10 +- contrib/libarchive/test_utils/test_main.c | 156 +++++--------------- contrib/libarchive/unzip/bsdunzip.c | 15 +- contrib/libarchive/unzip/cmdline.c | 2 +- contrib/libarchive/unzip/test/test_C.c | 4 + contrib/libarchive/unzip/test/test_L.c | 4 + contrib/libarchive/unzip/test/test_P_encryption.c | 12 +- contrib/libarchive/unzip/test/test_basic.c | 4 + contrib/libarchive/unzip/test/test_d.c | 8 ++ contrib/libarchive/unzip/test/test_doubledash.c | 4 + contrib/libarchive/unzip/test/test_glob.c | 4 + contrib/libarchive/unzip/test/test_j.c | 4 + contrib/libarchive/unzip/test/test_n.c | 4 + contrib/libarchive/unzip/test/test_o.c | 4 + contrib/libarchive/unzip/test/test_p.c | 4 + contrib/libarchive/unzip/test/test_q.c | 4 + contrib/libarchive/unzip/test/test_singlefile.c | 4 + contrib/libarchive/unzip/test/test_t.c | 4 + contrib/libarchive/unzip/test/test_x.c | 12 ++ lib/libarchive/tests/Makefile | 6 + usr.bin/bsdcat/Makefile | 2 +- usr.bin/cpio/Makefile | 2 +- usr.bin/cpio/tests/Makefile | 2 +- usr.bin/tar/Makefile | 2 +- usr.bin/tar/tests/Makefile | 1 + usr.bin/unzip/Makefile | 2 +- usr.bin/unzip/tests/Makefile | 2 +- 112 files changed, 1119 insertions(+), 546 deletions(-) diff --git a/contrib/libarchive/NEWS b/contrib/libarchive/NEWS index caca7d5cbdb9..f2dd4102fa04 100644 --- a/contrib/libarchive/NEWS +++ b/contrib/libarchive/NEWS @@ -1,3 +1,5 @@ +Oct 15, 2026: libarchive 3.8.2 released + Jun 01, 2026: libarchive 3.8.1 released May 20, 2025: libarchive 3.8.0 released diff --git a/contrib/libarchive/SECURITY.md b/contrib/libarchive/SECURITY.md index 6ca188b603fe..f2f60e792a57 100644 --- a/contrib/libarchive/SECURITY.md +++ b/contrib/libarchive/SECURITY.md @@ -16,4 +16,4 @@ Please provide the following information in your report: - How to reproduce the issue This project is maintained by volunteers on a reasonable-effort basis. As such, we ask -that you give me 90 days to work on a fix before public exposure. +that you give us 90 days to work on a fix before public exposure. diff --git a/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh b/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh index 2aa4823fc3d0..b33aed5e5562 100755 --- a/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh +++ b/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh @@ -5,6 +5,9 @@ set -eux #brew update > /dev/null #brew upgrade > /dev/null +# Workaround for cmake in local/pinned tap issue +brew uninstall cmake + # This does an upgrade if the package is already installed brew install \ autoconf \ diff --git a/contrib/libarchive/cat/bsdcat.c b/contrib/libarchive/cat/bsdcat.c index 731621fa9b75..2e78870ae50e 100644 --- a/contrib/libarchive/cat/bsdcat.c +++ b/contrib/libarchive/cat/bsdcat.c @@ -7,6 +7,9 @@ #include "bsdcat_platform.h" +#ifdef HAVE_SIGNAL_H +#include +#endif #include #ifdef HAVE_STDLIB_H #include @@ -22,7 +25,7 @@ #include #include "bsdcat.h" -#include "err.h" +#include "lafe_err.h" #define BYTES_PER_BLOCK (20*512) @@ -105,6 +108,16 @@ main(int argc, char **argv) bsdcat = &bsdcat_storage; memset(bsdcat, 0, sizeof(*bsdcat)); +#if defined(HAVE_SIGACTION) && defined(SIGCHLD) + { /* Do not ignore SIGCHLD. */ + struct sigaction sa; + sa.sa_handler = SIG_DFL; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sigaction(SIGCHLD, &sa, NULL); + } +#endif + lafe_setprogname(*argv, "bsdcat"); bsdcat->argv = argv; diff --git a/contrib/libarchive/cat/cmdline.c b/contrib/libarchive/cat/cmdline.c index 8ecd74aa95e4..5a5fcaf0263f 100644 --- a/contrib/libarchive/cat/cmdline.c +++ b/contrib/libarchive/cat/cmdline.c @@ -22,7 +22,7 @@ #endif #include "bsdcat.h" -#include "err.h" +#include "lafe_err.h" /* * Short options for bsdcat. Please keep this sorted. diff --git a/contrib/libarchive/cpio/cmdline.c b/contrib/libarchive/cpio/cmdline.c index c67519947dbc..db06c03c011d 100644 --- a/contrib/libarchive/cpio/cmdline.c +++ b/contrib/libarchive/cpio/cmdline.c @@ -26,7 +26,7 @@ #endif #include "cpio.h" -#include "err.h" +#include "lafe_err.h" /* * Short options for cpio. Please keep this sorted. diff --git a/contrib/libarchive/cpio/cpio.c b/contrib/libarchive/cpio/cpio.c index 2bf1bfa2985a..262db510568b 100644 --- a/contrib/libarchive/cpio/cpio.c +++ b/contrib/libarchive/cpio/cpio.c @@ -60,7 +60,7 @@ #endif #include "cpio.h" -#include "err.h" +#include "lafe_err.h" #include "line_reader.h" #include "passphrase.h" @@ -124,13 +124,21 @@ main(int argc, char *argv[]) cpio->buff_size = sizeof(buff); -#if defined(HAVE_SIGACTION) && defined(SIGPIPE) - { /* Ignore SIGPIPE signals. */ +#if defined(HAVE_SIGACTION) + { struct sigaction sa; sigemptyset(&sa.sa_mask); sa.sa_flags = 0; +#ifdef SIGPIPE + /* Ignore SIGPIPE signals. */ sa.sa_handler = SIG_IGN; sigaction(SIGPIPE, &sa, NULL); +#endif +#ifdef SIGCHLD + /* Do not ignore SIGCHLD. */ + sa.sa_handler = SIG_DFL; + sigaction(SIGCHLD, &sa, NULL); +#endif } #endif diff --git a/contrib/libarchive/cpio/test/test_owner_parse.c b/contrib/libarchive/cpio/test/test_owner_parse.c index dfc78ca77aec..bd68f21cec9b 100644 --- a/contrib/libarchive/cpio/test/test_owner_parse.c +++ b/contrib/libarchive/cpio/test/test_owner_parse.c @@ -7,7 +7,7 @@ #include "test.h" #include "../cpio.h" -#include "err.h" +#include "lafe_err.h" #if !defined(_WIN32) #define ROOT "root" diff --git a/contrib/libarchive/libarchive/archive.h b/contrib/libarchive/libarchive/archive.h index 002190a24663..98d7674e18f1 100644 --- a/contrib/libarchive/libarchive/archive.h +++ b/contrib/libarchive/libarchive/archive.h @@ -34,7 +34,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3008001 +#define ARCHIVE_VERSION_NUMBER 3008002 #include #include /* for wchar_t */ @@ -177,7 +177,7 @@ __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.8.1" +#define ARCHIVE_VERSION_ONLY_STRING "3.8.2" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); diff --git a/contrib/libarchive/libarchive/archive_acl.c b/contrib/libarchive/libarchive/archive_acl.c index 9e71f5ee5610..362e3308f43f 100644 --- a/contrib/libarchive/libarchive/archive_acl.c +++ b/contrib/libarchive/libarchive/archive_acl.c @@ -270,6 +270,19 @@ acl_new_entry(struct archive_acl *acl, { struct archive_acl_entry *ap, *aq; + /* Reject an invalid type */ + switch (type) { + case ARCHIVE_ENTRY_ACL_TYPE_ACCESS: + case ARCHIVE_ENTRY_ACL_TYPE_DEFAULT: + case ARCHIVE_ENTRY_ACL_TYPE_ALLOW: + case ARCHIVE_ENTRY_ACL_TYPE_DENY: + case ARCHIVE_ENTRY_ACL_TYPE_AUDIT: + case ARCHIVE_ENTRY_ACL_TYPE_ALARM: + break; + default: + return (NULL); + } + /* Type argument must be a valid NFS4 or POSIX.1e type. * The type must agree with anything already set and * the permset must be compatible. */ @@ -822,6 +835,9 @@ append_entry_w(wchar_t **wp, const wchar_t *prefix, int type, wname = NULL; id = -1; break; + default: + **wp = '\0'; + break; } *wp += wcslen(*wp); *(*wp)++ = L':'; @@ -878,6 +894,7 @@ append_entry_w(wchar_t **wp, const wchar_t *prefix, int type, wcscpy(*wp, L"alarm"); break; default: + *(*wp) = L'\0'; break; } *wp += wcslen(*wp); @@ -1057,6 +1074,9 @@ append_entry(char **p, const char *prefix, int type, name = NULL; id = -1; break; + default: + **p = '\0'; + break; } *p += strlen(*p); *(*p)++ = ':'; @@ -1112,6 +1132,9 @@ append_entry(char **p, const char *prefix, int type, case ARCHIVE_ENTRY_ACL_TYPE_ALARM: strcpy(*p, "alarm"); break; + default: + *(*p) = '\0'; + break; } *p += strlen(*p); } diff --git a/contrib/libarchive/libarchive/archive_check_magic.c b/contrib/libarchive/libarchive/archive_check_magic.c index d12f0c496e27..6b8e0c5595f4 100644 --- a/contrib/libarchive/libarchive/archive_check_magic.c +++ b/contrib/libarchive/libarchive/archive_check_magic.c @@ -30,6 +30,7 @@ #endif #include +#include #ifdef HAVE_STDLIB_H #include #endif @@ -54,8 +55,14 @@ errmsg(const char *m) while (s > 0) { written = write(2, m, s); - if (written <= 0) + if (written == 0) return; + if (written < 0) + { + if (errno == EINTR) + continue; + return; + } m += written; s -= written; } diff --git a/contrib/libarchive/libarchive/archive_cryptor.c b/contrib/libarchive/libarchive/archive_cryptor.c index 1825af4dc510..9f03f9ca6dd0 100644 --- a/contrib/libarchive/libarchive/archive_cryptor.c +++ b/contrib/libarchive/libarchive/archive_cryptor.c @@ -151,7 +151,7 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt, (void)rounds; /* UNUSED */ (void)derived_key; /* UNUSED */ (void)derived_key_len; /* UNUSED */ - return -1; /* UNSUPPORTED */ + return CRYPTOR_STUB_FUNCTION; /* UNSUPPORTED */ } #endif @@ -439,14 +439,14 @@ aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len) (void)ctx; /* UNUSED */ (void)key; /* UNUSED */ (void)key_len; /* UNUSED */ - return -1; + return CRYPTOR_STUB_FUNCTION; } static int aes_ctr_encrypt_counter(archive_crypto_ctx *ctx) { (void)ctx; /* UNUSED */ - return -1; + return CRYPTOR_STUB_FUNCTION; } static int @@ -469,7 +469,7 @@ aes_ctr_update(archive_crypto_ctx *ctx, const uint8_t * const in, (void)out; /* UNUSED */ (void)out_len; /* UNUSED */ aes_ctr_encrypt_counter(ctx); /* UNUSED */ /* Fix unused function warning */ - return -1; + return CRYPTOR_STUB_FUNCTION; } #else diff --git a/contrib/libarchive/libarchive/archive_cryptor_private.h b/contrib/libarchive/libarchive/archive_cryptor_private.h index 4b3c6c161433..1dbc5c17a01a 100644 --- a/contrib/libarchive/libarchive/archive_cryptor_private.h +++ b/contrib/libarchive/libarchive/archive_cryptor_private.h @@ -43,7 +43,7 @@ int __libarchive_cryptor_build_hack(void); #ifdef __APPLE__ # include # if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -# define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto +# define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto 1 # endif #endif @@ -144,9 +144,15 @@ typedef struct { #else +#if defined(ARCHIVE_CRYPTO_MD5_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA1_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA256_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA384_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA512_WIN) #if defined(_WIN32) && !defined(__CYGWIN__) && !(defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA) #define ARCHIVE_CRYPTOR_USE_WINCRYPT 1 #endif +#endif #define AES_BLOCK_SIZE 16 #define AES_MAX_KEY_SIZE 32 @@ -172,6 +178,9 @@ typedef int archive_crypto_ctx; #define archive_encrypto_aes_ctr_release(ctx) \ __archive_cryptor.encrypto_aes_ctr_release(ctx) +/* Stub return value if no encryption support exists. */ +#define CRYPTOR_STUB_FUNCTION -2 + /* Minimal interface to cryptographic functionality for internal use in * libarchive */ struct archive_cryptor diff --git a/contrib/libarchive/libarchive/archive_entry.h b/contrib/libarchive/libarchive/archive_entry.h index 2b917b3fde8e..344f33bffac2 100644 --- a/contrib/libarchive/libarchive/archive_entry.h +++ b/contrib/libarchive/libarchive/archive_entry.h @@ -28,7 +28,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3008001 +#define ARCHIVE_VERSION_NUMBER 3008002 /* * Note: archive_entry.h is for use outside of libarchive; the diff --git a/contrib/libarchive/libarchive/archive_entry_paths.3 b/contrib/libarchive/libarchive/archive_entry_paths.3 index 0f849c9ebb35..f739b172308d 100644 --- a/contrib/libarchive/libarchive/archive_entry_paths.3 +++ b/contrib/libarchive/libarchive/archive_entry_paths.3 @@ -64,7 +64,7 @@ Streaming Archive Library (libarchive, -larchive) .Ft void .Fn archive_entry_copy_hardlink "struct archive_entry *a" "const char *path" .Ft void -.Fn archive_entry_copy_hardlink_w "struct archive_entry *a "const wchar_t *path" +.Fn archive_entry_copy_hardlink_w "struct archive_entry *a" "const wchar_t *path" .Ft int .Fn archive_entry_update_hardlink_utf8 "struct archive_entry *a" "const char *path" .Ft void diff --git a/contrib/libarchive/libarchive/archive_entry_stat.c b/contrib/libarchive/libarchive/archive_entry_stat.c index c4906838ed0f..345d3d29b2f2 100644 --- a/contrib/libarchive/libarchive/archive_entry_stat.c +++ b/contrib/libarchive/libarchive/archive_entry_stat.c @@ -38,6 +38,7 @@ const struct stat * archive_entry_stat(struct archive_entry *entry) { + int64_t size; struct stat *st; if (entry->stat == NULL) { entry->stat = calloc(1, sizeof(*st)); @@ -74,7 +75,10 @@ archive_entry_stat(struct archive_entry *entry) st->st_ino = (ino_t)archive_entry_ino64(entry); st->st_nlink = archive_entry_nlink(entry); st->st_rdev = archive_entry_rdev(entry); - st->st_size = (off_t)archive_entry_size(entry); + size = archive_entry_size(entry); + st->st_size = (off_t)size; + if (st->st_size < 0 || (int64_t)st->st_size != size) + st->st_size = 0; st->st_mode = archive_entry_mode(entry); /* diff --git a/contrib/libarchive/libarchive/archive_parse_date.c b/contrib/libarchive/libarchive/archive_parse_date.c index cda0b11a555f..d9e968387d34 100644 --- a/contrib/libarchive/libarchive/archive_parse_date.c +++ b/contrib/libarchive/libarchive/archive_parse_date.c @@ -703,9 +703,7 @@ Convert(time_t Month, time_t Day, time_t Year, Year += 1900; DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 29 : 28; - /* Checking for 2038 bogusly assumes that time_t is 32 bits. But - I'm too lazy to try to check for time_t overflow in another way. */ - if (Year < EPOCH || Year >= 2038 + if (Year < EPOCH || (sizeof(time_t) <= 4 && Year >= 2038) || Month < 1 || Month > 12 /* Lint fluff: "conversion from long may lose accuracy" */ || Day < 1 || Day > DaysInMonth[(int)--Month] diff --git a/contrib/libarchive/libarchive/archive_platform.h b/contrib/libarchive/libarchive/archive_platform.h index f30df1104c83..33dc5582b7ed 100644 --- a/contrib/libarchive/libarchive/archive_platform.h +++ b/contrib/libarchive/libarchive/archive_platform.h @@ -183,16 +183,6 @@ #define CAN_RESTORE_METADATA_FD #endif -/* - * glibc 2.24 deprecates readdir_r - * bionic c deprecates readdir_r too - */ -#if defined(HAVE_READDIR_R) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)) && (!defined(__ANDROID__)) -#define USE_READDIR_R 1 -#else -#undef USE_READDIR_R -#endif - /* Set up defaults for internal error codes. */ #ifndef ARCHIVE_ERRNO_FILE_FORMAT #if HAVE_EFTYPE diff --git a/contrib/libarchive/libarchive/archive_platform_stat.h b/contrib/libarchive/libarchive/archive_platform_stat.h new file mode 100644 index 000000000000..5432b2f6433a --- /dev/null +++ b/contrib/libarchive/libarchive/archive_platform_stat.h @@ -0,0 +1,45 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Tobias Stoeckmann + * All rights reserved. + */ + +/* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */ + +#ifndef ARCHIVE_PLATFORM_STAT_H_INCLUDED +#define ARCHIVE_PLATFORM_STAT_H_INCLUDED + +#ifndef __LIBARCHIVE_BUILD +#error This header is only to be used internally to libarchive. +#endif + +#if defined(_WIN32) && !defined(__CYGWIN__) +/* We use _lseeki64() on Windows. */ +typedef int64_t la_seek_t; + +struct la_seek_stat { + int64_t st_mtime; + ino_t st_ino; + unsigned short st_mode; + uint32_t st_nlink; + gid_t st_gid; + la_seek_t st_size; + uid_t st_uid; + dev_t st_dev; + dev_t st_rdev; +}; +typedef struct la_seek_stat la_seek_stat_t; + +#define la_seek_fstat(fd, st) __la_seek_fstat((fd), (st)) +#define la_seek_stat(fd, st) __la_seek_stat((fd), (st)) + +#else +typedef off_t la_seek_t; +typedef struct stat la_seek_stat_t; + +#define la_seek_fstat(fd, st) fstat((fd), (st)) +#define la_seek_stat(fd, st) stat((fd), (st)) +#endif + +#endif /* !ARCHIVE_PLATFORM_STAT_H_INCLUDED */ diff --git a/contrib/libarchive/libarchive/archive_private.h b/contrib/libarchive/libarchive/archive_private.h index 050fc63c0b2e..3a926c6886ad 100644 --- a/contrib/libarchive/libarchive/archive_private.h +++ b/contrib/libarchive/libarchive/archive_private.h @@ -158,6 +158,7 @@ int __archive_check_magic(struct archive *, unsigned int magic, __LA_NORETURN void __archive_errx(int retvalue, const char *msg); void __archive_ensure_cloexec_flag(int fd); +int __archive_get_tempdir(struct archive_string *); int __archive_mktemp(const char *tmpdir); #if defined(_WIN32) && !defined(__CYGWIN__) int __archive_mkstemp(wchar_t *templates); diff --git a/contrib/libarchive/libarchive/archive_read.c b/contrib/libarchive/libarchive/archive_read.c index 50db87017706..c9b9d5981516 100644 --- a/contrib/libarchive/libarchive/archive_read.c +++ b/contrib/libarchive/libarchive/archive_read.c @@ -575,8 +575,7 @@ choose_filters(struct archive_read *a) return (ARCHIVE_OK); } - filter - = calloc(1, sizeof(*filter)); + filter = calloc(1, sizeof(*filter)); if (filter == NULL) return (ARCHIVE_FATAL); filter->bidder = best_bidder; @@ -834,7 +833,9 @@ archive_read_data(struct archive *_a, void *buff, size_t s) r = archive_read_data_block(a, &read_buf, &a->read_data_remaining, &a->read_data_offset); a->read_data_block = read_buf; - if (r == ARCHIVE_EOF) + if (r == ARCHIVE_EOF && + a->read_data_offset == a->read_data_output_offset && + a->read_data_remaining == 0) return (bytes_read); /* * Error codes are all negative, so the status diff --git a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c index 19d049770b78..42af4034b07e 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c +++ b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c @@ -338,7 +338,7 @@ setup_mac_metadata(struct archive_read_disk *a, int ret = ARCHIVE_OK; void *buff = NULL; int have_attrs; - const char *name, *tempdir; + const char *name; struct archive_string tempfile; (void)fd; /* UNUSED */ @@ -357,13 +357,11 @@ setup_mac_metadata(struct archive_read_disk *a, if (have_attrs == 0) return (ARCHIVE_OK); - tempdir = NULL; - if (issetugid() == 0) - tempdir = getenv("TMPDIR"); - if (tempdir == NULL) - tempdir = _PATH_TMP; archive_string_init(&tempfile); - archive_strcpy(&tempfile, tempdir); + if (__archive_get_tempdir(&tempfile) != ARCHIVE_OK) { + ret = ARCHIVE_WARN; + goto cleanup; + } archive_strcat(&tempfile, "tar.md.XXXXXX"); tempfd = mkstemp(tempfile.s); if (tempfd < 0) { diff --git a/contrib/libarchive/libarchive/archive_read_disk_posix.c b/contrib/libarchive/libarchive/archive_read_disk_posix.c index a7a98e9cb1cd..54a8e66188f8 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_posix.c +++ b/contrib/libarchive/libarchive/archive_read_disk_posix.c @@ -168,9 +168,6 @@ struct filesystem { int synthetic; int remote; int noatime; -#if defined(USE_READDIR_R) - size_t name_max; -#endif long incr_xfer_size; long max_xfer_size; long min_xfer_size; @@ -203,10 +200,6 @@ struct tree { DIR *d; #define INVALID_DIR_HANDLE NULL struct dirent *de; -#if defined(USE_READDIR_R) - struct dirent *dirent; - size_t dirent_allocated; -#endif int flags; int visit_type; /* Error code from last failed operation. */ @@ -869,7 +862,7 @@ next_entry(struct archive_read_disk *a, struct tree *t, tree_enter_initial_dir(t); return (ARCHIVE_FATAL); case TREE_ERROR_DIR: - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, + archive_set_error(&a->archive, t->tree_errno, "%s: Couldn't visit directory", tree_current_path(t)); tree_enter_initial_dir(t); @@ -1578,9 +1571,6 @@ setup_current_filesystem(struct archive_read_disk *a) # endif #endif int r, xr = 0; -#if !defined(HAVE_STRUCT_STATFS_F_NAMEMAX) - long nm; -#endif t->current_filesystem->synthetic = -1; t->current_filesystem->remote = -1; @@ -1647,35 +1637,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -#if defined(HAVE_STRUCT_STATFS_F_NAMEMAX) - t->current_filesystem->name_max = sfs.f_namemax; -#else -# if defined(_PC_NAME_MAX) - /* Mac OS X does not have f_namemax in struct statfs. */ - if (tree_current_is_symblic_link_target(t)) { - if (tree_enter_working_dir(t) != 0) { - archive_set_error(&a->archive, errno, "fchdir failed"); - return (ARCHIVE_FAILED); - } - nm = pathconf(tree_current_access_path(t), _PC_NAME_MAX); - } else - nm = fpathconf(tree_current_dir_fd(t), _PC_NAME_MAX); -# else - nm = -1; -# endif - if (nm == -1) - t->current_filesystem->name_max = NAME_MAX; - else - t->current_filesystem->name_max = nm; -#endif - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif /* USE_READDIR_R */ return (ARCHIVE_OK); } @@ -1863,19 +1824,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -#if defined(HAVE_STATVFS) - t->current_filesystem->name_max = svfs.f_namemax; -#else - t->current_filesystem->name_max = sfs.f_namelen; -#endif - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif return (ARCHIVE_OK); } @@ -1953,15 +1901,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ - t->current_filesystem->name_max = svfs.f_namemax; - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif return (ARCHIVE_OK); } @@ -1975,9 +1914,6 @@ static int setup_current_filesystem(struct archive_read_disk *a) { struct tree *t = a->tree; -#if defined(_PC_NAME_MAX) && defined(USE_READDIR_R) - long nm; -#endif t->current_filesystem->synthetic = -1;/* Not supported */ t->current_filesystem->remote = -1;/* Not supported */ t->current_filesystem->noatime = 0; @@ -1987,40 +1923,6 @@ setup_current_filesystem(struct archive_read_disk *a) t->current_filesystem->min_xfer_size = -1; t->current_filesystem->incr_xfer_size = -1; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -# if defined(_PC_NAME_MAX) - if (tree_current_is_symblic_link_target(t)) { - if (tree_enter_working_dir(t) != 0) { - archive_set_error(&a->archive, errno, "fchdir failed"); - return (ARCHIVE_FAILED); - } - nm = pathconf(tree_current_access_path(t), _PC_NAME_MAX); - } else - nm = fpathconf(tree_current_dir_fd(t), _PC_NAME_MAX); - if (nm == -1) -# endif /* _PC_NAME_MAX */ - /* - * Some systems (HP-UX or others?) incorrectly defined - * NAME_MAX macro to be a smaller value. - */ -# if defined(NAME_MAX) && NAME_MAX >= 255 - t->current_filesystem->name_max = NAME_MAX; -# else - /* No way to get a trusted value of maximum filename - * length. */ - t->current_filesystem->name_max = PATH_MAX; -# endif /* NAME_MAX */ -# if defined(_PC_NAME_MAX) - else - t->current_filesystem->name_max = nm; -# endif /* _PC_NAME_MAX */ - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif /* USE_READDIR_R */ return (ARCHIVE_OK); } @@ -2112,8 +2014,11 @@ tree_dup(int fd) } #endif /* F_DUPFD_CLOEXEC */ new_fd = dup(fd); - __archive_ensure_cloexec_flag(new_fd); - return (new_fd); + if (new_fd != -1) { + __archive_ensure_cloexec_flag(new_fd); + return (new_fd); + } + return (-1); } /* @@ -2235,11 +2140,16 @@ tree_reopen(struct tree *t, const char *path, int restore_time) * so try again for execute. The consequences of not opening this are * unhelpful and unnecessary errors later. */ - if (t->initial_dir_fd < 0) + if (t->initial_dir_fd < 0) { t->initial_dir_fd = open(".", o_flag | O_CLOEXEC); + if (t->initial_dir_fd < 0) + return NULL; + } #endif __archive_ensure_cloexec_flag(t->initial_dir_fd); t->working_dir_fd = tree_dup(t->initial_dir_fd); + if (t->working_dir_fd < 0) + return NULL; return (t); } @@ -2449,12 +2359,11 @@ tree_dir_next_posix(struct tree *t) size_t namelen; if (t->d == NULL) { -#if defined(USE_READDIR_R) - size_t dirent_size; -#endif #if defined(HAVE_FDOPENDIR) - t->d = fdopendir(tree_dup(t->working_dir_fd)); + int fd = tree_dup(t->working_dir_fd); + if (fd != -1) + t->d = fdopendir(fd); #else /* HAVE_FDOPENDIR */ if (tree_enter_working_dir(t) == 0) { t->d = opendir("."); @@ -2470,45 +2379,12 @@ tree_dir_next_posix(struct tree *t) t->visit_type = r != 0 ? r : TREE_ERROR_DIR; return (t->visit_type); } -#if defined(USE_READDIR_R) - dirent_size = offsetof(struct dirent, d_name) + - t->filesystem_table[t->current->filesystem_id].name_max + 1; - if (t->dirent == NULL || t->dirent_allocated < dirent_size) { - free(t->dirent); - t->dirent = malloc(dirent_size); - if (t->dirent == NULL) { - closedir(t->d); - t->d = INVALID_DIR_HANDLE; - (void)tree_ascend(t); - tree_pop(t); - t->tree_errno = ENOMEM; - t->visit_type = TREE_ERROR_DIR; - return (t->visit_type); - } - t->dirent_allocated = dirent_size; - } -#endif /* USE_READDIR_R */ } for (;;) { errno = 0; -#if defined(USE_READDIR_R) - r = readdir_r(t->d, t->dirent, &t->de); -#ifdef _AIX - /* Note: According to the man page, return value 9 indicates - * that the readdir_r was not successful and the error code - * is set to the global errno variable. And then if the end - * of directory entries was reached, the return value is 9 - * and the third parameter is set to NULL and errno is - * unchanged. */ - if (r == 9) - r = errno; -#endif /* _AIX */ - if (r != 0 || t->de == NULL) { -#else t->de = readdir(t->d); if (t->de == NULL) { r = errno; -#endif closedir(t->d); t->d = INVALID_DIR_HANDLE; if (r != 0) { @@ -2747,9 +2623,6 @@ tree_free(struct tree *t) if (t == NULL) return; archive_string_free(&t->path); -#if defined(USE_READDIR_R) - free(t->dirent); -#endif free(t->sparse_list); for (i = 0; i < t->max_filesystem_id; i++) free(t->filesystem_table[i].allocation_ptr); diff --git a/contrib/libarchive/libarchive/archive_read_open_fd.c b/contrib/libarchive/libarchive/archive_read_open_fd.c index dc7c9e52c6f6..c85a62a3e2d7 100644 --- a/contrib/libarchive/libarchive/archive_read_open_fd.c +++ b/contrib/libarchive/libarchive/archive_read_open_fd.c @@ -48,6 +48,7 @@ #endif #include "archive.h" +#include "archive_platform_stat.h" struct read_fd_data { int fd; @@ -65,12 +66,12 @@ static int64_t file_skip(struct archive *, void *, int64_t request); int archive_read_open_fd(struct archive *a, int fd, size_t block_size) *** 3269 LINES SKIPPED *** From nobody Mon Nov 3 12:00:26 2025 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 4d0VXB6lYKz6Fbth; Mon, 03 Nov 2025 12:00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0VXB5j40z44sX; Mon, 03 Nov 2025 12:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762171226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M5n4tH9g63Lrku1gdY9S9bUtJJAN41yj8cDpbEF3+h4=; b=xdjZESK1rZ+cxF6tUfSvX4Xi8kZPO+xNbiMt/F36P+TD0OOv5+kxKg+b13LiJTbuvBF9Qr LzKHTrM5LpxS0QWk1YeaSl9Jvnc9maY0FMe1A070513YH+w8E48atChqM9LSWCAXsDunn5 q/nYH+3n1aP/w8WpUJbDD1fYsup5GGnJsK8XmQx9HvyBumdJhIwn+d9wQKK7utwuVnjDz6 ckjVHiO5ktF/SRxQPzb/4dOax8a1gQxcDRWhGcbDWZ7uwgib8bo2ItweJR/C1V3XgE6aPI pJUXAXGv+FbSgFod8RWM3cnXqo8AbdTMjunrPeu2otOyu3I2Ttr+OWwYEVWw4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762171226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M5n4tH9g63Lrku1gdY9S9bUtJJAN41yj8cDpbEF3+h4=; b=izWUOU9OewJkXovEQDMYsmjD5A0xKNQ3PBmOWXu0vAnl30NNhuQRWDtIaU5dCappbKWazd n1yWFuOlvwTeSCS11cEKec+/mca98D8+iMAv2jnNWCcQ9SPPxk5Nj16OdR/xHVija93pc0 OmQ6YbHnAKuMXEvLrG1eItT818KI03NUMTPPN/iDzCDwn9kuXtxCcMyALP80zUPC9Vx21R xQmsYFZKiv3x9M95jIf8+oFtZL9tL0+/iTLJAvD0kVAv3JqxFiPNakYepfRuXSHCREMwNN vAADZ414IF2Y9Xada4yfHBAwFiTVmyRvFexfmCZ0Y1qGmXoZH4guJ1sEGxM0JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762171226; a=rsa-sha256; cv=none; b=e2uZ0nkJ49PbvvTkjSURulbmyxaYGay0Ab1LjJ+5z67tBN6ZteQntQZwjYMXWVZWi+Y1hQ uIvAiWf6E4PfnctaNjcQIR4tlMey3LrR2gKk/3yz3yayjuxeGiXPLZUfrS33bpLs6+bfrS LMdboyhKdUpKIygd4ZXt6hSJf7/wEBaZTZAsFBPVMqWb9A5nB3V2FOULMSTgBO3S1icTc4 cxVNxn/GXccNBaRY6nLrRHPnWYAIVOWIxlKeI1MHq4dB9knMm+SKw/WvHD27MqgN9ZCFlh 4gETz77D7bsGVjd0ikEruJngeXP+YlddczhiGnEGA6NRloFhplOxjBB3wIQ/DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0VXB57Wlz18Ps; Mon, 03 Nov 2025 12:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3C0QWf001596; Mon, 3 Nov 2025 12:00:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3C0QtQ001593; Mon, 3 Nov 2025 12:00:26 GMT (envelope-from git) Date: Mon, 3 Nov 2025 12:00:26 GMT Message-Id: <202511031200.5A3C0QtQ001593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1471af5110fc - stable/15 - bsd.prog.mk: Skip warnings if compiler.mk was not included List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 1471af5110fc3bb6b1f1548e056f1717fb844ffd Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1471af5110fc3bb6b1f1548e056f1717fb844ffd commit 1471af5110fc3bb6b1f1548e056f1717fb844ffd Author: Ed Maste AuthorDate: 2025-10-31 15:53:42 +0000 Commit: Ed Maste CommitDate: 2025-11-03 12:00:07 +0000 bsd.prog.mk: Skip warnings if compiler.mk was not included We emit a warning if src.conf options WITH_RETPOLINE or INIT_ALL are in use, and the compiler or linker does not support the feature. For targets like `cleandir` we skip including bsd.compiler.mk, which leaves COMPILER_FEATURES unset and spurious warnings were emitted in early buildworld stages, if these options are in use. Commit 0837b2ebd570 ("pkg: Die if make -V BRANCH fails") added -W to usr.sbin/pkg's make flags, causing it to exit on warnings. As a result buildworld failed when these src.conf options were in use. Clean this up by omitting the warning if the magic _NO_INCLUDE_COMPILERMK flag is set, which indicates that COMPILER_FEATURES is not set. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53501 (cherry picked from commit e4f2a350955406ffd58dd3f0bb7610df0f36d647) --- share/mk/bsd.prog.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 10e1c177e2b2..5697845079e2 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -49,9 +49,11 @@ CXXFLAGS+= -mretpoline LDFLAGS+= -Wl,-zretpolineplt .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning Retpoline requested but not supported by compiler or linker .endif .endif +.endif # LLD sensibly defaults to -znoexecstack, so do the same for BFD LDFLAGS.bfd+= -Wl,-znoexecstack .if ${MK_BRANCH_PROTECTION} != "no" @@ -71,9 +73,11 @@ CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clan CXXFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning INIT_ALL (${OPT_INIT_ALL}) requested but not supported by compiler .endif .endif +.endif # Zero used registers on return (mitigate some ROP) .if ${MK_ZEROREGS} != "no" From nobody Mon Nov 3 12:46:32 2025 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 4d0WYN6y9yz6Fgds; Mon, 03 Nov 2025 12:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0WYN5fCbz3BvJ; Mon, 03 Nov 2025 12:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762173992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tPtt8iZcwJTXLduVUTTkZE7oVIcfkyJQnMyJzqGW/Bc=; b=mJR7HOtnvmi4cyLIk6LvZMaCp/uKZnRPaJ3XD8IBglvdOCSKcUXIy0a1pK77KbMdPVuo/P 3X3a55PdaTAf5kwv4NfvxqOObRPNcPW+tVoHG+U7S+qU3GcS4lpdd/CeOA1qMQDNVGfSZq +JyVZN3PdCaWtmGKE7q0B+Iw+njz/j1qdtgwXPwjWq3wROPzqmilRipD8THfdJP3XTkMAm E9xgVQ4aGqqAbdYiQq0yCAEUl82j6z3IY7QyTmEJmFjesbzY5pWs8Fj+qcgCOiBF8tRK7p RpDcHO8HYAji/AHioxia5WmZw3a1XnB7w35nx7TNTRsJy5S8w0AEGTQ/LQBQiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762173992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tPtt8iZcwJTXLduVUTTkZE7oVIcfkyJQnMyJzqGW/Bc=; b=b6W10C4oS4+xZH8aumLhtCzC8+SrVnWfxQQAc8fXB4J0G/2bavV+ml4MiMJEvo5ajkpnrf tFZQ0UFYgmxJsokb8SmHdUuTzhqaKqS65GBtltRVWCFh2h1+4OV9lzCGj+SsA8yUtS9hiv oyLkbzo9IIMg9XNSUwe0snxiP6Ij1ojrG2Xf+h17JUMxVJYAruun3mX7C+wFKE5hCoS0Dl YRcJBo13G17okGZo0evl9GqeY7cRrTSJohyCNmt41Qh1SH6lxtjgnAAXCn8Z2mJOU7or8c lHRnalh1HRV0lgoHKJGHHon0DO6AKtCr3Wl8qUfwekeI0j2yhD9il6mXl7AE6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762173992; a=rsa-sha256; cv=none; b=qCrwhAZfsqvalBSHuC+a244kh778H2mhB3bmUfUhLxthw1NwYqBAokazHg8qKJBCPwN48h lctVekUPrmgs6p11+uhlsjB8eoF4h90v6DsEhCts4UDuoJuw0OdAgoCLpkbQy1zaXczuC3 QHRt/aMj93ZnBuE4rHW3x8MXF8FGXxzRRlvGec8tKJXU+7h7rP5A5mj7z5vYmePCCi+DBy 6pq4pchyeK6A/vjTxx3+2xO7eI6i1mxkyWPjngthyz1UxExAO0QnKfpHQVrn2KldGNKlH0 pxMXWiPk/scuXTWZ2T+tOrFTH2KASs2WgHWpD0EdErV9Tb7SUFzVSQo8r0fFmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0WYN5F3bz1BLp; Mon, 03 Nov 2025 12:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3CkWtj084908; Mon, 3 Nov 2025 12:46:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3CkWK4084905; Mon, 3 Nov 2025 12:46:32 GMT (envelope-from git) Date: Mon, 3 Nov 2025 12:46:32 GMT Message-Id: <202511031246.5A3CkWK4084905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d01eb8e98f48 - stable/15 - revoke.2: Remove mention of block special device files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d01eb8e98f48b756802dc8dccd0f6246a6fcf8fa Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d01eb8e98f48b756802dc8dccd0f6246a6fcf8fa commit d01eb8e98f48b756802dc8dccd0f6246a6fcf8fa Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 17:17:42 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-03 12:46:28 +0000 revoke.2: Remove mention of block special device files Block devices are a thing of a past in FreeBSD. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53332 --- lib/libsys/revoke.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/revoke.2 b/lib/libsys/revoke.2 index f5ae1e92c357..938d2f083e27 100644 --- a/lib/libsys/revoke.2 +++ b/lib/libsys/revoke.2 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 25, 2016 +.Dd October 24, 2025 .Dt REVOKE 2 .Os .Sh NAME @@ -62,7 +62,7 @@ using a special close method which does not block. Access to a file may be revoked only by its owner or the super user. The .Fn revoke -system call is currently supported only for block and character special +system call is currently supported only for character special device files. It is normally used to prepare a terminal device for a new login session, preventing any access by a previous user of the terminal. From nobody Mon Nov 3 12:47:05 2025 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 4d0WZ13T7fz6FgrH; Mon, 03 Nov 2025 12:47: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0WZ12t7nz3C50; Mon, 03 Nov 2025 12:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762174025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B3QhZ4v1higpF5aTcfHWgYnW6zu5qYPOIxvYbENTJ8U=; b=UXed1rtk9zMTQ3ILsk8Qe7KKMTho0DnvZWu+IyWgILKncPOAVKg+mzP7nsv7FPycc7x9Se Skn28jWzNDP0XodnW3Mo5Ytx6GfvMn3M1ARKfPv7woSw2KTs/YtRJRHYUS/Dt+Ycyth0ez lfBx/oVsAxwwo0i3CPoBqg9GRuXhwg3zKr+zOLqVRV47t5yt++y/LrBjy9nLiKN9ofFSN1 auIX9EWaHfVWhgtHgzGab9edRp9QknDcaGiwoaHSfrNuww3mEzSJjKhncMBTSLypvJ9ZLP o42xeoZ8bV5NPegxrYFxIy+1/suCzoviwf5r+/jndnoSaozZKVa9apjgto0QfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762174025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B3QhZ4v1higpF5aTcfHWgYnW6zu5qYPOIxvYbENTJ8U=; b=F+0iT/8jX8KnmqK6SCrgbkkiGz0sX+gXK0dUfYWRMRCWZIHJWPhQdyZy2jLefTTF4cTMlZ hRjcZQpGrbrl5t2uhWnjBv1my1H6fmBnCSKVElwyOsYumT0SAcHt/1n+CH+2CO6a1Tg2yw zz8AXR4M9RwR8cjgCnrR2EBPjcibi8EpvbboYEEnv0/jwR9qfgT0fb+qE83QsQWA2/sBTe mdzk0MmBKC1PtgAUjrFslVwPBI5v80UPNiweIpdXj28eqKetWaP6AqVe+l6nKHQ+ji+zTQ Rl5JqyZcX2EXgZRkqnexkareTDwRygvtUIl/yPv+6Q7nhd8QU8cI93DZvuES/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762174025; a=rsa-sha256; cv=none; b=lPClUXtCSAuoIQXSFl4v3Bu7LfOnBwT02LpoAVdApGgdg40wRwBzpdx6Rf2WgAN+w41RKJ qASrMLYBo50JA3gkGiAOp9Iy8CQyJo6zq3Ia30p48q+wxdLZNjlrDRuR/waU/RhHC7DLQR vhNxoc9RPaoSD6WTp5hRkb8Jz60BTI6HxEx1mHZBLbUbhi8ZcEvZ2VbKTlEA/JpHMZAjxf ixx7RA1PoGyiMs+gdqLx7R36QQfX6Qxv+SJ3r40Nd8u48QA9KKNFRTV1n64U+yhBqJ1Htc y8mAS+jjY3uKPTjeV8JZdF5mfAGCPovc518W2Qnli+H2je+zy2ruIG07AhY5KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0WZ12TKfz1BJd; Mon, 03 Nov 2025 12:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3Cl5Sx085223; Mon, 3 Nov 2025 12:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3Cl5dw085221; Mon, 3 Nov 2025 12:47:05 GMT (envelope-from git) Date: Mon, 3 Nov 2025 12:47:05 GMT Message-Id: <202511031247.5A3Cl5dw085221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 05120af690fb - stable/14 - revoke.2: Remove mention of block special device files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 05120af690fbae7b6d91b2d2ad856086611ff67e Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=05120af690fbae7b6d91b2d2ad856086611ff67e commit 05120af690fbae7b6d91b2d2ad856086611ff67e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 17:17:42 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-03 12:47:01 +0000 revoke.2: Remove mention of block special device files Block devices are a thing of a past in FreeBSD. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53332 --- lib/libc/sys/revoke.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2 index dc92512d3129..db0c8a85558b 100644 --- a/lib/libc/sys/revoke.2 +++ b/lib/libc/sys/revoke.2 @@ -30,7 +30,7 @@ .\" .\" @(#)revoke.2 8.1 (Berkeley) 6/4/93 .\" -.Dd January 25, 2016 +.Dd October 24, 2025 .Dt REVOKE 2 .Os .Sh NAME @@ -64,7 +64,7 @@ using a special close method which does not block. Access to a file may be revoked only by its owner or the super user. The .Fn revoke -system call is currently supported only for block and character special +system call is currently supported only for character special device files. It is normally used to prepare a terminal device for a new login session, preventing any access by a previous user of the terminal. From nobody Mon Nov 3 20:29:36 2025 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 4d0jqh6wfbz6Fj4q; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqh5hSJz3KMw; Mon, 03 Nov 2025 20:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cmGsEjjCP5AaMsd4rcNL4MkGPpBov+QZN020Q3ReSQ4=; b=oWxQemOqxY9FrYrWrdsqU2j9DECwyI0XxO4qAXo1GEn0pUzxGx1jmf8MypB2Yoiq+LuEMs WebrsY04dyxz0xYWcnUaTavj/bmPl7CAUEd+MAjXw3cm8GXc5U462MiuFeMDufF8dNX/La N2cXsgI+u7fAP+yP90znxMrSv3hFc47NJU2jKRGVbiXIvUpJEAbHp8IzUnjd+pDxFUP8T2 00CTWSFd5SKaSRvt4jRn/obVbwOOwtuZwTx/ZP+qj/He15VHyepAlOh5+1hSTdkYUddUy/ Fqd0m2ihswoWI9EFOd+2Owfgt622wWXae5xAct+P9HjqTyyB0SY2Tfi+ZLk5Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cmGsEjjCP5AaMsd4rcNL4MkGPpBov+QZN020Q3ReSQ4=; b=So+VEDf4xweBIxHQ3asPme4qN1c9fXgymmq8VZXTfL7x8uyG3aQBapalHYE3AczwuahiwV LOvixs51knX/tDRQ1qP03R1S3GDIMCZCex1GMiDQaL8CzvOuTEIyL9KRPTTwRw5Qnih0YU KWhvIf/WVwNWNkC6AGyv59lE6xOR5Z2RKw5NRJ7AZLywTrxXy0MnPkA9Uw1bopKoL3Zr+7 9fU5E194oszLnFtzMtKKJj+gV12CnXTNMgjwlPqJRI0r19oLB+KmfpDpBfj3kXrd4j75AE j31OyAaZjs6LxbaTDpr1DRI0tRTmlnG/JpsMmD2vydWGE3cMTICF/QV4RP1OMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201776; a=rsa-sha256; cv=none; b=J/Tx1utC+VFEXSOCkSNuv9LPbsiYKK1mfzfsX1lYdEP3Gv7tTrpEiCF9kzjT0tneAnEQy1 xQhFsI4WOK05VA+ObeauHl+LPooXRJiYQ3I3Po9l51AgSUxM+4r/RE8o3v+55w7l+r92mI opZ9EMrZNrUlvFtc181saSdTfYPP85wbrLQuKW5X5hK+eC+qoCCfP8F/Oa+0NGEWJYhIGh gOw7dRu9VXt8eBUW24g6r4ppDh+QZNjoAtflVmg5TIBweLFe1roYJvGgTF/x2kl/kh2UFm 5Lq7KIwWr35CVQGsC9rnUMAFPlORofkxHoKOlJH5HGWyhtYEpOom1w9JsyWxdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqh55qrz9wy; Mon, 03 Nov 2025 20:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTaYp050806; Mon, 3 Nov 2025 20:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTaC0050803; Mon, 3 Nov 2025 20:29:36 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:36 GMT Message-Id: <202511032029.5A3KTaC0050803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1b7bd82b6dcc - releng/15.0 - random: add RDSEED as a provably unique entropy source List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 1b7bd82b6dcc3e6ff15189d61f36f4b6984c4a50 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b7bd82b6dcc3e6ff15189d61f36f4b6984c4a50 commit 1b7bd82b6dcc3e6ff15189d61f36f4b6984c4a50 Author: David E. O'Brien AuthorDate: 2025-10-17 03:20:23 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:29 +0000 random: add RDSEED as a provably unique entropy source NIST SP800-90B allows for only a single entropy source to be claimed in a FIPS-140-3 certificate. In addition, only hardware sources that have a NIST Entropy Source Validation (ESV) certificate, backed by a SP800-90B Entropy Assessment Report, are usable. Intel has obtained ESV certificates for several of their processors, so RDSEED is a FIPS-140-3 suitable entropy source. However, even though RDRAND is seeded by RDSEED internally, RDRAND would need a RBG certificate and CAVP testing run on the DRBG in order to use it for FIPS-140-3 (SP800-90B) purposes. So we need to know down in the CSPRNG-subsystem which source the entropy came from. In light of the potential issues surrounding AMD Zen 5 CPU's RDSEED implementation[*], allow RDSEED to be disabled in loader.conf. [*] https://www.phoronix.com/news/AMD-EPYC-Turin-RDSEED-Bug Approved by: re (cperciva) Reviewed by: cem MFC after: 3 days Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D53150 Differential Revision: https://reviews.freebsd.org/D53291 (cherry picked from commit 3a12982962ce330c37c154bb2eb8ae0539fc6f48) (cherry picked from commit 38e9d282cd7dacbf64883b45544723408cfd4d09) (cherry picked from commit 9ca8e09abba87991ad5171ed8920f4d1571245d5) --- sys/conf/files.x86 | 1 + sys/dev/random/fenestrasX/fx_pool.c | 3 + sys/dev/random/ivy.c | 69 ++++----------- sys/dev/random/random_harvestq.c | 1 + sys/dev/random/rdseed.c | 169 ++++++++++++++++++++++++++++++++++++ sys/modules/Makefile | 2 + sys/modules/rdrand_rng/Makefile | 5 -- sys/modules/rdseed_rng/Makefile | 9 ++ sys/sys/random.h | 1 + 9 files changed, 205 insertions(+), 55 deletions(-) diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 953da7dd1284..21a1b8046f12 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -311,6 +311,7 @@ dev/ntb/test/ntb_tool.c optional ntb_tool dev/nvram/nvram.c optional nvram isa dev/random/ivy.c optional rdrand_rng !random_loadable dev/random/nehemiah.c optional padlock_rng !random_loadable +dev/random/rdseed.c optional rdrand_rng !random_loadable dev/qat_c2xxx/qat.c optional qat_c2xxx dev/qat_c2xxx/qat_ae.c optional qat_c2xxx dev/qat_c2xxx/qat_c2xxx.c optional qat_c2xxx diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index f4ad1e295d54..6a9828023678 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -182,6 +182,9 @@ static const struct fxrng_ent_char { [RANDOM_PURE_RDRAND] = { .entc_cls = &fxrng_hi_pull, }, + [RANDOM_PURE_RDSEED] = { + .entc_cls = &fxrng_hi_pull, + }, [RANDOM_PURE_NEHEMIAH] = { .entc_cls = &fxrng_hi_pull, }, diff --git a/sys/dev/random/ivy.c b/sys/dev/random/ivy.c index fa1e4831f1b9..3eb0f261e6dc 100644 --- a/sys/dev/random/ivy.c +++ b/sys/dev/random/ivy.c @@ -1,6 +1,6 @@ /*- + * Copyright (c) 2013, 2025, David E. O'Brien * Copyright (c) 2013 The FreeBSD Foundation - * Copyright (c) 2013 David E. O'Brien * Copyright (c) 2012 Konstantin Belousov * All rights reserved. * @@ -48,7 +48,6 @@ #define RETRY_COUNT 10 -static bool has_rdrand, has_rdseed; static u_int random_ivy_read(void *, u_int); static const struct random_source random_ivy = { @@ -57,13 +56,7 @@ static const struct random_source random_ivy = { .rs_read = random_ivy_read }; -SYSCTL_NODE(_kern_random, OID_AUTO, rdrand, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, - "rdrand (ivy) entropy source"); static bool acquire_independent_seed_samples = false; -SYSCTL_BOOL(_kern_random_rdrand, OID_AUTO, rdrand_independent_seed, - CTLFLAG_RWTUN, &acquire_independent_seed_samples, 0, - "If non-zero, use more expensive and slow, but safer, seeded samples " - "where RDSEED is not present."); static bool x86_rdrand_store(u_long *buf) @@ -99,45 +92,6 @@ x86_rdrand_store(u_long *buf) return (true); } -static bool -x86_rdseed_store(u_long *buf) -{ - u_long rndval; - int retry; - - retry = RETRY_COUNT; - __asm __volatile( - "1:\n\t" - "rdseed %1\n\t" /* read randomness into rndval */ - "jc 2f\n\t" /* CF is set on success, exit retry loop */ - "dec %0\n\t" /* otherwise, retry-- */ - "jne 1b\n\t" /* and loop if retries are not exhausted */ - "2:" - : "+r" (retry), "=r" (rndval) : : "cc"); - *buf = rndval; - return (retry != 0); -} - -static bool -x86_unimpl_store(u_long *buf __unused) -{ - - panic("%s called", __func__); -} - -DEFINE_IFUNC(static, bool, x86_rng_store, (u_long *buf)) -{ - has_rdrand = (cpu_feature2 & CPUID2_RDRAND); - has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); - - if (has_rdseed) - return (x86_rdseed_store); - else if (has_rdrand) - return (x86_rdrand_store); - else - return (x86_unimpl_store); -} - /* It is required that buf length is a multiple of sizeof(u_long). */ static u_int random_ivy_read(void *buf, u_int c) @@ -148,7 +102,7 @@ random_ivy_read(void *buf, u_int c) KASSERT(c % sizeof(*b) == 0, ("partial read %d", c)); b = buf; for (count = c; count > 0; count -= sizeof(*b)) { - if (!x86_rng_store(&rndval)) + if (!x86_rdrand_store(&rndval)) break; *b++ = rndval; } @@ -158,18 +112,33 @@ random_ivy_read(void *buf, u_int c) static int rdrand_modevent(module_t mod, int type, void *unused) { + struct sysctl_ctx_list ctx; + struct sysctl_oid *o; + bool has_rdrand, has_rdseed; int error = 0; + has_rdrand = (cpu_feature2 & CPUID2_RDRAND); + has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); + switch (type) { case MOD_LOAD: - if (has_rdrand || has_rdseed) { + if (has_rdrand && !has_rdseed) { + sysctl_ctx_init(&ctx); + o = SYSCTL_ADD_NODE(&ctx, SYSCTL_STATIC_CHILDREN(_kern_random), + OID_AUTO, "rdrand", CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "rdrand (ivy) entropy source"); + SYSCTL_ADD_BOOL(&ctx, SYSCTL_CHILDREN(o), OID_AUTO, + "rdrand_independent_seed", CTLFLAG_RDTUN, + &acquire_independent_seed_samples, 0, + "If non-zero, use more expensive and slow, but safer, seeded samples " + "where RDSEED is not present."); random_source_register(&random_ivy); printf("random: fast provider: \"%s\"\n", random_ivy.rs_ident); } break; case MOD_UNLOAD: - if (has_rdrand || has_rdseed) + if (has_rdrand && !has_rdseed) random_source_deregister(&random_ivy); break; diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 2d7af254c52c..96676e8694bf 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -666,6 +666,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_PURE_GLXSB] = "PURE_GLXSB", [RANDOM_PURE_HIFN] = "PURE_HIFN", [RANDOM_PURE_RDRAND] = "PURE_RDRAND", + [RANDOM_PURE_RDSEED] = "PURE_RDSEED", [RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH", [RANDOM_PURE_RNDTEST] = "PURE_RNDTEST", [RANDOM_PURE_VIRTIO] = "PURE_VIRTIO", diff --git a/sys/dev/random/rdseed.c b/sys/dev/random/rdseed.c new file mode 100644 index 000000000000..af084aab4ed9 --- /dev/null +++ b/sys/dev/random/rdseed.c @@ -0,0 +1,169 @@ +/*- + * Copyright (c) 2013, 2025, David E. O'Brien + * Copyright (c) 2013 The FreeBSD Foundation + * Copyright (c) 2012 Konstantin Belousov + * All rights reserved. + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#define RETRY_COUNT 10 + +static u_int random_rdseed_read(void *, u_int); + +static struct random_source random_rdseed = { + .rs_ident = "Intel Secure Key Seed", + .rs_source = RANDOM_PURE_RDSEED, + .rs_read = random_rdseed_read +}; + +SYSCTL_NODE(_kern_random, OID_AUTO, rdseed, CTLFLAG_RW, 0, + "rdseed (x86) entropy source"); +/* XXX: kern.random.rdseed.enabled=0 also disables RDRAND */ +static bool enabled = true; +SYSCTL_BOOL(_kern_random_rdseed, OID_AUTO, enabled, CTLFLAG_RDTUN, &enabled, 0, + "If zero, disable the use of RDSEED."); + +static bool +x86_rdseed_store(u_long *buf) +{ + u_long rndval; + int retry; + + retry = RETRY_COUNT; + __asm __volatile( + "1:\n\t" + "rdseed %1\n\t" /* read randomness into rndval */ + "jc 2f\n\t" /* CF is set on success, exit retry loop */ + "dec %0\n\t" /* otherwise, retry-- */ + "jne 1b\n\t" /* and loop if retries are not exhausted */ + "2:" + : "+r" (retry), "=r" (rndval) : : "cc"); + *buf = rndval; + return (retry != 0); +} + +/* It is required that buf length is a multiple of sizeof(u_long). */ +static u_int +random_rdseed_read(void *buf, u_int c) +{ + u_long *b, rndval; + u_int count; + + KASSERT(c % sizeof(*b) == 0, ("partial read %d", c)); + b = buf; + for (count = c; count > 0; count -= sizeof(*b)) { + if (!x86_rdseed_store(&rndval)) + break; + *b++ = rndval; + } + return (c - count); +} + +static int +rdseed_modevent(module_t mod, int type, void *unused) +{ + bool has_rdseed; + int error = 0; + + has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); + + switch (type) { + case MOD_LOAD: + if (has_rdseed && enabled) { + random_source_register(&random_rdseed); + printf("random: fast provider: \"%s\"\n", random_rdseed.rs_ident); + } + break; + + case MOD_UNLOAD: + if (has_rdseed) + random_source_deregister(&random_rdseed); + break; + + case MOD_SHUTDOWN: + break; + + default: + error = EOPNOTSUPP; + break; + + } + + return (error); +} + +static moduledata_t rdseed_mod = { + "rdseed", + rdseed_modevent, + 0 +}; + +DECLARE_MODULE(rdseed, rdseed_mod, SI_SUB_RANDOM, SI_ORDER_FOURTH); +MODULE_VERSION(rdseed, 1); +MODULE_DEPEND(rdseed, random_harvestq, 1, 1, 1); + +/* + * Intel's RDSEED Entropy Assessment Report min-entropy claim is 0.6 Shannons + * per bit of data output. Rrefer to the following Entropy Source Validation + * (ESV) certificates: + * + * E#87: Junos OS Physical Entropy Source - Broadwell EP 10-Core Die + * Broadwell-EP-10 FCLGA2011 Intel(R) Xeon(R) E5-2620 V4 Processor + * https://csrc.nist.gov/projects/cryptographic-module-validation-program/entropy-validations/certificate/87 + * (URLs below omitted for brevity but follow same format.) + * + * E#121: Junos OS Physical Entropy Source - Intel Atom C3000 Series + * (Denverton) 16 Core Die with FCBGA1310 Package + * + * E#122: Junos OS Physical Entropy Source - Intel Xeon D-1500 Family + * (Broadwell) 8 Core Die with FCBGA1667 Package + * + * E#123: Junos OS Physical Entropy Source - Intel Xeon D-2100 Series + * (Skylake) 18 Core Die with FCBGA2518 Package + * + * E#141: Junos OS Physical Entropy Source - Intel Xeon D-10 Series + * (Ice Lake-D-10) Die with FCBGA2227 Package + * + * E#169: Junos OS Physical Entropy Source - Intel Xeon AWS-1000 v4 and + * E5 v4 (Broadwell EP) 15 Core Die with FCLGA2011 Package + */ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 5315d518afd8..3a7c818ff651 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -346,6 +346,7 @@ SUBDIR= \ rc4 \ ${_rdma} \ ${_rdrand_rng} \ + ${_rdseed_rng} \ re \ rl \ ${_rockchip} \ @@ -818,6 +819,7 @@ _nvram= nvram _padlock= padlock _padlock_rng= padlock_rng _rdrand_rng= rdrand_rng +_rdseed_rng= rdseed_rng .endif _pchtherm = pchtherm _s3= s3 diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile index 7fa7a8bb8fb9..496fc863033f 100644 --- a/sys/modules/rdrand_rng/Makefile +++ b/sys/modules/rdrand_rng/Makefile @@ -6,9 +6,4 @@ SRCS+= bus_if.h device_if.h CFLAGS+= -I${SRCTOP}/sys -# ld.bfd doesn't support ifuncs invoked non-PIC -.if ${MACHINE_CPUARCH} == "i386" -CFLAGS.gcc= -fPIC -.endif - .include diff --git a/sys/modules/rdseed_rng/Makefile b/sys/modules/rdseed_rng/Makefile new file mode 100644 index 000000000000..6593505546dd --- /dev/null +++ b/sys/modules/rdseed_rng/Makefile @@ -0,0 +1,9 @@ +.PATH: ${SRCTOP}/sys/dev/random + +KMOD= rdseed_rng +SRCS= rdseed.c +SRCS+= bus_if.h device_if.h + +CFLAGS+= -I${SRCTOP}/sys + +.include diff --git a/sys/sys/random.h b/sys/sys/random.h index 2a68f0c99b6d..dca30dc8fde4 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -94,6 +94,7 @@ enum random_entropy_source { RANDOM_PURE_GLXSB, RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND, + RANDOM_PURE_RDSEED, RANDOM_PURE_NEHEMIAH, RANDOM_PURE_RNDTEST, RANDOM_PURE_VIRTIO, From nobody Mon Nov 3 20:29:37 2025 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 4d0jqk00Hhz6FjDq; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqj6HHJz3KMx; Mon, 03 Nov 2025 20:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SsYsdVnk3tHVELgwOu3mXuEcXNMbCwoGrg5uYuF225E=; b=LQzTeANZmtU2BdbhCoTNCI3Yh684m/Tgho+ptaXyEZsn/ZcXf3R8SiVB5A0ZjbVsKB0cUh e+7T87Bst6GBMT5vWi5cQCmO5gflx9X14pxUo2ZJwHMxVaZjoQy9Zbltqox9JZPt95BFYK oa9rjx6lHrBhmVyYgUyMqv5HV2ULCdjRJBvYrhAGAIuh1GZwMLfO/wPtxINSTrdGBNn0L1 yvcjYSnWX/CUc61S0cew2T0TrQFwe2nP/yPCvRsyZ7r1Fa5Opg60ORokUhUogdf3+3QZcT IJWUQtrxuVxH55i8ndaIsQtQE0CtfLDNaLCf09nAEl7wBZ/a/C0OY5KueYXsWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SsYsdVnk3tHVELgwOu3mXuEcXNMbCwoGrg5uYuF225E=; b=hPGJAi7eNpIHZs1TA2hVHJuc8TiCze5UV1QvMPZtL/UIU2w7Y0mva3hrASF1slEDDvf2fc hP691ionKwq43IibCTsDSokZDBwiFQazq7EV6toLGB3jmINw3a68aHBsZhsd3lCV4jiQ2j OKrdwnmoECQvCwQxcYj1/uBZ30e4rLgGBf/mOrfuPA9OB7L1XzOD1eu09CvLtksv7w+Sjj eMZY83Gg7AYliQQKlBsXTzUAXeD1teMUIkYGonaHO1ia1d7hTk0rfypvYNZTcxeqOS8Hrk CPvDQfEQgjxwYnWM/Dfokw4MoZvfuOJSpzC/YRIC6ny8vmo6fuVs65VYmCvzcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201777; a=rsa-sha256; cv=none; b=fSOtxTAs74L6P4j4T83vQyrexZEkkHvTmsEXYNcDO2Fxms5SzofnbccWnZ9OoVXIKvuWX3 mneLp3nWU+UlPpci9Biy0EBU01Fax4MhUCGi+KtemBh5ogbA8n2PK6MZR7XqbyvEkKiv4s 0bsICd/6o/bxqvvBppvfxw1i/+fLFcAdeyM1ZmBwFIgT+LshG8pSYv0grWdsVRNCFdOVaf dr+8wmm1YnusdE08EWMFbgOKBY04jdf1DhT9e2v0PHQ6DehFuAU/GJHs2h4YuK5ANdfv+b alwfCCanlOllV1LcdHoTUl8Kg3u/8PY4vwEzHMKreeV/s012AxAp8dSbZ9G3Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqj5r4vz9j6; Mon, 03 Nov 2025 20:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTbNX050845; Mon, 3 Nov 2025 20:29:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTbVW050842; Mon, 3 Nov 2025 20:29:37 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:37 GMT Message-Id: <202511032029.5A3KTbVW050842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4002a34e6836 - releng/15.0 - random: garbage collect the RANDOM_PURE_OCTEON entropy source List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 4002a34e6836a10061fba8a76eeb9a092e1759dc Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4002a34e6836a10061fba8a76eeb9a092e1759dc commit 4002a34e6836a10061fba8a76eeb9a092e1759dc Author: David E. O'Brien AuthorDate: 2025-10-17 00:55:51 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:35 +0000 random: garbage collect the RANDOM_PURE_OCTEON entropy source It was used for Octeon MIPS and all producers have been removed from the source tree. Approved by: re (cperciva) Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53146 (cherry picked from commit 283699338c5724253f721f4d0e488113dd49bd17) (cherry picked from commit b3bf22d70eb580b0a03906b17442f3950686b23a) --- sys/dev/random/fenestrasX/fx_pool.c | 3 --- sys/dev/random/random_harvestq.c | 3 +-- sys/sys/random.h | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 6a9828023678..95c2d223e0de 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -167,9 +167,6 @@ static const struct fxrng_ent_char { [RANDOM_RANDOMDEV] = { .entc_cls = &fxrng_lo_push, }, - [RANDOM_PURE_OCTEON] = { - .entc_cls = &fxrng_hi_push, /* Could be made pull. */ - }, [RANDOM_PURE_SAFE] = { .entc_cls = &fxrng_hi_push, }, diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 96676e8694bf..e38fd38c310b 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -661,8 +661,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_UMA] = "UMA", [RANDOM_CALLOUT] = "CALLOUT", [RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */ - [RANDOM_PURE_OCTEON] = "PURE_OCTEON", /* PURE_START */ - [RANDOM_PURE_SAFE] = "PURE_SAFE", + [RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */ [RANDOM_PURE_GLXSB] = "PURE_GLXSB", [RANDOM_PURE_HIFN] = "PURE_HIFN", [RANDOM_PURE_RDRAND] = "PURE_RDRAND", diff --git a/sys/sys/random.h b/sys/sys/random.h index dca30dc8fde4..af6b1e117423 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -89,8 +89,7 @@ enum random_entropy_source { RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV, /* Fast hardware random-number sources from here on. */ RANDOM_PURE_START, - RANDOM_PURE_OCTEON = RANDOM_PURE_START, - RANDOM_PURE_SAFE, + RANDOM_PURE_SAFE = RANDOM_PURE_START, RANDOM_PURE_GLXSB, RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND, From nobody Mon Nov 3 20:29:38 2025 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 4d0jql3Vbmz6FjHR; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jql073zz3KLC; Mon, 03 Nov 2025 20:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWmSRRJSIj8tM2JIwWNkr/uiMqrlzTDhPqVR65rufos=; b=NE7QPMiWg8dCoAOMbrZ2ZwtD/UkkMRv59E4F1DWVpR6NrU3eAOumqOAqBkKTAuNj3HNZXp 7u83H6UEAeiPwSbxMTwLVC7ZWLGl4YvjPhKfFt9WbiPP45Pp7PySSsk2crjp4ayyiYSo+4 DV/S6jzLlf2HZxDNeWpCCgUFhhDVHhXzDH7t/QlxKm9oB3PqGDhOa6ktk/r7dOb6YYlAec 3AnPRJCxo4JMVzuWJo+w/cI0j8V2i65yyONerD1LWzyzVzsohbPV2Y8lvY7fah51b3E8e9 MUJ73n3ZO2e5Ymf9yaayRmGvundwtRVFjHqYGkiU+b5NO1ZSNo2Eryy29i5GIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWmSRRJSIj8tM2JIwWNkr/uiMqrlzTDhPqVR65rufos=; b=A+NcJNklyRHjs29ngaVuwUPUebM77ybNDiw/cuYdAyIr2fEl210j0q3MrlrOW1WZ/vqL+q GzJ14x0hgMcwkHTY/iBjade0bJ2BOUAvqD12Wim+RW3DgRww/CF/fR+Dz02jj9uiY4CgOJ LUvK2fc2hp0lYhm+1GIsGeBIakeXUCh4SNrJehAAxBIOJI+ZSq6dQ3iZODQD+66i7wBMJX cuTgSuX0fq/o01o11g7Jrop4mIMIUAaSUn3KlEIX9m3jNSAwtHqrMfpVFSK+5ZVNkzH6ot iRL3xBVxP9S8H6ILep5VRN+3jsHEvsj7HRzPtE7KBgp3YUI/bk2WS3/1nDUjtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201779; a=rsa-sha256; cv=none; b=MUXfnGcRdS43GRayNaUFWm4l2HmwgJ/8dcMwW0516npDRKowlS39eGJfQJ/NvknfukxgYc IgO4qnDShBnbpSMMfMN3e/87YwyOa2aZbILCTc4xYkOMYeSPBs34oKCAWTJonK9ishZpAN kfMbfmCfXzDzzXyT1Uo7NTkIK6Prte62s79tCzJeu24S1XHvVmi/wR78K24BhTkDgcY5tk Vx5cWaxzq5GHT7SWvJSPk27wMJsPReokQA/FsB1D6HxhjMUwR6htoh9IrCK2KMt/XfDp5+ C+E6u/DWJwmVizmBsVYKiCQ+hgd6Zz2njTolSMNjXABvMUn1aZKWext7nrSRtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqk6mLqz9x0; Mon, 03 Nov 2025 20:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTcD1050881; Mon, 3 Nov 2025 20:29:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTclF050878; Mon, 3 Nov 2025 20:29:38 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:38 GMT Message-Id: <202511032029.5A3KTclF050878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 10858b0162dc - releng/15.0 - snd_dummy: Round channel pointer after each 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 10858b0162dc434d1b6430d7583a88a83c8012d5 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10858b0162dc434d1b6430d7583a88a83c8012d5 commit 10858b0162dc434d1b6430d7583a88a83c8012d5 Author: Christos Margiolis AuthorDate: 2025-10-27 11:30:29 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:38 +0000 snd_dummy: Round channel pointer after each write Otherwise we go out of bounds and keep incrementing endlessly. Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D53337 (cherry picked from commit 364864ea91abbd8a9a79578168fa5d34e05200a7) (cherry picked from commit 4eac02b29f56f35d17f3cb2104e5b952841e83b9) --- sys/dev/sound/dummy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 4df5b112d3f4..54320aab8496 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -104,9 +104,10 @@ dummy_chan_io(void *arg) ch = &sc->chans[i]; if (!ch->run) continue; - if (ch->dir == PCMDIR_PLAY) + if (ch->dir == PCMDIR_PLAY) { ch->ptr += sndbuf_getblksz(ch->buf); - else + ch->ptr %= sndbuf_getsize(ch->buf); + } else sndbuf_fillsilence(ch->buf); snd_mtxunlock(sc->lock); chn_intr(ch->chan); From nobody Mon Nov 3 20:29:39 2025 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 4d0jqm5lGqz6FjDv; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqm10Lcz3KYn; Mon, 03 Nov 2025 20:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZccrlAs6n2MUsBziEeMNB5aa+3KGqLdiIEYeLNTnlY=; b=CZFL3XrF8VUV1wEF3eYmbvCjJboNQq05OHPhibYagFE2e3tr1VgI89uPIzJRnPVIPN0V43 l6B3JQXhfr985SalrG37SulXsTrnxeMJYuxNxcx8BB/QxIHa/wDwiLenZnfZN3JRDPjMOR 74u7APxEQLQHhygYDWlhOxQ2XOseutjuyeaCW6ooDQKmGV7br7I/VPb0AycLzMLWklAzem dSeG0a4j6kIkbD3vL/ClEgh1QmT+9UNGdm0sRwgqXR4PKwKj84pp5d8QqFJBQJF+T6p2Ao Ljk9iZVvuHFUtSxjcIuWX/zwbad1Td0r0ka0angsshsbpx+AtdRM7UKOCgIKRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZccrlAs6n2MUsBziEeMNB5aa+3KGqLdiIEYeLNTnlY=; b=hhaCkF4VIsDVGaO6I5+YsJwLnOdPe1F1TeYV4XMpLgVpeEW3htqsWidnD6bpPHEXiTiBN0 tZrSvlqtXkR3wcznk0qS0jj16ST/qAhLz7Kf/yTos0kWxd6kkbfpt+hBuweaTmNAdhgwg2 civGCZNWYes4XHifXJQP1UFonIsJErn6BmsYlbnrBq9DoBtGQhYbzailMY1aXJs0gRwXWn orAtFDf58u7o9THpi7MaHCoIkLNFlTZS7egz+mPsE2hUcs/2TW9sWgKmRh0m42WYqmou6j jHor9c0Dg3UtSqxF/9hN5QBhVnBZs2geHMqtabDuE5F0IZ4Ql0HyVWo6DjaDrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201780; a=rsa-sha256; cv=none; b=upbRRhadx9kW4/urrNlskWx3ma/ZPwgKiRazOBfgZZHQL836p26S3e4l3GUbpHjEDN+ZsQ lTDPm0BzTHQ73cbAwnY5XktV8QrzTXKgO7Fnj40kZHk5WEyvBu0Qf//Gdy/bW9sD0lJNXU FsBwKaFL58iBcpdQiEWEq4LBxK5Hi4t4QWoV5tLtoVYpwggg6PSt3gZiSPtVuT2JBuxjSm IcbuQ3F1laOo09aNfOTyWO9mrzZ1qNMN4GvwVVxaBzFyYLJc5gxEifWvAZzUddh7dH/L9e WgzyP66vChukafELDfaVF6zdrpZftht4w16AFQBoFISDevsLwy9m4JmMsCLdLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqm0Z9Fz9j7; Mon, 03 Nov 2025 20:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTdp6050915; Mon, 3 Nov 2025 20:29:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTd0x050912; Mon, 3 Nov 2025 20:29:39 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:39 GMT Message-Id: <202511032029.5A3KTd0x050912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f38a2cfd5f24 - releng/15.0 - nfs_nfsdserv.c: Add a sanity check for layout commit cnt List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f38a2cfd5f24dc815ae4a4a5778db05b403cd8ff Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f38a2cfd5f24dc815ae4a4a5778db05b403cd8ff commit f38a2cfd5f24dc815ae4a4a5778db05b403cd8ff Author: Rick Macklem AuthorDate: 2025-10-27 14:24:47 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:41 +0000 nfs_nfsdserv.c: Add a sanity check for layout commit cnt If a client were to send a LayoutCommit (seldom used and only for a pNFS server) with a bogus cnt, there could be problems with a malloc() call that uses it. This patch adds a sanity check for the cnt. Note that RFC8881 does not specify any upper bound on the cnt. Approved by: re (cperciva) (cherry picked from commit 1a679fb907962843f01b103ec672136a8f8d8edb) (cherry picked from commit c69e0be70f4693940873f16e5019bd229a410369) --- sys/fs/nfsserver/nfs_nfsdserv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index a881968b03be..9dda65d5cbcf 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -5128,6 +5128,11 @@ nfsrvd_layoutcommit(struct nfsrv_descript *nd, __unused int isdgram, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); layouttype = fxdr_unsigned(int, *tl++); maxcnt = fxdr_unsigned(int, *tl); + /* There is no limit in the RFC, so use 1000 as a sanity limit. */ + if (maxcnt < 0 || maxcnt > 1000) { + error = NFSERR_BADXDR; + goto nfsmout; + } if (maxcnt > 0) { layp = malloc(maxcnt + 1, M_TEMP, M_WAITOK); error = nfsrv_mtostr(nd, layp, maxcnt); From nobody Mon Nov 3 20:29:41 2025 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 4d0jqn3wKlz6Fj45; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqn23X2z3KF0; Mon, 03 Nov 2025 20:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ld2jpE9uRokXD1ca/x9vGMx+heJxTo8nwJxnfLRvVnE=; b=HtRJDS+Lv/vF+d+NXzPb7goABXnIXa6mX5gBxX+wjRcdY6XAmJYVNF0ygkiQoV3W6IjB9I ZaBDFIwq2NGtym29xBtPEqhbFU6x8ROffWL7ehZbpjXjTD+bPKiQme2P21mlY6jNHWFPlI Md4L6YloHnDD/Cw3o/7CXbtVTbVBo1dHz+oDZOcReC48Jp6UMM/oaAFMdUaNBy5wYwAR0t aUe4Y0ANW/aclSh/tza6cyJ3xFCqzKokeJiDxfHybrjfUUhYznAzc/LWyWvgc+Je/RCjES OXPwIcUexraT0U012gOxcAPVBigygGJRJaazlVsYCZAlfW6jP43wEQ9M6wrJ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ld2jpE9uRokXD1ca/x9vGMx+heJxTo8nwJxnfLRvVnE=; b=cet0I3tLCvHWFb3JFTaT9q/qLUKyDJJUZUshXxIg0K4091oVYKbNvtNG3puzStZORFmpg3 NoJp6YkE3RhiwO63mpqlY2oehRxSgWAbY6Tfr46pY/9yv/PFpXqMeJt9rvNVsVKpS1tObT yDjVCGMq9CUZ0rCuzPxMQknbwYVioEj+jOy2zSlpLcd06Jeih4t+/LW2OutEKZJY57KEud eBypcU4IA5hnPHfkRQTR2xg6Nx7RXSxO9imcrHZYTtXTHmwrTnW7fiGXb4J+LGVnDo0gU+ FhNbqgO0/kRtITvy/wN02uZp0NeU5g7N6kRPL/dToAod0g0XUC2EFJGvVKEhcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201781; a=rsa-sha256; cv=none; b=WN4OQh8U5nVLFQUfbEtOgFgBafEf8PXPwdqizaSCVNWO8qQXWv2YiV/oIUtvHgB6lj/6x7 27jhjrIA2yn8V5OD2VFBGkcMpIApW5IC92aBlFUJ8CyXO64vEp6iJuxAyzuMql9oNk9zH2 D0kIP4PFREcMxoyoptTQO3DfYM7RXGVZwj1nhjBq7B7ZJd3hLi2SSGWyJhwDzK06rHaUcJ HsIK2nI1Y11Ib256fz+9fAOgS5YIlYNBHCq3644Ir/7PVKRSJ7VhGs5bdGTHiYRCMg17fj gBwbv8YT9FwcDFNkmiEixPBndOiSXYooJJUAjvYWU8PKrkwP9zleoHxJx+aCew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqn1c52z9x1; Mon, 03 Nov 2025 20:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTfQW050949; Mon, 3 Nov 2025 20:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTfNq050946; Mon, 3 Nov 2025 20:29:41 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:41 GMT Message-Id: <202511032029.5A3KTfNq050946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9c47506fc77b - releng/15.0 - nfs_clrpcops.c: Add sanity checks for the slot cnts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 9c47506fc77b38963d4b3ebe16112cc0fa6f5437 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9c47506fc77b38963d4b3ebe16112cc0fa6f5437 commit 9c47506fc77b38963d4b3ebe16112cc0fa6f5437 Author: Rick Macklem AuthorDate: 2025-10-27 14:35:27 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:45 +0000 nfs_clrpcops.c: Add sanity checks for the slot cnts The reply to CreateSession includes the slot cnt for both fore and back slots. It should never be larger than the argument specified and the fore slot cnt should always be at least 1. Without this patch, the replied slot cnts were not being sanity checked. While here, replace 64 with NFSV4_SLOTS (which is 64). Approved by: re (cperciva) (cherry picked from commit 3053b2a3dcab6e05311c3b696bee4c9e5698d93a) (cherry picked from commit 14148591b951e60093afca50fe2497f21ee91950) --- sys/fs/nfsclient/nfs_clrpcops.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 4ec621de2eff..efc0c31fc589 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5596,7 +5596,7 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsclsession *sep, } *tl++ = txdr_unsigned(4096); /* Max response size cached */ *tl++ = txdr_unsigned(20); /* Max operations */ - *tl++ = txdr_unsigned(64); /* Max slots */ + *tl++ = txdr_unsigned(NFSV4_SLOTS); /* Max slots */ *tl = 0; /* No rdma ird */ /* Fill in back channel attributes. */ @@ -5665,6 +5665,11 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsclsession *sep, sep->nfsess_maxcache = fxdr_unsigned(int, *tl++); tl++; sep->nfsess_foreslots = fxdr_unsigned(uint16_t, *tl++); + if (sep->nfsess_foreslots == 0) { + error = NFSERR_BADXDR; + goto nfsmout; + } else if (sep->nfsess_foreslots > NFSV4_SLOTS) + sep->nfsess_foreslots = NFSV4_SLOTS; NFSCL_DEBUG(4, "fore slots=%d\n", (int)sep->nfsess_foreslots); irdcnt = fxdr_unsigned(int, *tl); if (irdcnt < 0 || irdcnt > 1) { @@ -5678,6 +5683,8 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsclsession *sep, NFSM_DISSECT(tl, uint32_t *, 7 * NFSX_UNSIGNED); tl += 5; sep->nfsess_backslots = fxdr_unsigned(uint16_t, *tl); + if (sep->nfsess_backslots > NFSV4_CBSLOTS) + sep->nfsess_backslots = NFSV4_CBSLOTS; NFSCL_DEBUG(4, "back slots=%d\n", (int)sep->nfsess_backslots); } error = nd->nd_repstat; From nobody Mon Nov 3 20:29:42 2025 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 4d0jqp4jpbz6FjHS; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqp301Pz3KFC; Mon, 03 Nov 2025 20:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VyNiXWvl2dgbnUsaf+yyhDIP0oGBI5yMyRmUwM/Gw/Y=; b=qk2svaaHqv2gWQU574Zt+Xg9Mnv5OlzkV4JzyNQFi470gv6mk64BEkIvNbExbSVpOwicpG NQB2uGyxNwF9KkjlkZvwgJZbQRLYaJ+/HoxSk5sOk6Shjc0IJWmmpyVXy0FVlEqUt/0yQ6 olgXvk1dG60MHo4JbsgkSZJ2FXKMnWOABxePp9rn4ApPTk15JBNCkJYDaZluICt+0G3Dv+ Vrrg4w9+ud+vRp3bZi5OqaqokpKMzqnRXo5HNBaxebE0zswTd0QNlwr2rlxD03mAUDu3Ap mZTiw3ggKbnWoPoKfyBuzs0wPBwwzTua/zJAbSOyMuYJ9zsOMXMoxGHsaMQNmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VyNiXWvl2dgbnUsaf+yyhDIP0oGBI5yMyRmUwM/Gw/Y=; b=WDwGpBcVLJ+aSxr7PWDPBqNU8OZplfJtSRFEVYJVECIw/+gyIRGKIVMzDn2AHKeZ+5NlKP eRCsshb69K6bgEUiwUUN7d0WThheMT3gK/89FmZFMyWdxF5ckHb+UIryVvh22CxxIoVETp ngEAkXGR93Gul531xqC+ij0sjAXV0O2bRvHeTShgncerR7AM9JWxrZXNe0IDVxnIMwOvmE tOfxpASFe0kl1QBhCZtOGU9PsKODCIIqa1hS16R0SMgA3nHc2CZP7gNdJrZR5uOOxEx82f WFOJJxPXGwqGBizAfGAJGKUYPwl9tNeq/SJDfX3OZbTl/I+GwPcjG+DM/GZs/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201782; a=rsa-sha256; cv=none; b=llx6DSkT2j8Xk/Tpk3QTAeqt5/sSw1rXYXBjiQATRY1Gf7PSTJ+Vd5tUsiAeNQUTrTByXV mgHq/LjGX4xayXQMgW9ReUs6Nv6POzHYIiobVO/4z3pB97hIY+QmcgIsbf340Dqhrfh/1i j/TRVIQmA4X/6xsmHOw+iQ3GmLJHvW0ZOMdWJDkKWojS2uVU4Vo3xEz8VpzTRYBBUXDjF2 80QoyZ3a/fhigDsPvCPTpCAF/T8bQJNNNW6R5nYFipX9XOj8uGXFrOGTvpNkv1qbHTY4qh g7e/kN02qP4xLi9YUqN+4eLwRzHTNsEZM7dagB2GmtetUNewLTpk9sCBTMYSWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqp2GM0zBP6; Mon, 03 Nov 2025 20:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTgq0050983; Mon, 3 Nov 2025 20:29:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTgIK050980; Mon, 3 Nov 2025 20:29:42 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:42 GMT Message-Id: <202511032029.5A3KTgIK050980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 82579ee1f0f8 - releng/15.0 - nfs_clrpcops.c: Fix two possible large NFSM_DISSECT()s List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 82579ee1f0f88c8e38f6c9dfe21b52f59b23a769 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=82579ee1f0f88c8e38f6c9dfe21b52f59b23a769 commit 82579ee1f0f88c8e38f6c9dfe21b52f59b23a769 Author: Rick Macklem AuthorDate: 2025-10-27 14:43:02 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:49 +0000 nfs_clrpcops.c: Fix two possible large NFSM_DISSECT()s There are two cases in nfs_clrpcops.c where it was possible for the code to attempt to NFSM_DISSECT() a large size, which is not allowed by nfsm_dissct(). This patch fixes them. Reducing the maximum stripecnt should be no problem, since there in no extant NFSv4.n server that does striped File Layout pNFS and current development is centered around the Flex File layout. Approved by: re (cperciva) (cherry picked from commit b9e6206f593385c80436d267ab759319c1e94e43) (cherry picked from commit 609c4eb70afeb713ab38efcb34c55cfa71a5838a) --- sys/fs/nfsclient/nfs_clrpcops.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index efc0c31fc589..06e9d9f87628 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5804,7 +5804,8 @@ nfsrpc_getdeviceinfo(struct nfsmount *nmp, uint8_t *deviceid, int layouttype, NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); stripecnt = fxdr_unsigned(int, *tl); NFSCL_DEBUG(4, "stripecnt=%d\n", stripecnt); - if (stripecnt < 1 || stripecnt > 4096) { + if (stripecnt >= MHLEN / NFSX_UNSIGNED || + stripecnt < 1) { printf("pNFS File layout devinfo stripecnt %d:" " out of range\n", stripecnt); error = NFSERR_BADXDR; @@ -8250,7 +8251,7 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, uid_t *uidp, gid_t *gidp, NFSPROC_T *p) { uint32_t *tl; - char *cp, *str, str0[NFSV4_SMALLSTR + 1]; + char *str, str0[NFSV4_SMALLSTR + 1]; uint32_t len = 0; int error = 0; @@ -8273,9 +8274,9 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, uid_t *uidp, gid_t *gidp, str = malloc(len + 1, M_TEMP, M_WAITOK); else str = str0; - NFSM_DISSECT(cp, char *, NFSM_RNDUP(len)); - NFSBCOPY(cp, str, len); - str[len] = '\0'; + error = nfsrv_mtostr(nd, str, len); + if (error != 0) + goto nfsmout; NFSCL_DEBUG(4, "nfsrv_parseug: str=%s\n", str); if (dogrp != 0) error = nfsv4_strtogid(nd, str, len, gidp); From nobody Mon Nov 3 20:29:43 2025 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 4d0jqq6XPvz6Fj6c; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqq3hnBz3Kbg; Mon, 03 Nov 2025 20:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Nh48XrwOVKutd5hzYuVlmUWyRilqvpPU1U/XssNs0M=; b=FD5p9UX0zV+v0Q3ogr2EWiD/7DAf0pdKpQIP9Hyd1HOfV9A5/eKZsbzLF+rSen/bm7JTFw 1T+blJVdLs5D1pweWTb32K4ddAbJ2LZSot0I8UlHAjR+hsknSmB7UzFOHr3ARuxi7lbyyH KdBvMf9M4PPjRO/YiBd5opIJq1Vsn5gQ9YeKT9YruocOc3RlQgtpjwtxXNAnxDUlbdSFQL EgFrIu4TOeG05HX5tA7fkmBtrxFuEIpukvML7L5aWuVD1IQyW4SjAAUT6wWy6ewsjFeKe5 N1cteKJR8HHaevg6FhHZvDu4wVHN4B1+Yzer/OHbuQe/4aWszsfWGHb6InsnFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Nh48XrwOVKutd5hzYuVlmUWyRilqvpPU1U/XssNs0M=; b=s6Mj/WfUQOGyvEwxT4MPB1grVj6hBORdbqHZFd7zr4IQ8FhGMcI9lVSWG2dHRjTV8h/LTw AOZ7d6oRQTdlnQFVPTP5b2eEoMAGs90+t05+RbGSZnMSlS6FvUtZ4mgzLJxA42z+V/5i1I kR0s9PiVnMgE2xbRc8Ep5TDUJYNVdpRbVBXKJRcCvhTePjQED0CyUmyrNSvzo86Dok4Nvd 44DLcpHA3cFETPZkZVt3WTiz+k8UGIphemo4bUTnze1D//jUiLb3ECCXliDOPkchrzN5k0 4cRVBiCHsKqAOiVEE0jrsGvGDEv3qTpBe5CwvzvI7k3KAaavVHDqnA2ycMhODQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201783; a=rsa-sha256; cv=none; b=eih8wtOewnvptX6ZNno0fxewafnb2rhdfAijcPEIDWxkGtDyvwj7VpUrnwAjlWdDFKjOha Q2DxVpVJd+xclyHi6ppFG20jg1uacDS40vv3hCNrnoAAg2h2Cm48sX/RDp1yPTVNyV5v/R hH+I6fyM1LmCuAtGB/3Lt/XfkeDJNaHGD3AC5dw4b8aNy4jXbPuzSap/mglrv9U8bD0E8A 5FjnSRZLLKWyWfRknxk9O74hsRI2+KXCPdEQL4LiXBcOzdsFXdlMBcG21m3w4/mIdJpuRU KNiT3wKNjQd1bNchFjShvcPDVmA51CQUNqosStHSoFaTpyo120tcULHFe22FPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqq39x4zB1C; Mon, 03 Nov 2025 20:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KThmx051016; Mon, 3 Nov 2025 20:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KThGD051013; Mon, 3 Nov 2025 20:29:43 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:43 GMT Message-Id: <202511032029.5A3KThGD051013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 5d37e6975e90 - releng/15.0 - nfs_clrpcops.c: Check for too large a write reply List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 5d37e6975e904e3889ee32a82bb255890aab0d68 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5d37e6975e904e3889ee32a82bb255890aab0d68 commit 5d37e6975e904e3889ee32a82bb255890aab0d68 Author: Rick Macklem AuthorDate: 2025-10-27 14:49:32 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:53 +0000 nfs_clrpcops.c: Check for too large a write reply The "rlen" reply length for a Write operation/RPC could cause trouble if a broken server replies with too large a value. Improve the sanity check for "rlen" to avoid this. Approved by: re (cperciva) (cherry picked from commit 2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b) (cherry picked from commit b5b6ddfc9981f9675cd165fc91d00c205282b716) --- sys/fs/nfsclient/nfs_clrpcops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 06e9d9f87628..ec0d3713dc9f 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2212,7 +2212,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode, NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED + NFSX_VERF); rlen = fxdr_unsigned(int, *tl++); - if (rlen == 0) { + if (rlen <= 0 || rlen > len) { error = NFSERR_IO; goto nfsmout; } else if (rlen < len) { @@ -7254,7 +7254,7 @@ nfsrpc_writeds(vnode_t vp, struct uio *uiop, int *iomode, int *must_commit, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED + NFSX_VERF); rlen = fxdr_unsigned(int, *tl++); NFSCL_DEBUG(4, "nfsrpc_writeds: len=%d rlen=%d\n", len, rlen); - if (rlen == 0) { + if (rlen <= 0 || rlen > len) { error = NFSERR_IO; goto nfsmout; } else if (rlen < len) { From nobody Mon Nov 3 20:29:44 2025 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 4d0jqs23j5z6Fj6j; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqr4Wphz3KX0; Mon, 03 Nov 2025 20:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcP/Q9CHTa55X86Z1TiJ2aiSNfaIuxE9pWrlFvLAIb4=; b=BplACFGqwiU+wCNLrNN+V9SOTEUvmCgRH7ONKm2Hj9M9nhGe1bZ5tvt4z8wfv5s+k7QccD MjCEIPNOxDAjOYncSXI4U2bJVsf4SmB7fhZjHPPOWJV0/PbsIIr0nrOwEEg1eLsZxsGnwy Kfibh1qBhuqTb+t5lZ8Yoe2MIM1Bh/B9Lto7Zg0GKzeHH4chiG0vDHTvtV8kw7W1G/7BYZ RWdR6oi9PoJXGyuKkZHGb4BLtB8J2Rhgskq0GMGYN+XZFONfRo+B335lLMvspr8ndjdorS vA5Pbg3AWjp9pFwzy3sUQeMZ/cEGR9cqph9xofmZw6GKS7ogqr2Uo2qwcRO7SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcP/Q9CHTa55X86Z1TiJ2aiSNfaIuxE9pWrlFvLAIb4=; b=oktuej9jWqKPYIT09qdSuhaJrpVbk4YHDcUBrTWXEPuVwevPlII3YpA1LoCg4HTxG+A86q 9EaZRwXBwRId8KvjJ2gv2PHrShgY9PM8wcwhG9f21ydiu2NdMwGfExmiOp7TnDEJO0gIb3 BDkRnHIBRcdO/cgeuvEr/7xvQTaMV/EJ3bAKSnVhr/FVuyVnDKNhgVG12uMR2+LDaoDJ1X 4CVrJ9TcU6Yes5eDh7pmM7vUyqnjlj7kQOD3McPXpx0vlAc8v+XpVrqEdg8SBA/qFXmGnq VzPz4AThP4kpUu/cxLm4cAxAldOg5SSP9O9XAVkt3tjK62Y4gYiqOh2pd8wkAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201784; a=rsa-sha256; cv=none; b=HjIZBHc72RLdU8JO6KdhfkJwWAQqoUeSkkGNEIM1xynP8bpapgjKvhNW3WTtNaf2VS5xTz cvSSB5lMTtll6ieBOxWUtmNfCIMdlYNe8w6ervy57vsJXYcIlwGwihBFbe2KhlmJXhci1o 7oSjfWpnUqmufu4v7WXiJRmJWA8hLlcekvfHnq4bk1oAEI0WQiOfFtcoSJPRMnPLGUfY7D FExIRtpILGVEM6nYnB1UNses2vzJK042cIjVmpyJzaesW5MfT5EIUzaaroBxAyS2yA11w3 bB/8K3mtthWFUAFZ/S/N28T9uS66TcKvcheDB4uzuCPPkAVirvOID+Bl0yVfGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqr468kzB1D; Mon, 03 Nov 2025 20:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTia7051055; Mon, 3 Nov 2025 20:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTitA051052; Mon, 3 Nov 2025 20:29:44 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:44 GMT Message-Id: <202511032029.5A3KTitA051052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: e5fc5bc53fb8 - releng/15.0 - nfs_commonsubs.c: Add a sanity check for nid_ngroup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e5fc5bc53fb83caea92ec9856aa4638ce7a97b46 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e5fc5bc53fb83caea92ec9856aa4638ce7a97b46 commit e5fc5bc53fb83caea92ec9856aa4638ce7a97b46 Author: Rick Macklem AuthorDate: 2025-10-28 14:44:14 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:56 +0000 nfs_commonsubs.c: Add a sanity check for nid_ngroup The nfsuserd(8) daemon passes user credentials (uid + gids) into the kernel for users and groups identified by name (received from a NFSv4 server). This patch add a sanity check for the number of groups (nid_ngroup) passed in. It's only purpose is to protect against a bogus nfsuserd(8) running in a jail. Approved by: re (cperciva) (cherry picked from commit 4672adcea4cf3c0c626d186f1f41c69552d915f1) (cherry picked from commit 83a0732a4cfe9f2846e144b39ebe517cbe395fac) --- sys/fs/nfs/nfs_commonsubs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 7f5b29ca2085..dd3b8b4f1708 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -4165,10 +4165,15 @@ nfssvc_idname(struct nfsd_idargs *nidp) nidp->nid_namelen); if (error == 0 && nidp->nid_ngroup > 0 && (nidp->nid_flag & NFSID_ADDUID) != 0) { - grps = malloc(sizeof(gid_t) * nidp->nid_ngroup, M_TEMP, - M_WAITOK); - error = copyin(nidp->nid_grps, grps, - sizeof(gid_t) * nidp->nid_ngroup); + grps = NULL; + if (nidp->nid_ngroup > NGROUPS_MAX) + error = EINVAL; + if (error == 0) { + grps = malloc(sizeof(gid_t) * nidp->nid_ngroup, M_TEMP, + M_WAITOK); + error = copyin(nidp->nid_grps, grps, + sizeof(gid_t) * nidp->nid_ngroup); + } if (error == 0) { /* * Create a credential just like svc_getcred(), From nobody Mon Nov 3 20:29:45 2025 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 4d0jqs6rv3z6Fj9Z; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqs5ZHnz3KFm; Mon, 03 Nov 2025 20:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+jdgXmWTsK9yFmjupO3FJ8GLvRpqIxIZF4fu7Y+/Xow=; b=rriusqKcfBKOZ9yjps8l8nmXGRvJBoGRAoURBrxKCDv1jY76gHjElxzfSGcXovpnfIulUO P0BXPUG/jjKJHHqAiRwsalyDSpNnS9tr9bo+2FtCpaagv2/3lIuJywx/Uagv1dD+0RdI0m AHXJP3FMBKBUBQYzD094dGcqRNBJW/foqEbvaNu4DJTWCG+ypjTPNo8nD5WnCXFRKld2CR XVUkVh1rBIKhBPKJJEnxqblEa0TziTbEDNb/hHOiC1bHquxKUexyJona9wURg+6ybzWGP1 sZVjN5szFb9Bxf/z2rvEmmq2SGUd5jVYJSMWzSLL7S1XsDySEC+mYMF4XEXyyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+jdgXmWTsK9yFmjupO3FJ8GLvRpqIxIZF4fu7Y+/Xow=; b=IHLwByZD6HcpP3r+1xwnuugDn6E0+KbyY8gB7T08bGny8H4VxrIubMouLoMM83A5C02nBy 82tVwGYwxmK4YsboPtt2dEtPKfyPfEmh11eVg0b1c0F8g8QuCJ6Z1hLny4+Q6kX7RGYyNJ 7y7fINfevRBDmfDSCaRYppU0zNQfQtvUbPuei3lYiL49LqrqfSLsMiQMNe9GpaS7um4OuQ Z80zqI+bp+j2zWLEMc4cJfY763uP4o+VmpdlvaRH2LgbEQ9ViLP8NyMOu8SEfoo72VHqGp a0A+0p67qdKKbB+QDOhZStq2g8ZnpWSMHdfmt4HfWCV3HEidZ68EWlfWVl7KNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201785; a=rsa-sha256; cv=none; b=Q6A1/lBAYS2NIT7Y9TNd0lAaD+Ms/kBkRnLfCVSKhgqrEECzad9yrKgdjJxuGndFUaXHQJ 7T8ePGeTy1CQvUAF9pEOXh6yeXdHAYkCx7rAGdkqNc85u7SJf/90NoY78mTU3DRub0jJTv r22dfn/J96C66S9pVbc5ocBAlMP8QltLJ97JfYt+5jokYSv48njMUp6Ags4Mk71BWAkx5B k47kh0+AnrrDmkfdarArhqeC9TmqQ6VsbA3yogbWVvmcbVbXGflYNYPrYwL0rf91R0y9Kr ptixkRkQKNqhil+O90ziDeliM2P7TwoyqIWOydtnTYHU9VhszTu0X79EoQTIzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqs57FszB1F; Mon, 03 Nov 2025 20:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTjFh051092; Mon, 3 Nov 2025 20:29:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTjYp051089; Mon, 3 Nov 2025 20:29:45 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:45 GMT Message-Id: <202511032029.5A3KTjYp051089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 8a0b57ba54f0 - releng/15.0 - libarchive: merge from vendor branch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 8a0b57ba54f0d2bc19bbc464526f2b925d7683be Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8a0b57ba54f0d2bc19bbc464526f2b925d7683be commit 8a0b57ba54f0d2bc19bbc464526f2b925d7683be Author: Martin Matuska AuthorDate: 2025-10-21 14:10:15 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:00 +0000 libarchive: merge from vendor branch libarchive 3.8.2 Important bugfixes: #2477 tar writer: fix replacing a regular file with a dir for ARCHIVE_EXTRACT_SAFE_WRITES #2659 lib: improve filter process handling #2664 zip writer: fix a memory leak if write callback error early #2665 lib: archive_read_data: handle sparse holes at end of file correctly #2668 7zip: Fix out of boundary access #2670 zip writer: fix writing with ZSTD compression #2672 lib: fix error checking in writing files #2678 zstd write filter: enable Zstandard's checksum feature #2679 lib: handle possible errors from system calls #2707 lib: avoid leaking file descriptors into subprocesses #2713 RAR5 reader: fix multiple issues in extra field parsing function #2716 RAR5 reader: early fail when file declares data for a dir entry #2717 bsdtar: Allow filename to have CRLF endings #2719 tar reader: fix checking the result of the strftime (CVE-2025-25724) #2737 tar reader: fix an infinite loop when parsing V headers #2742 lib: parse_date: handle dates in 2038 and beyond if time_t is big enough Approved by: re (cperciva) Obtained from: libarchive Vendor commit: 7f53fce04e4e672230f4eb80b219af17975e4f83 Security: CVE-2025-25724 PR: 290303 (exp-run) MFC after: 1 week (cherry picked from commit 401026e4825a05abba6f945cf1b74b3328876fa2) (cherry picked from commit f55001cc9f9185dca21d80c10922df4c1846ffb3) --- contrib/libarchive/NEWS | 2 + contrib/libarchive/SECURITY.md | 2 +- .../github_actions/install-macos-dependencies.sh | 3 + contrib/libarchive/cat/bsdcat.c | 15 +- contrib/libarchive/cat/cmdline.c | 2 +- contrib/libarchive/cpio/cmdline.c | 2 +- contrib/libarchive/cpio/cpio.c | 14 +- contrib/libarchive/cpio/test/test_owner_parse.c | 2 +- contrib/libarchive/libarchive/archive.h | 4 +- contrib/libarchive/libarchive/archive_acl.c | 23 +++ .../libarchive/libarchive/archive_check_magic.c | 9 +- contrib/libarchive/libarchive/archive_cryptor.c | 8 +- .../libarchive/archive_cryptor_private.h | 11 +- contrib/libarchive/libarchive/archive_entry.h | 2 +- .../libarchive/libarchive/archive_entry_paths.3 | 2 +- contrib/libarchive/libarchive/archive_entry_stat.c | 6 +- contrib/libarchive/libarchive/archive_parse_date.c | 4 +- contrib/libarchive/libarchive/archive_platform.h | 10 -- .../libarchive/libarchive/archive_platform_stat.h | 45 ++++++ contrib/libarchive/libarchive/archive_private.h | 1 + contrib/libarchive/libarchive/archive_read.c | 7 +- .../libarchive/archive_read_disk_entry_from_file.c | 12 +- .../libarchive/archive_read_disk_posix.c | 157 ++------------------- .../libarchive/libarchive/archive_read_open_fd.c | 23 +-- .../libarchive/libarchive/archive_read_open_file.c | 16 ++- .../libarchive/archive_read_open_filename.c | 31 ++-- .../libarchive/archive_read_set_format.c | 32 ++--- .../archive_read_support_filter_program.c | 7 +- .../libarchive/archive_read_support_format_7zip.c | 7 +- .../libarchive/archive_read_support_format_mtree.c | 23 ++- .../libarchive/archive_read_support_format_rar.c | 8 +- .../libarchive/archive_read_support_format_rar5.c | 66 +++++++-- .../libarchive/archive_read_support_format_tar.c | 70 ++++++--- .../libarchive/archive_read_support_format_warc.c | 2 +- .../libarchive/archive_read_support_format_xar.c | 2 +- .../libarchive/archive_read_support_format_zip.c | 4 +- contrib/libarchive/libarchive/archive_string.c | 5 +- .../libarchive/libarchive/archive_string_sprintf.c | 2 +- contrib/libarchive/libarchive/archive_util.c | 38 ++++- contrib/libarchive/libarchive/archive_write.c | 30 ++-- .../libarchive/archive_write_add_filter_bzip2.c | 4 + .../libarchive/archive_write_add_filter_gzip.c | 55 +++++--- .../libarchive/archive_write_add_filter_program.c | 11 +- .../libarchive/archive_write_add_filter_zstd.c | 2 + .../libarchive/archive_write_disk_posix.c | 16 ++- .../libarchive/libarchive/archive_write_open_fd.c | 2 +- .../libarchive/archive_write_open_file.c | 14 +- .../libarchive/archive_write_open_filename.c | 3 +- .../libarchive/archive_write_set_format_7zip.c | 2 +- .../libarchive/archive_write_set_format_mtree.c | 19 ++- .../libarchive/archive_write_set_format_xar.c | 6 +- .../libarchive/archive_write_set_format_zip.c | 25 +++- contrib/libarchive/libarchive/filter_fork_posix.c | 37 ++++- contrib/libarchive/libarchive/test/test_acl_nfs4.c | 7 + .../libarchive/libarchive/test/test_acl_posix1e.c | 5 + .../libarchive/test/test_archive_parse_date.c | 2 + .../test/test_archive_string_conversion.c | 10 ++ contrib/libarchive/libarchive/test/test_entry.c | 11 ++ .../test/test_read_filter_gzip_recursive.c | 4 +- .../libarchive/test/test_read_format_7zip.c | 81 +++++++---- .../libarchive/test/test_read_format_rar5.c | 66 +++++++++ .../test/test_read_format_rar5_dirdata.rar.uu | 6 + ...rmat_rar5_invalid_hash_valid_htime_exfld.rar.uu | 6 + .../test_read_format_rar5_only_crypt_exfld.rar.uu | 7 + .../test_read_format_rar5_unsupported_exfld.rar.uu | 6 + .../test/test_read_format_tar_V_negative_size.c | 48 +++++++ .../test_read_format_tar_V_negative_size.tar.uu | 20 +++ .../libarchive/test/test_read_set_format.c | 7 +- .../libarchive/test/test_write_filter_bzip2.c | 29 ++++ .../libarchive/test/test_write_filter_gzip.c | 12 +- .../test/test_write_filter_gzip_timestamp.c | 7 +- .../libarchive/libarchive_fe/{err.c => lafe_err.c} | 2 +- .../libarchive/libarchive_fe/{err.h => lafe_err.h} | 0 contrib/libarchive/libarchive_fe/line_reader.c | 2 +- contrib/libarchive/libarchive_fe/passphrase.c | 2 +- contrib/libarchive/tar/bsdtar.c | 7 +- contrib/libarchive/tar/bsdtar.h | 8 +- contrib/libarchive/tar/cmdline.c | 2 +- contrib/libarchive/tar/creation_set.c | 2 +- contrib/libarchive/tar/read.c | 2 +- contrib/libarchive/tar/subst.c | 2 +- contrib/libarchive/tar/test/test_crlf_mtree.c | 74 ++++++++++ .../libarchive/tar/test/test_option_safe_writes.c | 5 +- contrib/libarchive/tar/util.c | 7 +- contrib/libarchive/tar/write.c | 29 +++- contrib/libarchive/test_utils/test_common.h | 10 +- contrib/libarchive/test_utils/test_main.c | 156 +++++--------------- contrib/libarchive/unzip/bsdunzip.c | 15 +- contrib/libarchive/unzip/cmdline.c | 2 +- contrib/libarchive/unzip/test/test_C.c | 4 + contrib/libarchive/unzip/test/test_L.c | 4 + contrib/libarchive/unzip/test/test_P_encryption.c | 12 +- contrib/libarchive/unzip/test/test_basic.c | 4 + contrib/libarchive/unzip/test/test_d.c | 8 ++ contrib/libarchive/unzip/test/test_doubledash.c | 4 + contrib/libarchive/unzip/test/test_glob.c | 4 + contrib/libarchive/unzip/test/test_j.c | 4 + contrib/libarchive/unzip/test/test_n.c | 4 + contrib/libarchive/unzip/test/test_o.c | 4 + contrib/libarchive/unzip/test/test_p.c | 4 + contrib/libarchive/unzip/test/test_q.c | 4 + contrib/libarchive/unzip/test/test_singlefile.c | 4 + contrib/libarchive/unzip/test/test_t.c | 4 + contrib/libarchive/unzip/test/test_x.c | 12 ++ lib/libarchive/tests/Makefile | 6 + usr.bin/bsdcat/Makefile | 2 +- usr.bin/cpio/Makefile | 2 +- usr.bin/cpio/tests/Makefile | 2 +- usr.bin/tar/Makefile | 3 +- usr.bin/tar/tests/Makefile | 1 + usr.bin/unzip/Makefile | 2 +- usr.bin/unzip/tests/Makefile | 2 +- 112 files changed, 1120 insertions(+), 546 deletions(-) diff --git a/contrib/libarchive/NEWS b/contrib/libarchive/NEWS index caca7d5cbdb9..f2dd4102fa04 100644 --- a/contrib/libarchive/NEWS +++ b/contrib/libarchive/NEWS @@ -1,3 +1,5 @@ +Oct 15, 2026: libarchive 3.8.2 released + Jun 01, 2026: libarchive 3.8.1 released May 20, 2025: libarchive 3.8.0 released diff --git a/contrib/libarchive/SECURITY.md b/contrib/libarchive/SECURITY.md index 6ca188b603fe..f2f60e792a57 100644 --- a/contrib/libarchive/SECURITY.md +++ b/contrib/libarchive/SECURITY.md @@ -16,4 +16,4 @@ Please provide the following information in your report: - How to reproduce the issue This project is maintained by volunteers on a reasonable-effort basis. As such, we ask -that you give me 90 days to work on a fix before public exposure. +that you give us 90 days to work on a fix before public exposure. diff --git a/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh b/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh index 2aa4823fc3d0..b33aed5e5562 100755 --- a/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh +++ b/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh @@ -5,6 +5,9 @@ set -eux #brew update > /dev/null #brew upgrade > /dev/null +# Workaround for cmake in local/pinned tap issue +brew uninstall cmake + # This does an upgrade if the package is already installed brew install \ autoconf \ diff --git a/contrib/libarchive/cat/bsdcat.c b/contrib/libarchive/cat/bsdcat.c index 731621fa9b75..2e78870ae50e 100644 --- a/contrib/libarchive/cat/bsdcat.c +++ b/contrib/libarchive/cat/bsdcat.c @@ -7,6 +7,9 @@ #include "bsdcat_platform.h" +#ifdef HAVE_SIGNAL_H +#include +#endif #include #ifdef HAVE_STDLIB_H #include @@ -22,7 +25,7 @@ #include #include "bsdcat.h" -#include "err.h" +#include "lafe_err.h" #define BYTES_PER_BLOCK (20*512) @@ -105,6 +108,16 @@ main(int argc, char **argv) bsdcat = &bsdcat_storage; memset(bsdcat, 0, sizeof(*bsdcat)); +#if defined(HAVE_SIGACTION) && defined(SIGCHLD) + { /* Do not ignore SIGCHLD. */ + struct sigaction sa; + sa.sa_handler = SIG_DFL; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sigaction(SIGCHLD, &sa, NULL); + } +#endif + lafe_setprogname(*argv, "bsdcat"); bsdcat->argv = argv; diff --git a/contrib/libarchive/cat/cmdline.c b/contrib/libarchive/cat/cmdline.c index 8ecd74aa95e4..5a5fcaf0263f 100644 --- a/contrib/libarchive/cat/cmdline.c +++ b/contrib/libarchive/cat/cmdline.c @@ -22,7 +22,7 @@ #endif #include "bsdcat.h" -#include "err.h" +#include "lafe_err.h" /* * Short options for bsdcat. Please keep this sorted. diff --git a/contrib/libarchive/cpio/cmdline.c b/contrib/libarchive/cpio/cmdline.c index c67519947dbc..db06c03c011d 100644 --- a/contrib/libarchive/cpio/cmdline.c +++ b/contrib/libarchive/cpio/cmdline.c @@ -26,7 +26,7 @@ #endif #include "cpio.h" -#include "err.h" +#include "lafe_err.h" /* * Short options for cpio. Please keep this sorted. diff --git a/contrib/libarchive/cpio/cpio.c b/contrib/libarchive/cpio/cpio.c index 2bf1bfa2985a..262db510568b 100644 --- a/contrib/libarchive/cpio/cpio.c +++ b/contrib/libarchive/cpio/cpio.c @@ -60,7 +60,7 @@ #endif #include "cpio.h" -#include "err.h" +#include "lafe_err.h" #include "line_reader.h" #include "passphrase.h" @@ -124,13 +124,21 @@ main(int argc, char *argv[]) cpio->buff_size = sizeof(buff); -#if defined(HAVE_SIGACTION) && defined(SIGPIPE) - { /* Ignore SIGPIPE signals. */ +#if defined(HAVE_SIGACTION) + { struct sigaction sa; sigemptyset(&sa.sa_mask); sa.sa_flags = 0; +#ifdef SIGPIPE + /* Ignore SIGPIPE signals. */ sa.sa_handler = SIG_IGN; sigaction(SIGPIPE, &sa, NULL); +#endif +#ifdef SIGCHLD + /* Do not ignore SIGCHLD. */ + sa.sa_handler = SIG_DFL; + sigaction(SIGCHLD, &sa, NULL); +#endif } #endif diff --git a/contrib/libarchive/cpio/test/test_owner_parse.c b/contrib/libarchive/cpio/test/test_owner_parse.c index dfc78ca77aec..bd68f21cec9b 100644 --- a/contrib/libarchive/cpio/test/test_owner_parse.c +++ b/contrib/libarchive/cpio/test/test_owner_parse.c @@ -7,7 +7,7 @@ #include "test.h" #include "../cpio.h" -#include "err.h" +#include "lafe_err.h" #if !defined(_WIN32) #define ROOT "root" diff --git a/contrib/libarchive/libarchive/archive.h b/contrib/libarchive/libarchive/archive.h index 002190a24663..98d7674e18f1 100644 --- a/contrib/libarchive/libarchive/archive.h +++ b/contrib/libarchive/libarchive/archive.h @@ -34,7 +34,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3008001 +#define ARCHIVE_VERSION_NUMBER 3008002 #include #include /* for wchar_t */ @@ -177,7 +177,7 @@ __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.8.1" +#define ARCHIVE_VERSION_ONLY_STRING "3.8.2" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); diff --git a/contrib/libarchive/libarchive/archive_acl.c b/contrib/libarchive/libarchive/archive_acl.c index 9e71f5ee5610..362e3308f43f 100644 --- a/contrib/libarchive/libarchive/archive_acl.c +++ b/contrib/libarchive/libarchive/archive_acl.c @@ -270,6 +270,19 @@ acl_new_entry(struct archive_acl *acl, { struct archive_acl_entry *ap, *aq; + /* Reject an invalid type */ + switch (type) { + case ARCHIVE_ENTRY_ACL_TYPE_ACCESS: + case ARCHIVE_ENTRY_ACL_TYPE_DEFAULT: + case ARCHIVE_ENTRY_ACL_TYPE_ALLOW: + case ARCHIVE_ENTRY_ACL_TYPE_DENY: + case ARCHIVE_ENTRY_ACL_TYPE_AUDIT: + case ARCHIVE_ENTRY_ACL_TYPE_ALARM: + break; + default: + return (NULL); + } + /* Type argument must be a valid NFS4 or POSIX.1e type. * The type must agree with anything already set and * the permset must be compatible. */ @@ -822,6 +835,9 @@ append_entry_w(wchar_t **wp, const wchar_t *prefix, int type, wname = NULL; id = -1; break; + default: + **wp = '\0'; + break; } *wp += wcslen(*wp); *(*wp)++ = L':'; @@ -878,6 +894,7 @@ append_entry_w(wchar_t **wp, const wchar_t *prefix, int type, wcscpy(*wp, L"alarm"); break; default: + *(*wp) = L'\0'; break; } *wp += wcslen(*wp); @@ -1057,6 +1074,9 @@ append_entry(char **p, const char *prefix, int type, name = NULL; id = -1; break; + default: + **p = '\0'; + break; } *p += strlen(*p); *(*p)++ = ':'; @@ -1112,6 +1132,9 @@ append_entry(char **p, const char *prefix, int type, case ARCHIVE_ENTRY_ACL_TYPE_ALARM: strcpy(*p, "alarm"); break; + default: + *(*p) = '\0'; + break; } *p += strlen(*p); } diff --git a/contrib/libarchive/libarchive/archive_check_magic.c b/contrib/libarchive/libarchive/archive_check_magic.c index d12f0c496e27..6b8e0c5595f4 100644 --- a/contrib/libarchive/libarchive/archive_check_magic.c +++ b/contrib/libarchive/libarchive/archive_check_magic.c @@ -30,6 +30,7 @@ #endif #include +#include #ifdef HAVE_STDLIB_H #include #endif @@ -54,8 +55,14 @@ errmsg(const char *m) while (s > 0) { written = write(2, m, s); - if (written <= 0) + if (written == 0) return; + if (written < 0) + { + if (errno == EINTR) + continue; + return; + } m += written; s -= written; } diff --git a/contrib/libarchive/libarchive/archive_cryptor.c b/contrib/libarchive/libarchive/archive_cryptor.c index 1825af4dc510..9f03f9ca6dd0 100644 --- a/contrib/libarchive/libarchive/archive_cryptor.c +++ b/contrib/libarchive/libarchive/archive_cryptor.c @@ -151,7 +151,7 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt, (void)rounds; /* UNUSED */ (void)derived_key; /* UNUSED */ (void)derived_key_len; /* UNUSED */ - return -1; /* UNSUPPORTED */ + return CRYPTOR_STUB_FUNCTION; /* UNSUPPORTED */ } #endif @@ -439,14 +439,14 @@ aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len) (void)ctx; /* UNUSED */ (void)key; /* UNUSED */ (void)key_len; /* UNUSED */ - return -1; + return CRYPTOR_STUB_FUNCTION; } static int aes_ctr_encrypt_counter(archive_crypto_ctx *ctx) { (void)ctx; /* UNUSED */ - return -1; + return CRYPTOR_STUB_FUNCTION; } static int @@ -469,7 +469,7 @@ aes_ctr_update(archive_crypto_ctx *ctx, const uint8_t * const in, (void)out; /* UNUSED */ (void)out_len; /* UNUSED */ aes_ctr_encrypt_counter(ctx); /* UNUSED */ /* Fix unused function warning */ - return -1; + return CRYPTOR_STUB_FUNCTION; } #else diff --git a/contrib/libarchive/libarchive/archive_cryptor_private.h b/contrib/libarchive/libarchive/archive_cryptor_private.h index 4b3c6c161433..1dbc5c17a01a 100644 --- a/contrib/libarchive/libarchive/archive_cryptor_private.h +++ b/contrib/libarchive/libarchive/archive_cryptor_private.h @@ -43,7 +43,7 @@ int __libarchive_cryptor_build_hack(void); #ifdef __APPLE__ # include # if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -# define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto +# define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto 1 # endif #endif @@ -144,9 +144,15 @@ typedef struct { #else +#if defined(ARCHIVE_CRYPTO_MD5_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA1_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA256_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA384_WIN) ||\ + defined(ARCHIVE_CRYPTO_SHA512_WIN) #if defined(_WIN32) && !defined(__CYGWIN__) && !(defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA) #define ARCHIVE_CRYPTOR_USE_WINCRYPT 1 #endif +#endif #define AES_BLOCK_SIZE 16 #define AES_MAX_KEY_SIZE 32 @@ -172,6 +178,9 @@ typedef int archive_crypto_ctx; #define archive_encrypto_aes_ctr_release(ctx) \ __archive_cryptor.encrypto_aes_ctr_release(ctx) +/* Stub return value if no encryption support exists. */ +#define CRYPTOR_STUB_FUNCTION -2 + /* Minimal interface to cryptographic functionality for internal use in * libarchive */ struct archive_cryptor diff --git a/contrib/libarchive/libarchive/archive_entry.h b/contrib/libarchive/libarchive/archive_entry.h index 2b917b3fde8e..344f33bffac2 100644 --- a/contrib/libarchive/libarchive/archive_entry.h +++ b/contrib/libarchive/libarchive/archive_entry.h @@ -28,7 +28,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3008001 +#define ARCHIVE_VERSION_NUMBER 3008002 /* * Note: archive_entry.h is for use outside of libarchive; the diff --git a/contrib/libarchive/libarchive/archive_entry_paths.3 b/contrib/libarchive/libarchive/archive_entry_paths.3 index 0f849c9ebb35..f739b172308d 100644 --- a/contrib/libarchive/libarchive/archive_entry_paths.3 +++ b/contrib/libarchive/libarchive/archive_entry_paths.3 @@ -64,7 +64,7 @@ Streaming Archive Library (libarchive, -larchive) .Ft void .Fn archive_entry_copy_hardlink "struct archive_entry *a" "const char *path" .Ft void -.Fn archive_entry_copy_hardlink_w "struct archive_entry *a "const wchar_t *path" +.Fn archive_entry_copy_hardlink_w "struct archive_entry *a" "const wchar_t *path" .Ft int .Fn archive_entry_update_hardlink_utf8 "struct archive_entry *a" "const char *path" .Ft void diff --git a/contrib/libarchive/libarchive/archive_entry_stat.c b/contrib/libarchive/libarchive/archive_entry_stat.c index c4906838ed0f..345d3d29b2f2 100644 --- a/contrib/libarchive/libarchive/archive_entry_stat.c +++ b/contrib/libarchive/libarchive/archive_entry_stat.c @@ -38,6 +38,7 @@ const struct stat * archive_entry_stat(struct archive_entry *entry) { + int64_t size; struct stat *st; if (entry->stat == NULL) { entry->stat = calloc(1, sizeof(*st)); @@ -74,7 +75,10 @@ archive_entry_stat(struct archive_entry *entry) st->st_ino = (ino_t)archive_entry_ino64(entry); st->st_nlink = archive_entry_nlink(entry); st->st_rdev = archive_entry_rdev(entry); - st->st_size = (off_t)archive_entry_size(entry); + size = archive_entry_size(entry); + st->st_size = (off_t)size; + if (st->st_size < 0 || (int64_t)st->st_size != size) + st->st_size = 0; st->st_mode = archive_entry_mode(entry); /* diff --git a/contrib/libarchive/libarchive/archive_parse_date.c b/contrib/libarchive/libarchive/archive_parse_date.c index cda0b11a555f..d9e968387d34 100644 --- a/contrib/libarchive/libarchive/archive_parse_date.c +++ b/contrib/libarchive/libarchive/archive_parse_date.c @@ -703,9 +703,7 @@ Convert(time_t Month, time_t Day, time_t Year, Year += 1900; DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 29 : 28; - /* Checking for 2038 bogusly assumes that time_t is 32 bits. But - I'm too lazy to try to check for time_t overflow in another way. */ - if (Year < EPOCH || Year >= 2038 + if (Year < EPOCH || (sizeof(time_t) <= 4 && Year >= 2038) || Month < 1 || Month > 12 /* Lint fluff: "conversion from long may lose accuracy" */ || Day < 1 || Day > DaysInMonth[(int)--Month] diff --git a/contrib/libarchive/libarchive/archive_platform.h b/contrib/libarchive/libarchive/archive_platform.h index f30df1104c83..33dc5582b7ed 100644 --- a/contrib/libarchive/libarchive/archive_platform.h +++ b/contrib/libarchive/libarchive/archive_platform.h @@ -183,16 +183,6 @@ #define CAN_RESTORE_METADATA_FD #endif -/* - * glibc 2.24 deprecates readdir_r - * bionic c deprecates readdir_r too - */ -#if defined(HAVE_READDIR_R) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)) && (!defined(__ANDROID__)) -#define USE_READDIR_R 1 -#else -#undef USE_READDIR_R -#endif - /* Set up defaults for internal error codes. */ #ifndef ARCHIVE_ERRNO_FILE_FORMAT #if HAVE_EFTYPE diff --git a/contrib/libarchive/libarchive/archive_platform_stat.h b/contrib/libarchive/libarchive/archive_platform_stat.h new file mode 100644 index 000000000000..5432b2f6433a --- /dev/null +++ b/contrib/libarchive/libarchive/archive_platform_stat.h @@ -0,0 +1,45 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Tobias Stoeckmann + * All rights reserved. + */ + +/* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */ + +#ifndef ARCHIVE_PLATFORM_STAT_H_INCLUDED +#define ARCHIVE_PLATFORM_STAT_H_INCLUDED + +#ifndef __LIBARCHIVE_BUILD +#error This header is only to be used internally to libarchive. +#endif + +#if defined(_WIN32) && !defined(__CYGWIN__) +/* We use _lseeki64() on Windows. */ +typedef int64_t la_seek_t; + +struct la_seek_stat { + int64_t st_mtime; + ino_t st_ino; + unsigned short st_mode; + uint32_t st_nlink; + gid_t st_gid; + la_seek_t st_size; + uid_t st_uid; + dev_t st_dev; + dev_t st_rdev; +}; +typedef struct la_seek_stat la_seek_stat_t; + +#define la_seek_fstat(fd, st) __la_seek_fstat((fd), (st)) +#define la_seek_stat(fd, st) __la_seek_stat((fd), (st)) + +#else +typedef off_t la_seek_t; +typedef struct stat la_seek_stat_t; + +#define la_seek_fstat(fd, st) fstat((fd), (st)) +#define la_seek_stat(fd, st) stat((fd), (st)) +#endif + +#endif /* !ARCHIVE_PLATFORM_STAT_H_INCLUDED */ diff --git a/contrib/libarchive/libarchive/archive_private.h b/contrib/libarchive/libarchive/archive_private.h index 050fc63c0b2e..3a926c6886ad 100644 --- a/contrib/libarchive/libarchive/archive_private.h +++ b/contrib/libarchive/libarchive/archive_private.h @@ -158,6 +158,7 @@ int __archive_check_magic(struct archive *, unsigned int magic, __LA_NORETURN void __archive_errx(int retvalue, const char *msg); void __archive_ensure_cloexec_flag(int fd); +int __archive_get_tempdir(struct archive_string *); int __archive_mktemp(const char *tmpdir); #if defined(_WIN32) && !defined(__CYGWIN__) int __archive_mkstemp(wchar_t *templates); diff --git a/contrib/libarchive/libarchive/archive_read.c b/contrib/libarchive/libarchive/archive_read.c index 50db87017706..c9b9d5981516 100644 --- a/contrib/libarchive/libarchive/archive_read.c +++ b/contrib/libarchive/libarchive/archive_read.c @@ -575,8 +575,7 @@ choose_filters(struct archive_read *a) return (ARCHIVE_OK); } - filter - = calloc(1, sizeof(*filter)); + filter = calloc(1, sizeof(*filter)); if (filter == NULL) return (ARCHIVE_FATAL); filter->bidder = best_bidder; @@ -834,7 +833,9 @@ archive_read_data(struct archive *_a, void *buff, size_t s) r = archive_read_data_block(a, &read_buf, &a->read_data_remaining, &a->read_data_offset); a->read_data_block = read_buf; - if (r == ARCHIVE_EOF) + if (r == ARCHIVE_EOF && + a->read_data_offset == a->read_data_output_offset && + a->read_data_remaining == 0) return (bytes_read); /* * Error codes are all negative, so the status diff --git a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c index 19d049770b78..42af4034b07e 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c +++ b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c @@ -338,7 +338,7 @@ setup_mac_metadata(struct archive_read_disk *a, int ret = ARCHIVE_OK; void *buff = NULL; int have_attrs; - const char *name, *tempdir; + const char *name; struct archive_string tempfile; (void)fd; /* UNUSED */ @@ -357,13 +357,11 @@ setup_mac_metadata(struct archive_read_disk *a, if (have_attrs == 0) return (ARCHIVE_OK); - tempdir = NULL; - if (issetugid() == 0) - tempdir = getenv("TMPDIR"); - if (tempdir == NULL) - tempdir = _PATH_TMP; archive_string_init(&tempfile); - archive_strcpy(&tempfile, tempdir); + if (__archive_get_tempdir(&tempfile) != ARCHIVE_OK) { + ret = ARCHIVE_WARN; + goto cleanup; + } archive_strcat(&tempfile, "tar.md.XXXXXX"); tempfd = mkstemp(tempfile.s); if (tempfd < 0) { diff --git a/contrib/libarchive/libarchive/archive_read_disk_posix.c b/contrib/libarchive/libarchive/archive_read_disk_posix.c index a7a98e9cb1cd..54a8e66188f8 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_posix.c +++ b/contrib/libarchive/libarchive/archive_read_disk_posix.c @@ -168,9 +168,6 @@ struct filesystem { int synthetic; int remote; int noatime; -#if defined(USE_READDIR_R) - size_t name_max; -#endif long incr_xfer_size; long max_xfer_size; long min_xfer_size; @@ -203,10 +200,6 @@ struct tree { DIR *d; #define INVALID_DIR_HANDLE NULL struct dirent *de; -#if defined(USE_READDIR_R) - struct dirent *dirent; - size_t dirent_allocated; -#endif int flags; int visit_type; /* Error code from last failed operation. */ @@ -869,7 +862,7 @@ next_entry(struct archive_read_disk *a, struct tree *t, tree_enter_initial_dir(t); return (ARCHIVE_FATAL); case TREE_ERROR_DIR: - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, + archive_set_error(&a->archive, t->tree_errno, "%s: Couldn't visit directory", tree_current_path(t)); tree_enter_initial_dir(t); @@ -1578,9 +1571,6 @@ setup_current_filesystem(struct archive_read_disk *a) # endif #endif int r, xr = 0; -#if !defined(HAVE_STRUCT_STATFS_F_NAMEMAX) - long nm; -#endif t->current_filesystem->synthetic = -1; t->current_filesystem->remote = -1; @@ -1647,35 +1637,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -#if defined(HAVE_STRUCT_STATFS_F_NAMEMAX) - t->current_filesystem->name_max = sfs.f_namemax; -#else -# if defined(_PC_NAME_MAX) - /* Mac OS X does not have f_namemax in struct statfs. */ - if (tree_current_is_symblic_link_target(t)) { - if (tree_enter_working_dir(t) != 0) { - archive_set_error(&a->archive, errno, "fchdir failed"); - return (ARCHIVE_FAILED); - } - nm = pathconf(tree_current_access_path(t), _PC_NAME_MAX); - } else - nm = fpathconf(tree_current_dir_fd(t), _PC_NAME_MAX); -# else - nm = -1; -# endif - if (nm == -1) - t->current_filesystem->name_max = NAME_MAX; - else - t->current_filesystem->name_max = nm; -#endif - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif /* USE_READDIR_R */ return (ARCHIVE_OK); } @@ -1863,19 +1824,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -#if defined(HAVE_STATVFS) - t->current_filesystem->name_max = svfs.f_namemax; -#else - t->current_filesystem->name_max = sfs.f_namelen; -#endif - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif return (ARCHIVE_OK); } @@ -1953,15 +1901,6 @@ setup_current_filesystem(struct archive_read_disk *a) #endif t->current_filesystem->noatime = 0; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ - t->current_filesystem->name_max = svfs.f_namemax; - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif return (ARCHIVE_OK); } @@ -1975,9 +1914,6 @@ static int setup_current_filesystem(struct archive_read_disk *a) { struct tree *t = a->tree; -#if defined(_PC_NAME_MAX) && defined(USE_READDIR_R) - long nm; -#endif t->current_filesystem->synthetic = -1;/* Not supported */ t->current_filesystem->remote = -1;/* Not supported */ t->current_filesystem->noatime = 0; @@ -1987,40 +1923,6 @@ setup_current_filesystem(struct archive_read_disk *a) t->current_filesystem->min_xfer_size = -1; t->current_filesystem->incr_xfer_size = -1; -#if defined(USE_READDIR_R) - /* Set maximum filename length. */ -# if defined(_PC_NAME_MAX) - if (tree_current_is_symblic_link_target(t)) { - if (tree_enter_working_dir(t) != 0) { - archive_set_error(&a->archive, errno, "fchdir failed"); - return (ARCHIVE_FAILED); - } - nm = pathconf(tree_current_access_path(t), _PC_NAME_MAX); - } else - nm = fpathconf(tree_current_dir_fd(t), _PC_NAME_MAX); - if (nm == -1) -# endif /* _PC_NAME_MAX */ - /* - * Some systems (HP-UX or others?) incorrectly defined - * NAME_MAX macro to be a smaller value. - */ -# if defined(NAME_MAX) && NAME_MAX >= 255 - t->current_filesystem->name_max = NAME_MAX; -# else - /* No way to get a trusted value of maximum filename - * length. */ - t->current_filesystem->name_max = PATH_MAX; -# endif /* NAME_MAX */ -# if defined(_PC_NAME_MAX) - else - t->current_filesystem->name_max = nm; -# endif /* _PC_NAME_MAX */ - if (t->current_filesystem->name_max == 0) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Cannot determine name_max"); - return (ARCHIVE_FAILED); - } -#endif /* USE_READDIR_R */ return (ARCHIVE_OK); } @@ -2112,8 +2014,11 @@ tree_dup(int fd) } #endif /* F_DUPFD_CLOEXEC */ new_fd = dup(fd); - __archive_ensure_cloexec_flag(new_fd); - return (new_fd); + if (new_fd != -1) { + __archive_ensure_cloexec_flag(new_fd); + return (new_fd); + } + return (-1); } /* @@ -2235,11 +2140,16 @@ tree_reopen(struct tree *t, const char *path, int restore_time) * so try again for execute. The consequences of not opening this are * unhelpful and unnecessary errors later. */ - if (t->initial_dir_fd < 0) + if (t->initial_dir_fd < 0) { t->initial_dir_fd = open(".", o_flag | O_CLOEXEC); + if (t->initial_dir_fd < 0) + return NULL; + } #endif __archive_ensure_cloexec_flag(t->initial_dir_fd); t->working_dir_fd = tree_dup(t->initial_dir_fd); + if (t->working_dir_fd < 0) + return NULL; return (t); } @@ -2449,12 +2359,11 @@ tree_dir_next_posix(struct tree *t) size_t namelen; if (t->d == NULL) { -#if defined(USE_READDIR_R) - size_t dirent_size; -#endif #if defined(HAVE_FDOPENDIR) - t->d = fdopendir(tree_dup(t->working_dir_fd)); + int fd = tree_dup(t->working_dir_fd); + if (fd != -1) + t->d = fdopendir(fd); #else /* HAVE_FDOPENDIR */ if (tree_enter_working_dir(t) == 0) { t->d = opendir("."); @@ -2470,45 +2379,12 @@ tree_dir_next_posix(struct tree *t) t->visit_type = r != 0 ? r : TREE_ERROR_DIR; return (t->visit_type); } -#if defined(USE_READDIR_R) - dirent_size = offsetof(struct dirent, d_name) + - t->filesystem_table[t->current->filesystem_id].name_max + 1; - if (t->dirent == NULL || t->dirent_allocated < dirent_size) { - free(t->dirent); - t->dirent = malloc(dirent_size); - if (t->dirent == NULL) { - closedir(t->d); - t->d = INVALID_DIR_HANDLE; - (void)tree_ascend(t); - tree_pop(t); - t->tree_errno = ENOMEM; - t->visit_type = TREE_ERROR_DIR; - return (t->visit_type); - } - t->dirent_allocated = dirent_size; - } -#endif /* USE_READDIR_R */ } for (;;) { errno = 0; -#if defined(USE_READDIR_R) - r = readdir_r(t->d, t->dirent, &t->de); -#ifdef _AIX - /* Note: According to the man page, return value 9 indicates - * that the readdir_r was not successful and the error code - * is set to the global errno variable. And then if the end - * of directory entries was reached, the return value is 9 - * and the third parameter is set to NULL and errno is - * unchanged. */ - if (r == 9) - r = errno; -#endif /* _AIX */ - if (r != 0 || t->de == NULL) { -#else t->de = readdir(t->d); if (t->de == NULL) { r = errno; -#endif closedir(t->d); t->d = INVALID_DIR_HANDLE; if (r != 0) { @@ -2747,9 +2623,6 @@ tree_free(struct tree *t) if (t == NULL) return; archive_string_free(&t->path); -#if defined(USE_READDIR_R) - free(t->dirent); -#endif free(t->sparse_list); for (i = 0; i < t->max_filesystem_id; i++) free(t->filesystem_table[i].allocation_ptr); diff --git a/contrib/libarchive/libarchive/archive_read_open_fd.c b/contrib/libarchive/libarchive/archive_read_open_fd.c index dc7c9e52c6f6..c85a62a3e2d7 100644 --- a/contrib/libarchive/libarchive/archive_read_open_fd.c +++ b/contrib/libarchive/libarchive/archive_read_open_fd.c @@ -48,6 +48,7 @@ #endif #include "archive.h" +#include "archive_platform_stat.h" struct read_fd_data { int fd; *** 3280 LINES SKIPPED *** From nobody Mon Nov 3 20:29:46 2025 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 4d0jqv0hDRz6Fj4w; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqt6pj2z3Khn; Mon, 03 Nov 2025 20:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rx7l0mLewPeeTcmpzXyA8+Ix6oRbmIfM9n45iHRAU50=; b=gpQmtQ+vnEflGPc3D0WiXbTM3cc+O7IS+vX0PGMcQ5/N9UEQU9tT7ljZsd74/tjJPvYnlu RUaCDA3nMmn0ofJPy4p1ny7cJkkkc2FXfnn9BYDyDJlCpvelsG3eRODdO3FcE+5aoP5b9j eAJhCcCbHZP4d7PEPyGNaRJxHxO5DVTTsk2MjaUu3X2Mn/nFOxg4QTgZC+UnunlO7K2SLg aE08FXX+1g4ZKVy6WUSLwzjybrDxXeeyZXEBqUfKnBj0m3KgIYHVJR2XsdhbWqfOr2TUJq 2IDfbuzmD3lAXAdyazILrI01DJHHlL31pgr3yg9kQeqI2N3mj2NhNPTNPNFzIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rx7l0mLewPeeTcmpzXyA8+Ix6oRbmIfM9n45iHRAU50=; b=FnNwkfAaneK2fEniWAfGfBvYmxCYnmM8INLOpALm5d6LX9NsnPsZxmilWse/hlInEdLB/i D8QFQqhVyMDE8wxxiynNi4YKNrQpS8iYGs+vDo6HiDPsaM+mpvNUamJqle0EC1bhSH3qPt G91mlM3VfWZdG5LeY5agbkEOceOORVu/N/+c6SCwadHVp9/c9qrxhcj7kAReDmxnHmMjlr 6TegOKOWxgtYVIzqAhuuFp4Mdf8V2/IQv7dsqDsqr12Dk85dcjZHaLizMiM0NlXh/RNZsR XK6TDkUnFCaTJ+EE03Iqh3Ti+wKXZqAtpifgbA4Xg+mt0f/2E5P29FahQdzNGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201787; a=rsa-sha256; cv=none; b=Y56yfkiMYdoVSMx9UnBdIE0IwAtSF3/pL9JAh4nF7WAeWoSL3VZhOpgKDJeUP8ENHvw5T1 RY8Je1F0T1ERsn1xnHh9/qh4Xgl6A2sAcvhTyclpJEcnsBu/mEDxkzlnSkyMOC7LCbsu3F kxSXeeptSQHrCiGew8TWgIgy2FG4R3ZhpFzuBFDvAenzjal/QSWOB4++7lfwROCxR9Dhax FnNHF/fRdesfwGK5/t1Kfc1n3uVFj6fjrQMJKxaj3qWezQ91LEqIz43UH1p4ROECz3auei 7XMPZWa9Wjx4NXu3nU+vr6JT1r4xgjoFlOVIx0k2cOutKgjfPHd5BKEyrAvbOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqt6Q6Vz9j8; Mon, 03 Nov 2025 20:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTklg051125; Mon, 3 Nov 2025 20:29:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTkBj051122; Mon, 3 Nov 2025 20:29:46 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:46 GMT Message-Id: <202511032029.5A3KTkBj051122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c3f3b96725ef - releng/15.0 - fusefs: fix page fault triggered by async notification when unmounted List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c3f3b96725ef78ff283ae38c835bae4dad7de64a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c3f3b96725ef78ff283ae38c835bae4dad7de64a commit c3f3b96725ef78ff283ae38c835bae4dad7de64a Author: Alan Somers AuthorDate: 2025-10-26 00:37:02 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:04 +0000 fusefs: fix page fault triggered by async notification when unmounted A FUSE daemon can send asynchronous notification to the kernel in order to, for example, invalidate an inode's cache. Fix a page fault that can happen if the file system isn't yet mounted, or is already unmounted, when that notification arrives. Approved by: re (cperciva) PR: 290519 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53356 (cherry picked from commit 5d42c8813976af484fd3e9a896c7839ba27ca764) (cherry picked from commit 25e368c4dad3df37184258eac5809ad7791e71c4) --- sys/fs/fuse/fuse_device.c | 7 ++++++ tests/sys/fs/fusefs/mockfs.cc | 4 +++- tests/sys/fs/fusefs/mockfs.hh | 4 +++- tests/sys/fs/fusefs/notify.cc | 56 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index 57b3559731f7..dff20ded202c 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -548,6 +548,13 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) } else if (ohead.unique == 0){ /* unique == 0 means asynchronous notification */ SDT_PROBE1(fusefs, , device, fuse_device_write_notify, &ohead); + if (data->mp == NULL) { + SDT_PROBE2(fusefs, , device, trace, 1, + "asynchronous notification before mount" + " or after unmount"); + return (EXTERROR(ENODEV, + "This FUSE session is not mounted")); + } mp = data->mp; vfs_ref(mp); err = vfs_busy(mp, 0); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index e8081dea9604..55c191716629 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -827,10 +827,12 @@ void MockFS::loop() { } } -int MockFS::notify_inval_entry(ino_t parent, const char *name, size_t namelen) +int MockFS::notify_inval_entry(ino_t parent, const char *name, size_t namelen, + int expected_errno) { std::unique_ptr out(new mockfs_buf_out); + out->expected_errno = expected_errno; out->header.unique = 0; /* 0 means asynchronous notification */ out->header.error = FUSE_NOTIFY_INVAL_ENTRY; out->body.inval_entry.parent = parent; diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index ba6f7fded9d0..4b0628d34dd7 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -390,8 +390,10 @@ class MockFS { * @param parent Parent directory's inode number * @param name name of dirent to invalidate * @param namelen size of name, including the NUL + * @param expected_errno The error that write() should return */ - int notify_inval_entry(ino_t parent, const char *name, size_t namelen); + int notify_inval_entry(ino_t parent, const char *name, size_t namelen, + int expected_errno = 0); /* * Send an asynchronous notification to invalidate an inode's cached diff --git a/tests/sys/fs/fusefs/notify.cc b/tests/sys/fs/fusefs/notify.cc index 1e22bde13db7..d370a1e6e706 100644 --- a/tests/sys/fs/fusefs/notify.cc +++ b/tests/sys/fs/fusefs/notify.cc @@ -385,6 +385,27 @@ TEST_F(Notify, inval_inode_with_clean_cache) leak(fd); } +/* + * Attempting to invalidate an entry or inode after unmounting should fail, but + * nothing bad should happen. + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519 + */ +TEST_F(Notify, notify_after_unmount) +{ + const static char *name = "foo"; + struct inval_entry_args iea; + + expect_destroy(0); + + m_mock->unmount(); + + iea.mock = m_mock; + iea.parent = FUSE_ROOT_ID; + iea.name = name; + iea.namelen = strlen(name); + iea.mock->notify_inval_entry(iea.parent, iea.name, iea.namelen, ENODEV); +} + /* FUSE_NOTIFY_STORE with a file that's not in the entry cache */ /* disabled because FUSE_NOTIFY_STORE is not yet implemented */ TEST_F(Notify, DISABLED_store_nonexistent) @@ -544,3 +565,38 @@ TEST_F(NotifyWriteback, inval_inode_attrs_only) leak(fd); } + +/* + * Attempting asynchronous invalidation of an Entry before mounting the file + * system should fail, but nothing bad should happen. + * + * Note that invalidating an inode before mount goes through the same path, and + * is not separately tested. + * + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519 + */ +TEST(PreMount, inval_entry_before_mount) +{ + const static char name[] = "foo"; + size_t namelen = strlen(name); + struct mockfs_buf_out *out; + int r; + int fuse_fd; + + fuse_fd = open("/dev/fuse", O_CLOEXEC | O_RDWR); + ASSERT_GE(fuse_fd, 0) << strerror(errno); + + out = new mockfs_buf_out; + out->header.unique = 0; /* 0 means asynchronous notification */ + out->header.error = FUSE_NOTIFY_INVAL_ENTRY; + out->body.inval_entry.parent = FUSE_ROOT_ID; + out->body.inval_entry.namelen = namelen; + strlcpy((char*)&out->body.bytes + sizeof(out->body.inval_entry), + name, sizeof(out->body.bytes) - sizeof(out->body.inval_entry)); + out->header.len = sizeof(out->header) + sizeof(out->body.inval_entry) + + namelen; + r = write(fuse_fd, out, out->header.len); + EXPECT_EQ(-1, r); + EXPECT_EQ(ENODEV, errno); + delete out; +} From nobody Mon Nov 3 20:29:47 2025 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 4d0jqw51N3z6Fj6p; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqw0Lzyz3Kch; Mon, 03 Nov 2025 20:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUJ3NSyEeMA1/aW3po/2sH4QfLFtDkzc2WWgCieKAu4=; b=FZPWGoCPKdMmb+uR1SgN5CJZ5Yif78I7GhkBkPLKN1d0cyekv8zETEZEaGfjEbY3ysIbo2 EawqFxBF8Fyo/BxE+QJ+Dotn1tVCJqW4E4OqC69qeEZZN9SryLpcs8IKvH/uHXchsxYyQ0 uewxxw2azOEa5gWy9XdkFZDxBU6/ieMFFHdI1wY0osEiTkEGxipOYstLYvmPK2nXQ1MkqO eQ7gqNPAMbVSr2k/N0o6hpC+A4MZCoo8pFLvfIOTlaScbFDNrzhqhA3ozK+nsOP0b1tJrr RhMAp8N2irETzfMgWt0XMIr4Xx5+yXX5vTS+CDHDKGbFwYBE4wjivyGD/HZ6wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUJ3NSyEeMA1/aW3po/2sH4QfLFtDkzc2WWgCieKAu4=; b=b+c2dsT8ca3WEJdB9pIGIkleFzPW9M9t+JaQezwVdpaOXbF6kTBTBKKzVx8aEkCl20SZqR jcJM3d4OVvmTs8dg9xbdJUI8vnUhzN564qzQ7t5H1jjJUHXV1E2+uY1R8Mb96BVESS2QLd a5llN5+0RE25hcQQZgpHkcQAggKPMSvqyvOwzPCc10JlEzxG0iax/mVTFC76prMdiHvMHL vuGCLHnj2nrJMZdgzE7VW+4YMtzxIIWHSLhZkSTI75Q8P5KSAndlGfmBpTPkkSStdrWdEt HEK14X3G5kAmK5NTTLGDGjpL9MI9Z7eM/uiq8OPuiGSU2Xp99XnEclwwi/DOoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201788; a=rsa-sha256; cv=none; b=P5E5kekGFrP5d6JUdZceiZFLBmbLIq3P1JPAqkYm7Z+8XFeJR/sAGm0m8ynO3le5+GvQU/ Ih7vWvH3b3qEZqZfw11ilZHv3HzTlJI8ExDweqUZOiEorARZ2f40Wkp39f1vaf4CSzQ6mD LCRKarNyfh3sPGDO4dgFqYjqHtxsbUYuoeXbs8VgyfqF2H9PgSeM0fmaIfGxM0GAVGxSw+ cxSPXuMSnEcDrhhv6ulMSnZZ6egBgSfRZ+6j4lJgsOQ4Jb+xTmZXek9dY3T1rV5YWM97ae EcMpyujLa67LZwALb4RHZUU3pGrVqWbMWYrO4DoTDMGeInGRn56B9EbsbOEgkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqv71wzzB9S; Mon, 03 Nov 2025 20:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTlPh051158; Mon, 3 Nov 2025 20:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTlRU051155; Mon, 3 Nov 2025 20:29:47 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:47 GMT Message-Id: <202511032029.5A3KTlRU051155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 258cc3474557 - releng/15.0 - bus_attach_children.9: fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 258cc3474557704f6f5314b7b2f6bbd86c667bb9 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=258cc3474557704f6f5314b7b2f6bbd86c667bb9 commit 258cc3474557704f6f5314b7b2f6bbd86c667bb9 Author: Ahmad Khalifa AuthorDate: 2025-10-30 13:14:42 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:07 +0000 bus_attach_children.9: fix typo s/DEVICE_ATTACH/DEVICE_DETACH Approved by: re (cperciva) Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53449 (cherry picked from commit 9b9c726df1e214afa122873395a3ac32dd80ae6b) (cherry picked from commit c14f97c16b59422ddfd43d9a677f9360004bc23b) --- share/man/man9/bus_attach_children.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/bus_attach_children.9 b/share/man/man9/bus_attach_children.9 index 5e3ca4c5e906..81a24a428d8e 100644 --- a/share/man/man9/bus_attach_children.9 +++ b/share/man/man9/bus_attach_children.9 @@ -105,7 +105,7 @@ Detached devices are not deleted. .Pp .Fn bus_detach_children is typically called at the start of a bus driver's -.Xr DEVICE_ATTACH 9 +.Xr DEVICE_DETACH 9 method to give child devices a chance to veto the detach request. It is usually paired with a later call to .Fn device_delete_children 9 From nobody Mon Nov 3 20:29:49 2025 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 4d0jqx513Hz6FjFG; Mon, 03 Nov 2025 20:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqx1YHvz3Kj3; Mon, 03 Nov 2025 20:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7UqnnLBN34Z4FlbkdgkYMmDTTrvGGZRHsXXGWHckv0E=; b=QV8TVOu37pZUajtyt1NBsmW8wcb5yFh6u3+11IUT24pCmvDl1w/3ZLMxAOYdb5s5kHeJtj KWD+YiM3+hIh8Ndr4oOIsCwsA2UUDGwMa/WXgOKSC3URTYDKYncp9qGde/q8tO9fC+ryAE UZxX5TtOBsShGgdC7t2lbGkp4f1ei05gULPP7Riw55OTxhviZJQMGaFzl0t6tW5OLA63pq pFnpc2znb1PVy9XdqSpAGHMOtsZYCe1cV/ALr1X5Gr3KZIAJ72ODDmYyx6x9T0ifcAuZsv AUJC4haWP8zPO8vgL+Q7m7EAqq2+rpnAD5cLZLcupnhOmH3UuQMTPw6sQ6F/MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7UqnnLBN34Z4FlbkdgkYMmDTTrvGGZRHsXXGWHckv0E=; b=dF77vEVhhMS8rGft2fyQ6yoD+Ey3q087BXWGk+KSNGVvGTpV0Ywgv/IRB4BR8oFv9/AEgE oWpM5eyfoG132MEWaXWRFGU9djP/0MmNMrXZyDoDmGCZ4jfWPVpSMRj/8xDtYtWucAmE+S ajnvdPt5hINjlFbaK8YoSTVR4IGJvaP4HduU0QN7M3Glf2vQfPlMuDZsBwOVvnuchMEYgL 0Yq9qctmqN6BDRFL+jxCniuc9IAvfhxxF681kcA7m8SMlM4jwDwU3GFUmlYDxAhmCQc03A UyS1xjQ282zLMK5I6dYULOXMCO0l7asszLOYN5bBPK4q3WKKpVBAcIhVUw4+Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201789; a=rsa-sha256; cv=none; b=aAq75Cuo5szHWJCTarf1pUFRtIsTRVBAkvMm5ir38fgs94QA47stjIlNt+trzWX3qoXRjF dt/YDzGo+IK4AWAMSiGkRzmgYI8YeOICvTiunOsyc9RZlJ+2+/DRDbXV9VPjF5jk43APXb X9GrT0i5ZMSRL6bBJ1nsoKkC4q5v6xewSCCztDl/DN2ipCYYwM7jTU80dmt5+M2BUvCy0Y Z8GwSsWXL5pSLmcEwW+o4PJ0kk9BS9DQ6efxConoW9LAdA+inGrlnVjDXtR6uYPUAq9BkC b3eFk2Z2xt/Sd9hcom3+xrRa3Iddzw2Y17a3H0nihYWSEiDqKekIIfHkHLdgeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqx18ZKz9sN; Mon, 03 Nov 2025 20:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTnLA051191; Mon, 3 Nov 2025 20:29:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTnrY051188; Mon, 3 Nov 2025 20:29:49 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:49 GMT Message-Id: <202511032029.5A3KTnrY051188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6bbf1d23e2b5 - releng/15.0 - bsd.prog.mk: Skip warnings if compiler.mk was not included List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 6bbf1d23e2b5bfbe4ae854390b1aaec8714dfb87 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6bbf1d23e2b5bfbe4ae854390b1aaec8714dfb87 commit 6bbf1d23e2b5bfbe4ae854390b1aaec8714dfb87 Author: Ed Maste AuthorDate: 2025-10-31 15:53:42 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:11 +0000 bsd.prog.mk: Skip warnings if compiler.mk was not included We emit a warning if src.conf options WITH_RETPOLINE or INIT_ALL are in use, and the compiler or linker does not support the feature. For targets like `cleandir` we skip including bsd.compiler.mk, which leaves COMPILER_FEATURES unset and spurious warnings were emitted in early buildworld stages, if these options are in use. Commit 0837b2ebd570 ("pkg: Die if make -V BRANCH fails") added -W to usr.sbin/pkg's make flags, causing it to exit on warnings. As a result buildworld failed when these src.conf options were in use. Clean this up by omitting the warning if the magic _NO_INCLUDE_COMPILERMK flag is set, which indicates that COMPILER_FEATURES is not set. Approved by: re (cperciva) Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53501 (cherry picked from commit e4f2a350955406ffd58dd3f0bb7610df0f36d647) (cherry picked from commit 1471af5110fc3bb6b1f1548e056f1717fb844ffd) --- share/mk/bsd.prog.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 10e1c177e2b2..5697845079e2 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -49,9 +49,11 @@ CXXFLAGS+= -mretpoline LDFLAGS+= -Wl,-zretpolineplt .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning Retpoline requested but not supported by compiler or linker .endif .endif +.endif # LLD sensibly defaults to -znoexecstack, so do the same for BFD LDFLAGS.bfd+= -Wl,-znoexecstack .if ${MK_BRANCH_PROTECTION} != "no" @@ -71,9 +73,11 @@ CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clan CXXFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning INIT_ALL (${OPT_INIT_ALL}) requested but not supported by compiler .endif .endif +.endif # Zero used registers on return (mitigate some ROP) .if ${MK_ZEROREGS} != "no" From nobody Mon Nov 3 20:29:50 2025 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 4d0jqy4TV1z6FjL5; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqy2mtkz3Kx6; Mon, 03 Nov 2025 20:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p9LAYJkCdqr3q7TAC8AtzXSLYUgbrtJENC/bW0ZeFTo=; b=iV6qG2BoF0Mo0504iL/gSIPD8aSrH3j/o6/JrZPzN3/D6RWABZm0qvuwLPtSJ3/KOrNGJf tGnGLwtp/m2dp9OWCJuCfhIBtN+8FQN73wJ39BVb7lfohd7jn6O4mix/XPJK/Z1R/DbnZU X9RF1RNWvFe/DOn5D79FXRxmersyqJnCANBW48OvJCyOFaLrtV+z2BkQGgiIksLoAxJ4HI swyEFKvGFhqOI4OYVR2G6IF3r6B0uk3df1G46jTNyuuEpHmP8+ANOPhGTCPONI9VzzPxuQ CKif7+OFdOf28flS0qubIruLWV/vIuzHjP0cKElEv9uzH8T8MRbuszxrObb4NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p9LAYJkCdqr3q7TAC8AtzXSLYUgbrtJENC/bW0ZeFTo=; b=cDER50vHCFiUmVNChI53jM32YlKfPOd9DxO/wXyfqMQ0b8cdhaW+B4gOfvEFR0nhg2yqgd HvAdZdgzUWeHXbyLhpGIVnN9M6cnQFQMt/lK97/C6DGfENVQfuo4MhmVVemIRA3hqlIrsX yM8Wk+9z71t2bKyn1mPoaK9exZfw1kIdiTgXBfybytUAsif2H186wqI3ARK5trDtKZTWTD qxm975q6EBIaFbXJqeNPQaOLm6yPHzwAr+UfPOVlcD0yWhAMfS5Ms9gl3UV14P32XNUEyf CxzUs8GRDa5wsQdzKwqkHamqwUsV+KHZdBLYbwn0VLA/TX/wYLSCGGtx6M6WRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201790; a=rsa-sha256; cv=none; b=ivT5Yo92MMnTh1EAke1lXqLu8Vgfs8M4GkWYtg3mMcnbjXHi7JxZqSqAF97JaxcgvU8N/A TCNIf2Yd/eD+dlz6xOX9ZDYgi8c1S2RApTIstdR6J4oTTKkiRk/On2wtKj9N+sh51Eur14 nF3o1uORYtq4FFxr4hG5qyUnMSjk/Ln97eBiQKLbjLome/16NPeiY49HKYIzloMwewsMMV IXQ5f7XEAZCo94I4KvnKAwy2iq8atmfuyv7xSK10z3bjLYXTqoUPVELSqv9vg7u/nMHViV RhRqICmqKqnrNFOcn+YttV2EkWSbJuMDABLvNetgVznqMICS6irSoaRbeqJLww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqy27vzzB1G; Mon, 03 Nov 2025 20:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KToe8051225; Mon, 3 Nov 2025 20:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KToAf051222; Mon, 3 Nov 2025 20:29:50 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:50 GMT Message-Id: <202511032029.5A3KToAf051222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1d4a3083cf00 - releng/15.0 - igb(4): Fix out-of-bounds register access on VFs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 1d4a3083cf00695f033de44e87f57136ccc9bfd0 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1d4a3083cf00695f033de44e87f57136ccc9bfd0 commit 1d4a3083cf00695f033de44e87f57136ccc9bfd0 Author: Krzysztof Galazka AuthorDate: 2025-10-24 19:25:47 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:15 +0000 igb(4): Fix out-of-bounds register access on VFs Virtual Functions have access to a limited number of registers, and their bus space size is lower. Use KASSERT to detect out-of-bounds access and eliminate them to avoid kernel panics in production environment. Signed-off-by: Krzysztof Galazka Approved by: re (cperciva) Reviewed by: jmg Tested by: mateusz.moga_intel.com Approved by: kbowling (mentor), erj (mentor) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D52976 (cherry picked from commit 2c02e6ca7154593d214b62578f67d9fe7db23d70) (cherry picked from commit 9d84e9cba12dad082e0b4bc8dace80a0f09dc950) --- sys/dev/e1000/e1000_osdep.h | 46 ++++++++++++++++++------- sys/dev/e1000/if_em.c | 83 +++++++++++++++++++++++++-------------------- 2 files changed, 80 insertions(+), 49 deletions(-) diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h index 893979025f01..ba1c8a16fad1 100644 --- a/sys/dev/e1000/e1000_osdep.h +++ b/sys/dev/e1000/e1000_osdep.h @@ -152,6 +152,9 @@ struct e1000_osdep { bus_space_tag_t mem_bus_space_tag; bus_space_handle_t mem_bus_space_handle; +#ifdef INVARIANTS + bus_size_t mem_bus_space_size; +#endif bus_space_tag_t io_bus_space_tag; bus_space_handle_t io_bus_space_handle; bus_space_tag_t flash_bus_space_tag; @@ -175,27 +178,44 @@ struct e1000_osdep bus_space_write_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, offset, value) +static __inline uint32_t +e1000_rd32(struct e1000_osdep *osdep, uint32_t reg) +{ + + KASSERT(reg < osdep->mem_bus_space_size, + ("e1000: register offset %#jx too large (max is %#jx)", + (uintmax_t)reg, (uintmax_t)osdep->mem_bus_space_size)); + + return (bus_space_read_4(osdep->mem_bus_space_tag, + osdep->mem_bus_space_handle, reg)); +} + + +static __inline void +e1000_wr32(struct e1000_osdep *osdep, uint32_t reg, uint32_t value) +{ + + KASSERT(reg < osdep->mem_bus_space_size, + ("e1000: register offset %#jx too large (max is %#jx)", + (uintmax_t)reg, (uintmax_t)osdep->mem_bus_space_size)); + + bus_space_write_4(osdep->mem_bus_space_tag, + osdep->mem_bus_space_handle, reg, value); +} + /* Register READ/WRITE macros */ -#define E1000_READ_REG(hw, reg) \ - bus_space_read_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ - ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, \ - E1000_REGISTER(hw, reg)) +#define E1000_READ_REG(hw, reg) \ + e1000_rd32((hw)->back, E1000_REGISTER(hw, reg)) #define E1000_WRITE_REG(hw, reg, value) \ - bus_space_write_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ - ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, \ - E1000_REGISTER(hw, reg), value) + e1000_wr32((hw)->back, E1000_REGISTER(hw, reg), value) #define E1000_READ_REG_ARRAY(hw, reg, index) \ - bus_space_read_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ - ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, \ - E1000_REGISTER(hw, reg) + ((index)<< 2)) + e1000_rd32((hw)->back, E1000_REGISTER(hw, reg) + ((index) << 2)) #define E1000_WRITE_REG_ARRAY(hw, reg, index, value) \ - bus_space_write_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ - ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, \ - E1000_REGISTER(hw, reg) + ((index)<< 2), value) + e1000_wr32((hw)->back, E1000_REGISTER(hw, reg) + ((index) << 2), value) #define E1000_READ_REG_ARRAY_DWORD E1000_READ_REG_ARRAY #define E1000_WRITE_REG_ARRAY_DWORD E1000_WRITE_REG_ARRAY diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 1f0a2430fa6a..168648c8c5ea 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1582,7 +1582,7 @@ em_if_init(if_ctx_t ctx) E1000_WRITE_REG(&sc->hw, E1000_VET, ETHERTYPE_VLAN); /* Clear bad data from Rx FIFOs */ - if (sc->hw.mac.type >= igb_mac_min) + if (sc->hw.mac.type >= igb_mac_min && !sc->vf_ifp) e1000_rx_fifo_flush_base(&sc->hw); /* Configure for OS presence */ @@ -1602,7 +1602,9 @@ em_if_init(if_ctx_t ctx) /* Don't lose promiscuous settings */ em_if_set_promisc(ctx, if_getflags(ifp)); - e1000_clear_hw_cntrs_base_generic(&sc->hw); + + if (sc->hw.mac.ops.clear_hw_cntrs != NULL) + sc->hw.mac.ops.clear_hw_cntrs(&sc->hw); /* MSI-X configuration for 82574 */ if (sc->hw.mac.type == e1000_82574) { @@ -2349,7 +2351,7 @@ em_if_stop(if_ctx_t ctx) em_flush_desc_rings(sc); e1000_reset_hw(&sc->hw); - if (sc->hw.mac.type >= e1000_82544) + if (sc->hw.mac.type >= e1000_82544 && !sc->vf_ifp) E1000_WRITE_REG(&sc->hw, E1000_WUFC, 0); e1000_led_off(&sc->hw); @@ -2408,6 +2410,9 @@ em_allocate_pci_resources(if_ctx_t ctx) } sc->osdep.mem_bus_space_tag = rman_get_bustag(sc->memory); sc->osdep.mem_bus_space_handle = rman_get_bushandle(sc->memory); +#ifdef INVARIANTS + sc->osdep.mem_bus_space_size = rman_get_size(sc->memory); +#endif sc->hw.hw_addr = (u8 *)&sc->osdep.mem_bus_space_handle; /* Only older adapters use IO mapping */ @@ -3259,11 +3264,13 @@ em_reset(if_ctx_t ctx) /* Issue a global reset */ e1000_reset_hw(hw); - if (hw->mac.type >= igb_mac_min) { - E1000_WRITE_REG(hw, E1000_WUC, 0); - } else { - E1000_WRITE_REG(hw, E1000_WUFC, 0); - em_disable_aspm(sc); + if (!sc->vf_ifp) { + if (hw->mac.type >= igb_mac_min) { + E1000_WRITE_REG(hw, E1000_WUC, 0); + } else { + E1000_WRITE_REG(hw, E1000_WUFC, 0); + em_disable_aspm(sc); + } } if (sc->flags & IGB_MEDIA_RESET) { e1000_setup_init_funcs(hw, true); @@ -3813,7 +3820,7 @@ em_initialize_receive_unit(if_ctx_t ctx) sc->rx_int_delay.value); } - if (hw->mac.type >= em_mac_min) { + if (hw->mac.type >= em_mac_min && !sc->vf_ifp) { uint32_t rfctl; /* Use extended rx descriptor formats */ rfctl = E1000_READ_REG(hw, E1000_RFCTL); @@ -3833,33 +3840,38 @@ em_initialize_receive_unit(if_ctx_t ctx) E1000_WRITE_REG(hw, E1000_RFCTL, rfctl); } - /* Set up L3 and L4 csum Rx descriptor offloads */ - rxcsum = E1000_READ_REG(hw, E1000_RXCSUM); - if (if_getcapenable(ifp) & IFCAP_RXCSUM) { - rxcsum |= E1000_RXCSUM_TUOFL | E1000_RXCSUM_IPOFL; - if (hw->mac.type > e1000_82575) - rxcsum |= E1000_RXCSUM_CRCOFL; - else if (hw->mac.type < em_mac_min && - if_getcapenable(ifp) & IFCAP_HWCSUM_IPV6) - rxcsum |= E1000_RXCSUM_IPV6OFL; - } else { - rxcsum &= ~(E1000_RXCSUM_IPOFL | E1000_RXCSUM_TUOFL); - if (hw->mac.type > e1000_82575) - rxcsum &= ~E1000_RXCSUM_CRCOFL; - else if (hw->mac.type < em_mac_min) - rxcsum &= ~E1000_RXCSUM_IPV6OFL; - } + /* + * Set up L3 and L4 csum Rx descriptor offloads only on Physical + * Functions. Virtual Functions have no access to this register. + */ + if (!sc->vf_ifp) { + rxcsum = E1000_READ_REG(hw, E1000_RXCSUM); + if (if_getcapenable(ifp) & IFCAP_RXCSUM) { + rxcsum |= E1000_RXCSUM_TUOFL | E1000_RXCSUM_IPOFL; + if (hw->mac.type > e1000_82575) + rxcsum |= E1000_RXCSUM_CRCOFL; + else if (hw->mac.type < em_mac_min && + if_getcapenable(ifp) & IFCAP_HWCSUM_IPV6) + rxcsum |= E1000_RXCSUM_IPV6OFL; + } else { + rxcsum &= ~(E1000_RXCSUM_IPOFL | E1000_RXCSUM_TUOFL); + if (hw->mac.type > e1000_82575) + rxcsum &= ~E1000_RXCSUM_CRCOFL; + else if (hw->mac.type < em_mac_min) + rxcsum &= ~E1000_RXCSUM_IPV6OFL; + } - if (sc->rx_num_queues > 1) { - /* RSS hash needed in the Rx descriptor */ - rxcsum |= E1000_RXCSUM_PCSD; + if (sc->rx_num_queues > 1) { + /* RSS hash needed in the Rx descriptor */ + rxcsum |= E1000_RXCSUM_PCSD; - if (hw->mac.type >= igb_mac_min) - igb_initialize_rss_mapping(sc); - else - em_initialize_rss_mapping(sc); + if (hw->mac.type >= igb_mac_min) + igb_initialize_rss_mapping(sc); + else + em_initialize_rss_mapping(sc); + } + E1000_WRITE_REG(hw, E1000_RXCSUM, rxcsum); } - E1000_WRITE_REG(hw, E1000_RXCSUM, rxcsum); for (i = 0, que = sc->rx_queues; i < sc->rx_num_queues; i++, que++) { struct rx_ring *rxr = &que->rxr; @@ -4367,6 +4379,8 @@ em_get_wakeup(if_ctx_t ctx) switch (sc->hw.mac.type) { case e1000_82542: case e1000_82543: + case e1000_vfadapt: + case e1000_vfadapt_i350: break; case e1000_82544: e1000_read_nvm(&sc->hw, @@ -4412,8 +4426,6 @@ em_get_wakeup(if_ctx_t ctx) case e1000_i354: case e1000_i210: case e1000_i211: - case e1000_vfadapt: - case e1000_vfadapt_i350: apme_mask = E1000_WUC_APME; sc->has_amt = true; eeprom_data = E1000_READ_REG(&sc->hw, E1000_WUC); @@ -4469,7 +4481,6 @@ em_get_wakeup(if_ctx_t ctx) global_quad_port_a = 0; break; } - return; } From nobody Mon Nov 3 20:29:51 2025 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 4d0jqz4szdz6FjCQ; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqz3Bjpz3Kmd; Mon, 03 Nov 2025 20:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2AFd2F/jb0dRIC5LDMJ04KOFdOAnBruYTtdRO8VFI8Y=; b=ZSIdNgzeNFyEqTylNqEFf/lUdXKd4XvlfuhPp2nwWBAa8jCqCvMT26TCz7vS4Ib3m0RbIX 1aH5ITdTMP3HJyv+FjXUr/GxBny+aK6TQVwgWCcqNUePDvvp1D7BQLw0NjzpoUj3jL2QgI V23ZZRVv8WDlqocumkHnLJqHMSevzS2lzAv7KissNEVQPeYzywLD1xZT3/Mkj0a4HPvXrQ lO7td7V6s7NWH1ntg7zGlh7gXKTn02zZJesX2MvNCVoNbLXT/tKflMShnwXwQVkqhUACmm 2v8Z9yMA7zSIYsZvbbFL46jLBSV5Y2bXXCH5p/idrIpGZv0rtUvPuuCm/absZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2AFd2F/jb0dRIC5LDMJ04KOFdOAnBruYTtdRO8VFI8Y=; b=Dy0EU7JQgbeW+OeAbGi+httOvsbqX23oC+83JsLvbg3rfJyT7ZaQsXlAa2r/ysTP2hZR3B I63o+oLX9S62/fjueyt97SHCsJT6vKH1wFtRd6SH+E0VsAYF1UfeDfmGEjLlsmc6pLbwry EIs12NXj4aZ/RgJJS4lomfgixG5p/etkMeKF3T/z+bcxKMJLMV0gl4y+5g2+gaNUPqsOZN QIaJjU5TOW7m9jMu2eF1xfx/yt64eqcmUMExPoWMHVFhZWDKWTxLwnwNXL3PR1FW8pj5DD FcfeKXXmjUURg7elxPFs1kEJtby4Oy/n4YbQNX/6we9wyb/rCcvBDlSYFvvZRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201791; a=rsa-sha256; cv=none; b=pQ2BszZBWwC3AA+UbnqlJoE8Z6QNFA2Pv9NlOD7Kg1NE3zb0+ok/xL03H6LbmJE8iNpXUe 0kOHGkWM9p0wboU7r7gXixm8JjTbQpRn3zaeJFVSP0GK3W6gA4GbmfggKv9czHjwhmHWYx pCbARXuF7VxwcPi+rpAnYS7DwfZqpgW7S8yJuA9yDb7SOk/kRGM4M8YVL9iRtoq+hT09Mj XHyVUvrgPNFu/bP2c+n8nRsrPOb/GlOugcJX5n4oZDqYcYvks7yyn0vY12JHn2pPMXq9FN 3EVF00yek7oACckWSPcSPm7Qi8fOAOzQzgjHDiHzHEblTkMoWyTxnchUBLICCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jqz2nmnz9tZ; Mon, 03 Nov 2025 20:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTpoR051265; Mon, 3 Nov 2025 20:29:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTpI8051262; Mon, 3 Nov 2025 20:29:51 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:51 GMT Message-Id: <202511032029.5A3KTpI8051262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 97fa2bfeab3d - releng/15.0 - ixl(4): fix multicast promiscuous mode state tracking and filter management List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 97fa2bfeab3de726f096ff2fb991da79ea8285fb Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=97fa2bfeab3de726f096ff2fb991da79ea8285fb commit 97fa2bfeab3de726f096ff2fb991da79ea8285fb Author: Bhosale, Yogesh AuthorDate: 2025-10-16 20:02:45 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:19 +0000 ixl(4): fix multicast promiscuous mode state tracking and filter management This change reapplies the improvements from commit 89e7335 and adds additional fixes and code optimizations on top of it. The ixl driver supports up to 128 multicast filters in hardware. When this limit is exceeded, the driver should enable multicast promiscuous mode. When the count drops below 128, it should disable promiscuous mode and restore individual filters. The driver previously had problems that could corrupt multicast filters list. The main issue was that ixl_dis_multi_promisc() would attempt to disable promiscuous mode without checking if it was actually enabled, potentially corrupting existing filters. There was also no state tracking across driver functions, leading to redundant operations. This change adds an IXL_FLAGS_MC_PROMISC flag to track the multicast promiscuous mode state. The flag is set when enabling promiscuous mode and cleared when disabling it. Early return checks prevent redundant operations when the mode is already in the desired state, avoiding filter corruption and unnecessary hardware calls. Signed-off-by: Yogesh Bhosale yogesh.bhosale@intel.com Approved by: re (cperciva) PR: 283820 Approved by: kbowling (mentor) Tested by: gowtham.kumar.ks_intel.com Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D52549 (cherry picked from commit 46a8a1f08f88c278e60ebb6daa7a551eb641c67b) (cherry picked from commit f3c442950de3b34dda24ecb258171c32d161b1fd) --- sys/dev/ixl/if_ixl.c | 27 +++++++++++- sys/dev/ixl/ixl.h | 1 + sys/dev/ixl/ixl_pf_main.c | 110 +++++++++++++++++++++++++++++++++++++++------- 3 files changed, 120 insertions(+), 18 deletions(-) diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c index 43c3af056b67..aa2e69ea0b5a 100644 --- a/sys/dev/ixl/if_ixl.c +++ b/sys/dev/ixl/if_ixl.c @@ -1480,17 +1480,33 @@ ixl_if_multi_set(if_ctx_t ctx) struct ixl_pf *pf = iflib_get_softc(ctx); struct ixl_vsi *vsi = &pf->vsi; struct i40e_hw *hw = vsi->hw; + enum i40e_status_code status; int mcnt; + if_t ifp = iflib_get_ifp(ctx); IOCTL_DEBUGOUT("ixl_if_multi_set: begin"); /* Delete filters for removed multicast addresses */ ixl_del_multi(vsi, false); - mcnt = min(if_llmaddr_count(iflib_get_ifp(ctx)), MAX_MULTICAST_ADDR); + mcnt = min(if_llmaddr_count(ifp), MAX_MULTICAST_ADDR); if (__predict_false(mcnt == MAX_MULTICAST_ADDR)) { - i40e_aq_set_vsi_multicast_promiscuous(hw, + /* Check if promisc mode is already enabled, if yes return */ + if (vsi->flags & IXL_FLAGS_MC_PROMISC) + return; + + status = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid, TRUE, NULL); + if (status != I40E_SUCCESS) + if_printf(ifp, "Failed to enable multicast promiscuous " + "mode, status: %s\n", i40e_stat_str(hw, status)); + else { + if_printf(ifp, "Enabled multicast promiscuous mode\n"); + + /* Set the flag to track promiscuous mode */ + vsi->flags |= IXL_FLAGS_MC_PROMISC; + } + /* Delete all existing MC filters */ ixl_del_multi(vsi, true); return; } @@ -1693,6 +1709,13 @@ ixl_if_promisc_set(if_ctx_t ctx, int flags) return (err); err = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid, multi, NULL); + + /* Update the multicast promiscuous flag based on the new state */ + if (multi) + vsi->flags |= IXL_FLAGS_MC_PROMISC; + else + vsi->flags &= ~IXL_FLAGS_MC_PROMISC; + return (err); } diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index 95379448b570..ab0f38307d90 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -202,6 +202,7 @@ #define IXL_FLAGS_KEEP_TSO6 (1 << 1) #define IXL_FLAGS_USES_MSIX (1 << 2) #define IXL_FLAGS_IS_VF (1 << 3) +#define IXL_FLAGS_MC_PROMISC (1 << 4) #define IXL_VSI_IS_PF(v) ((v->flags & IXL_FLAGS_IS_VF) == 0) #define IXL_VSI_IS_VF(v) ((v->flags & IXL_FLAGS_IS_VF) != 0) diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index 1752efc02fff..b62619ced5cb 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -593,24 +593,29 @@ ixl_add_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) * Routines for multicast and vlan filter management. * *********************************************************************/ + +/** + * ixl_add_multi - Add multicast filters to the hardware + * @vsi: The VSI structure + * + * In case number of multicast filters in the IFP exceeds 127 entries, + * multicast promiscuous mode will be enabled and the filters will be removed + * from the hardware + */ void ixl_add_multi(struct ixl_vsi *vsi) { if_t ifp = vsi->ifp; - struct i40e_hw *hw = vsi->hw; int mcnt = 0; struct ixl_add_maddr_arg cb_arg; IOCTL_DEBUGOUT("ixl_add_multi: begin"); - mcnt = if_llmaddr_count(ifp); - if (__predict_false(mcnt >= MAX_MULTICAST_ADDR)) { - i40e_aq_set_vsi_multicast_promiscuous(hw, - vsi->seid, TRUE, NULL); - /* delete all existing MC filters */ - ixl_del_multi(vsi, true); - return; - } + /* + * There is no need to check if the number of multicast addresses + * exceeds the MAX_MULTICAST_ADDR threshold and set promiscuous mode + * here, as all callers already handle this case. + */ cb_arg.vsi = vsi; LIST_INIT(&cb_arg.to_add); @@ -633,30 +638,103 @@ ixl_match_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) return (0); } +/** + * ixl_dis_multi_promisc - Disable multicast promiscuous mode + * @vsi: The VSI structure + * @vsi_mcnt: Number of multicast filters in the VSI + * + * Disable multicast promiscuous mode based on number of entries in the IFP + * and the VSI, then re-add multicast filters. + * + */ +static void +ixl_dis_multi_promisc(struct ixl_vsi *vsi, int vsi_mcnt) +{ + struct ifnet *ifp = vsi->ifp; + struct i40e_hw *hw = vsi->hw; + int ifp_mcnt = 0; + enum i40e_status_code status; + + /* + * Check if multicast promiscuous mode was actually enabled. + * If promiscuous mode was not enabled, don't attempt to disable it. + * Also, don't disable if IFF_PROMISC or IFF_ALLMULTI is set. + */ + if (!(vsi->flags & IXL_FLAGS_MC_PROMISC) || + (if_getflags(ifp) & (IFF_PROMISC | IFF_ALLMULTI))) + return; + + ifp_mcnt = if_llmaddr_count(ifp); + /* + * Equal lists or empty ifp list mean the list has not been changed + * and in such case avoid disabling multicast promiscuous mode as it + * was not previously enabled. Case where multicast promiscuous mode has + * been enabled is when vsi_mcnt == 0 && ifp_mcnt > 0. + */ + if (ifp_mcnt == vsi_mcnt || ifp_mcnt == 0 || + ifp_mcnt >= MAX_MULTICAST_ADDR) + return; + + status = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid, + FALSE, NULL); + if (status != I40E_SUCCESS) { + if_printf(ifp, "Failed to disable multicast promiscuous " + "mode, status: %s\n", i40e_stat_str(hw, status)); + + return; + } + + /* Clear the flag since promiscuous mode is now disabled */ + vsi->flags &= ~IXL_FLAGS_MC_PROMISC; + if_printf(ifp, "Disabled multicast promiscuous mode\n"); + + ixl_add_multi(vsi); +} + +/** + * ixl_del_multi - Delete multicast filters from the hardware + * @vsi: The VSI structure + * @all: Bool to determine if all the multicast filters should be removed + * + * In case number of multicast filters in the IFP drops to 127 entries, + * multicast promiscuous mode will be disabled and the filters will be reapplied + * to the hardware. + */ void ixl_del_multi(struct ixl_vsi *vsi, bool all) { - struct ixl_ftl_head to_del; + int to_del_cnt = 0, vsi_mcnt = 0; if_t ifp = vsi->ifp; struct ixl_mac_filter *f, *fn; - int mcnt = 0; + struct ixl_ftl_head to_del; IOCTL_DEBUGOUT("ixl_del_multi: begin"); LIST_INIT(&to_del); /* Search for removed multicast addresses */ LIST_FOREACH_SAFE(f, &vsi->ftl, ftle, fn) { - if ((f->flags & IXL_FILTER_MC) == 0 || - (!all && (if_foreach_llmaddr(ifp, ixl_match_maddr, f) == 0))) + if ((f->flags & IXL_FILTER_MC) == 0) + continue; + + /* Count all the multicast filters in the VSI for comparison */ + vsi_mcnt++; + + if (!all && if_foreach_llmaddr(ifp, ixl_match_maddr, f) != 0) continue; LIST_REMOVE(f, ftle); LIST_INSERT_HEAD(&to_del, f, ftle); - mcnt++; + to_del_cnt++; } - if (mcnt > 0) - ixl_del_hw_filters(vsi, &to_del, mcnt); + if (to_del_cnt > 0) { + ixl_del_hw_filters(vsi, &to_del, to_del_cnt); + return; + } + + ixl_dis_multi_promisc(vsi, vsi_mcnt); + + IOCTL_DEBUGOUT("ixl_del_multi: end"); } void From nobody Mon Nov 3 20:29:52 2025 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 4d0jr105Mnz6FjCS; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jr04Yg1z3Kdf; Mon, 03 Nov 2025 20:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejgj+rVbyxCzSTOkNIb38SXVU9pmX3yPuSMWGbtYJO8=; b=lu1GCcFnNN/GVrDu/oGlAQC1bl9m4SLHxMuWj/Ytae7wQUmOAuTkNVussYOnpzf5n9E9rO +180w43nlSijZvPf0WcCZofNRaAZi9oZF8hJ8rfTiaBx5fS5gZboJSYMoqsPTNdmVSQ7Yu YvWmK/6tYdO3ZPVozZ3nmR++asZuJtmEdyE6C4c7ylCxCaRNYXWDrm9rUEAm4YfjKxvI4z WMdROSKNtbvLHPbetFFVqgiDcAUhH4GS+lEHxP17VGIRfMha7Hwew3M6a/6x7qV1oN5OpK zBAqNGEGrKiYgOUkEYBZF9hVLef6W5JfScftm6+vkpOOglSdCfxvJ0QmwVzJgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejgj+rVbyxCzSTOkNIb38SXVU9pmX3yPuSMWGbtYJO8=; b=d1VVyjb9t5pYW7IGrucfoJys114ogFJ97ia/YQouKSmII4Q3/PwYymrzeFKIkPNHFLvVGD 9GpXVtnTg4C+ybzJT2O1dR1UrwZCb1K3K+QCK/VDCypfgnBzhkeH/h+2EGGvIgN6VuMBfw drYnIAzA/Zw5lfuEACEgi9G9M666UiZeJDYYejhsy4XJUlN0jN9IM3EcBXeBcQkdQMTGEs niwCviXAbciGNgVBepGBv/Dnwzl0LxdApqxlvFghjU7ZxXvfTthCSSWPz+Hxv8bPIjPKbD 23Ht/1JJ9LOZprC2zjlp3aSHtTGFI5yQaernf09vckxvdzYpI/9bo12QvBjWbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201792; a=rsa-sha256; cv=none; b=uFt8rhnTN9v0kqB2f5FRIfHRx507BC67yS4qe9eantr7JelKG1eUwy62N2SHtiVDynaO9G VJjYsarB5o2vLy/hi0Smh+qYs5PhaAtY4n08jYYUcTJQnSNTJn9qcsF8GIGCKWcAY8+aqc AqJkAyGEpVrMMjQrthf33rrwzgo+c7z6/AtBvUCzPkn9nxnN26WyXFu5j9SLMjdyveF18S MeUDPle/+eWaDFuO1PNtAo5kEBXf1S8H9tEYqwkKeg/ncFQS4EjTTqG3HIzFZ3r9vl9lW7 BA5CN/PG07UZ1OuCJNQSM9cno09qb0NmEJ7gnkp6mOQXUWmu4EIEmY9K/uwnrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jr048kPzBP7; Mon, 03 Nov 2025 20:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTqDa051300; Mon, 3 Nov 2025 20:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTqox051297; Mon, 3 Nov 2025 20:29:52 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:52 GMT Message-Id: <202511032029.5A3KTqox051297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 99fdcac549c6 - releng/15.0 - ice(4): Add PCI IDs for E835 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 99fdcac549c670dcdbc79342ebcc11ddf2f18a23 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=99fdcac549c670dcdbc79342ebcc11ddf2f18a23 commit 99fdcac549c670dcdbc79342ebcc11ddf2f18a23 Author: Krzysztof Galazka AuthorDate: 2025-10-10 12:04:00 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:23 +0000 ice(4): Add PCI IDs for E835 devices Add device IDs and branding strings for E835 adapters. This is a follow up for E830 adapters with Security Protocol and Data Model (SPDM) support and RDMA support available on 100 and 200Gbps links. Signed-off-by: Krzysztof Galazka Approved by: re (cperciva) Approved by: kbowling (mentor), erj (mentor) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D52782 (cherry picked from commit b202176dc76d862f886778439b96dd1243d8b999) (cherry picked from commit 16004d2a9eee3bac4a4552d66e30e1089e08d518) --- sys/dev/ice/ice_common.c | 9 +++++++++ sys/dev/ice/ice_devids.h | 18 ++++++++++++++++++ sys/dev/ice/ice_drv_info.h | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index ad4ea4c8e7a1..b895f661bc46 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -213,6 +213,15 @@ int ice_set_mac_type(struct ice_hw *hw) case ICE_DEV_ID_E830_L_QSFP: case ICE_DEV_ID_E830C_SFP: case ICE_DEV_ID_E830_L_SFP: + case ICE_DEV_ID_E835CC_BACKPLANE: + case ICE_DEV_ID_E835CC_QSFP56: + case ICE_DEV_ID_E835CC_SFP: + case ICE_DEV_ID_E835C_BACKPLANE: + case ICE_DEV_ID_E835C_QSFP: + case ICE_DEV_ID_E835C_SFP: + case ICE_DEV_ID_E835_L_BACKPLANE: + case ICE_DEV_ID_E835_L_QSFP: + case ICE_DEV_ID_E835_L_SFP: hw->mac_type = ICE_MAC_E830; break; default: diff --git a/sys/dev/ice/ice_devids.h b/sys/dev/ice/ice_devids.h index 3f91e9dfbcaf..74712c61ae8e 100644 --- a/sys/dev/ice/ice_devids.h +++ b/sys/dev/ice/ice_devids.h @@ -62,6 +62,24 @@ #define ICE_DEV_ID_E830C_SFP 0x12DA /* Intel(R) Ethernet Controller E830-L for SFP */ #define ICE_DEV_ID_E830_L_SFP 0x12DE +/* Intel(R) Ethernet Controller E835-CC for backplane */ +#define ICE_DEV_ID_E835CC_BACKPLANE 0x1248 +/* Intel(R) Ethernet Controller E835-CC for QSFP */ +#define ICE_DEV_ID_E835CC_QSFP56 0x1249 +/* Intel(R) Ethernet Controller E835-CC for SFP */ +#define ICE_DEV_ID_E835CC_SFP 0x124A +/* Intel(R) Ethernet Controller E835-C for backplane */ +#define ICE_DEV_ID_E835C_BACKPLANE 0x1261 +/* Intel(R) Ethernet Controller E835-C for QSFP */ +#define ICE_DEV_ID_E835C_QSFP 0x1262 +/* Intel(R) Ethernet Controller E835-C for SFP */ +#define ICE_DEV_ID_E835C_SFP 0x1263 +/* Intel(R) Ethernet Controller E835-L for backplane */ +#define ICE_DEV_ID_E835_L_BACKPLANE 0x1265 +/* Intel(R) Ethernet Controller E835-L for QSFP */ +#define ICE_DEV_ID_E835_L_QSFP 0x1266 +/* Intel(R) Ethernet Controller E835-L for SFP */ +#define ICE_DEV_ID_E835_L_SFP 0x1267 /* Intel(R) Ethernet Controller E810-C for backplane */ #define ICE_DEV_ID_E810C_BACKPLANE 0x1591 /* Intel(R) Ethernet Controller E810-C for QSFP */ diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index 2a51a7394424..46965f4124bc 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -218,6 +218,45 @@ static const pci_vendor_info_t ice_vendor_info_array[] = { "Intel(R) Ethernet Network Adapter E830-XXV-2"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_L_SFP, "Intel(R) Ethernet Connection E830-L for SFP"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_BACKPLANE, + "Intel(R) Ethernet Connection E835-CC for backplane"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_QSFP56, + ICE_INTEL_VENDOR_ID, 0x0001, 0, + "Intel(R) Ethernet Network Adapter E835-C-Q2"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_QSFP56, + ICE_INTEL_VENDOR_ID, 0x0002, 0, + "Intel(R) Ethernet Network Adapter E835-C-Q2 for OCP 3.0"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_QSFP56, + ICE_INTEL_VENDOR_ID, 0x0003, 0, + "Intel(R) Ethernet Network Adapter E835-CC-Q1"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_QSFP56, + ICE_INTEL_VENDOR_ID, 0x0004, 0, + "Intel(R) Ethernet Network Adapter E835-CC-Q1 for OCP 3.0"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_QSFP56, + "Intel(R) Ethernet Connection E835-CC for QSFP56"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, + ICE_INTEL_VENDOR_ID, 0x0001, 0, + "Intel(R) Ethernet Network Adapter E835-XXV-2 for OCP 3.0"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, + ICE_INTEL_VENDOR_ID, 0x0003, 0, + "Intel(R) Ethernet Network Adapter E835-XXV-2"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, + ICE_INTEL_VENDOR_ID, 0x0004, 0, + "Intel(R) Ethernet Network Adapter E835-XXV-4 for OCP 3.0"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, + "Intel(R) Ethernet Connection E835-CC for SFP"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835C_BACKPLANE, + "Intel(R) Ethernet Connection E835-C for backplane"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835C_QSFP, + "Intel(R) Ethernet Connection E835-C for QSFP"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835C_SFP, + "Intel(R) Ethernet Connection E835-C for SFP"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835_L_BACKPLANE, + "Intel(R) Ethernet Connection E835-L for backplane"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835_L_QSFP, + "Intel(R) Ethernet Connection E835-L for QSFP"), + PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835_L_SFP, + "Intel(R) Ethernet Connection E835-L for SFP"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E825C_BACKPLANE, "Intel(R) Ethernet Connection E825-C for backplane"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E825C_QSFP, From nobody Mon Nov 3 20:29:53 2025 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 4d0jr23rM7z6Fj6v; Mon, 03 Nov 2025 20:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jr15HL3z3Kdy; Mon, 03 Nov 2025 20:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7M5GiNuNJSp+ziyr2/Ih/j+Kuv9HNe1LN2oyEQ09hQQ=; b=vysgv5sFze/ZXbQR42KoLbfH1lQtROLgeiIxGARPdIphstc97TYpkx3drDTGQLKErNs8zU G4QB+ce7wN6nsx4Zu+HRoIikaR5Yki/pE6ua9SUwtul6HUgD98bz5xsXDDlEVAEhJgcEad ONMzfnCVI6Jpfdo0n8uze3GxdqqP62ZEWxVVNyBKjCQ05Fn5nWfPGMRs1p1fycmyfX353u E6GiGv4Q7bqxmAl1U8vbdZTjaGsSjTNTbN5Mzhi899amLfOzsHjqkdl+VljjTjQK0aXEu9 b2UjAzas4pwb7fYdHAyOswzpgT/xaEdoBLmYj5AsaTV1n4bemZ+UtXDiaR/0Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7M5GiNuNJSp+ziyr2/Ih/j+Kuv9HNe1LN2oyEQ09hQQ=; b=UVh9S+TecnFRtrgNnDy5izQKUEVntI53XM0l2gOxCVZE/Wso0vnxABqttPiyR/idLkDdQC WXijB94HHZ5Ba/mdnJ31LuniLSTgqyuM2UPOfgy4XqDCGqwuO5i2qKmDI9x9+7giiP2YD+ Pr9RibkiWohPjbv+Xrt0RfTPwqEqHGN4He8YEVg9eAHVy7XItw3s2XArGbvOncLE2PvAiL 7YoxT+Xl23qoc7vFAd/JWSq1ufeRqIngKdc7rOG+7v2W6qj1CtGVD84sDVSsxVRcHZx4tn kTZQXBJiDDr/eWXIIf4ebW5rJ7zK+CHk3gdhLIHYV0wV1BZJt6KkadhksyUYMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201793; a=rsa-sha256; cv=none; b=ENeMn62aDNZfUuBcXOHaxjIMjdlLh7+51m26vtG+zQbGkhnW0HIpqwd7AHkmdD9kSRcZwZ 2hQQQ3NK4bXBx19mazX5eLxEk3nM/9YneMJixeSJUsAblunuyboAXUTmxwiVjt4t4uNA/x iNAMVyeU5WCPfFNwh57gorXUWyf3JbxuKyhqdWquD1BXOh0BBPWPlr7l6/oouETtcUxuVX Bbicx4k9HhSC6Udqki1gXx1AR27mCKCxqxFAeBxaLXElro0g9NbB43oQPmCN5a59GE+zjw UQ9i8luBPVc6pgaZ4uAxFLr7LFDmQBUJpgCqazbW/rUHSqwoJB5aY+gMUwlomw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0jr14sJBz9x2; Mon, 03 Nov 2025 20:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3KTr5c051335; Mon, 3 Nov 2025 20:29:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTrR9051332; Mon, 3 Nov 2025 20:29:53 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:53 GMT Message-Id: <202511032029.5A3KTrR9051332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 83a23ceb4088 - releng/15.0 - ice(4): Add support for E835-XXV-4 adapter List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 83a23ceb408865572d4652a68d99bdf6996fd218 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=83a23ceb408865572d4652a68d99bdf6996fd218 commit 83a23ceb408865572d4652a68d99bdf6996fd218 Author: Krzysztof Galazka AuthorDate: 2025-10-27 14:10:26 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:26 +0000 ice(4): Add support for E835-XXV-4 adapter Add subdevice ID and branding string for E835-XXV-4 adapter. Signed-off-by: Krzysztof Galazka Approved by: re (cperciva) Approved by: kbowling (mentor), erj (mentor) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D53319 (cherry picked from commit 09b48f811b4bf3a17485680b4720d1c0a81bbe07) (cherry picked from commit b59a9230a6a824e9e63864677784deccf2b676c6) --- sys/dev/ice/ice_drv_info.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index 46965f4124bc..abb11bdb5fd9 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -237,6 +237,9 @@ static const pci_vendor_info_t ice_vendor_info_array[] = { PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, ICE_INTEL_VENDOR_ID, 0x0001, 0, "Intel(R) Ethernet Network Adapter E835-XXV-2 for OCP 3.0"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, + ICE_INTEL_VENDOR_ID, 0x0002, 0, + "Intel(R) Ethernet Network Adapter E835-XXV-4"), PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, ICE_INTEL_VENDOR_ID, 0x0003, 0, "Intel(R) Ethernet Network Adapter E835-XXV-2"), From nobody Mon Nov 3 22:00:46 2025 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 4d0lrt4LLBz6FsD4; Mon, 03 Nov 2025 22:00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0lrt23rqz3YrY; Mon, 03 Nov 2025 22:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762207246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqEHrqyT+HXxO9T9jx1UFdkrClZEbJBR3aoQ2PoYZ1c=; b=GvNEcsW7NLxrNx8AOz5ml/bbTnnf5jbUyyQTm5cGAtoACXteCkMpSMpKiRQ2601lPhd3+N Uy/Z1LstlPdGSEbmQ6BSfN5qOlbi90XCm/V+T90A1zvyjnCInJp0m8iGaug4+98AdynkQD uMnr5cMhe4c5tXRPkkniSSHP2bAgrrwsDgzz4ZZn0fXaBWjV6U2kIQ9TYyq3aCOZ2669ee BuXCeWIKqb4PLIHD/d5vJ1z5vQY6k/HAB7JKF9qANFz4kC5+HVlsaKgbgxEPDezvtOj+ww zSGWvUUrBLAUleABjz2nbkre93M6u0VAlQUtwcdTIhFp5FkUVWoUilQWT879NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762207246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqEHrqyT+HXxO9T9jx1UFdkrClZEbJBR3aoQ2PoYZ1c=; b=vMwuXdCzTmvDd2NPdCS09tUY9lxwpmuIxMVDAyTwyU5Ecgxo/KfcyexFh4RVqiThhln//q 0CnqujX+g5PKhiawzmuPg8YwJ8bJB3hNHlODcWKt4R0Uwlcxxr3AmvVzPO7mi556VrtWOj 5dqhzKby9e/cWxPAHdBjX8XG7D+5s8iw+BQDIdTZm+Ku1zoMqFh+N77ERL+FRQGeBe0goF GcDfRkdyUoBRb5YMqfsk8RdWW/8eR+ts4RAiKEjjzHq9119LtRo9luN6S54LuAmrgic3km BwVZ+2SDbglXXYZfqrezBaNxFaxLd4JH2k4gW7dSU+a2kMIMZdxxj3BEramV3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762207246; a=rsa-sha256; cv=none; b=nqxzPO8poaF16p6yqdRBXw5Pg51G/uf5wdwI9VVHM+hPrQC1LKFLo1Spqg+cvY5uWGxGk8 7pFjEUiRwagu+PadR/ML1Nd29xnaQUt3nLVmHjlNnyMwJyr9OfleG+8sUfAZ1I9jbgnuK5 1ez5aQka4OwDqLLiRlVhxJilHI21vkpkXvJyVEFo2dzccq+h8T+JuG8KWaRfroZF88tLa4 3CzY15VGs6VoRKkB10a2qwsNEA2mHkaEjQn0ZBp665SVevm/+BrBCnoYV7maPK+KKvBBtY A1I6lqELj6GbjzBuXjhJq0Yh8Nm808uYf/mEonXKYgiaDKnfM62c4Kh5gKJUGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0lrt1TH7zDT1; Mon, 03 Nov 2025 22:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3M0kQL029761; Mon, 3 Nov 2025 22:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3M0ktm029758; Mon, 3 Nov 2025 22:00:46 GMT (envelope-from git) Date: Mon, 3 Nov 2025 22:00:46 GMT Message-Id: <202511032200.5A3M0ktm029758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c63166a2aff4 - stable/14 - bsd.prog.mk: Skip warnings if compiler.mk was not included List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: c63166a2aff488314be4c2a75493ed30597a91d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c63166a2aff488314be4c2a75493ed30597a91d4 commit c63166a2aff488314be4c2a75493ed30597a91d4 Author: Ed Maste AuthorDate: 2025-10-31 15:53:42 +0000 Commit: Ed Maste CommitDate: 2025-11-03 20:42:50 +0000 bsd.prog.mk: Skip warnings if compiler.mk was not included We emit a warning if src.conf options WITH_RETPOLINE or INIT_ALL are in use, and the compiler or linker does not support the feature. For targets like `cleandir` we skip including bsd.compiler.mk, which leaves COMPILER_FEATURES unset and spurious warnings were emitted in early buildworld stages, if these options are in use. Commit 0837b2ebd570 ("pkg: Die if make -V BRANCH fails") added -W to usr.sbin/pkg's make flags, causing it to exit on warnings. As a result buildworld failed when these src.conf options were in use. Clean this up by omitting the warning if the magic _NO_INCLUDE_COMPILERMK flag is set, which indicates that COMPILER_FEATURES is not set. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53501 (cherry picked from commit e4f2a350955406ffd58dd3f0bb7610df0f36d647) (cherry picked from commit 1471af5110fc3bb6b1f1548e056f1717fb844ffd) --- share/mk/bsd.prog.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index fa15370a82c6..1c32a442aac9 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -49,9 +49,11 @@ CXXFLAGS+= -mretpoline LDFLAGS+= -Wl,-zretpolineplt .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning Retpoline requested but not supported by compiler or linker .endif .endif +.endif # LLD sensibly defaults to -znoexecstack, so do the same for BFD LDFLAGS.bfd+= -Wl,-znoexecstack @@ -65,16 +67,20 @@ CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clan CXXFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning InitAll (zeros) requested but not supported by compiler .endif +.endif .elif ${MK_INIT_ALL_PATTERN} == "yes" .if ${COMPILER_FEATURES:Minit-all} CFLAGS+= -ftrivial-auto-var-init=pattern CXXFLAGS+= -ftrivial-auto-var-init=pattern .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning InitAll (pattern) requested but not supported by compiler .endif .endif +.endif # bsd.sanitizer.mk is not installed, so don't require it (e.g. for ports). .sinclude "bsd.sanitizer.mk" From nobody Mon Nov 3 23:17:43 2025 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 4d0nYh2DxNz6Fylg; Mon, 03 Nov 2025 23:17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0nYh1lp1z3hcB; Mon, 03 Nov 2025 23:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762211864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDq2D9GlDhFYCfGZ71pgZloKM8S+7zoHkvJyz8aVNS4=; b=jhtFfc5T1JVVpvlN1Pa8Vo3LmnpZvSSoqjMVmECV8AUuXfnpQai4uWkP/gP5yArK50vvmI y9TY7EuokB5Sp6Z8rgv6O5Dge5D9N8lD+F3y6rctq/UKNOXEeF4Ec2Vbfge0Drg4ycDPWf DLAcCikS23nbOFdceQSNiFgOryy5w37Xt19Kv+4EAPGRZtjGUjfpziM2dC/vgCM7HNCFWC soPq+v7w7rrAtvFW3PrManSjpdqSzfk3zxpc7OfNys5FdAGMp6Sn1eAWNcS9M5aNdrQWbR fN+ZHkPRMl6R5BgWmikJEKjgH4SIMajRMBd3y0d9oJxgfMUdx2PVo8lxiv1WXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762211864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDq2D9GlDhFYCfGZ71pgZloKM8S+7zoHkvJyz8aVNS4=; b=b22AfUVlclYB2Dnc6QYf0p9zdYmw2XYSfdUfCukU5TBPaUZASuoekAQZZ6t9YplmnEW3uB BtAssTSJvcCq5I1NxW7oLyPcQscNFv7F5qFTtLj7X4MR3Wz8Ry9amp0S+V5tLYk/m/TF11 VwyCnHREKFNHCKCwIFQ9I8okANfyeb0zTHOR9ZU+TLj8U5Xb6a0CTEkEgvuv3oW08jON+D Cke2tegHfmaszfIEOJV1SkErIefU9aGJiiqrHbvEvUXbGKAwQ54nii09mxm3avLBRBjvbn CdB5qG3WqTR/RgJDIVUXlxuP/VChebMHJacawbsuG5Z8PQ1HMiVxPe9VND4qMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762211864; a=rsa-sha256; cv=none; b=nshfX0SC8NXA35/zNEb6b4Tzf9Xl6B3hIq5Bj+5QBUMSw/EjrPigyUI+Ac4Gs6iXirjxZF lWublyqannPk7ugJTO54EPomnVyZONtzNTqOnNXw+Aq5boKF2xh69tLRoFu04B2eRyYkwv E6uY19xk9tdiqwwgckTYBjcwCbg3psdFIxHEAJIk8enxfij6zPAljVMnZqKElphOi0j9pC u/CwO7NsGj5FCByxZ1WikQq1fYOrWX5kh9q1qTe0Ad99RtI1hwnlofnFpdiMpX4lUhB5Vw iKaF0+j22N4ulKbMKmVv3dMOm0818E1DVvso6yDQKSvP9JogXRzStfEkfmqGrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0nYh0xpyzXfC; Mon, 03 Nov 2025 23:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3NHh6j070295; Mon, 3 Nov 2025 23:17:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3NHhJR070292; Mon, 3 Nov 2025 23:17:43 GMT (envelope-from git) Date: Mon, 3 Nov 2025 23:17:43 GMT Message-Id: <202511032317.5A3NHhJR070292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 6c321dc15d52 - stable/15 - nvme: Add handling for bar5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 6c321dc15d5234742c6452e975f41f4a24b52e1d Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=6c321dc15d5234742c6452e975f41f4a24b52e1d commit 6c321dc15d5234742c6452e975f41f4a24b52e1d Author: Jasper Tran O'Leary AuthorDate: 2025-10-28 20:43:35 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-03 22:04:30 +0000 nvme: Add handling for bar5 The NVMe spec allows the Table BIR (TBIR) and PBA DIR (PBIR) to be 0, 4, or 5. The existing NVMe driver basically only has support for 4, perhaps under the assumption that BAR4 is 64-bit and also occupies BAR5. This change adds support for BAR5, covering the case where BAR4 and BAR5 might both be present and 32-bit, where the Table BIR might be 4 and the PBA BIR might be 5, or vice versa. The NVMe spec (in the SR-IOV section) also permits VFs to use BIR=2, so I haven't added stricter checks on which BIR will be permitted by the driver. This enables FreeBSD on Google Compute Engine C4 Machines. MFC after: 3 days Reviewed by: imp Sponsored by: Google Co-authored-by: Matt Delco Signed-off-by: Jasper Tran O'Leary Differential Revision: https://reviews.freebsd.org/D53140 (cherry picked from commit 7b32f4f0a7fe9b1b2f5a3905ca15f656713255ad) --- sys/dev/nvme/nvme_ctrlr.c | 9 +++++++-- sys/dev/nvme/nvme_pci.c | 48 ++++++++++++++++++++++++++++++++++----------- sys/dev/nvme/nvme_private.h | 6 ++++-- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index fc912c1342f4..6ed9cb33f991 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1746,9 +1746,14 @@ noadminq: bus_release_resource(ctrlr->dev, SYS_RES_IRQ, rman_get_rid(ctrlr->res), ctrlr->res); - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } bus_release_resource(dev, SYS_RES_MEMORY, diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index c07a68d2f0dc..cecb05ca0a92 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -152,11 +152,15 @@ static int nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) { ctrlr->resource_id = PCIR_BAR(0); + ctrlr->msix_table_resource_id = -1; + ctrlr->msix_table_resource = NULL; + ctrlr->msix_pba_resource_id = -1; + ctrlr->msix_pba_resource = NULL; ctrlr->resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, &ctrlr->resource_id, RF_ACTIVE); - if(ctrlr->resource == NULL) { + if (ctrlr->resource == NULL) { nvme_printf(ctrlr, "unable to allocate pci resource\n"); return (ENOMEM); } @@ -166,15 +170,32 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; /* - * The NVMe spec allows for the MSI-X table to be placed behind - * BAR 4/5, separate from the control/doorbell registers. Always - * try to map this bar, because it must be mapped prior to calling - * pci_alloc_msix(). If the table isn't behind BAR 4/5, - * bus_alloc_resource() will just return NULL which is OK. + * The NVMe spec allows for the MSI-X tables to be placed behind + * BAR 4 and/or 5, separate from the control/doorbell registers. */ - ctrlr->bar4_resource_id = PCIR_BAR(4); - ctrlr->bar4_resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, - &ctrlr->bar4_resource_id, RF_ACTIVE); + + ctrlr->msix_table_resource_id = pci_msix_table_bar(ctrlr->dev); + ctrlr->msix_pba_resource_id = pci_msix_pba_bar(ctrlr->dev); + + if (ctrlr->msix_table_resource_id >= 0 && + ctrlr->msix_table_resource_id != ctrlr->resource_id) { + ctrlr->msix_table_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, RF_ACTIVE); + if (ctrlr->msix_table_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x table resource\n"); + return (ENOMEM); + } + } + if (ctrlr->msix_pba_resource_id >= 0 && + ctrlr->msix_pba_resource_id != ctrlr->resource_id && + ctrlr->msix_pba_resource_id != ctrlr->msix_table_resource_id) { + ctrlr->msix_pba_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, RF_ACTIVE); + if (ctrlr->msix_pba_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x pba resource\n"); + return (ENOMEM); + } + } return (0); } @@ -200,9 +221,14 @@ bad: ctrlr->resource_id, ctrlr->resource); } - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } if (ctrlr->tag) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 52e9fcbbebcd..a425a6a5ad62 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -235,8 +235,10 @@ struct nvme_controller { * separate from the control registers which are in BAR 0/1. These * members track the mapping of BAR 4/5 for that reason. */ - int bar4_resource_id; - struct resource *bar4_resource; + int msix_table_resource_id; + struct resource *msix_table_resource; + int msix_pba_resource_id; + struct resource *msix_pba_resource; int msi_count; uint32_t enable_aborts; From nobody Mon Nov 3 23:27:41 2025 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 4d0nn959Lhz6G18S; Mon, 03 Nov 2025 23:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0nn94V5Tz3ktd; Mon, 03 Nov 2025 23:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762212461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C5XR/YC/7T4rgq9uENQUURzDhPIfPnvd5ftX/iPVb8s=; b=H+ithtz1A0EvnXrjgDjIawxjB+aNc8hGlAtklGFi60x4a7rqaOEeBUGBay+9N70pw8j2wB xL2X6wLWYx5hKOu2GAhGi76dTulC3/4lsF3TE/MH8s8rzW3kM3enVZAFWAvYYUEdeOaxe8 Op8EiwjnR1/A8Xn8e+lHwsqEp7WQLwgXbwbSetydUq2nlRHoYE+/nA9ab5OLtdc9HthiPR 8JH5gJaGVlcQalql8RKtSfU73FTItVNVlGjtH1z7JtYmI40I1AfscAUGVTC5WJ1pOIVEHU 0+QzqoQ29xDfwo5La0VjrlN0JJWaEME+dH8px4eJdkjUchZo5ZSFTpXPSlO8Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762212461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C5XR/YC/7T4rgq9uENQUURzDhPIfPnvd5ftX/iPVb8s=; b=eOa85QbOzUggGKsMu7Ug8lLvTsZirqh6WzGOZcs8EADDDFCfB2EI6SxkG8y5xErCG5f54t 4YeVIOD+BFladwBW8g0I7bD4oaxFgbZKsFvQ+5LJj5qrvs/glRl9HDQgXw50l5IzAXAspC lXxRkQ7C4kCuGk19tD0eAodKqxWQKPDbqtQzXqvAy6aAA3XcW/P95O63USH+iBz5GHTAM7 fcED7WsuDL2qVCQgPg3sw0cyz30uaxi+3l8wBgw2+fK8X4iXSNP+rAmj8ix/4kgNDvwT3J tYsjgvCoTC5tPElEccI71rYwbr49HtMYphxZorAW+x8GbTPTeZ4g0h1bHPMxEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762212461; a=rsa-sha256; cv=none; b=NsmDK93W5qvU5AdgT0g7pROIrGlkPgJsTFllV6N1+LYSJ6wH+5xH9Ydkh480nEw7Dds/U7 qwopN1loaeH4njkd/0LR2gdafQT9SmPZn/fkKFiVRHha/5KTvVyLkRenGYaWonAEmzwi+N JVyatbha6RB2Ik2SOlY2AOrmI6AofAOnV4EWr2rh1zaRYBKV5amQNKFOc47Sk5UKYGJXv5 5qQIhRyIFjXapYCPLy/E1PdUqP/2XysaI2FzEFRcUjLrWd6V0lq5Rh6VmwqVthFOpi4LS6 cbkryxNLObKFFtrcN708T+naAxjUi2Ou2owigof+wn1nn0RbjfIemwUd3ZvjzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0nn93kXyzXg0; Mon, 03 Nov 2025 23:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3NRf2V089386; Mon, 3 Nov 2025 23:27:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3NRfwj089383; Mon, 3 Nov 2025 23:27:41 GMT (envelope-from git) Date: Mon, 3 Nov 2025 23:27:41 GMT Message-Id: <202511032327.5A3NRfwj089383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 772837c632ec - stable/15 - bhyve.8: Correct description for -c flag, 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 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: 772837c632ec9f3cb3ded33830a60a8b310c2e22 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=772837c632ec9f3cb3ded33830a60a8b310c2e22 commit 772837c632ec9f3cb3ded33830a60a8b310c2e22 Author: Alexander Ziaee AuthorDate: 2025-10-30 15:06:30 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-03 23:26:42 +0000 bhyve.8: Correct description for -c flag, tag spdx The examples only show the usage of `-c `, as did the flag description, however the -c flag supports more complex cpu topology specifiers. These were documented correctly in SYNOPSIS, add them to the body of the DESCRIPTION as well. Someone could go further and do and example with using them. MFC after: 3 days (there was a merge conflict with the date) Event: OpenZFS Developer Summit '25 Reported by: Levi Worley (cherry picked from commit 205af037e302fbd50dabc485a89e2222cd063b9e) --- usr.sbin/bhyve/bhyve.8 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index c902c265da9e..13f0d239ef40 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2013 Peter Grehan .\" All rights reserved. .\" @@ -22,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 21, 2024 +.Dd October 28, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -125,7 +128,7 @@ xAPIC mode is the default setting so this option is redundant. It will be deprecated in a future version. .It Fl C Include guest memory in core files. -.It Fl c Op Ar setting ... +.It Fl c Oo Oo Cm cpus= Oc Ns Ar numcpus Oc Ns Oo Cm ,sockets= Ns Ar n Oc Ns Oo Cm ,cores= Ns Ar n Oc Ns Oo Cm ,threads= Ns Ar n Oc Number of guest virtual CPUs and/or the CPU topology. The default value for each of From nobody Mon Nov 3 23:27:42 2025 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 4d0nnB6VbHz6G13Q; Mon, 03 Nov 2025 23:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0nnB4nBxz3kr0; Mon, 03 Nov 2025 23:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762212462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Adm9zHiamGj5bKYMgjKbCIhfiTGIbuaLOATcTzfFpcA=; b=TN5M9Ezb9NKk5zEaN83CB1g5pzAfWaqEMKfEjX/S11j08qvtk6Nzq75aSXw7mxHooPK6MN iGZLuqGtYAg2aLCHibnxlm91QdhB+IeZDcGKbmWsMevPIFvY1qSGNHBvON5J413lgSsNoQ U4wKW9K1BYl1dL0lkpP2+lOEwPVEJZz3RKEIpxS/FpqXvSAcIlg6knO9T7G7d4FOYuIsDO g92BGZUL/SD/hhuAAPIsTkVQZFk4ukVWnpxL+o+1Jeyv0n4VCy4FqEsme7U5mm9nYpzONi 1RJQBC1W+Z9ruWeroex01rs8jXw7sgGyb8Id41Eapr60y77kLnWiF8hepCMjVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762212462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Adm9zHiamGj5bKYMgjKbCIhfiTGIbuaLOATcTzfFpcA=; b=RwTtmJ4DmL1nOLoyNKktaEfULWRO0cLVQCY1f2oiaXsvCfBkgKnYWvM9VsweDtIHYGrPos UEn7AcrRZcHZG7CdnTYbRTdiPjdFE0r4aUc58qH9Dt6VBGUhs/eMdXVFTtL2XCeWZo5Qbl eQlYDfUc7ZZQmX3kTEYJgAznTPmtkxhBnJkpJHipCLgzeE+i8acFp8EjWVVlWSBda48sW5 fHGsES4d6IqfthTN9aaEckjvGk+P/Oa4eZSbRMgbKkXj8Y0GRmffUAUV+S0EwxB/iel1nx n+UByVfMt5Drj2rIqrX90rUEW8v4HAgHEIQytj86ThjIWDmYSI0Qe+n6soM1tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762212462; a=rsa-sha256; cv=none; b=bZF8QkTUZzLk0OpJErnKEmVFlSTrsSmHlfbRI2Pg9c37WeJShECO8xBhZLfd5HrN+EAL4+ h13bQVy0govj+WD5qvXzX0n7ZcV3DHF9auoOdm0dpGE3p3cJ680bChhCaKYyNTC75IDXQA ZC4RL+9janD+McHjjp1C7jzl8Oocm9SxggiZe4IujvHRLJD22YGmTRQ4qTOfGdAXK31znx HyLbwKDLHs9ei0QiGEAVIAmrNqGBsAOFC4daUZ6LXHM9iTfPVSAOn3OGHoCeeKEW7KwiZP g2T9JVs7Pcryr1Y2gTbCxOidXyGGRq3ikHhaJDL/wyMXxw8koNvCbJdd3Ct12Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0nnB449nzYhh; Mon, 03 Nov 2025 23:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3NRgur089420; Mon, 3 Nov 2025 23:27:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3NRgPt089417; Mon, 3 Nov 2025 23:27:42 GMT (envelope-from git) Date: Mon, 3 Nov 2025 23:27:42 GMT Message-Id: <202511032327.5A3NRgPt089417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 6d6132d8ca28 - stable/15 - gshsec.8: Fix list alignment, 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 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: 6d6132d8ca280649b6471f7c1045752828e3ebe5 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=6d6132d8ca280649b6471f7c1045752828e3ebe5 commit 6d6132d8ca280649b6471f7c1045752828e3ebe5 Author: Alexander Ziaee AuthorDate: 2025-10-30 15:49:31 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-03 23:27:12 +0000 gshsec.8: Fix list alignment, tag spdx MFC after: 3 days (cherry picked from commit 05d48584607221922539bb6917c9c118236d78d5) --- lib/geom/shsec/gshsec.8 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/geom/shsec/gshsec.8 b/lib/geom/shsec/gshsec.8 index d4477de3a71e..f80ab9384fe3 100644 --- a/lib/geom/shsec/gshsec.8 +++ b/lib/geom/shsec/gshsec.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2005 Pawel Jakub Dawidek .\" All rights reserved. .\" @@ -64,7 +67,7 @@ the rest of them. The first argument to .Nm indicates an action to be performed: -.Bl -tag -width ".Cm destroy" +.Bl -tag -width indent .It Cm label Set up a shared secret device from the given components with the specified .Ar name . @@ -92,7 +95,7 @@ See .El .Pp Additional options: -.Bl -tag -width ".Fl f" +.Bl -tag -width indent .It Fl f Force the removal of the specified shared secret device. .It Fl h From nobody Mon Nov 3 23:27:43 2025 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 4d0nnD0lNcz6G13T; Mon, 03 Nov 2025 23:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0nnC6MfGz3l1Y; Mon, 03 Nov 2025 23:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762212463; h=from:from:reply-to:subject:subject: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/aC92R2HgVY54m7c829bvDsLOmZNzdp8Xof/lOGwTA=; b=pe3onED3PJFxfdJ1iZ6oXk/6OR629EeaBoereWJx0Py/o6P2ZsNSnqPmv0rr8ZcwkVNKgi OhGvQMH+TylDix5J1FrDnKjg1vRGnkr/sySH17NsotovhlkAUrE0Yg42vEwDDHm+QejHkK y2L1Y/5lNTjGxp0jlk90O98FjGRrFd+5OaX5qjNF/orsIAuZgjF5vVztwz79I6aUkAkLbL cK4zKFfInOqaRjjwIhzcRdEA6QuRK1NxDutGrD+KZIdOKvp3XvSvceoKPBDzKMjY33hFtD WlA3jYaMpLacmWYt3nsODWTP5OzQmzarZFmE7vpeF6CJi5nwgJYldV/mbOzJfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762212463; h=from:from:reply-to:subject:subject: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/aC92R2HgVY54m7c829bvDsLOmZNzdp8Xof/lOGwTA=; b=UgSXY3Hk+ch4bCJPv7MUzExAUioolTCbBz8/5hl3GnpqVqk/HoBgEZvwQF8yI12imW/EuB Mzn4ooMczUTQGXQ8dVfeg+VO5IFyePgmQf7dCDNwlfMTVnz41F8oPiog0/958OwJMmNRTB 5Gp5uXCF3h6CgwlfagooDrg6Inf9/SRh9VjVoDx5dYsWUeEa70d1kEkYd7oqlkpZ4ZxhTr rvs1D4lJ7ogpD2Z9cf5I1TBv3ueVHVqgMeODWSRxSwKq+8LpeTZrll1CCWobKAo3FdLTDd 06uxep3fd5HzPi0yDCL4TAQZzVUSzSf8BsFtR+2kYr++4NQBgiZdC1VltN5E6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762212463; a=rsa-sha256; cv=none; b=CyEV8OqduiCgfyshH+sqyurV03LUnhZCcEX0zG+gwySweFlVKkMJXmmxIaswiOAbjrd5+V 8zWyMi8QbYhtpIcKBP3g2tCRQhbbOlqk7szhePedmt8qs4t44XvszRpYWTqqlnTrbSUv5+ n6J2QkmJh3iu1bk8b+7M38ehr+8/FADNt5/s4CXStHG/WxNBn/9BOqyr/MZjANunLQkgQr p/z5Xtl/tMv5uwRvCeXG4BD6a4U+b4azxBu7krpXUSz2DJPM3laClmO2FuwERkNtjiRlwc VDwvBcCK2amQ+5ZeMVOd1j7BQlLvE+5XS4uquZyR59Da7w028+//pXsnBTrosw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0nnC52flzY9b; Mon, 03 Nov 2025 23:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A3NRhu3089456; Mon, 3 Nov 2025 23:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3NRh1w089453; Mon, 3 Nov 2025 23:27:43 GMT (envelope-from git) Date: Mon, 3 Nov 2025 23:27:43 GMT Message-Id: <202511032327.5A3NRh1w089453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: e2a87c08171a - stable/15 - ifconfig.8: Mention max name length List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: e2a87c08171acd5c3a037c1dd74a5504ff9cc881 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e2a87c08171acd5c3a037c1dd74a5504ff9cc881 commit e2a87c08171acd5c3a037c1dd74a5504ff9cc881 Author: William Carrel AuthorDate: 2025-10-30 18:39:29 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-03 23:27:19 +0000 ifconfig.8: Mention max name length PR: 289113 MFC after: 3 days (cherry picked from commit 832cd05905980d0f6547bf02745b054c1f4af1eb) --- sbin/ifconfig/ifconfig.8 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index bf9a032d8c58..481181d3d5d2 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -630,6 +630,9 @@ This is useful for devices which have multiple physical layer interfaces .It Cm name Ar name Set the interface name to .Ar name . +The +.Ar name +may not be longer than 15 characters. .It Cm rxcsum , txcsum , rxcsum6 , txcsum6 If the driver supports user-configurable checksum offloading, enable receive (or transmit) checksum offloading on the interface. From nobody Tue Nov 4 00:30:04 2025 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 4d0q9913L2z6G5dQ; Tue, 04 Nov 2025 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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0q9874DGz3r8S; Tue, 04 Nov 2025 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=1762216205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAFV6uErMF/Vw1kGj4BFfLKY1L9jJ6YzDlD5WZCf9O8=; b=dLZ1quLXWloz50OqAs2QW6hcrbZ2U7Nabh+1BSHeGsS9TlluDaWRfDryU3VHDoyxw5hl+J GH7VqGjxaRx9ouyGBC6pmmbPErsO4cbLCxP/UCy05FU+t91c2m36G26DTBPmjZAPtl24CY /KO19yVf1FNBEYc7QWBwQeLLF5QcnFkChryk14EkN6baPo6yjdFc+gqTg8iZQOyYhSiebs jFiV5icIbJIpGtOVxyHLB3X91o4GIKN/1+EkQ/33M6HszxfTsP4I0LM1mB4WBBJX9/2R+D 0rrkx6US2KKwiYVQ8UdtWTyD7IYg0Kx1qIH2KaRroBk89el1nCY+7+gyqT9ACw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762216205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAFV6uErMF/Vw1kGj4BFfLKY1L9jJ6YzDlD5WZCf9O8=; b=JKX6Q7zvdU6ae7HS4WC2WK5DOIx+zVUNrEmmrALCmh42Fof31SGh4aODMydOgHvzUE3B+X D79sVfmRws9BPtg/04kRFbuECS9m2rQJotMkCa6Kffqit26ScmQ9wiQazM9IeWWXIlZHCU qAMbGoA6R850fHuai4FDJmDI3Z3QsRxgUqUHJX0nwh4S3uhJmJLjeCP7pD+qB8wH6ZzR6I RGUrZYXroxWsfObPVp3mjB4o4X/nbkXLsk09v31hDxnuu1dEiFEEPYvA70JpThGUOeqeQM UxhXRbjj4Rcjgnl8rofpNNVyguK34ILYEOdK86WvCSeCkPtm5VnHmOuZABgEHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762216205; a=rsa-sha256; cv=none; b=h8Ea466vWzQskUjMrXyCkCiZLyrZFo8TDjOVrS9VuoDiltT+yLagFwSjV3X2ogZGKnJWYZ iqcpoa+z5daIjAizPIpaweWr3uK6EJ1wBSiaER9iO5sEMPtlzRBzeD0Dbnrwzdmwd+DVdp WeWubYLCwlo4ci24f2UQ57kzcXgHhpLCt5zJ/ADKi7aNclFo4SbBjTfQ20PgSWJrq1EpPy rd1Y5BIzFur1vAG04fD/frf88xm1Nn7YrSgWaB9cyuPkfVTeKJlJ5banBnsw/KRVSPSuAN iqCpMb0Lk9oKzgamO9v6sOGAK6fHlb98QARmY9qR6Q3xyAGbyOBhhQ5sQIjzeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0q986GnZzZkG; Tue, 04 Nov 2025 00:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A40U4Oo005497; Tue, 4 Nov 2025 00:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A40U4Zg005492; Tue, 4 Nov 2025 00:30:04 GMT (envelope-from git) Date: Tue, 4 Nov 2025 00:30:04 GMT Message-Id: <202511040030.5A40U4Zg005492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 144529148065 - releng/15.0 - nvme: Add handling for bar5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 1445291480651dc5ee53217632dbdcc0d7eaad66 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1445291480651dc5ee53217632dbdcc0d7eaad66 commit 1445291480651dc5ee53217632dbdcc0d7eaad66 Author: Jasper Tran O'Leary AuthorDate: 2025-10-28 20:43:35 +0000 Commit: Colin Percival CommitDate: 2025-11-04 00:29:52 +0000 nvme: Add handling for bar5 The NVMe spec allows the Table BIR (TBIR) and PBA DIR (PBIR) to be 0, 4, or 5. The existing NVMe driver basically only has support for 4, perhaps under the assumption that BAR4 is 64-bit and also occupies BAR5. This change adds support for BAR5, covering the case where BAR4 and BAR5 might both be present and 32-bit, where the Table BIR might be 4 and the PBA BIR might be 5, or vice versa. The NVMe spec (in the SR-IOV section) also permits VFs to use BIR=2, so I haven't added stricter checks on which BIR will be permitted by the driver. This enables FreeBSD on Google Compute Engine C4 Machines. Approved by: re (cperciva) MFC after: 3 days Reviewed by: imp Sponsored by: Google Co-authored-by: Matt Delco Signed-off-by: Jasper Tran O'Leary Differential Revision: https://reviews.freebsd.org/D53140 (cherry picked from commit 7b32f4f0a7fe9b1b2f5a3905ca15f656713255ad) (cherry picked from commit 6c321dc15d5234742c6452e975f41f4a24b52e1d) --- sys/dev/nvme/nvme_ctrlr.c | 9 +++++++-- sys/dev/nvme/nvme_pci.c | 48 ++++++++++++++++++++++++++++++++++----------- sys/dev/nvme/nvme_private.h | 6 ++++-- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index fc912c1342f4..6ed9cb33f991 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1746,9 +1746,14 @@ noadminq: bus_release_resource(ctrlr->dev, SYS_RES_IRQ, rman_get_rid(ctrlr->res), ctrlr->res); - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } bus_release_resource(dev, SYS_RES_MEMORY, diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index c07a68d2f0dc..cecb05ca0a92 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -152,11 +152,15 @@ static int nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) { ctrlr->resource_id = PCIR_BAR(0); + ctrlr->msix_table_resource_id = -1; + ctrlr->msix_table_resource = NULL; + ctrlr->msix_pba_resource_id = -1; + ctrlr->msix_pba_resource = NULL; ctrlr->resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, &ctrlr->resource_id, RF_ACTIVE); - if(ctrlr->resource == NULL) { + if (ctrlr->resource == NULL) { nvme_printf(ctrlr, "unable to allocate pci resource\n"); return (ENOMEM); } @@ -166,15 +170,32 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; /* - * The NVMe spec allows for the MSI-X table to be placed behind - * BAR 4/5, separate from the control/doorbell registers. Always - * try to map this bar, because it must be mapped prior to calling - * pci_alloc_msix(). If the table isn't behind BAR 4/5, - * bus_alloc_resource() will just return NULL which is OK. + * The NVMe spec allows for the MSI-X tables to be placed behind + * BAR 4 and/or 5, separate from the control/doorbell registers. */ - ctrlr->bar4_resource_id = PCIR_BAR(4); - ctrlr->bar4_resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, - &ctrlr->bar4_resource_id, RF_ACTIVE); + + ctrlr->msix_table_resource_id = pci_msix_table_bar(ctrlr->dev); + ctrlr->msix_pba_resource_id = pci_msix_pba_bar(ctrlr->dev); + + if (ctrlr->msix_table_resource_id >= 0 && + ctrlr->msix_table_resource_id != ctrlr->resource_id) { + ctrlr->msix_table_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, RF_ACTIVE); + if (ctrlr->msix_table_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x table resource\n"); + return (ENOMEM); + } + } + if (ctrlr->msix_pba_resource_id >= 0 && + ctrlr->msix_pba_resource_id != ctrlr->resource_id && + ctrlr->msix_pba_resource_id != ctrlr->msix_table_resource_id) { + ctrlr->msix_pba_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, RF_ACTIVE); + if (ctrlr->msix_pba_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x pba resource\n"); + return (ENOMEM); + } + } return (0); } @@ -200,9 +221,14 @@ bad: ctrlr->resource_id, ctrlr->resource); } - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } if (ctrlr->tag) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 52e9fcbbebcd..a425a6a5ad62 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -235,8 +235,10 @@ struct nvme_controller { * separate from the control registers which are in BAR 0/1. These * members track the mapping of BAR 4/5 for that reason. */ - int bar4_resource_id; - struct resource *bar4_resource; + int msix_table_resource_id; + struct resource *msix_table_resource; + int msix_pba_resource_id; + struct resource *msix_pba_resource; int msi_count; uint32_t enable_aborts; From nobody Tue Nov 4 00:53:23 2025 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 4d0qh34hG9z6G7Sb; Tue, 04 Nov 2025 00:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0qh346K5z3v53; Tue, 04 Nov 2025 00:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762217603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tMTAfQykr2f7W1kkVHebbVmcMxN63kunBGH2Lpx8e+c=; b=kIWy6UP8TFVzuhkwzRy8UIbLdWXvPspL5kYeiBUdzmODnjUUOu1V7iA2DEZo7cqV8dgYNU RNG0FZbvnJPGZJIuVaTWy3FShRLLi3/BX/JSJVET6pHTPD0Zg+Gf8G5efvkVnvbuaC67Sx c3waqXdY8xTnM0kCBRg6zQmpIUuCM/kSk6gXRYTkv2v+nJVk6yTcXZgs20XlSY3w7h87yo dyCkByEJY3uK3BLcy0eqk7b76Vz3+7P8EMifDY5BrxXi/HKYXuNWVK0kwcjQjsBp/kzq2c lCgg/NEcQXik1tFBf09YraZQLn2Fe63++ivjHEVlshxuoSeIL3qOyK9oqJnWzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762217603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tMTAfQykr2f7W1kkVHebbVmcMxN63kunBGH2Lpx8e+c=; b=ReKNg8vVnZfNXPgDsEpxs7qkBGklR4kQQ0P+zS3bve0Ha+ClWACZQQ6MxbMJ3YULvJStXA WWwSfH4aNpk/5mLym83exrnkuKn7dGgagfwnCzoUKga3YK4CoECsPzMrlSVEeA0CCoFaiG W+YVEoM73QJTWcR9jXHqz8OQyFOnIzy9aZllMxX66gIK7n/QBuOkp+e0RNVPCE+ZwiD8uE RV0dE7T1HPVRDvUz1k4Cw8Yirq1XJBpMjaV6NuYCyGCNYUg2CAYan8AG2G4qpIV0czia9M 4fHVCs/gDjPaSvo1SuFGrrL9S8pHuyVyBLrxDjkMDGeDo8wVB7mavek/pg8Pvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762217603; a=rsa-sha256; cv=none; b=lR28fhNeGj22f3aYnyrGy0hM8jcLaiSnLCybtTBAE9J15antNpvLtxiugJi/VV9nkQ5KQp uaUaDVTEpzuN310JoHdRqpjArBLrQnCnuJ5kclU4jyDCSDblZdNEF+KLY//ePNyHOsPjYW pQ6nlq5E5wj+KyddmXFz+9l9mv1I8N3krh4MboDlr6meI8ie2ijeLTYEdyAkgRwBDt9i51 632OJ933SwMvNst17Ghg/CIvx6rh5Zg8AeRvoliO946qIzokxAz8Sno8Zj3iYaEwLTa+xA a/w3XcfwBXFx3b0XII7EcX/3QtT1w4li29++24lFr6v1v136uRIDuIwoTtW4qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0qh33FRLzbVY; Tue, 04 Nov 2025 00:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A40rNQY057313; Tue, 4 Nov 2025 00:53:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A40rNMt057309; Tue, 4 Nov 2025 00:53:23 GMT (envelope-from git) Date: Tue, 4 Nov 2025 00:53:23 GMT Message-Id: <202511040053.5A40rNMt057309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 21d55ae111aa - stable/15 - ipfw: pmod: avoid further rule processing after tcp-mod failures List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 21d55ae111aada3c5426632253ad8df9103d3423 Auto-Submitted: auto-generated The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=21d55ae111aada3c5426632253ad8df9103d3423 commit 21d55ae111aada3c5426632253ad8df9103d3423 Author: Kyle Evans AuthorDate: 2025-11-01 17:34:11 +0000 Commit: Kyle Evans CommitDate: 2025-11-04 00:51:57 +0000 ipfw: pmod: avoid further rule processing after tcp-mod failures m_pullup() here will have freed the mbuf chain, but we pass back an IP_FW_DENY without any signal that the outer loop should finish. Thus, rule processing continues without an mbuf and there's a chance that we conclude that the packet may pass (but there's no mbuf remaining) depending on the rules that follow it. PR: 284606 Reviewed by: ae (cherry picked from commit c0382512bfce872102d213b9bc2550de0bc30b67) --- sys/netpfil/ipfw/pmod/tcpmod.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/netpfil/ipfw/pmod/tcpmod.c b/sys/netpfil/ipfw/pmod/tcpmod.c index 0338dc792c64..50074ee98cca 100644 --- a/sys/netpfil/ipfw/pmod/tcpmod.c +++ b/sys/netpfil/ipfw/pmod/tcpmod.c @@ -57,7 +57,8 @@ VNET_DEFINE_STATIC(uint32_t, tcpmod_setmss_eid) = 0; #define V_tcpmod_setmss_eid VNET(tcpmod_setmss_eid) static int -tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) +tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss, + int *done) { struct mbuf *m; u_char *cp; @@ -72,8 +73,10 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) * TCP header with options. */ *mp = m = m_pullup(m, m->m_pkthdr.len); - if (m == NULL) + if (m == NULL) { + *done = 1; return (ret); + } } /* Parse TCP options. */ for (tlen -= sizeof(struct tcphdr), cp = (u_char *)(tcp + 1); @@ -114,7 +117,7 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) #ifdef INET6 static int -tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct ip6_hdr *ip6; struct ip6_hbh *hbh; @@ -142,13 +145,13 @@ tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET6 */ #ifdef INET static int -tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct tcphdr *tcp; struct ip *ip; @@ -162,7 +165,7 @@ tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET */ @@ -206,19 +209,23 @@ ipfw_tcpmod(struct ip_fw_chain *chain, struct ip_fw_args *args, switch (args->f_id.addr_type) { #ifdef INET case 4: - ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1), + done); break; #endif #ifdef INET6 case 6: - ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1), + done); break; #endif } /* * We return zero in both @ret and @done on success, and ipfw_chk() * will update rule counters. Otherwise a packet will not be matched - * by rule. + * by rule. We passed @done around above in case we hit a fatal error + * somewhere, we'll return non-zero but signal that rule processing + * cannot succeed. */ return (ret); } From nobody Tue Nov 4 00:53:32 2025 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 4d0qhD37xYz6G7kP; Tue, 04 Nov 2025 00:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0qhD2jSFz3tmT; Tue, 04 Nov 2025 00:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762217612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05gIk75sXEDqr9eMlxmTF5q9UKJC/XNHe28ipPUTdz4=; b=WK98gouSp4xR+OI4+cAD+JhZFKZH3TB4yZwmURB/iOR9HkkIWLhSt8AcwWjNXbiaeYcG6G elnJTHUI/JohcZoXzFEW32K7HY5jqG+GP/+FIIYl6gN6l0jb/vH3ibeMLkNyTIklLaKKuI u2SJuTCoZsfZfCEXNYcPCVs08nhYswFsdOSy4FfOuvrxic9vSztrLJ/2LbLmh7EnkwCeXN R683QREjLxQYKMvLts7bOrQOHBWIU5DVEEmwp/wQ9vJy4SVQdoso79hQL+VuBDHat2M8if q0vr1cJq1UeqhJVFk7+beMm1T0OmQLX4R+7bUxMSN9+Wf3vxubJJZLUAazk32A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762217612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05gIk75sXEDqr9eMlxmTF5q9UKJC/XNHe28ipPUTdz4=; b=yduAp1aaYXPEzENv9hmKBdU1dfZS/uTaaXR4vhZuOcQeP1iD34zmLdkwOT4qPnpg8DCwiN hzdO91IkaYXFTSQYao2zelZH9asR92VeD04wdOecGGO8QDw/ZnvC9C+xB2lclV/tuKgW+L ADNdvVRJ4h7/mYe1jhyOgN1OiKY4i8jdJ+5UOkgpPSFmxa0gFcPITKy4ukLwosbOkq4GoK kzAl2x3FE0Va6LavKLbIo3Me242x7PRzufZtPtO85JcUEvWEasoQsajJK1hbE6TrsLAHD6 igoxI3oq+YcAiY92s+DjUtExyi5OAnoTGWPJhFpS2/MvYX3Hk8KvfAKYX0XMgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762217612; a=rsa-sha256; cv=none; b=YBCRIfoC17PwL7yXAZpYscuC5VB6oCC7k+bQCYQln+icu2mYqCYira4zzfkdZpmPqVXgoT WxBl0AN2MUqI/73bVsQrPKeYLfL/rf4eYJsvfKA508df1x7wAHvwwVa5GrmAyfz/nU3CLr KAS/WFPAhA6rc6mDyxUFgpKgdXyufWPQhErKzAWvOgrPe3bstIU3gZp0/UhbT9xCECr/KP 6MlZz/tTAD48eW9bF8h81lepfI6MsF7HhBvSRovyeMj/7eJg8F1a42lz+rOZYBGR1l9zMy 565UU1rZZkQYmi5ABBzg/djP4TBSlHJjYb9qEqIIp8uMD449FWmSEy1mwqfBfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0qhD29XDzbVZ; Tue, 04 Nov 2025 00:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A40rWQW057476; Tue, 4 Nov 2025 00:53:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A40rW0o057473; Tue, 4 Nov 2025 00:53:32 GMT (envelope-from git) Date: Tue, 4 Nov 2025 00:53:32 GMT Message-Id: <202511040053.5A40rW0o057473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: deb684f9d1d6 - stable/14 - ipfw: pmod: avoid further rule processing after tcp-mod failures List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: deb684f9d1d6a3681e451d3af31f768c567f7dbe Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=deb684f9d1d6a3681e451d3af31f768c567f7dbe commit deb684f9d1d6a3681e451d3af31f768c567f7dbe Author: Kyle Evans AuthorDate: 2025-11-01 17:34:11 +0000 Commit: Kyle Evans CommitDate: 2025-11-04 00:52:54 +0000 ipfw: pmod: avoid further rule processing after tcp-mod failures m_pullup() here will have freed the mbuf chain, but we pass back an IP_FW_DENY without any signal that the outer loop should finish. Thus, rule processing continues without an mbuf and there's a chance that we conclude that the packet may pass (but there's no mbuf remaining) depending on the rules that follow it. PR: 284606 Reviewed by: ae (cherry picked from commit c0382512bfce872102d213b9bc2550de0bc30b67) --- sys/netpfil/ipfw/pmod/tcpmod.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/netpfil/ipfw/pmod/tcpmod.c b/sys/netpfil/ipfw/pmod/tcpmod.c index d7400f4fd5ed..138fefe22a98 100644 --- a/sys/netpfil/ipfw/pmod/tcpmod.c +++ b/sys/netpfil/ipfw/pmod/tcpmod.c @@ -58,7 +58,8 @@ VNET_DEFINE_STATIC(uint16_t, tcpmod_setmss_eid) = 0; #define V_tcpmod_setmss_eid VNET(tcpmod_setmss_eid) static int -tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) +tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss, + int *done) { struct mbuf *m; u_char *cp; @@ -73,8 +74,10 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) * TCP header with options. */ *mp = m = m_pullup(m, m->m_pkthdr.len); - if (m == NULL) + if (m == NULL) { + *done = 1; return (ret); + } } /* Parse TCP options. */ for (tlen -= sizeof(struct tcphdr), cp = (u_char *)(tcp + 1); @@ -115,7 +118,7 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) #ifdef INET6 static int -tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct ip6_hdr *ip6; struct ip6_hbh *hbh; @@ -143,13 +146,13 @@ tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET6 */ #ifdef INET static int -tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct tcphdr *tcp; struct ip *ip; @@ -163,7 +166,7 @@ tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET */ @@ -207,19 +210,23 @@ ipfw_tcpmod(struct ip_fw_chain *chain, struct ip_fw_args *args, switch (args->f_id.addr_type) { #ifdef INET case 4: - ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1), + done); break; #endif #ifdef INET6 case 6: - ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1), + done); break; #endif } /* * We return zero in both @ret and @done on success, and ipfw_chk() * will update rule counters. Otherwise a packet will not be matched - * by rule. + * by rule. We passed @done around above in case we hit a fatal error + * somewhere, we'll return non-zero but signal that rule processing + * cannot succeed. */ return (ret); } From nobody Tue Nov 4 00:53:36 2025 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 4d0qhK1tfnz6G7Sh; Tue, 04 Nov 2025 00:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0qhK1HCnz3vJk; Tue, 04 Nov 2025 00:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762217617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wz4H9AB5uygJ+qrdo2O0AU9XMZBNg2F289LQkQNfp8c=; b=fgXgS6AVhYRTQLX9lH6TH4sTyIN65IBpfqyZNJRPd5inLz51E9o9PX0I6TaLM+ZLx0kzDP 3+oy+uCXj9yO14gFO0QB1HrWFiRFVEI5XRIl4tBuDTmO1MJPMHYfGVp8FD5WjDPtvNLL4C 3b3Kk3R0EYWjSSeA8L4nwYsSSambg0zvStfhYkkrKR639lCLwcYjBncYS095yl/0aym2qy vhtlWxc8ZM7xvgLIL9ogusdQo3aHXIlTUJhwcYGI6FqlZPsj8AmMqGIN5kK+jpXYvU/ije rdsV4Sl5Hok2Mc1OLFymBsu7LHVDTSjmZ8HxjGozUscoYuiXDdstaerODvZ+xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762217617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wz4H9AB5uygJ+qrdo2O0AU9XMZBNg2F289LQkQNfp8c=; b=sKpR1zV///OsrtcG+TFWWUmA2xHJTU2Ta5ukXbCQsKbk4EI+lDGYLG5GLb7HmI+3mmbSbh oZ+FBzP3NTXY4oYovI/hHhoUI8DmUmb/BAltl1/QR830aHKljFxplTEKm7Ol//syH6yB3b ehGuDLO7aUxOztG7pm7hNkYo2FVN5NijIcAgNggLcslr9paVtOR1OXsd0GRpagu0k3kSxk 0Iv3TEB/eX5zlygEtBEx8TyHxNvfGGFyBg5fVtcnc/E/1x0w23dIpPV7F7EWUTAOIspoRK Yq+/A8OI+jebNj6tHlCiTZjYT31DeXRhZmeyDwmsbzcAqD20f+DqwW6DEVM7eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762217617; a=rsa-sha256; cv=none; b=Jmf7fCL3wO/WQ74gjJ8Re5ZwnTs0TpRP4BUryFNjxyRM/QCoVSV3e+gMrYrPd3s2FACJHA O9Ye/dlrXAb9/J7MdTKpASL/rK38yGjv2vdLjr4Ep89QUL/0k0EkytP7Nd8QhBWnoBch3u XJmLM95pk7nqNtSVUT+yJZKo4DJZoORZ7I/IhqXdGTnaC1dV8Ckh/z5Y1wtjgQfMubPGYQ hE9NNI8nWIuXqwXjYsi8ij+TbUdM2cTvZIDOEDRVFQpZNzDh5V1OPfa5ZXId+zogxvHvZY reUWFSW43re+qpnjUaMPgB0m9i9mUDl7uFGvYemqSm9UQkk6HluHDHg0AiiT4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0qhK0lNvzbyT; Tue, 04 Nov 2025 00:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A40ra5F057634; Tue, 4 Nov 2025 00:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A40ra2s057631; Tue, 4 Nov 2025 00:53:36 GMT (envelope-from git) Date: Tue, 4 Nov 2025 00:53:36 GMT Message-Id: <202511040053.5A40ra2s057631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 94360584542a - stable/13 - ipfw: pmod: avoid further rule processing after tcp-mod failures List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94360584542abc49a1d947844cf4d8ca1369d4df Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=94360584542abc49a1d947844cf4d8ca1369d4df commit 94360584542abc49a1d947844cf4d8ca1369d4df Author: Kyle Evans AuthorDate: 2025-11-01 17:34:11 +0000 Commit: Kyle Evans CommitDate: 2025-11-04 00:52:12 +0000 ipfw: pmod: avoid further rule processing after tcp-mod failures m_pullup() here will have freed the mbuf chain, but we pass back an IP_FW_DENY without any signal that the outer loop should finish. Thus, rule processing continues without an mbuf and there's a chance that we conclude that the packet may pass (but there's no mbuf remaining) depending on the rules that follow it. PR: 284606 Reviewed by: ae (cherry picked from commit c0382512bfce872102d213b9bc2550de0bc30b67) --- sys/netpfil/ipfw/pmod/tcpmod.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/netpfil/ipfw/pmod/tcpmod.c b/sys/netpfil/ipfw/pmod/tcpmod.c index d7400f4fd5ed..138fefe22a98 100644 --- a/sys/netpfil/ipfw/pmod/tcpmod.c +++ b/sys/netpfil/ipfw/pmod/tcpmod.c @@ -58,7 +58,8 @@ VNET_DEFINE_STATIC(uint16_t, tcpmod_setmss_eid) = 0; #define V_tcpmod_setmss_eid VNET(tcpmod_setmss_eid) static int -tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) +tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss, + int *done) { struct mbuf *m; u_char *cp; @@ -73,8 +74,10 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) * TCP header with options. */ *mp = m = m_pullup(m, m->m_pkthdr.len); - if (m == NULL) + if (m == NULL) { + *done = 1; return (ret); + } } /* Parse TCP options. */ for (tlen -= sizeof(struct tcphdr), cp = (u_char *)(tcp + 1); @@ -115,7 +118,7 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) #ifdef INET6 static int -tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct ip6_hdr *ip6; struct ip6_hbh *hbh; @@ -143,13 +146,13 @@ tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET6 */ #ifdef INET static int -tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct tcphdr *tcp; struct ip *ip; @@ -163,7 +166,7 @@ tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET */ @@ -207,19 +210,23 @@ ipfw_tcpmod(struct ip_fw_chain *chain, struct ip_fw_args *args, switch (args->f_id.addr_type) { #ifdef INET case 4: - ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1), + done); break; #endif #ifdef INET6 case 6: - ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1), + done); break; #endif } /* * We return zero in both @ret and @done on success, and ipfw_chk() * will update rule counters. Otherwise a packet will not be matched - * by rule. + * by rule. We passed @done around above in case we hit a fatal error + * somewhere, we'll return non-zero but signal that rule processing + * cannot succeed. */ return (ret); } From nobody Tue Nov 4 01:22:03 2025 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 4d0rK75gKbz6G9pW; Tue, 04 Nov 2025 01:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0rK73hzyz41LT; Tue, 04 Nov 2025 01:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762219323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qGyFTHfSMtBhqx/ochH8bv1O9O9t/aV5k9WrJg85TaU=; b=ILAKzmutwBoVXkSerdkUDQqhUZg8RCkQbwCDojjTTat5cx7egDHGu2iM+0HRs/k84XNPif HXmc5/1uvrAx9iKkv0Rj3gDyLi53WlaFEzWoU7rmFsRBSOxIXjf4+Dc79cWOXXiSP19Lwq CSQDWGcU+QYFYQPAh4gDTFGxHKHRDR/UN0FJZk0h4ZHbDm1Ts7QJMZ5xv/LpBZk/SFLYvr XocY2m4aPd7GTvNVconuAEevT519B4fpzZolc4ysD3UTl4XN7H+j6DbR45vahm6T/JD18J 5CvDvWihnwAn++hA1B8pnQfbUdVdifuq3ZDJUqOo2CqQPj6O8qePyDNHvxdBvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762219323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qGyFTHfSMtBhqx/ochH8bv1O9O9t/aV5k9WrJg85TaU=; b=EN6N7leADbPjgGKz8aJ60WfY8BxpA2GShMIiTPnci63rMSXluwluA+C7rS1D5YPAno8zDd HOMUIBy6lYAVxJ5GZUiDrUERUNm29jZVcU4eG73MD5HaW4wtjasGYY7RLNwYrDuoz5OBLL DRUbE6lvxLF6JddEib0S66co69unh0UVbLxC5PdhQPX70E2pBeaTJ4TZWaYEsquJIxt/Er zlxIO1GkcfVgIf6PGr4l9jZYX8IPkikFdY7RoCDoO1Deoxa9ZYlHK/NLMl1IVKeD2n4emL iFfjkIIasBlDMSiD8UnJMzGKcNK/CN6wo3V8Jof9Bn/0uq1JZ2UK+tvq6zFE7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762219323; a=rsa-sha256; cv=none; b=G7DV8I0JI38yeBcMxXc0K5UMjSYeXffT8Q1D268NQC0fneFsOVQ1+7J7VRKpdQG3qCPyYn FP/Zb5ywc6ASLKCimpjCbd5KD9lHC4dWb2Zexc2jhV3AySz0su7bxExfti/gKuoSYywRKR qBWLirESjtEUVcjV+MJjAZVnYAaCV418D7dNG953RXM5n1OhCCuwzWiUFRQwHAB3JMzbtr +sDvH4MDWrpl8rwpDIs9Sz8VVZ8ciRxXwp62yOGYPeMXyTNVG6DZnsuC2GDJ1r5wMtGrvl jhZX9qaI7jbIvAuPNcvKP+H38tDog1xISM3YFZ9I8ceuMi+4I747+aniUBeSuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0rK73H8YzcX7; Tue, 04 Nov 2025 01:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A41M33R011606; Tue, 4 Nov 2025 01:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A41M37i011603; Tue, 4 Nov 2025 01:22:03 GMT (envelope-from git) Date: Tue, 4 Nov 2025 01:22:03 GMT Message-Id: <202511040122.5A41M37i011603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 92a081bc2d1a - stable/15 - static_libpam: Don't install pam.d.5 twice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 92a081bc2d1ad2c06749d5fbcf31697db05a2001 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=92a081bc2d1ad2c06749d5fbcf31697db05a2001 commit 92a081bc2d1ad2c06749d5fbcf31697db05a2001 Author: Lexi Winter AuthorDate: 2025-11-01 13:38:26 +0000 Commit: Lexi Winter CommitDate: 2025-11-04 01:12:11 +0000 static_libpam: Don't install pam.d.5 twice static_libpam's Makefile includes libpam's Makefile after setting some variables (like MAN) to empty to avoid installing the manpages twice. After commit 031e711647c3, it neglected to do this for MANNODEVLINKS, causing pam.d.5.gz to be installed twice. This is harmless for installworld, but breaks some things that rely on METALOG (NO_ROOT installs) since it causes two METALOG entries to be generated for the same file. Fixes: 031e711647c3 ("packages: Install development manpages in the -dev package") MFC after: 3 days PR: 290708 Reported by: emaste Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53512 (cherry picked from commit a1806e6ff37a606277ab9657b951e918164e9f63) --- lib/libpam/static_libpam/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libpam/static_libpam/Makefile b/lib/libpam/static_libpam/Makefile index 8830f09ef0da..703e6a4a2f00 100644 --- a/lib/libpam/static_libpam/Makefile +++ b/lib/libpam/static_libpam/Makefile @@ -45,6 +45,7 @@ MAN= MANNODEV= INCS= MLINKS= +MANNODEVLINKS= MK_TESTS= no # From nobody Tue Nov 4 01:22:04 2025 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 4d0rK90myfz6G9js; Tue, 04 Nov 2025 01:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0rK84YkWz41B4; Tue, 04 Nov 2025 01:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762219324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=St6c4GQPdOgq0WbW5qK/zKMbaEe95BW2GPUoN7X3iWk=; b=I5SsJtYPP6qoierojhfbUacJQGIRAiPA1dsnlyFnFjeXgwkdA4FWvq0ANm0e7GBWEW0GeK WwHjYIfGTT9yw82Z30oXA2ZfVNdGmULUOGa/HKPVgSa2dEzeCff3G1BWMXfqpYCT5Q0GY4 broi1KS25KZZSoc9yO6TUVfpK3gaLerUrGIsCDAyElZJHr4itDVtQbcbLZReOk1Z7dTlrv bPSDr3ci/ptmNwrRxDFRXffaPA5frk3QU69EvLba24VCM4RSjEbmuPQEvd8/U1AxsJZDSK V473+7MjxMJSAXEMsuDnZsJsFYUYwO+AjDeEQekLSISQAJEbnR4ehZ99l/vLoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762219324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=St6c4GQPdOgq0WbW5qK/zKMbaEe95BW2GPUoN7X3iWk=; b=tptkG6SgnQWw2u1DK3GBz89JMKlBYRigV1p3BKdqE4WIJ+nUSH17OS2uOQfMnhq108eviF q4uCFEZCKU0D8njcr93CNHdWrv5WiAxxBPKRP8HrMNS2OJj9oi4ADMyF2gC5CU2tv8vzUf wbrMe9ByTfyWokrizHr2Qz+vrSDoswwpi8VhiC1KLpWJkdt6dl4FsNK9ixmc2/wIc2nZ9y 2VGLxYbrjcNEavEE/RRLS+KI8x81nyakwuLoCH7xf4R2ZAmOh98QDOxn/Pt6yr8deKwH0z CHNgj4VWNT4Fong0XRMJzBtrl2xHw/L87eh1s+9DlAQPWoLJLNa0PmxtfPbf8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762219324; a=rsa-sha256; cv=none; b=trcv6x8rAOxSTFvvuocnw8CRHu3GW0CpihEkicQ+7diCrImRqw5cmLoUP9mQFhLwt8piqz 0VdK3bidSlCxTWHwymzgcxHpUW2ZwEs59yctQcvCKB7mdGnn2dqhDBbw5lbTsDKIlsjwQW eUEm6bvA296ekWwQBp2/hjUKple6ijX7VFeJ0cFZaGpB7dcAO0ab5+ze9xn1zIHCmDDjf0 V5wRIyvalusRCUfxVDTiKb1un9uTXZNpVVuVHv+g8vx/2uwx2nUvSPoi1TR3uMjlr8rMwO 5dwmIwCtpnjk9YTuo6CMK7dIiWB/XxvH9Z+J9pCDz12+IAzicZTGDwLeaJqx/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0rK83wxrzc0k; Tue, 04 Nov 2025 01:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A41M4xr011644; Tue, 4 Nov 2025 01:22:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A41M4ti011641; Tue, 4 Nov 2025 01:22:04 GMT (envelope-from git) Date: Tue, 4 Nov 2025 01:22:04 GMT Message-Id: <202511040122.5A41M4ti011641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: fe2e53443377 - stable/15 - ifconfig: Fix invalid free() in ifbridge List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fe2e534433778c038138510ff6a8f07066e72703 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=fe2e534433778c038138510ff6a8f07066e72703 commit fe2e534433778c038138510ff6a8f07066e72703 Author: Lexi Winter AuthorDate: 2025-11-04 00:53:25 +0000 Commit: Lexi Winter CommitDate: 2025-11-04 01:12:30 +0000 ifconfig: Fix invalid free() in ifbridge parse_vlans() does 's = strdup(str)', then calls strsep(&s, ...), then attempts to free(s) at the end of the function. For the success case, this is fine (s is NULL, so it's a trivial memory leak), but in the error case, we will attempt to free an invalid pointer. Fix this by storing the original return value from strdup() and freeing that instead. MFC after: 3 seconds Reported by: David Gwynne Reviewed by: zlei, kevans Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53545 (cherry picked from commit 0899f7a3b791ed4878e7cb3859636ec980c76832) --- sbin/ifconfig/ifbridge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index eff443447c13..8bcf4a638adf 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -811,7 +811,7 @@ unsetbridge_private(if_ctx *ctx, const char *val, int dummy __unused) static int parse_vlans(ifbvlan_set_t *set, const char *str) { - char *s, *token; + char *s, *free_s, *token; /* "none" means the empty vlan set */ if (strcmp(str, "none") == 0) { @@ -829,6 +829,8 @@ parse_vlans(ifbvlan_set_t *set, const char *str) if ((s = strdup(str)) == NULL) return (-1); + /* Keep the original value of s, since strsep() will modify it */ + free_s = s; while ((token = strsep(&s, ",")) != NULL) { unsigned long first, last; @@ -856,11 +858,11 @@ parse_vlans(ifbvlan_set_t *set, const char *str) BRVLAN_SET(set, vlan); } - free(s); + free(free_s); return (0); err: - free(s); + free(free_s); return (-1); } From nobody Tue Nov 4 13:04:52 2025 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 4d17w501G8z6G2gd; Tue, 04 Nov 2025 13:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d17w45q12z3t5G; Tue, 04 Nov 2025 13:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hefQmmsQV+cdZ7/jKOaQ7f7rqoSHefCEwbVOUMfbT7I=; b=chE+MTVEFlc2PrGkg14jEH4m/2m8EA0x5ymWTbbSlMNJkatHbRbY2BIqegLHQRPrWj7bcz wE7B7IoJRmL+k8winN6WAtWEUYWhdC/tjJFZtE+lgSbQFBpK52eqR/LfjUed4NWVkqv0dZ kS4XbvjzvRsfEfru8xuaf7IWgTBxdSpHK7u7gy6VvJkXVnvFyRNhW8FcGzgS/GgtdgU2Lm nGHxRj0COo2chnE3hHmE1QOpqf0Qujq3u7wIXsJcAJiu4bjpyfXja3e9sco4AQCboGibkj 6qTpPrNNDB4nyiZXs78RV6gHzgR3SBgXYDX5wbthnyiFpegwNNoni/sA0y5Cpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hefQmmsQV+cdZ7/jKOaQ7f7rqoSHefCEwbVOUMfbT7I=; b=D3jgnXeFWyrqm/AZNPfvyq0GflWHRZcvsz2izdoNgWEECy9tgwV0c4UYpf9jsGDg1p99SJ zvKzgMCkvAmTC86Nws9/8YdUznFIJNbG25cV4IMS0DYS3nJrdLspc9ZlTAUWXTaTGjOrDe mONnXFfOWPKPHnjJC52oyVeSf7XXhEONVXr749xpVt61pU9Rpf4uhKa4KYQLVnLVVXVF9d XdrQvDbYqgTTE9tTESgPi9nKRd4hEaVvWE5lx6NLEiQZJf/u9Dgf7hRr1jjg0NjntaeZ52 i3nySvKgTfch3pmW2MLORZL8+2/cvL3gMXBC6AR1dyA/9PpFWA9Vqg3+FO4jZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762261492; a=rsa-sha256; cv=none; b=ef7nGK9AIbrYV/MhnWD15QvAAQvP10MTMrlREEGBzOFbrg3ope4tTQ0o+7T+uujF01WPWw 7zqciA+oWAbwa8U3UdfGW0iRyMIVhY/UdsbNibbDwaPGrPrRTnw20Fo0yKIfgOloJi9dFh ZL0lGVuvqJv45QZ774tKgppPCJ/D7EO7CvM+CJGYh12d4rH/X6WXiDQblTRvk4a5roXb7O utRoXtdbLqUFBcKlVHvVM06u72yUZcvJXxjPi/WNhbAukwjQwKHSte79yxhl0866tMKOuV m0EeHzmQkh30Yw9Lp8hNYUTWNkZMU7AbUsjDvLmvL1CsB5ij+Nc5svsB0JkqFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d17w45N8XzySr; Tue, 04 Nov 2025 13:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4D4qUY034599; Tue, 4 Nov 2025 13:04:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4D4qSL034596; Tue, 4 Nov 2025 13:04:52 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:04:52 GMT Message-Id: <202511041304.5A4D4qSL034596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e533d2535b7a - stable/15 - net: Remove useless field annotations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: e533d2535b7af7e4dba7175abad507428761e8fb Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e533d2535b7af7e4dba7175abad507428761e8fb commit e533d2535b7af7e4dba7175abad507428761e8fb Author: Mark Johnston AuthorDate: 2025-10-27 16:27:55 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 12:46:19 +0000 net: Remove useless field annotations MFC after: 1 week (cherry picked from commit 500717311bff635dac12602a27d0dbca02cf9a2e) --- sys/net/if_var.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net/if_var.h b/sys/net/if_var.h index f2df612b19c1..961259bb0ca1 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -383,18 +383,18 @@ struct ifg_group { char ifg_group[IFNAMSIZ]; u_int ifg_refcnt; void *ifg_pf_kif; - CK_STAILQ_HEAD(, ifg_member) ifg_members; /* (CK_) */ - CK_STAILQ_ENTRY(ifg_group) ifg_next; /* (CK_) */ + CK_STAILQ_HEAD(, ifg_member) ifg_members; + CK_STAILQ_ENTRY(ifg_group) ifg_next; }; struct ifg_member { - CK_STAILQ_ENTRY(ifg_member) ifgm_next; /* (CK_) */ + CK_STAILQ_ENTRY(ifg_member) ifgm_next; if_t ifgm_ifp; }; struct ifg_list { struct ifg_group *ifgl_group; - CK_STAILQ_ENTRY(ifg_list) ifgl_next; /* (CK_) */ + CK_STAILQ_ENTRY(ifg_list) ifgl_next; }; #ifdef _SYS_EVENTHANDLER_H_ From nobody Tue Nov 4 13:04:53 2025 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 4d17w62Zgbz6G2mK; Tue, 04 Nov 2025 13:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d17w56Vnwz3tVB; Tue, 04 Nov 2025 13:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjfCP3+zqhLtbqcLwRxn8pCWYNAUF5BRd1aw/50BL58=; b=xT20ScjWdW2+lITFoV38O4f+r3YU8iGjCbhBFquSs3alqyYungyHDJmgRprZcnbnDi1d2r xe40N75imEkUiySNZgDooAGY942eM+kTTPShp2V7n/Z3gvja5Twc6HuT/A5L5nzAZ8j//1 uCiUWMHwBsRldXJL+DjWfMUbTaZlHwbUkIPysUCvSpRtLxo0EHs+iqtFWBItxbRMUF5ENw 44HhDOlDIoA5OVmD0eP8AjblLX4/MAdCaletzCBm1sFYFqOoFdgAUn9Mbp7giklICLRWXX CAbWN9zqLe9mE8QdFlx1NRCFkXiHqpbP/GknGmp7yPpGIe7Wu46nWaWneYMaFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjfCP3+zqhLtbqcLwRxn8pCWYNAUF5BRd1aw/50BL58=; b=AxuFX8jP7+grZAICsU/HQEmeDd8n3E+pptS5XG8d330u/Dmc93MG6a0nfvqS6f6aMKrl9x PhOWPPoJJPR+fSe6PIBT83l1lhVn4M+gX1+sPOfiiA5UXUeCI7A3CwE2MqHfE6gfFXlrqv ReFqUi4mU/htChBh8GuuOky0f7xCc8h+v+KHvzaL7P8fnBd1CVFEtlmAx+654vFcRA33hE vZmcxEmkOyPBGuazgt4vQFDpaYOXz0H2EFhX+IYWUh31kQqj46LDpDsT04TAemKJ+HN4uv eSnWffPRjn+oObch0GspfEDu1zbgy5haczSw3ohNVR6F5QUuGmX7x73R84Hvdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762261493; a=rsa-sha256; cv=none; b=qOXXu8K0BHx2y7Xlw7xqJqfGaPqJnvg/Sm7eVkeoMQSkhJqwNzqClGKBx+SdFepDnb9emi nonIcC8yPiwJRKVktF2XBnCbcXonfndhUNL7i+x+Z35xGH102NAgoNIryDdT6fc9KYbMwv F0ywxjKjCsUYPdRseWTmrOeo2VxyCoCkw6HOOz5Mcbw6S37pEtMXX94GuCbrmW5Fwv7Y2K azQYBQq1rnmdx9QtU/vIWQYDoDMxKavABc6nFn9GLsCCZpA0RWRgkY6jpbNJnXFDBWt6K/ WoJO3J+YKUI4Gxlwwz3BavOLLWga+Kih0thKeMzlPNCN4BvcflZdTz1GL3CpgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d17w561ZYzy3s; Tue, 04 Nov 2025 13:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4D4rpd034634; Tue, 4 Nov 2025 13:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4D4rPO034631; Tue, 4 Nov 2025 13:04:53 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:04:53 GMT Message-Id: <202511041304.5A4D4rPO034631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 008c674b9b77 - stable/15 - gdb: Improve doc strings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 008c674b9b77db5d88f8c339f7228dadc30636e4 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=008c674b9b77db5d88f8c339f7228dadc30636e4 commit 008c674b9b77db5d88f8c339f7228dadc30636e4 Author: Mark Johnston AuthorDate: 2025-10-27 16:28:20 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 12:46:19 +0000 gdb: Improve doc strings These are printed by gdb when requesting help for the corresponding function or command, so phrase them such that they make sense in that context. MFC after: 1 week (cherry picked from commit ef7b81340b8e0ad06584f364aa02105c03ca5f7c) --- sys/tools/gdb/acttrace.py | 6 ++---- sys/tools/gdb/pcpu.py | 2 +- sys/tools/gdb/vnet.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/tools/gdb/acttrace.py b/sys/tools/gdb/acttrace.py index 147effbbddf1..fdd18a4833cd 100644 --- a/sys/tools/gdb/acttrace.py +++ b/sys/tools/gdb/acttrace.py @@ -13,10 +13,8 @@ from pcpu import * class acttrace(gdb.Command): """ - Register an acttrace command with gdb. - - When run, acttrace prints the stack trace of all threads that were on-CPU - at the time of the panic. + Print the stack trace of all threads that were on-CPU at the time of + the panic. """ def __init__(self): super(acttrace, self).__init__("acttrace", gdb.COMMAND_USER) diff --git a/sys/tools/gdb/pcpu.py b/sys/tools/gdb/pcpu.py index aadc4b2d42df..94c451e6eca5 100644 --- a/sys/tools/gdb/pcpu.py +++ b/sys/tools/gdb/pcpu.py @@ -9,7 +9,7 @@ from freebsd import * class pcpu(gdb.Function): """ - Register a function to lookup PCPU and DPCPU variables by name. + A function to look up PCPU and DPCPU fields by name. To look up the value of the PCPU field foo on CPU n, use $PCPU("foo", n). This works for DPCPU fields too. If the CPU ID is diff --git a/sys/tools/gdb/vnet.py b/sys/tools/gdb/vnet.py index 36b4d512a3eb..5f416b2a515a 100644 --- a/sys/tools/gdb/vnet.py +++ b/sys/tools/gdb/vnet.py @@ -10,7 +10,7 @@ from freebsd import * class vnet(gdb.Function): """ - Register a function to look up VNET variables by name. + A function to look up VNET variables by name. To look at the value of a VNET variable V_foo, print $V("foo"). The currently selected thread's VNET is used by default, but can be optionally From nobody Tue Nov 4 13:04:54 2025 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 4d17w73nDCz6G2mL; Tue, 04 Nov 2025 13:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d17w70sV2z3tPx; Tue, 04 Nov 2025 13:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZTIGpZdZng5lJKlkFEsIUOSbtRyqBTfEedINOAQffE=; b=ViPOiCMbd5A+LSiN8OCPDJIPXOjSfHrUfqhrr7ohy47eiorqQdhA3HOtb2B25aUjOT3oVk XHCvSwZzCJoOKmCMvSOgrIXi1qV3wIR11bUbf/ssexDe3GOAH9znmE2NIO7owkxXBdI6ZE OCidCAmAoR35EyKilUKV0FWK6019VuY3y0eAYE9uEqYRrGJOXxIalP7m+lZJ80kreSOWa7 V9Kd97AXnlA4o5V6zS0MJ3hd5gvmFg6okFV7fBrcsRf+YeL5LOKa9jU06Xhb6LsurtkoIA 8pY9kbr6hv2CCAEcQ8HkWdLsFvYpY+Cqu5nRFg1gGhqgvC8hGZWZmGT9Nvy9Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZTIGpZdZng5lJKlkFEsIUOSbtRyqBTfEedINOAQffE=; b=jDBc2KVEJfYwvgic4R1ESGLRRkuAKNycLbvWD/OrPJD8qWuoPTcdvkjzCK4WV0ZZ54lQG1 2Ybtd/iRN5qJhaThpmkAx0aWnO3a3qaxqaFw6uUGmYmj4WwCbi0oRFDse34V65/K3/BWsj AtDQY+M63RYGTLTnqZ1cUXtlsX9R57h8rp61QbVH5b2F3eCynJsLn0znvsCP129U7+5Hwr H2EXNY1DTOnI3UVEs3cC3dEa5fDb7Tc8H4U9I4/kW2sf/Q9JRCVuInUN/kIS+ZaS8wZ6FF R/PVTxdc3+HCsq/ZZnSo94jraD8BDCsDGh4IhXcuGRPDGWh/mIx5xh990KTRhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762261495; a=rsa-sha256; cv=none; b=TH3+eYb1ygjB5RDcFk3kh77A3sndY5qMyILb/cncbF634jw/jGU6OuIRDWdP9WGjBG/0P/ +n8yzAWRqoizZIBXgUnMN7lBDiB6gO66hGkUtQe4CXWcrtBtzM64jN8IksDveQJEBYN0Od 1AtOduutSoAcle9X5aDD5U57XvRsF6evinmN+X7RTdPcSEwBMzfNw6UV3kQpuiVIeIlhVt puT9Xk7HIZ4Tl0mB0QOqALZrsx2og1CBSCCBsk9pMleoDtlrL8AUyd/E4STIJOF4/W6Bf3 RxAwWu/mTUjZot4xhQi2UsgxhvbQ9JQByPhljtxyyIWtjh5HFD3opesdaXGAkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d17w708q8zyKN; Tue, 04 Nov 2025 13:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4D4skB034668; Tue, 4 Nov 2025 13:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4D4sCN034665; Tue, 4 Nov 2025 13:04:54 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:04:54 GMT Message-Id: <202511041304.5A4D4sCN034665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 090beeed90c3 - stable/15 - gdb: Make development a bit easier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 090beeed90c3aaa3b2c2a25effb555c0e886b5c2 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=090beeed90c3aaa3b2c2a25effb555c0e886b5c2 commit 090beeed90c3aaa3b2c2a25effb555c0e886b5c2 Author: Mark Johnston AuthorDate: 2025-10-27 16:33:34 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 12:46:19 +0000 gdb: Make development a bit easier Provide a command which can be used to reload gdb modules. MFC after: 1 week (cherry picked from commit d5d47e1e67cdf1707cb460c2722894305f3cb34d) --- sys/tools/gdb/README.txt | 5 +++++ sys/tools/kernel-gdb.py | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/sys/tools/gdb/README.txt b/sys/tools/gdb/README.txt index 8c31565ddc42..ad1544912c3c 100644 --- a/sys/tools/gdb/README.txt +++ b/sys/tools/gdb/README.txt @@ -8,6 +8,9 @@ be automatically loaded by kgdb when opening a vmcore, so if you add new GDB commands or functions, that script should be updated to import them, and you should document them here. +When improving these scripts, you can use the "kgdb-reload" command to reload +them from /usr/lib/debug/boot/kernel/gdb/*. + To provide some rudimentary testing, selftest.py tries to exercise all of the commands and functions defined here. To use it, run selftest.sh to panic the system. Then, create a kernel dump or attach to the panicked kernel, and invoke @@ -15,6 +18,8 @@ the script with "python import selftest" in (k)gdb. Commands: acttrace Display a backtrace for all on-CPU threads +kgdb-reload Reload all gdb modules, useful when developing the modules + themselves. Functions: $PCPU([, ]) Display the value of a PCPU/DPCPU field diff --git a/sys/tools/kernel-gdb.py b/sys/tools/kernel-gdb.py index 8a41ef6efab1..990bdaf31fda 100644 --- a/sys/tools/kernel-gdb.py +++ b/sys/tools/kernel-gdb.py @@ -4,12 +4,40 @@ # SPDX-License-Identifier: BSD-2-Clause # +import importlib import os import sys sys.path.append(os.path.join(os.path.dirname(__file__), "gdb")) -# Import FreeBSD kernel debugging commands and modules below. -import acttrace -import pcpu -import vnet +modules = [ + "acttrace", + "freebsd", + "pcpu", + "vnet" +] + + +def reload_modules(modules): + for mod in modules: + if mod in sys.modules: + importlib.reload(sys.modules[mod]) + else: + importlib.import_module(mod) + +reload_modules(modules) + + +class reload(gdb.Command): + """ + Reload the FreeBSD kernel GDB helper scripts. + """ + def __init__(self): + super(reload, self).__init__("kgdb-reload", gdb.COMMAND_USER) + + def invoke(self, arg, from_tty): + reload_modules(modules) + + +# Register the reload command with gdb. +reload() From nobody Tue Nov 4 13:04:56 2025 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 4d17w839M8z6G2MZ; Tue, 04 Nov 2025 13:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d17w81YNHz3tXZ; Tue, 04 Nov 2025 13:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7BGhfkawX5KrpRu662tPBr2D+qH+0XV2MFaCg89u6+g=; b=kiQXvlymJYVAFtACmpD7iQ2QymwKPGVTZVOOeHnXx5eRhBPPOAl3LT0JQI0Gwi5fQf47a0 z/dbKxffU5sprd8Q6NkITdlTf1lwTyRDaDR60upHYli5nGZDewBaLVixTFmEEMmA8korix 2RMSP1aVY0D7EooOKwicJubmaviOkGtlmjtf9cqwIzlPWMrroGgW9ehmP6coUMqFIT2Ps2 kXbRsxsqqcPJs/f94Wc/xy2+DuMa6jP7uhdYsfSW/KIAGscQxfbTtevHSUGg8SZV4yQH0z Mj8NoLuH5dLluOM0DQL7CPOSQJYQ+p09twHf1MU/aJvc3YZzaBiV9Hev0X9cXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7BGhfkawX5KrpRu662tPBr2D+qH+0XV2MFaCg89u6+g=; b=jyZdB4ebxk7nWZjk+c26SYaKS/5pUQ13qYe1sWk4tLEMQmWH7U1Bjy9VUgtNXs/Pp+qv3E HmAl4hUw8AVrE0NYZSNW20GgxYyz6/BiYyx9JIxh5HPiz0PDJGw8Eriy09o83o90DEfEoK bKfrtEz3/mLKzqCu6aG6cxR/1qh2MMW6h2XODz+r3WLoejJiWOL11zrA1iZ6LGEKLkT/dJ JA7LrBi4n1CYB0m4OxPop10XybgT5KFHVe1uFjIorlY/FIxToJM5Qe2k3kW7rs3KilVLje 8MbAjbJtZBo9ckqMT88HcbkUXKCwXcIGQRB9Vu0h4VD9AjLpfL5xQZDPHzJunw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762261496; a=rsa-sha256; cv=none; b=qid2Imi18Y/TwMMMPdT1mHYtn//TA4UI9kljqNHRUk25cQaOq4sslysQr25JXYfYBldhjE YS1X6Y4+7zh7xz9ujz1TqcbqQ0lAIEFl0LdKzHF+J9mRkWGyy+vDmVXbKxJW2+LmfW+J1Y W0MrZmEjl/PvuhVszV8FKcqTiCWqps+nweE/TD+xVbWODJt6NTHfjP/LZR7AGiIogBn1dy iNfiN26fC3bo935r096qdUY2Q0QbcHHSscg7g5CRSBF4X1Ftj1WEIwAapdfjBebpIvpDi6 yOLzPLrfh3Zy8if7RPct2bDqiZ9Ye+xgtwEAEKYsNll/ZQXr40w9HC+enKiRfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d17w813yRzxyW; Tue, 04 Nov 2025 13:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4D4u5l034709; Tue, 4 Nov 2025 13:04:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4D4uNp034706; Tue, 4 Nov 2025 13:04:56 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:04:56 GMT Message-Id: <202511041304.5A4D4uNp034706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5c4144fe1f41 - stable/15 - mld6: Properly initialize MLD packet 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 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: 5c4144fe1f41b16368a3785b7edd6d2d70c24d1b Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5c4144fe1f41b16368a3785b7edd6d2d70c24d1b commit 5c4144fe1f41b16368a3785b7edd6d2d70c24d1b Author: Andrey V. Elsukov AuthorDate: 2025-11-02 15:56:14 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 12:46:30 +0000 mld6: Properly initialize MLD packet options After commit 530c2c30b0c7 we need to set flags to ensure that hop-by-hop and hop limit options are included. PR: 290407 Reviewed by: zlei, markj MFC after: 3 days Fixes: 530c2c30b0c7 ("ip6_output: Reduce cache misses on pktopts") (cherry picked from commit 5568fba657c260286b9f1f1e837ab83ef6ce572d) --- sys/netinet6/mld6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index a825658bd9ee..5dfe48908a4f 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -3267,6 +3267,7 @@ mld_init(void *unused __unused) mld_po.ip6po_hbh = &mld_ra.hbh; mld_po.ip6po_prefer_tempaddr = IP6PO_TEMPADDR_NOTPREFER; mld_po.ip6po_flags = IP6PO_DONTFRAG; + mld_po.ip6po_valid = IP6PO_VALID_HLIM | IP6PO_VALID_HBH; callout_init(&mldslow_callout, 1); callout_reset(&mldslow_callout, hz / MLD_SLOWHZ, mld_slowtimo, NULL); From nobody Tue Nov 4 13:04:57 2025 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 4d17wB1bT9z6G2px; Tue, 04 Nov 2025 13:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d17w92NDgz3tSl; Tue, 04 Nov 2025 13:04:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h53Apgs7qaxEAnNxJuubEkNFk3N9bbEqhm9vSaycZCo=; b=qrkahcDPmaOmab2ckIcV0m2MH4GnNrVWDnOXavl3P/dG4Q0x4x6qzksz4Kf74jSVfnXt5o 4tBXKjerKqj/K1G3tvRhWuAQNg6iPJJyyTBtgi36GL+kSNv1jInmhjB+qVn6sIDmqwJjjk pz2B1aBnpbDWPGbMYk3Pjaov+stMf/lgxfrUxYLrx08ZFgPAdQKXOptLDGADygQvjz6sQE 3r+jssCfSKCqOa2xoP7qsOdwkLE0ogWI8WqVqYHcUo3+N80b8B+5eJiZzFGRINC39/lKTK pYovKh/DEY5AkAyN697MVTYYmt6SGnkXY06HHjSisWjxA24N9fZ4cpkDO8tz1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h53Apgs7qaxEAnNxJuubEkNFk3N9bbEqhm9vSaycZCo=; b=QlINEy6V8M8yLv0luKGkkviBKylZYFysqPoCqOn2aTHO1SgbCLSXOcYTttsZBF13hLNly7 zzW7+4MtcVfUSKNwezecRfN7h2IxIEBzp+QOl1zqwfHbYBvS5YSZqJv6JzU7GQoqYb3gHU BwUujhahhaUbycPYMmSQKf/gOr52/1JN4J8biB921Y3E+cAacJhw5Ou+LgzW1KgxdRLKAT 5GICT5QZs+uJrr8z29YOL/uZeu9H/DgrHNd2Y3SNILZbaXBMm6DM5sHwg/aUM0u3ZhRDCN LQiQaeFSZWM0ujOhflIcpoYgcxYHLoM0hV2nHTI0fYtnMWzzkEJBi5hg6O771g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762261497; a=rsa-sha256; cv=none; b=lnGzU4JzBZZWx9FNShhbdLkgLHkwEP/rziy3N+ce/hiMdu1qVkiAmPnBYQFyh48MJeklBT oyVkswZw6ATdKlCsH0t6DSnf2zjMWdGm1yqRaCdIERq0cEw8FjgqvT64Izc3tmMKDFvJ6g V8z6mBUnSWFwXcJtQ4SYOlFNR32Uyh5VTtkY7bLusMi2LVz6sqhB4pAnqLkSDCqbrYgAuo +gZSbKc4FW8WTDiBf5behlLQgihPQfSjDl8N48ivQXATWxLUgT4Zlm6aSlO/RwrAta2yd8 8V4VNTghRsSbLRfEHBMsQ6yFp9YmA10LHoI5+LEut4ieTdqbAsTfJetXupo9bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d17w91lMqzy6V; Tue, 04 Nov 2025 13:04:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4D4vPJ034745; Tue, 4 Nov 2025 13:04:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4D4v9N034742; Tue, 4 Nov 2025 13:04:57 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:04:57 GMT Message-Id: <202511041304.5A4D4v9N034742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0e33b730ed1a - stable/15 - vmm: Improve register get/set handling a bit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 0e33b730ed1a25d3ba50c8e237217b6f5a89fbed Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0e33b730ed1a25d3ba50c8e237217b6f5a89fbed commit 0e33b730ed1a25d3ba50c8e237217b6f5a89fbed Author: Mark Johnston AuthorDate: 2025-10-21 17:34:11 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 12:46:51 +0000 vmm: Improve register get/set handling a bit On non-amd64 platforms, check for negative register indices. This isn't required today since we match against individual register indices, but we might as well check it. On amd64, add a comment explaining why we permit negative register indices. Use mallocarray() for allocating register arrays in the ioctl layer. No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53143 (cherry picked from commit 14133abfe9c218b97e888edf04d2ec4a86e7ab4b) --- sys/amd64/vmm/vmm.c | 3 ++- sys/arm64/vmm/vmm.c | 5 ++--- sys/dev/vmm/vmm_dev.c | 16 ++++++++-------- sys/riscv/vmm/vmm.c | 5 ++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 2ac076551165..7254ebed6097 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -870,7 +870,7 @@ vm_assign_pptdev(struct vm *vm, int bus, int slot, int func) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - + /* Negative values represent VM control structure fields. */ if (reg >= VM_REG_LAST) return (EINVAL); @@ -882,6 +882,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; + /* Negative values represent VM control structure fields. */ if (reg >= VM_REG_LAST) return (EINVAL); diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index aeda689f3b1a..4f266de0cfb1 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -1279,8 +1279,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); return (vmmops_getreg(vcpu->cookie, reg, retval)); @@ -1291,7 +1290,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); error = vmmops_setreg(vcpu->cookie, reg, val); if (error || reg != VM_REG_GUEST_PC) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 460a508a60dc..51c946f24c91 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -640,10 +640,10 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } - regvals = malloc(sizeof(regvals[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); - regnums = malloc(sizeof(regnums[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); + regvals = mallocarray(vmregset->count, sizeof(regvals[0]), + M_VMMDEV, M_WAITOK); + regnums = mallocarray(vmregset->count, sizeof(regnums[0]), + M_VMMDEV, M_WAITOK); error = copyin(vmregset->regnums, regnums, sizeof(regnums[0]) * vmregset->count); if (error == 0) @@ -666,10 +666,10 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } - regvals = malloc(sizeof(regvals[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); - regnums = malloc(sizeof(regnums[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); + regvals = mallocarray(vmregset->count, sizeof(regvals[0]), + M_VMMDEV, M_WAITOK); + regnums = mallocarray(vmregset->count, sizeof(regnums[0]), + M_VMMDEV, M_WAITOK); error = copyin(vmregset->regnums, regnums, sizeof(regnums[0]) * vmregset->count); if (error == 0) diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index 790dcc576507..fda444d6461b 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -954,8 +954,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); return (vmmops_getreg(vcpu->cookie, reg, retval)); @@ -966,7 +965,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); error = vmmops_setreg(vcpu->cookie, reg, val); if (error || reg != VM_REG_GUEST_SEPC) From nobody Tue Nov 4 13:04:58 2025 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 4d17wB4x4zz6G2fC; Tue, 04 Nov 2025 13:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d17wB3Kqmz3tN5; Tue, 04 Nov 2025 13:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KWHG8LpvVo/Hx64VUb3pl1Adm2BEO/3ZCY63/A/fCpw=; b=XZk9bC2bSvuuIE9dmad3QWWyf5g688qODTpxWVKtBEnZWTVyPi/J7kW0VTaYNzqfraWjKu Rd5y7K3hC/vuODMz8prNGT0OSLfyf23LwWKDog9A/EEAsw7I5e+PRdXoCrjd0rOB+0Udtu y7m9keqVRNZPccDAI+XF2g0QxB48Qxm0TTZe480wR6M7ZxVe6jkc8QQE1kmEYpx82PGAsg SbtghznB+73sMo7ifhZa2k0nz6O2fVKKDU0qeQCnzjTspdl7KX0qU2U+DiIvURg0zYzL+O hKgBB+aHukfiPIbKHVMEouWZHXqbUhTHqJMZ7wRgvlNuha9AbVRMMCw9ozKdjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KWHG8LpvVo/Hx64VUb3pl1Adm2BEO/3ZCY63/A/fCpw=; b=oVdMpjdwLSgIcE+aNGamwHinV4lxPtZBd+es+rwLNpZeWQtmi7sOgmYnKT/z8Rvg1bXo9o aB2VHPt4YjCRN8yL7PXQWVDOsGnRsfA5xefsmG45dknXvxXmjHp0QI/XboJGSPBcM/hCJV RY05ReZ6f+iubp5lJWmClti/9e/RK+PZKApwha9C2MMyoKWj4lfER6OEaLYZOuc8vlFV4c VUFgYTurE80VmiBQkLcYtl06J3Q/yLUKXhIi+cny5yxjc8LW/rRuagpCDqWn/umbxkt27v fN0eKnr9/DvZ7nU75J+Vz7O/UYs5IFX4t8QrdAcvb1QqWDSC0jkO8gA6/0nInw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762261498; a=rsa-sha256; cv=none; b=cwBsUYXxljitxjFkIQSc7Z1kWtpVcCjsetKGB5JDoZpnZfy/F7SnXP9mT9rtBBV4PA1FXZ bNLADdtsN0BmZLOccEX2s1NaAmJtI16ce6FZhkUHZumMAxBA9udcFez/b7rCZVrVTsKGiY ZeVFSZvl29izeiBn/bYc9XeHJhe/8JRCt1WdhGzji8qP1r4BX+R4V54b99iEJxvktvIcIC 8TP4EWX2QHZ6yR9FkWRfD7dcFzSFFe6Kxj2agmoB6+mPHqBOevghI1qoRP3iiszxnzbqV7 ncexDVVJicfm90D2WaV3B74jg04h5/GTbIpa+Zv42SVAxA7JdRjG2/mBA8UB+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d17wB2tzNzy3t; Tue, 04 Nov 2025 13:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4D4w19034779; Tue, 4 Nov 2025 13:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4D4w5r034776; Tue, 4 Nov 2025 13:04:58 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:04:58 GMT Message-Id: <202511041304.5A4D4w5r034776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e2d6c959b29d - stable/15 - vmm: Add PRIV_DRIVER checks for passthru ioctls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: e2d6c959b29d85a83a0c827b02f3303b115daf03 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e2d6c959b29d85a83a0c827b02f3303b115daf03 commit e2d6c959b29d85a83a0c827b02f3303b115daf03 Author: Mark Johnston AuthorDate: 2025-10-21 17:34:29 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 12:46:53 +0000 vmm: Add PRIV_DRIVER checks for passthru ioctls In preparation for allowing non-root users to create and access bhyve VMs, add privilege checks for ioctls which operate on passthru devices. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53144 (cherry picked from commit e11768e94787bef2866486ba8616353716a10447) --- sys/amd64/vmm/vmm_dev_machdep.c | 18 +++++++++++------- sys/dev/vmm/vmm_dev.c | 7 +++++++ sys/dev/vmm/vmm_dev.h | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c index dfebc9dcadbf..347f739d53ec 100644 --- a/sys/amd64/vmm/vmm_dev_machdep.c +++ b/sys/amd64/vmm/vmm_dev_machdep.c @@ -124,12 +124,16 @@ const struct vmmdev_ioctl vmmdev_machdep_ioctls[] = { VMMDEV_IOCTL(VM_SET_KERNEMU_DEV, VMMDEV_IOCTL_LOCK_ONE_VCPU), VMMDEV_IOCTL(VM_BIND_PPTDEV, - VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), VMMDEV_IOCTL(VM_UNBIND_PPTDEV, - VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), - VMMDEV_IOCTL(VM_MAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS), - VMMDEV_IOCTL(VM_UNMAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL(VM_MAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_UNMAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), #ifdef BHYVE_SNAPSHOT #ifdef COMPAT_FREEBSD13 VMMDEV_IOCTL(VM_SNAPSHOT_REQ_13, VMMDEV_IOCTL_LOCK_ALL_VCPUS), @@ -147,9 +151,9 @@ const struct vmmdev_ioctl vmmdev_machdep_ioctls[] = { VMMDEV_IOCTL(VM_LAPIC_LOCAL_IRQ, VMMDEV_IOCTL_MAYBE_ALLOC_VCPU), - VMMDEV_IOCTL(VM_PPTDEV_MSI, 0), - VMMDEV_IOCTL(VM_PPTDEV_MSIX, 0), - VMMDEV_IOCTL(VM_PPTDEV_DISABLE_MSIX, 0), + VMMDEV_IOCTL(VM_PPTDEV_MSI, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_PPTDEV_MSIX, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_PPTDEV_DISABLE_MSIX, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), VMMDEV_IOCTL(VM_LAPIC_MSI, 0), VMMDEV_IOCTL(VM_IOAPIC_ASSERT_IRQ, 0), VMMDEV_IOCTL(VM_IOAPIC_DEASSERT_IRQ, 0), diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 51c946f24c91..5b857a171e94 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -454,6 +455,12 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, if (ioctl == NULL) return (ENOTTY); + if ((ioctl->flags & VMMDEV_IOCTL_PRIV_CHECK_DRIVER) != 0) { + error = priv_check(td, PRIV_DRIVER); + if (error != 0) + return (error); + } + if ((ioctl->flags & VMMDEV_IOCTL_XLOCK_MEMSEGS) != 0) vm_xlock_memsegs(sc->vm); else if ((ioctl->flags & VMMDEV_IOCTL_SLOCK_MEMSEGS) != 0) diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index 410066c49cf2..2881a7063565 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -44,6 +44,7 @@ struct vmmdev_ioctl { #define VMMDEV_IOCTL_LOCK_ALL_VCPUS 0x08 #define VMMDEV_IOCTL_ALLOC_VCPU 0x10 #define VMMDEV_IOCTL_MAYBE_ALLOC_VCPU 0x20 +#define VMMDEV_IOCTL_PRIV_CHECK_DRIVER 0x40 int flags; }; From nobody Tue Nov 4 13:04:59 2025 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 4d17wC5y8lz6G2Q2; Tue, 04 Nov 2025 13:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d17wC3bRpz3tT5; Tue, 04 Nov 2025 13:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awBvIVNxWHPzuy3kglkQD9Zi8HZbIIuUnkMCJ4kIiks=; b=os0CYVHIwyMwOUuEN7+SAyoNHP7Plx6tNHL0vmUdhS+SdJXbWmDO/whN/WaCl+V8c/udcH anXZKuBle2OQWklOQ7brk/nNC753WZvwWEhtJzzWTToEnB9vawat8zottPEtiPTF8IJhO3 2m4gRcb5QfXcnGMhi+WIvMlFJb68aINT9BwWe+Pk6p8fv+cmRk43o/64C5xNV9TTG3Vxly 4Z3v99xAghjEF/9ShSTHFlNtj2wogmWKGGo3jRZaWRNVP3kt8v6amEJWBGdNmNBCGkUdXj WfBRPn/5OFzhahKgw+JcXfJtrkz4WtPfnr7yKEV5eAvwUZxF6xnBqVPjAYMn4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762261499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awBvIVNxWHPzuy3kglkQD9Zi8HZbIIuUnkMCJ4kIiks=; b=HtAJkLtQ29nKSELOWmoY69YNKnl5nFTDSUk3KXnmGILlHSnWiOSNghJp9851uyPEu5mghR 4CKXcG1bPr83F5dBkSi2pLJGskKyy+qiqM+mcNZ+Jwu3G/+L1TjwaBxvYwOQGWLJ9o+LWz kO2mw8Wj3or9EHZGcmWESFY0b7duMVwHi8DG9KswZ1iWom/ONacSuIr6Mzml3onE4kVtIi geRVizgfotOwxi8ZEr4fLUvoK8fQ6NnVB2lSeF1tNhSEK76w0GmVwm7vA28aqGlVlFg5mW Z1cfOLOiBztdszwe0ryqSFWszIHv7QpqgrPt4vKktfX9NEzilogvshIuy8OcsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762261499; a=rsa-sha256; cv=none; b=BznTCWxq5eWhOT8u1/UsjtXi10W7agJzEaZRH64X5mS1Njvz4CxKyZqrAUViCgfYal5iqV wZD942KpZ9i9YbTINc08mFPhOsbPvuFSmPiJ7jytBcL1eO8014CuAJFsHCWnJJY7LoY914 F4ryD4NJo1HoaMZF7t+njqNp7OxPwWEmorplwhHJQiImjYzqRu0aELgxLonNZYPRf1RY5e ICMPCj9Rq0Yrivt3e+gOIkT8GlDDQSyzKaLjIs2Xqug5pPDfX8cvW+XIrsMu/Y7/+qDqEg QcuL1PLxGgt7bKyzLMyT+fCO7/9Jnzoj6jTR6Ccz9rCBraOZoQJRkiJ1MQeH1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d17wC3B1lzy3v; Tue, 04 Nov 2025 13:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4D4xpY034814; Tue, 4 Nov 2025 13:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4D4xAR034811; Tue, 4 Nov 2025 13:04:59 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:04:59 GMT Message-Id: <202511041304.5A4D4xAR034811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e419e48efac3 - stable/15 - vmm: Move local variables into ioctl handlers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: e419e48efac32676b155ae73eb90e621e93fea75 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e419e48efac32676b155ae73eb90e621e93fea75 commit e419e48efac32676b155ae73eb90e621e93fea75 Author: Mark Johnston AuthorDate: 2025-10-21 17:34:48 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 12:46:54 +0000 vmm: Move local variables into ioctl handlers Make the ioctl handlers easy to read by moving local variables into per-ioctl blocks. No functional change intended. Reviewed by: corvink, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53145 (cherry picked from commit 0225c6d85d0d4250ed304b31e6ce855fc5d93f15) --- sys/amd64/vmm/vmm_dev_machdep.c | 237 +++++++++++++++++++++++++--------------- sys/arm64/vmm/vmm_dev_machdep.c | 43 +++++--- sys/riscv/vmm/vmm_dev_machdep.c | 37 +++++-- 3 files changed, 205 insertions(+), 112 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c index 347f739d53ec..b84be809ea24 100644 --- a/sys/amd64/vmm/vmm_dev_machdep.c +++ b/sys/amd64/vmm/vmm_dev_machdep.c @@ -176,40 +176,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_seg_desc *vmsegdesc; - struct vm_run *vmrun; -#ifdef COMPAT_FREEBSD13 - struct vm_run_13 *vmrun_13; -#endif - struct vm_exception *vmexc; - struct vm_lapic_irq *vmirq; - struct vm_lapic_msi *vmmsi; - struct vm_ioapic_irq *ioapic_irq; - struct vm_isa_irq *isa_irq; - struct vm_isa_irq_trigger *isa_irq_trigger; - struct vm_pptdev *pptdev; - struct vm_pptdev_mmio *pptmmio; - struct vm_pptdev_msi *pptmsi; - struct vm_pptdev_msix *pptmsix; - struct vm_x2apic *x2apic; - struct vm_gpa_pte *gpapte; - struct vm_gla2gpa *gg; - struct vm_intinfo *vmii; - struct vm_rtc_time *rtctime; - struct vm_rtc_data *rtcdata; - struct vm_readwrite_kernemu_device *kernemu; -#ifdef BHYVE_SNAPSHOT - struct vm_snapshot_meta *snapshot_meta; -#ifdef COMPAT_FREEBSD13 - struct vm_snapshot_meta_13 *snapshot_13; -#endif -#endif int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -247,6 +220,7 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, case VM_RUN_13: { struct vm_exit *vme; struct vm_exit_13 *vme_13; + struct vm_run_13 *vmrun_13; vmrun_13 = (struct vm_run_13 *)data; vme_13 = &vmrun_13->vm_exit; @@ -285,85 +259,123 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, break; } #endif - case VM_PPTDEV_MSI: + case VM_PPTDEV_MSI: { + struct vm_pptdev_msi *pptmsi; + pptmsi = (struct vm_pptdev_msi *)data; - error = ppt_setup_msi(vm, - pptmsi->bus, pptmsi->slot, pptmsi->func, - pptmsi->addr, pptmsi->msg, - pptmsi->numvec); + error = ppt_setup_msi(vm, pptmsi->bus, pptmsi->slot, + pptmsi->func, pptmsi->addr, pptmsi->msg, pptmsi->numvec); break; - case VM_PPTDEV_MSIX: + } + case VM_PPTDEV_MSIX: { + struct vm_pptdev_msix *pptmsix; + pptmsix = (struct vm_pptdev_msix *)data; - error = ppt_setup_msix(vm, - pptmsix->bus, pptmsix->slot, - pptmsix->func, pptmsix->idx, - pptmsix->addr, pptmsix->msg, - pptmsix->vector_control); + error = ppt_setup_msix(vm, pptmsix->bus, pptmsix->slot, + pptmsix->func, pptmsix->idx, pptmsix->addr, pptmsix->msg, + pptmsix->vector_control); break; - case VM_PPTDEV_DISABLE_MSIX: + } + case VM_PPTDEV_DISABLE_MSIX: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = ppt_disable_msix(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_MAP_PPTDEV_MMIO: + } + case VM_MAP_PPTDEV_MMIO: { + struct vm_pptdev_mmio *pptmmio; + pptmmio = (struct vm_pptdev_mmio *)data; error = ppt_map_mmio(vm, pptmmio->bus, pptmmio->slot, - pptmmio->func, pptmmio->gpa, pptmmio->len, - pptmmio->hpa); + pptmmio->func, pptmmio->gpa, pptmmio->len, pptmmio->hpa); break; - case VM_UNMAP_PPTDEV_MMIO: + } + case VM_UNMAP_PPTDEV_MMIO: { + struct vm_pptdev_mmio *pptmmio; + pptmmio = (struct vm_pptdev_mmio *)data; error = ppt_unmap_mmio(vm, pptmmio->bus, pptmmio->slot, - pptmmio->func, pptmmio->gpa, pptmmio->len); + pptmmio->func, pptmmio->gpa, pptmmio->len); break; - case VM_BIND_PPTDEV: + } + case VM_BIND_PPTDEV: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = vm_assign_pptdev(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_UNBIND_PPTDEV: + } + case VM_UNBIND_PPTDEV: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = vm_unassign_pptdev(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_INJECT_EXCEPTION: + } + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->vector, vmexc->error_code_valid, vmexc->error_code, vmexc->restart_instruction); break; + } case VM_INJECT_NMI: error = vm_inject_nmi(vcpu); break; - case VM_LAPIC_IRQ: + case VM_LAPIC_IRQ: { + struct vm_lapic_irq *vmirq; + vmirq = (struct vm_lapic_irq *)data; error = lapic_intr_edge(vcpu, vmirq->vector); break; - case VM_LAPIC_LOCAL_IRQ: + } + case VM_LAPIC_LOCAL_IRQ: { + struct vm_lapic_irq *vmirq; + vmirq = (struct vm_lapic_irq *)data; error = lapic_set_local_intr(vm, vcpu, vmirq->vector); break; - case VM_LAPIC_MSI: + } + case VM_LAPIC_MSI: { + struct vm_lapic_msi *vmmsi; + vmmsi = (struct vm_lapic_msi *)data; error = lapic_intr_msi(vm, vmmsi->addr, vmmsi->msg); break; - case VM_IOAPIC_ASSERT_IRQ: + } + case VM_IOAPIC_ASSERT_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_assert_irq(vm, ioapic_irq->irq); break; - case VM_IOAPIC_DEASSERT_IRQ: + } + case VM_IOAPIC_DEASSERT_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_deassert_irq(vm, ioapic_irq->irq); break; - case VM_IOAPIC_PULSE_IRQ: + } + case VM_IOAPIC_PULSE_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_pulse_irq(vm, ioapic_irq->irq); break; + } case VM_IOAPIC_PINCOUNT: *(int *)data = vioapic_pincount(vm); break; case VM_SET_KERNEMU_DEV: case VM_GET_KERNEMU_DEV: { + struct vm_readwrite_kernemu_device *kernemu; mem_region_write_t mwrite; mem_region_read_t mread; int size; @@ -400,60 +412,86 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, error = mread(vcpu, kernemu->gpa, &kernemu->value, size, &arg); break; - } - case VM_ISA_ASSERT_IRQ: + } + case VM_ISA_ASSERT_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_assert_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_assert_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_DEASSERT_IRQ: + } + case VM_ISA_DEASSERT_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_deassert_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_deassert_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_PULSE_IRQ: + } + case VM_ISA_PULSE_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_pulse_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_pulse_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_SET_IRQ_TRIGGER: + } + case VM_ISA_SET_IRQ_TRIGGER: { + struct vm_isa_irq_trigger *isa_irq_trigger; + isa_irq_trigger = (struct vm_isa_irq_trigger *)data; error = vatpic_set_irq_trigger(vm, isa_irq_trigger->atpic_irq, isa_irq_trigger->trigger); break; - case VM_SET_SEGMENT_DESCRIPTOR: + } + case VM_SET_SEGMENT_DESCRIPTOR: { + struct vm_seg_desc *vmsegdesc; + vmsegdesc = (struct vm_seg_desc *)data; - error = vm_set_seg_desc(vcpu, - vmsegdesc->regnum, - &vmsegdesc->desc); + error = vm_set_seg_desc(vcpu, vmsegdesc->regnum, + &vmsegdesc->desc); break; - case VM_GET_SEGMENT_DESCRIPTOR: + } + case VM_GET_SEGMENT_DESCRIPTOR: { + struct vm_seg_desc *vmsegdesc; + vmsegdesc = (struct vm_seg_desc *)data; - error = vm_get_seg_desc(vcpu, - vmsegdesc->regnum, - &vmsegdesc->desc); + error = vm_get_seg_desc(vcpu, vmsegdesc->regnum, + &vmsegdesc->desc); break; - case VM_SET_X2APIC_STATE: + } + case VM_SET_X2APIC_STATE: { + struct vm_x2apic *x2apic; + x2apic = (struct vm_x2apic *)data; error = vm_set_x2apic_state(vcpu, x2apic->state); break; - case VM_GET_X2APIC_STATE: + } + case VM_GET_X2APIC_STATE: { + struct vm_x2apic *x2apic; + x2apic = (struct vm_x2apic *)data; error = vm_get_x2apic_state(vcpu, &x2apic->state); break; - case VM_GET_GPA_PMAP: + } + case VM_GET_GPA_PMAP: { + struct vm_gpa_pte *gpapte; + gpapte = (struct vm_gpa_pte *)data; - pmap_get_mapping(vmspace_pmap(vm_vmspace(vm)), - gpapte->gpa, gpapte->pte, &gpapte->ptenum); - error = 0; + pmap_get_mapping(vmspace_pmap(vm_vmspace(vm)), gpapte->gpa, + gpapte->pte, &gpapte->ptenum); break; + } case VM_GET_HPET_CAPABILITIES: error = vhpet_getcap((struct vm_hpet_cap *)data); break; case VM_GLA2GPA: { + struct vm_gla2gpa *gg; + CTASSERT(PROT_READ == VM_PROT_READ); CTASSERT(PROT_WRITE == VM_PROT_WRITE); CTASSERT(PROT_EXEC == VM_PROT_EXECUTE); @@ -464,50 +502,76 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; } - case VM_GLA2GPA_NOFAULT: + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_SET_INTINFO: + } + case VM_SET_INTINFO: { + struct vm_intinfo *vmii; + vmii = (struct vm_intinfo *)data; error = vm_exit_intinfo(vcpu, vmii->info1); break; - case VM_GET_INTINFO: + } + case VM_GET_INTINFO: { + struct vm_intinfo *vmii; + vmii = (struct vm_intinfo *)data; error = vm_get_intinfo(vcpu, &vmii->info1, &vmii->info2); break; - case VM_RTC_WRITE: + } + case VM_RTC_WRITE: { + struct vm_rtc_data *rtcdata; + rtcdata = (struct vm_rtc_data *)data; error = vrtc_nvram_write(vm, rtcdata->offset, rtcdata->value); break; - case VM_RTC_READ: + } + case VM_RTC_READ: { + struct vm_rtc_data *rtcdata; + rtcdata = (struct vm_rtc_data *)data; error = vrtc_nvram_read(vm, rtcdata->offset, &rtcdata->value); break; - case VM_RTC_SETTIME: + } + case VM_RTC_SETTIME: { + struct vm_rtc_time *rtctime; + rtctime = (struct vm_rtc_time *)data; error = vrtc_set_time(vm, rtctime->secs); break; - case VM_RTC_GETTIME: - error = 0; + } + case VM_RTC_GETTIME: { + struct vm_rtc_time *rtctime; + rtctime = (struct vm_rtc_time *)data; rtctime->secs = vrtc_get_time(vm); break; + } case VM_RESTART_INSTRUCTION: error = vm_restart_instruction(vcpu); break; #ifdef BHYVE_SNAPSHOT - case VM_SNAPSHOT_REQ: + case VM_SNAPSHOT_REQ: { + struct vm_snapshot_meta *snapshot_meta; + snapshot_meta = (struct vm_snapshot_meta *)data; error = vm_snapshot_req(vm, snapshot_meta); break; + } #ifdef COMPAT_FREEBSD13 - case VM_SNAPSHOT_REQ_13: + case VM_SNAPSHOT_REQ_13: { + struct vm_snapshot_meta *snapshot_meta; + struct vm_snapshot_meta_13 *snapshot_13; + /* * The old structure just has an additional pointer at * the start that is ignored. @@ -517,6 +581,7 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, (struct vm_snapshot_meta *)&snapshot_13->dev_data; error = vm_snapshot_req(vm, snapshot_meta); break; + } #endif case VM_RESTORE_TIME: error = vm_restore_time(vm); diff --git a/sys/arm64/vmm/vmm_dev_machdep.c b/sys/arm64/vmm/vmm_dev_machdep.c index 926a74fa528b..29d14e1ba952 100644 --- a/sys/arm64/vmm/vmm_dev_machdep.c +++ b/sys/arm64/vmm/vmm_dev_machdep.c @@ -68,19 +68,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_run *vmrun; - struct vm_vgic_version *vgv; - struct vm_vgic_descr *vgic; - struct vm_irq *vi; - struct vm_exception *vmexc; - struct vm_gla2gpa *gg; - struct vm_msi *vmsi; int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -94,41 +88,62 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, break; break; } - case VM_INJECT_EXCEPTION: + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->esr, vmexc->far); break; - case VM_GLA2GPA_NOFAULT: + } + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_GET_VGIC_VERSION: + } + case VM_GET_VGIC_VERSION: { + struct vm_vgic_version *vgv; + vgv = (struct vm_vgic_version *)data; /* TODO: Query the vgic driver for this */ vgv->version = 3; vgv->flags = 0; error = 0; break; - case VM_ATTACH_VGIC: + } + case VM_ATTACH_VGIC: { + struct vm_vgic_descr *vgic; + vgic = (struct vm_vgic_descr *)data; error = vm_attach_vgic(vm, vgic); break; - case VM_RAISE_MSI: + } + case VM_RAISE_MSI: { + struct vm_msi *vmsi; + vmsi = (struct vm_msi *)data; error = vm_raise_msi(vm, vmsi->msg, vmsi->addr, vmsi->bus, vmsi->slot, vmsi->func); break; - case VM_ASSERT_IRQ: + } + case VM_ASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_assert_irq(vm, vi->irq); break; - case VM_DEASSERT_IRQ: + } + case VM_DEASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_deassert_irq(vm, vi->irq); break; + } default: error = ENOTTY; break; diff --git a/sys/riscv/vmm/vmm_dev_machdep.c b/sys/riscv/vmm/vmm_dev_machdep.c index ba15d8dcd79e..c736b10dc9c0 100644 --- a/sys/riscv/vmm/vmm_dev_machdep.c +++ b/sys/riscv/vmm/vmm_dev_machdep.c @@ -67,18 +67,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_run *vmrun; - struct vm_aplic_descr *aplic; - struct vm_irq *vi; - struct vm_exception *vmexc; - struct vm_gla2gpa *gg; - struct vm_msi *vmsi; int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -90,34 +85,52 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, error = copyout(vme, vmrun->vm_exit, sizeof(*vme)); break; } - case VM_INJECT_EXCEPTION: + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->scause); break; - case VM_GLA2GPA_NOFAULT: + } + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_ATTACH_APLIC: + } + case VM_ATTACH_APLIC: { + struct vm_aplic_descr *aplic; + aplic = (struct vm_aplic_descr *)data; error = vm_attach_aplic(vm, aplic); break; - case VM_RAISE_MSI: + } + case VM_RAISE_MSI: { + struct vm_msi *vmsi; + vmsi = (struct vm_msi *)data; error = vm_raise_msi(vm, vmsi->msg, vmsi->addr, vmsi->bus, vmsi->slot, vmsi->func); break; - case VM_ASSERT_IRQ: + } + case VM_ASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_assert_irq(vm, vi->irq); break; - case VM_DEASSERT_IRQ: + } + case VM_DEASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_deassert_irq(vm, vi->irq); break; + } default: error = ENOTTY; break; From nobody Tue Nov 4 13:24:53 2025 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 4d18MB2l4cz6G494; Tue, 04 Nov 2025 13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d18M96bRPz3xqS; Tue, 04 Nov 2025 13: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=1762262693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UajqO3iyppJEkyzdOdDzF7pZbjpwT02qskBClikGtk=; b=FNBwYWJFIaodlWu5Tpk1gqH11I0ehFLjwXCGNKE/sEFodbFNU4DVVdNnB6SMphW7qj40ma LkrIHM2EBONa4j+SVeU9k94rajz87q/ImpAZp2GtLe/AzyHcaHTHOSCoeDjVyTZ61f9yQm CRPGNVga1QnF+V3RSfOpKNXquz22IT4fx0fK7OZptAfc4PyTlji2rJld/c17SL3Yda3VUn FtemF+dsvo9+KRZy4dBZM1ztcnPGghxCmN4AWbFtO9S0Dj/6VyWsxbNZb9NdBEEk+qr9SY O/3F8uONU8FJymaW/VaVc1OEqZBX2xdUDN/vhatcs9Jc656F4HIUkkYU9UfixQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762262693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UajqO3iyppJEkyzdOdDzF7pZbjpwT02qskBClikGtk=; b=Ji28vEVtD6aU7HJgidVShfS1ZOwdkvIpbnwiCReGs2ibZNe0BdCN62E6wlpy9DT8UkLTNP ZbOvzRc1u9pOMDjN5uvHWQGGiW+O9txzbtVDDFgP/K8oTutOm7kZwXbvKU+ehQkC15Iv7I 9pkSw6hB7Y8tNneIHA3WZVWKmTuk2r0IDoyxnV4IZUYHL1uA7OYsihMtsVa/POameiqCJP ffsmB5rGfgh7pfXkRri8ZPFwaRRYy2xBZhdN7VbpSnQo/M6HkdsPRPDyO3NMKXbleS1A4u F7lkiGQixdpdee9jrIAnYrQWHNxEaXZv3w+R/yFwZaqfmr7OD18iPj+QHDFitw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762262693; a=rsa-sha256; cv=none; b=fV9eSfK2fQekYVoXSlU4lclUmZCXSztj9SN1oZcLr0dmpImc37ewpHsY7sFSVCDqMM7Ecu eL05qpwIUMATGJkcg8FJ22t5FsORGBEIGVyxbcq36v8bnuH90O9QWKbkSJoFiaPouCmX0C qlxrqYhzdKd3CZuDY09tZjGdbVaWuTP+/+oS1kWSdU04BIlELBk9of5jZNWkro/vP6+qWE oU4x6p0wg6e80TsxhWumzUtYBw2nj5u8eeDp1jsXisAcRU5uLfae9QlsoyJY/vchS5po/E bmgTYi8wCDWwKaBeGg1c6y1EqHrCwTIEO8Df684ebH2GHpo4Pq8+Eqck5vZB2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d18M95tDxz1027; Tue, 04 Nov 2025 13:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4DOrKe071785; Tue, 4 Nov 2025 13:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4DOrO5071782; Tue, 4 Nov 2025 13:24:53 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:24:53 GMT Message-Id: <202511041324.5A4DOrO5071782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 763f18140d37 - stable/14 - net: Validate interface group names in ioctl handlers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 763f18140d37d848aa6647e88f36dc468207c41d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=763f18140d37d848aa6647e88f36dc468207c41d commit 763f18140d37d848aa6647e88f36dc468207c41d Author: Mark Johnston AuthorDate: 2025-10-27 16:27:13 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 13:24:42 +0000 net: Validate interface group names in ioctl handlers The handlers were not checking that the group names are nul-terminated. Add checks for this. Reported by: Ilja Van Sprundel Reviewed by: zlei MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53344 (cherry picked from commit 32919a34f17ac1af99dec7376f22a8393c251602) --- sys/net/if.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 607bcdd2aa80..0c7e32e858bc 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2850,15 +2850,20 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) break; case SIOCAIFGROUP: + { + const char *groupname; + error = priv_check(td, PRIV_NET_ADDIFGROUP); if (error) return (error); - error = if_addgroup(ifp, - ((struct ifgroupreq *)data)->ifgr_group); + groupname = ((struct ifgroupreq *)data)->ifgr_group; + if (strnlen(groupname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + error = if_addgroup(ifp, groupname); if (error != 0) return (error); break; - + } case SIOCGIFGROUP: { struct epoch_tracker et; @@ -2870,15 +2875,20 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) } case SIOCDIFGROUP: + { + const char *groupname; + error = priv_check(td, PRIV_NET_DELIFGROUP); if (error) return (error); - error = if_delgroup(ifp, - ((struct ifgroupreq *)data)->ifgr_group); + groupname = ((struct ifgroupreq *)data)->ifgr_group; + if (strnlen(groupname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + error = if_delgroup(ifp, groupname); if (error != 0) return (error); break; - + } default: error = ENOIOCTL; break; @@ -3022,9 +3032,17 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td) goto out_noref; case SIOCGIFGMEMB: - error = if_getgroupmembers((struct ifgroupreq *)data); - goto out_noref; + { + struct ifgroupreq *req; + req = (struct ifgroupreq *)data; + if (strnlen(req->ifgr_name, IFNAMSIZ) == IFNAMSIZ) { + error = EINVAL; + goto out_noref; + } + error = if_getgroupmembers(req); + goto out_noref; + } #if defined(INET) || defined(INET6) case SIOCSVH: case SIOCGVH: From nobody Tue Nov 4 13:24:52 2025 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 4d18M902dsz6G4Cg; Tue, 04 Nov 2025 13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d18M85P1tz3xTj; Tue, 04 Nov 2025 13: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=1762262692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSahiKcMXazhJPpiCpSrk3vVhKFw0n+rzTjjk133H0U=; b=pujXeVSZGmh0vFshdmHmAJUnDCmNG5KY8F09J6R7sV0pOeOH9N+YT4n4XnF1JBnfKF0DBh zL8E3pPKklv0UlzKw1Ufaiksm5NcJdwkL/vJ0wdKnZtw4SjuAxwJTgfje7Mji5qy6mkfkL C1VF3UH/gVUyL6iWG/YYpRA+JrjDm+pGsdArmTVjh4qu4H5kIjH6wU0fDvz3O4pjahLy09 XINo1ax7YB/pqjKG4Bb6lmrzajHf7rMBGt6expT2vWchLIQG0bPKf5Lszj3rneCfbJ72Ec Pg1Yws1ANF9vJWN/m57VDBwN5s7nvREtcB+MFGDM7DZ9idjes/5e2sO3xgNRsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762262692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSahiKcMXazhJPpiCpSrk3vVhKFw0n+rzTjjk133H0U=; b=HEhtmh0tzjDn/fPkJL4vzcWRzFSLVqhmHId+FeR1VUKk6wCs8CvZV2gzUV8X7oHclZicnC S6qjracxuGPD3MqHGPHAFJAB3vWZ7bH76EWiO1IgMC1EvBll3MtdeeIKpfrr4XOEfhBYHi YCQwW8QR/+j9dVckgUEJQN+TQ5TjjeWLOAO8rsqUBrIPcW4QImh7kG8KuYGv8LW+lHtNTQ p5EDe6H+odYVVrWVyFrm9jYh/TLvOZnIs5MJXdwqh7jYZFiIPw695/pGmx8Jf6d4y2rKKc Kd4A9DB1z62tLRjVOf9VybvNX9Cxv29oj6CqlaBngAZQwIASnbhUGdzRLRfIvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762262692; a=rsa-sha256; cv=none; b=SilujY8Z8MWNndZL8eMnLj1XvWBb3lU7sZ41XfZQvxK8Vjr2ciN8PV6Kkc5nGYo9/oPopj XKlZNix8caIRVlmaIyj350AMddoFzOHW1cPGeZ+4DUqpIVd1SAI18xQpV5LKtgcMDMI2xS rfm1eydgMw4KQXmOSbys4ULZje5bem0kHyQNG/NWNuCAYcdr3vfvj8CJzm9cQkw6TDB43s PKvrxBDm/aBXd6orHSr1oXjT9f4spltFaMYZe035KMp8goi2waWtbhBzzAtOUKFt8ao6q7 rgoQfW+2HYbWmxI0P6KyIJAauQ/tjMuJnj3bhwoxYQ0hRyveUjPpUo2ibXZzCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d18M84xP3zyXk; Tue, 04 Nov 2025 13:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4DOq96071744; Tue, 4 Nov 2025 13:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4DOqlQ071741; Tue, 4 Nov 2025 13:24:52 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:24:52 GMT Message-Id: <202511041324.5A4DOqlQ071741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9769eb9282ea - stable/14 - altq: Clear stats structures in get_class_stats() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 9769eb9282ea7cd27210076adf1946b9235aa916 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9769eb9282ea7cd27210076adf1946b9235aa916 commit 9769eb9282ea7cd27210076adf1946b9235aa916 Author: Mark Johnston AuthorDate: 2025-10-27 16:27:40 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 13:24:42 +0000 altq: Clear stats structures in get_class_stats() These structures are copied out to userspace, and it's possible to leak uninitialized stack bytes since these routines and their callers weren't careful to clear them first. Add memsets to avoid this. Reported by: Ilja Van Sprundel Reviewed by: kp, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53342 (cherry picked from commit ff08916e9ac689e6ce734de72325fc2bd9495a35) --- sys/net/altq/altq_cbq.c | 2 ++ sys/net/altq/altq_fairq.c | 2 ++ sys/net/altq/altq_priq.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sys/net/altq/altq_cbq.c b/sys/net/altq/altq_cbq.c index fdf39690160b..2333b9ea8678 100644 --- a/sys/net/altq/altq_cbq.c +++ b/sys/net/altq/altq_cbq.c @@ -173,6 +173,8 @@ cbq_request(struct ifaltq *ifq, int req, void *arg) static void get_class_stats(class_stats_t *statsp, struct rm_class *cl) { + memset(statsp, 0, sizeof(*statsp)); + statsp->xmit_cnt = cl->stats_.xmit_cnt; statsp->drop_cnt = cl->stats_.drop_cnt; statsp->over = cl->stats_.over; diff --git a/sys/net/altq/altq_fairq.c b/sys/net/altq/altq_fairq.c index 6069865101a0..0a00168e547e 100644 --- a/sys/net/altq/altq_fairq.c +++ b/sys/net/altq/altq_fairq.c @@ -857,6 +857,8 @@ get_class_stats(struct fairq_classstats *sp, struct fairq_class *cl) { fairq_bucket_t *b; + memset(sp, 0, sizeof(*sp)); + sp->class_handle = cl->cl_handle; sp->qlimit = cl->cl_qlimit; sp->xmit_cnt = cl->cl_xmitcnt; diff --git a/sys/net/altq/altq_priq.c b/sys/net/altq/altq_priq.c index 026346639b2e..fec488418546 100644 --- a/sys/net/altq/altq_priq.c +++ b/sys/net/altq/altq_priq.c @@ -597,6 +597,8 @@ priq_purgeq(struct priq_class *cl) static void get_class_stats(struct priq_classstats *sp, struct priq_class *cl) { + memset(sp, 0, sizeof(*sp)); + sp->class_handle = cl->cl_handle; sp->qlength = qlen(cl->cl_q); sp->qlimit = qlimit(cl->cl_q); From nobody Tue Nov 4 13:24:54 2025 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 4d18MC32ctz6G46b; Tue, 04 Nov 2025 13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d18MC0JC6z3xt3; Tue, 04 Nov 2025 13: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=1762262695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFcNdVzvXvWAgDEGgkN4BpUmNZbgQqc5VHs4qI6ISjE=; b=g3+IQ+USa+dRtw4ADbMMuZEBj5fwYWMzjLJrXQiZRI6iA2RnQ8Ur8/R8kvci1e1zbpdolE h4zxchOPT0V36ONhZ3hI9WiIAptgFhjmWcORD63TpRDS7UJkltOPoolZQLgeu0NXfbVYEg z9sP+l+fTmsp8h3elPEut7GzMb8jzIn0GgmDKLlwATO3GpjGiKn5RgnCyO+0mFrsFdnO0U BsYBZOe2vKty0+3akdW/N4Dl9nCQR0+9ZrEnxOfJwg3LAlxg5e+h0Ixte4dJoDxGiEYGgo kuJdo+BOmOyuMxS5LHrRL5XpCfHJjfFZbyjZQhTHNU3TvIE3KuN1pmJp0vwEdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762262695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFcNdVzvXvWAgDEGgkN4BpUmNZbgQqc5VHs4qI6ISjE=; b=P5ho2hoMLLoWBmy3FYk8VujyqUP4xH/G9ZDvOEgxGaUXWv4srDUe7jkY0xy47oT34hJqh8 MA3yqvji56uR2Qs+45uGGqUoUFgzvCb92DqALfJY9IzNLs9EEC0IhRXePuWD1nX83pQ+yW ETQSkLfIjI2MtULpK5zcf0JGcVDH5IOKxdc4o8bSTlSd54MyBThgBFw2a1usoyVPi0ucB3 Of+1oEwAaDWumCzrkFtBwIPBWPJMPBcGpQwrVtc2lGAhcaEWqmaCjyvzYE+N8nwXInlQ2w 8NQgux/IQJ6eAPn/6quv9qLS8XPDy8d/DCyCqALy0H33dhEiVKWLxUGAoy/pMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762262695; a=rsa-sha256; cv=none; b=O1EVK9EimxEWu7sh6RNXJAkTxbWvrcNGLx3kn3KxSqiYP3fVrGiZ4qWUDgj5kh673Va/up pP0uSFVxhVubBsUr3lPU5/YwTvtOT9m6/mk9j9zEZjYpfHvSoFrmzK1PX9wuW6p+jDs92X k1T13T/tzAzwvHhe8b6tDPsijJospDcv+qvQkZa/Ji5veXebLqEQ6aA7t7FsrNXeHX+4n2 BsM5akA8N/NLfoG+B2Vi3HIRE/jTHtwC4Y6XiYoeQngC0SG5ysMFsBgP/rxtSg+3oXAypT S0AF8pBz3MW0MuIcjRSgJz31QPNEV1lV0lKvcwaZvihNxve00oytScN+AAXNCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d18MB6sWQzyXl; Tue, 04 Nov 2025 13:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4DOsSa071820; Tue, 4 Nov 2025 13:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4DOsIR071817; Tue, 4 Nov 2025 13:24:54 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:24:54 GMT Message-Id: <202511041324.5A4DOsIR071817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9b4c38bb8948 - stable/14 - dtrace/arm64: properly traverse the symbol table List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 9b4c38bb8948557fe1983280ac0e78db4209eb8d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9b4c38bb8948557fe1983280ac0e78db4209eb8d commit 9b4c38bb8948557fe1983280ac0e78db4209eb8d Author: Konrad Witaszczyk AuthorDate: 2025-10-28 16:09:24 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 13:24:42 +0000 dtrace/arm64: properly traverse the symbol table LINKER_EACH_FUNCTION_NAMEVAL() stops processing the symbol table if a callback function returns a non-zero value. The fbt_provide_module_function() callback should not return 1 when ignoring symbols. Instead, always return 0, as in dtrace/x86. Fixes: 30b68ecda84e ("Changes that improve DTrace FBT reliability on freebsd/arm64:") Reviewed by: markj, oshogbo Approved by: oshogbo (mentor) Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D53399 (cherry picked from commit 2acdec9e4d915ec61d0ca45b408f9beb7aa4b772) --- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index fd666770d3a2..b265f6a1e23e 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -105,7 +105,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx, */ if (strcmp(name, "handle_el1h_sync") == 0 || strcmp(name, "do_el1h_sync") == 0) - return (1); + return (0); instr = (uint32_t *)(symval->value); limit = (uint32_t *)(symval->value + symval->size); From nobody Tue Nov 4 15:29:22 2025 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 4d1C6p32yTz6GFZv; Tue, 04 Nov 2025 15:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1C6p2Jy7z3QSX; Tue, 04 Nov 2025 15:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762270162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/vsotggKqqD1RbhdopiyHmYHPjlO7UYSw2C4vn9G30c=; b=rD1i+lh5eVwTrOZPlK/WMnNtcF1B6hWY+3IStCxcPAbtyuwmIJbAE4eiclaK6kHt1rY1JV /Xt9iX7/a+pkCLul+iTOQNjWW4mI7VByw3r20GOdfs43HvKrUyt6V5x08OxfvKXcFd1M7a PkI5XU3aa9wrd/0chGRHAJ/oe3N6yaShiz/nXQQl5YjkxRhSZUoKPhz3jr0WmmJZEWIroF UUmY9slaCN9eZ37PKG88HNg4nH1uDvrMmgYEgcMJdj7qaj4ZQ8x6xq9tnogaAex8Gg/tQg 5Pqxqe9TF6BfBqInBlyPJDSdqq6qijWB9/uRJftR+Qw0q9Z11752lCV3n6QA9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762270162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/vsotggKqqD1RbhdopiyHmYHPjlO7UYSw2C4vn9G30c=; b=qY0h3Olnf0dZw1Ve5v0XME4aOKZZE6icfkE1EO4VUOHIZ2VLpQEj4roABJ1Ubq55U6rtpi NmgooPlHlggHjdzh3slqRwZlpvRWz1NI3xesV/IOt1pJdl4hlF/Ey3gAbH02bCFcm9tppk MP+pYBn53T3l/igG19BG41MJ7rXq9xf9oIpw1r+vaoCJwsdmCE8P36WGGugmu70BKRGrtk 9b0z+AXP11k0lBL0wmseFcXiZyV3lJBHfVDecrYsfpFfSKVzJ9sQUqSDfGqxIflgdqWolf rX+P5tVaKSboJly9VDfbLyKA4kbtZO1GbtEsRzSnRw43a1Puov1jywpTnImRMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762270162; a=rsa-sha256; cv=none; b=dXDNLm4TL4D/+ALBNiNQxoCbbWmW7o+CbMGJtO85hcNNkwpU8QaH37Kqpqx617RGFzQCri 0sD4Klm5QgjaKPf4+OBafbvEYoNU3uuZXc0QYr1pbPoGRutxtCClPdYE9/SkhiELHcte2a XQIm3ow+nuz1Xr016AddjdhzSt2oh5yG8QtVnA8wF5PYMtWZnUHV1ivo32lo28S8HXrDur QkWUSg+pI+TwNnDi6rqhG/rX38FC5hSOVx5QXMsWJBp8UtIiwB06SPVF4Bj6Yd6GfaOOEL wbQ06PJeRJMBdZGIXLEFQs1KjRlLJtK6XmsOpoVZNV0hV30ZD7L/QLVzFoaEnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1C6p1mfGz12nL; Tue, 04 Nov 2025 15:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4FTMLc099611; Tue, 4 Nov 2025 15:29:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4FTMfc099608; Tue, 4 Nov 2025 15:29:22 GMT (envelope-from git) Date: Tue, 4 Nov 2025 15:29:22 GMT Message-Id: <202511041529.5A4FTMfc099608@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 05a3f80efe91 - stable/15 - id: Fix WITHOUT_AUDIT build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 05a3f80efe91b2cb9856ffd6c4a68d06117da824 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=05a3f80efe91b2cb9856ffd6c4a68d06117da824 commit 05a3f80efe91b2cb9856ffd6c4a68d06117da824 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:45:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-04 15:29:19 +0000 id: Fix WITHOUT_AUDIT build Rather than add more ifdefs, trust the compiler to optimize Aflag away. Fixes: 70b72ede982f ("id: Clean up") PR: 290740 MFC after: 3 days (cherry picked from commit 92a533ed1d3c81a772815f90cc9aff9237a4429c) --- usr.bin/id/id.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 5f9d2670caa3..7ba07daad11e 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -67,19 +67,13 @@ main(int argc, char *argv[]) { struct group *gr; struct passwd *pw; -#ifdef USE_BSM_AUDIT - bool Aflag; -#endif - bool Gflag, Mflag, Pflag; + bool Aflag, Gflag, Mflag, Pflag; bool cflag, dflag, gflag, nflag, pflag, rflag, sflag, uflag; int ch, combo, error, id; const char *myname, *optstr; char loginclass[MAXLOGNAME]; -#ifdef USE_BSM_AUDIT - Aflag = false; -#endif - Gflag = Mflag = Pflag = false; + Aflag = Gflag = Mflag = Pflag = false; cflag = dflag = gflag = nflag = pflag = rflag = sflag = uflag = false; myname = getprogname(); From nobody Tue Nov 4 15:29:41 2025 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 4d1C795cHXz6GFmJ; Tue, 04 Nov 2025 15:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1C794DZXz3Qnb; Tue, 04 Nov 2025 15:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762270181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+69fKPTWdrDuq3ocsl/j7B6IutMGDoJe19pmoAjYoU=; b=atN+lszxbOJmTXBIjQIzy+bwv19203uqph+Zhs/AcUyaqCj2Ten2rm8Ezo/a1tuGebst5b HEN1AZu75plWHZ2sXwRlKF7geGKqmaurU9EgoEkXGKU3IHCTKsASsWZa2KsTv8MzmrDhJo fKNEB7hq4vXUZT2NlOVN/ESIrxBVheWzgF0ToSEuunZ4xb43h1mzGBSNW70eBP9/O2CbPn bRyxpbxRsQNP8aPG36PGoVOcEHK3iFfE1EFZHeg3ZAeOXzGbw27Ml9NpCfXqOdMBcr3ATl m+ZWq3S/ekerVUq9DmdCdey6GjaQTJqiKIuZ8qpD2Jx9/N6JVwQKXxY154gboA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762270181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+69fKPTWdrDuq3ocsl/j7B6IutMGDoJe19pmoAjYoU=; b=AApQxhTelCe6t/RE22O9foPLDaHBE+3Se76y0B2Yof4lt96ZKKCsMTIkayzCWhxW7t1zgQ fGBG/OMTSYHSLJzOvX8tZBOqUs37oHNj148q2j3wB9fW0KPDoz18u/x3AWucx/HMVeTsPM MeptKewZnJ6LXlu1tDQMNH8Rt3NKfyJHtnRVAbyoaVQQS/p/xP24VQDkdaurYn8vyServI pPKJKeF8tAjbCfqvVhQ+JsFhJBxNZC7Z8xB4goDZ2JHyYpr2NKXJ2inepA1optu7I7WfWk qHq8hHeJ+50Cul/fleM8R0ZHZ2pk0NEI91+NIyBFmDoHexgfpwRcErASSqx3mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762270181; a=rsa-sha256; cv=none; b=Z+yzpZAsnya1vyDEtpCPNv3i9m8NzC8LUvf40ekZAQPv486u+BmHTsJDAq3Qyzlybl/HT7 zN9zOerA/6aJkK1lZcvggpHx3+oL6Y76eeg9vpItiAzbW9KhreKYPnx2JrX/IDPj/i4sMJ +epeWAJJ6+B7UvkkgdWb4fYnnnO4v3viyT8CaYcAa/zPvABQgK2rnpIXx6p5iybxNUxcSq R5GhAT6HCItpXmow9Aaga7IcFsXpvqYsgYd2QEaDEKVrJjTb6Kf+/vYrUdaM/8a4rTbVQn Lsp+zkRZp+xNDoabEO/eA4geoErcvvLpzklIzjJhXIQdr/6fPll9ycQ7SVeijw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1C793rC4z136n; Tue, 04 Nov 2025 15:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4FTfpf099844; Tue, 4 Nov 2025 15:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4FTfVv099841; Tue, 4 Nov 2025 15:29:41 GMT (envelope-from git) Date: Tue, 4 Nov 2025 15:29:41 GMT Message-Id: <202511041529.5A4FTfVv099841@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: c64b594a3064 - stable/14 - id: Fix WITHOUT_AUDIT build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: c64b594a306480b567ed7132947459af9cc6aec5 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c64b594a306480b567ed7132947459af9cc6aec5 commit c64b594a306480b567ed7132947459af9cc6aec5 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:45:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-04 15:29:38 +0000 id: Fix WITHOUT_AUDIT build Rather than add more ifdefs, trust the compiler to optimize Aflag away. Fixes: 70b72ede982f ("id: Clean up") PR: 290740 MFC after: 3 days (cherry picked from commit 92a533ed1d3c81a772815f90cc9aff9237a4429c) --- usr.bin/id/id.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 238c6f2bf709..342a891e4165 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -79,19 +79,13 @@ main(int argc, char *argv[]) { struct group *gr; struct passwd *pw; -#ifdef USE_BSM_AUDIT - bool Aflag; -#endif - bool Gflag, Mflag, Pflag; + bool Aflag, Gflag, Mflag, Pflag; bool cflag, dflag, gflag, nflag, pflag, rflag, sflag, uflag; int ch, combo, error, id; const char *myname, *optstr; char loginclass[MAXLOGNAME]; -#ifdef USE_BSM_AUDIT - Aflag = false; -#endif - Gflag = Mflag = Pflag = false; + Aflag = Gflag = Mflag = Pflag = false; cflag = dflag = gflag = nflag = pflag = rflag = sflag = uflag = false; myname = getprogname(); From nobody Tue Nov 4 15:52:24 2025 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 4d1CdR2L3bz6GHDs; Tue, 04 Nov 2025 15:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1CdP18Bhz3VSf; Tue, 04 Nov 2025 15:52:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762271545; h=from:from:reply-to:subject:subject: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+BQf6fsSMIzEehmtd8BqktiTb/RweuZhm5MpiGsu7s=; b=IUN1++F3/7rykXWnzVRHhoZ3vBpmRrnA778Xt7/afzziDsYPB8j/UicQKRoUCHxQitlnxR +DEtbc2DbdJaW1HaXfViDaY4fCgPv5MFyH88mb1UxbalOUIOJbzHXmDVumCFlp+S82Wadb Bj7X+mzEsD0uNXUokvO9AEnR9qstxWF69POLPCXItg/DHY94MupSyNhxH1RKHGP0FfCESO MxcItE8iOuNPZ0SBIy+ahVjxG9VwxVampWBykQif2y3vph4XnaiUgj85btsqo/ZplDnDSv cEy5hxvyB7d1r5PYEURAlJoLLDxxv6q76K9fitymBunUlCNu00mYgjproH0FpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762271545; h=from:from:reply-to:subject:subject: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+BQf6fsSMIzEehmtd8BqktiTb/RweuZhm5MpiGsu7s=; b=T0L19k/jkJIBbFd0ytRULcBdAY6GFjdY4DIkg6qYcojC3wCE4CXs5wHUsOtDK/bTJdL5dB tFhnRUxzriCY3PtnuSQxeyT3OJLf1J6tWM0Mcq41UBjH1Xec0xV5wWArerplU/C/3kDfO7 L8VBT9cDSARwCpNzuYM3yD4KKzkqpqr33PlLVr/szuh8tbjLu597Z/k+dw75lFCphntCab aBLqpGO4qL7Mecd0XaVp4IxYhEJVbwAsOaLph8CGt+RS0/8De87BAlxkEDOId0Sx9SnXFk RIFBbYtaOBjU0eigEmPYoZAi9z6FsJi1AHxc4kxvbsBwB4W78X0gS7lcxsZUiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762271545; a=rsa-sha256; cv=none; b=Pm20pxPLgGz3VE4HkED+Ax18WwtvgZDTDY3IbSHx9DbopIh6+A4UnBuYScVI7gpCr7QiOq OlT65nt7A+HpMybgDdEhOX/MFErJ07D1u0+eEXUbfCGVT5ZvHOGhixEqfSsPBBTm+X8WTD Jcb8r+HhY2kclPUkRJyZ5CBsSbUq41hBwJ96BDkghONadw/b3rtelEIElkIHo8WI6fZLtO c34E2mvCiviiHLEtRxuNetDrGHYv29AicbAaHaKT/CvuijtvsLjwEX04FGrWa80aeskRm3 fANrtX+Zb0znwN8jLZa+7sHv5GRJJ577HJ9yzaSh/j+etwC0MwLDTaj+BPiZHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1CdP0KC2z13Ws; Tue, 04 Nov 2025 15:52:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4FqO5Y054064; Tue, 4 Nov 2025 15:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4FqOFI054061; Tue, 4 Nov 2025 15:52:24 GMT (envelope-from git) Date: Tue, 4 Nov 2025 15:52:24 GMT Message-Id: <202511041552.5A4FqOFI054061@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 887e686fc935 - stable/15 - pjdfstest: Fix link count 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 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: 887e686fc9358fb4f08c4b46ce917dee18b9056c Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=887e686fc9358fb4f08c4b46ce917dee18b9056c commit 887e686fc9358fb4f08c4b46ce917dee18b9056c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-30 20:18:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-04 15:52:11 +0000 pjdfstest: Fix link count test This UFS-only test verifies that attempting to create more links than permitted by the file system returns EMLINK, but has been broken ever since UFS_LINK_MAX was increased because a) it hardcodes the previous value of UFS_LINK_MAX, and b) the new value requires more space than the test allocates, so it ends up getting ENOSPC instead of EMLINK. * Switch to retrieving {PC_LINK_MAX} at runtime. * Stop the test when we reach {PC_LINK_MAX} links. This ensures that we don't go on for hours if the actual limit turns out to be much higher than we anticipated (e.g. INT64_MAX on ZFS). * Double the size of the test filesystem. MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Fixes: 35a301555bff ("Increase UFS/FFS maximum link count from 32767 to 65530.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53442 (cherry picked from commit 6c86379b0d0deb2750a662579f63d71ffa519e81) --- contrib/pjdfstest/tests/link/05.t | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/pjdfstest/tests/link/05.t b/contrib/pjdfstest/tests/link/05.t index 5a18c2103e1d..e6a7d1cc8201 100644 --- a/contrib/pjdfstest/tests/link/05.t +++ b/contrib/pjdfstest/tests/link/05.t @@ -2,7 +2,7 @@ # vim: filetype=sh noexpandtab ts=8 sw=8 # $FreeBSD: head/tools/regression/pjdfstest/tests/link/05.t 211352 2010-08-15 21:24:17Z pjd $ -desc="link returns EMLINK if the link count of the file named by name1 would exceed 32767" +desc="link returns EMLINK if the link count of the file named by name1 would exceed {PC_LINK_MAX}" dir=`dirname $0` . ${dir}/../misc.sh @@ -16,19 +16,20 @@ n1=`namegen` n2=`namegen` expect 0 mkdir ${n0} 0755 -n=`mdconfig -a -n -t malloc -s 1m` || exit +n=`mdconfig -a -n -t malloc -s 2m` || exit newfs -i 1 /dev/md${n} >/dev/null || exit mount /dev/md${n} ${n0} || exit +link_max=`${fstest} pathconf ${n0} _PC_LINK_MAX` expect 0 create ${n0}/${n1} 0644 i=1 -while :; do +while [ ${i} -le ${link_max} ]; do link ${n0}/${n1} ${n0}/${i} >/dev/null 2>&1 if [ $? -ne 0 ]; then break fi i=`expr $i + 1` done -test_check $i -eq 32767 +test_check $i -eq ${link_max} expect EMLINK link ${n0}/${n1} ${n0}/${n2} From nobody Tue Nov 4 16:05:37 2025 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 4d1Cwd6D1Bz6GJdT; Tue, 04 Nov 2025 16:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Cwd53wqz3X3P; Tue, 04 Nov 2025 16:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E6JC1rIHWt6eCgNKzuCYnoQ6SKofmUgtVPhpyrB176A=; b=nc/K6wEfHCD3FtRWDq/Sdbk5fYBt5KuZ60MSkgdfN/9ZMDI4fsb5ZCG/neBfwG2MPMpB9h 1rCcRDBA4NzldMk4xVWAd0IaKjwgiBx3Paxjk4nrrJ4nPl7QvswQzHtjfRXMIEftQLhUNA BOkdyr/tU9vgMCMpdR4fv93OoMgjY9adTc+IYjZupgV4dtB2VHFNHyCmsuAdW+LqmnOP+B Wxjns4feFSHztYT+Sh/TY/4axfciyAmOONEApivEynzcNJdTkRe3up738QbmLtXcCTwoJi H1e6Cyyz+OiEnuiQgXaTpIhGLIy53TtuXskLrFckct271xvJWAZLTnf4dVKqIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E6JC1rIHWt6eCgNKzuCYnoQ6SKofmUgtVPhpyrB176A=; b=mvDUB8sinYIYyTCFxZd1hQm/b0gxlxvJ7R/4CEMmm2qRQSOz+D9zxunfCzliUUBniva6Tf X+qN+VW6w3lP8VvT+TxyprGAMMDslVq0UbIfWzaEFfIxZ4R9MWSfCET2aD78dcf8mX9lCX ECZK2ZEnUVd9c771gO4b2J0TgJ//jz7APa1AzjkQ57huSMS85Tlxb3T/mf1JSFzd5ozSxe RHqyOvZj+cBopPxw4Xi8X8DdQCFxbay4FwMjdzTB0oqa9N32HOI/1ERd0iIbmwhD60+JZT 0Pm7XQAoMkUTcIJ+0obfEnOpbKb0RBW5IjBKym9GXmtgZgLQmZ4NrHan23R+vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762272337; a=rsa-sha256; cv=none; b=OvZjhj6PVMrrv8hhtlp9HMZtz7ZaciLrEugmRlr/ppyXixDnV97hgmC3wEVLwsuV0u/r/Z sNfseNnCOjsVb261sXLNjXZf1VTi09VqCgFFrrPSLmZucHYMCSGenK/b7Elzi5AExuWRv0 j81JkQvZQXisH0YXHwVvvbpn6jdxGgdxL02gSY1pEkifbJA1s+PhrqnDsbvJ0Tw47oHjSG klOSxokw/GHsHNNjD68hcHh8zDOcl4Q2etueN7B+E9RI86mg2Dxl7yFXsbcxcv7rX4RZ7H Hfv4MbBsCYGGa3XeyvVw1sMZhz4L7ircGW+X8m3+hc/iWQytQU64ixKzqMOi8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Cwd42Vnz13nG; Tue, 04 Nov 2025 16:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4G5bDc075443; Tue, 4 Nov 2025 16:05:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4G5bUe075440; Tue, 4 Nov 2025 16:05:37 GMT (envelope-from git) Date: Tue, 4 Nov 2025 16:05:37 GMT Message-Id: <202511041605.5A4G5bUe075440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 3e979746ab99 - stable/15 - Update the installed manpages to match OpenSSL 3.5.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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3e979746ab99a2f5c99813cc2083c69fcbadbbb2 Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3e979746ab99a2f5c99813cc2083c69fcbadbbb2 commit 3e979746ab99a2f5c99813cc2083c69fcbadbbb2 Author: Enji Cooper AuthorDate: 2025-09-07 21:23:01 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:02:54 +0000 Update the installed manpages to match OpenSSL 3.5.1 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52008 (cherry picked from commit fdb3b695a4d19f098367be4fe2df51bec991170d) --- secure/lib/libcrypto/man/man3/Makefile | 4883 +++++++++++++++++++------------- secure/lib/libcrypto/man/man7/Makefile | 38 +- 2 files changed, 2853 insertions(+), 2068 deletions(-) diff --git a/secure/lib/libcrypto/man/man3/Makefile b/secure/lib/libcrypto/man/man3/Makefile index 46d20013e0ac..0fc9cc100077 100644 --- a/secure/lib/libcrypto/man/man3/Makefile +++ b/secure/lib/libcrypto/man/man3/Makefile @@ -670,67 +670,81 @@ MAN+= i2d_PKCS7_bio_stream.3 MAN+= i2d_re_X509_tbs.3 MAN+= o2i_SCT_LIST.3 MAN+= s2i_ASN1_IA5STRING.3 -MLINKS+= X509_dup.3 ACCESS_DESCRIPTION_free.3 -MLINKS+= X509_dup.3 ACCESS_DESCRIPTION_new.3 -MLINKS+= X509_dup.3 ADMISSIONS_free.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_get0_admissionAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_get0_namingAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_get0_professionInfos.3 -MLINKS+= X509_dup.3 ADMISSIONS_new.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_set0_admissionAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_set0_namingAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_set0_professionInfos.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX.3 -MLINKS+= X509_dup.3 ADMISSION_SYNTAX_free.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX_get0_admissionAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX_get0_contentsOfAdmissions.3 -MLINKS+= X509_dup.3 ADMISSION_SYNTAX_new.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX_set0_admissionAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX_set0_contentsOfAdmissions.3 -MLINKS+= X509_dup.3 ASIdOrRange_free.3 -MLINKS+= X509_dup.3 ASIdOrRange_new.3 -MLINKS+= X509_dup.3 ASIdentifierChoice_free.3 -MLINKS+= X509_dup.3 ASIdentifierChoice_new.3 -MLINKS+= X509_dup.3 ASIdentifiers_free.3 -MLINKS+= X509_dup.3 ASIdentifiers_new.3 -MLINKS+= ASN1_aux_cb.3 ASN1_AUX.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_get0_authorityId.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_get0_authorityText.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_get0_authorityURL.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_set0_authorityId.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_set0_authorityText.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_set0_authorityURL.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFOS.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_addProfessionInfo.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_namingAuthority.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_professionItems.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_professionOIDs.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_registrationNumber.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_addProfessionInfo.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_namingAuthority.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_professionItems.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_professionOIDs.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_registrationNumber.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_d2i.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_d2i_ex.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_free_func.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_i2d.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_new_ex_func.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_new_func.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_print_func.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 IMPLEMENT_EXTERN_ASN1.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_get.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_get_int64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_set.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_set_int64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_to_BN.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_adj.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_check.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_dup.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_print.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_set.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_set_string.3 -MLINKS+= ASN1_INTEGER_new.3 ASN1_INTEGER_free.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_get.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_get_uint64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_set.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_set_int64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_set_uint64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_to_BN.3 -MLINKS+= X509_dup.3 ASN1_ITEM.3 +MLINKS+= ASN1_INTEGER_get_int64.3 BN_to_ASN1_ENUMERATED.3 +MLINKS+= ASN1_INTEGER_get_int64.3 BN_to_ASN1_INTEGER.3 +MLINKS+= ASN1_INTEGER_new.3 ASN1_INTEGER_free.3 MLINKS+= ASN1_ITEM_lookup.3 ASN1_ITEM_get.3 MLINKS+= ASN1_OBJECT_new.3 ASN1_OBJECT_free.3 -MLINKS+= ASN1_aux_cb.3 ASN1_PRINT_ARG.3 -MLINKS+= ASN1_aux_cb.3 ASN1_STREAM_ARG.3 MLINKS+= ASN1_STRING_TABLE_add.3 ASN1_STRING_TABLE.3 MLINKS+= ASN1_STRING_TABLE_add.3 ASN1_STRING_TABLE_cleanup.3 MLINKS+= ASN1_STRING_TABLE_add.3 ASN1_STRING_TABLE_get.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_cmp.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_data.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_dup.3 -MLINKS+= ASN1_STRING_new.3 ASN1_STRING_free.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_get0_data.3 -MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print.3 -MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print_ex_fp.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_set.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_to_UTF8.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_type.3 +MLINKS+= ASN1_STRING_new.3 ASN1_STRING_free.3 MLINKS+= ASN1_STRING_new.3 ASN1_STRING_type_new.3 +MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print.3 +MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print_ex_fp.3 +MLINKS+= ASN1_STRING_print_ex.3 ASN1_tag2str.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_adj.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_check.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_dup.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_print.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_set.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_set_string.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_adj.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_check.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_cmp_time_t.3 @@ -744,11 +758,6 @@ MLINKS+= ASN1_TIME_set.3 ASN1_TIME_set_string.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_set_string_X509.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_to_generalizedtime.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_to_tm.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_cmp.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_pack_sequence.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_set.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_set1.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_unpack_sequence.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_adj.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_check.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_cmp_time_t.3 @@ -756,15 +765,15 @@ MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_dup.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_print.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_set.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_set_string.3 -MLINKS+= OPENSSL_load_builtin_modules.3 ASN1_add_oid_module.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_cmp.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_pack_sequence.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_set.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_set1.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_unpack_sequence.3 +MLINKS+= ASN1_aux_cb.3 ASN1_AUX.3 +MLINKS+= ASN1_aux_cb.3 ASN1_PRINT_ARG.3 +MLINKS+= ASN1_aux_cb.3 ASN1_STREAM_ARG.3 MLINKS+= ASN1_aux_cb.3 ASN1_aux_const_cb.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_d2i.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_d2i_ex.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_free_func.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_i2d.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_new_ex_func.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_new_func.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_print_func.3 MLINKS+= ASN1_generate_nconf.3 ASN1_generate_v3.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i_bio_ex.3 @@ -772,15 +781,15 @@ MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i_ex.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i_fp.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i_fp_ex.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_i2d_mem_bio.3 +MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_pack.3 +MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_unpack.3 +MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_unpack_ex.3 MLINKS+= ASN1_item_new.3 ASN1_item_new_ex.3 MLINKS+= ASN1_item_sign.3 ASN1_item_sign_ctx.3 MLINKS+= ASN1_item_sign.3 ASN1_item_sign_ex.3 MLINKS+= ASN1_item_sign.3 ASN1_item_verify.3 MLINKS+= ASN1_item_sign.3 ASN1_item_verify_ctx.3 MLINKS+= ASN1_item_sign.3 ASN1_item_verify_ex.3 -MLINKS+= ASN1_STRING_print_ex.3 ASN1_tag2str.3 -MLINKS+= X509_dup.3 ASRange_free.3 -MLINKS+= X509_dup.3 ASRange_new.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_STATUS_EAGAIN.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_STATUS_ERR.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_STATUS_OK.3 @@ -795,21 +804,19 @@ MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_WAIT_CTX_get_status.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_WAIT_CTX_set_callback.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_WAIT_CTX_set_status.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_WAIT_CTX_set_wait_fd.3 -MLINKS+= ASYNC_start_job.3 ASYNC_block_pause.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_callback_fn.3 +MLINKS+= ASYNC_start_job.3 ASYNC_block_pause.3 MLINKS+= ASYNC_start_job.3 ASYNC_cleanup_thread.3 MLINKS+= ASYNC_start_job.3 ASYNC_get_current_job.3 +MLINKS+= ASYNC_start_job.3 ASYNC_get_mem_functions.3 MLINKS+= ASYNC_start_job.3 ASYNC_get_wait_ctx.3 MLINKS+= ASYNC_start_job.3 ASYNC_init_thread.3 MLINKS+= ASYNC_start_job.3 ASYNC_is_capable.3 MLINKS+= ASYNC_start_job.3 ASYNC_pause_job.3 +MLINKS+= ASYNC_start_job.3 ASYNC_set_mem_functions.3 +MLINKS+= ASYNC_start_job.3 ASYNC_stack_alloc_fn.3 +MLINKS+= ASYNC_start_job.3 ASYNC_stack_free_fn.3 MLINKS+= ASYNC_start_job.3 ASYNC_unblock_pause.3 -MLINKS+= X509_dup.3 AUTHORITY_INFO_ACCESS_free.3 -MLINKS+= X509_dup.3 AUTHORITY_INFO_ACCESS_new.3 -MLINKS+= X509_dup.3 AUTHORITY_KEYID_free.3 -MLINKS+= X509_dup.3 AUTHORITY_KEYID_new.3 -MLINKS+= X509_dup.3 BASIC_CONSTRAINTS_free.3 -MLINKS+= X509_dup.3 BASIC_CONSTRAINTS_new.3 MLINKS+= BF_encrypt.3 BF_cbc_encrypt.3 MLINKS+= BF_encrypt.3 BF_cfb64_encrypt.3 MLINKS+= BF_encrypt.3 BF_decrypt.3 @@ -817,13 +824,9 @@ MLINKS+= BF_encrypt.3 BF_ecb_encrypt.3 MLINKS+= BF_encrypt.3 BF_ofb64_encrypt.3 MLINKS+= BF_encrypt.3 BF_options.3 MLINKS+= BF_encrypt.3 BF_set_key.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_address.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_family.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_free.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_next.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_protocol.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_socktype.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_clear.3 +MLINKS+= BIO_ADDR.3 BIO_ADDR_copy.3 +MLINKS+= BIO_ADDR.3 BIO_ADDR_dup.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_family.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_free.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_hostname_string.3 @@ -833,190 +836,275 @@ MLINKS+= BIO_ADDR.3 BIO_ADDR_rawaddress.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_rawmake.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_rawport.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_service_string.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_address.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_family.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_free.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_next.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_protocol.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_socktype.3 +MLINKS+= BIO_ADDRINFO.3 BIO_lookup.3 +MLINKS+= BIO_ADDRINFO.3 BIO_lookup_ex.3 +MLINKS+= BIO_ADDRINFO.3 BIO_lookup_type.3 MLINKS+= BIO_connect.3 BIO_accept_ex.3 -MLINKS+= BIO_s_file.3 BIO_append_filename.3 MLINKS+= BIO_connect.3 BIO_bind.3 -MLINKS+= BIO_ctrl.3 BIO_callback_ctrl.3 -MLINKS+= BIO_set_callback.3 BIO_callback_fn.3 -MLINKS+= BIO_set_callback.3 BIO_callback_fn_ex.3 MLINKS+= BIO_connect.3 BIO_closesocket.3 -MLINKS+= BIO_s_datagram.3 BIO_ctrl_dgram_connect.3 -MLINKS+= BIO_s_bio.3 BIO_ctrl_get_read_request.3 -MLINKS+= BIO_s_bio.3 BIO_ctrl_get_write_guarantee.3 +MLINKS+= BIO_connect.3 BIO_listen.3 +MLINKS+= BIO_connect.3 BIO_socket.3 +MLINKS+= BIO_ctrl.3 BIO_callback_ctrl.3 MLINKS+= BIO_ctrl.3 BIO_ctrl_pending.3 -MLINKS+= BIO_s_bio.3 BIO_ctrl_reset_read_request.3 -MLINKS+= BIO_s_datagram.3 BIO_ctrl_set_connected.3 MLINKS+= BIO_ctrl.3 BIO_ctrl_wpending.3 -MLINKS+= BIO_set_callback.3 BIO_debug_callback.3 -MLINKS+= BIO_set_callback.3 BIO_debug_callback_ex.3 -MLINKS+= BIO_s_bio.3 BIO_destroy_bio_pair.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_get_mtu_overhead.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_get_peer.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_recv_timedout.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_send_timedout.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_set_peer.3 -MLINKS+= BIO_s_accept.3 BIO_do_accept.3 -MLINKS+= BIO_s_connect.3 BIO_do_connect.3 -MLINKS+= BIO_socket_wait.3 BIO_do_connect_retry.3 -MLINKS+= BIO_f_ssl.3 BIO_do_handshake.3 MLINKS+= BIO_ctrl.3 BIO_eof.3 MLINKS+= BIO_ctrl.3 BIO_flush.3 -MLINKS+= BIO_new.3 BIO_free.3 -MLINKS+= BIO_new.3 BIO_free_all.3 -MLINKS+= BIO_s_accept.3 BIO_get_accept_ip_family.3 -MLINKS+= BIO_s_accept.3 BIO_get_accept_name.3 -MLINKS+= BIO_s_accept.3 BIO_get_accept_port.3 -MLINKS+= BIO_get_ex_new_index.3 BIO_get_app_data.3 -MLINKS+= BIO_s_accept.3 BIO_get_bind_mode.3 -MLINKS+= BIO_f_buffer.3 BIO_get_buffer_num_lines.3 -MLINKS+= BIO_set_callback.3 BIO_get_callback.3 -MLINKS+= BIO_set_callback.3 BIO_get_callback_arg.3 -MLINKS+= BIO_set_callback.3 BIO_get_callback_ex.3 -MLINKS+= BIO_f_cipher.3 BIO_get_cipher_ctx.3 -MLINKS+= BIO_f_cipher.3 BIO_get_cipher_status.3 MLINKS+= BIO_ctrl.3 BIO_get_close.3 -MLINKS+= BIO_s_connect.3 BIO_get_conn_address.3 -MLINKS+= BIO_s_connect.3 BIO_get_conn_hostname.3 -MLINKS+= BIO_s_connect.3 BIO_get_conn_ip_family.3 -MLINKS+= BIO_s_connect.3 BIO_get_conn_port.3 -MLINKS+= BIO_get_ex_new_index.3 BIO_get_ex_data.3 -MLINKS+= BIO_s_fd.3 BIO_get_fd.3 -MLINKS+= BIO_s_file.3 BIO_get_fp.3 -MLINKS+= BIO_f_prefix.3 BIO_get_indent.3 +MLINKS+= BIO_ctrl.3 BIO_get_conn_mode.3 MLINKS+= BIO_ctrl.3 BIO_get_info_callback.3 -MLINKS+= BIO_get_data.3 BIO_get_init.3 MLINKS+= BIO_ctrl.3 BIO_get_ktls_recv.3 MLINKS+= BIO_ctrl.3 BIO_get_ktls_send.3 -MLINKS+= BIO_read.3 BIO_get_line.3 -MLINKS+= BIO_f_md.3 BIO_get_md.3 -MLINKS+= BIO_f_md.3 BIO_get_md_ctx.3 -MLINKS+= BIO_s_mem.3 BIO_get_mem_data.3 -MLINKS+= BIO_s_mem.3 BIO_get_mem_ptr.3 -MLINKS+= BIO_meth_new.3 BIO_get_new_index.3 -MLINKS+= BIO_f_ssl.3 BIO_get_num_renegotiates.3 -MLINKS+= BIO_s_accept.3 BIO_get_peer_name.3 -MLINKS+= BIO_s_accept.3 BIO_get_peer_port.3 -MLINKS+= BIO_s_bio.3 BIO_get_read_request.3 -MLINKS+= BIO_should_retry.3 BIO_get_retry_BIO.3 -MLINKS+= BIO_should_retry.3 BIO_get_retry_reason.3 -MLINKS+= BIO_get_data.3 BIO_get_shutdown.3 -MLINKS+= BIO_f_ssl.3 BIO_get_ssl.3 -MLINKS+= BIO_s_bio.3 BIO_get_write_buf_size.3 -MLINKS+= BIO_s_bio.3 BIO_get_write_guarantee.3 -MLINKS+= BIO_read.3 BIO_gets.3 -MLINKS+= BIO_parse_hostserv.3 BIO_hostserv_priorities.3 MLINKS+= BIO_ctrl.3 BIO_info_cb.3 MLINKS+= BIO_ctrl.3 BIO_int_ctrl.3 -MLINKS+= BIO_connect.3 BIO_listen.3 -MLINKS+= BIO_ADDRINFO.3 BIO_lookup.3 -MLINKS+= BIO_ADDRINFO.3 BIO_lookup_ex.3 -MLINKS+= BIO_ADDRINFO.3 BIO_lookup_type.3 -MLINKS+= BIO_s_bio.3 BIO_make_bio_pair.3 -MLINKS+= BIO_meth_new.3 BIO_meth_free.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_callback_ctrl.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_create.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_ctrl.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_destroy.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_gets.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_puts.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_read.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_read_ex.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_write.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_write_ex.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_callback_ctrl.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_create.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_ctrl.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_destroy.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_gets.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_puts.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_read.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_read_ex.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_write.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_write_ex.3 -MLINKS+= BIO_find_type.3 BIO_method_type.3 -MLINKS+= BIO_s_accept.3 BIO_new_accept.3 -MLINKS+= BIO_s_bio.3 BIO_new_bio_pair.3 -MLINKS+= BIO_f_ssl.3 BIO_new_buffer_ssl_connect.3 -MLINKS+= BIO_s_connect.3 BIO_new_connect.3 -MLINKS+= BIO_s_datagram.3 BIO_new_dgram.3 -MLINKS+= BIO_new.3 BIO_new_ex.3 -MLINKS+= BIO_s_fd.3 BIO_new_fd.3 -MLINKS+= BIO_s_file.3 BIO_new_file.3 -MLINKS+= BIO_s_file.3 BIO_new_fp.3 -MLINKS+= BIO_s_core.3 BIO_new_from_core_bio.3 -MLINKS+= BIO_s_mem.3 BIO_new_mem_buf.3 -MLINKS+= BIO_s_socket.3 BIO_new_socket.3 -MLINKS+= BIO_f_ssl.3 BIO_new_ssl.3 -MLINKS+= BIO_f_ssl.3 BIO_new_ssl_connect.3 -MLINKS+= BIO_find_type.3 BIO_next.3 MLINKS+= BIO_ctrl.3 BIO_pending.3 -MLINKS+= BIO_push.3 BIO_pop.3 MLINKS+= BIO_ctrl.3 BIO_ptr_ctrl.3 -MLINKS+= BIO_read.3 BIO_puts.3 -MLINKS+= BIO_read.3 BIO_read_ex.3 -MLINKS+= BIO_s_file.3 BIO_read_filename.3 MLINKS+= BIO_ctrl.3 BIO_reset.3 -MLINKS+= BIO_should_retry.3 BIO_retry_type.3 -MLINKS+= BIO_s_file.3 BIO_rw_filename.3 -MLINKS+= BIO_s_mem.3 BIO_s_secmem.3 MLINKS+= BIO_ctrl.3 BIO_seek.3 -MLINKS+= BIO_s_accept.3 BIO_set_accept_bios.3 -MLINKS+= BIO_s_accept.3 BIO_set_accept_ip_family.3 -MLINKS+= BIO_s_accept.3 BIO_set_accept_name.3 -MLINKS+= BIO_s_accept.3 BIO_set_accept_port.3 -MLINKS+= BIO_get_ex_new_index.3 BIO_set_app_data.3 -MLINKS+= BIO_s_accept.3 BIO_set_bind_mode.3 +MLINKS+= BIO_ctrl.3 BIO_set_close.3 +MLINKS+= BIO_ctrl.3 BIO_set_conn_mode.3 +MLINKS+= BIO_ctrl.3 BIO_set_info_callback.3 +MLINKS+= BIO_ctrl.3 BIO_set_tfo.3 +MLINKS+= BIO_ctrl.3 BIO_tell.3 +MLINKS+= BIO_ctrl.3 BIO_wpending.3 +MLINKS+= BIO_f_buffer.3 BIO_get_buffer_num_lines.3 MLINKS+= BIO_f_buffer.3 BIO_set_buffer_read_data.3 MLINKS+= BIO_f_buffer.3 BIO_set_buffer_size.3 -MLINKS+= BIO_set_callback.3 BIO_set_callback_arg.3 -MLINKS+= BIO_set_callback.3 BIO_set_callback_ex.3 +MLINKS+= BIO_f_buffer.3 BIO_set_read_buffer_size.3 +MLINKS+= BIO_f_buffer.3 BIO_set_write_buffer_size.3 +MLINKS+= BIO_f_cipher.3 BIO_get_cipher_ctx.3 +MLINKS+= BIO_f_cipher.3 BIO_get_cipher_status.3 MLINKS+= BIO_f_cipher.3 BIO_set_cipher.3 -MLINKS+= BIO_ctrl.3 BIO_set_close.3 -MLINKS+= BIO_s_connect.3 BIO_set_conn_address.3 -MLINKS+= BIO_s_connect.3 BIO_set_conn_hostname.3 -MLINKS+= BIO_s_connect.3 BIO_set_conn_ip_family.3 -MLINKS+= BIO_s_connect.3 BIO_set_conn_port.3 -MLINKS+= BIO_get_data.3 BIO_set_data.3 -MLINKS+= BIO_get_ex_new_index.3 BIO_set_ex_data.3 -MLINKS+= BIO_s_fd.3 BIO_set_fd.3 -MLINKS+= BIO_s_file.3 BIO_set_fp.3 +MLINKS+= BIO_f_md.3 BIO_get_md.3 +MLINKS+= BIO_f_md.3 BIO_get_md_ctx.3 +MLINKS+= BIO_f_md.3 BIO_set_md.3 +MLINKS+= BIO_f_prefix.3 BIO_get_indent.3 MLINKS+= BIO_f_prefix.3 BIO_set_indent.3 -MLINKS+= BIO_ctrl.3 BIO_set_info_callback.3 -MLINKS+= BIO_get_data.3 BIO_set_init.3 -MLINKS+= BIO_f_md.3 BIO_set_md.3 -MLINKS+= BIO_s_mem.3 BIO_set_mem_buf.3 -MLINKS+= BIO_s_mem.3 BIO_set_mem_eof_return.3 -MLINKS+= BIO_s_connect.3 BIO_set_nbio.3 -MLINKS+= BIO_s_accept.3 BIO_set_nbio_accept.3 -MLINKS+= BIO_push.3 BIO_set_next.3 MLINKS+= BIO_f_prefix.3 BIO_set_prefix.3 -MLINKS+= BIO_f_buffer.3 BIO_set_read_buffer_size.3 -MLINKS+= BIO_should_retry.3 BIO_set_retry_reason.3 -MLINKS+= BIO_get_data.3 BIO_set_shutdown.3 +MLINKS+= BIO_f_ssl.3 BIO_do_handshake.3 +MLINKS+= BIO_f_ssl.3 BIO_get_num_renegotiates.3 +MLINKS+= BIO_f_ssl.3 BIO_get_ssl.3 +MLINKS+= BIO_f_ssl.3 BIO_new_buffer_ssl_connect.3 +MLINKS+= BIO_f_ssl.3 BIO_new_ssl.3 +MLINKS+= BIO_f_ssl.3 BIO_new_ssl_connect.3 MLINKS+= BIO_f_ssl.3 BIO_set_ssl.3 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_mode.3 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_renegotiate_bytes.3 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_renegotiate_timeout.3 -MLINKS+= BIO_s_bio.3 BIO_set_write_buf_size.3 -MLINKS+= BIO_f_buffer.3 BIO_set_write_buffer_size.3 -MLINKS+= BIO_should_retry.3 BIO_should_io_special.3 -MLINKS+= BIO_should_retry.3 BIO_should_read.3 -MLINKS+= BIO_should_retry.3 BIO_should_write.3 -MLINKS+= BIO_s_bio.3 BIO_shutdown_wr.3 -MLINKS+= BIO_printf.3 BIO_snprintf.3 -MLINKS+= BIO_connect.3 BIO_socket.3 MLINKS+= BIO_f_ssl.3 BIO_ssl_copy_session_id.3 MLINKS+= BIO_f_ssl.3 BIO_ssl_shutdown.3 -MLINKS+= BIO_ctrl.3 BIO_tell.3 +MLINKS+= BIO_find_type.3 BIO_method_type.3 +MLINKS+= BIO_find_type.3 BIO_next.3 +MLINKS+= BIO_get_data.3 BIO_get_init.3 +MLINKS+= BIO_get_data.3 BIO_get_shutdown.3 +MLINKS+= BIO_get_data.3 BIO_set_data.3 +MLINKS+= BIO_get_data.3 BIO_set_init.3 +MLINKS+= BIO_get_data.3 BIO_set_shutdown.3 +MLINKS+= BIO_get_ex_new_index.3 BIO_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 BIO_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 BIO_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 BIO_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 DH_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 DH_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 DH_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 DSA_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 DSA_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 DSA_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 EC_KEY_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 EC_KEY_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 EC_KEY_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 ENGINE_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 ENGINE_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 ENGINE_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 EVP_PKEY_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 EVP_PKEY_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 EVP_PKEY_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 UI_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 UI_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 UI_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 UI_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 UI_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 X509_set_ex_data.3 +MLINKS+= BIO_get_rpoll_descriptor.3 BIO_get_wpoll_descriptor.3 +MLINKS+= BIO_meth_new.3 BIO_get_new_index.3 +MLINKS+= BIO_meth_new.3 BIO_meth_free.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_callback_ctrl.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_create.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_ctrl.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_destroy.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_gets.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_puts.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_read.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_read_ex.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_recvmmsg.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_sendmmsg.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_write.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_write_ex.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_callback_ctrl.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_create.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_ctrl.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_destroy.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_gets.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_puts.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_read.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_read_ex.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_recvmmsg.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_sendmmsg.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_write.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_write_ex.3 +MLINKS+= BIO_new.3 BIO_free.3 +MLINKS+= BIO_new.3 BIO_free_all.3 +MLINKS+= BIO_new.3 BIO_new_ex.3 MLINKS+= BIO_new.3 BIO_up_ref.3 MLINKS+= BIO_new.3 BIO_vfree.3 +MLINKS+= BIO_parse_hostserv.3 BIO_hostserv_priorities.3 +MLINKS+= BIO_printf.3 BIO_snprintf.3 MLINKS+= BIO_printf.3 BIO_vprintf.3 MLINKS+= BIO_printf.3 BIO_vsnprintf.3 -MLINKS+= BIO_socket_wait.3 BIO_wait.3 -MLINKS+= BIO_ctrl.3 BIO_wpending.3 +MLINKS+= BIO_push.3 BIO_pop.3 +MLINKS+= BIO_push.3 BIO_set_next.3 +MLINKS+= BIO_read.3 BIO_get_line.3 +MLINKS+= BIO_read.3 BIO_gets.3 +MLINKS+= BIO_read.3 BIO_puts.3 +MLINKS+= BIO_read.3 BIO_read_ex.3 MLINKS+= BIO_read.3 BIO_write.3 MLINKS+= BIO_read.3 BIO_write_ex.3 +MLINKS+= BIO_s_accept.3 BIO_do_accept.3 +MLINKS+= BIO_s_accept.3 BIO_get_accept_ip_family.3 +MLINKS+= BIO_s_accept.3 BIO_get_accept_name.3 +MLINKS+= BIO_s_accept.3 BIO_get_accept_port.3 +MLINKS+= BIO_s_accept.3 BIO_get_bind_mode.3 +MLINKS+= BIO_s_accept.3 BIO_get_peer_name.3 +MLINKS+= BIO_s_accept.3 BIO_get_peer_port.3 +MLINKS+= BIO_s_accept.3 BIO_new_accept.3 +MLINKS+= BIO_s_accept.3 BIO_set_accept_bios.3 +MLINKS+= BIO_s_accept.3 BIO_set_accept_ip_family.3 +MLINKS+= BIO_s_accept.3 BIO_set_accept_name.3 +MLINKS+= BIO_s_accept.3 BIO_set_accept_port.3 +MLINKS+= BIO_s_accept.3 BIO_set_bind_mode.3 +MLINKS+= BIO_s_accept.3 BIO_set_nbio_accept.3 +MLINKS+= BIO_s_accept.3 BIO_set_tfo_accept.3 +MLINKS+= BIO_s_bio.3 BIO_ctrl_get_read_request.3 +MLINKS+= BIO_s_bio.3 BIO_ctrl_get_write_guarantee.3 +MLINKS+= BIO_s_bio.3 BIO_ctrl_reset_read_request.3 +MLINKS+= BIO_s_bio.3 BIO_destroy_bio_pair.3 +MLINKS+= BIO_s_bio.3 BIO_get_read_request.3 +MLINKS+= BIO_s_bio.3 BIO_get_write_buf_size.3 +MLINKS+= BIO_s_bio.3 BIO_get_write_guarantee.3 +MLINKS+= BIO_s_bio.3 BIO_make_bio_pair.3 +MLINKS+= BIO_s_bio.3 BIO_new_bio_pair.3 +MLINKS+= BIO_s_bio.3 BIO_set_write_buf_size.3 +MLINKS+= BIO_s_bio.3 BIO_shutdown_wr.3 +MLINKS+= BIO_s_connect.3 BIO_do_connect.3 +MLINKS+= BIO_s_connect.3 BIO_get0_dgram_bio.3 +MLINKS+= BIO_s_connect.3 BIO_get_conn_address.3 +MLINKS+= BIO_s_connect.3 BIO_get_conn_hostname.3 +MLINKS+= BIO_s_connect.3 BIO_get_conn_ip_family.3 +MLINKS+= BIO_s_connect.3 BIO_get_conn_port.3 +MLINKS+= BIO_s_connect.3 BIO_get_sock_type.3 +MLINKS+= BIO_s_connect.3 BIO_new_connect.3 +MLINKS+= BIO_s_connect.3 BIO_set_conn_address.3 +MLINKS+= BIO_s_connect.3 BIO_set_conn_hostname.3 +MLINKS+= BIO_s_connect.3 BIO_set_conn_ip_family.3 +MLINKS+= BIO_s_connect.3 BIO_set_conn_port.3 +MLINKS+= BIO_s_connect.3 BIO_set_nbio.3 +MLINKS+= BIO_s_connect.3 BIO_set_sock_type.3 +MLINKS+= BIO_s_core.3 BIO_new_from_core_bio.3 +MLINKS+= BIO_s_datagram.3 BIO_ctrl_dgram_connect.3 +MLINKS+= BIO_s_datagram.3 BIO_ctrl_set_connected.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_detect_peer_addr.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_get_mtu_overhead.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_get_peer.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_recv_timedout.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_send_timedout.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_set_peer.3 +MLINKS+= BIO_s_datagram.3 BIO_new_dgram.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_get_caps.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_get_effective_caps.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_get_mtu.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_get_no_trunc.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_set0_local_addr.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_set_caps.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_set_mtu.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_set_no_trunc.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_new_bio_dgram_pair.3 +MLINKS+= BIO_s_fd.3 BIO_get_fd.3 +MLINKS+= BIO_s_fd.3 BIO_new_fd.3 +MLINKS+= BIO_s_fd.3 BIO_set_fd.3 +MLINKS+= BIO_s_file.3 BIO_append_filename.3 +MLINKS+= BIO_s_file.3 BIO_get_fp.3 +MLINKS+= BIO_s_file.3 BIO_new_file.3 +MLINKS+= BIO_s_file.3 BIO_new_fp.3 +MLINKS+= BIO_s_file.3 BIO_read_filename.3 +MLINKS+= BIO_s_file.3 BIO_rw_filename.3 +MLINKS+= BIO_s_file.3 BIO_set_fp.3 MLINKS+= BIO_s_file.3 BIO_write_filename.3 +MLINKS+= BIO_s_mem.3 BIO_get_mem_data.3 +MLINKS+= BIO_s_mem.3 BIO_get_mem_ptr.3 +MLINKS+= BIO_s_mem.3 BIO_new_mem_buf.3 +MLINKS+= BIO_s_mem.3 BIO_s_dgram_mem.3 +MLINKS+= BIO_s_mem.3 BIO_s_secmem.3 +MLINKS+= BIO_s_mem.3 BIO_set_mem_buf.3 +MLINKS+= BIO_s_mem.3 BIO_set_mem_eof_return.3 +MLINKS+= BIO_s_socket.3 BIO_new_socket.3 +MLINKS+= BIO_sendmmsg.3 BIO_dgram_get_local_addr_cap.3 +MLINKS+= BIO_sendmmsg.3 BIO_dgram_get_local_addr_enable.3 +MLINKS+= BIO_sendmmsg.3 BIO_dgram_set_local_addr_enable.3 +MLINKS+= BIO_sendmmsg.3 BIO_err_is_non_fatal.3 +MLINKS+= BIO_sendmmsg.3 BIO_recvmmsg.3 +MLINKS+= BIO_set_callback.3 BIO_callback_fn.3 +MLINKS+= BIO_set_callback.3 BIO_callback_fn_ex.3 +MLINKS+= BIO_set_callback.3 BIO_debug_callback.3 +MLINKS+= BIO_set_callback.3 BIO_debug_callback_ex.3 +MLINKS+= BIO_set_callback.3 BIO_get_callback.3 +MLINKS+= BIO_set_callback.3 BIO_get_callback_arg.3 +MLINKS+= BIO_set_callback.3 BIO_get_callback_ex.3 +MLINKS+= BIO_set_callback.3 BIO_set_callback_arg.3 +MLINKS+= BIO_set_callback.3 BIO_set_callback_ex.3 +MLINKS+= BIO_should_retry.3 BIO_get_retry_BIO.3 +MLINKS+= BIO_should_retry.3 BIO_get_retry_reason.3 +MLINKS+= BIO_should_retry.3 BIO_retry_type.3 +MLINKS+= BIO_should_retry.3 BIO_set_retry_reason.3 +MLINKS+= BIO_should_retry.3 BIO_should_io_special.3 +MLINKS+= BIO_should_retry.3 BIO_should_read.3 +MLINKS+= BIO_should_retry.3 BIO_should_write.3 +MLINKS+= BIO_socket_wait.3 BIO_do_connect_retry.3 +MLINKS+= BIO_socket_wait.3 BIO_wait.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_convert.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_convert_ex.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_create_param.3 @@ -1030,96 +1118,90 @@ MLINKS+= BN_BLINDING_new.3 BN_BLINDING_set_current_thread.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_set_flags.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_unlock.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_update.3 -MLINKS+= BN_CTX_start.3 BN_CTX_end.3 MLINKS+= BN_CTX_new.3 BN_CTX_free.3 -MLINKS+= BN_CTX_start.3 BN_CTX_get.3 MLINKS+= BN_CTX_new.3 BN_CTX_new_ex.3 MLINKS+= BN_CTX_new.3 BN_CTX_secure_new.3 MLINKS+= BN_CTX_new.3 BN_CTX_secure_new_ex.3 +MLINKS+= BN_CTX_start.3 BN_CTX_end.3 +MLINKS+= BN_CTX_start.3 BN_CTX_get.3 +MLINKS+= BN_add.3 BN_div.3 +MLINKS+= BN_add.3 BN_exp.3 +MLINKS+= BN_add.3 BN_gcd.3 +MLINKS+= BN_add.3 BN_mod.3 +MLINKS+= BN_add.3 BN_mod_add.3 +MLINKS+= BN_add.3 BN_mod_exp.3 +MLINKS+= BN_add.3 BN_mod_mul.3 +MLINKS+= BN_add.3 BN_mod_sqr.3 +MLINKS+= BN_add.3 BN_mod_sqrt.3 +MLINKS+= BN_add.3 BN_mod_sub.3 +MLINKS+= BN_add.3 BN_mul.3 +MLINKS+= BN_add.3 BN_nnmod.3 +MLINKS+= BN_add.3 BN_sqr.3 +MLINKS+= BN_add.3 BN_sub.3 +MLINKS+= BN_add_word.3 BN_div_word.3 +MLINKS+= BN_add_word.3 BN_mod_word.3 +MLINKS+= BN_add_word.3 BN_mul_word.3 +MLINKS+= BN_add_word.3 BN_sub_word.3 +MLINKS+= BN_bn2bin.3 BN_bin2bn.3 +MLINKS+= BN_bn2bin.3 BN_bn2binpad.3 +MLINKS+= BN_bn2bin.3 BN_bn2dec.3 +MLINKS+= BN_bn2bin.3 BN_bn2hex.3 +MLINKS+= BN_bn2bin.3 BN_bn2lebinpad.3 +MLINKS+= BN_bn2bin.3 BN_bn2mpi.3 +MLINKS+= BN_bn2bin.3 BN_bn2nativepad.3 +MLINKS+= BN_bn2bin.3 BN_dec2bn.3 +MLINKS+= BN_bn2bin.3 BN_hex2bn.3 +MLINKS+= BN_bn2bin.3 BN_lebin2bn.3 +MLINKS+= BN_bn2bin.3 BN_mpi2bn.3 +MLINKS+= BN_bn2bin.3 BN_native2bn.3 +MLINKS+= BN_bn2bin.3 BN_print.3 +MLINKS+= BN_bn2bin.3 BN_print_fp.3 +MLINKS+= BN_bn2bin.3 BN_signed_bin2bn.3 +MLINKS+= BN_bn2bin.3 BN_signed_bn2bin.3 +MLINKS+= BN_bn2bin.3 BN_signed_bn2lebin.3 +MLINKS+= BN_bn2bin.3 BN_signed_bn2native.3 +MLINKS+= BN_bn2bin.3 BN_signed_lebin2bn.3 +MLINKS+= BN_bn2bin.3 BN_signed_native2bn.3 +MLINKS+= BN_cmp.3 BN_abs_is_word.3 +MLINKS+= BN_cmp.3 BN_are_coprime.3 +MLINKS+= BN_cmp.3 BN_is_odd.3 +MLINKS+= BN_cmp.3 BN_is_one.3 +MLINKS+= BN_cmp.3 BN_is_word.3 +MLINKS+= BN_cmp.3 BN_is_zero.3 +MLINKS+= BN_cmp.3 BN_ucmp.3 +MLINKS+= BN_copy.3 BN_dup.3 +MLINKS+= BN_copy.3 BN_with_flags.3 MLINKS+= BN_generate_prime.3 BN_GENCB_call.3 MLINKS+= BN_generate_prime.3 BN_GENCB_free.3 MLINKS+= BN_generate_prime.3 BN_GENCB_get_arg.3 MLINKS+= BN_generate_prime.3 BN_GENCB_new.3 MLINKS+= BN_generate_prime.3 BN_GENCB_set.3 MLINKS+= BN_generate_prime.3 BN_GENCB_set_old.3 +MLINKS+= BN_generate_prime.3 BN_check_prime.3 +MLINKS+= BN_generate_prime.3 BN_generate_prime_ex.3 +MLINKS+= BN_generate_prime.3 BN_generate_prime_ex2.3 +MLINKS+= BN_generate_prime.3 BN_is_prime.3 +MLINKS+= BN_generate_prime.3 BN_is_prime_ex.3 +MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest.3 +MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest_ex.3 +MLINKS+= BN_mod_exp_mont.3 BN_mod_exp_mont_consttime.3 +MLINKS+= BN_mod_exp_mont.3 BN_mod_exp_mont_consttime_x2.3 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_copy.3 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_free.3 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_new.3 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_set.3 +MLINKS+= BN_mod_mul_montgomery.3 BN_from_montgomery.3 +MLINKS+= BN_mod_mul_montgomery.3 BN_to_montgomery.3 MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_free.3 MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_new.3 MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_set.3 -MLINKS+= BN_cmp.3 BN_abs_is_word.3 -MLINKS+= BN_bn2bin.3 BN_bin2bn.3 -MLINKS+= BN_bn2bin.3 BN_bn2binpad.3 -MLINKS+= BN_bn2bin.3 BN_bn2dec.3 -MLINKS+= BN_bn2bin.3 BN_bn2hex.3 -MLINKS+= BN_bn2bin.3 BN_bn2lebinpad.3 -MLINKS+= BN_bn2bin.3 BN_bn2mpi.3 -MLINKS+= BN_bn2bin.3 BN_bn2nativepad.3 -MLINKS+= BN_generate_prime.3 BN_check_prime.3 +MLINKS+= BN_mod_mul_reciprocal.3 BN_div_recp.3 MLINKS+= BN_new.3 BN_clear.3 -MLINKS+= BN_set_bit.3 BN_clear_bit.3 MLINKS+= BN_new.3 BN_clear_free.3 -MLINKS+= BN_bn2bin.3 BN_dec2bn.3 -MLINKS+= BN_add.3 BN_div.3 -MLINKS+= BN_mod_mul_reciprocal.3 BN_div_recp.3 -MLINKS+= BN_add_word.3 BN_div_word.3 -MLINKS+= BN_copy.3 BN_dup.3 -MLINKS+= BN_add.3 BN_exp.3 MLINKS+= BN_new.3 BN_free.3 -MLINKS+= BN_mod_mul_montgomery.3 BN_from_montgomery.3 -MLINKS+= BN_add.3 BN_gcd.3 -MLINKS+= BN_generate_prime.3 BN_generate_prime_ex.3 -MLINKS+= BN_generate_prime.3 BN_generate_prime_ex2.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_192.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_224.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_256.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_384.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_521.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc2409_prime_1024.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc2409_prime_768.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_1536.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_2048.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_3072.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_4096.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_6144.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_8192.3 -MLINKS+= BN_zero.3 BN_get_word.3 -MLINKS+= BN_bn2bin.3 BN_hex2bn.3 -MLINKS+= BN_set_bit.3 BN_is_bit_set.3 -MLINKS+= BN_cmp.3 BN_is_odd.3 -MLINKS+= BN_cmp.3 BN_is_one.3 -MLINKS+= BN_generate_prime.3 BN_is_prime.3 -MLINKS+= BN_generate_prime.3 BN_is_prime_ex.3 -MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest.3 -MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest_ex.3 -MLINKS+= BN_cmp.3 BN_is_word.3 -MLINKS+= BN_cmp.3 BN_is_zero.3 -MLINKS+= BN_bn2bin.3 BN_lebin2bn.3 -MLINKS+= BN_set_bit.3 BN_lshift.3 -MLINKS+= BN_set_bit.3 BN_lshift1.3 -MLINKS+= BN_set_bit.3 BN_mask_bits.3 -MLINKS+= BN_add.3 BN_mod.3 -MLINKS+= BN_add.3 BN_mod_add.3 -MLINKS+= BN_add.3 BN_mod_exp.3 -MLINKS+= BN_mod_exp_mont.3 BN_mod_exp_mont_consttime.3 -MLINKS+= BN_mod_exp_mont.3 BN_mod_exp_mont_consttime_x2.3 -MLINKS+= BN_add.3 BN_mod_mul.3 -MLINKS+= BN_add.3 BN_mod_sqr.3 -MLINKS+= BN_add.3 BN_mod_sqrt.3 -MLINKS+= BN_add.3 BN_mod_sub.3 -MLINKS+= BN_add_word.3 BN_mod_word.3 -MLINKS+= BN_bn2bin.3 BN_mpi2bn.3 -MLINKS+= BN_add.3 BN_mul.3 -MLINKS+= BN_add_word.3 BN_mul_word.3 -MLINKS+= BN_bn2bin.3 BN_native2bn.3 -MLINKS+= BN_add.3 BN_nnmod.3 +MLINKS+= BN_new.3 BN_secure_new.3 MLINKS+= BN_num_bytes.3 BN_num_bits.3 MLINKS+= BN_num_bytes.3 BN_num_bits_word.3 -MLINKS+= BN_zero.3 BN_one.3 -MLINKS+= BN_bn2bin.3 BN_print.3 -MLINKS+= BN_bn2bin.3 BN_print_fp.3 MLINKS+= BN_rand.3 BN_priv_rand.3 MLINKS+= BN_rand.3 BN_priv_rand_ex.3 MLINKS+= BN_rand.3 BN_priv_rand_range.3 @@ -1129,39 +1211,51 @@ MLINKS+= BN_rand.3 BN_pseudo_rand_range.3 MLINKS+= BN_rand.3 BN_rand_ex.3 MLINKS+= BN_rand.3 BN_rand_range.3 MLINKS+= BN_rand.3 BN_rand_range_ex.3 +MLINKS+= BN_set_bit.3 BN_clear_bit.3 +MLINKS+= BN_set_bit.3 BN_is_bit_set.3 +MLINKS+= BN_set_bit.3 BN_lshift.3 +MLINKS+= BN_set_bit.3 BN_lshift1.3 +MLINKS+= BN_set_bit.3 BN_mask_bits.3 MLINKS+= BN_set_bit.3 BN_rshift.3 MLINKS+= BN_set_bit.3 BN_rshift1.3 -MLINKS+= BN_new.3 BN_secure_new.3 +MLINKS+= BN_zero.3 BN_get_word.3 +MLINKS+= BN_zero.3 BN_one.3 MLINKS+= BN_zero.3 BN_set_word.3 -MLINKS+= BN_add.3 BN_sqr.3 -MLINKS+= BN_add.3 BN_sub.3 -MLINKS+= BN_add_word.3 BN_sub_word.3 -MLINKS+= ASN1_INTEGER_get_int64.3 BN_to_ASN1_ENUMERATED.3 -MLINKS+= ASN1_INTEGER_get_int64.3 BN_to_ASN1_INTEGER.3 -MLINKS+= BN_mod_mul_montgomery.3 BN_to_montgomery.3 -MLINKS+= BN_cmp.3 BN_ucmp.3 MLINKS+= BN_zero.3 BN_value_one.3 -MLINKS+= BN_copy.3 BN_with_flags.3 MLINKS+= BUF_MEM_new.3 BUF_MEM_free.3 MLINKS+= BUF_MEM_new.3 BUF_MEM_grow.3 MLINKS+= BUF_MEM_new.3 BUF_MEM_grow_clean.3 MLINKS+= BUF_MEM_new.3 BUF_MEM_new_ex.3 MLINKS+= BUF_MEM_new.3 BUF_reverse.3 -MLINKS+= X509_dup.3 CERTIFICATEPOLICIES_free.3 -MLINKS+= X509_dup.3 CERTIFICATEPOLICIES_new.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_cleanup.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_copy.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_free.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_get0_cipher_ctx.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_new.3 +MLINKS+= CMAC_CTX.3 CMAC_Final.3 +MLINKS+= CMAC_CTX.3 CMAC_Init.3 +MLINKS+= CMAC_CTX.3 CMAC_Update.3 +MLINKS+= CMAC_CTX.3 CMAC_resume.3 +MLINKS+= CMS_EncryptedData_decrypt.3 CMS_EnvelopedData_decrypt.3 +MLINKS+= CMS_EncryptedData_encrypt.3 CMS_EncryptedData_encrypt_ex.3 MLINKS+= CMS_EnvelopedData_create.3 CMS_AuthEnvelopedData_create.3 MLINKS+= CMS_EnvelopedData_create.3 CMS_AuthEnvelopedData_create_ex.3 -MLINKS+= X509_dup.3 CMS_ContentInfo_free.3 -MLINKS+= X509_dup.3 CMS_ContentInfo_new.3 -MLINKS+= X509_dup.3 CMS_ContentInfo_new_ex.3 -MLINKS+= X509_dup.3 CMS_ContentInfo_print_ctx.3 -MLINKS+= CMS_EncryptedData_encrypt.3 CMS_EncryptedData_encrypt_ex.3 MLINKS+= CMS_EnvelopedData_create.3 CMS_EnvelopedData_create_ex.3 -MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0.3 -MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0_ex.3 -MLINKS+= X509_dup.3 CMS_ReceiptRequest_free.3 -MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_get0_values.3 -MLINKS+= X509_dup.3 CMS_ReceiptRequest_new.3 +MLINKS+= CMS_add0_cert.3 CMS_add0_crl.3 +MLINKS+= CMS_add0_cert.3 CMS_add1_cert.3 +MLINKS+= CMS_add0_cert.3 CMS_add1_crl.3 +MLINKS+= CMS_add0_cert.3 CMS_get1_certs.3 +MLINKS+= CMS_add0_cert.3 CMS_get1_crls.3 +MLINKS+= CMS_add1_recipient_cert.3 CMS_add0_recipient_key.3 +MLINKS+= CMS_add1_recipient_cert.3 CMS_add1_recipient.3 +MLINKS+= CMS_add1_signer.3 CMS_SignerInfo_sign.3 +MLINKS+= CMS_data_create.3 CMS_data_create_ex.3 +MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_password.3 +MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_pkey.3 +MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_pkey_and_peer.3 +MLINKS+= CMS_digest_create.3 CMS_digest_create_ex.3 +MLINKS+= CMS_encrypt.3 CMS_encrypt_ex.3 +MLINKS+= CMS_final.3 CMS_final_digest.3 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_decrypt.3 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_encrypt.3 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_kari_set0_pkey.3 @@ -1177,80 +1271,82 @@ MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_cert_cmp.3 MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_get0_signature.3 MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_get0_signer_id.3 MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_set1_signer_cert.3 -MLINKS+= CMS_add1_signer.3 CMS_SignerInfo_sign.3 -MLINKS+= CMS_add0_cert.3 CMS_add0_crl.3 -MLINKS+= CMS_add1_recipient_cert.3 CMS_add0_recipient_key.3 -MLINKS+= CMS_get1_ReceiptRequest.3 CMS_add1_ReceiptRequest.3 -MLINKS+= CMS_add0_cert.3 CMS_add1_cert.3 -MLINKS+= CMS_add0_cert.3 CMS_add1_crl.3 -MLINKS+= CMS_add1_recipient_cert.3 CMS_add1_recipient.3 -MLINKS+= CMS_data_create.3 CMS_data_create_ex.3 -MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_password.3 -MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_pkey.3 -MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_pkey_and_peer.3 -MLINKS+= CMS_digest_create.3 CMS_digest_create_ex.3 -MLINKS+= CMS_encrypt.3 CMS_encrypt_ex.3 MLINKS+= CMS_get0_type.3 CMS_get0_content.3 MLINKS+= CMS_get0_type.3 CMS_get0_eContentType.3 -MLINKS+= CMS_verify.3 CMS_get0_signers.3 -MLINKS+= CMS_add0_cert.3 CMS_get1_certs.3 -MLINKS+= CMS_add0_cert.3 CMS_get1_crls.3 MLINKS+= CMS_get0_type.3 CMS_set1_eContentType.3 +MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0.3 +MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0_ex.3 +MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_get0_values.3 +MLINKS+= CMS_get1_ReceiptRequest.3 CMS_add1_ReceiptRequest.3 MLINKS+= CMS_sign.3 CMS_sign_ex.3 -MLINKS+= CONF_modules_load_file.3 CONF_get1_default_config_file.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_add1_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_add1_attr_by_NID.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_add1_attr_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_add1_attr_by_txt.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_delete_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_get0_data_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_get_attr_by_NID.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_get_attr_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_get_attr_count.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_add1_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_add1_attr_by_NID.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_add1_attr_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_add1_attr_by_txt.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_delete_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get0_data_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get_attr_by_NID.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get_attr_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get_attr_count.3 +MLINKS+= CMS_verify.3 CMS_SignedData_verify.3 +MLINKS+= CMS_verify.3 CMS_get0_signers.3 +MLINKS+= COMP_CTX_new.3 BIO_f_brotli.3 +MLINKS+= COMP_CTX_new.3 BIO_f_zlib.3 +MLINKS+= COMP_CTX_new.3 BIO_f_zstd.3 +MLINKS+= COMP_CTX_new.3 COMP_CTX_free.3 +MLINKS+= COMP_CTX_new.3 COMP_CTX_get_method.3 +MLINKS+= COMP_CTX_new.3 COMP_CTX_get_type.3 +MLINKS+= COMP_CTX_new.3 COMP_brotli.3 +MLINKS+= COMP_CTX_new.3 COMP_brotli_oneshot.3 +MLINKS+= COMP_CTX_new.3 COMP_compress_block.3 +MLINKS+= COMP_CTX_new.3 COMP_expand_block.3 +MLINKS+= COMP_CTX_new.3 COMP_get_name.3 +MLINKS+= COMP_CTX_new.3 COMP_get_type.3 +MLINKS+= COMP_CTX_new.3 COMP_zlib.3 +MLINKS+= COMP_CTX_new.3 COMP_zlib_oneshot.3 +MLINKS+= COMP_CTX_new.3 COMP_zstd.3 +MLINKS+= COMP_CTX_new.3 COMP_zstd_oneshot.3 MLINKS+= CONF_modules_free.3 CONF_modules_finish.3 +MLINKS+= CONF_modules_free.3 CONF_modules_unload.3 +MLINKS+= CONF_modules_load_file.3 CONF_get1_default_config_file.3 MLINKS+= CONF_modules_load_file.3 CONF_modules_load.3 MLINKS+= CONF_modules_load_file.3 CONF_modules_load_file_ex.3 -MLINKS+= CONF_modules_free.3 CONF_modules_unload.3 -MLINKS+= X509_dup.3 CRL_DIST_POINTS_free.3 -MLINKS+= X509_dup.3 CRL_DIST_POINTS_new.3 -MLINKS+= CRYPTO_get_ex_new_index.3 CRYPTO_EX_dup.3 -MLINKS+= CRYPTO_get_ex_new_index.3 CRYPTO_EX_free.3 -MLINKS+= CRYPTO_get_ex_new_index.3 CRYPTO_EX_new.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_lock_free.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_lock_new.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_read_lock.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_unlock.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_write_lock.3 -MLINKS+= CRYPTO_get_ex_new_index.3 CRYPTO_alloc_ex_data.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_add.3 +MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_add64.3 +MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_and.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_load.3 +MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_load_int.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_or.3 -MLINKS+= OPENSSL_malloc.3 CRYPTO_clear_free.3 -MLINKS+= OPENSSL_malloc.3 CRYPTO_clear_realloc.3 -MLINKS+= OPENSSL_malloc.3 CRYPTO_free.3 +MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_store.3 +MLINKS+= CRYPTO_THREAD_run_once.3 OSSL_THREAD_SUPPORT_FLAG_DEFAULT_SPAWN.3 +MLINKS+= CRYPTO_THREAD_run_once.3 OSSL_THREAD_SUPPORT_FLAG_THREAD_POOL.3 +MLINKS+= CRYPTO_THREAD_run_once.3 OSSL_get_max_threads.3 +MLINKS+= CRYPTO_THREAD_run_once.3 OSSL_get_thread_support_flags.3 +MLINKS+= CRYPTO_THREAD_run_once.3 OSSL_set_max_threads.3 *** 5599 LINES SKIPPED *** From nobody Tue Nov 4 16:05:38 2025 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 4d1Cwf5sKgz6GJrq; Tue, 04 Nov 2025 16:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Cwf4ZFZz3Wmk; Tue, 04 Nov 2025 16:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVp+D1iWiSk2R/D2Xz1GJL3s/M0xP+zDxWeNhjRIOQc=; b=qYlU3s0Vf6q9Ex/fqyO/u9pLRSFu+P5y6jT9S85Qxn68L0cWbr4pvzGc7hmIlgc7HvEGzH dBR2r/HmfHphlvxX0aUQ0uMSQFb+Ti/dJRjybqQpy82lsJ7b5K+jzEsWAL6irsbO9f0gce 1p1A6lQXuRfQt+X36J/BKKJagPAwNfsqYbKtvrqUOwVczGnUj1JKjnoBlQzaNXLdeIv7yE OIWYZTp9B8YLbLyn74Js6ug1k8jY8mYxwLt7eQgYJLuKW4tLY8v0xq6BkuKN+JHLRIkB7i kmg1H2no05xrZA0zMRghQu1nSTetLUFaQ594hZ2MLwquK4Q4Nr4NbGOzX8fALQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVp+D1iWiSk2R/D2Xz1GJL3s/M0xP+zDxWeNhjRIOQc=; b=knma+qvCWcB4jzA2PzcCP0VHv+2dCpyUyvdvNelQ8LfTVDr7kP7+B2p1Ez3HwdEqf46UZf GH1GUuEwS7Ru10vyT0EM/L1WNaUBW5alCtPcBxkPQPEQ5Chsljw2ONOYw4up4akT/Wflm7 C6Uas7Co1sToHbi3ROkwIj7/Yc4cRqdNpzzJwQQXNjxJ0p0QhcrH6hGvSgzTKd90YvTVX8 C9ZLZy8wt9DhlWP6Q0XhQlCVrRRYMFSwins3edZM+VZG3B8PAUolQgMWomY7sYMZtuJwnx 4mC85dvmwjwZNMq1VSkkfSTdw7lvIOFz4+VyB2KAb9MQx6czgARUekXzpJMwNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762272338; a=rsa-sha256; cv=none; b=xc0dhdJtze09TCJNwPZuGi6MdkpOwzx81e/yLHP+zdKBuUmYldqiCcMGVV/ywZvTZUAMFv 8EEuW565oOkT9qOZXMcYifLcwh9ZO6CCIMLnI4f5WxCJ0H9BAykoufSisXCmxhFGxvzJad TQ0mWsiHr2DcZ1sq/b8l73dUhhISBtQmk4BTZtexzetABgvcGYItiM6snT1QqyUuhY4p3q V9GAWY/BYyjidKUbOpI500WFfbUpMCIhBLpYLyTlvQtub2DCAPuhVJ6Csd8FBIm1OccPJQ /OH/RH4aW5gH9mcAKQomp7/KODz6oMYbt/UJGMBeUUGbMByLsAkHOGGBro+y2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Cwf43TBz13gw; Tue, 04 Nov 2025 16:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4G5cwW075477; Tue, 4 Nov 2025 16:05:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4G5cEN075474; Tue, 4 Nov 2025 16:05:38 GMT (envelope-from git) Date: Tue, 4 Nov 2025 16:05:38 GMT Message-Id: <202511041605.5A4G5cEN075474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 22382d9e706b - stable/15 - crypto/openssl: apply polish to new vendor import 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 22382d9e706baddac193f66c3a48b086fc53e98c Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=22382d9e706baddac193f66c3a48b086fc53e98c commit 22382d9e706baddac193f66c3a48b086fc53e98c Author: Enji Cooper AuthorDate: 2025-08-22 00:19:25 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:02:54 +0000 crypto/openssl: apply polish to new vendor import process This change does the following 2 things: - Makes the build more repeatable by isolating the environment. This prevents bmake from leaking variables into gmake and makes the overall process a bit more robust. - Add debug printouts to make the process more straightforward to the reader and whoever is executing doing the current vendor import. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D52420 (cherry picked from commit d18058b7b850c78f2ca1be746ab411c0bed5acc9) --- crypto/openssl/BSDmakefile | 73 ++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile index bd2bfe0ea033..514c87ae3a8e 100644 --- a/crypto/openssl/BSDmakefile +++ b/crypto/openssl/BSDmakefile @@ -12,8 +12,10 @@ LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc CAT?= /bin/cat +GMAKE?= gmake MV?= /bin/mv PERL?= perl +SETENVI= /usr/bin/env -i BN_CONF_H= include/crypto/bn_conf.h BN_CONF_H_ORIG= ${BN_CONF_H}.orig @@ -23,8 +25,11 @@ CONFIGURATION_H_ORIG= ${CONFIGURATION_H}.orig .PHONY: configure patch all .ORDER: configure patch all +LOCALBASE= /usr/local +WRK_ENV= PATH=${LOCALBASE}/bin:/bin:/usr/bin + configure: - @cd ${.CURDIR} && \ + @(cd ${.CURDIR} && ${SETENVI} \ ${PERL} ./Configure \ disable-aria \ disable-egd \ @@ -37,34 +42,45 @@ configure: enable-ktls \ enable-sctp \ --openssldir=etc \ - --prefix=/usr - @cd ${.CURDIR} && gmake configdata.pm - @cd ${LCRYPTO_SRC} && ${PERL} \ - ${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \ - ${SRCTOP}/secure/lib/libcrypto/Makefile.version + --prefix=/usr) + @echo "Building configdata.pm for later use." + @(cd ${.CURDIR} && \ + ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} configdata.pm) -all: patch - # Passing `-j ${.MAKE.JOBS}` doesn't work here for some reason. - @cd ${.CURDIR} && gmake build_all_generated + @echo "Populating Makefile.version with release information" + @(cd ${LCRYPTO_SRC} && ${SETENVI} ${WRK_ENV} ${PERL} \ + ${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \ + ${SRCTOP}/secure/lib/libcrypto/Makefile.version) - # Clean the pkgconfig files: - # 1. Fix --prefix (not sure why configure --prefix isn't honored properly). +all: patch + @echo "==> Building generated files (headers, manpages, etc)" + @(cd ${.CURDIR} && \ + ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} build_all_generated) + + # 1. Fix --prefix. + # a. Not sure why --prefix isn't honored properly, even though it's + # passed to Configure; the files might be getting rebuilt + # post-Configure, somehow. # 2. Remove duplicate path in CFLAGS. # 3. Remove duplicate path in includedir(s). + @echo "==> Fixing pkgconfig files" @find . -name \*.pc -print -exec sed -i '' -E \ -e 's,^prefix=.+,prefix=/usr,' \ -e 's,[[:space:]]+(\-I)?\$\{prefix\}/\./include[[:space:]]*,,g' \ {} + - @cd ${SRCTOP}/secure/lib/libcrypto && \ - ${MAKE} cleanasm && \ - ${MAKE} buildasm + @echo "==> Cleaning / rebuilding ASM" + @(cd ${SRCTOP}/secure/lib/libcrypto && \ + ${SETENVI} ${WRK_ENV} ${MAKE} cleanasm && \ + ${SETENVI} ${WRK_ENV} ${MAKE} buildasm) + @echo "==> Syncing manpages (section 1)" @rsync -a --delete \ --exclude 'Makefile*' --exclude '*.1' \ ${LCRYPTO_DOC}/man/ \ ${SRCTOP}/secure/lib/libcrypto/man + @echo "==> Syncing manpages (sections {3,5,7})" @rsync -a --delete \ --exclude 'Makefile*' --exclude '*.[357]' \ ${LCRYPTO_DOC}/man/man1/ \ @@ -75,25 +91,26 @@ all: patch # depending on the host architecture. patch: configure # Spam arch-specific overrides to config files. + @echo "==> Patching headers" + @(cd ${.CURDIR} && ${SETENVI} ${WRK_ENV} ${GMAKE} ${BN_CONF_H} && \ + ${MV} ${BN_CONF_H} ${BN_CONF_H_ORIG} && \ + ${CAT} ${BN_CONF_H}.orig \ + ${LCRYPTO_SRC}/freebsd/${BN_CONF_H} >> \ + ${BN_CONF_H}) - @cd ${.CURDIR} && gmake ${BN_CONF_H} && \ - ${MV} ${BN_CONF_H} ${BN_CONF_H_ORIG} && \ - ${CAT} ${BN_CONF_H}.orig \ - ${LCRYPTO_SRC}/freebsd/${BN_CONF_H} >> \ - ${BN_CONF_H} - - @cd ${.CURDIR} && \ - ${MV} ${CONFIGURATION_H} ${CONFIGURATION_H_ORIG} && \ - ${CAT} ${CONFIGURATION_H_ORIG} \ - ${LCRYPTO_SRC}/freebsd/${CONFIGURATION_H} >> \ - ${CONFIGURATION_H} + @(cd ${.CURDIR} && \ + ${MV} ${CONFIGURATION_H} ${CONFIGURATION_H_ORIG} && \ + ${CAT} ${CONFIGURATION_H_ORIG} \ + ${LCRYPTO_SRC}/freebsd/${CONFIGURATION_H} >> \ + ${CONFIGURATION_H}) clean: .PHONY - @cd ${.CURDIR} && rm -f ${BN_CONF_H_ORIG} ${CONFIGURATION_H_ORIG} + @(cd ${.CURDIR} && rm -f ${BN_CONF_H_ORIG} ${CONFIGURATION_H_ORIG}) - @cd ${SRCTOP}/secure/lib/libcrypto && ${MAKE} cleanasm + @(cd ${SRCTOP}/secure/lib/libcrypto && \ + ${SETENVI} ${WRK_ENV} ${MAKE} cleanasm) - -@cd ${.CURDIR} && gmake ${.TARGET} + -@(cd ${.CURDIR} && ${GMAKE} ${.TARGET}) .include From nobody Tue Nov 4 16:05:39 2025 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 4d1Cwh1539z6GK0x; Tue, 04 Nov 2025 16:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Cwg6qWCz3Wgx; Tue, 04 Nov 2025 16:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G54EkretQlI+bEbTLm9mQwL3vCmYWHdQgmKfB8a/pBQ=; b=kcpEuX2abnpPpIDY1HG6E32eY2PbwI37RbMyBdLrcqY8Dy09vAV87urvOwzwLZB+PLwi6i ft5r4eZWuapgHMAKi2rq79gy2rHX9sYiyG9QBgDBgAEPGcU0x5jK+YoGzhFOBww33I0/Lm /IHww6pDof1S59Pm9sYmbHIAuc47oybnuKg38Ilub2y9gYf1JcAhKGsYkWJ00RZamp9xzy DR1EatkVoA5sgZk8UUr2QdrV3dEUM31h8ddvAhk2rJLo/9zgbzc3H66ertJWFe7R57O8ga Kz7E2OGDJ/yvmYG3C8YC0RGpJVOXMUYS1Li17YBI40J8TUEE2++mEkylfb1JXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G54EkretQlI+bEbTLm9mQwL3vCmYWHdQgmKfB8a/pBQ=; b=ZVZE/KQ0EpJZfiULpQTH1zt+vLMFGJP2jvFItx1bfvZpg63z/17VMX6NfZhSf1/z0/zP7z 3UFvOU8XNmMLkzsUPMV4898S4CL+i3RuYJGabitCwAJDVpjZTA3Z4idO75qS6FSfqEN5nj c2z4JKphMkivHHA4P9oKHDwGjNxn7j8YOa6YYH+NILBhekyNCsQVxroGTrn8ON6AlU8Tkd tO0NlkKTxDwb8g6zXq5IwceQeFFc6dKm3X76c6Wu4lbABN55ohz1KSZ/NDLXeBIfzbIk/3 Hl1VHhz+Fi+oCarbOoLa+71cceipbhnpR4esx5WrxpqilMb/nMi6kj2+i9q8cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762272339; a=rsa-sha256; cv=none; b=tDbUtU9iLoYAH7IaYwn0OKgX9xeaezC+5R7OeDSuwF6mU+oBpXHRVt2kn2G8ri7EBWq/3r /fB8B9tMWoyt3VnkBxFE9KVI/BZa41zWKuMkX6j868qru7J31Far3sGkBkWzcVQToWeSQ6 s63POK2Y4Oe0Ignqo5BRxAGAQ8bxr+5OWW9tTI2FMMcWta7ShbSDgyBFjHjXqg85rKg79o pn8wkfu2VendAGGsBTeRSl34jY54RMz6tKHxZ736cUGRinDCZ6lYHT/l/mz29z59cbWhwx uG/WLBuh8WAX5dGTZgHKhRNVapVK/ETVA4HYcOBrRnN5DWooXRWhIxeX7WS5ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Cwg61s5z1466; Tue, 04 Nov 2025 16:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4G5ddk075515; Tue, 4 Nov 2025 16:05:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4G5dxi075512; Tue, 4 Nov 2025 16:05:39 GMT (envelope-from git) Date: Tue, 4 Nov 2025 16:05:39 GMT Message-Id: <202511041605.5A4G5dxi075512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 779e075df98d - stable/15 - crypto/openssl: update component to 3.5.3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 779e075df98da07468ec5dd13b44241110a2abf2 Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=779e075df98da07468ec5dd13b44241110a2abf2 commit 779e075df98da07468ec5dd13b44241110a2abf2 Author: Enji Cooper AuthorDate: 2025-09-22 22:31:10 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:03:09 +0000 crypto/openssl: update component to 3.5.3 This change updates the sources for crypto/openssl. The subsequent commit will update the build artifacts to match the 3.5.3 release. More details about the update can be found in the related vendor branch commits. MFC after: 1 week Merge commit 'aed904c48f330dc76da942a8ee2d6eef9d11f572' --- crypto/openssl/.ctags.d/add-dir.ctags | 11 + crypto/openssl/.ctags.d/exclude.ctags | 13 + .../openssl-stage1/10extrac-macrodefs.ctags | 18 + .../.ctags.d/openssl-stage2/10expand-macros.ctags | 9 + crypto/openssl/CHANGES.md | 57 +++ crypto/openssl/Configurations/unix-Makefile.tmpl | 14 +- crypto/openssl/NEWS.md | 14 + crypto/openssl/NOTES-WINDOWS.md | 2 +- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/asn1parse.c | 2 +- crypto/openssl/apps/cms.c | 1 + crypto/openssl/apps/enc.c | 2 + crypto/openssl/apps/include/apps.h | 1 - crypto/openssl/apps/lib/apps.c | 49 -- crypto/openssl/apps/ocsp.c | 21 +- crypto/openssl/apps/rand.c | 4 +- crypto/openssl/crypto/aes/asm/aes-s390x.pl | 5 +- crypto/openssl/crypto/asn1/asn_mime.c | 22 +- crypto/openssl/crypto/bio/bss_dgram.c | 25 +- crypto/openssl/crypto/dh/dh_check.c | 36 +- crypto/openssl/crypto/dh/dh_key.c | 14 +- crypto/openssl/crypto/dh/dh_pmeth.c | 2 +- crypto/openssl/crypto/encode_decode/decoder_lib.c | 28 ++ crypto/openssl/crypto/encode_decode/decoder_pkey.c | 72 ++- .../openssl/crypto/encode_decode/encoder_local.h | 2 + crypto/openssl/crypto/err/openssl.txt | 1 + crypto/openssl/crypto/evp/asymcipher.c | 8 +- crypto/openssl/crypto/evp/keymgmt_meth.c | 4 +- crypto/openssl/crypto/evp/m_sigver.c | 24 +- crypto/openssl/crypto/evp/p_seal.c | 7 +- crypto/openssl/crypto/evp/skeymgmt_meth.c | 2 +- crypto/openssl/crypto/pkcs7/pk7_doit.c | 7 +- crypto/openssl/crypto/provider_core.c | 10 +- crypto/openssl/crypto/rand/randfile.c | 6 +- crypto/openssl/crypto/riscv32cpuid.pl | 5 +- crypto/openssl/crypto/riscv64cpuid.pl | 5 +- crypto/openssl/crypto/rsa/rsa_gen.c | 15 + crypto/openssl/crypto/rsa/rsa_pmeth.c | 8 +- crypto/openssl/crypto/sleep.c | 39 +- crypto/openssl/crypto/slh_dsa/slh_dsa_key.c | 24 +- crypto/openssl/crypto/slh_dsa/slh_hash.c | 3 + crypto/openssl/crypto/sm2/sm2_sign.c | 6 +- crypto/openssl/crypto/store/store_lib.c | 25 +- crypto/openssl/crypto/x509/by_store.c | 34 +- crypto/openssl/crypto/x509/t_req.c | 6 +- crypto/openssl/crypto/x509/v3_attrdesc.c | 4 +- crypto/openssl/crypto/x509/v3_purp.c | 2 +- crypto/openssl/crypto/x509/x509_ext.c | 20 +- crypto/openssl/crypto/x509/x509_local.h | 1 + crypto/openssl/crypto/x509/x509_lu.c | 6 +- crypto/openssl/crypto/x509/x509_vpm.c | 5 + crypto/openssl/crypto/x509/x_crl.c | 15 +- crypto/openssl/demos/bio/saccept.c | 7 +- crypto/openssl/demos/bio/server-arg.c | 7 +- crypto/openssl/demos/bio/server-cmod.c | 7 +- crypto/openssl/demos/bio/server-conf.c | 7 +- crypto/openssl/demos/certs/mkcerts.sh | 2 +- crypto/openssl/demos/certs/ocspquery.sh | 2 +- crypto/openssl/demos/certs/ocsprun.sh | 4 +- crypto/openssl/demos/cms/cms_ddec.c | 4 +- crypto/openssl/demos/cms/cms_denc.c | 4 +- crypto/openssl/demos/pkey/EVP_PKEY_RSA_keygen.c | 4 +- .../openssl/doc/internal/man3/ossl_namemap_new.pod | 15 +- crypto/openssl/doc/man1/openssl-enc.pod.in | 7 +- crypto/openssl/doc/man1/openssl-fipsinstall.pod.in | 10 +- crypto/openssl/doc/man3/BN_generate_prime.pod | 6 +- crypto/openssl/doc/man3/EVP_EncryptInit.pod | 2 +- crypto/openssl/doc/man3/EVP_PKEY_new.pod | 14 +- crypto/openssl/doc/man3/EVP_aes_128_gcm.pod | 4 +- crypto/openssl/doc/man3/EVP_aria_128_gcm.pod | 4 +- crypto/openssl/doc/man3/EVP_chacha20.pod | 4 +- crypto/openssl/doc/man3/OPENSSL_secure_malloc.pod | 9 +- crypto/openssl/doc/man3/OSSL_CALLBACK.pod | 11 +- crypto/openssl/doc/man3/PEM_read_CMS.pod | 8 +- crypto/openssl/doc/man3/RAND_load_file.pod | 8 +- .../openssl/doc/man3/SSL_CTX_set_domain_flags.pod | 2 +- .../doc/man3/SSL_CTX_set_tmp_dh_callback.pod | 10 +- crypto/openssl/doc/man3/SSL_poll.pod | 24 +- crypto/openssl/doc/man3/d2i_X509.pod | 5 +- crypto/openssl/doc/man5/fips_config.pod | 16 +- crypto/openssl/doc/man7/EVP_ASYM_CIPHER-RSA.pod | 5 +- crypto/openssl/doc/man7/EVP_PKEY-DSA.pod | 4 +- crypto/openssl/doc/man7/EVP_PKEY-FFC.pod | 4 +- crypto/openssl/doc/man7/EVP_SIGNATURE-ML-DSA.pod | 2 +- crypto/openssl/doc/man7/EVP_SIGNATURE-SLH-DSA.pod | 2 +- crypto/openssl/doc/man7/OSSL_PROVIDER-FIPS.pod | 96 ++-- crypto/openssl/doc/man7/provider-base.pod | 31 ++ crypto/openssl/fuzz/dtlsserver.c | 5 +- crypto/openssl/include/crypto/dh.h | 4 +- crypto/openssl/include/crypto/rsa.h | 6 +- crypto/openssl/include/crypto/slh_dsa.h | 2 + crypto/openssl/include/internal/quic_ackm.h | 4 +- crypto/openssl/include/internal/quic_record_rx.h | 11 + crypto/openssl/include/openssl/core_dispatch.h | 4 + crypto/openssl/include/openssl/crypto.h.in | 8 +- crypto/openssl/include/openssl/opensslv.h.in | 9 +- crypto/openssl/include/openssl/pem.h | 1 + crypto/openssl/include/openssl/proverr.h | 1 + crypto/openssl/include/openssl/self_test.h | 2 + crypto/openssl/providers/common/provider_err.c | 2 + .../openssl/providers/common/securitycheck_fips.c | 25 +- crypto/openssl/providers/fips-sources.checksums | 76 +-- crypto/openssl/providers/fips.checksum | 2 +- crypto/openssl/providers/fips/fipsprov.c | 9 + .../providers/fips/include/fips/fipsindicator.h | 3 +- crypto/openssl/providers/fips/self_test.c | 13 +- crypto/openssl/providers/fips/self_test_data.inc | 235 ++++----- .../implementations/asymciphers/rsa_enc.c | 19 +- .../implementations/encode_decode/decode_pem2der.c | 1 + .../providers/implementations/kem/ml_kem_kem.c | 2 +- .../providers/implementations/keymgmt/dh_kmgmt.c | 15 +- .../providers/implementations/keymgmt/ec_kmgmt.c | 17 + .../providers/implementations/keymgmt/ecx_kmgmt.c | 23 +- .../implementations/keymgmt/ml_dsa_kmgmt.c | 13 +- .../implementations/keymgmt/ml_kem_kmgmt.c | 4 +- .../providers/implementations/keymgmt/rsa_kmgmt.c | 1 + .../implementations/keymgmt/slh_dsa_kmgmt.c | 29 +- .../providers/implementations/macs/hmac_prov.c | 17 +- .../providers/implementations/signature/dsa_sig.c | 2 +- .../implementations/signature/ecdsa_sig.c | 2 +- .../providers/implementations/signature/rsa_sig.c | 8 +- crypto/openssl/providers/legacyprov.c | 11 +- crypto/openssl/ssl/d1_lib.c | 2 +- crypto/openssl/ssl/quic/quic_ackm.c | 33 +- crypto/openssl/ssl/quic/quic_channel.c | 18 +- crypto/openssl/ssl/quic/quic_impl.c | 1 + crypto/openssl/ssl/quic/quic_port.c | 3 +- crypto/openssl/ssl/quic/quic_record_rx.c | 10 + crypto/openssl/ssl/quic/quic_record_tx.c | 4 +- crypto/openssl/ssl/quic/quic_rx_depack.c | 28 +- crypto/openssl/ssl/statem/extensions_clnt.c | 10 +- crypto/openssl/test/crltest.c | 127 ++++- crypto/openssl/test/evp_extra_test.c | 43 ++ crypto/openssl/test/fake_rsaprov.c | 548 ++++++++++++++++++++- crypto/openssl/test/ml_kem_internal_test.c | 14 +- crypto/openssl/test/provider_pkey_test.c | 289 ++++++++++- .../hq-interop/quic-hq-interop.c | 3 +- crypto/openssl/test/quic_ackm_test.c | 5 +- crypto/openssl/test/quic_fifd_test.c | 5 +- crypto/openssl/test/quic_txp_test.c | 3 +- crypto/openssl/test/quicapitest.c | 57 +++ crypto/openssl/test/radix/quic_bindings.c | 4 +- crypto/openssl/test/recipes/15-test_ec.t | 14 +- crypto/openssl/test/recipes/20-test_cli_list.t | 25 + .../recipes/30-test_evp_data/evppkey_ecdsa.txt | 11 +- crypto/openssl/test/recipes/80-test_cms.t | 17 + crypto/openssl/test/recipes/90-test_store_cases.t | 26 +- .../recipes/90-test_store_cases_data/test-BER.p12 | Bin 0 -> 2126 bytes .../recipes/90-test_threads_data/store/8489a545.0 | 19 + .../oqsprovider-ca.sh | 58 +++ .../oqsprovider.sh | 2 + crypto/openssl/test/sanitytest.c | 81 ++- crypto/openssl/test/slh_dsa_test.c | 9 +- crypto/openssl/test/testec-sm2.pem | 5 + crypto/openssl/test/threadstest.c | 70 ++- crypto/openssl/test/tls13groupselection_test.c | 19 +- crypto/openssl/test/x509_test.c | 111 ++++- crypto/openssl/util/perl/TLSProxy/Proxy.pm | 27 +- 158 files changed, 2705 insertions(+), 653 deletions(-) diff --git a/crypto/openssl/.ctags.d/add-dir.ctags b/crypto/openssl/.ctags.d/add-dir.ctags new file mode 100644 index 000000000000..ec20b51bd4ca --- /dev/null +++ b/crypto/openssl/.ctags.d/add-dir.ctags @@ -0,0 +1,11 @@ +# +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# + +# Allow ctags to load configuration file under the sub directories. +--optlib-dir=+./.ctags.d diff --git a/crypto/openssl/.ctags.d/exclude.ctags b/crypto/openssl/.ctags.d/exclude.ctags new file mode 100644 index 000000000000..c932464e6dbd --- /dev/null +++ b/crypto/openssl/.ctags.d/exclude.ctags @@ -0,0 +1,13 @@ +# +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# + +# List file names or patterns you want ctags to ignore. +--exclude=.ctags.d +--exclude=test +--exclude=check-format-test-positives.c diff --git a/crypto/openssl/.ctags.d/openssl-stage1/10extrac-macrodefs.ctags b/crypto/openssl/.ctags.d/openssl-stage1/10extrac-macrodefs.ctags new file mode 100644 index 000000000000..ddd4fd54bd04 --- /dev/null +++ b/crypto/openssl/.ctags.d/openssl-stage1/10extrac-macrodefs.ctags @@ -0,0 +1,18 @@ +# +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# + +# This file is only for extracting macro definitions. +--langmap=C:+.h +-o - +--sort=no +--languages=C +-R + +--fields-C=+{macrodef} +--fields=+{signature} diff --git a/crypto/openssl/.ctags.d/openssl-stage2/10expand-macros.ctags b/crypto/openssl/.ctags.d/openssl-stage2/10expand-macros.ctags new file mode 100644 index 000000000000..5cf5000df3af --- /dev/null +++ b/crypto/openssl/.ctags.d/openssl-stage2/10expand-macros.ctags @@ -0,0 +1,9 @@ +# +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# +--param-CPreProcessor._expand=1 diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md index 2978ebfa2d10..5f5ba3ef1751 100644 --- a/crypto/openssl/CHANGES.md +++ b/crypto/openssl/CHANGES.md @@ -28,6 +28,63 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Changes between 3.5.2 and 3.5.3 [16 Sep 2025] + + * Avoided a potential race condition introduced in 3.5.1, where + `OSSL_STORE_CTX` kept open during lookup while potentially being used + by multiple threads simultaneously, that could lead to potential crashes + when multiple concurrent TLS connections are served. + + *Matt Caswell* + + * The FIPS provider no longer performs a PCT on key import for RSA, DH, + and EC keys (that was introduced in 3.5.2), following the latest update + on that requirement in FIPS 140-3 IG 10.3.A additional comment 1. + + *Dr Paul Dale* + + * Secure memory allocation calls are no longer used for HMAC keys. + + *Dr Paul Dale* + + * `openssl req` no longer generates certificates with an empty extension list + when SKID/AKID are set to `none` during generation. + + *David Benjamin* + + * The man page date is now derived from the release date provided + in `VERSION.dat` and not the current date for the released builds. + + *Enji Cooper* + + * Hardened the provider implementation of the RSA public key "encrypt" + operation to add a missing check that the caller-indicated output buffer + size is at least as large as the byte count of the RSA modulus. The issue + was reported by Arash Ale Ebrahim from SYSPWN. + + This operation is typically invoked via `EVP_PKEY_encrypt(3)`. Callers that + in fact provide a sufficiently large buffer, but fail to correctly indicate + its size may now encounter unexpected errors. In applications that attempt + RSA public encryption into a buffer that is too small, an out-of-bounds + write is now avoided and an error is reported instead. + + *Viktor Dukhovni* + + * Added FIPS 140-3 PCT on DH key generation. + + *Nikola Pajkovsky* + + * Fixed the synthesised `OPENSSL_VERSION_NUMBER`. + + *Richard Levitte* + +### Changes between 3.5.1 and 3.5.2 [5 Aug 2025] + + * The FIPS provider now performs a PCT on key import for RSA, EC and ECX. + This is mandated by FIPS 140-3 IG 10.3.A additional comment 1. + + *Dr Paul Dale* + ### Changes between 3.5.0 and 3.5.1 [1 Jul 2025] * Fix x509 application adds trusted use instead of rejected use. diff --git a/crypto/openssl/Configurations/unix-Makefile.tmpl b/crypto/openssl/Configurations/unix-Makefile.tmpl index a6f666957ec0..81f49926ce92 100644 --- a/crypto/openssl/Configurations/unix-Makefile.tmpl +++ b/crypto/openssl/Configurations/unix-Makefile.tmpl @@ -3,6 +3,8 @@ ## ## {- join("\n## ", @autowarntext) -} {- + use Time::Piece; + use OpenSSL::Util; our $makedep_scheme = $config{makedep_scheme}; @@ -74,6 +76,15 @@ FIPSKEY={- $config{FIPSKEY} -} VERSION={- "$config{full_version}" -} VERSION_NUMBER={- "$config{version}" -} +RELEASE_DATE={- my $t = localtime; + if ($config{"release_date"}) { + # Provide the user with a more meaningful error message + # than the default internal parsing error from + # `Time::Piece->strptime(..)`. + eval { $t = Time::Piece->strptime($config{"release_date"}, "%d %b %Y"); } || + die "Parsing \$config{release_date} ('$config{release_date}') failed: $@"; + } + $t->strftime("%Y-%m-%d") -} MAJOR={- $config{major} -} MINOR={- $config{minor} -} SHLIB_VERSION_NUMBER={- $config{shlib_version} -} @@ -1565,7 +1576,8 @@ EOF return <<"EOF"; $args{src}: $pod pod2man --name=$name --section=$section\$(MANSUFFIX) --center=OpenSSL \\ - --release=\$(VERSION) $pod >\$\@ + --date=\$(RELEASE_DATE) --release=\$(VERSION) \\ + $pod >\$\@ EOF } elsif (platform->isdef($args{src})) { # diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index e5fe94779035..5d8a83f43068 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -23,6 +23,20 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Major changes between OpenSSL 3.5.2 and OpenSSL 3.5.3 [16 Sep 2025] + + * Added FIPS 140-3 PCT on DH key generation. + + *Nikola Pajkovsky* + + * Fixed the synthesised `OPENSSL_VERSION_NUMBER`. + + *Richard Levitte* + +### Major changes between OpenSSL 3.5.1 and OpenSSL 3.5.2 [5 Aug 2025] + + * none + ### Major changes between OpenSSL 3.5.0 and OpenSSL 3.5.1 [1 Jul 2025] OpenSSL 3.5.1 is a security patch release. The most severe CVE fixed in this diff --git a/crypto/openssl/NOTES-WINDOWS.md b/crypto/openssl/NOTES-WINDOWS.md index e903376db530..5d6287a8e8fd 100644 --- a/crypto/openssl/NOTES-WINDOWS.md +++ b/crypto/openssl/NOTES-WINDOWS.md @@ -125,7 +125,7 @@ format: `\\HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432node\OpenSSL--` Where `` is the major.minor version of the library being -built, and `` is the value specified by `-DOPENSSL_WINCTX`. This allows +built, and `` is the value specified by `-DOSSL_WINCTX`. This allows for multiple openssl builds to be created and installed on a single system, in which each library can use its own set of registry keys. diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat index f931934a1972..8a2893b68006 100644 --- a/crypto/openssl/VERSION.dat +++ b/crypto/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=5 -PATCH=1 +PATCH=3 PRE_RELEASE_TAG= BUILD_METADATA= -RELEASE_DATE="1 Jul 2025" +RELEASE_DATE="16 Sep 2025" SHLIB_VERSION=3 diff --git a/crypto/openssl/apps/asn1parse.c b/crypto/openssl/apps/asn1parse.c index 4f882396d03d..4540d5f5fb6e 100644 --- a/crypto/openssl/apps/asn1parse.c +++ b/crypto/openssl/apps/asn1parse.c @@ -40,8 +40,8 @@ const OPTIONS asn1parse_options[] = { {"length", OPT_LENGTH, 'p', "length of section in file"}, {"strparse", OPT_STRPARSE, 'p', "offset; a series of these can be used to 'dig'"}, - {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"}, {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"}, + {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"}, {"genconf", OPT_GENCONF, 's', "file to generate ASN1 structure from"}, {"strictpem", OPT_STRICTPEM, 0, "equivalent to '-inform pem' (obsolete)"}, diff --git a/crypto/openssl/apps/cms.c b/crypto/openssl/apps/cms.c index 919d306ff687..6f19414880c9 100644 --- a/crypto/openssl/apps/cms.c +++ b/crypto/openssl/apps/cms.c @@ -1280,6 +1280,7 @@ int cms_main(int argc, char **argv) goto end; } if (ret <= 0) { + BIO_printf(bio_err, "Error writing CMS output\n"); ret = 6; goto end; } diff --git a/crypto/openssl/apps/enc.c b/crypto/openssl/apps/enc.c index 3f45ba15e576..33949d402dd7 100644 --- a/crypto/openssl/apps/enc.c +++ b/crypto/openssl/apps/enc.c @@ -260,6 +260,8 @@ int enc_main(int argc, char **argv) goto opthelp; if (k) n *= 1024; + if (n > INT_MAX) + goto opthelp; bsize = (int)n; break; case OPT_K: diff --git a/crypto/openssl/apps/include/apps.h b/crypto/openssl/apps/include/apps.h index ceebfde72786..11381ea7da8c 100644 --- a/crypto/openssl/apps/include/apps.h +++ b/crypto/openssl/apps/include/apps.h @@ -103,7 +103,6 @@ int wrap_password_callback(char *buf, int bufsiz, int verify, void *cb_data); /* progress callback for dsaparam, dhparam, req, genpkey, etc. */ int progress_cb(EVP_PKEY_CTX *ctx); -int chopup_args(ARGS *arg, char *buf); void dump_cert_text(BIO *out, X509 *x); void print_name(BIO *out, const char *title, const X509_NAME *nm); void print_bignum_var(BIO *, const BIGNUM *, const char *, diff --git a/crypto/openssl/apps/lib/apps.c b/crypto/openssl/apps/lib/apps.c index d4e72307de58..1b9c9e3e9a19 100644 --- a/crypto/openssl/apps/lib/apps.c +++ b/crypto/openssl/apps/lib/apps.c @@ -83,55 +83,6 @@ static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl); int app_init(long mesgwin); -int chopup_args(ARGS *arg, char *buf) -{ - int quoted; - char c = '\0', *p = NULL; - - arg->argc = 0; - if (arg->size == 0) { - arg->size = 20; - arg->argv = app_malloc(sizeof(*arg->argv) * arg->size, "argv space"); - } - - for (p = buf;;) { - /* Skip whitespace. */ - while (*p && isspace(_UC(*p))) - p++; - if (*p == '\0') - break; - - /* The start of something good :-) */ - if (arg->argc >= arg->size) { - char **tmp; - - arg->size += 20; - tmp = OPENSSL_realloc(arg->argv, sizeof(*arg->argv) * arg->size); - if (tmp == NULL) - return 0; - arg->argv = tmp; - } - quoted = *p == '\'' || *p == '"'; - if (quoted) - c = *p++; - arg->argv[arg->argc++] = p; - - /* now look for the end of this */ - if (quoted) { - while (*p && *p != c) - p++; - *p++ = '\0'; - } else { - while (*p && !isspace(_UC(*p))) - p++; - if (*p) - *p++ = '\0'; - } - } - arg->argv[arg->argc] = NULL; - return 1; -} - #ifndef APP_INIT int app_init(long mesgwin) { diff --git a/crypto/openssl/apps/ocsp.c b/crypto/openssl/apps/ocsp.c index 79b76a2ca747..95a95f56cb99 100644 --- a/crypto/openssl/apps/ocsp.c +++ b/crypto/openssl/apps/ocsp.c @@ -662,7 +662,8 @@ redo_accept: resp = OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, NULL); - send_ocsp_response(cbio, resp); + if (resp != NULL) + send_ocsp_response(cbio, resp); } goto done_resp; } @@ -764,16 +765,18 @@ redo_accept: BIO_free(derbio); } - i = OCSP_response_status(resp); - if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) { - BIO_printf(out, "Responder Error: %s (%d)\n", - OCSP_response_status_str(i), i); - if (!ignore_err) + if (resp != NULL) { + i = OCSP_response_status(resp); + if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) { + BIO_printf(out, "Responder Error: %s (%d)\n", + OCSP_response_status_str(i), i); + if (!ignore_err) goto end; - } + } - if (resp_text) - OCSP_RESPONSE_print(out, resp, 0); + if (resp_text) + OCSP_RESPONSE_print(out, resp, 0); + } /* If running as responder don't verify our own response */ if (cbio != NULL) { diff --git a/crypto/openssl/apps/rand.c b/crypto/openssl/apps/rand.c index b123a151ea74..da747c1783e4 100644 --- a/crypto/openssl/apps/rand.c +++ b/crypto/openssl/apps/rand.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -199,7 +199,7 @@ int rand_main(int argc, char **argv) int chunk; chunk = scaled_num > buflen ? (int)buflen : (int)scaled_num; - r = RAND_bytes(buf, chunk); + r = RAND_bytes_ex(app_get0_libctx(), buf, chunk, 0); if (r <= 0) goto end; if (format != FORMAT_TEXT) { diff --git a/crypto/openssl/crypto/aes/asm/aes-s390x.pl b/crypto/openssl/crypto/aes/asm/aes-s390x.pl index 5d1283f57690..2345d4574a41 100755 --- a/crypto/openssl/crypto/aes/asm/aes-s390x.pl +++ b/crypto/openssl/crypto/aes/asm/aes-s390x.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -1431,6 +1431,9 @@ $code.=<<___ if (!$softonly); st${g} $s3,0($sp) # backchain la %r1,$stdframe($sp) + xc $stdframe+0(64,$sp),$stdframe+0($sp) # clear reserved/unused + # in parameter block + lmg $s2,$s3,0($key) # copy key stg $s2,$stdframe+80($sp) stg $s3,$stdframe+88($sp) diff --git a/crypto/openssl/crypto/asn1/asn_mime.c b/crypto/openssl/crypto/asn1/asn_mime.c index 806adade7ffc..9afe249965e9 100644 --- a/crypto/openssl/crypto/asn1/asn_mime.c +++ b/crypto/openssl/crypto/asn1/asn_mime.c @@ -168,6 +168,19 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs) BIO_write(out, ",", 1); write_comma = 1; md_nid = OBJ_obj2nid(sk_X509_ALGOR_value(mdalgs, i)->algorithm); + + /* RFC 8702 does not define a micalg for SHAKE, assuming "shake-" */ + if (md_nid == NID_shake128) { + if (BIO_puts(out, "shake-128") < 0) + goto err; + continue; + } + if (md_nid == NID_shake256) { + if (BIO_puts(out, "shake-256") < 0) + goto err; + continue; + } + md = EVP_get_digestbynid(md_nid); if (md && md->md_ctrl) { int rv; @@ -204,15 +217,15 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs) case NID_id_GostR3411_94: BIO_puts(out, "gostr3411-94"); - goto err; + break; case NID_id_GostR3411_2012_256: BIO_puts(out, "gostr3411-2012-256"); - goto err; + break; case NID_id_GostR3411_2012_512: BIO_puts(out, "gostr3411-2012-512"); - goto err; + break; default: if (have_unknown) { @@ -272,7 +285,8 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags, BIO_printf(bio, "Content-Type: multipart/signed;"); BIO_printf(bio, " protocol=\"%ssignature\";", mime_prefix); BIO_puts(bio, " micalg=\""); - asn1_write_micalg(bio, mdalgs); + if (!asn1_write_micalg(bio, mdalgs)) + return 0; BIO_printf(bio, "\"; boundary=\"----%s\"%s%s", bound, mime_eol, mime_eol); BIO_printf(bio, "This is an S/MIME signed message%s%s", diff --git a/crypto/openssl/crypto/bio/bss_dgram.c b/crypto/openssl/crypto/bio/bss_dgram.c index ea2550859ccd..784a1abb00bb 100644 --- a/crypto/openssl/crypto/bio/bss_dgram.c +++ b/crypto/openssl/crypto/bio/bss_dgram.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2005-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -464,11 +464,11 @@ static int dgram_write(BIO *b, const char *in, int inl) return ret; } -static long dgram_get_mtu_overhead(bio_dgram_data *data) +static long dgram_get_mtu_overhead(BIO_ADDR *addr) { long ret; - switch (BIO_ADDR_family(&data->peer)) { + switch (BIO_ADDR_family(addr)) { case AF_INET: /* * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP @@ -480,7 +480,8 @@ static long dgram_get_mtu_overhead(bio_dgram_data *data) { # ifdef IN6_IS_ADDR_V4MAPPED struct in6_addr tmp_addr; - if (BIO_ADDR_rawaddress(&data->peer, &tmp_addr, NULL) + + if (BIO_ADDR_rawaddress(addr, &tmp_addr, NULL) && IN6_IS_ADDR_V4MAPPED(&tmp_addr)) /* * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP @@ -666,11 +667,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) &sockopt_len)) < 0 || sockopt_val < 0) { ret = 0; } else { - /* - * we assume that the transport protocol is UDP and no IP - * options are used. - */ - data->mtu = sockopt_val - 8 - 20; + data->mtu = sockopt_val - dgram_get_mtu_overhead(&addr); ret = data->mtu; } break; @@ -682,11 +679,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) || sockopt_val < 0) { ret = 0; } else { - /* - * we assume that the transport protocol is UDP and no IPV6 - * options are used. - */ - data->mtu = sockopt_val - 8 - 40; + data->mtu = sockopt_val - dgram_get_mtu_overhead(&addr); ret = data->mtu; } break; @@ -700,7 +693,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) # endif break; case BIO_CTRL_DGRAM_GET_FALLBACK_MTU: - ret = -dgram_get_mtu_overhead(data); + ret = -dgram_get_mtu_overhead(&data->peer); switch (BIO_ADDR_family(&data->peer)) { case AF_INET: ret += 576; @@ -956,7 +949,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) } break; case BIO_CTRL_DGRAM_GET_MTU_OVERHEAD: - ret = dgram_get_mtu_overhead(data); + ret = dgram_get_mtu_overhead(&data->peer); break; /* diff --git a/crypto/openssl/crypto/dh/dh_check.c b/crypto/openssl/crypto/dh/dh_check.c index ae23f61839ea..2d899dc96f67 100644 --- a/crypto/openssl/crypto/dh/dh_check.c +++ b/crypto/openssl/crypto/dh/dh_check.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -16,6 +16,7 @@ #include #include "internal/cryptlib.h" #include +#include #include "dh_local.h" #include "crypto/dh.h" @@ -329,17 +330,27 @@ end: * FFC pairwise check from SP800-56A R3. * Section 5.6.2.1.4 Owner Assurance of Pair-wise Consistency */ -int ossl_dh_check_pairwise(const DH *dh) +int ossl_dh_check_pairwise(const DH *dh, int return_on_null_numbers) { int ret = 0; BN_CTX *ctx = NULL; BIGNUM *pub_key = NULL; + OSSL_SELF_TEST *st = NULL; + OSSL_CALLBACK *stcb = NULL; + void *stcbarg = NULL; if (dh->params.p == NULL || dh->params.g == NULL || dh->priv_key == NULL || dh->pub_key == NULL) - return 0; + return return_on_null_numbers; + + OSSL_SELF_TEST_get_callback(dh->libctx, &stcb, &stcbarg); + st = OSSL_SELF_TEST_new(stcb, stcbarg); + if (st == NULL) + goto err; + OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT, + OSSL_SELF_TEST_DESC_PCT_DH); ctx = BN_CTX_new_ex(dh->libctx); if (ctx == NULL) @@ -351,10 +362,27 @@ int ossl_dh_check_pairwise(const DH *dh) /* recalculate the public key = (g ^ priv) mod p */ if (!ossl_dh_generate_public_key(ctx, dh, dh->priv_key, pub_key)) goto err; + +#ifdef FIPS_MODULE + { + int len; + unsigned char bytes[1024] = {0}; /* Max key size of 8192 bits */ + + if (BN_num_bytes(pub_key) > (int)sizeof(bytes)) + goto err; + len = BN_bn2bin(pub_key, bytes); + OSSL_SELF_TEST_oncorrupt_byte(st, bytes); + if (BN_bin2bn(bytes, len, pub_key) == NULL) + goto err; + } +#endif /* check it matches the existing public_key */ ret = BN_cmp(pub_key, dh->pub_key) == 0; -err: + err: BN_free(pub_key); BN_CTX_free(ctx); + + OSSL_SELF_TEST_onend(st, ret); + OSSL_SELF_TEST_free(st); return ret; } diff --git a/crypto/openssl/crypto/dh/dh_key.c b/crypto/openssl/crypto/dh/dh_key.c index 7132b9b68e53..052d4d29ed22 100644 --- a/crypto/openssl/crypto/dh/dh_key.c +++ b/crypto/openssl/crypto/dh/dh_key.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -267,7 +267,7 @@ static int generate_key(DH *dh) int ok = 0; int generate_new_key = 0; #ifndef FIPS_MODULE - unsigned l; + int l; #endif BN_CTX *ctx = NULL; BIGNUM *pub_key = NULL, *priv_key = NULL; @@ -327,11 +327,13 @@ static int generate_key(DH *dh) goto err; #else if (dh->params.q == NULL) { - /* secret exponent length, must satisfy 2^(l-1) <= p */ - if (dh->length != 0 - && dh->length >= BN_num_bits(dh->params.p)) + /* secret exponent length, must satisfy 2^l < (p-1)/2 */ + l = BN_num_bits(dh->params.p); + if (dh->length >= l) goto err; - l = dh->length ? dh->length : BN_num_bits(dh->params.p) - 1; + l -= 2; + if (dh->length != 0 && dh->length < l) + l = dh->length; if (!BN_priv_rand_ex(priv_key, l, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY, 0, ctx)) goto err; diff --git a/crypto/openssl/crypto/dh/dh_pmeth.c b/crypto/openssl/crypto/dh/dh_pmeth.c index 3b75a537b3e0..74bef9370d3a 100644 --- a/crypto/openssl/crypto/dh/dh_pmeth.c +++ b/crypto/openssl/crypto/dh/dh_pmeth.c @@ -408,7 +408,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, } dh = (DH *)EVP_PKEY_get0_DH(ctx->pkey); dhpub = EVP_PKEY_get0_DH(ctx->peerkey); - if (dhpub == NULL) { + if (dhpub == NULL || dh == NULL) { ERR_raise(ERR_LIB_DH, DH_R_KEYS_NOT_SET); return 0; } diff --git a/crypto/openssl/crypto/encode_decode/decoder_lib.c b/crypto/openssl/crypto/encode_decode/decoder_lib.c index ffcf3cde1155..dedfb24e569e 100644 --- a/crypto/openssl/crypto/encode_decode/decoder_lib.c +++ b/crypto/openssl/crypto/encode_decode/decoder_lib.c @@ -537,6 +537,14 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg) } } +static int decoder_sk_cmp(const OSSL_DECODER_INSTANCE *const *a, + const OSSL_DECODER_INSTANCE *const *b) +{ + if ((*a)->score == (*b)->score) + return (*a)->order - (*b)->order; + return (*a)->score - (*b)->score; +} + int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx, OSSL_LIB_CTX *libctx, const char *propq) { @@ -595,6 +603,26 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx, OSSL_DECODER_do_all_provided(libctx, collect_all_decoders, skdecoders); numdecoders = sk_OSSL_DECODER_num(skdecoders); + /* + * If there are provided or default properties, sort the initial decoder list + * by property matching score so that the highest scored provider is selected + * first. + */ + if (propq != NULL || ossl_ctx_global_properties(libctx, 0) != NULL) { + int num_decoder_insts = sk_OSSL_DECODER_INSTANCE_num(ctx->decoder_insts); + int i; + OSSL_DECODER_INSTANCE *di; + sk_OSSL_DECODER_INSTANCE_compfunc old_cmp = + sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, decoder_sk_cmp); + + for (i = 0; i < num_decoder_insts; i++) { + di = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i); + di->order = i; + } + sk_OSSL_DECODER_INSTANCE_sort(ctx->decoder_insts); + sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, old_cmp); + } + memset(&data, 0, sizeof(data)); data.ctx = ctx; data.w_prev_start = 0; diff --git a/crypto/openssl/crypto/encode_decode/decoder_pkey.c b/crypto/openssl/crypto/encode_decode/decoder_pkey.c index f99566bde744..9fc4e2312331 100644 --- a/crypto/openssl/crypto/encode_decode/decoder_pkey.c +++ b/crypto/openssl/crypto/encode_decode/decoder_pkey.c @@ -222,15 +222,21 @@ struct collect_data_st { int total; /* number of matching results */ char error_occurred; char keytype_resolved; + OSSL_PROPERTY_LIST *pq; STACK_OF(EVP_KEYMGMT) *keymgmts; }; -static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, - void *provctx, struct collect_data_st *data) +/* + * Add decoder instance to the decoder context if it is compatible. Returns 1 + * if a decoder was added, 0 otherwise. + */ +static int collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, + void *provctx, struct collect_data_st *data) { void *decoderctx = NULL; OSSL_DECODER_INSTANCE *di = NULL; + const OSSL_PROPERTY_LIST *props; /* * We already checked the EVP_KEYMGMT is applicable in check_keymgmt so we @@ -239,17 +245,17 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, if (keymgmt->name_id != decoder->base.id) /* Mismatch is not an error, continue. */ - return; + return 0; if ((decoderctx = decoder->newctx(provctx)) == NULL) { data->error_occurred = 1; - return; + return 0; } if ((di = ossl_decoder_instance_new(decoder, decoderctx)) == NULL) { decoder->freectx(decoderctx); data->error_occurred = 1; - return; + return 0; } /* @@ -263,7 +269,7 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, || OPENSSL_strcasecmp(data->ctx->start_input_type, "PEM") != 0)) { /* Mismatch is not an error, continue. */ ossl_decoder_instance_free(di); - return; + return 0; } OSSL_TRACE_BEGIN(DECODER) { @@ -275,13 +281,30 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, OSSL_DECODER_get0_properties(decoder)); } OSSL_TRACE_END(DECODER); + /* + * Get the property match score so the decoders can be prioritized later. + */ + props = ossl_decoder_parsed_properties(decoder); + if (data->pq != NULL && props != NULL) { + di->score = ossl_property_match_count(data->pq, props); + /* + * Mismatch of mandatory properties is not an error, the decoder is just + * ignored, continue. *** 6151 LINES SKIPPED *** From nobody Tue Nov 4 16:05:40 2025 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 4d1Cwj4zwbz6GJrs; Tue, 04 Nov 2025 16:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Cwj22dFz3XDn; Tue, 04 Nov 2025 16:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272341; h=from:from:reply-to:subject:subject: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/zj20+TZljYp3n01oMsgcdyaengvFdD1lTe72mRlZ4=; b=xR6U2oWnzCqzgDLrKLLOns0EP1Zu+H64y/masONB64HJm31ViWtGWHgiKxQh5Xf3NnBsJI j7YpMh/TcrmesYVtFZy1MQt6ZL2BbyDiQsQeBHJhgPZ05CdtSwJXKTqPQM3TZUh56Z0lcL LEx6BYi+NGdcPttm1eDBUptuqyP1crfZgTLlF6ZC0Rgty5K8MR+z/sZxT9g3L7msC16WM9 P3USO0hyGKmoDx7k5uCkan6VV62niyzQg3SDZHhvts/eLZc8m9gJD0pTH/cvAY5/F+6Bjo Jis/njjXXNkR5uh3RsOTN7dN3chmu2QtzxE6WHs9xPrhcnZZCxhYqSGRHzlS/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272341; h=from:from:reply-to:subject:subject: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/zj20+TZljYp3n01oMsgcdyaengvFdD1lTe72mRlZ4=; b=cFH8S0pyM0JrY27Ryh9cAOFmdD1tYKDM0zZlDtd7b1F2DlzTcC+mydNIXwRv2iv3IvBeCh KxzN2CQY4m/YdyO8jIkITW0J3rN7bpWeVcltKxiTKMqaeXE4i9B7NQ4VrNYV2GsRoggam3 PvZ0EApfcLGWqiRUs/twoSjQ28Pw0RgiqalEXZV2OwfO3uJ4X3jnJzvT0/pIGsRiChqK6S M8FzNQBb2zlxIO9S3anOzkPFvvsjucwu44w1CQqCZDWkrVEwqDrpITOmHvhgKtJxdbXOXv YQNebgFqG3SqnqoqEpH3rmxGSFVt+wClWHVc4akGd8RTuty+fiQUrMEg4cJNSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762272341; a=rsa-sha256; cv=none; b=u2PKFMqHuhs+OcXoo1Y91+TrG865gQ/WZWt8t3IaMoKrIu85ApHVbsg0f/BhqzUDpJ116j DZVDMGIbLResrUg6EzvuZLIq/wA/BPMaMj3ZrrHB9ZI/0XwQU44XaNzkzgglxHt9GZJWkE G3WBmTow0JEbhqe8rThFffBFMCiG1QVt0xksFdwDEHnTLZtftO1bHhRM1XEQHT9zA7q7Fv jS8iwhNKfAkQInWKcODPaYAx4hLdSCNA3lTp2Jgx1QeLS2RXW1SFcpAMRFEokL0bnorZca Qgr/CaG8rxE+Qt9KtkbT4VSScIe973DddKk4QkvjNDGvGufVO+gEJxDIWoWssQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Cwj1b8fz13nH; Tue, 04 Nov 2025 16:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4G5fXB075554; Tue, 4 Nov 2025 16:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4G5eJD075550; Tue, 4 Nov 2025 16:05:40 GMT (envelope-from git) Date: Tue, 4 Nov 2025 16:05:40 GMT Message-Id: <202511041605.5A4G5eJD075550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 41955f207f50 - stable/15 - crypto/openssl: update build artifacts for the 3.5.3 release List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 41955f207f506035169451a6d9e8351df9984a97 Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=41955f207f506035169451a6d9e8351df9984a97 commit 41955f207f506035169451a6d9e8351df9984a97 Author: Enji Cooper AuthorDate: 2025-09-18 19:20:31 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:04:27 +0000 crypto/openssl: update build artifacts for the 3.5.3 release This change updates the build artifacts to match the 3.5.3 release. Much of the change involves updating version numbers and release dates to match the release version's metadata. MFC after: 1 week MFC with: 88b8b7f0c4e9948667a2279e78e975a784049cba (cherry picked from commit d9cc3d558d00ee7f62dbef2032f099033c91d2a1) --- crypto/openssl/configdata.pm | 15 ++-- crypto/openssl/exporters/libcrypto.pc | 2 +- crypto/openssl/exporters/libssl.pc | 2 +- crypto/openssl/exporters/openssl.pc | 2 +- crypto/openssl/include/openssl/crypto.h | 8 +- crypto/openssl/include/openssl/opensslv.h | 19 ++--- crypto/openssl/libcrypto.pc | 2 +- crypto/openssl/libssl.pc | 2 +- crypto/openssl/openssl.pc | 2 +- secure/lib/libcrypto/Makefile.version | 4 +- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 | 2 +- .../libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_sign.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- .../lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- .../libcrypto/man/man3/BIO_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_core.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_datagram.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_dgram_pair.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_sendmmsg.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_socket_wait.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 8 +- secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMAC_CTX.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_decrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_encrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EnvelopedData_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- .../libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_data_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_digest_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- .../libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- .../lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- .../libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- .../lib/libcrypto/man/man3/CMS_signed_get_attr.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/COMP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- .../libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- .../libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- .../libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- .../man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- .../libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 2 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- .../libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- .../libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_get_timeout.3 | 2 +- .../lib/libcrypto/man/man3/DTLSv1_handle_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_sign.3 | 2 +- .../lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- .../lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- .../lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- .../libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_new.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- .../lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_original_iv.3 | 2 +- .../lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- .../lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 4 +- secure/lib/libcrypto/man/man3/EVP_KDF.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEM_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MAC.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get_algor.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_copy_parameters.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- .../man/man3/EVP_PKEY_digestsign_supports_digest.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_attr.3 | 2 +- .../man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_field_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_gettable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 16 +++- .../libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- .../man/man3/EVP_PKEY_set1_encoded_public_key.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_settable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_RAND.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEY.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- .../lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_des_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- .../lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- .../man/man3/EVP_set_default_properties.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/GENERAL_NAME.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/NCONF_new_ex.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- .../libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- .../libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- .../man/man3/OPENSSL_load_builtin_modules.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_load_u16_le.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_riscvcap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 11 ++- secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 | 8 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ATAV_set0.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 | 2 +- .../man/man3/OSSL_CMP_HDR_get0_transactionID.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_ITAV_new_caCerts.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 | 2 +- .../libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set0_validity.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 | 2 +- .../man/man3/OSSL_DECODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 | 2 +- .../man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ERR_STATE_save.3 | 2 +- .../man/man3/OSSL_ESS_check_signing_certs.3 | 2 +- .../libcrypto/man/man3/OSSL_GENERAL_NAMES_print.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HPKE_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_IETF_ATTR_SYNTAX.3 | 2 +- .../man/man3/OSSL_IETF_ATTR_SYNTAX_print.3 | 2 +- .../man/man3/OSSL_INDICATOR_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ITEM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 | 2 +- .../man/man3/OSSL_LIB_CTX_set_conf_diagnostics.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 | 2 +- .../man/man3/OSSL_PARAM_allocate_from_text.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 | 2 +- .../libcrypto/man/man3/OSSL_PARAM_print_to_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 | 2 +- .../libcrypto/man/man3/OSSL_QUIC_client_method.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 | 2 +- .../man/man3/OSSL_SELF_TEST_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_sleep.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 | 2 +- .../man/man3/OSSL_trace_get_category_num.3 | 2 +- .../libcrypto/man/man3/OSSL_trace_set_channel.3 | 2 +- .../man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_version.3 | 2 +- .../libcrypto/man/man3/PBMAC1_get1_pbkdf2_param.3 | 2 +- .../libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 10 +-- .../libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- .../libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- .../man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 | 2 +- .../man/man3/PKCS12_SAFEBAG_create_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_set0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 | 2 +- .../libcrypto/man/man3/PKCS12_add_CSPName_asc.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 | 2 +- .../man/man3/PKCS12_add_friendlyname_asc.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 | 2 +- .../libcrypto/man/man3/PKCS12_get_friendlyname.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_init.3 | 2 +- .../libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 | 2 +- .../libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- .../libcrypto/man/man3/PKCS7_get_octet_string.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_type_is_other.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 | 2 +- .../lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_get0_primary.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 10 ++- secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 | 2 +- .../lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- .../man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- .../lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- .../man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_Calc_B.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 | 2 +- .../lib/libcrypto/man/man3/SRP_create_verifier.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 2 +- .../man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- .../man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- .../man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- .../man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- .../man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- .../man/man3/SSL_CTX_set1_cert_comp_preference.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- .../man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- .../man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- .../man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- .../man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- .../man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- .../man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_domain_flags.3 | 4 +- .../man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- .../man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- .../man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- .../man/man3/SSL_CTX_set_new_pending_conn_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- .../man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- .../man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- .../man/man3/SSL_CTX_set_security_level.3 | 2 +- .../man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- .../man/man3/SSL_CTX_set_session_id_context.3 | 2 +- .../man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- .../man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_srp_password.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- .../man/man3/SSL_CTX_set_tmp_dh_callback.3 | 12 +-- .../lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- .../man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 2 +- .../man/man3/SSL_SESSION_get0_id_context.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- .../man/man3/SSL_SESSION_get_compress_id.3 | 2 +- .../man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept_stream.3 | 2 +- .../lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- .../man/man3/SSL_export_keying_material.3 | 2 +- .../libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_connection.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_rpk.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- .../libcrypto/man/man3/SSL_get1_builtin_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- .../libcrypto/man/man3/SSL_get_conn_close_info.3 | 2 +- .../libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_event_timeout.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_handshake_rtt.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- .../man/man3/SSL_get_peer_signature_nid.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- .../libcrypto/man/man3/SSL_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- .../libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_stream_id.3 | 2 +- .../libcrypto/man/man3/SSL_get_stream_read_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_value_uint.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_group_to_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_handle_events.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- .../lib/libcrypto/man/man3/SSL_inject_net_dgram.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- .../libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_domain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_listener.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_stream.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_poll.3 | 26 ++++--- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- .../lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- .../man/man3/SSL_set1_initial_peer_addr.3 | 2 +- .../libcrypto/man/man3/SSL_set1_server_cert_type.3 | 2 +- .../libcrypto/man/man3/SSL_set_async_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_blocking_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- .../man/man3/SSL_set_default_stream_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- .../man/man3/SSL_set_incoming_stream_policy.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_quic_tls_cbs.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_retry_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- .../libcrypto/man/man3/SSL_set_session_secret_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- .../lib/libcrypto/man/man3/SSL_stream_conclude.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_stream_reset.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/TS_VERIFY_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_add1_attr.3 | 2 +- .../libcrypto/man/man3/X509_ACERT_add_attr_nconf.3 | 2 +- .../man/man3/X509_ACERT_get0_holder_baseCertId.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_get_attr.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ATTRIBUTE.3 | 2 +- .../libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- .../libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- .../man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- .../man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- .../man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_REQ_get_attr.3 | 2 +- .../libcrypto/man/man3/X509_REQ_get_extensions.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- .../man/man3/X509_STORE_CTX_get_by_subject.3 | 2 +- .../libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- .../man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- .../man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- .../man/man3/X509_VERIFY_PARAM_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- .../libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- .../man/man3/X509_get0_distinguishing_id.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- .../man/man3/X509_get_default_cert_file.3 | 2 +- .../libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_load_http.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 | 2 +- .../libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 7 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- .../lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 | 2 +- secure/lib/libcrypto/man/man5/config.5 | 2 +- secure/lib/libcrypto/man/man5/fips_config.5 | 18 ++--- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 | 7 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-ARGON2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PVKKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 | 2 +- .../lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-KECCAK.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-common.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 | 6 +- secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 | 6 +- secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SLH-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CRNG-TEST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-JITTER.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ML-DSA.7 | 4 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-SLH-DSA.7 | 4 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 | 87 ++++++++++------------ secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_STORE-winstore.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/fips_module.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-digest.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-mac.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-pkey.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-rand.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-core.h.7 | 2 +- .../libcrypto/man/man7/openssl-core_dispatch.h.7 | 2 +- .../lib/libcrypto/man/man7/openssl-core_names.h.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-env.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-glossary.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-qlog.7 | 2 +- .../libcrypto/man/man7/openssl-quic-concurrency.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-quic.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-threads.7 | 2 +- .../lib/libcrypto/man/man7/openssl_user_macros.7 | 2 +- .../libcrypto/man/man7/ossl-guide-introduction.7 | 2 +- .../man/man7/ossl-guide-libcrypto-introduction.7 | 2 +- .../man/man7/ossl-guide-libraries-introduction.7 | 2 +- .../man/man7/ossl-guide-libssl-introduction.7 | 2 +- .../lib/libcrypto/man/man7/ossl-guide-migration.7 | 2 +- .../man/man7/ossl-guide-quic-client-block.7 | 2 +- .../man/man7/ossl-guide-quic-client-non-block.7 | 2 +- .../man/man7/ossl-guide-quic-introduction.7 | 2 +- .../man/man7/ossl-guide-quic-multi-stream.7 | 2 +- .../man/man7/ossl-guide-quic-server-block.7 | 2 +- .../man/man7/ossl-guide-quic-server-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-introduction.7 | 2 +- .../man/man7/ossl-guide-tls-server-block.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- .../lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/property.7 | 2 +- .../lib/libcrypto/man/man7/provider-asym_cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-base.7 | 29 +++++++- secure/lib/libcrypto/man/man7/provider-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-decoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-digest.7 | 2 +- secure/lib/libcrypto/man/man7/provider-encoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kem.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keyexch.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-mac.7 | 2 +- secure/lib/libcrypto/man/man7/provider-object.7 | 2 +- secure/lib/libcrypto/man/man7/provider-rand.7 | 2 +- secure/lib/libcrypto/man/man7/provider-signature.7 | 2 +- secure/lib/libcrypto/man/man7/provider-skeymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-storemgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/openssl-asn1parse.1 | 2 +- secure/usr.bin/openssl/man/openssl-ca.1 | 2 +- secure/usr.bin/openssl/man/openssl-ciphers.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmds.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmp.1 | 2 +- secure/usr.bin/openssl/man/openssl-cms.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-dgst.1 | 2 +- secure/usr.bin/openssl/man/openssl-dhparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsaparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-ec.1 | 2 +- secure/usr.bin/openssl/man/openssl-ecparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-enc.1 | 11 ++- secure/usr.bin/openssl/man/openssl-engine.1 | 2 +- secure/usr.bin/openssl/man/openssl-errstr.1 | 2 +- secure/usr.bin/openssl/man/openssl-fipsinstall.1 | 12 +-- .../usr.bin/openssl/man/openssl-format-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-gendsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-genpkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-genrsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-info.1 | 2 +- secure/usr.bin/openssl/man/openssl-kdf.1 | 2 +- secure/usr.bin/openssl/man/openssl-list.1 | 2 +- secure/usr.bin/openssl/man/openssl-mac.1 | 2 +- .../openssl/man/openssl-namedisplay-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-nseq.1 | 2 +- secure/usr.bin/openssl/man/openssl-ocsp.1 | 2 +- .../openssl/man/openssl-passphrase-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-passwd.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs12.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs8.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-prime.1 | 2 +- secure/usr.bin/openssl/man/openssl-rand.1 | 2 +- secure/usr.bin/openssl/man/openssl-rehash.1 | 2 +- secure/usr.bin/openssl/man/openssl-req.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsautl.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_client.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_server.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_time.1 | 2 +- secure/usr.bin/openssl/man/openssl-sess_id.1 | 2 +- secure/usr.bin/openssl/man/openssl-skeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-smime.1 | 2 +- secure/usr.bin/openssl/man/openssl-speed.1 | 2 +- secure/usr.bin/openssl/man/openssl-spkac.1 | 2 +- secure/usr.bin/openssl/man/openssl-srp.1 | 2 +- secure/usr.bin/openssl/man/openssl-storeutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-ts.1 | 2 +- .../openssl/man/openssl-verification-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-verify.1 | 2 +- secure/usr.bin/openssl/man/openssl-version.1 | 2 +- secure/usr.bin/openssl/man/openssl-x509.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- 903 files changed, 1078 insertions(+), 1036 deletions(-) diff --git a/crypto/openssl/configdata.pm b/crypto/openssl/configdata.pm index ec70eaba9f07..8ea23bf8a681 100755 --- a/crypto/openssl/configdata.pm +++ b/crypto/openssl/configdata.pm @@ -30,6 +30,7 @@ our %config = ( "FIPSKEY" => "f4556650ac31d35461610bac4ed81b1a181b2d8a43ea2854cbae22ca74560813", "FIPS_VENDOR" => "OpenSSL non-compliant FIPS Provider", "HASHBANGPERL" => "/usr/bin/env perl", + "LD" => "ld", "LDFLAGS" => [], "LDLIBS" => [], "OBJCOPY" => "objcopy", @@ -167,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "1", "ex_libs" => [], - "full_version" => "3.5.1", + "full_version" => "3.5.3", "includes" => [], "ktls" => "", "lflags" => [], @@ -231,10 +232,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "etc", "options" => "enable-ec_nistp_64_gcc_128 enable-ktls enable-sctp --openssldir=etc --prefix=/usr no-acvp-tests no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips no-fips-jitter no-fips-post no-fips-securitychecks no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", - "patch" => "1", + "patch" => "3", "perl_archname" => "amd64-freebsd-thread-multi", "perl_cmd" => "/usr/local/bin/perl", - "perl_version" => "5.40.2", + "perl_version" => "5.40.3", "perlargv" => [ "disable-aria", "disable-egd", @@ -255,7 +256,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => undef, + "CC" => "cc", "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -265,7 +266,7 @@ our %config = ( "CXX" => undef, "CXXFLAGS" => undef, "HASHBANGPERL" => undef, - "LD" => undef, + "LD" => "ld", "LDFLAGS" => undef, "LDLIBS" => undef, "MT" => undef, @@ -290,11 +291,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "1 Jul 2025", + "release_date" => "16 Sep 2025", "shlib_version" => "3", "sourcedir" => ".", *** 12456 LINES SKIPPED *** From nobody Tue Nov 4 16:05:42 2025 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 4d1Cwk6chzz6GJrv; Tue, 04 Nov 2025 16:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Cwk3SJsz3XHJ; Tue, 04 Nov 2025 16:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n47va9ByKt0jz5n54MVTVeC2XHXJKjkXX2d9oP5x7H8=; b=IpeHW7JetBWRyuJAxgcVzfNe4w9zsrf4ZW9bKBebuG1iBxgNqSIfPX79Yi1OIfAQCvCA6t 05LZDsg4tisFQmzx39df96vWaARMMM9zTzhRmTWMZm//SYU9vEQqq8ZbgcvWHrPs1ZjFbw TQJin77C3DC2v8tvoRUGF0J2TKGladMmVT5oTeFTLXttNR7uvc7+9DnmZ0lOoSlnTcMR+0 ZPv1wBvZcRUoLXNooDJTW7MggDwd6vYuTUJ5A0jsUgQFmZwR098JK7nkZ6aC9YlxO24HEM aRFdgwg/Inq/sYt6X9fQXmTjVrqAgLjPECQM/7SssrsvFRayO9CuPlCGZKz0VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n47va9ByKt0jz5n54MVTVeC2XHXJKjkXX2d9oP5x7H8=; b=CXWbK8/9t9Ou1gH4w5OQBVdV7GVSm2azaJiPiqxqFz/gxA2CndFlPOVJ23Ewa3sztojQar YOx+KpCo3u+WSWtxFn+ZNN0u8MU2f+lzUcSMfGNyPuNTKSw31RReoOoBDwS3oM9499MzCh R+fjfxiWeP0sKK6QP878NXGIunAfuMU7VBSkIklkrSk4oCnrd8gjuIHHLggomXFVBAeIaZ MGmhz6Q8eKjUKt7eBlCqCtfoBnpMP7ehKRREN+HvyG8FViuouIqvjMgD80B9/EfW/YEDvZ Y8sy1bSiZ7zBhGyqIQmy8ZQiV6F05G+oZdroOfKzy8w4KQlHD189Sl63XMS8XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762272342; a=rsa-sha256; cv=none; b=tVA+uFy89GkGEssGXjiQakqBbg28zy4xHdiKFfR2DZ3XmW5EdPEddF/k4JJsCpNM/vqS/T JXB//HUqn1hIxT54rldo+LIO8qHczw75tcVi2k7UytSNSG5ROroGYfr6ER6b2zLYrf69DF yHMC29+eAeUMecRXbz8AKWjBM0mdj6y6XWHQZrlPGVIDI1p7EQvfttaQzcOX2WpWFZ1H++ KevcoISMnVzJSmJZql8e1+iBlDcIB4P6YcgaRhyvH71ftMisaE0HbuYk4ICJkMZh7Tdz9l agFgF1/OP4iyOX5R/6C3BDa3x+vTd3A4pWoMwDJtpqtACc+zpn9dweYd/1SaRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Cwk2lyCz13gx; Tue, 04 Nov 2025 16:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4G5gqW075590; Tue, 4 Nov 2025 16:05:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4G5gFV075587; Tue, 4 Nov 2025 16:05:42 GMT (envelope-from git) Date: Tue, 4 Nov 2025 16:05:42 GMT Message-Id: <202511041605.5A4G5gFV075587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 57d1d2c49707 - stable/15 - crypto/openssl: update to 3.5.4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 57d1d2c49707d1d74cdae2946d89bbd427661dca Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=57d1d2c49707d1d74cdae2946d89bbd427661dca commit 57d1d2c49707d1d74cdae2946d89bbd427661dca Author: Enji Cooper AuthorDate: 2025-10-04 03:26:18 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:05:12 +0000 crypto/openssl: update to 3.5.4 This change includes all necessary changes required to update to OpenSSL 3.5.4. More information about the 3.5.4 release can be found in the relevant release notes (see 8e12a5c4eb3507846b5 for more details). Merge commit '8e12a5c4eb3507846b507d0afe87d115af41df40' (cherry picked from commit 046c625e9382e17da953767b881aaa782fa73af8) --- crypto/openssl/CHANGES.md | 69 ++++++ crypto/openssl/NEWS.md | 40 +++- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/storeutl.c | 16 +- crypto/openssl/crypto/bio/bss_file.c | 2 +- crypto/openssl/crypto/ec/ecp_sm2p256.c | 2 +- crypto/openssl/crypto/evp/bio_ok.c | 27 ++- crypto/openssl/crypto/evp/ctrl_params_translate.c | 2 +- crypto/openssl/crypto/evp/p_lib.c | 17 +- crypto/openssl/crypto/info.c | 14 +- crypto/openssl/crypto/ml_dsa/ml_dsa_key.c | 4 +- crypto/openssl/crypto/ml_kem/ml_kem.c | 2 +- crypto/openssl/crypto/modes/siv128.c | 3 + crypto/openssl/crypto/property/property_parse.c | 2 +- crypto/openssl/crypto/rsa/rsa_gen.c | 15 -- crypto/openssl/crypto/rsa/rsa_sign.c | 4 +- crypto/openssl/crypto/threads_pthread.c | 12 +- crypto/openssl/crypto/x509/t_x509.c | 3 +- crypto/openssl/crypto/x509/x509_lu.c | 1 - crypto/openssl/doc/man3/DEFINE_STACK_OF.pod | 19 +- crypto/openssl/doc/man3/OpenSSL_version.pod | 9 +- crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod | 4 +- .../openssl/doc/man3/SSL_SESSION_get0_hostname.pod | 10 +- crypto/openssl/include/crypto/rsa.h | 4 - crypto/openssl/include/openssl/opensslv.h.in | 4 +- crypto/openssl/providers/fips-sources.checksums | 20 +- crypto/openssl/providers/fips.checksum | 2 +- crypto/openssl/providers/fips/self_test_data.inc | 42 ++++ crypto/openssl/providers/fips/self_test_kats.c | 100 ++++++++ .../providers/implementations/kdfs/krb5kdf.c | 7 +- .../providers/implementations/keymgmt/ecx_kmgmt.c | 8 - crypto/openssl/ssl/quic/quic_impl.c | 7 +- crypto/openssl/ssl/record/methods/tls_common.c | 11 +- crypto/openssl/ssl/ssl_rsa.c | 5 +- crypto/openssl/ssl/t1_trce.c | 4 + crypto/openssl/test/build.info | 3 +- crypto/openssl/test/fake_rsaprov.c | 4 +- crypto/openssl/test/fake_rsaprov.h | 11 +- crypto/openssl/test/ml_kem_evp_extra_test.c | 10 + crypto/openssl/test/property_test.c | 19 +- crypto/openssl/test/provider_pkey_test.c | 72 ++++++ crypto/openssl/test/quicapitest.c | 95 +------- crypto/openssl/test/radix/terp.c | 6 +- crypto/openssl/test/recipes/03-test_fipsinstall.t | 12 +- crypto/openssl/test/recipes/25-test_verify.t | 5 +- .../test/recipes/30-test_evp_data/evpkdf_krb5.txt | 10 +- .../30-test_evp_data/evppkey_rsa_sigalg.txt | 4 +- crypto/openssl/test/recipes/90-test_sslapi.t | 17 +- .../90-test_sslapi_data/ssltraceref-zlib.txt | 255 +++++++++++++++++++++ .../recipes/90-test_sslapi_data/ssltraceref.txt | 253 ++++++++++++++++++++ crypto/openssl/test/sslapitest.c | 87 +++++++ crypto/openssl/test/testutil.h | 2 + crypto/openssl/test/testutil/compare.c | 88 +++++++ crypto/openssl/test/threadstest.c | 11 +- crypto/openssl/test/wpackettest.c | 2 +- 55 files changed, 1241 insertions(+), 220 deletions(-) diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md index 5f5ba3ef1751..b991285aedb2 100644 --- a/crypto/openssl/CHANGES.md +++ b/crypto/openssl/CHANGES.md @@ -28,6 +28,72 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Changes between 3.5.3 and 3.5.4 [30 Sep 2025] + + * Fix Out-of-bounds read & write in RFC 3211 KEK Unwrap + + Issue summary: An application trying to decrypt CMS messages encrypted using + password based encryption can trigger an out-of-bounds read and write. + + Impact summary: This out-of-bounds read may trigger a crash which leads to + Denial of Service for an application. The out-of-bounds write can cause + a memory corruption which can have various consequences including + a Denial of Service or Execution of attacker-supplied code. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9230]) + + *Viktor Dukhovni* + + * Fix Timing side-channel in SM2 algorithm on 64 bit ARM + + Issue summary: A timing side-channel which could potentially allow remote + recovery of the private key exists in the SM2 algorithm implementation on + 64 bit ARM platforms. + + Impact summary: A timing side-channel in SM2 signature computations on + 64 bit ARM platforms could allow recovering the private key by an attacker. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9231]) + + *Stanislav Fort and Tomáš Mráz* + + * Fix Out-of-bounds read in HTTP client no_proxy handling + + Issue summary: An application using the OpenSSL HTTP client API functions + may trigger an out-of-bounds read if the "no_proxy" environment variable is + set and the host portion of the authority component of the HTTP URL is an + IPv6 address. + + Impact summary: An out-of-bounds read can trigger a crash which leads to + Denial of Service for an application. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9232]) + + *Stanislav Fort* + + * The FIPS provider no longer performs a PCT on key import for ECX keys + (that was introduced in 3.5.2), following the latest update + on that requirement in FIPS 140-3 IG 10.3.A additional comment 1. + + *Eugene Syromiatnikov* + + * Fixed the length of the ASN.1 sequence for the SM3 digests of RSA-encrypted + signatures. + + *Xiao Lou Dong Feng* + + * Reverted the synthesised `OPENSSL_VERSION_NUMBER` change for the release + builds, as it broke some exiting applications that relied on the previous + 3.x semantics, as documented in `OpenSSL_version(3)`. + + *Richard Levitte* + ### Changes between 3.5.2 and 3.5.3 [16 Sep 2025] * Avoided a potential race condition introduced in 3.5.1, where @@ -21284,6 +21350,9 @@ ndif +[CVE-2025-9232]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9232 +[CVE-2025-9231]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9231 +[CVE-2025-9230]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9230 [CVE-2025-4575]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-4575 [CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176 [CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143 diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index 5d8a83f43068..b194dfb7cb06 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -23,19 +23,46 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Major changes between OpenSSL 3.5.3 and OpenSSL 3.5.4 [30 Sep 2025] + +OpenSSL 3.5.4 is a security patch release. The most severe CVE fixed in this +release is Moderate. + +This release incorporates the following bug fixes and mitigations: + + * Fix Out-of-bounds read & write in RFC 3211 KEK Unwrap. + ([CVE-2025-9230]) + + * Fix Timing side-channel in SM2 algorithm on 64 bit ARM. + ([CVE-2025-9231]) + + * Fix Out-of-bounds read in HTTP client no_proxy handling. + ([CVE-2025-9232]) + + * Reverted the synthesised `OPENSSL_VERSION_NUMBER` change for the release + builds, as it broke some exiting applications that relied on the previous + 3.x semantics, as documented in `OpenSSL_version(3)`. + ### Major changes between OpenSSL 3.5.2 and OpenSSL 3.5.3 [16 Sep 2025] - * Added FIPS 140-3 PCT on DH key generation. +OpenSSL 3.5.3 is a bug fix release. + +This release incorporates the following bug fixes and mitigations: - *Nikola Pajkovsky* + * Added FIPS 140-3 PCT on DH key generation. * Fixed the synthesised `OPENSSL_VERSION_NUMBER`. - *Richard Levitte* + * Removed PCT on key import in the FIPS provider as it is not required by + the standard. ### Major changes between OpenSSL 3.5.1 and OpenSSL 3.5.2 [5 Aug 2025] - * none +OpenSSL 3.5.2 is a bug fix release. + +This release incorporates the following bug fixes and mitigations: + + * The FIPS provider now performs a PCT on key import for RSA, EC and ECX. ### Major changes between OpenSSL 3.5.0 and OpenSSL 3.5.1 [1 Jul 2025] @@ -45,7 +72,7 @@ release is Low. This release incorporates the following bug fixes and mitigations: * Fix x509 application adds trusted use instead of rejected use. - ([CVE-2025-4575]) + ([CVE-2025-4575]) ### Major changes between OpenSSL 3.4 and OpenSSL 3.5.0 [8 Apr 2025] @@ -1913,6 +1940,9 @@ OpenSSL 0.9.x * Support for various new platforms +[CVE-2025-9232]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9232 +[CVE-2025-9231]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9231 +[CVE-2025-9230]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9230 [CVE-2025-4575]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-4575 [CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176 [CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143 diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat index 8a2893b68006..a8eb3ac9c421 100644 --- a/crypto/openssl/VERSION.dat +++ b/crypto/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=5 -PATCH=3 +PATCH=4 PRE_RELEASE_TAG= BUILD_METADATA= -RELEASE_DATE="16 Sep 2025" +RELEASE_DATE="30 Sep 2025" SHLIB_VERSION=3 diff --git a/crypto/openssl/apps/storeutl.c b/crypto/openssl/apps/storeutl.c index 62f0e6135640..f8ebde44481c 100644 --- a/crypto/openssl/apps/storeutl.c +++ b/crypto/openssl/apps/storeutl.c @@ -331,14 +331,22 @@ int storeutl_main(int argc, char *argv[]) static int indent_printf(int indent, BIO *bio, const char *format, ...) { va_list args; - int ret; + int ret, vret; + + ret = BIO_printf(bio, "%*s", indent, ""); + if (ret < 0) + return ret; va_start(args, format); + vret = BIO_vprintf(bio, format, args); + va_end(args); - ret = BIO_printf(bio, "%*s", indent, "") + BIO_vprintf(bio, format, args); + if (vret < 0) + return vret; + if (vret > INT_MAX - ret) + return INT_MAX; - va_end(args); - return ret; + return ret + vret; } static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata, diff --git a/crypto/openssl/crypto/bio/bss_file.c b/crypto/openssl/crypto/bio/bss_file.c index 2743a14417cf..ddcb4feb6a58 100644 --- a/crypto/openssl/crypto/bio/bss_file.c +++ b/crypto/openssl/crypto/bio/bss_file.c @@ -287,7 +287,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) if (fp == NULL) { ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(), "calling fopen(%s, %s)", - ptr, p); + (const char *)ptr, p); ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB); ret = 0; break; diff --git a/crypto/openssl/crypto/ec/ecp_sm2p256.c b/crypto/openssl/crypto/ec/ecp_sm2p256.c index ffb58399dfd0..4c39be2186fb 100644 --- a/crypto/openssl/crypto/ec/ecp_sm2p256.c +++ b/crypto/openssl/crypto/ec/ecp_sm2p256.c @@ -1,5 +1,5 @@ /* - * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2023-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/crypto/evp/bio_ok.c b/crypto/openssl/crypto/evp/bio_ok.c index 20811ffded6f..d7f6c71ee1ad 100644 --- a/crypto/openssl/crypto/evp/bio_ok.c +++ b/crypto/openssl/crypto/evp/bio_ok.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -560,7 +560,7 @@ static int block_in(BIO *b) { BIO_OK_CTX *ctx; EVP_MD_CTX *md; - unsigned long tl = 0; + size_t tl = 0; unsigned char tmp[EVP_MAX_MD_SIZE]; int md_size; @@ -571,15 +571,18 @@ static int block_in(BIO *b) goto berr; assert(sizeof(tl) >= OK_BLOCK_BLOCK); /* always true */ - tl = ctx->buf[0]; - tl <<= 8; - tl |= ctx->buf[1]; - tl <<= 8; - tl |= ctx->buf[2]; - tl <<= 8; - tl |= ctx->buf[3]; - - if (ctx->buf_len < tl + OK_BLOCK_BLOCK + md_size) + tl = ((size_t)ctx->buf[0] << 24) + | ((size_t)ctx->buf[1] << 16) + | ((size_t)ctx->buf[2] << 8) + | ((size_t)ctx->buf[3]); + + if (tl > OK_BLOCK_SIZE) + goto berr; + + if (tl > SIZE_MAX - OK_BLOCK_BLOCK - (size_t)md_size) + goto berr; + + if (ctx->buf_len < tl + OK_BLOCK_BLOCK + (size_t)md_size) return 1; if (!EVP_DigestUpdate(md, @@ -587,7 +590,7 @@ static int block_in(BIO *b) goto berr; if (!EVP_DigestFinal_ex(md, tmp, NULL)) goto berr; - if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, md_size) == 0) { + if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, (size_t)md_size) == 0) { /* there might be parts from next block lurking around ! */ ctx->buf_off_save = tl + OK_BLOCK_BLOCK + md_size; ctx->buf_len_save = ctx->buf_len; diff --git a/crypto/openssl/crypto/evp/ctrl_params_translate.c b/crypto/openssl/crypto/evp/ctrl_params_translate.c index ed73fc0fbb8d..c846353200b2 100644 --- a/crypto/openssl/crypto/evp/ctrl_params_translate.c +++ b/crypto/openssl/crypto/evp/ctrl_params_translate.c @@ -1356,7 +1356,7 @@ static int fix_rsa_padding_mode(enum state state, if (i == OSSL_NELEM(str_value_map)) { ERR_raise_data(ERR_LIB_RSA, RSA_R_UNKNOWN_PADDING_TYPE, "[action:%d, state:%d] padding name %s", - ctx->action_type, state, ctx->p1); + ctx->action_type, state, (const char *)ctx->p2); ctx->p1 = ret = -2; } else if (state == POST_CTRL_TO_PARAMS) { /* EVP_PKEY_CTRL_GET_RSA_PADDING weirdness explained further up */ diff --git a/crypto/openssl/crypto/evp/p_lib.c b/crypto/openssl/crypto/evp/p_lib.c index 7f4508169dfa..63953a84e1f5 100644 --- a/crypto/openssl/crypto/evp/p_lib.c +++ b/crypto/openssl/crypto/evp/p_lib.c @@ -1146,15 +1146,14 @@ int EVP_PKEY_can_sign(const EVP_PKEY *pkey) } else { const OSSL_PROVIDER *prov = EVP_KEYMGMT_get0_provider(pkey->keymgmt); OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov); - const char *supported_sig = - pkey->keymgmt->query_operation_name != NULL - ? pkey->keymgmt->query_operation_name(OSSL_OP_SIGNATURE) - : EVP_KEYMGMT_get0_name(pkey->keymgmt); - EVP_SIGNATURE *signature = NULL; - - signature = EVP_SIGNATURE_fetch(libctx, supported_sig, NULL); - if (signature != NULL) { - EVP_SIGNATURE_free(signature); + EVP_SIGNATURE *sig; + const char *name; + + name = evp_keymgmt_util_query_operation_name(pkey->keymgmt, + OSSL_OP_SIGNATURE); + sig = EVP_SIGNATURE_fetch(libctx, name, NULL); + if (sig != NULL) { + EVP_SIGNATURE_free(sig); return 1; } } diff --git a/crypto/openssl/crypto/info.c b/crypto/openssl/crypto/info.c index 4d70471be255..e760ec094027 100644 --- a/crypto/openssl/crypto/info.c +++ b/crypto/openssl/crypto/info.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -23,6 +23,9 @@ #if defined(__arm__) || defined(__arm) || defined(__aarch64__) # include "arm_arch.h" # define CPU_INFO_STR_LEN 128 +#elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC) +# include "crypto/ppc_arch.h" +# define CPU_INFO_STR_LEN 128 #elif defined(__s390__) || defined(__s390x__) # include "s390x_arch.h" # define CPU_INFO_STR_LEN 2048 @@ -77,6 +80,15 @@ DEFINE_RUN_ONCE_STATIC(init_info_strings) BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str), sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str), " env:%s", env); +# elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC) + const char *env; + + BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str), + CPUINFO_PREFIX "OPENSSL_ppccap=0x%x", OPENSSL_ppccap_P); + if ((env = getenv("OPENSSL_ppccap")) != NULL) + BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str), + sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str), + " env:%s", env); # elif defined(__s390__) || defined(__s390x__) const char *env; diff --git a/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c b/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c index 41df1a956fb8..50e3b5433085 100644 --- a/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c +++ b/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c @@ -311,6 +311,7 @@ int ossl_ml_dsa_key_has(const ML_DSA_KEY *key, int selection) static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx, VECTOR *t1, VECTOR *t0) { + int ret = 0; const ML_DSA_PARAMS *params = key->params; uint32_t k = params->k, l = params->l; POLY *polys; @@ -343,9 +344,10 @@ static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx, /* Zeroize secret */ vector_zero(&s1_ntt); + ret = 1; err: OPENSSL_free(polys); - return 1; + return ret; } int ossl_ml_dsa_key_public_from_private(ML_DSA_KEY *key) diff --git a/crypto/openssl/crypto/ml_kem/ml_kem.c b/crypto/openssl/crypto/ml_kem/ml_kem.c index 4474af0f87cb..716c3bf4275e 100644 --- a/crypto/openssl/crypto/ml_kem/ml_kem.c +++ b/crypto/openssl/crypto/ml_kem/ml_kem.c @@ -2046,5 +2046,5 @@ int ossl_ml_kem_pubkey_cmp(const ML_KEM_KEY *key1, const ML_KEM_KEY *key2) * No match if just one of the public keys is not available, otherwise both * are unavailable, and for now such keys are considered equal. */ - return (ossl_ml_kem_have_pubkey(key1) ^ ossl_ml_kem_have_pubkey(key2)); + return (!(ossl_ml_kem_have_pubkey(key1) ^ ossl_ml_kem_have_pubkey(key2))); } diff --git a/crypto/openssl/crypto/modes/siv128.c b/crypto/openssl/crypto/modes/siv128.c index 72526b849eaf..4e52d8eb8782 100644 --- a/crypto/openssl/crypto/modes/siv128.c +++ b/crypto/openssl/crypto/modes/siv128.c @@ -202,9 +202,12 @@ int ossl_siv128_init(SIV128_CONTEXT *ctx, const unsigned char *key, int klen, || !EVP_MAC_final(mac_ctx, ctx->d.byte, &out_len, sizeof(ctx->d.byte))) { EVP_CIPHER_CTX_free(ctx->cipher_ctx); + ctx->cipher_ctx = NULL; EVP_MAC_CTX_free(ctx->mac_ctx_init); + ctx->mac_ctx_init = NULL; EVP_MAC_CTX_free(mac_ctx); EVP_MAC_free(ctx->mac); + ctx->mac = NULL; return 0; } EVP_MAC_CTX_free(mac_ctx); diff --git a/crypto/openssl/crypto/property/property_parse.c b/crypto/openssl/crypto/property/property_parse.c index 3a67754224f0..23963c89bc46 100644 --- a/crypto/openssl/crypto/property/property_parse.c +++ b/crypto/openssl/crypto/property/property_parse.c @@ -641,7 +641,7 @@ static void put_str(const char *str, char **buf, size_t *remain, size_t *needed) } quotes = quote != '\0'; - if (*remain == 0) { + if (*remain <= (size_t)quotes) { *needed += 2 * quotes; return; } diff --git a/crypto/openssl/crypto/rsa/rsa_gen.c b/crypto/openssl/crypto/rsa/rsa_gen.c index 033f66714add..f76bb7748369 100644 --- a/crypto/openssl/crypto/rsa/rsa_gen.c +++ b/crypto/openssl/crypto/rsa/rsa_gen.c @@ -734,18 +734,3 @@ err: return ret; } - -#ifdef FIPS_MODULE -int ossl_rsa_key_pairwise_test(RSA *rsa) -{ - OSSL_CALLBACK *stcb; - void *stcbarg; - int res; - - OSSL_SELF_TEST_get_callback(rsa->libctx, &stcb, &stcbarg); - res = rsa_keygen_pairwise_test(rsa, stcb, stcbarg); - if (res <= 0) - ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT_IMPORT); - return res; -} -#endif /* FIPS_MODULE */ diff --git a/crypto/openssl/crypto/rsa/rsa_sign.c b/crypto/openssl/crypto/rsa/rsa_sign.c index 78e4bad69e49..bb6e99acf9d3 100644 --- a/crypto/openssl/crypto/rsa/rsa_sign.c +++ b/crypto/openssl/crypto/rsa/rsa_sign.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -129,7 +129,7 @@ static const unsigned char digestinfo_ripemd160_der[] = { # ifndef OPENSSL_NO_SM3 /* SM3 (1 2 156 10197 1 401) */ static const unsigned char digestinfo_sm3_der[] = { - ASN1_SEQUENCE, 0x0f + SM3_DIGEST_LENGTH, + ASN1_SEQUENCE, 0x10 + SM3_DIGEST_LENGTH, ASN1_SEQUENCE, 0x0c, ASN1_OID, 0x08, 1 * 40 + 2, 0x81, 0x1c, 0xcf, 0x55, 1, 0x83, 0x78, ASN1_NULL, 0x00, diff --git a/crypto/openssl/crypto/threads_pthread.c b/crypto/openssl/crypto/threads_pthread.c index 44d6ebe09231..ace2dc499061 100644 --- a/crypto/openssl/crypto/threads_pthread.c +++ b/crypto/openssl/crypto/threads_pthread.c @@ -62,8 +62,10 @@ __tsan_mutex_post_lock((x), 0, 0) /* * The Non-Stop KLT thread model currently seems broken in its rwlock * implementation + * Likewise is there a problem with the glibc implementation on riscv. */ -# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) +# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) \ + && !defined(__riscv) # define USE_RWLOCK # endif @@ -279,7 +281,7 @@ static struct rcu_qp *get_hold_current_qp(struct rcu_lock_st *lock) /* if the idx hasn't changed, we're good, else try again */ if (qp_idx == ATOMIC_LOAD_N(uint32_t, &lock->reader_idx, - __ATOMIC_RELAXED)) + __ATOMIC_ACQUIRE)) break; ATOMIC_SUB_FETCH(&lock->qp_group[qp_idx].users, (uint64_t)1, @@ -403,8 +405,12 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id) *curr_id = lock->id_ctr; lock->id_ctr++; + /* + * make the current state of everything visible by this release + * when get_hold_current_qp acquires the next qp + */ ATOMIC_STORE_N(uint32_t, &lock->reader_idx, lock->current_alloc_idx, - __ATOMIC_RELAXED); + __ATOMIC_RELEASE); /* * this should make sure that the new value of reader_idx is visible in diff --git a/crypto/openssl/crypto/x509/t_x509.c b/crypto/openssl/crypto/x509/t_x509.c index 7d693669cd36..d849e642ce8b 100644 --- a/crypto/openssl/crypto/x509/t_x509.c +++ b/crypto/openssl/crypto/x509/t_x509.c @@ -219,7 +219,8 @@ int X509_ocspid_print(BIO *bp, X509 *x) goto err; if ((der = dertmp = OPENSSL_malloc(derlen)) == NULL) goto err; - i2d_X509_NAME(subj, &dertmp); + if (i2d_X509_NAME(subj, &dertmp) < 0) + goto err; md = EVP_MD_fetch(x->libctx, SN_sha1, x->propq); if (md == NULL) diff --git a/crypto/openssl/crypto/x509/x509_lu.c b/crypto/openssl/crypto/x509/x509_lu.c index 05ee7c8c6b51..eb2d47955b2e 100644 --- a/crypto/openssl/crypto/x509/x509_lu.c +++ b/crypto/openssl/crypto/x509/x509_lu.c @@ -408,7 +408,6 @@ static int x509_store_add(X509_STORE *store, void *x, int crl) } if (!X509_STORE_lock(store)) { - obj->type = X509_LU_NONE; X509_OBJECT_free(obj); return 0; } diff --git a/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod b/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod index ff2074820f68..eeb882f291e4 100644 --- a/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod +++ b/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod @@ -170,15 +170,14 @@ B_set>() sets element I of I to I replacing the current element. The new element value is returned or NULL if an error occurred: this will only happen if I is NULL or I is out of range. -B_find>() searches I for the element I. In the case -where no comparison function has been specified, the function performs -a linear search for a pointer equal to I. The index of the first -matching element is returned or B<-1> if there is no match. In the case -where a comparison function has been specified, I is sorted and -B_find>() returns the index of a matching element or B<-1> if there -is no match. Note that, in this case the comparison function will usually -compare the values pointed to rather than the pointers themselves and -the order of elements in I can change. +B_find>() searches I for the element I. In the +case where no comparison function has been specified, the function +performs a linear search for a pointer equal to I. In the case +where a comparison function has been specified, the function performs +a search for a element that the comparison function indicates is a +match. If the stack is sorted, a binary search is used, otherwise, a +linear search is used. B_find>() returns the index of a +matching element or B<-1> if there is no match. B_find_ex>() operates like B_find>() except when a comparison function has been specified and no matching element is found. @@ -301,7 +300,7 @@ was changed to return 0 in this condition as for other errors. =head1 COPYRIGHT -Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/OpenSSL_version.pod b/crypto/openssl/doc/man3/OpenSSL_version.pod index e5dff33dcdda..6b899cbe5438 100644 --- a/crypto/openssl/doc/man3/OpenSSL_version.pod +++ b/crypto/openssl/doc/man3/OpenSSL_version.pod @@ -256,9 +256,16 @@ L The macros and functions described here were added in OpenSSL 3.0, except for OPENSSL_VERSION_NUMBER and OpenSSL_version_num(). +=head1 BUGS + +There was a discrepancy between this manual and commentary + code +in F<< >>, where the latter suggested that the +four least significant bits of B could be +C<0x0f> in released OpenSSL versions. + =head1 COPYRIGHT -Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2018-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod b/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod index 09b7280bdd58..a10942433aa7 100644 --- a/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod +++ b/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod @@ -37,7 +37,7 @@ SSL_CIPHER_get_protocol_id int SSL_CIPHER_is_aead(const SSL_CIPHER *c); const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr); uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c); - uint32_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c); + uint16_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c); =head1 DESCRIPTION @@ -203,7 +203,7 @@ The OPENSSL_cipher_name() function was added in OpenSSL 1.1.1. =head1 COPYRIGHT -Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod b/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod index f7add16d7bdd..0140deee9a5e 100644 --- a/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod +++ b/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod @@ -23,9 +23,10 @@ SSL_SESSION_set1_alpn_selected =head1 DESCRIPTION -SSL_SESSION_get0_hostname() retrieves the SNI value that was sent by the -client when the session was created if it was accepted by the server. Otherwise -NULL is returned. +SSL_SESSION_get0_hostname() retrieves the Server Name Indication (SNI) value +that was sent by the client when the session was created if the server +acknowledged the client's SNI extension by including an empty SNI extension +in response. Otherwise NULL is returned. The value returned is a pointer to memory maintained within B and should not be free'd. @@ -44,8 +45,7 @@ B. =head1 RETURN VALUES -SSL_SESSION_get0_hostname() returns either a string or NULL based on if there -is the SNI value sent by client. +SSL_SESSION_get0_hostname() returns the SNI string if available, or NULL if not. SSL_SESSION_set1_hostname() returns 1 on success or 0 on error. diff --git a/crypto/openssl/include/crypto/rsa.h b/crypto/openssl/include/crypto/rsa.h index ffbc95a77888..55cc814ce913 100644 --- a/crypto/openssl/include/crypto/rsa.h +++ b/crypto/openssl/include/crypto/rsa.h @@ -124,10 +124,6 @@ ASN1_STRING *ossl_rsa_ctx_to_pss_string(EVP_PKEY_CTX *pkctx); int ossl_rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx, const X509_ALGOR *sigalg, EVP_PKEY *pkey); -# ifdef FIPS_MODULE -int ossl_rsa_key_pairwise_test(RSA *rsa); -# endif /* FIPS_MODULE */ - # if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS) int ossl_rsa_acvp_test_gen_params_new(OSSL_PARAM **dst, const OSSL_PARAM src[]); void ossl_rsa_acvp_test_gen_params_free(OSSL_PARAM *dst); diff --git a/crypto/openssl/include/openssl/opensslv.h.in b/crypto/openssl/include/openssl/opensslv.h.in index e547281ff527..69b9caacf4dc 100644 --- a/crypto/openssl/include/openssl/opensslv.h.in +++ b/crypto/openssl/include/openssl/opensslv.h.in @@ -89,12 +89,12 @@ extern "C" { # define OPENSSL_VERSION_TEXT "OpenSSL {- "$config{full_version} $config{release_date}" -}" -/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ +/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PP0L */ # define OPENSSL_VERSION_NUMBER \ ( (OPENSSL_VERSION_MAJOR<<28) \ |(OPENSSL_VERSION_MINOR<<20) \ |(OPENSSL_VERSION_PATCH<<4) \ - |{- @config{prerelease} ? "0x0L" : "0xfL" -} ) + |0x0L ) # ifdef __cplusplus } diff --git a/crypto/openssl/providers/fips-sources.checksums b/crypto/openssl/providers/fips-sources.checksums index d48a9c85f57b..334b4ad6b7f2 100644 --- a/crypto/openssl/providers/fips-sources.checksums +++ b/crypto/openssl/providers/fips-sources.checksums @@ -250,7 +250,7 @@ c685813be6ad35b0861ba888670ef54aa2b399d003472698e39426de6e52db59 crypto/initthr f866aafae928db1b439ac950dc90744a2397dfe222672fe68b3798396190c8b0 crypto/mem_clr.c 18127868d868ca5705444c24f7dc385391ba31154fc04ff54949739e8fa7fdfc crypto/ml_dsa/ml_dsa_encoders.c 825105b0a2c4844b2b4229001650ff7e61e1348e52f1072210f70b97cd4adb71 crypto/ml_dsa/ml_dsa_hash.h -c82201cf1a17ff2d4b169dcd4402d3d56f4685e460a1447e021db4abd67f7f0e crypto/ml_dsa/ml_dsa_key.c +c467f4400d399aad6b51746ef2575d1e04d260a1bf901b35ca55624fe62e650e crypto/ml_dsa/ml_dsa_key.c 579c1a12a5c5f014476a6bf695dc271f63074fb187e23ffc3f9ccb5b7ea044f1 crypto/ml_dsa/ml_dsa_key.h 3f98eb0467033d0a40867ef1c1036dcfea5d231eeac2321196f7d7c7243edace crypto/ml_dsa/ml_dsa_key_compress.c 983d164bfa3dbe8d85ad1fdc24d897e79d9246d96d9c1862855c6c538b387ad9 crypto/ml_dsa/ml_dsa_local.h @@ -263,7 +263,7 @@ ff65c82c56e341f47df03d0c74de7fb537de0e68a4fa23fa07a9fdb51c511f1c crypto/ml_dsa/ 1d7f57a41034988a4e7d4c9a998760d2ef802c5e90275d09a3ca31c5f3403d94 crypto/ml_dsa/ml_dsa_sign.c 5217ef237e21872205703b95577290c34898423466a465c7bd609b2eb4627964 crypto/ml_dsa/ml_dsa_sign.h abd934284bcd8061027a69f437fa4410c6b72cd950be1ebe048244d036371208 crypto/ml_dsa/ml_dsa_vector.h -defc2e4e81ff1b78056c795bc0565f4241a259c2957abe84a51bcbc1e4ace3f1 crypto/ml_kem/ml_kem.c +8c4f7238f68f959f2ad1e2529c567364c5a8818898355c82818521e03239ea76 crypto/ml_kem/ml_kem.c 36e24eae5d38cc9666ae40e4e8a2dc12328e1159fea68447cb19dab174d25adf crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl 33357356cd739d4ae89d52f0804b6900e4b94d8829323819c6f64c8908e978df crypto/modes/asm/aes-gcm-armv8_64.pl bcc09bdb474f045d04c983fa09c31a010c5a25513f53a5d3653ade91304f0f96 crypto/modes/asm/aes-gcm-avx512.pl @@ -306,7 +306,7 @@ f50450f7e5f6896fb8e3cde2fdc11cc543124c854ef9d88252a166606ca80081 crypto/params_ 467c416422ecf61e3b713c5eb259fdbcb4aa73ae8dee61804d0b85cfd3fff4f7 crypto/property/defn_cache.c 91c1f1f8eb5588ed9da17386c244ae68a6a81717b1c7ab6c9f1a6a57973a039f crypto/property/property.c 66da4f28d408133fb544b14aeb9ad4913e7c5c67e2826e53f0dc5bf4d8fada26 crypto/property/property_local.h -d32105cb087d708d0504a787f74bc163cc398c299faf2e98d6bb5ae02f5ce9b7 crypto/property/property_parse.c +1e99a3934812f99dad79cbfbb6727ad61b6093711c1a6c74d4b50f9318152611 crypto/property/property_parse.c a7cefda6a117550e2c76e0f307565ce1e11640b11ba10c80e469a837fd1212a3 crypto/property/property_query.c 20e69b9d594dfc443075eddbb0e6bcc0ed36ca51993cd50cc5a4f86eb31127f8 crypto/property/property_string.c 10644e9d20214660706de58d34edf635c110d4e4f2628cd5284a08c60ed9aff8 crypto/provider_core.c @@ -322,7 +322,7 @@ f0c8792a99132e0b9c027cfa7370f45594a115934cdc9e8f23bdd64abecaf7fd crypto/rsa/rsa 1b828f428f0e78b591378f7b780164c4574620c68f9097de041cbd576f811bf6 crypto/rsa/rsa_backend.c 38a102cd1da1f6ca5a46e6a22f018237964336274385f5c70cbedcaa6997647e crypto/rsa/rsa_chk.c e762c599b17d5c89f4b1c9eb7d0ca1f04a95d815c86a3e72c30b231ce57fb199 crypto/rsa/rsa_crpt.c -0fa3e4687510e2d91c8f4b1c460b1d51375d9855ed825b3d6697620b146b52d1 crypto/rsa/rsa_gen.c +a3d20f27ae3cb41af5b62febd0bb19025e59d401b136306d570cdba103b15542 crypto/rsa/rsa_gen.c f22bc4e2c3acab83e67820c906c1caf048ec1f0d4fcb7472c1bec753c75f8e93 crypto/rsa/rsa_lib.c 5ae8edaf654645996385fbd420ef73030762fc146bf41deb5294d6d83e257a16 crypto/rsa/rsa_local.h cf0b75cd54b61b9b9a290ef18d0ddce9fb26a029a54eb3f720d9b25188440f00 crypto/rsa/rsa_mp_names.c @@ -416,7 +416,7 @@ a00e16963e1e2a0126c6a8e62da8a14f98de9736027654c925925dadd0ca3cc1 crypto/thread/ 27ec0090f4243c96e4fbe1babfd4320c2a16615ffa368275433217d50a1ef76c crypto/thread/internal.c 67ba8d87fbbb7c9a9e438018e7ecfd1cedd4d00224be05755580d044f5f1317a crypto/threads_lib.c b1a828491d9ce305802662561788facac92dff70cca9ead807f3e28741ff21e0 crypto/threads_none.c -c659f7ce5c4b59d2a1cff78485fa8e89c8d20d5798df4afc1b94ff635ffc0262 crypto/threads_pthread.c +491e9c29d4a7b4dd627ea25c20ce4a33103565b3108b618c41c6816dfc675569 crypto/threads_pthread.c 9c3bf7b4baa302a4017150fbcaa114ee9df935b18d5a3a8c8015003780d4e7de crypto/threads_win.c 7edd638df588b14711a50c98d458c4fc83f223ed03bc6c39c7c8edf7915b7cfa crypto/time.c 88c5f9f4d2611223d283ebd2ae10ae5ecbb9972d00f747d93fcb74b62641e3f9 crypto/x86_64cpuid.pl @@ -445,7 +445,7 @@ bbe5e52d84e65449a13e42cd2d6adce59b8ed6e73d6950917aa77dc1f3f5dff6 include/crypto 6e7762e7fb63f56d25b24f70209f4dc834c59a87f74467531ec81646f565dbe3 include/crypto/modes.h 920bc48a4dad3712bdcef188c0ce8e8a8304e0ce332b54843bab366fc5eab472 include/crypto/rand.h 71f23915ea74e93971fb0205901031be3abea7ffef2c52e4cc4848515079f68d include/crypto/rand_pool.h -b1df067691f9741ef9c42b2e5f12461bcd87b745514fc5701b9c9402fb10b224 include/crypto/rsa.h +6f16685ffbc97dc2ac1240bfddf4bbac2dd1ad83fff6da91aee6f3f64c6ee8ff include/crypto/rsa.h 32f0149ab1d82fddbdfbbc44e3078b4a4cc6936d35187e0f8d02cc0bc19f2401 include/crypto/security_bits.h 80338f3865b7c74aab343879432a6399507b834e2f55dd0e9ee7a5eeba11242a include/crypto/sha.h dc7808729c3231a08bbe470b3e1b562420030f59f7bc05b14d7b516fa77b4f3a include/crypto/slh_dsa.h @@ -546,7 +546,7 @@ a8a45996fd21411cb7ed610bc202dbd06570cdfa0a2d14f7dfc8bfadc820e636 include/openss cb6bca3913c60a57bac39583eee0f789d49c3d29be3ecde9aecc7f3287117aa5 include/openssl/objects.h d25537af264684dff033dd8ae62b0348f868fcfec4aa51fa8f07bcfa4bd807ad include/openssl/objectserr.h fe6acd42c3e90db31aaafc2236a7d30ebfa53c4c07ea4d8265064c7fcb951970 include/openssl/opensslconf.h -fc914a750d798ac9fc9287e6359cfa1da214b91651deaaaa7e1a46b595cd0425 include/openssl/opensslv.h.in +6c1a8837bbba633db2a8951ff29ccfe09e7d2a24a37ee2af90f2d897c190da9a include/openssl/opensslv.h.in 767d9d7d5051c937a3ce8a268c702902fda93eeaa210a94dfde1f45c23277d20 include/openssl/param_build.h 1c442aaaa4dda7fbf727a451bc676fb4d855ef617c14dc77ff2a5e958ae33c3e include/openssl/params.h 44f178176293c6ce8142890ff9dc2d466364c734e4e811f56bd62010c5403183 include/openssl/pkcs7.h.in @@ -618,8 +618,8 @@ f2581d7b4e105f2bb6d30908f3c2d9959313be08cec6dbeb49030c125a7676d3 providers/fips 669f76f742bcaaf28846b057bfab97da7c162d69da244de71b7c743bf16e430f providers/fips/include/fipscommon.h f111fd7e016af8cc6f96cd8059c28227b328dd466ed137ae0c0bc0c3c3eec3ba providers/fips/self_test.c 5c2c6c2f69e2eb01b88fa35630f27948e00dd2c2fd351735c74f34ccb2005cbe providers/fips/self_test.h -663441de9aba1d1b81ce02b3acded520b88cc460330d4d98adb7450d9664c474 providers/fips/self_test_data.inc -2e568e2b161131240e97bd77a730c2299f961c2f1409ea8466422fc07f9be23f providers/fips/self_test_kats.c +df83c901ad13675fbbb4708b6087feba6099870ad3dd0e8d09cfdb6798419770 providers/fips/self_test_data.inc +6779d5afb3f48d82868b247ffb0a6a572f6e3964738296ad47e7ccafdb263c88 providers/fips/self_test_kats.c dde79dfdedfe0e73006a0cf912fdde1ff109dfbc5ba6ecab319c938bc4275950 providers/implementations/asymciphers/rsa_enc.c c2f1b12c64fc369dfc3b9bc9e76a76de7280e6429adaee55d332eb1971ad1879 providers/implementations/ciphers/cipher_aes.c 6ba7d817081cf0d87ba7bfb38cd9d70e41505480bb8bc796ef896f68d4514ea6 providers/implementations/ciphers/cipher_aes.h @@ -699,7 +699,7 @@ c764555b9dc9b273c280514a5d2d44156f82f3e99155a77c627f2c773209bcd7 providers/impl 24cc3cc8e8681c77b7f96c83293bd66045fd8ad69f756e673ca7f8ca9e82b0af providers/implementations/keymgmt/dsa_kmgmt.c 36a9c1c8658ce7918453827cb58ed52787e590e3f148c5510deeb2c16c25a29d providers/implementations/keymgmt/ec_kmgmt.c 258ae17bb2dd87ed1511a8eb3fe99eed9b77f5c2f757215ff6b3d0e8791fc251 providers/implementations/keymgmt/ec_kmgmt_imexport.inc -9728d696d249b2d224724c9872138a60e1998e5cfa5c49f3f48ad0666f7eed34 providers/implementations/keymgmt/ecx_kmgmt.c +11c27cc3c9f38885c484f25d11987e93f197aa90bef2fc1d6e8f508c2d014d4d providers/implementations/keymgmt/ecx_kmgmt.c daf35a7ab961ef70aefca981d80407935904c5da39dca6692432d6e6bc98759d providers/implementations/keymgmt/kdf_legacy_kmgmt.c d97d7c8d3410b3e560ef2becaea2a47948e22205be5162f964c5e51a7eef08cb providers/implementations/keymgmt/mac_legacy_kmgmt.c a428de71082fd01e5dcfa030a6fc34f6700b86d037b4e22f015c917862a158ce providers/implementations/keymgmt/ml_dsa_kmgmt.c diff --git a/crypto/openssl/providers/fips.checksum b/crypto/openssl/providers/fips.checksum index 7fa4ea19bba3..5d1117361d27 100644 --- a/crypto/openssl/providers/fips.checksum +++ b/crypto/openssl/providers/fips.checksum @@ -1 +1 @@ -8d0c2c2b986f4c98f511c9aa020e98aa984dce5976d8e1966a7721f8b559cda8 providers/fips-sources.checksums +c342f9dc7075a6ecd0e4b3c9db06e180765278a7bbae233ec1a65095a0e524ec providers/fips-sources.checksums diff --git a/crypto/openssl/providers/fips/self_test_data.inc b/crypto/openssl/providers/fips/self_test_data.inc index b6aa433ca93c..6abab0a7a173 100644 --- a/crypto/openssl/providers/fips/self_test_data.inc +++ b/crypto/openssl/providers/fips/self_test_data.inc @@ -1308,6 +1308,18 @@ static const ST_KAT_PARAM rsa_priv_key[] = { ST_KAT_PARAM_END() }; +/*- + * Using OSSL_PKEY_RSA_PAD_MODE_NONE directly in the expansion of the + * ST_KAT_PARAM_UTF8STRING macro below causes a failure on ancient + * HP/UX PA-RISC compilers. + */ +static const char pad_mode_none[] = OSSL_PKEY_RSA_PAD_MODE_NONE; + +static const ST_KAT_PARAM rsa_enc_params[] = { + ST_KAT_PARAM_UTF8STRING(OSSL_ASYM_CIPHER_PARAM_PAD_MODE, pad_mode_none), + ST_KAT_PARAM_END() +}; + static const unsigned char rsa_sig_msg[] = "Hello World!"; static const unsigned char rsa_expected_sig[256] = { @@ -3497,3 +3509,33 @@ static const ST_KAT_ASYM_KEYGEN st_kat_asym_keygen_tests[] = { # endif }; #endif /* !OPENSSL_NO_ML_DSA || !OPENSSL_NO_SLH_DSA */ + +static const ST_KAT_ASYM_CIPHER st_kat_asym_cipher_tests[] = { + { + OSSL_SELF_TEST_DESC_ASYM_RSA_ENC, + "RSA", + 1, + rsa_pub_key, + rsa_enc_params, + ITM(rsa_asym_plaintext_encrypt), + ITM(rsa_asym_expected_encrypt), + }, + { + OSSL_SELF_TEST_DESC_ASYM_RSA_DEC, + "RSA", + 0, + rsa_priv_key, + rsa_enc_params, + ITM(rsa_asym_expected_encrypt), + ITM(rsa_asym_plaintext_encrypt), + }, + { + OSSL_SELF_TEST_DESC_ASYM_RSA_DEC, + "RSA", + 0, + rsa_crt_key, + rsa_enc_params, + ITM(rsa_asym_expected_encrypt), + ITM(rsa_asym_plaintext_encrypt), + }, +}; diff --git a/crypto/openssl/providers/fips/self_test_kats.c b/crypto/openssl/providers/fips/self_test_kats.c index 35ecb43598ee..acb0b85f7343 100644 --- a/crypto/openssl/providers/fips/self_test_kats.c +++ b/crypto/openssl/providers/fips/self_test_kats.c @@ -812,6 +812,93 @@ err: } #endif +/* + * Test an encrypt or decrypt KAT.. + * + * FIPS 140-2 IG D.9 states that separate KAT tests are needed for encrypt + * and decrypt.. + */ +static int self_test_asym_cipher(const ST_KAT_ASYM_CIPHER *t, OSSL_SELF_TEST *st, + OSSL_LIB_CTX *libctx) +{ + int ret = 0; + OSSL_PARAM *keyparams = NULL, *initparams = NULL; + OSSL_PARAM_BLD *keybld = NULL, *initbld = NULL; + EVP_PKEY_CTX *encctx = NULL, *keyctx = NULL; + EVP_PKEY *key = NULL; + BN_CTX *bnctx = NULL; + unsigned char out[256]; + size_t outlen = sizeof(out); + + OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_KAT_ASYM_CIPHER, t->desc); + + bnctx = BN_CTX_new_ex(libctx); + if (bnctx == NULL) + goto err; + + /* Load a public or private key from data */ + keybld = OSSL_PARAM_BLD_new(); + if (keybld == NULL + || !add_params(keybld, t->key, bnctx)) + goto err; + keyparams = OSSL_PARAM_BLD_to_param(keybld); + keyctx = EVP_PKEY_CTX_new_from_name(libctx, t->algorithm, NULL); + if (keyctx == NULL || keyparams == NULL) + goto err; + if (EVP_PKEY_fromdata_init(keyctx) <= 0 + || EVP_PKEY_fromdata(keyctx, &key, EVP_PKEY_KEYPAIR, keyparams) <= 0) + goto err; + + /* Create a EVP_PKEY_CTX to use for the encrypt or decrypt operation */ + encctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL); + if (encctx == NULL + || (t->encrypt && EVP_PKEY_encrypt_init(encctx) <= 0) + || (!t->encrypt && EVP_PKEY_decrypt_init(encctx) <= 0)) + goto err; + + /* Add any additional parameters such as padding */ + if (t->postinit != NULL) { + initbld = OSSL_PARAM_BLD_new(); + if (initbld == NULL) + goto err; + if (!add_params(initbld, t->postinit, bnctx)) + goto err; + initparams = OSSL_PARAM_BLD_to_param(initbld); + if (initparams == NULL) + goto err; + if (EVP_PKEY_CTX_set_params(encctx, initparams) <= 0) + goto err; + } + + if (t->encrypt) { + if (EVP_PKEY_encrypt(encctx, out, &outlen, + t->in, t->in_len) <= 0) + goto err; + } else { + if (EVP_PKEY_decrypt(encctx, out, &outlen, + t->in, t->in_len) <= 0) + goto err; + } *** 1476 LINES SKIPPED *** From nobody Tue Nov 4 16:05:43 2025 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 4d1Cwm1M50z6GJXT; Tue, 04 Nov 2025 16:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Cwl6B3Tz3XBc; Tue, 04 Nov 2025 16:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XiTLRieR8l4SzbHjUK/ofCs53SS4f97L3ylUWfWuT2I=; b=KhFQ1qWUIAg03zNXD8uxFLMgtK3vW09fnei4G4kYEvdQdPjtlisT7YaGgbXF145iXF3+ep H85xEIT2E7SRNOF9uC+aQmqskcpe30llGIe2b+vpPLRPj56iirWueDR6XcpBDYM8hZeCRp OrZd6Op4A8wtqMaaCM4mafLnt9OMjthflwgyA+AsJpDjggLUc1UdO8SWJrOj4OAg8DamZE vDVCCupFTZ6eMaMQ0sH7VeNeZ8Ouzd+eSJuZ80X3gnhcRh0/cjAm04nRDbcL7fiYiAHmwo 1m61axzVmZivnOozq6SAycTajidBG79kbM07wXCGqvmB5f9RQ15DV40yLjYuQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XiTLRieR8l4SzbHjUK/ofCs53SS4f97L3ylUWfWuT2I=; b=uYcDat+DcA9oNtfPpZvGNXmrRedzAvS7A2Mku0mlhYzU0fK4TLiWmnCviyaoIpzi8dDDwT /GxCDx99trdyh3mDkceZBBERXmb7Ibxf4igrygyInuPI1LMldAnvNr/V8l5tQm9vrzrS8w GIvIKszZSo2C9aXP+ml9OhsaXy7fxSbEqSE7Nzjm6B8flxFlmjdOryAEKRTx6suJJRbspM avk4Ney33VFsjpZd5Lca8F2LvMx0CqqKr5ysIy2Um/xQltXudAADPxUi+tbxyX2wVfhEqq 0lvjyf2Ruk53+ubj2ULgXRthFq0phXAgsNDAHxtTV2CG3Zu/C+44vBSLcGr8DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762272343; a=rsa-sha256; cv=none; b=yM802E2dN2fZiG8tN+BHrNxsGnxw77XMG+jDrGneTKFsGJaZuyh/ZvyUFZH45AaQqh/5Ts I/aTTBLW6ZEDvgd1KiZkOmSJCYdRqEs+Wd3eoY5/eO77fCftdcQVoVX8gDxlrWUQTG909M S+UbdwEbrzeF9hVvtpPcf7RGyasT6zmv/i6oJrsJmrX4NMwXca4Qz0cHv+Bey8Ys7vNfpm R3SyZhTSVbb93fg5Kc7hvUicUsY69w8QFDgoiOxCfipUB7IEcC9ziLjTne/H5C1zxOkZ6s xOJM/R715KUx+YkdiW/hD67DIid+MN/SCK7nen6mfcUZ5slvkmzI5py347q2lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Cwl5K9lz13bG; Tue, 04 Nov 2025 16:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4G5hR3075630; Tue, 4 Nov 2025 16:05:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4G5hcp075626; Tue, 4 Nov 2025 16:05:43 GMT (envelope-from git) Date: Tue, 4 Nov 2025 16:05:43 GMT Message-Id: <202511041605.5A4G5hcp075626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 505aec2bf3b1 - stable/15 - crypto/openssl: update generated files to match 3.5.4 artifacts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 505aec2bf3b1576fd9b6dad5d6c9a6522e20ad92 Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=505aec2bf3b1576fd9b6dad5d6c9a6522e20ad92 commit 505aec2bf3b1576fd9b6dad5d6c9a6522e20ad92 Author: Enji Cooper AuthorDate: 2025-10-07 23:14:13 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:05:13 +0000 crypto/openssl: update generated files to match 3.5.4 artifacts MFC with: 046c625e9382 Fixes: 046c625e9382 ("crypto/openssl: update to 3.5.4") Reported by: Herbert J. Skuhra (cherry picked from commit d4033e6d37747f5213bb245c8e605406703a8766) --- crypto/openssl/configdata.pm | 569 ++++++++++++++++++++- crypto/openssl/exporters/libcrypto.pc | 2 +- crypto/openssl/exporters/libssl.pc | 2 +- crypto/openssl/exporters/openssl.pc | 2 +- crypto/openssl/include/openssl/opensslv.h | 14 +- crypto/openssl/libcrypto.pc | 2 +- crypto/openssl/libssl.pc | 2 +- crypto/openssl/openssl.pc | 2 +- crypto/openssl/util/wrap.pl | 6 +- secure/lib/libcrypto/Makefile.version | 4 +- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 | 2 +- .../libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_sign.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- .../lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- .../libcrypto/man/man3/BIO_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_core.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_datagram.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_dgram_pair.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_sendmmsg.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_socket_wait.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMAC_CTX.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_decrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_encrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EnvelopedData_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- .../libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_data_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_digest_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- .../libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- .../lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- .../libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- .../lib/libcrypto/man/man3/CMS_signed_get_attr.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/COMP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- .../libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- .../libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- .../libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- .../man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- .../libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 21 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- .../libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- .../libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_get_timeout.3 | 2 +- .../lib/libcrypto/man/man3/DTLSv1_handle_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_sign.3 | 2 +- .../lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- .../lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- .../lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- .../libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_new.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- .../lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_original_iv.3 | 2 +- .../lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- .../lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KDF.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEM_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MAC.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get_algor.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_copy_parameters.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- .../man/man3/EVP_PKEY_digestsign_supports_digest.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_attr.3 | 2 +- .../man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_field_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_gettable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- .../man/man3/EVP_PKEY_set1_encoded_public_key.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_settable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_RAND.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEY.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- .../lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_des_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- .../lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- .../man/man3/EVP_set_default_properties.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/GENERAL_NAME.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/NCONF_new_ex.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- .../libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- .../libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- .../man/man3/OPENSSL_load_builtin_modules.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_load_u16_le.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_riscvcap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ATAV_set0.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 | 2 +- .../man/man3/OSSL_CMP_HDR_get0_transactionID.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_ITAV_new_caCerts.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 | 2 +- .../libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set0_validity.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 | 2 +- .../man/man3/OSSL_DECODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 | 2 +- .../man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ERR_STATE_save.3 | 2 +- .../man/man3/OSSL_ESS_check_signing_certs.3 | 2 +- .../libcrypto/man/man3/OSSL_GENERAL_NAMES_print.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HPKE_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_IETF_ATTR_SYNTAX.3 | 2 +- .../man/man3/OSSL_IETF_ATTR_SYNTAX_print.3 | 2 +- .../man/man3/OSSL_INDICATOR_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ITEM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 | 2 +- .../man/man3/OSSL_LIB_CTX_set_conf_diagnostics.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 | 2 +- .../man/man3/OSSL_PARAM_allocate_from_text.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 | 2 +- .../libcrypto/man/man3/OSSL_PARAM_print_to_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 | 2 +- .../libcrypto/man/man3/OSSL_QUIC_client_method.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 | 2 +- .../man/man3/OSSL_SELF_TEST_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_sleep.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 | 2 +- .../man/man3/OSSL_trace_get_category_num.3 | 2 +- .../libcrypto/man/man3/OSSL_trace_set_channel.3 | 2 +- .../man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_version.3 | 10 +- .../libcrypto/man/man3/PBMAC1_get1_pbkdf2_param.3 | 2 +- .../libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 +- .../libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- .../libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- .../man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 | 2 +- .../man/man3/PKCS12_SAFEBAG_create_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_set0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 | 2 +- .../libcrypto/man/man3/PKCS12_add_CSPName_asc.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 | 2 +- .../man/man3/PKCS12_add_friendlyname_asc.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 | 2 +- .../libcrypto/man/man3/PKCS12_get_friendlyname.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_init.3 | 2 +- .../libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 | 2 +- .../libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- .../libcrypto/man/man3/PKCS7_get_octet_string.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_type_is_other.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 | 2 +- .../lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_get0_primary.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 | 2 +- .../lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- .../man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- .../lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- .../man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_Calc_B.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 | 2 +- .../lib/libcrypto/man/man3/SRP_create_verifier.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 6 +- .../man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- .../man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- .../man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- .../man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- .../man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- .../man/man3/SSL_CTX_set1_cert_comp_preference.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- .../man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- .../man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- .../man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- .../man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- .../man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- .../man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_domain_flags.3 | 2 +- .../man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- .../man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- .../man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- .../man/man3/SSL_CTX_set_new_pending_conn_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- .../man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- .../man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- .../man/man3/SSL_CTX_set_security_level.3 | 2 +- .../man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- .../man/man3/SSL_CTX_set_session_id_context.3 | 2 +- .../man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- .../man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_srp_password.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- .../man/man3/SSL_CTX_set_tmp_dh_callback.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- .../man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 12 +- .../man/man3/SSL_SESSION_get0_id_context.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- .../man/man3/SSL_SESSION_get_compress_id.3 | 2 +- .../man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept_stream.3 | 2 +- .../lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- .../man/man3/SSL_export_keying_material.3 | 2 +- .../libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_connection.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_rpk.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- .../libcrypto/man/man3/SSL_get1_builtin_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- .../libcrypto/man/man3/SSL_get_conn_close_info.3 | 2 +- .../libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_event_timeout.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_handshake_rtt.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- .../man/man3/SSL_get_peer_signature_nid.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- .../libcrypto/man/man3/SSL_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- .../libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_stream_id.3 | 2 +- .../libcrypto/man/man3/SSL_get_stream_read_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_value_uint.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_group_to_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_handle_events.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- .../lib/libcrypto/man/man3/SSL_inject_net_dgram.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- .../libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_domain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_listener.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_stream.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_poll.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- .../lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- .../man/man3/SSL_set1_initial_peer_addr.3 | 2 +- .../libcrypto/man/man3/SSL_set1_server_cert_type.3 | 2 +- .../libcrypto/man/man3/SSL_set_async_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_blocking_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- .../man/man3/SSL_set_default_stream_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- .../man/man3/SSL_set_incoming_stream_policy.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_quic_tls_cbs.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_retry_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- .../libcrypto/man/man3/SSL_set_session_secret_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- .../lib/libcrypto/man/man3/SSL_stream_conclude.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_stream_reset.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/TS_VERIFY_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_add1_attr.3 | 2 +- .../libcrypto/man/man3/X509_ACERT_add_attr_nconf.3 | 2 +- .../man/man3/X509_ACERT_get0_holder_baseCertId.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_get_attr.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ATTRIBUTE.3 | 2 +- .../libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- .../libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- .../man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- .../man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- .../man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_REQ_get_attr.3 | 2 +- .../libcrypto/man/man3/X509_REQ_get_extensions.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- .../man/man3/X509_STORE_CTX_get_by_subject.3 | 2 +- .../libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- .../man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- .../man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- .../man/man3/X509_VERIFY_PARAM_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- .../libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- .../man/man3/X509_get0_distinguishing_id.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- .../man/man3/X509_get_default_cert_file.3 | 2 +- .../libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_load_http.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 | 2 +- .../libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- .../lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 | 2 +- secure/lib/libcrypto/man/man5/config.5 | 2 +- secure/lib/libcrypto/man/man5/fips_config.5 | 2 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-ARGON2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PVKKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 | 2 +- .../lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-KECCAK.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-common.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SLH-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CRNG-TEST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-JITTER.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ML-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-SLH-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_STORE-winstore.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/fips_module.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-digest.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-mac.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-pkey.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-rand.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-core.h.7 | 2 +- .../libcrypto/man/man7/openssl-core_dispatch.h.7 | 2 +- .../lib/libcrypto/man/man7/openssl-core_names.h.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-env.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-glossary.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-qlog.7 | 2 +- .../libcrypto/man/man7/openssl-quic-concurrency.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-quic.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-threads.7 | 2 +- .../lib/libcrypto/man/man7/openssl_user_macros.7 | 2 +- .../libcrypto/man/man7/ossl-guide-introduction.7 | 2 +- .../man/man7/ossl-guide-libcrypto-introduction.7 | 2 +- .../man/man7/ossl-guide-libraries-introduction.7 | 2 +- .../man/man7/ossl-guide-libssl-introduction.7 | 2 +- .../lib/libcrypto/man/man7/ossl-guide-migration.7 | 2 +- .../man/man7/ossl-guide-quic-client-block.7 | 2 +- .../man/man7/ossl-guide-quic-client-non-block.7 | 2 +- .../man/man7/ossl-guide-quic-introduction.7 | 2 +- .../man/man7/ossl-guide-quic-multi-stream.7 | 2 +- .../man/man7/ossl-guide-quic-server-block.7 | 2 +- .../man/man7/ossl-guide-quic-server-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-introduction.7 | 2 +- .../man/man7/ossl-guide-tls-server-block.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- .../lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/property.7 | 2 +- .../lib/libcrypto/man/man7/provider-asym_cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-base.7 | 2 +- secure/lib/libcrypto/man/man7/provider-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-decoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-digest.7 | 2 +- secure/lib/libcrypto/man/man7/provider-encoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kem.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keyexch.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-mac.7 | 2 +- secure/lib/libcrypto/man/man7/provider-object.7 | 2 +- secure/lib/libcrypto/man/man7/provider-rand.7 | 2 +- secure/lib/libcrypto/man/man7/provider-signature.7 | 2 +- secure/lib/libcrypto/man/man7/provider-skeymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-storemgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/openssl-asn1parse.1 | 2 +- secure/usr.bin/openssl/man/openssl-ca.1 | 2 +- secure/usr.bin/openssl/man/openssl-ciphers.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmds.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmp.1 | 2 +- secure/usr.bin/openssl/man/openssl-cms.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-dgst.1 | 2 +- secure/usr.bin/openssl/man/openssl-dhparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsaparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-ec.1 | 2 +- secure/usr.bin/openssl/man/openssl-ecparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-enc.1 | 2 +- secure/usr.bin/openssl/man/openssl-engine.1 | 2 +- secure/usr.bin/openssl/man/openssl-errstr.1 | 2 +- secure/usr.bin/openssl/man/openssl-fipsinstall.1 | 2 +- .../usr.bin/openssl/man/openssl-format-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-gendsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-genpkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-genrsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-info.1 | 2 +- secure/usr.bin/openssl/man/openssl-kdf.1 | 2 +- secure/usr.bin/openssl/man/openssl-list.1 | 2 +- secure/usr.bin/openssl/man/openssl-mac.1 | 2 +- .../openssl/man/openssl-namedisplay-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-nseq.1 | 2 +- secure/usr.bin/openssl/man/openssl-ocsp.1 | 2 +- .../openssl/man/openssl-passphrase-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-passwd.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs12.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs8.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-prime.1 | 2 +- secure/usr.bin/openssl/man/openssl-rand.1 | 2 +- secure/usr.bin/openssl/man/openssl-rehash.1 | 2 +- secure/usr.bin/openssl/man/openssl-req.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsautl.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_client.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_server.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_time.1 | 2 +- secure/usr.bin/openssl/man/openssl-sess_id.1 | 2 +- secure/usr.bin/openssl/man/openssl-skeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-smime.1 | 2 +- secure/usr.bin/openssl/man/openssl-speed.1 | 2 +- secure/usr.bin/openssl/man/openssl-spkac.1 | 2 +- secure/usr.bin/openssl/man/openssl-srp.1 | 2 +- secure/usr.bin/openssl/man/openssl-storeutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-ts.1 | 2 +- .../openssl/man/openssl-verification-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-verify.1 | 2 +- secure/usr.bin/openssl/man/openssl-version.1 | 2 +- secure/usr.bin/openssl/man/openssl-x509.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- 903 files changed, 1494 insertions(+), 938 deletions(-) diff --git a/crypto/openssl/configdata.pm b/crypto/openssl/configdata.pm index 8ea23bf8a681..4a2c9307aa86 100755 --- a/crypto/openssl/configdata.pm +++ b/crypto/openssl/configdata.pm @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "1", "ex_libs" => [], - "full_version" => "3.5.3", + "full_version" => "3.5.4", "includes" => [], "ktls" => "", "lflags" => [], @@ -232,7 +232,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "etc", "options" => "enable-ec_nistp_64_gcc_128 enable-ktls enable-sctp --openssldir=etc --prefix=/usr no-acvp-tests no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips no-fips-jitter no-fips-post no-fips-securitychecks no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", - "patch" => "3", + "patch" => "4", "perl_archname" => "amd64-freebsd-thread-multi", "perl_cmd" => "/usr/local/bin/perl", "perl_version" => "5.40.3", @@ -291,11 +291,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "16 Sep 2025", + "release_date" => "30 Sep 2025", "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.5.3" + "version" => "3.5.4" ); our %target = ( "AR" => "ar", @@ -1097,9 +1097,18 @@ our %unified_info = ( "test/buildtest_c_aes" => { "noinst" => "1" }, + "test/buildtest_c_asn1" => { + "noinst" => "1" + }, + "test/buildtest_c_asn1t" => { + "noinst" => "1" + }, "test/buildtest_c_async" => { "noinst" => "1" }, + "test/buildtest_c_bio" => { + "noinst" => "1" + }, "test/buildtest_c_blowfish" => { "noinst" => "1" }, @@ -1121,9 +1130,21 @@ our %unified_info = ( "test/buildtest_c_cmac" => { "noinst" => "1" }, + "test/buildtest_c_cmp" => { + "noinst" => "1" + }, "test/buildtest_c_cmp_util" => { *** 13009 LINES SKIPPED *** From nobody Tue Nov 4 16:05:44 2025 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 4d1Cwn0gGgz6GJZP; Tue, 04 Nov 2025 16:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Cwm6hxlz3X6X; Tue, 04 Nov 2025 16:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GzJKxCvnervEXrCkL9RxAL3mAXHhA4AtI7lr7cpSqDQ=; b=BtyI+qpRZGEIFX5qzXH9NyLKmhRaHZTFZXNTjCCuVMuK8B+ocYIlliinhpBqBi0zWjKFQE YFBNsZKZgbtpDt2imbEFErqy+6hpOuRl6YctMfSE0dNPKVLMXbn3pFHxtCujeXtQymFcUx kHyXykHARQ5eHYbpJEpZufETmuOpC3PbO+7SElaCW1N/pMzBU27zJ7zlkUU7y+2vh0DOyV Yx22tzvhCl9TcYAXXl7ExkGDOHI09iSlKrq9vHqDVeRulJTFRff8zXMO3PDvurbYosCv8g DLeSCh4bWN2lbZ4HnYD5OqRdnLp9wSQYKYW8VkJo1qUfkaMKj3ykHo5ikiZvbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GzJKxCvnervEXrCkL9RxAL3mAXHhA4AtI7lr7cpSqDQ=; b=rOd8l3b/Ghx+jRdO8qH8AAjVsSsMcHcN8N2/AtMEuQ1NdXnqRhcD1INQlXiqIUrCUSYF2T 0kuYeUrDkQqcfbDcY53d1ktpsxsFveuydrCa81VKkTGniyGkrvJ8Fy+73xpPha4SGN76GE TGLvbL31+13Qt0nXribsRWUrKBiWtob6/DgL4diCqvj/pS6Mg8wIZZ+WmBHLwEWzZmRZ/k MnlQpL0iw5PLdxcqyeC0n/6DQx8GyI+iU68GR55caKw/4HFqATHUVtVS4ype+79FB3fjCS lukig/yBF05nlPLgsWiXmR8+kQmD4T+8t3nLSZBiuMIsL6exo7C50YZ7fY38vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762272344; a=rsa-sha256; cv=none; b=r9jswYpNocu4Nqgsh7c2FVSAdpZ248DSXBWzZzN6UXV6Azw1iA0OkCdr3PT3Ytn/BG1AYw qaIOGeU0VbAGW268mg+XwuXLlJpx6Umq+cc7p7/gvrKrmamYM6c+boIynQauyHfzkFL/5w mqNMl64loFj/eg8vmtWS+wmAO30wiMtg9o+0R087+1R3xOtBqZM/0hlpFpIXOi/GzaN2gM 1keIfHje4VP4ocwee60iEk1o7ShfHGYwQzyiLlYbAJCQY5Yeflr9oPjhZXfCewln7JRhjZ eIpFUaaGuy+sD0D6J3k8GJqfeDGk0vMQEsUzKzEUh3GlvOt3yDZI2atbcUWLnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Cwm6F3rz13nJ; Tue, 04 Nov 2025 16:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4G5i6m075663; Tue, 4 Nov 2025 16:05:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4G5iw9075660; Tue, 4 Nov 2025 16:05:44 GMT (envelope-from git) Date: Tue, 4 Nov 2025 16:05:44 GMT Message-Id: <202511041605.5A4G5iw9075660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 9b3c89ce8b2b - stable/15 - openssl: add a simple smoke test for the legacy provider List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9b3c89ce8b2b6455d50e364708988c832672a042 Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=9b3c89ce8b2b6455d50e364708988c832672a042 commit 9b3c89ce8b2b6455d50e364708988c832672a042 Author: Enji Cooper AuthorDate: 2025-10-11 20:45:20 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:05:13 +0000 openssl: add a simple smoke test for the legacy provider This change adds a simple smoke test for the legacy provider to ensure that the provider doesn't break in the future when performing updates. This is not a functional or system test; the OpenSSL test suite does a much better job at doing this than we can. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53045 (cherry picked from commit 3b6442370a17c57c4c290b9a8e1e8328da820705) --- etc/mtree/BSD.tests.dist | 2 ++ secure/lib/libcrypto/Makefile | 3 +++ secure/lib/libcrypto/tests/Makefile | 5 ++++ secure/lib/libcrypto/tests/libcrypto_test.sh | 40 ++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 9ab2f3e972d6..520b41c8b88f 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -520,6 +520,8 @@ .. secure lib + libcrypto + .. .. libexec .. diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 75ebb6e65327..6f9dd62d8610 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -673,6 +673,9 @@ buildasm cleanasm: ${.TARGET:S/build/all/:S/asm$//} .endfor +HAS_TESTS= yes +SUBDIR.${MK_TESTS}= tests + .include .if ${MACHINE} == "powerpc" diff --git a/secure/lib/libcrypto/tests/Makefile b/secure/lib/libcrypto/tests/Makefile new file mode 100644 index 000000000000..d309a1b1100c --- /dev/null +++ b/secure/lib/libcrypto/tests/Makefile @@ -0,0 +1,5 @@ +PACKAGE= tests + +ATF_TESTS_SH+= libcrypto_test + +.include diff --git a/secure/lib/libcrypto/tests/libcrypto_test.sh b/secure/lib/libcrypto/tests/libcrypto_test.sh new file mode 100755 index 000000000000..83ef1686089d --- /dev/null +++ b/secure/lib/libcrypto/tests/libcrypto_test.sh @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Enji Cooper + +atf_test_case legacy_provider +legacy_provider_head() { + atf_set "descr" "daemon should drop privileges" +} +legacy_provider_body() { + local passphrase="test" + local plaintext="test" + + export OPENSSL_CONF="$PWD/openssl.conf" + cat > "$OPENSSL_CONF" < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 0d5ef734e91e - stable/15 - crypto/openssl: remove autogenerated files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0d5ef734e91e6b03312b54ab3463ed5608ed27fa Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=0d5ef734e91e6b03312b54ab3463ed5608ed27fa commit 0d5ef734e91e6b03312b54ab3463ed5608ed27fa Author: Enji Cooper AuthorDate: 2025-10-11 16:48:10 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:05:27 +0000 crypto/openssl: remove autogenerated files These files contain build host paths and other configuration details that can be regenerated via the standard vendor import process. Don't clutter up the FreeBSD tree with these files. Add the paths to .gitignore to prevent them from accidentally being added in a future update. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53044 (cherry picked from commit d271d2ce152435b14e309bd8b25f47a0f4a2040f) --- crypto/.gitignore | 78 + crypto/openssl/configdata.pm | 36871 ----------------------------------------- crypto/openssl/libcrypto.pc | 13 - crypto/openssl/libssl.pc | 11 - crypto/openssl/openssl.pc | 9 - crypto/openssl/util/wrap.pl | 133 - 6 files changed, 78 insertions(+), 37037 deletions(-) diff --git a/crypto/.gitignore b/crypto/.gitignore new file mode 100644 index 000000000000..4c6e1f0fe03f --- /dev/null +++ b/crypto/.gitignore @@ -0,0 +1,78 @@ +# OpenSSL: the following are generated paths that generally should not be committed to FreeBSD. +openssl/apps/tsget.pl +openssl/crypto/buildinf.h +openssl/doc/html +openssl/doc/man +openssl/test/buildtest_*.c +openssl/util/wrap.pl +openssl/**/*.cmake +openssl/**/*.ld +openssl/**/*.s +openssl/*.pc +openssl/Makefile +openssl/Makefile.in +openssl/builddata.pm +openssl/configdata.pm +openssl/installdata.pm +openssl/pod2htmd.tmp + +# .pod files generated from .pod.in files. +# +# List can be easily updated via this command: +# +# % find openssl/doc -name \*.pod.in | sed -e 's,\.in,,g' +openssl/doc/man1/openssl-asn1parse.pod +openssl/doc/man1/openssl-ca.pod +openssl/doc/man1/openssl-ciphers.pod +openssl/doc/man1/openssl-cmds.pod +openssl/doc/man1/openssl-cmp.pod +openssl/doc/man1/openssl-cms.pod +openssl/doc/man1/openssl-crl.pod +openssl/doc/man1/openssl-crl2pkcs7.pod +openssl/doc/man1/openssl-dgst.pod +openssl/doc/man1/openssl-dhparam.pod +openssl/doc/man1/openssl-dsa.pod +openssl/doc/man1/openssl-dsaparam.pod +openssl/doc/man1/openssl-ec.pod +openssl/doc/man1/openssl-ecparam.pod +openssl/doc/man1/openssl-enc.pod +openssl/doc/man1/openssl-engine.pod +openssl/doc/man1/openssl-errstr.pod +openssl/doc/man1/openssl-fipsinstall.pod +openssl/doc/man1/openssl-gendsa.pod +openssl/doc/man1/openssl-genpkey.pod +openssl/doc/man1/openssl-genrsa.pod +openssl/doc/man1/openssl-info.pod +openssl/doc/man1/openssl-kdf.pod +openssl/doc/man1/openssl-list.pod +openssl/doc/man1/openssl-mac.pod +openssl/doc/man1/openssl-nseq.pod +openssl/doc/man1/openssl-ocsp.pod +openssl/doc/man1/openssl-passwd.pod +openssl/doc/man1/openssl-pkcs12.pod +openssl/doc/man1/openssl-pkcs7.pod +openssl/doc/man1/openssl-pkcs8.pod +openssl/doc/man1/openssl-pkey.pod +openssl/doc/man1/openssl-pkeyparam.pod +openssl/doc/man1/openssl-pkeyutl.pod +openssl/doc/man1/openssl-prime.pod +openssl/doc/man1/openssl-rand.pod +openssl/doc/man1/openssl-rehash.pod +openssl/doc/man1/openssl-req.pod +openssl/doc/man1/openssl-rsa.pod +openssl/doc/man1/openssl-rsautl.pod +openssl/doc/man1/openssl-s_client.pod +openssl/doc/man1/openssl-s_server.pod +openssl/doc/man1/openssl-s_time.pod +openssl/doc/man1/openssl-sess_id.pod +openssl/doc/man1/openssl-skeyutl.pod +openssl/doc/man1/openssl-smime.pod +openssl/doc/man1/openssl-speed.pod +openssl/doc/man1/openssl-spkac.pod +openssl/doc/man1/openssl-srp.pod +openssl/doc/man1/openssl-storeutl.pod +openssl/doc/man1/openssl-ts.pod +openssl/doc/man1/openssl-verify.pod +openssl/doc/man1/openssl-version.pod +openssl/doc/man1/openssl-x509.pod +openssl/doc/man7/openssl_user_macros.pod diff --git a/crypto/openssl/configdata.pm b/crypto/openssl/configdata.pm deleted file mode 100755 index 4a2c9307aa86..000000000000 --- a/crypto/openssl/configdata.pm +++ /dev/null @@ -1,36871 +0,0 @@ -#! /usr/bin/env perl -# -*- mode: perl -*- - -package configdata; - -use strict; -use warnings; - -use Exporter; -our @ISA = qw(Exporter); -our @EXPORT = qw( - %config %target %disabled %withargs %unified_info - @disablables @disablables_int -); - -our %config = ( - "AR" => "ar", - "ARFLAGS" => [ - "qc" - ], - "ASFLAGS" => [], - "CC" => "cc", - "CFLAGS" => [ - "-Wall -O3" - ], - "CPPDEFINES" => [], - "CPPFLAGS" => [], - "CPPINCLUDES" => [], - "CXXFLAGS" => [], - "FIPSKEY" => "f4556650ac31d35461610bac4ed81b1a181b2d8a43ea2854cbae22ca74560813", - "FIPS_VENDOR" => "OpenSSL non-compliant FIPS Provider", - "HASHBANGPERL" => "/usr/bin/env perl", - "LD" => "ld", - "LDFLAGS" => [], - "LDLIBS" => [], - "OBJCOPY" => "objcopy", - "PERL" => "/usr/local/bin/perl", - "RANLIB" => "ranlib", - "RC" => "windres", - "RCFLAGS" => [], - "afalgeng" => "", - "api" => "30500", - "b32" => "0", - "b64" => "0", - "b64l" => "1", - "bn_ll" => "0", - "build_file" => "Makefile", - "build_file_templates" => [ - "Configurations/common0.tmpl", - "Configurations/unix-Makefile.tmpl" - ], - "build_infos" => [ - "./build.info", - "crypto/build.info", - "ssl/build.info", - "apps/build.info", - "util/build.info", - "tools/build.info", - "fuzz/build.info", - "providers/build.info", - "doc/build.info", - "test/build.info", - "engines/build.info", - "exporters/build.info", - "crypto/objects/build.info", - "crypto/buffer/build.info", - "crypto/bio/build.info", - "crypto/stack/build.info", - "crypto/lhash/build.info", - "crypto/hashtable/build.info", - "crypto/rand/build.info", - "crypto/evp/build.info", - "crypto/asn1/build.info", - "crypto/pem/build.info", - "crypto/x509/build.info", - "crypto/conf/build.info", - "crypto/txt_db/build.info", - "crypto/pkcs7/build.info", - "crypto/pkcs12/build.info", - "crypto/ui/build.info", - "crypto/kdf/build.info", - "crypto/store/build.info", - "crypto/property/build.info", - "crypto/md4/build.info", - "crypto/md5/build.info", - "crypto/sha/build.info", - "crypto/ml_kem/build.info", - "crypto/hmac/build.info", - "crypto/ripemd/build.info", - "crypto/whrlpool/build.info", - "crypto/poly1305/build.info", - "crypto/siphash/build.info", - "crypto/des/build.info", - "crypto/aes/build.info", - "crypto/rc2/build.info", - "crypto/rc4/build.info", - "crypto/bf/build.info", - "crypto/cast/build.info", - "crypto/camellia/build.info", - "crypto/seed/build.info", - "crypto/chacha/build.info", - "crypto/modes/build.info", - "crypto/bn/build.info", - "crypto/ec/build.info", - "crypto/rsa/build.info", - "crypto/dsa/build.info", - "crypto/dh/build.info", - "crypto/dso/build.info", - "crypto/engine/build.info", - "crypto/err/build.info", - "crypto/comp/build.info", - "crypto/http/build.info", - "crypto/ocsp/build.info", - "crypto/cms/build.info", - "crypto/ts/build.info", - "crypto/srp/build.info", - "crypto/cmac/build.info", - "crypto/ct/build.info", - "crypto/async/build.info", - "crypto/ess/build.info", - "crypto/crmf/build.info", - "crypto/cmp/build.info", - "crypto/encode_decode/build.info", - "crypto/ffc/build.info", - "crypto/hpke/build.info", - "crypto/thread/build.info", - "crypto/ml_dsa/build.info", - "crypto/slh_dsa/build.info", - "ssl/record/build.info", - "ssl/rio/build.info", - "ssl/quic/build.info", - "apps/lib/build.info", - "providers/common/build.info", - "providers/implementations/build.info", - "doc/man1/build.info", - "ssl/record/methods/build.info", - "providers/common/der/build.info", - "providers/implementations/digests/build.info", - "providers/implementations/ciphers/build.info", - "providers/implementations/rands/build.info", - "providers/implementations/macs/build.info", - "providers/implementations/kdfs/build.info", - "providers/implementations/exchange/build.info", - "providers/implementations/keymgmt/build.info", - "providers/implementations/signature/build.info", - "providers/implementations/asymciphers/build.info", - "providers/implementations/encode_decode/build.info", - "providers/implementations/storemgmt/build.info", - "providers/implementations/kem/build.info", - "providers/implementations/skeymgmt/build.info", - "providers/implementations/rands/seeding/build.info" - ], - "build_metadata" => "", - "build_type" => "release", - "builddir" => ".", - "cflags" => [ - "-Wa,--noexecstack", - "-Qunused-arguments" - ], - "conf_files" => [ - "Configurations/00-base-templates.conf", - "Configurations/10-main.conf" - ], - "cppflags" => [], - "cxxflags" => [], - "defines" => [ - "NDEBUG" - ], - "dynamic_engines" => "1", - "ex_libs" => [], - "full_version" => "3.5.4", - "includes" => [], - "ktls" => "", - "lflags" => [], - "lib_defines" => [ - "OPENSSL_PIC" - ], - "libdir" => "", - "major" => "3", - "makedep_scheme" => "gcc", - "minor" => "5", - "openssl_api_defines" => [ - "OPENSSL_CONFIGURED_API=30500" - ], - "openssl_feature_defines" => [ - "OPENSSL_RAND_SEED_OS", - "OPENSSL_THREADS", - "OPENSSL_NO_ACVP_TESTS", - "OPENSSL_NO_AFALGENG", - "OPENSSL_NO_ARIA", - "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", - "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_CRYPTO_MDEBUG", - "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", - "OPENSSL_NO_DEMOS", - "OPENSSL_NO_EGD", - "OPENSSL_NO_EXTERNAL_TESTS", - "OPENSSL_NO_FIPS_JITTER", - "OPENSSL_NO_FIPS_POST", - "OPENSSL_NO_FIPS_SECURITYCHECKS", - "OPENSSL_NO_FUZZ_AFL", - "OPENSSL_NO_FUZZ_LIBFUZZER", - "OPENSSL_NO_H3DEMO", - "OPENSSL_NO_HQINTEROP", - "OPENSSL_NO_IDEA", - "OPENSSL_NO_JITTER", - "OPENSSL_NO_MD2", - "OPENSSL_NO_MDC2", - "OPENSSL_NO_MSAN", - "OPENSSL_NO_PIE", - "OPENSSL_NO_RC5", - "OPENSSL_NO_SM2", - "OPENSSL_NO_SM3", - "OPENSSL_NO_SM4", - "OPENSSL_NO_SSL3", - "OPENSSL_NO_SSL3_METHOD", - "OPENSSL_NO_SSLKEYLOG", - "OPENSSL_NO_TFO", - "OPENSSL_NO_TRACE", - "OPENSSL_NO_UBSAN", - "OPENSSL_NO_UNIT_TEST", - "OPENSSL_NO_UPLINK", - "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", - "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", - "OPENSSL_NO_ZSTD_DYNAMIC", - "OPENSSL_NO_STATIC_ENGINE" - ], - "openssl_sys_defines" => [], - "openssldir" => "etc", - "options" => "enable-ec_nistp_64_gcc_128 enable-ktls enable-sctp --openssldir=etc --prefix=/usr no-acvp-tests no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips no-fips-jitter no-fips-post no-fips-securitychecks no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", - "patch" => "4", - "perl_archname" => "amd64-freebsd-thread-multi", - "perl_cmd" => "/usr/local/bin/perl", - "perl_version" => "5.40.3", - "perlargv" => [ - "disable-aria", - "disable-egd", - "disable-idea", - "disable-mdc2", - "disable-sm2", - "disable-sm3", - "disable-sm4", - "enable-ec_nistp_64_gcc_128", - "enable-ktls", - "enable-sctp", - "--openssldir=etc", - "--prefix=/usr" - ], - "perlenv" => { - "AR" => undef, - "ARFLAGS" => undef, - "AS" => undef, - "ASFLAGS" => undef, - "BUILDFILE" => undef, - "CC" => "cc", - "CFLAGS" => undef, - "CPP" => undef, - "CPPDEFINES" => undef, - "CPPFLAGS" => undef, - "CPPINCLUDES" => undef, - "CROSS_COMPILE" => undef, - "CXX" => undef, - "CXXFLAGS" => undef, - "HASHBANGPERL" => undef, - "LD" => "ld", - "LDFLAGS" => undef, - "LDLIBS" => undef, - "MT" => undef, - "MTFLAGS" => undef, - "OBJCOPY" => undef, - "OPENSSL_LOCAL_CONFIG_DIR" => undef, - "PERL" => undef, - "RANLIB" => undef, - "RC" => undef, - "RCFLAGS" => undef, - "RM" => undef, - "WINDRES" => undef, - "__CNF_CFLAGS" => undef, - "__CNF_CPPDEFINES" => undef, - "__CNF_CPPFLAGS" => undef, - "__CNF_CPPINCLUDES" => undef, - "__CNF_CXXFLAGS" => undef, - "__CNF_LDFLAGS" => undef, - "__CNF_LDLIBS" => undef - }, - "prefix" => "/usr", - "prerelease" => "", - "processor" => "", - "rc4_int" => "unsigned int", - "release_date" => "30 Sep 2025", - "shlib_version" => "3", - "sourcedir" => ".", - "target" => "BSD-x86_64", - "version" => "3.5.4" -); -our %target = ( - "AR" => "ar", - "ARFLAGS" => "qc", - "CC" => "cc", - "CFLAGS" => "-Wall -O3", - "HASHBANGPERL" => "/usr/bin/env perl", - "OBJCOPY" => "objcopy", - "RANLIB" => "ranlib", - "RC" => "windres", - "_conf_fname_int" => [ - "Configurations/00-base-templates.conf", - "Configurations/00-base-templates.conf", - "Configurations/10-main.conf", - "Configurations/10-main.conf", - "Configurations/10-main.conf", - "Configurations/shared-info.pl" - ], - "asm_arch" => "x86_64", - "bin_cflags" => "", - "bin_lflags" => "", - "bn_ops" => "SIXTY_FOUR_BIT_LONG", - "build_file" => "Makefile", - "build_scheme" => [ - "unified", - "unix" - ], - "cflags" => "-pthread", - "cppflags" => "-D_THREAD_SAFE -D_REENTRANT", - "defines" => [ - "OPENSSL_BUILDING_OPENSSL" - ], - "disable" => [], - "dso_ldflags" => "-Wl,-z,defs", - "dso_scheme" => "dlfcn", - "enable" => [ - "devcryptoeng" - ], - "ex_libs" => "-pthread", - "includes" => [], - "lflags" => "", - "lib_cflags" => "", - "lib_cppflags" => "-DL_ENDIAN", - "lib_defines" => [], - "module_cflags" => "-fPIC", - "module_cxxflags" => undef, - "module_ldflags" => "-shared -Wl,-Bsymbolic", - "perl_platform" => "Unix", - "perlasm_scheme" => "elf", - "shared_cflag" => "-fPIC", - "shared_defflag" => "-Wl,--version-script=", - "shared_defines" => [], - "shared_ldflag" => "-shared -Wl,-Bsymbolic", - "shared_rcflag" => "", - "shared_sonameflag" => "-Wl,-soname=", - "shared_target" => "bsd-gcc-shared", - "template" => "1", - "thread_defines" => [], - "thread_scheme" => "pthreads", - "unistd" => "" -); -our @disablables = ( - "acvp-tests", - "afalgeng", - "apps", - "argon2", - "aria", - "asan", - "asm", - "async", - "atexit", - "autoalginit", - "autoerrinit", - "autoload-config", - "bf", - "blake2", - "brotli", - "brotli-dynamic", - "buildtest-c++", - "bulk", - "cached-fetch", - "camellia", - "capieng", - "winstore", - "cast", - "chacha", - "cmac", - "cmp", - "cms", - "comp", - "crypto-mdebug", - "ct", - "default-thread-pool", - "demos", - "h3demo", - "hqinterop", - "deprecated", - "des", - "devcryptoeng", - "dgram", - "dh", - "docs", - "dsa", - "dso", - "dtls", - "dynamic-engine", - "ec", - "ec2m", - "ec_nistp_64_gcc_128", - "ecdh", - "ecdsa", - "ecx", - "egd", - "engine", - "err", - "external-tests", - "filenames", - "fips", - "fips-securitychecks", - "fips-post", - "fips-jitter", - "fuzz-afl", - "fuzz-libfuzzer", - "gost", - "http", - "idea", - "integrity-only-ciphers", - "jitter", - "ktls", - "legacy", - "loadereng", - "makedepend", - "md2", - "md4", - "mdc2", - "ml-dsa", - "ml-kem", - "module", - "msan", - "multiblock", - "nextprotoneg", - "ocb", - "ocsp", - "padlockeng", - "pic", - "pie", - "pinshared", - "poly1305", - "posix-io", - "psk", - "quic", - "unstable-qlog", - "rc2", - "rc4", - "rc5", - "rdrand", - "rfc3779", - "rmd160", - "scrypt", - "sctp", - "secure-memory", - "seed", - "shared", - "siphash", - "siv", - "slh-dsa", - "sm2", - "sm2-precomp", - "sm3", - "sm4", - "sock", - "srp", - "srtp", - "sse2", - "ssl", - "ssl-trace", - "static-engine", - "stdio", - "sslkeylog", - "tests", - "tfo", - "thread-pool", - "threads", - "tls", - "tls-deprecated-ec", - "trace", - "ts", - "ubsan", - "ui-console", - "unit-test", - "uplink", - "weak-ssl-ciphers", - "whirlpool", - "zlib", - "zlib-dynamic", - "zstd", - "zstd-dynamic", - "ssl3", - "ssl3-method", - "tls1", - "tls1-method", - "tls1_1", - "tls1_1-method", - "tls1_2", - "tls1_2-method", - "tls1_3", - "dtls1", - "dtls1-method", - "dtls1_2", - "dtls1_2-method" -); -our @disablables_int = ( - "crmf" -); -our %disabled = ( - "acvp-tests" => "cascade", - "afalgeng" => "not-linux", - "aria" => "option", - "asan" => "default", - "brotli" => "default", - "brotli-dynamic" => "default", - "buildtest-c++" => "default", - "crypto-mdebug" => "default", - "crypto-mdebug-backtrace" => "default", - "demos" => "default", - "egd" => "option", - "external-tests" => "default", - "fips" => "default", - "fips-jitter" => "default", - "fips-post" => "cascade", - "fips-securitychecks" => "cascade", - "fuzz-afl" => "default", - "fuzz-libfuzzer" => "default", - "h3demo" => "default", - "hqinterop" => "default", - "idea" => "option", - "jitter" => "default", - "md2" => "default", - "mdc2" => "option", - "msan" => "default", - "pie" => "default", - "rc5" => "default", - "sm2" => "option", - "sm3" => "option", - "sm4" => "option", - "ssl3" => "default", - "ssl3-method" => "default", - "sslkeylog" => "default", - "tfo" => "default", - "trace" => "default", - "ubsan" => "default", - "unit-test" => "default", - "uplink" => "no uplink_arch", - "weak-ssl-ciphers" => "default", - "winstore" => "not-windows", - "zlib" => "default", - "zlib-dynamic" => "default", - "zstd" => "default", - "zstd-dynamic" => "default" -); -our %withargs = (); -our %unified_info = ( - "attributes" => { - "depends" => { - "doc/man1/openssl-asn1parse.pod" => { - "doc/man1/openssl-asn1parse.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ca.pod" => { - "doc/man1/openssl-ca.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ciphers.pod" => { - "doc/man1/openssl-ciphers.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-cmds.pod" => { - "doc/man1/openssl-cmds.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-cmp.pod" => { - "doc/man1/openssl-cmp.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-cms.pod" => { - "doc/man1/openssl-cms.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-crl.pod" => { - "doc/man1/openssl-crl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-crl2pkcs7.pod" => { - "doc/man1/openssl-crl2pkcs7.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-dgst.pod" => { - "doc/man1/openssl-dgst.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-dhparam.pod" => { - "doc/man1/openssl-dhparam.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-dsa.pod" => { - "doc/man1/openssl-dsa.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-dsaparam.pod" => { - "doc/man1/openssl-dsaparam.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ec.pod" => { - "doc/man1/openssl-ec.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ecparam.pod" => { - "doc/man1/openssl-ecparam.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-enc.pod" => { - "doc/man1/openssl-enc.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-engine.pod" => { - "doc/man1/openssl-engine.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-errstr.pod" => { - "doc/man1/openssl-errstr.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-fipsinstall.pod" => { - "doc/man1/openssl-fipsinstall.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-gendsa.pod" => { - "doc/man1/openssl-gendsa.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-genpkey.pod" => { - "doc/man1/openssl-genpkey.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-genrsa.pod" => { - "doc/man1/openssl-genrsa.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-info.pod" => { - "doc/man1/openssl-info.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-kdf.pod" => { - "doc/man1/openssl-kdf.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-list.pod" => { - "doc/man1/openssl-list.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-mac.pod" => { - "doc/man1/openssl-mac.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-nseq.pod" => { - "doc/man1/openssl-nseq.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ocsp.pod" => { - "doc/man1/openssl-ocsp.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-passwd.pod" => { - "doc/man1/openssl-passwd.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkcs12.pod" => { - "doc/man1/openssl-pkcs12.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkcs7.pod" => { - "doc/man1/openssl-pkcs7.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkcs8.pod" => { - "doc/man1/openssl-pkcs8.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkey.pod" => { - "doc/man1/openssl-pkey.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkeyparam.pod" => { - "doc/man1/openssl-pkeyparam.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkeyutl.pod" => { - "doc/man1/openssl-pkeyutl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-prime.pod" => { - "doc/man1/openssl-prime.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-rand.pod" => { - "doc/man1/openssl-rand.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-rehash.pod" => { - "doc/man1/openssl-rehash.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-req.pod" => { - "doc/man1/openssl-req.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-rsa.pod" => { - "doc/man1/openssl-rsa.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-rsautl.pod" => { - "doc/man1/openssl-rsautl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-s_client.pod" => { - "doc/man1/openssl-s_client.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-s_server.pod" => { - "doc/man1/openssl-s_server.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-s_time.pod" => { - "doc/man1/openssl-s_time.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-sess_id.pod" => { - "doc/man1/openssl-sess_id.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-skeyutl.pod" => { - "doc/man1/openssl-skeyutl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-smime.pod" => { - "doc/man1/openssl-smime.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-speed.pod" => { - "doc/man1/openssl-speed.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-spkac.pod" => { - "doc/man1/openssl-spkac.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-srp.pod" => { - "doc/man1/openssl-srp.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-storeutl.pod" => { - "doc/man1/openssl-storeutl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ts.pod" => { - "doc/man1/openssl-ts.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-verify.pod" => { - "doc/man1/openssl-verify.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-version.pod" => { - "doc/man1/openssl-version.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-x509.pod" => { - "doc/man1/openssl-x509.pod.in" => { - "pod" => "1" - } - }, - "doc/man7/openssl_user_macros.pod" => { - "doc/man7/openssl_user_macros.pod.in" => { - "pod" => "1" - } - }, - "providers/libcommon.a" => { - "libcrypto" => { - "weak" => "1" - } - } - }, - "generate" => { - "exporters/OpenSSLConfig.cmake" => { - "exporter" => "cmake" - }, - "exporters/OpenSSLConfigVersion.cmake" => { - "exporter" => "cmake" - }, - "exporters/libcrypto.pc" => { - "exporter" => "pkg-config" - }, - "exporters/libssl.pc" => { - "exporter" => "pkg-config" - }, - "exporters/openssl.pc" => { - "exporter" => "pkg-config" - }, - "include/openssl/configuration.h" => { - "skip" => "1" - } - }, - "libraries" => { *** 36197 LINES SKIPPED *** From nobody Tue Nov 4 16:05:47 2025 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 4d1Cwq6kMlz6GJgr; Tue, 04 Nov 2025 16:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Cwq3gN8z3XNF; Tue, 04 Nov 2025 16:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9QBghVGivl5IPUYgWh8eDaKy46Jq87tq/nEK8qxLv2g=; b=NlhkOtcvfKRis6IcD8gYFysX0l+rqWBN4GFK3rPZbzEI8mPr/LiMO/JwhbChdeOhzA7Eg3 YiReyEGr2HsgDwQojFIpkGBsmWHPqC9AGn3bo0Hm6wPq6Sjx5pObhzXm8lOGhh9orVfGPM TddN8qu326v9biFC44NRem7VoS+SAIPbu7NktRYpP1phqXfygZjmWGp1PzZFRHFY3TdnGB rNC/v2od3B++xK3ZZI85jYgUIWN32L238vMYDX55X9n6oRxjV3s+xZNAxAZIJIN88i3vhq BFmgNSSIrIj7xk0QiscleTzh+kVp9Iv+s/eer7RLQXLhhPoLeCyrwi5TKIXTxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762272347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9QBghVGivl5IPUYgWh8eDaKy46Jq87tq/nEK8qxLv2g=; b=KbvibQGpC9aoa+Y67oY2mbtuEDXvBwKCxOjSc3+240pBvew4E6Ni6dnZTi26OBw4+unCrB xLPMPBV+WXCKI9rtV3P2XfT7ko5KAiCm22hBCnh+LyqSJ0eGL/ZQ2R0k0XAfJBBW1r2EI4 5rMaj4141Ht2CDTcRa/I4OwlH2JW6R28JLS3PS8K1TbKz7t4Xqd7/RjuKrk+I/dSScWHla ux2j9CaPVWfoJmZYjyA9dcOg18szcQThegeBEMjdVeoES0MBZ3OSYf+XLd6C7TvN03Jukl aqwsH1aOaE1iUjTDa0Kd5Zy/s59p71XYbwI5XKoeCA4cHgX8IHboG1wqydollw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762272347; a=rsa-sha256; cv=none; b=VHIAhqsK/xyyuf8CxI/FBolh4KSb5he9eWusGYxboJjADmEKpaJ0ZGXZwMjcESFY536Q2w 6RWdTXmi9jtTbHn+xiTLPGOalHqcXqAOCfEBrbQf3Zp+EPvq972GldYRin4NN81X5kbCEj gwea36joU83jhXJpvubViGDbkCo/Z75VA51t34CCVmWw0MvEpfQfNt8HpY2jhUtlNdlqWp /r3Vs7x+3Mt9Cp8UymNU3861B33gSZ3uQyVJ52E+ic9/tISwK1SYTyaX/QxUhaFEVZ3bQS JG0ayUb3vZAxJlVPqZSsclN3SAApaHmBjJ/PA14DzgTBEqThC7mBxO5DoEZRug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Cwq3CvPz13gy; Tue, 04 Nov 2025 16:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4G5lhS075730; Tue, 4 Nov 2025 16:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4G5la0075727; Tue, 4 Nov 2025 16:05:47 GMT (envelope-from git) Date: Tue, 4 Nov 2025 16:05:47 GMT Message-Id: <202511041605.5A4G5la0075727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 9b84a17c0adc - stable/15 - OpenSSL: install .pc files from the exporters subdir List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9b84a17c0adc85f32eb6a284011730f5d645fd2c Auto-Submitted: auto-generated The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=9b84a17c0adc85f32eb6a284011730f5d645fd2c commit 9b84a17c0adc85f32eb6a284011730f5d645fd2c Author: Enji Cooper AuthorDate: 2025-10-11 20:47:20 +0000 Commit: Enji Cooper CommitDate: 2025-11-04 16:05:27 +0000 OpenSSL: install .pc files from the exporters subdir The .pc files generated in the root directory are used as part of the build; they should never be installed. Use the versions from the exporters subdirectory--which should be installed--as the .pc files which are distributed with FreeBSD. This avoids the need for "fixing up" these files after the fact (see `crypto/openssl/BSDmakefile` for more details as part of this change). Garbage collect `secure/lib/libcrypto/Makefile.version`, et al, as they're orphaned files. They were technically unused prior to this change as the vendor process properly embeds the version numbers in various files, but this commit formalizes the removal. This correction/clarification on the .pc files will be made in an upcoming release of OpenSSL [1]. References: 1. https://github.com/openssl/openssl/issues/28803 Suggested by: Richard Levitte (OpenSSL project) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53043 (cherry picked from commit 97388e7215e080f2cb9fd446f4be4e46a9aeb114) --- crypto/openssl/BSDmakefile | 20 -------------------- .../openssl/freebsd/dump_version_from_configdata.pl | 21 --------------------- secure/lib/libcrypto/Makefile.inc | 12 +++--------- secure/lib/libcrypto/Makefile.version | 2 -- 4 files changed, 3 insertions(+), 52 deletions(-) diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile index 514c87ae3a8e..c6b539be0432 100644 --- a/crypto/openssl/BSDmakefile +++ b/crypto/openssl/BSDmakefile @@ -43,32 +43,12 @@ configure: enable-sctp \ --openssldir=etc \ --prefix=/usr) - @echo "Building configdata.pm for later use." - @(cd ${.CURDIR} && \ - ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} configdata.pm) - - @echo "Populating Makefile.version with release information" - @(cd ${LCRYPTO_SRC} && ${SETENVI} ${WRK_ENV} ${PERL} \ - ${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \ - ${SRCTOP}/secure/lib/libcrypto/Makefile.version) all: patch @echo "==> Building generated files (headers, manpages, etc)" @(cd ${.CURDIR} && \ ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} build_all_generated) - # 1. Fix --prefix. - # a. Not sure why --prefix isn't honored properly, even though it's - # passed to Configure; the files might be getting rebuilt - # post-Configure, somehow. - # 2. Remove duplicate path in CFLAGS. - # 3. Remove duplicate path in includedir(s). - @echo "==> Fixing pkgconfig files" - @find . -name \*.pc -print -exec sed -i '' -E \ - -e 's,^prefix=.+,prefix=/usr,' \ - -e 's,[[:space:]]+(\-I)?\$\{prefix\}/\./include[[:space:]]*,,g' \ - {} + - @echo "==> Cleaning / rebuilding ASM" @(cd ${SRCTOP}/secure/lib/libcrypto && \ ${SETENVI} ${WRK_ENV} ${MAKE} cleanasm && \ diff --git a/crypto/openssl/freebsd/dump_version_from_configdata.pl b/crypto/openssl/freebsd/dump_version_from_configdata.pl deleted file mode 100644 index b6137718ba54..000000000000 --- a/crypto/openssl/freebsd/dump_version_from_configdata.pl +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env perl -# -# This dumps out the values needed to generate manpages and other artifacts -# which include the release version/date. -# -# See also: `secure/lib/libcrypto/Makefile.version`. - -use Cwd qw(realpath); -use File::Basename qw(dirname); -use Time::Piece; - -use lib dirname(dirname(realpath($0))); - -use configdata qw(%config); - -$OPENSSL_DATE = Time::Piece->strptime($config{"release_date"}, "%d %b %Y")->strftime("%Y-%m-%d"); - -$OPENSSL_VER = "$config{'major'}.$config{'minor'}.$config{'patch'}"; - -print("OPENSSL_VER=\t${OPENSSL_VER}\n"); -print("OPENSSL_DATE=\t${OPENSSL_DATE}\n"); diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 4d5e9c68a1fe..5b281166df61 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -3,9 +3,6 @@ PACKAGE= openssl LIB_PACKAGE= -# OpenSSL version used for manual page generation -.include "Makefile.version" - LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc @@ -15,10 +12,7 @@ CFLAGS+= -I${LCRYPTO_SRC}/providers/common/include CFLAGS+= -I${LCRYPTO_SRC}/providers/fips/include CFLAGS+= -I${LCRYPTO_SRC}/providers/implementations/include -.include "Makefile.common" +.SUFFIXES: .pc +.PATH.pc: ${LCRYPTO_SRC}/exporters -.for pcfile in ${PCFILES} -${pcfile}: ${pcfile}.in - sed -e 's,@openssl_ver@,${OPENSSL_VER},g' ${.ALLSRC} > ${.TARGET} -.endfor -CLEANFILES+= ${PCFILES} +.include "Makefile.common" diff --git a/secure/lib/libcrypto/Makefile.version b/secure/lib/libcrypto/Makefile.version deleted file mode 100644 index 81636b8adfe8..000000000000 --- a/secure/lib/libcrypto/Makefile.version +++ /dev/null @@ -1,2 +0,0 @@ -OPENSSL_VER= 3.5.4 -OPENSSL_DATE= 2025-09-30 From nobody Tue Nov 4 18:16:17 2025 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 4d1GqQ0jXFz657LV; Tue, 04 Nov 2025 18:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1GqQ03Q6z3qlq; Tue, 04 Nov 2025 18:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762280178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZIdlz5PSBv2eg2lkZiZVQmfIJomrTjtS7qe+mJVL+U4=; b=GhcmxdqqRkIvnU25Dm2kFuJ4dp/KQENcbncax3y/Wmm2VLwbszscOM8uGi1TRemfleDv6m 0VuJHEeECps5L7GzDm9aiNUAH7O6TR9aCSoyOUR5V4bkXQerSzm9m2tqsD77yllXD1A4g8 Pd2dyjyRUwEovvw/0WNnMOmteW8sfX2t7ZakW+296HDXso8Rx77mHr5f5F7HtTT6OEzXZd 5GVPEqjI52diN+ZumPNE7sCq3AjJUouB3sprnS7YLkSIj75fsM/EQcOAkDvZI1NFhoy0z3 xPuBZ7QUBw1/68u9XNWM/F3nOw/t/xGDrXltHBxRbrMHheF2SPEaS4R/1Jeb1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762280178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZIdlz5PSBv2eg2lkZiZVQmfIJomrTjtS7qe+mJVL+U4=; b=OesuHTiS22KdluZ1yOarmocsaC/lJEafZRmSC3PiF6KIow/RBRPZ+UjPROmp8kpDjBjylH Fc0Azqlec9OGe/+LUB5hCPJezdLAY4uJn4aGioxCncH/OtAEtIfYeaHaZs7X9rV4444nAv i0UGE53tNL6KneeYqwgmWk+QuqlnFTQrIqVYoqxG1k1vYwSyeEoFP6H5VFCopM95tr2Yao Z66wj1u5hjrUSog+nZiNy7cCfeFzaclKXEAAoDhN2ztAwC2fOKyQqm8Vx+qzyqK0X2g0Fz ne41PxzO57e8c4QZ6vDQE+1vTBPIGVJOeS6NLHuUrACKRFCg/Y5TNTguFRYedg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762280178; a=rsa-sha256; cv=none; b=U+nCq9iTSn18BN6a+VYG4Chm+uQHdQB5sd+aTM5No8+yl4DkkZzwaNOyJRzpgYggCUJ0ev Oy0cZw568bySHnjZmNW3JkDgk8iJTrgOJ93++vV0RoP3ASGEs7EFz3q+IOQeR6qh74DYmZ gahB/2JANnAaRY6iTTTLGTu3yXZYPotYwtBWEm8419Rg2N1QhsQK6w3XU8hrJFlycZU3VZ yZ4bxnHD5CozSfW90V1u8fxIFGYG5GA9QwG4Su4+p5PCQEZpLmHp4zdFegr4cApXhm2kfX lp6SN2HhsDWcXrdzOJmCSIEpoOhWVx3D5/wuciDjvJXvm7zOVIoSwZH0AOtxZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1GqP6kQYz16hc; Tue, 04 Nov 2025 18:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4IGHJt020556; Tue, 4 Nov 2025 18:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4IGHJL020553; Tue, 4 Nov 2025 18:16:17 GMT (envelope-from git) Date: Tue, 4 Nov 2025 18:16:17 GMT Message-Id: <202511041816.5A4IGHJL020553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: dca645cd3112 - stable/14 - nvme: Add handling for bar5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: dca645cd3112feefee2dce8cab029b1b779823b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=dca645cd3112feefee2dce8cab029b1b779823b8 commit dca645cd3112feefee2dce8cab029b1b779823b8 Author: Jasper Tran O'Leary AuthorDate: 2025-10-28 20:43:35 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-04 18:15:17 +0000 nvme: Add handling for bar5 The NVMe spec allows the Table BIR (TBIR) and PBA DIR (PBIR) to be 0, 4, or 5. The existing NVMe driver basically only has support for 4, perhaps under the assumption that BAR4 is 64-bit and also occupies BAR5. This change adds support for BAR5, covering the case where BAR4 and BAR5 might both be present and 32-bit, where the Table BIR might be 4 and the PBA BIR might be 5, or vice versa. The NVMe spec (in the SR-IOV section) also permits VFs to use BIR=2, so I haven't added stricter checks on which BIR will be permitted by the driver. This enables FreeBSD on Google Compute Engine C4 Machines. MFC after: 3 days Reviewed by: imp Sponsored by: Google Co-authored-by: Matt Delco Signed-off-by: Jasper Tran O'Leary Differential Revision: https://reviews.freebsd.org/D53140 (cherry picked from commit 7b32f4f0a7fe9b1b2f5a3905ca15f656713255ad) --- sys/dev/nvme/nvme_ctrlr.c | 9 +++++++-- sys/dev/nvme/nvme_pci.c | 48 ++++++++++++++++++++++++++++++++++----------- sys/dev/nvme/nvme_private.h | 6 ++++-- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 6f5d6ae74add..ce203e2869fd 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1584,9 +1584,14 @@ noadminq: bus_release_resource(ctrlr->dev, SYS_RES_IRQ, rman_get_rid(ctrlr->res), ctrlr->res); - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } bus_release_resource(dev, SYS_RES_MEMORY, diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index a78327ba0e8b..9c40c3d9f5c7 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -154,11 +154,15 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) { ctrlr->resource_id = PCIR_BAR(0); + ctrlr->msix_table_resource_id = -1; + ctrlr->msix_table_resource = NULL; + ctrlr->msix_pba_resource_id = -1; + ctrlr->msix_pba_resource = NULL; ctrlr->resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, &ctrlr->resource_id, RF_ACTIVE); - if(ctrlr->resource == NULL) { + if (ctrlr->resource == NULL) { nvme_printf(ctrlr, "unable to allocate pci resource\n"); return (ENOMEM); } @@ -168,15 +172,32 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; /* - * The NVMe spec allows for the MSI-X table to be placed behind - * BAR 4/5, separate from the control/doorbell registers. Always - * try to map this bar, because it must be mapped prior to calling - * pci_alloc_msix(). If the table isn't behind BAR 4/5, - * bus_alloc_resource() will just return NULL which is OK. + * The NVMe spec allows for the MSI-X tables to be placed behind + * BAR 4 and/or 5, separate from the control/doorbell registers. */ - ctrlr->bar4_resource_id = PCIR_BAR(4); - ctrlr->bar4_resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, - &ctrlr->bar4_resource_id, RF_ACTIVE); + + ctrlr->msix_table_resource_id = pci_msix_table_bar(ctrlr->dev); + ctrlr->msix_pba_resource_id = pci_msix_pba_bar(ctrlr->dev); + + if (ctrlr->msix_table_resource_id >= 0 && + ctrlr->msix_table_resource_id != ctrlr->resource_id) { + ctrlr->msix_table_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, RF_ACTIVE); + if (ctrlr->msix_table_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x table resource\n"); + return (ENOMEM); + } + } + if (ctrlr->msix_pba_resource_id >= 0 && + ctrlr->msix_pba_resource_id != ctrlr->resource_id && + ctrlr->msix_pba_resource_id != ctrlr->msix_table_resource_id) { + ctrlr->msix_pba_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, RF_ACTIVE); + if (ctrlr->msix_pba_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x pba resource\n"); + return (ENOMEM); + } + } return (0); } @@ -202,9 +223,14 @@ bad: ctrlr->resource_id, ctrlr->resource); } - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } if (ctrlr->tag) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 36e04ceb7f31..93833672674a 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -233,8 +233,10 @@ struct nvme_controller { * separate from the control registers which are in BAR 0/1. These * members track the mapping of BAR 4/5 for that reason. */ - int bar4_resource_id; - struct resource *bar4_resource; + int msix_table_resource_id; + struct resource *msix_table_resource; + int msix_pba_resource_id; + struct resource *msix_pba_resource; int msi_count; uint32_t enable_aborts; From nobody Tue Nov 4 18:17:31 2025 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 4d1Grq3d3gz657QW; Tue, 04 Nov 2025 18:17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Grq34jvz3rfx; Tue, 04 Nov 2025 18:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762280251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xz9DbI9stjxKg9gDvRhosYvVZ1pwA2Bjm67GVqPWJ6g=; b=CAATfEMay/Ye9oxtt01ZBv8U9u1YzpTHZVj2FoUgimsjMSgFaXHp+IZIUm0YmSjzz2R97M D+DdDmUshiV1cIICiYVR29cqN++H5D9nzs+nB7EtoSkHV/JdZ6rLblX48DI0Cy0QeMY5n2 i+/RkZMRF0eyQqKVgV4GwtB+o1/4GxlvqrCtrkT3MvT1AKIjYZ5QnR1oxTn6ptrWuqeRa3 Zcl5CPUOBJfYSmchl6mX8OfNDZ7Gj5vlxBUPeGdODG55h9MGL9vex7xlGRi6oX3N6Bf+pD Qzcerrwu6KqK3SHRBOvTmPkKL1M4pkKoLODKyye/irlHeYuG8pT4eKc8Mik+9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762280251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xz9DbI9stjxKg9gDvRhosYvVZ1pwA2Bjm67GVqPWJ6g=; b=QGmRMQJ0ld8bd3Fg64YY3NjVOMYyxn/Y3PbzmzQOybU4kRMsQdtz1JnYFovKaFdrYk/Wcq jFJfglV4Qp+gARTNfZdTRb1T6Ri7UVGV/L/DRXd6A0A++W9U2uNvefCDnQMfPA71+U7Czv GAGZPgoBD5nQijPAqGm237r+0gLllGOqX4U33c343L9gkMnSu1gNcoOiztVVOQ4mcxNWEv LeQtvM3WEcdHLQjePV0lyeakigJxF3mMIlZfRnpvXkJ3NwqSkl8ork2W4nwapGgtNYvvj6 urzp9QBlBQDubD61rRgPYWerbG4TDHMxPCp4FJ5p+tx224JWdoafoKFNeAlXIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762280251; a=rsa-sha256; cv=none; b=bRSEc1QGmH7VR3I85P6vXD1Noba9AMXpqX+Atq/crczHNizN2QkRXgzo3KAiMWh3qhcDr3 LcsgVqrCEKIJYTCN69x+XRLtC2ZO98gDoZC1p0T1F0OsjefTDCxN/Z91Fxnm0AnSPDUfaR i0NsJYFAOacYI8A6YMo64MFV5Ivlz06cvtWjEzPLwAi/zRPkKrBZF4P6elcyWeydqK9CFg PA+o2VetwXHzOLEXp2M2M0EejE2GGwyHZ95gJDw87vPm17oqfCwqXOxWQlyu0PWu+Xb7wn 5ZrDH4XXZwJdHAfcxZgNCvcvXmMlOkTylnh+cXRmKDxxoSpSi9kNUTkSYeMhZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Grq2ZBfz16my; Tue, 04 Nov 2025 18:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4IHVeb021033; Tue, 4 Nov 2025 18:17:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4IHVAM021030; Tue, 4 Nov 2025 18:17:31 GMT (envelope-from git) Date: Tue, 4 Nov 2025 18:17:31 GMT Message-Id: <202511041817.5A4IHVAM021030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 639eaea58e5b - stable/13 - nvme: Add handling for bar5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/13 X-Git-Reftype: branch X-Git-Commit: 639eaea58e5ba9f36e23c0f9f928640bd9fb74e3 Auto-Submitted: auto-generated The branch stable/13 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=639eaea58e5ba9f36e23c0f9f928640bd9fb74e3 commit 639eaea58e5ba9f36e23c0f9f928640bd9fb74e3 Author: Jasper Tran O'Leary AuthorDate: 2025-10-28 20:43:35 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-04 18:16:55 +0000 nvme: Add handling for bar5 The NVMe spec allows the Table BIR (TBIR) and PBA DIR (PBIR) to be 0, 4, or 5. The existing NVMe driver basically only has support for 4, perhaps under the assumption that BAR4 is 64-bit and also occupies BAR5. This change adds support for BAR5, covering the case where BAR4 and BAR5 might both be present and 32-bit, where the Table BIR might be 4 and the PBA BIR might be 5, or vice versa. The NVMe spec (in the SR-IOV section) also permits VFs to use BIR=2, so I haven't added stricter checks on which BIR will be permitted by the driver. This enables FreeBSD on Google Compute Engine C4 Machines. MFC after: 3 days Reviewed by: imp Sponsored by: Google Co-authored-by: Matt Delco Signed-off-by: Jasper Tran O'Leary Differential Revision: https://reviews.freebsd.org/D53140 (cherry picked from commit 7b32f4f0a7fe9b1b2f5a3905ca15f656713255ad) --- sys/dev/nvme/nvme_ctrlr.c | 9 +++++++-- sys/dev/nvme/nvme_pci.c | 48 ++++++++++++++++++++++++++++++++++----------- sys/dev/nvme/nvme_private.h | 6 ++++-- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index a3862113ed75..ebdafdc1e73b 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1560,9 +1560,14 @@ noadminq: bus_release_resource(ctrlr->dev, SYS_RES_IRQ, rman_get_rid(ctrlr->res), ctrlr->res); - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } bus_release_resource(dev, SYS_RES_MEMORY, diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index 92140b9c39fc..1e3c5cd33f48 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -153,11 +153,15 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) { ctrlr->resource_id = PCIR_BAR(0); + ctrlr->msix_table_resource_id = -1; + ctrlr->msix_table_resource = NULL; + ctrlr->msix_pba_resource_id = -1; + ctrlr->msix_pba_resource = NULL; ctrlr->resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, &ctrlr->resource_id, RF_ACTIVE); - if(ctrlr->resource == NULL) { + if (ctrlr->resource == NULL) { nvme_printf(ctrlr, "unable to allocate pci resource\n"); return (ENOMEM); } @@ -167,15 +171,32 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; /* - * The NVMe spec allows for the MSI-X table to be placed behind - * BAR 4/5, separate from the control/doorbell registers. Always - * try to map this bar, because it must be mapped prior to calling - * pci_alloc_msix(). If the table isn't behind BAR 4/5, - * bus_alloc_resource() will just return NULL which is OK. + * The NVMe spec allows for the MSI-X tables to be placed behind + * BAR 4 and/or 5, separate from the control/doorbell registers. */ - ctrlr->bar4_resource_id = PCIR_BAR(4); - ctrlr->bar4_resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, - &ctrlr->bar4_resource_id, RF_ACTIVE); + + ctrlr->msix_table_resource_id = pci_msix_table_bar(ctrlr->dev); + ctrlr->msix_pba_resource_id = pci_msix_pba_bar(ctrlr->dev); + + if (ctrlr->msix_table_resource_id >= 0 && + ctrlr->msix_table_resource_id != ctrlr->resource_id) { + ctrlr->msix_table_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, RF_ACTIVE); + if (ctrlr->msix_table_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x table resource\n"); + return (ENOMEM); + } + } + if (ctrlr->msix_pba_resource_id >= 0 && + ctrlr->msix_pba_resource_id != ctrlr->resource_id && + ctrlr->msix_pba_resource_id != ctrlr->msix_table_resource_id) { + ctrlr->msix_pba_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, RF_ACTIVE); + if (ctrlr->msix_pba_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x pba resource\n"); + return (ENOMEM); + } + } return (0); } @@ -201,9 +222,14 @@ bad: ctrlr->resource_id, ctrlr->resource); } - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } if (ctrlr->tag) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index e2e2f5efeacc..a4392ef65bf2 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -252,8 +252,10 @@ struct nvme_controller { * separate from the control registers which are in BAR 0/1. These * members track the mapping of BAR 4/5 for that reason. */ - int bar4_resource_id; - struct resource *bar4_resource; + int msix_table_resource_id; + struct resource *msix_table_resource; + int msix_pba_resource_id; + struct resource *msix_pba_resource; int msi_count; uint32_t enable_aborts; From nobody Tue Nov 4 18:27:47 2025 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 4d1H4h0n53z658FW; Tue, 04 Nov 2025 18:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1H4h0Pq2z3sht; Tue, 04 Nov 2025 18:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762280868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xnm866Pz5ale5dSzNQiA4MYZePNRRqoU3FcbfTKlmLk=; b=nDYeP2TsoEblsWiPxNrintB5fpSYKUKTlg2TEqGN+Tm498F4SuWGNCw/M8iu4K/aBdTOxX 8XJeIbffn/5dEZBHY/cYXBcznMt2LsNKBsTdHrfa6/JOL2uSzFmL3XUqA3KvueUhc+6ZN2 dy/NzZr/pGz7B43duYnZOim56boaBOGTkH6RNnow4EwVML3Y6t0vT9SOlH9U3YrT3Oc8aP 3jaUEr+EgNu8bmDR2Z1/q15q4HZXd5Lc4mF9BiK6Vj9qdDdY+DPObo6EGeYUh4VuitRypA c80zzFRYAXHUDGhDF9YNMUECKddoY8OATVnNRC3m8U2bhDSKm9zH9j0eXf8KIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762280868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xnm866Pz5ale5dSzNQiA4MYZePNRRqoU3FcbfTKlmLk=; b=hR00qcqLQKJqYJ7Vb09MG88s5wmt3Tg9WeV81D4hn7zIaE/grElOFNjXx6yokp23klruhx RfrkFRpO6M7V5tSMFoGqdregVnRf1iCalvAyLvMSist0kklPG8wnzIdM4B/qvPyyQLmxSy uLgiiAru1SwfWTtnUqQRd6ooLi3AwdOuuBIP6l9UD6bpFSUT2phdxCgp2bHYx7yfs3evWN +PHDPkiYmFaG+QudbA8TWm8jvcCoMrOXosZivsW1p5Iu/d1N9brJYjkGNFVSsa3gF9uBrX Tm9DGrGs/IQzJ9XjlFqXc0H8uSaDl57Pv7YUxX2+HjtNANHaM7wrbCbfYonR8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762280868; a=rsa-sha256; cv=none; b=qbnnvfWpVWUQCT6Bz/spztpumzeZYIyF/G9rEsKZhhV3efHnPvHqB/jO3rOcfkevoUQbDd 1+bTPeJ2yrYw8ZMr6E92RZoM3urj9+OZmy79LhrV4lScsihs/TbGWAs7MlNBceyN6ZAWHd m8RjtGtuqOeCMOYoL2SYGEavQVOBl3Xmq1/0vuKIOCmG3xLob+hy59r22xYYISYnpUBHmn jJFU6Ur2uLsmRCnd+cWpMRarXgUpwyif1iLzH/MtP6JthjhykQxgepafzEN86kJrXQL4DX gRB1fHixCL09kJBf5uQ5nTqJLJgeG+xxYoNpeNSngB7TaPxNwytnGb/rVDcJEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1H4g73Y5z17nD; Tue, 04 Nov 2025 18:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4IRl19039354; Tue, 4 Nov 2025 18:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4IRlQE039351; Tue, 4 Nov 2025 18:27:47 GMT (envelope-from git) Date: Tue, 4 Nov 2025 18:27:47 GMT Message-Id: <202511041827.5A4IRlQE039351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: aa2fe36f5e4b - stable/15 - contrib/bsddialog: Import version 1.0.5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: aa2fe36f5e4b3b907af2ea94945ae9cab7263d0c Auto-Submitted: auto-generated The branch stable/15 has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=aa2fe36f5e4b3b907af2ea94945ae9cab7263d0c commit aa2fe36f5e4b3b907af2ea94945ae9cab7263d0c Author: Alfonso S. Siciliano AuthorDate: 2025-10-09 15:39:10 +0000 Commit: Alfonso S. Siciliano CommitDate: 2025-11-04 18:26:44 +0000 contrib/bsddialog: Import version 1.0.5 Version for change and feature requests. * Improve documentation for --alternate-screen and --normal-screen. Request: https://bugs.freebsd.org/285459. (This PR is not about bsddialog itself but is used as an example for an official FreeBSD documentation request.) * Reduce the number of screen refreshes to improve performance over a 115200 UART connection. Request: https://gitlab.com/alfix/bsddialog/-/issues/8. * Change textbox buttons to return distinct values (previously always returned OK). Request: https://reviews.freebsd.org/D48668; already committed in contrib/ 96a241a35905078bdc5d20bf25943cdb67758dea * Change forms navigation key behavior for ENTER and TAB. Request: https://bugs.freebsd.org/287592. Refer to /usr/src/contrib/bsddialog/CHANGELOG to know more. PR: 287592 Reported by: adrian Sponsored by: The FreeBSD Foundation Merge commit '653f765f05b8c7e3908ae92e9bf61522a50cefc9' into YYY (cherry picked from commit 3e42d7194bdcd4fbfd781518258f919d6ac803d3) --- contrib/bsddialog/.gitignore | 1 + contrib/bsddialog/CHANGELOG | 50 ++++++++++++++++++++- contrib/bsddialog/LICENSE | 2 +- contrib/bsddialog/Makefile | 13 +++++- contrib/bsddialog/README.md | 5 +-- contrib/bsddialog/examples_library/compile | 8 ++-- contrib/bsddialog/examples_library/textbox.c | 38 ++++++++++++++++ contrib/bsddialog/lib/GNUmakefile | 19 +++++++- contrib/bsddialog/lib/Makefile | 21 ++++++++- contrib/bsddialog/lib/barbox.c | 37 ++++++++-------- contrib/bsddialog/lib/bsddialog.3 | 16 +++++-- contrib/bsddialog/lib/bsddialog.h | 5 ++- contrib/bsddialog/lib/bsddialog_theme.h | 2 +- contrib/bsddialog/lib/datebox.c | 28 ++++++------ contrib/bsddialog/lib/formbox.c | 48 ++++++++++++++------ contrib/bsddialog/lib/lib_util.c | 3 +- contrib/bsddialog/lib/lib_util.h | 4 +- contrib/bsddialog/lib/libbsddialog.c | 14 +++++- contrib/bsddialog/lib/menubox.c | 18 ++++---- contrib/bsddialog/lib/messagebox.c | 16 +++---- contrib/bsddialog/lib/textbox.c | 16 +++---- contrib/bsddialog/lib/theme.c | 6 +-- contrib/bsddialog/lib/timebox.c | 16 +++---- contrib/bsddialog/utility/GNUmakefile | 11 ++++- contrib/bsddialog/utility/Makefile | 11 ++++- contrib/bsddialog/utility/bsddialog.1 | 21 ++++++--- contrib/bsddialog/utility/bsddialog.c | 2 +- contrib/bsddialog/utility/util.h | 2 +- contrib/bsddialog/utility/util_builders.c | 66 ++++++++++++++-------------- contrib/bsddialog/utility/util_cli.c | 2 +- contrib/bsddialog/utility/util_theme.c | 4 +- 31 files changed, 353 insertions(+), 152 deletions(-) diff --git a/contrib/bsddialog/.gitignore b/contrib/bsddialog/.gitignore index c8fc68ed8a0e..c9613d477f7f 100644 --- a/contrib/bsddialog/.gitignore +++ b/contrib/bsddialog/.gitignore @@ -21,6 +21,7 @@ examples_library/msgbox examples_library/pause examples_library/radiolist examples_library/rangebox +examples_library/textbox examples_library/theme examples_library/timebox examples_library/yesno diff --git a/contrib/bsddialog/CHANGELOG b/contrib/bsddialog/CHANGELOG index a4cf4d01c077..7800098644d7 100644 --- a/contrib/bsddialog/CHANGELOG +++ b/contrib/bsddialog/CHANGELOG @@ -1,11 +1,57 @@ -2024-07-01 1.0.4 +2025-06-22 Version 1.0.5 + + Manual: + * fix: "User-friendly documentation for alternate screen" + https://bugs.freebsd.org/285459. + Improve bsddialog.1: --alternate-screen and --normal-screen. + + NetBSD (tested on amd64) refactoring, no function changes: + * https://gitlab.com/alfix/bsddialog/-/merge_requests/4 + lib: include in lib_util.c. + * https://gitlab.com/alfix/bsddialog/-/merge_requests/5 + a call to curses' refresh() is performed, while a local + variable is also called refresh. + * Makefiles: add install and uninstall targets (both GND and BSD) + https://gitlab.com/alfix/bsddialog/-/merge_requests/3 + + MacOS (tested on amd64) refactoring, no function changes: + * https://gitlab.com/alfix/bsddialog/-/merge_requests/6 + utility: replace u_int with unsigned int. + + Library: + * fix: useless refreshes, https://gitlab.com/alfix/bsddialog/-/issues/8: + "It takes lot of time when running over a 115200 UART". + Not fixed for bsddialog_gauge() because it has to be rewritten. + * change: bsddialog_backtitle() does not update the screen so the + backtitle is not printed. To use if a dialog is built later. + Rationale: see "115200 UART" problem above. + * add: bsddialog_backtitle_rf() to print a top title refreshing the + screen like bsddialog_backtitle() was previously. + * change: forms, ENTER is also a navigation keys in forms fields. + Request: https://bugs.freebsd.org/287592 + If conf.button.always_active is true the form is closes immediatly. + + Library and implicitly utility: + * fix: textbox buttons returned values (was always OK). + Thanks to https://reviews.freebsd.org/D48668. + * change: TAB is a navigation keys in forms. Previously it directly + switched form-fields <-> buttons. + Request: https://bugs.freebsd.org/287592 + + Utility: + * change: forms, ENTER is a also navigation keys in forms fields. + Previously it directly closed the form except with --switch-buttons + Request: https://bugs.freebsd.org/287592 + + +2024-07-01 Version 1.0.4 Utility internal refactoring (no functional change): * change: rename an internal constant to avoid a future conflict because FreeBSD is changing headers files for _FORTIFY_SOURCE. Reported and fixed by Kyle Evans. -2024-05-27 1.0.3 +2024-05-27 Version 1.0.3 Utility: change: --form and --mixedform do not print field value to output fd if diff --git a/contrib/bsddialog/LICENSE b/contrib/bsddialog/LICENSE index 7b36a8dce42e..9ea4a4a62f4b 100644 --- a/contrib/bsddialog/LICENSE +++ b/contrib/bsddialog/LICENSE @@ -1,6 +1,6 @@ BSD 2-Clause License -Copyright (c) 2021-2024, Alfonso Sabato Siciliano +Copyright (c) 2021-2025, Alfonso Sabato Siciliano Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/contrib/bsddialog/Makefile b/contrib/bsddialog/Makefile index a6af8813a48e..335b693470e6 100644 --- a/contrib/bsddialog/Makefile +++ b/contrib/bsddialog/Makefile @@ -4,7 +4,7 @@ # Written in 2023 by Alfonso Sabato Siciliano OUTPUT = bsddialog -export VERSION=1.0.4 +export VERSION=1.0.5 .CURDIR ?= ${CURDIR} LIBPATH = ${.CURDIR}/lib LIBBSDDIALOG = ${LIBPATH}/libbsddialog.so @@ -22,7 +22,15 @@ DEBUG ?= export ENABLEDEBUG=${DEBUG} ################### -all : ${OUTPUT} +all: ${OUTPUT} + +install: all + ${MAKE} -C ${LIBPATH} install + ${MAKE} -C ${UTILITYPATH} install + +uninstall: + ${MAKE} -C ${UTILITYPATH} uninstall + ${MAKE} -C ${LIBPATH} uninstall ${OUTPUT}: ${LIBBSDDIALOG} ${MAKE} -C ${UTILITYPATH} LIBPATH=${LIBPATH} @@ -36,3 +44,4 @@ clean: ${MAKE} -C ${UTILITYPATH} clean ${RM} ${OUTPUT} *.core +.PHONY: all install uninstall clean diff --git a/contrib/bsddialog/README.md b/contrib/bsddialog/README.md index 7b9b6cf8e84d..5a25109775fe 100644 --- a/contrib/bsddialog/README.md +++ b/contrib/bsddialog/README.md @@ -1,4 +1,4 @@ -# BSDDialog 1.0.4 +# BSDDialog 1.0.5 This project provides **bsddialog** and **libbsddialog**, an utility and a library to build scripts and tools with TUI dialogs and widgets. @@ -129,7 +129,6 @@ in the _Public Domain_ to build new projects: - implement global buttons handler. - doc: external tutorial, theming guide. - implement menutype.min\_on. - - improve refresh at startup, avoid dialog refresh before drawing text. - add debug API: bsddialog\_debug(y,x,refresh,"fmt",...). - add mouse support. - use alarm(2) for bsddialog\_pause. @@ -139,4 +138,4 @@ in the _Public Domain_ to build new projects: - fix --mixedform "" 0 0 0 Label 1 0 Init 1 12 0 0 2 (with 0 editable field). - add *text* customization to --hmsg *help-message* - check --passwordform *fieldlen* like --form and --mixedform. - + - add manuals to Makefiles installe and uninstall targets. diff --git a/contrib/bsddialog/examples_library/compile b/contrib/bsddialog/examples_library/compile index 9025f35426d9..1a68313090f6 100755 --- a/contrib/bsddialog/examples_library/compile +++ b/contrib/bsddialog/examples_library/compile @@ -8,14 +8,16 @@ # worldwide. This software is distributed without any warranty, see: # . +set -x + libpath=../lib examples="menu checklist radiolist mixedlist theme infobox yesno msgbox \ - datebox form timebox rangebox pause calendar gauge mixedgauge" +datebox form timebox rangebox pause calendar gauge mixedgauge textbox" rm -f $examples for e in $examples do - cc -g -Wall -Wextra -I$libpath ${e}.c -o $e -L$libpath -lbsddialog \ - -Wl,-rpath=$libpath + cc -g -Wall -Wextra -I$libpath ${e}.c -o $e \ + -Wl,-rpath=$libpath -L$libpath -lbsddialog done diff --git a/contrib/bsddialog/examples_library/textbox.c b/contrib/bsddialog/examples_library/textbox.c new file mode 100644 index 000000000000..2e76cbb97891 --- /dev/null +++ b/contrib/bsddialog/examples_library/textbox.c @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: CC0-1.0 + * + * Written in 2025 by Alfonso Sabato Siciliano. + * To the extent possible under law, the author has dedicated all copyright + * and related and neighboring rights to this software to the public domain + * worldwide. This software is distributed without any warranty, see: + * . + */ + +#include +#include + +int main() +{ + int output; + struct bsddialog_conf conf; + + if (bsddialog_init() == BSDDIALOG_ERROR) { + printf("Error: %s\n", bsddialog_geterror()); + return (1); + } + bsddialog_initconf(&conf); + conf.title = "textbox"; + output = bsddialog_textbox(&conf, "./textbox.c", 20, 80); + bsddialog_end(); + + switch (output) { + case BSDDIALOG_ERROR: + printf("Error %s\n", bsddialog_geterror()); + return (1); + case BSDDIALOG_OK: + printf("[Exit]\n"); + break; + } + + return (0); +} diff --git a/contrib/bsddialog/lib/GNUmakefile b/contrib/bsddialog/lib/GNUmakefile index 7c7a9bc25ee4..2cb060381a46 100644 --- a/contrib/bsddialog/lib/GNUmakefile +++ b/contrib/bsddialog/lib/GNUmakefile @@ -9,6 +9,7 @@ HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h SOURCES = barbox.c datebox.c formbox.c libbsddialog.c lib_util.c \ menubox.c messagebox.c textbox.c theme.c timebox.c OBJECTS = $(SOURCES:.c=.o) +PREFIX = /usr/local ifneq ($(ENABLEDEBUG),) CFLAGS += -g @@ -21,7 +22,21 @@ LIBFLAG = -shared RM = rm -f LN = ln -s -f -all : $(LIBRARY) +all: $(LIBRARY) + +install: all + ${INSTALL} -m 0644 bsddialog.h ${DESTDIR}${PREFIX}/include/bsddialog.h + ${INSTALL} -m 0644 bsddialog_progressview.h ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h + ${INSTALL} -m 0644 bsddialog_theme.h ${DESTDIR}${PREFIX}/include/bsddialog_theme.h + ${INSTALL} -m 0755 ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} + ${LN} ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} + +uninstall: + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog.h + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_theme.h + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} $(LIBRARY): $(OBJECTS) $(CC) $(LIBFLAG) $^ -o $(LIBRARY_SO).$(VERSION) $(LDFLAGS) @@ -32,3 +47,5 @@ $(LIBRARY): $(OBJECTS) clean: $(RM) $(LIBRARY_SO)* *.o *~ + +.PHONY: all install uninstall ${LIBRARY} clean diff --git a/contrib/bsddialog/lib/Makefile b/contrib/bsddialog/lib/Makefile index 252b33f79848..c728541a9f7a 100644 --- a/contrib/bsddialog/lib/Makefile +++ b/contrib/bsddialog/lib/Makefile @@ -10,6 +10,7 @@ HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h SOURCES = barbox.c datebox.c formbox.c libbsddialog.c lib_util.c \ menubox.c messagebox.c textbox.c theme.c timebox.c OBJECTS = ${SOURCES:.c=.o} +PREFIX = /usr/local .if defined(DEBUG) CFLAGS += -g @@ -23,7 +24,23 @@ LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \ LN = ln -s -f RM = rm -f -all : ${LIBRARY} +all: ${LIBRARY} + +install: all + ${INSTALL} -m 0644 bsddialog.h ${DESTDIR}${PREFIX}/include/bsddialog.h + ${INSTALL} -m 0644 bsddialog_progressview.h ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h + ${INSTALL} -m 0644 bsddialog_theme.h ${DESTDIR}${PREFIX}/include/bsddialog_theme.h + ${INSTALL} -m 0644 ${LIBRARY_A} ${DESTDIR}${PREFIX}/lib/${LIBRARY_A} + ${INSTALL} -m 0755 ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} + ${LN} ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} + +uninstall: + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog.h + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_theme.h + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_A} + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} ${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A} @@ -42,3 +59,5 @@ ${LIBRARY_A}: ${OBJECTS} clean: ${RM} ${LIBRARY_SO}* *.o *~ *.gz ${LIBRARY_A} + +.PHONY: all install uninstall ${LIBRARY} clean diff --git a/contrib/bsddialog/lib/barbox.c b/contrib/bsddialog/lib/barbox.c index 4feea20c6441..51f81ecbca68 100644 --- a/contrib/bsddialog/lib/barbox.c +++ b/contrib/bsddialog/lib/barbox.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -371,7 +371,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, unsigned int i, mainperc, totaltodo; float readforsec; const char **minilabels; - time_t tstart, told, tnew, refresh; + time_t tstart, told, tnew, trefresh; if ((minilabels = calloc(nminibar, sizeof(char*))) == NULL) RETURN_ERROR("Cannot allocate memory for minilabels"); @@ -385,7 +385,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, minipercs[i] = minibar[i].status; } - refresh = pvconf->refresh == 0 ? 0 : pvconf->refresh - 1; + trefresh = pvconf->refresh == 0 ? 0 : pvconf->refresh - 1; retval = BSDDIALOG_OK; i = 0; update = true; @@ -398,7 +398,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, mainperc = (bsddialog_total_progview * 100) / totaltodo; time(&tnew); - if (update || tnew > told + refresh) { + if (update || tnew > told + trefresh) { retval = do_mixedgauge(conf, text, rows, cols, mainperc, nminibar, minilabels, minipercs, true); if (retval == BSDDIALOG_ERROR) @@ -440,17 +440,18 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, return (retval); } -static int rangebox_redraw(struct dialog *d, struct bar *b, int *bigchange) +static int +rangebox_redraw(struct dialog *d, bool redraw, struct bar *b, int *bigchange) { - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } if (dialog_size_position(d, HBOX, MIN_WBOX, NULL) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate() in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, HBOX + HBUTTONS); @@ -490,7 +491,7 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, RETURN_ERROR("Cannot build WINDOW bar"); b.y = b.x = 1; b.fmt = "%d"; - if (rangebox_redraw(&d, &b, &bigchange) != 0) + if (rangebox_redraw(&d, false, &b, &bigchange) != 0) return (BSDDIALOG_ERROR); loop = true; @@ -568,12 +569,12 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (rangebox_redraw(&d, &b, &bigchange) != 0) + if (rangebox_redraw(&d, true, &b, &bigchange) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (rangebox_redraw(&d, &b, &bigchange) != 0) + if (rangebox_redraw(&d, true, &b, &bigchange) != 0) return (BSDDIALOG_ERROR); break; default: @@ -594,17 +595,17 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, return (retval); } -static int pause_redraw(struct dialog *d, struct bar *b) +static int pause_redraw(struct dialog *d, bool redraw, struct bar *b) { - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } if (dialog_size_position(d, HBOX, MIN_WBOX, NULL) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate() in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, HBOX + HBUTTONS); @@ -633,7 +634,7 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows, RETURN_ERROR("Cannot build WINDOW bar"); b.y = b.x = 1; b.fmt = "%d"; - if (pause_redraw(&d, &b) != 0) + if (pause_redraw(&d, false, &b) != 0) return (BSDDIALOG_ERROR); tout = *seconds; @@ -687,12 +688,12 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (pause_redraw(&d, &b) != 0) + if (pause_redraw(&d, true, &b) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (pause_redraw(&d, &b) != 0) + if (pause_redraw(&d, true, &b) != 0) return (BSDDIALOG_ERROR); break; default: diff --git a/contrib/bsddialog/lib/bsddialog.3 b/contrib/bsddialog/lib/bsddialog.3 index cbf1653a2aca..bbd756661a78 100644 --- a/contrib/bsddialog/lib/bsddialog.3 +++ b/contrib/bsddialog/lib/bsddialog.3 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2021-2024 Alfonso Sabato Siciliano +.\" Copyright (c) 2021-2025 Alfonso Sabato Siciliano .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,11 +22,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 16, 2024 +.Dd June 22, 2025 .Dt BSDDIALOG 3 .Os .Sh NAME .Nm bsddialog_backtitle , +.Nm bsddialog_backtitle_rf , .Nm bsddialog_calendar , .Nm bsddialog_clear , .Nm bsddialog_color , @@ -65,6 +66,8 @@ .Ft int .Fn bsddialog_backtitle "struct bsddialog_conf *conf" "const char *backtitle" .Ft int +.Fn bsddialog_backtitle_rf "struct bsddialog_conf *conf" "const char *backtitle" +.Ft int .Fo bsddialog_calendar .Fa "struct bsddialog_conf *conf" .Fa "const char *text" @@ -292,7 +295,7 @@ and before .Dv false otherwise. .Pp -.Fn bsddialog_backtitle +.Fn bsddialog_backtitle_rf prints .Fa backtitle on the top of the screen. @@ -302,6 +305,11 @@ and .Fa conf.no_lines described later. .Pp +.Fn bsddialog_backtitle +is like +.Fn bsddialog_backtitle_rf +but it does not update the screen, using if a dialog is built later. +.Pp .Fn bsddialog_error returns a string to describe the last error. The function should be called after a @@ -902,7 +910,7 @@ provides a dialog for a the labels on buttons are .Dq Yes and -.Dq No . +.Dq &No . .Ss Keys .Bl -tag -width Ds .It Ctrl-l diff --git a/contrib/bsddialog/lib/bsddialog.h b/contrib/bsddialog/lib/bsddialog.h index fd0e2bc02580..fc59071c6fa0 100644 --- a/contrib/bsddialog/lib/bsddialog.h +++ b/contrib/bsddialog/lib/bsddialog.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ #include -#define LIBBSDDIALOG_VERSION "1.0.4" +#define LIBBSDDIALOG_VERSION "1.0.5" /* Return values */ #define BSDDIALOG_ERROR -1 @@ -179,6 +179,7 @@ int bsddialog_init_notheme(void); bool bsddialog_inmode(void); int bsddialog_end(void); int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle); +int bsddialog_backtitle_rf(struct bsddialog_conf *conf, const char *backtitle); int bsddialog_initconf(struct bsddialog_conf *conf); void bsddialog_clear(unsigned int y); void bsddialog_refresh(void); diff --git a/contrib/bsddialog/lib/bsddialog_theme.h b/contrib/bsddialog/lib/bsddialog_theme.h index 2071896b61f0..77938c65b6ce 100644 --- a/contrib/bsddialog/lib/bsddialog_theme.h +++ b/contrib/bsddialog/lib/bsddialog_theme.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/contrib/bsddialog/lib/datebox.c b/contrib/bsddialog/lib/datebox.c index ee955471799e..66f36f5f4a99 100644 --- a/contrib/bsddialog/lib/datebox.c +++ b/contrib/bsddialog/lib/datebox.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2022-2024 Alfonso Sabato Siciliano + * Copyright (c) 2022-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -296,20 +296,20 @@ print_calendar(struct bsddialog_conf *conf, WINDOW *win, int yy, int mm, int dd, } static int -calendar_redraw(struct dialog *d, WINDOW *yy_win, WINDOW *mm_win, +calendar_draw(struct dialog *d, bool redraw, WINDOW *yy_win, WINDOW *mm_win, WINDOW *dd_win) { int ycal, xcal; - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } if (dialog_size_position(d, MINHCAL, MINWCAL, NULL) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, MINHCAL + HBUTTONS); @@ -354,7 +354,7 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, if ((dd_win = newwin(1, 1, 1, 1)) == NULL) RETURN_ERROR("Cannot build WINDOW for dd"); wbkgd(dd_win, t.dialog.color); - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) + if (calendar_draw(&d, false, yy_win, mm_win, dd_win) != 0) return (BSDDIALOG_ERROR); sel = -1; @@ -503,12 +503,12 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) + if (calendar_draw(&d, true, yy_win, mm_win, dd_win) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) + if (calendar_draw(&d, true, yy_win, mm_win, dd_win) != 0) return (BSDDIALOG_ERROR); break; default: @@ -533,11 +533,11 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, return (retval); } -static int datebox_redraw(struct dialog *d, struct dateitem *di) +static int datebox_draw(struct dialog *d, bool redraw, struct dateitem *di) { int y, x; - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } @@ -545,7 +545,7 @@ static int datebox_redraw(struct dialog *d, struct dateitem *di) return (BSDDIALOG_ERROR); if (draw_dialog(d) != 0) return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, 3 /*windows*/ + HBUTTONS); @@ -624,7 +624,7 @@ bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows, set_buttons(&d, true, OK_LABEL, CANCEL_LABEL); if (build_dateitem(conf->date.format, &yy, &mm, &dd, di) != 0) return (BSDDIALOG_ERROR); - if (datebox_redraw(&d, di) != 0) + if (datebox_draw(&d, false, di) != 0) return (BSDDIALOG_ERROR); sel = -1; @@ -716,12 +716,12 @@ bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (datebox_redraw(&d, di) != 0) + if (datebox_draw(&d, true, di) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (datebox_redraw(&d, di) != 0) + if (datebox_draw(&d, true, di) != 0) return (BSDDIALOG_ERROR); break; default: diff --git a/contrib/bsddialog/lib/formbox.c b/contrib/bsddialog/lib/formbox.c index ca473356e350..a072461c43e1 100644 --- a/contrib/bsddialog/lib/formbox.c +++ b/contrib/bsddialog/lib/formbox.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -601,11 +601,11 @@ static int form_size_position(struct dialog *d, struct privateform *f) } static int -form_redraw(struct dialog *d, struct privateform *f, bool focusinform) +form_draw(struct dialog *d, bool redraw, struct privateform *f, bool focusinform) { unsigned int i; - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } @@ -613,9 +613,9 @@ form_redraw(struct dialog *d, struct privateform *f, bool focusinform) f->w = f->wmin; if (form_size_position(d, f) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate() in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, 2 /* box borders */ + f->viewrows + HBUTTONS); @@ -707,7 +707,7 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, } form.formheight = formheight; - if (form_redraw(&d, &form, focusinform) != 0) + if (form_draw(&d, false, &form, focusinform) != 0) return (BSDDIALOG_ERROR); changeitem = switchfocus = false; @@ -719,10 +719,16 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, switch(input) { case KEY_ENTER: case 10: /* Enter */ - if (focusinform && conf->button.always_active == false) - break; - retval = BUTTONVALUE(d.bs); - loop = false; + if (focusinform && conf->button.always_active == false) { + next = nextitem(form.nitems, form.pritems, form.sel); + if (next > form.sel) + changeitem = true; /* needs next */ + else + switchfocus = true; + } else { + retval = BUTTONVALUE(d.bs); + loop = false; + } break; case 27: /* Esc */ if (conf->key.enable_esc) { @@ -732,7 +738,12 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, break; case '\t': /* TAB */ if (focusinform) { - switchfocus = true; + next = nextitem(form.nitems, form.pritems, + form.sel); + if (next > form.sel) + changeitem = true; /* needs next */ + else + switchfocus = true; } else { if (d.bs.curr + 1 < (int)d.bs.nbuttons) { d.bs.curr++; @@ -839,12 +850,12 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, retval = BSDDIALOG_ERROR; loop = false; } - if (form_redraw(&d, &form, focusinform) != 0) + if (form_draw(&d, true, &form, focusinform) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (form_redraw(&d, &form, focusinform) != 0) + if (form_draw(&d, true, &form, focusinform) != 0) return (BSDDIALOG_ERROR); break; default: @@ -884,11 +895,20 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, conf->button.always_active || !focusinform, !focusinform); wnoutrefresh(d.widget); - DRAWITEM_TRICK(&form, form.sel, focusinform); + if (focusinform == false) + DRAWITEM_TRICK(&form, form.sel, false); + else { + next = firstitem(form.nitems, form.pritems); + if (next == form.sel) + DRAWITEM_TRICK(&form, form.sel, true); + else + changeitem = true; + } switchfocus = false; } if (changeitem) { + /* useless after if(switchfocus) */ DRAWITEM_TRICK(&form, form.sel, false); form.sel = next; item = &form.pritems[form.sel]; diff --git a/contrib/bsddialog/lib/lib_util.c b/contrib/bsddialog/lib/lib_util.c index d673a1a74d72..f042a2832eb9 100644 --- a/contrib/bsddialog/lib/lib_util.c +++ b/contrib/bsddialog/lib/lib_util.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,6 +25,7 @@ * SUCH DAMAGE. */ +#include #include #include #include diff --git a/contrib/bsddialog/lib/lib_util.h b/contrib/bsddialog/lib/lib_util.h index 526f65b4bfaa..1adc34f3b80a 100644 --- a/contrib/bsddialog/lib/lib_util.h +++ b/contrib/bsddialog/lib/lib_util.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -62,7 +62,7 @@ extern bool hastermcolors; RETURN_ERROR("*" #p " is NULL"); \ } while (0) #define CHECK_ARRAY(nitem, a) do { \ - if (nitem > 0 && a == NULL) \ + if (nitem > 0 && a == NULL) \ RETURN_FMTERROR(#nitem " is %d but *" #a " is NULL", nitem); \ } while (0) /* widget utils */ diff --git a/contrib/bsddialog/lib/libbsddialog.c b/contrib/bsddialog/lib/libbsddialog.c index 555d060ebcbd..cdb5e1e251dc 100644 --- a/contrib/bsddialog/lib/libbsddialog.c +++ b/contrib/bsddialog/lib/libbsddialog.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -114,11 +114,21 @@ int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle) mvhline_set(1, 1, WACS_HLINE, SCREENCOLS - 2); } - refresh(); + wnoutrefresh(stdscr); return (BSDDIALOG_OK); } +int bsddialog_backtitle_rf(struct bsddialog_conf *conf, const char *backtitle) +{ + int rv; + + rv = bsddialog_backtitle(conf, backtitle); + doupdate(); + + return (rv); +} + bool bsddialog_inmode(void) { return (in_bsddialog_mode); diff --git a/contrib/bsddialog/lib/menubox.c b/contrib/bsddialog/lib/menubox.c index 896306b2881d..e6e2e7e3e63e 100644 --- a/contrib/bsddialog/lib/menubox.c +++ b/contrib/bsddialog/lib/menubox.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -391,7 +391,7 @@ drawitem(struct bsddialog_conf *conf, struct privatemenu *m, int y, bool focus) attron(t.menu.bottomdesccolor); addstr(pritem->bottomdesc); attroff(t.menu.bottomdesccolor); - refresh(); + wnoutrefresh(stdscr); } } } @@ -454,18 +454,18 @@ static int menu_size_position(struct dialog *d, struct privatemenu *m) return (0); } -static int mixedlist_redraw(struct dialog *d, struct privatemenu *m) +static int mixedlist_draw(struct dialog *d, bool redraw, struct privatemenu *m) { - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } m->menurows = m->apimenurows; if (menu_size_position(d, m) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate() in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, 2/*bmenu*/ + m->menurows + HBUTTONS); @@ -532,7 +532,7 @@ do_mixedlist(struct bsddialog_conf *conf, const char *text, int rows, int cols, drawitem(d.conf, &m, m.sel, true); m.ypad = 0; m.apimenurows = menurows; - if (mixedlist_redraw(&d, &m) != 0) + if (mixedlist_draw(&d, false, &m) != 0) return (BSDDIALOG_ERROR); changeitem = false; @@ -575,12 +575,12 @@ do_mixedlist(struct bsddialog_conf *conf, const char *text, int rows, int cols, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (mixedlist_redraw(&d, &m) != 0) + if (mixedlist_draw(&d, true, &m) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (mixedlist_redraw(&d, &m) != 0) *** 608 LINES SKIPPED *** From nobody Tue Nov 4 18:31:38 2025 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 4d1H962GFBz658Pf; Tue, 04 Nov 2025 18:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1H961x5gz3t1Q; Tue, 04 Nov 2025 18:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762281098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6zi4UPRIIaJn7aKCFOpFuu0vfcATjUeXkIOAATk4G8=; b=owgRGzM1HtZX+XPBIZbvcQNVW3jVj5wUXnqiWr6NSMYeGRiQBpZOXphwM7aGA4SHG13Eu4 lbrMM5jmLB4vuUu0nXH4ico4cmlh4AIzIzA9LHEX1AOlrQu+DiVZwEGeCCWRXyHigOZ2Fl XrV8lNI5eVDFF08jfW6LR2CWR7Stb1L8FveJFUVbQH2ouOKIuq0DMcoXGUgOrmmtCGNtb4 1dCBlwEHQi1J5efw54RFQaJrph6Ik2qvEdiuR01NruqPWmFk8zdD5Cwh8woBdN7+ZXRrLq aS6EnSh2s8wnBYpq6vgI9pCk45rU+4Dmjtv6SK4xUhNUVMUWKV7G0w6R5SkWNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762281098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6zi4UPRIIaJn7aKCFOpFuu0vfcATjUeXkIOAATk4G8=; b=oZL6ABucPmmilprvs1jLl4diaWxJZCdqJ6InXv2oKfc0o7JIqhQdV0v/Mm9CBcazc+68rJ rNb2fD0hah8FzcwYUcIYsT4xMoQ29kWZPQohQgfjhMb/h6+/uFH3laaunWumq7CCS/Q6QG vTUa4Prc2z01lsc56Gc+tc7CPfhRXWQTtRGEZbM8ek+owYGJyhmKePeHHrNWuS0BzPXben QDav717pnJqjptsOwpz6hYi1eB4KyzlqrlZMN7ISJM/Hjw9PE4lKr/kko4ePJAQ/3JpIog aAqdJMiU+YdLpdD9ZJnHZ365Avlvkb6N665n06xlK+Iz1I7Tfkl0CM4lj46AMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762281098; a=rsa-sha256; cv=none; b=vdL3AJixWU37eqBEODCwHT2UXhpVyf1Y+0p2pyUKuIj4fVLRZPb+GU5ctBWZBkS4RxU2OL 60BW+3EdcKn994LvcV+KMYvV5WgsOSfxw+zJX5g2Ip+j/Nvi3qexvwnjUy5O5noNrTbk9X WPvza0p71mKBHfTJIx7ESQp+td3aM2jZZa3O9J3S0z8BYkPVeDr8trIqTVzSjGuVqSPXlK +nWDCsMl3nu1vKE8cOh1GasLJCI6p08jyEAaXAYLM0NwFeXhyNAtmuB60ANXSsVuhJwGpb mInMLKAUbnYMCEadFmoeolq48cBqdUkeOjwBwSI1E4oYJBxanwwYHxd12UcI6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1H961TBhz17nX; Tue, 04 Nov 2025 18:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4IVclJ050153; Tue, 4 Nov 2025 18:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4IVcwP050150; Tue, 4 Nov 2025 18:31:38 GMT (envelope-from git) Date: Tue, 4 Nov 2025 18:31:38 GMT Message-Id: <202511041831.5A4IVcwP050150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 0595e10ec773 - releng/15.0 - contrib/bsddialog: Import version 1.0.5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0595e10ec77383a3038c45fbd9fcdb6922c971fe Auto-Submitted: auto-generated The branch releng/15.0 has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=0595e10ec77383a3038c45fbd9fcdb6922c971fe commit 0595e10ec77383a3038c45fbd9fcdb6922c971fe Author: Alfonso S. Siciliano AuthorDate: 2025-10-09 15:39:10 +0000 Commit: Alfonso S. Siciliano CommitDate: 2025-11-04 18:30:32 +0000 contrib/bsddialog: Import version 1.0.5 Version for change and feature requests. * Improve documentation for --alternate-screen and --normal-screen. Request: https://bugs.freebsd.org/285459. (This PR is not about bsddialog itself but is used as an example for an official FreeBSD documentation request.) * Reduce the number of screen refreshes to improve performance over a 115200 UART connection. Request: https://gitlab.com/alfix/bsddialog/-/issues/8. * Change textbox buttons to return distinct values (previously always returned OK). Request: https://reviews.freebsd.org/D48668; already committed in contrib/ 96a241a35905078bdc5d20bf25943cdb67758dea * Change forms navigation key behavior for ENTER and TAB. Request: https://bugs.freebsd.org/287592. Refer to /usr/src/contrib/bsddialog/CHANGELOG to know more. PR: 287592 Reported by: adrian Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation Merge commit '653f765f05b8c7e3908ae92e9bf61522a50cefc9' into YYY (cherry picked from commit 3e42d7194bdcd4fbfd781518258f919d6ac803d3) (cherry picked from commit aa2fe36f5e4b3b907af2ea94945ae9cab7263d0c) --- contrib/bsddialog/.gitignore | 1 + contrib/bsddialog/CHANGELOG | 50 ++++++++++++++++++++- contrib/bsddialog/LICENSE | 2 +- contrib/bsddialog/Makefile | 13 +++++- contrib/bsddialog/README.md | 5 +-- contrib/bsddialog/examples_library/compile | 8 ++-- contrib/bsddialog/examples_library/textbox.c | 38 ++++++++++++++++ contrib/bsddialog/lib/GNUmakefile | 19 +++++++- contrib/bsddialog/lib/Makefile | 21 ++++++++- contrib/bsddialog/lib/barbox.c | 37 ++++++++-------- contrib/bsddialog/lib/bsddialog.3 | 16 +++++-- contrib/bsddialog/lib/bsddialog.h | 5 ++- contrib/bsddialog/lib/bsddialog_theme.h | 2 +- contrib/bsddialog/lib/datebox.c | 28 ++++++------ contrib/bsddialog/lib/formbox.c | 48 ++++++++++++++------ contrib/bsddialog/lib/lib_util.c | 3 +- contrib/bsddialog/lib/lib_util.h | 4 +- contrib/bsddialog/lib/libbsddialog.c | 14 +++++- contrib/bsddialog/lib/menubox.c | 18 ++++---- contrib/bsddialog/lib/messagebox.c | 16 +++---- contrib/bsddialog/lib/textbox.c | 16 +++---- contrib/bsddialog/lib/theme.c | 6 +-- contrib/bsddialog/lib/timebox.c | 16 +++---- contrib/bsddialog/utility/GNUmakefile | 11 ++++- contrib/bsddialog/utility/Makefile | 11 ++++- contrib/bsddialog/utility/bsddialog.1 | 21 ++++++--- contrib/bsddialog/utility/bsddialog.c | 2 +- contrib/bsddialog/utility/util.h | 2 +- contrib/bsddialog/utility/util_builders.c | 66 ++++++++++++++-------------- contrib/bsddialog/utility/util_cli.c | 2 +- contrib/bsddialog/utility/util_theme.c | 4 +- 31 files changed, 353 insertions(+), 152 deletions(-) diff --git a/contrib/bsddialog/.gitignore b/contrib/bsddialog/.gitignore index c8fc68ed8a0e..c9613d477f7f 100644 --- a/contrib/bsddialog/.gitignore +++ b/contrib/bsddialog/.gitignore @@ -21,6 +21,7 @@ examples_library/msgbox examples_library/pause examples_library/radiolist examples_library/rangebox +examples_library/textbox examples_library/theme examples_library/timebox examples_library/yesno diff --git a/contrib/bsddialog/CHANGELOG b/contrib/bsddialog/CHANGELOG index a4cf4d01c077..7800098644d7 100644 --- a/contrib/bsddialog/CHANGELOG +++ b/contrib/bsddialog/CHANGELOG @@ -1,11 +1,57 @@ -2024-07-01 1.0.4 +2025-06-22 Version 1.0.5 + + Manual: + * fix: "User-friendly documentation for alternate screen" + https://bugs.freebsd.org/285459. + Improve bsddialog.1: --alternate-screen and --normal-screen. + + NetBSD (tested on amd64) refactoring, no function changes: + * https://gitlab.com/alfix/bsddialog/-/merge_requests/4 + lib: include in lib_util.c. + * https://gitlab.com/alfix/bsddialog/-/merge_requests/5 + a call to curses' refresh() is performed, while a local + variable is also called refresh. + * Makefiles: add install and uninstall targets (both GND and BSD) + https://gitlab.com/alfix/bsddialog/-/merge_requests/3 + + MacOS (tested on amd64) refactoring, no function changes: + * https://gitlab.com/alfix/bsddialog/-/merge_requests/6 + utility: replace u_int with unsigned int. + + Library: + * fix: useless refreshes, https://gitlab.com/alfix/bsddialog/-/issues/8: + "It takes lot of time when running over a 115200 UART". + Not fixed for bsddialog_gauge() because it has to be rewritten. + * change: bsddialog_backtitle() does not update the screen so the + backtitle is not printed. To use if a dialog is built later. + Rationale: see "115200 UART" problem above. + * add: bsddialog_backtitle_rf() to print a top title refreshing the + screen like bsddialog_backtitle() was previously. + * change: forms, ENTER is also a navigation keys in forms fields. + Request: https://bugs.freebsd.org/287592 + If conf.button.always_active is true the form is closes immediatly. + + Library and implicitly utility: + * fix: textbox buttons returned values (was always OK). + Thanks to https://reviews.freebsd.org/D48668. + * change: TAB is a navigation keys in forms. Previously it directly + switched form-fields <-> buttons. + Request: https://bugs.freebsd.org/287592 + + Utility: + * change: forms, ENTER is a also navigation keys in forms fields. + Previously it directly closed the form except with --switch-buttons + Request: https://bugs.freebsd.org/287592 + + +2024-07-01 Version 1.0.4 Utility internal refactoring (no functional change): * change: rename an internal constant to avoid a future conflict because FreeBSD is changing headers files for _FORTIFY_SOURCE. Reported and fixed by Kyle Evans. -2024-05-27 1.0.3 +2024-05-27 Version 1.0.3 Utility: change: --form and --mixedform do not print field value to output fd if diff --git a/contrib/bsddialog/LICENSE b/contrib/bsddialog/LICENSE index 7b36a8dce42e..9ea4a4a62f4b 100644 --- a/contrib/bsddialog/LICENSE +++ b/contrib/bsddialog/LICENSE @@ -1,6 +1,6 @@ BSD 2-Clause License -Copyright (c) 2021-2024, Alfonso Sabato Siciliano +Copyright (c) 2021-2025, Alfonso Sabato Siciliano Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/contrib/bsddialog/Makefile b/contrib/bsddialog/Makefile index a6af8813a48e..335b693470e6 100644 --- a/contrib/bsddialog/Makefile +++ b/contrib/bsddialog/Makefile @@ -4,7 +4,7 @@ # Written in 2023 by Alfonso Sabato Siciliano OUTPUT = bsddialog -export VERSION=1.0.4 +export VERSION=1.0.5 .CURDIR ?= ${CURDIR} LIBPATH = ${.CURDIR}/lib LIBBSDDIALOG = ${LIBPATH}/libbsddialog.so @@ -22,7 +22,15 @@ DEBUG ?= export ENABLEDEBUG=${DEBUG} ################### -all : ${OUTPUT} +all: ${OUTPUT} + +install: all + ${MAKE} -C ${LIBPATH} install + ${MAKE} -C ${UTILITYPATH} install + +uninstall: + ${MAKE} -C ${UTILITYPATH} uninstall + ${MAKE} -C ${LIBPATH} uninstall ${OUTPUT}: ${LIBBSDDIALOG} ${MAKE} -C ${UTILITYPATH} LIBPATH=${LIBPATH} @@ -36,3 +44,4 @@ clean: ${MAKE} -C ${UTILITYPATH} clean ${RM} ${OUTPUT} *.core +.PHONY: all install uninstall clean diff --git a/contrib/bsddialog/README.md b/contrib/bsddialog/README.md index 7b9b6cf8e84d..5a25109775fe 100644 --- a/contrib/bsddialog/README.md +++ b/contrib/bsddialog/README.md @@ -1,4 +1,4 @@ -# BSDDialog 1.0.4 +# BSDDialog 1.0.5 This project provides **bsddialog** and **libbsddialog**, an utility and a library to build scripts and tools with TUI dialogs and widgets. @@ -129,7 +129,6 @@ in the _Public Domain_ to build new projects: - implement global buttons handler. - doc: external tutorial, theming guide. - implement menutype.min\_on. - - improve refresh at startup, avoid dialog refresh before drawing text. - add debug API: bsddialog\_debug(y,x,refresh,"fmt",...). - add mouse support. - use alarm(2) for bsddialog\_pause. @@ -139,4 +138,4 @@ in the _Public Domain_ to build new projects: - fix --mixedform "" 0 0 0 Label 1 0 Init 1 12 0 0 2 (with 0 editable field). - add *text* customization to --hmsg *help-message* - check --passwordform *fieldlen* like --form and --mixedform. - + - add manuals to Makefiles installe and uninstall targets. diff --git a/contrib/bsddialog/examples_library/compile b/contrib/bsddialog/examples_library/compile index 9025f35426d9..1a68313090f6 100755 --- a/contrib/bsddialog/examples_library/compile +++ b/contrib/bsddialog/examples_library/compile @@ -8,14 +8,16 @@ # worldwide. This software is distributed without any warranty, see: # . +set -x + libpath=../lib examples="menu checklist radiolist mixedlist theme infobox yesno msgbox \ - datebox form timebox rangebox pause calendar gauge mixedgauge" +datebox form timebox rangebox pause calendar gauge mixedgauge textbox" rm -f $examples for e in $examples do - cc -g -Wall -Wextra -I$libpath ${e}.c -o $e -L$libpath -lbsddialog \ - -Wl,-rpath=$libpath + cc -g -Wall -Wextra -I$libpath ${e}.c -o $e \ + -Wl,-rpath=$libpath -L$libpath -lbsddialog done diff --git a/contrib/bsddialog/examples_library/textbox.c b/contrib/bsddialog/examples_library/textbox.c new file mode 100644 index 000000000000..2e76cbb97891 --- /dev/null +++ b/contrib/bsddialog/examples_library/textbox.c @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: CC0-1.0 + * + * Written in 2025 by Alfonso Sabato Siciliano. + * To the extent possible under law, the author has dedicated all copyright + * and related and neighboring rights to this software to the public domain + * worldwide. This software is distributed without any warranty, see: + * . + */ + +#include +#include + +int main() +{ + int output; + struct bsddialog_conf conf; + + if (bsddialog_init() == BSDDIALOG_ERROR) { + printf("Error: %s\n", bsddialog_geterror()); + return (1); + } + bsddialog_initconf(&conf); + conf.title = "textbox"; + output = bsddialog_textbox(&conf, "./textbox.c", 20, 80); + bsddialog_end(); + + switch (output) { + case BSDDIALOG_ERROR: + printf("Error %s\n", bsddialog_geterror()); + return (1); + case BSDDIALOG_OK: + printf("[Exit]\n"); + break; + } + + return (0); +} diff --git a/contrib/bsddialog/lib/GNUmakefile b/contrib/bsddialog/lib/GNUmakefile index 7c7a9bc25ee4..2cb060381a46 100644 --- a/contrib/bsddialog/lib/GNUmakefile +++ b/contrib/bsddialog/lib/GNUmakefile @@ -9,6 +9,7 @@ HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h SOURCES = barbox.c datebox.c formbox.c libbsddialog.c lib_util.c \ menubox.c messagebox.c textbox.c theme.c timebox.c OBJECTS = $(SOURCES:.c=.o) +PREFIX = /usr/local ifneq ($(ENABLEDEBUG),) CFLAGS += -g @@ -21,7 +22,21 @@ LIBFLAG = -shared RM = rm -f LN = ln -s -f -all : $(LIBRARY) +all: $(LIBRARY) + +install: all + ${INSTALL} -m 0644 bsddialog.h ${DESTDIR}${PREFIX}/include/bsddialog.h + ${INSTALL} -m 0644 bsddialog_progressview.h ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h + ${INSTALL} -m 0644 bsddialog_theme.h ${DESTDIR}${PREFIX}/include/bsddialog_theme.h + ${INSTALL} -m 0755 ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} + ${LN} ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} + +uninstall: + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog.h + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_theme.h + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} $(LIBRARY): $(OBJECTS) $(CC) $(LIBFLAG) $^ -o $(LIBRARY_SO).$(VERSION) $(LDFLAGS) @@ -32,3 +47,5 @@ $(LIBRARY): $(OBJECTS) clean: $(RM) $(LIBRARY_SO)* *.o *~ + +.PHONY: all install uninstall ${LIBRARY} clean diff --git a/contrib/bsddialog/lib/Makefile b/contrib/bsddialog/lib/Makefile index 252b33f79848..c728541a9f7a 100644 --- a/contrib/bsddialog/lib/Makefile +++ b/contrib/bsddialog/lib/Makefile @@ -10,6 +10,7 @@ HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h SOURCES = barbox.c datebox.c formbox.c libbsddialog.c lib_util.c \ menubox.c messagebox.c textbox.c theme.c timebox.c OBJECTS = ${SOURCES:.c=.o} +PREFIX = /usr/local .if defined(DEBUG) CFLAGS += -g @@ -23,7 +24,23 @@ LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \ LN = ln -s -f RM = rm -f -all : ${LIBRARY} +all: ${LIBRARY} + +install: all + ${INSTALL} -m 0644 bsddialog.h ${DESTDIR}${PREFIX}/include/bsddialog.h + ${INSTALL} -m 0644 bsddialog_progressview.h ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h + ${INSTALL} -m 0644 bsddialog_theme.h ${DESTDIR}${PREFIX}/include/bsddialog_theme.h + ${INSTALL} -m 0644 ${LIBRARY_A} ${DESTDIR}${PREFIX}/lib/${LIBRARY_A} + ${INSTALL} -m 0755 ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} + ${LN} ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} + +uninstall: + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog.h + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_theme.h + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_A} + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} ${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A} @@ -42,3 +59,5 @@ ${LIBRARY_A}: ${OBJECTS} clean: ${RM} ${LIBRARY_SO}* *.o *~ *.gz ${LIBRARY_A} + +.PHONY: all install uninstall ${LIBRARY} clean diff --git a/contrib/bsddialog/lib/barbox.c b/contrib/bsddialog/lib/barbox.c index 4feea20c6441..51f81ecbca68 100644 --- a/contrib/bsddialog/lib/barbox.c +++ b/contrib/bsddialog/lib/barbox.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -371,7 +371,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, unsigned int i, mainperc, totaltodo; float readforsec; const char **minilabels; - time_t tstart, told, tnew, refresh; + time_t tstart, told, tnew, trefresh; if ((minilabels = calloc(nminibar, sizeof(char*))) == NULL) RETURN_ERROR("Cannot allocate memory for minilabels"); @@ -385,7 +385,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, minipercs[i] = minibar[i].status; } - refresh = pvconf->refresh == 0 ? 0 : pvconf->refresh - 1; + trefresh = pvconf->refresh == 0 ? 0 : pvconf->refresh - 1; retval = BSDDIALOG_OK; i = 0; update = true; @@ -398,7 +398,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, mainperc = (bsddialog_total_progview * 100) / totaltodo; time(&tnew); - if (update || tnew > told + refresh) { + if (update || tnew > told + trefresh) { retval = do_mixedgauge(conf, text, rows, cols, mainperc, nminibar, minilabels, minipercs, true); if (retval == BSDDIALOG_ERROR) @@ -440,17 +440,18 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, return (retval); } -static int rangebox_redraw(struct dialog *d, struct bar *b, int *bigchange) +static int +rangebox_redraw(struct dialog *d, bool redraw, struct bar *b, int *bigchange) { - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } if (dialog_size_position(d, HBOX, MIN_WBOX, NULL) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate() in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, HBOX + HBUTTONS); @@ -490,7 +491,7 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, RETURN_ERROR("Cannot build WINDOW bar"); b.y = b.x = 1; b.fmt = "%d"; - if (rangebox_redraw(&d, &b, &bigchange) != 0) + if (rangebox_redraw(&d, false, &b, &bigchange) != 0) return (BSDDIALOG_ERROR); loop = true; @@ -568,12 +569,12 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (rangebox_redraw(&d, &b, &bigchange) != 0) + if (rangebox_redraw(&d, true, &b, &bigchange) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (rangebox_redraw(&d, &b, &bigchange) != 0) + if (rangebox_redraw(&d, true, &b, &bigchange) != 0) return (BSDDIALOG_ERROR); break; default: @@ -594,17 +595,17 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, return (retval); } -static int pause_redraw(struct dialog *d, struct bar *b) +static int pause_redraw(struct dialog *d, bool redraw, struct bar *b) { - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } if (dialog_size_position(d, HBOX, MIN_WBOX, NULL) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate() in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, HBOX + HBUTTONS); @@ -633,7 +634,7 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows, RETURN_ERROR("Cannot build WINDOW bar"); b.y = b.x = 1; b.fmt = "%d"; - if (pause_redraw(&d, &b) != 0) + if (pause_redraw(&d, false, &b) != 0) return (BSDDIALOG_ERROR); tout = *seconds; @@ -687,12 +688,12 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (pause_redraw(&d, &b) != 0) + if (pause_redraw(&d, true, &b) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (pause_redraw(&d, &b) != 0) + if (pause_redraw(&d, true, &b) != 0) return (BSDDIALOG_ERROR); break; default: diff --git a/contrib/bsddialog/lib/bsddialog.3 b/contrib/bsddialog/lib/bsddialog.3 index cbf1653a2aca..bbd756661a78 100644 --- a/contrib/bsddialog/lib/bsddialog.3 +++ b/contrib/bsddialog/lib/bsddialog.3 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2021-2024 Alfonso Sabato Siciliano +.\" Copyright (c) 2021-2025 Alfonso Sabato Siciliano .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,11 +22,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 16, 2024 +.Dd June 22, 2025 .Dt BSDDIALOG 3 .Os .Sh NAME .Nm bsddialog_backtitle , +.Nm bsddialog_backtitle_rf , .Nm bsddialog_calendar , .Nm bsddialog_clear , .Nm bsddialog_color , @@ -65,6 +66,8 @@ .Ft int .Fn bsddialog_backtitle "struct bsddialog_conf *conf" "const char *backtitle" .Ft int +.Fn bsddialog_backtitle_rf "struct bsddialog_conf *conf" "const char *backtitle" +.Ft int .Fo bsddialog_calendar .Fa "struct bsddialog_conf *conf" .Fa "const char *text" @@ -292,7 +295,7 @@ and before .Dv false otherwise. .Pp -.Fn bsddialog_backtitle +.Fn bsddialog_backtitle_rf prints .Fa backtitle on the top of the screen. @@ -302,6 +305,11 @@ and .Fa conf.no_lines described later. .Pp +.Fn bsddialog_backtitle +is like +.Fn bsddialog_backtitle_rf +but it does not update the screen, using if a dialog is built later. +.Pp .Fn bsddialog_error returns a string to describe the last error. The function should be called after a @@ -902,7 +910,7 @@ provides a dialog for a the labels on buttons are .Dq Yes and -.Dq No . +.Dq &No . .Ss Keys .Bl -tag -width Ds .It Ctrl-l diff --git a/contrib/bsddialog/lib/bsddialog.h b/contrib/bsddialog/lib/bsddialog.h index fd0e2bc02580..fc59071c6fa0 100644 --- a/contrib/bsddialog/lib/bsddialog.h +++ b/contrib/bsddialog/lib/bsddialog.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ #include -#define LIBBSDDIALOG_VERSION "1.0.4" +#define LIBBSDDIALOG_VERSION "1.0.5" /* Return values */ #define BSDDIALOG_ERROR -1 @@ -179,6 +179,7 @@ int bsddialog_init_notheme(void); bool bsddialog_inmode(void); int bsddialog_end(void); int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle); +int bsddialog_backtitle_rf(struct bsddialog_conf *conf, const char *backtitle); int bsddialog_initconf(struct bsddialog_conf *conf); void bsddialog_clear(unsigned int y); void bsddialog_refresh(void); diff --git a/contrib/bsddialog/lib/bsddialog_theme.h b/contrib/bsddialog/lib/bsddialog_theme.h index 2071896b61f0..77938c65b6ce 100644 --- a/contrib/bsddialog/lib/bsddialog_theme.h +++ b/contrib/bsddialog/lib/bsddialog_theme.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/contrib/bsddialog/lib/datebox.c b/contrib/bsddialog/lib/datebox.c index ee955471799e..66f36f5f4a99 100644 --- a/contrib/bsddialog/lib/datebox.c +++ b/contrib/bsddialog/lib/datebox.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2022-2024 Alfonso Sabato Siciliano + * Copyright (c) 2022-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -296,20 +296,20 @@ print_calendar(struct bsddialog_conf *conf, WINDOW *win, int yy, int mm, int dd, } static int -calendar_redraw(struct dialog *d, WINDOW *yy_win, WINDOW *mm_win, +calendar_draw(struct dialog *d, bool redraw, WINDOW *yy_win, WINDOW *mm_win, WINDOW *dd_win) { int ycal, xcal; - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } if (dialog_size_position(d, MINHCAL, MINWCAL, NULL) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, MINHCAL + HBUTTONS); @@ -354,7 +354,7 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, if ((dd_win = newwin(1, 1, 1, 1)) == NULL) RETURN_ERROR("Cannot build WINDOW for dd"); wbkgd(dd_win, t.dialog.color); - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) + if (calendar_draw(&d, false, yy_win, mm_win, dd_win) != 0) return (BSDDIALOG_ERROR); sel = -1; @@ -503,12 +503,12 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) + if (calendar_draw(&d, true, yy_win, mm_win, dd_win) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) + if (calendar_draw(&d, true, yy_win, mm_win, dd_win) != 0) return (BSDDIALOG_ERROR); break; default: @@ -533,11 +533,11 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, return (retval); } -static int datebox_redraw(struct dialog *d, struct dateitem *di) +static int datebox_draw(struct dialog *d, bool redraw, struct dateitem *di) { int y, x; - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } @@ -545,7 +545,7 @@ static int datebox_redraw(struct dialog *d, struct dateitem *di) return (BSDDIALOG_ERROR); if (draw_dialog(d) != 0) return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, 3 /*windows*/ + HBUTTONS); @@ -624,7 +624,7 @@ bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows, set_buttons(&d, true, OK_LABEL, CANCEL_LABEL); if (build_dateitem(conf->date.format, &yy, &mm, &dd, di) != 0) return (BSDDIALOG_ERROR); - if (datebox_redraw(&d, di) != 0) + if (datebox_draw(&d, false, di) != 0) return (BSDDIALOG_ERROR); sel = -1; @@ -716,12 +716,12 @@ bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (datebox_redraw(&d, di) != 0) + if (datebox_draw(&d, true, di) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (datebox_redraw(&d, di) != 0) + if (datebox_draw(&d, true, di) != 0) return (BSDDIALOG_ERROR); break; default: diff --git a/contrib/bsddialog/lib/formbox.c b/contrib/bsddialog/lib/formbox.c index ca473356e350..a072461c43e1 100644 --- a/contrib/bsddialog/lib/formbox.c +++ b/contrib/bsddialog/lib/formbox.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -601,11 +601,11 @@ static int form_size_position(struct dialog *d, struct privateform *f) } static int -form_redraw(struct dialog *d, struct privateform *f, bool focusinform) +form_draw(struct dialog *d, bool redraw, struct privateform *f, bool focusinform) { unsigned int i; - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } @@ -613,9 +613,9 @@ form_redraw(struct dialog *d, struct privateform *f, bool focusinform) f->w = f->wmin; if (form_size_position(d, f) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate() in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, 2 /* box borders */ + f->viewrows + HBUTTONS); @@ -707,7 +707,7 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, } form.formheight = formheight; - if (form_redraw(&d, &form, focusinform) != 0) + if (form_draw(&d, false, &form, focusinform) != 0) return (BSDDIALOG_ERROR); changeitem = switchfocus = false; @@ -719,10 +719,16 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, switch(input) { case KEY_ENTER: case 10: /* Enter */ - if (focusinform && conf->button.always_active == false) - break; - retval = BUTTONVALUE(d.bs); - loop = false; + if (focusinform && conf->button.always_active == false) { + next = nextitem(form.nitems, form.pritems, form.sel); + if (next > form.sel) + changeitem = true; /* needs next */ + else + switchfocus = true; + } else { + retval = BUTTONVALUE(d.bs); + loop = false; + } break; case 27: /* Esc */ if (conf->key.enable_esc) { @@ -732,7 +738,12 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, break; case '\t': /* TAB */ if (focusinform) { - switchfocus = true; + next = nextitem(form.nitems, form.pritems, + form.sel); + if (next > form.sel) + changeitem = true; /* needs next */ + else + switchfocus = true; } else { if (d.bs.curr + 1 < (int)d.bs.nbuttons) { d.bs.curr++; @@ -839,12 +850,12 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, retval = BSDDIALOG_ERROR; loop = false; } - if (form_redraw(&d, &form, focusinform) != 0) + if (form_draw(&d, true, &form, focusinform) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): case KEY_RESIZE: - if (form_redraw(&d, &form, focusinform) != 0) + if (form_draw(&d, true, &form, focusinform) != 0) return (BSDDIALOG_ERROR); break; default: @@ -884,11 +895,20 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, conf->button.always_active || !focusinform, !focusinform); wnoutrefresh(d.widget); - DRAWITEM_TRICK(&form, form.sel, focusinform); + if (focusinform == false) + DRAWITEM_TRICK(&form, form.sel, false); + else { + next = firstitem(form.nitems, form.pritems); + if (next == form.sel) + DRAWITEM_TRICK(&form, form.sel, true); + else + changeitem = true; + } switchfocus = false; } if (changeitem) { + /* useless after if(switchfocus) */ DRAWITEM_TRICK(&form, form.sel, false); form.sel = next; item = &form.pritems[form.sel]; diff --git a/contrib/bsddialog/lib/lib_util.c b/contrib/bsddialog/lib/lib_util.c index d673a1a74d72..f042a2832eb9 100644 --- a/contrib/bsddialog/lib/lib_util.c +++ b/contrib/bsddialog/lib/lib_util.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,6 +25,7 @@ * SUCH DAMAGE. */ +#include #include #include #include diff --git a/contrib/bsddialog/lib/lib_util.h b/contrib/bsddialog/lib/lib_util.h index 526f65b4bfaa..1adc34f3b80a 100644 --- a/contrib/bsddialog/lib/lib_util.h +++ b/contrib/bsddialog/lib/lib_util.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -62,7 +62,7 @@ extern bool hastermcolors; RETURN_ERROR("*" #p " is NULL"); \ } while (0) #define CHECK_ARRAY(nitem, a) do { \ - if (nitem > 0 && a == NULL) \ + if (nitem > 0 && a == NULL) \ RETURN_FMTERROR(#nitem " is %d but *" #a " is NULL", nitem); \ } while (0) /* widget utils */ diff --git a/contrib/bsddialog/lib/libbsddialog.c b/contrib/bsddialog/lib/libbsddialog.c index 555d060ebcbd..cdb5e1e251dc 100644 --- a/contrib/bsddialog/lib/libbsddialog.c +++ b/contrib/bsddialog/lib/libbsddialog.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -114,11 +114,21 @@ int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle) mvhline_set(1, 1, WACS_HLINE, SCREENCOLS - 2); } - refresh(); + wnoutrefresh(stdscr); return (BSDDIALOG_OK); } +int bsddialog_backtitle_rf(struct bsddialog_conf *conf, const char *backtitle) +{ + int rv; + + rv = bsddialog_backtitle(conf, backtitle); + doupdate(); + + return (rv); +} + bool bsddialog_inmode(void) { return (in_bsddialog_mode); diff --git a/contrib/bsddialog/lib/menubox.c b/contrib/bsddialog/lib/menubox.c index 896306b2881d..e6e2e7e3e63e 100644 --- a/contrib/bsddialog/lib/menubox.c +++ b/contrib/bsddialog/lib/menubox.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -391,7 +391,7 @@ drawitem(struct bsddialog_conf *conf, struct privatemenu *m, int y, bool focus) attron(t.menu.bottomdesccolor); addstr(pritem->bottomdesc); attroff(t.menu.bottomdesccolor); - refresh(); + wnoutrefresh(stdscr); } } } @@ -454,18 +454,18 @@ static int menu_size_position(struct dialog *d, struct privatemenu *m) return (0); } -static int mixedlist_redraw(struct dialog *d, struct privatemenu *m) +static int mixedlist_draw(struct dialog *d, bool redraw, struct privatemenu *m) { - if (d->built) { + if (redraw) { hide_dialog(d); refresh(); /* Important for decreasing screen */ } m->menurows = m->apimenurows; if (menu_size_position(d, m) != 0) return (BSDDIALOG_ERROR); - if (draw_dialog(d) != 0) + if (draw_dialog(d) != 0) /* doupdate() in main loop */ return (BSDDIALOG_ERROR); - if (d->built) + if (redraw) refresh(); /* Important to fix grey lines expanding screen */ TEXTPAD(d, 2/*bmenu*/ + m->menurows + HBUTTONS); @@ -532,7 +532,7 @@ do_mixedlist(struct bsddialog_conf *conf, const char *text, int rows, int cols, drawitem(d.conf, &m, m.sel, true); m.ypad = 0; m.apimenurows = menurows; - if (mixedlist_redraw(&d, &m) != 0) + if (mixedlist_draw(&d, false, &m) != 0) return (BSDDIALOG_ERROR); changeitem = false; @@ -575,12 +575,12 @@ do_mixedlist(struct bsddialog_conf *conf, const char *text, int rows, int cols, break; if (f1help_dialog(conf) != 0) return (BSDDIALOG_ERROR); - if (mixedlist_redraw(&d, &m) != 0) + if (mixedlist_draw(&d, true, &m) != 0) return (BSDDIALOG_ERROR); break; case KEY_CTRL('l'): *** 610 LINES SKIPPED *** From nobody Tue Nov 4 19:13:42 2025 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 4d1J5m2Yvqz65Cq8 for ; Tue, 04 Nov 2025 19:13:48 +0000 (UTC) (envelope-from 0100019a504a0fcf-c2663842-9d23-4e59-a6af-3bb3df219efe-000000@amazonses.com) Received: from a8-176.smtp-out.amazonses.com (a8-176.smtp-out.amazonses.com [54.240.8.176]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1J5m0lTFz40DD for ; Tue, 04 Nov 2025 19:13:48 +0000 (UTC) (envelope-from 0100019a504a0fcf-c2663842-9d23-4e59-a6af-3bb3df219efe-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57; d=tarsnap.com; t=1762283622; h=Message-ID:Date:MIME-Version:Subject:To:References:Cc:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=xqJWw0I8pZ0sYssRtOL+wVsbi6KQEumikX/vFU3iiFc=; b=OC25ky4JfhkD7m4zzZo3k2+QQZ9s+ExamCdyA5y1Y9xVLxdFt8Qz8XE9UKlg3gGt oLEG71bzrBFGvsmO/mpKE+aSUUjIC5GHBmrL/c6PqMwSMWjOIt/pcItL5NZefWhgiQM twvrIYDzusO13WVh0Nr7I5FyhYg72+8g5aOlCzZw= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1762283622; h=Message-ID:Date:MIME-Version:Subject:To:References:Cc:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=xqJWw0I8pZ0sYssRtOL+wVsbi6KQEumikX/vFU3iiFc=; b=sKHimf0e+LSbX8nh9KqTXBmnDsEfEjd3Ec/GtV0TS9i+x+8+0KQnExkolPXfAH1h tF2qcpQa4xvaigCLqoP/lhMcSOOp8vqVV6IIi35GCa4w3d5blEn0otQwdo/CFl16KTk 5I+2wkTGJ70qkCNX+a/cEwxeFti0jSRFzWyhrFJg= Message-ID: <0100019a504a0fcf-c2663842-9d23-4e59-a6af-3bb3df219efe-000000@email.amazonses.com> Date: Tue, 4 Nov 2025 19:13:42 +0000 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 0595e10ec773 - releng/15.0 - contrib/bsddialog: Import version 1.0.5 To: "Alfonso S. Siciliano" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202511041831.5A4IVcwP050150@gitrepo.freebsd.org> Content-Language: en-US Cc: FreeBSD Release Engineering Team From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202511041831.5A4IVcwP050150@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2025.11.04-54.240.8.176 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d1J5m0lTFz40DD Hi Alfonso, Not a big issue in this case, but the correct process here was for you to merge to stable/15 (as you did) and then send an email to re@ asking for us to cherry-pick the commit to releng/15.0 (rather than merging it there yourself). Colin Percival On 11/4/25 10:31, Alfonso S. Siciliano wrote: > The branch releng/15.0 has been updated by asiciliano: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0595e10ec77383a3038c45fbd9fcdb6922c971fe > > commit 0595e10ec77383a3038c45fbd9fcdb6922c971fe > Author: Alfonso S. Siciliano > AuthorDate: 2025-10-09 15:39:10 +0000 > Commit: Alfonso S. Siciliano > CommitDate: 2025-11-04 18:30:32 +0000 > > contrib/bsddialog: Import version 1.0.5 > > Version for change and feature requests. > > * Improve documentation for --alternate-screen and --normal-screen. > Request: https://bugs.freebsd.org/285459. (This PR is not about > bsddialog itself but is used as an example for an official FreeBSD > documentation request.) > > * Reduce the number of screen refreshes to improve performance over a > 115200 UART connection. > Request: https://gitlab.com/alfix/bsddialog/-/issues/8. > > * Change textbox buttons to return distinct values (previously always > returned OK). > Request: https://reviews.freebsd.org/D48668; already committed in > contrib/ 96a241a35905078bdc5d20bf25943cdb67758dea > > * Change forms navigation key behavior for ENTER and TAB. > Request: https://bugs.freebsd.org/287592. > > Refer to /usr/src/contrib/bsddialog/CHANGELOG to know more. > > PR: 287592 > Reported by: adrian > Approved by: re (cperciva) > Sponsored by: The FreeBSD Foundation > > Merge commit '653f765f05b8c7e3908ae92e9bf61522a50cefc9' into YYY > > (cherry picked from commit 3e42d7194bdcd4fbfd781518258f919d6ac803d3) > (cherry picked from commit aa2fe36f5e4b3b907af2ea94945ae9cab7263d0c) > --- > contrib/bsddialog/.gitignore | 1 + > contrib/bsddialog/CHANGELOG | 50 ++++++++++++++++++++- > contrib/bsddialog/LICENSE | 2 +- > contrib/bsddialog/Makefile | 13 +++++- > contrib/bsddialog/README.md | 5 +-- > contrib/bsddialog/examples_library/compile | 8 ++-- > contrib/bsddialog/examples_library/textbox.c | 38 ++++++++++++++++ > contrib/bsddialog/lib/GNUmakefile | 19 +++++++- > contrib/bsddialog/lib/Makefile | 21 ++++++++- > contrib/bsddialog/lib/barbox.c | 37 ++++++++-------- > contrib/bsddialog/lib/bsddialog.3 | 16 +++++-- > contrib/bsddialog/lib/bsddialog.h | 5 ++- > contrib/bsddialog/lib/bsddialog_theme.h | 2 +- > contrib/bsddialog/lib/datebox.c | 28 ++++++------ > contrib/bsddialog/lib/formbox.c | 48 ++++++++++++++------ > contrib/bsddialog/lib/lib_util.c | 3 +- > contrib/bsddialog/lib/lib_util.h | 4 +- > contrib/bsddialog/lib/libbsddialog.c | 14 +++++- > contrib/bsddialog/lib/menubox.c | 18 ++++---- > contrib/bsddialog/lib/messagebox.c | 16 +++---- > contrib/bsddialog/lib/textbox.c | 16 +++---- > contrib/bsddialog/lib/theme.c | 6 +-- > contrib/bsddialog/lib/timebox.c | 16 +++---- > contrib/bsddialog/utility/GNUmakefile | 11 ++++- > contrib/bsddialog/utility/Makefile | 11 ++++- > contrib/bsddialog/utility/bsddialog.1 | 21 ++++++--- > contrib/bsddialog/utility/bsddialog.c | 2 +- > contrib/bsddialog/utility/util.h | 2 +- > contrib/bsddialog/utility/util_builders.c | 66 ++++++++++++++-------------- > contrib/bsddialog/utility/util_cli.c | 2 +- > contrib/bsddialog/utility/util_theme.c | 4 +- > 31 files changed, 353 insertions(+), 152 deletions(-) > > diff --git a/contrib/bsddialog/.gitignore b/contrib/bsddialog/.gitignore > index c8fc68ed8a0e..c9613d477f7f 100644 > --- a/contrib/bsddialog/.gitignore > +++ b/contrib/bsddialog/.gitignore > @@ -21,6 +21,7 @@ examples_library/msgbox > examples_library/pause > examples_library/radiolist > examples_library/rangebox > +examples_library/textbox > examples_library/theme > examples_library/timebox > examples_library/yesno > diff --git a/contrib/bsddialog/CHANGELOG b/contrib/bsddialog/CHANGELOG > index a4cf4d01c077..7800098644d7 100644 > --- a/contrib/bsddialog/CHANGELOG > +++ b/contrib/bsddialog/CHANGELOG > @@ -1,11 +1,57 @@ > -2024-07-01 1.0.4 > +2025-06-22 Version 1.0.5 > + > + Manual: > + * fix: "User-friendly documentation for alternate screen" > + https://bugs.freebsd.org/285459. > + Improve bsddialog.1: --alternate-screen and --normal-screen. > + > + NetBSD (tested on amd64) refactoring, no function changes: > + * https://gitlab.com/alfix/bsddialog/-/merge_requests/4 > + lib: include in lib_util.c. > + * https://gitlab.com/alfix/bsddialog/-/merge_requests/5 > + a call to curses' refresh() is performed, while a local > + variable is also called refresh. > + * Makefiles: add install and uninstall targets (both GND and BSD) > + https://gitlab.com/alfix/bsddialog/-/merge_requests/3 > + > + MacOS (tested on amd64) refactoring, no function changes: > + * https://gitlab.com/alfix/bsddialog/-/merge_requests/6 > + utility: replace u_int with unsigned int. > + > + Library: > + * fix: useless refreshes, https://gitlab.com/alfix/bsddialog/-/issues/8: > + "It takes lot of time when running over a 115200 UART". > + Not fixed for bsddialog_gauge() because it has to be rewritten. > + * change: bsddialog_backtitle() does not update the screen so the > + backtitle is not printed. To use if a dialog is built later. > + Rationale: see "115200 UART" problem above. > + * add: bsddialog_backtitle_rf() to print a top title refreshing the > + screen like bsddialog_backtitle() was previously. > + * change: forms, ENTER is also a navigation keys in forms fields. > + Request: https://bugs.freebsd.org/287592 > + If conf.button.always_active is true the form is closes immediatly. > + > + Library and implicitly utility: > + * fix: textbox buttons returned values (was always OK). > + Thanks to https://reviews.freebsd.org/D48668. > + * change: TAB is a navigation keys in forms. Previously it directly > + switched form-fields <-> buttons. > + Request: https://bugs.freebsd.org/287592 > + > + Utility: > + * change: forms, ENTER is a also navigation keys in forms fields. > + Previously it directly closed the form except with --switch-buttons > + Request: https://bugs.freebsd.org/287592 > + > + > +2024-07-01 Version 1.0.4 > > Utility internal refactoring (no functional change): > * change: rename an internal constant to avoid a future conflict > because FreeBSD is changing headers files for _FORTIFY_SOURCE. > Reported and fixed by Kyle Evans. > > -2024-05-27 1.0.3 > +2024-05-27 Version 1.0.3 > > Utility: > change: --form and --mixedform do not print field value to output fd if > diff --git a/contrib/bsddialog/LICENSE b/contrib/bsddialog/LICENSE > index 7b36a8dce42e..9ea4a4a62f4b 100644 > --- a/contrib/bsddialog/LICENSE > +++ b/contrib/bsddialog/LICENSE > @@ -1,6 +1,6 @@ > BSD 2-Clause License > > -Copyright (c) 2021-2024, Alfonso Sabato Siciliano > +Copyright (c) 2021-2025, Alfonso Sabato Siciliano > > Redistribution and use in source and binary forms, with or without > modification, are permitted provided that the following conditions are met: > diff --git a/contrib/bsddialog/Makefile b/contrib/bsddialog/Makefile > index a6af8813a48e..335b693470e6 100644 > --- a/contrib/bsddialog/Makefile > +++ b/contrib/bsddialog/Makefile > @@ -4,7 +4,7 @@ > # Written in 2023 by Alfonso Sabato Siciliano > > OUTPUT = bsddialog > -export VERSION=1.0.4 > +export VERSION=1.0.5 > .CURDIR ?= ${CURDIR} > LIBPATH = ${.CURDIR}/lib > LIBBSDDIALOG = ${LIBPATH}/libbsddialog.so > @@ -22,7 +22,15 @@ DEBUG ?= > export ENABLEDEBUG=${DEBUG} > ################### > > -all : ${OUTPUT} > +all: ${OUTPUT} > + > +install: all > + ${MAKE} -C ${LIBPATH} install > + ${MAKE} -C ${UTILITYPATH} install > + > +uninstall: > + ${MAKE} -C ${UTILITYPATH} uninstall > + ${MAKE} -C ${LIBPATH} uninstall > > ${OUTPUT}: ${LIBBSDDIALOG} > ${MAKE} -C ${UTILITYPATH} LIBPATH=${LIBPATH} > @@ -36,3 +44,4 @@ clean: > ${MAKE} -C ${UTILITYPATH} clean > ${RM} ${OUTPUT} *.core > > +.PHONY: all install uninstall clean > diff --git a/contrib/bsddialog/README.md b/contrib/bsddialog/README.md > index 7b9b6cf8e84d..5a25109775fe 100644 > --- a/contrib/bsddialog/README.md > +++ b/contrib/bsddialog/README.md > @@ -1,4 +1,4 @@ > -# BSDDialog 1.0.4 > +# BSDDialog 1.0.5 > > This project provides **bsddialog** and **libbsddialog**, an utility > and a library to build scripts and tools with TUI dialogs and widgets. > @@ -129,7 +129,6 @@ in the _Public Domain_ to build new projects: > - implement global buttons handler. > - doc: external tutorial, theming guide. > - implement menutype.min\_on. > - - improve refresh at startup, avoid dialog refresh before drawing text. > - add debug API: bsddialog\_debug(y,x,refresh,"fmt",...). > - add mouse support. > - use alarm(2) for bsddialog\_pause. > @@ -139,4 +138,4 @@ in the _Public Domain_ to build new projects: > - fix --mixedform "" 0 0 0 Label 1 0 Init 1 12 0 0 2 (with 0 editable field). > - add *text* customization to --hmsg *help-message* > - check --passwordform *fieldlen* like --form and --mixedform. > - > + - add manuals to Makefiles installe and uninstall targets. > diff --git a/contrib/bsddialog/examples_library/compile b/contrib/bsddialog/examples_library/compile > index 9025f35426d9..1a68313090f6 100755 > --- a/contrib/bsddialog/examples_library/compile > +++ b/contrib/bsddialog/examples_library/compile > @@ -8,14 +8,16 @@ > # worldwide. This software is distributed without any warranty, see: > # . > > +set -x > + > libpath=../lib > examples="menu checklist radiolist mixedlist theme infobox yesno msgbox \ > - datebox form timebox rangebox pause calendar gauge mixedgauge" > +datebox form timebox rangebox pause calendar gauge mixedgauge textbox" > > rm -f $examples > > for e in $examples > do > - cc -g -Wall -Wextra -I$libpath ${e}.c -o $e -L$libpath -lbsddialog \ > - -Wl,-rpath=$libpath > + cc -g -Wall -Wextra -I$libpath ${e}.c -o $e \ > + -Wl,-rpath=$libpath -L$libpath -lbsddialog > done > diff --git a/contrib/bsddialog/examples_library/textbox.c b/contrib/bsddialog/examples_library/textbox.c > new file mode 100644 > index 000000000000..2e76cbb97891 > --- /dev/null > +++ b/contrib/bsddialog/examples_library/textbox.c > @@ -0,0 +1,38 @@ > +/*- > + * SPDX-License-Identifier: CC0-1.0 > + * > + * Written in 2025 by Alfonso Sabato Siciliano. > + * To the extent possible under law, the author has dedicated all copyright > + * and related and neighboring rights to this software to the public domain > + * worldwide. This software is distributed without any warranty, see: > + * . > + */ > + > +#include > +#include > + > +int main() > +{ > + int output; > + struct bsddialog_conf conf; > + > + if (bsddialog_init() == BSDDIALOG_ERROR) { > + printf("Error: %s\n", bsddialog_geterror()); > + return (1); > + } > + bsddialog_initconf(&conf); > + conf.title = "textbox"; > + output = bsddialog_textbox(&conf, "./textbox.c", 20, 80); > + bsddialog_end(); > + > + switch (output) { > + case BSDDIALOG_ERROR: > + printf("Error %s\n", bsddialog_geterror()); > + return (1); > + case BSDDIALOG_OK: > + printf("[Exit]\n"); > + break; > + } > + > + return (0); > +} > diff --git a/contrib/bsddialog/lib/GNUmakefile b/contrib/bsddialog/lib/GNUmakefile > index 7c7a9bc25ee4..2cb060381a46 100644 > --- a/contrib/bsddialog/lib/GNUmakefile > +++ b/contrib/bsddialog/lib/GNUmakefile > @@ -9,6 +9,7 @@ HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h > SOURCES = barbox.c datebox.c formbox.c libbsddialog.c lib_util.c \ > menubox.c messagebox.c textbox.c theme.c timebox.c > OBJECTS = $(SOURCES:.c=.o) > +PREFIX = /usr/local > > ifneq ($(ENABLEDEBUG),) > CFLAGS += -g > @@ -21,7 +22,21 @@ LIBFLAG = -shared > RM = rm -f > LN = ln -s -f > > -all : $(LIBRARY) > +all: $(LIBRARY) > + > +install: all > + ${INSTALL} -m 0644 bsddialog.h ${DESTDIR}${PREFIX}/include/bsddialog.h > + ${INSTALL} -m 0644 bsddialog_progressview.h ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h > + ${INSTALL} -m 0644 bsddialog_theme.h ${DESTDIR}${PREFIX}/include/bsddialog_theme.h > + ${INSTALL} -m 0755 ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} > + ${LN} ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} > + > +uninstall: > + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog.h > + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h > + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_theme.h > + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} > + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} > > $(LIBRARY): $(OBJECTS) > $(CC) $(LIBFLAG) $^ -o $(LIBRARY_SO).$(VERSION) $(LDFLAGS) > @@ -32,3 +47,5 @@ $(LIBRARY): $(OBJECTS) > > clean: > $(RM) $(LIBRARY_SO)* *.o *~ > + > +.PHONY: all install uninstall ${LIBRARY} clean > diff --git a/contrib/bsddialog/lib/Makefile b/contrib/bsddialog/lib/Makefile > index 252b33f79848..c728541a9f7a 100644 > --- a/contrib/bsddialog/lib/Makefile > +++ b/contrib/bsddialog/lib/Makefile > @@ -10,6 +10,7 @@ HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h > SOURCES = barbox.c datebox.c formbox.c libbsddialog.c lib_util.c \ > menubox.c messagebox.c textbox.c theme.c timebox.c > OBJECTS = ${SOURCES:.c=.o} > +PREFIX = /usr/local > > .if defined(DEBUG) > CFLAGS += -g > @@ -23,7 +24,23 @@ LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \ > LN = ln -s -f > RM = rm -f > > -all : ${LIBRARY} > +all: ${LIBRARY} > + > +install: all > + ${INSTALL} -m 0644 bsddialog.h ${DESTDIR}${PREFIX}/include/bsddialog.h > + ${INSTALL} -m 0644 bsddialog_progressview.h ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h > + ${INSTALL} -m 0644 bsddialog_theme.h ${DESTDIR}${PREFIX}/include/bsddialog_theme.h > + ${INSTALL} -m 0644 ${LIBRARY_A} ${DESTDIR}${PREFIX}/lib/${LIBRARY_A} > + ${INSTALL} -m 0755 ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} > + ${LN} ${LIBRARY_SO}.${VERSION} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} > + > +uninstall: > + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog.h > + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_progressview.h > + ${RM} ${DESTDIR}${PREFIX}/include/bsddialog_theme.h > + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_A} > + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO}.${VERSION} > + ${RM} ${DESTDIR}${PREFIX}/lib/${LIBRARY_SO} > > ${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A} > > @@ -42,3 +59,5 @@ ${LIBRARY_A}: ${OBJECTS} > > clean: > ${RM} ${LIBRARY_SO}* *.o *~ *.gz ${LIBRARY_A} > + > +.PHONY: all install uninstall ${LIBRARY} clean > diff --git a/contrib/bsddialog/lib/barbox.c b/contrib/bsddialog/lib/barbox.c > index 4feea20c6441..51f81ecbca68 100644 > --- a/contrib/bsddialog/lib/barbox.c > +++ b/contrib/bsddialog/lib/barbox.c > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano > + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -371,7 +371,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, > unsigned int i, mainperc, totaltodo; > float readforsec; > const char **minilabels; > - time_t tstart, told, tnew, refresh; > + time_t tstart, told, tnew, trefresh; > > if ((minilabels = calloc(nminibar, sizeof(char*))) == NULL) > RETURN_ERROR("Cannot allocate memory for minilabels"); > @@ -385,7 +385,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, > minipercs[i] = minibar[i].status; > } > > - refresh = pvconf->refresh == 0 ? 0 : pvconf->refresh - 1; > + trefresh = pvconf->refresh == 0 ? 0 : pvconf->refresh - 1; > retval = BSDDIALOG_OK; > i = 0; > update = true; > @@ -398,7 +398,7 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, > mainperc = (bsddialog_total_progview * 100) / totaltodo; > > time(&tnew); > - if (update || tnew > told + refresh) { > + if (update || tnew > told + trefresh) { > retval = do_mixedgauge(conf, text, rows, cols, mainperc, > nminibar, minilabels, minipercs, true); > if (retval == BSDDIALOG_ERROR) > @@ -440,17 +440,18 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, > return (retval); > } > > -static int rangebox_redraw(struct dialog *d, struct bar *b, int *bigchange) > +static int > +rangebox_redraw(struct dialog *d, bool redraw, struct bar *b, int *bigchange) > { > - if (d->built) { > + if (redraw) { > hide_dialog(d); > refresh(); /* Important for decreasing screen */ > } > if (dialog_size_position(d, HBOX, MIN_WBOX, NULL) != 0) > return (BSDDIALOG_ERROR); > - if (draw_dialog(d) != 0) > + if (draw_dialog(d) != 0) /* doupdate() in main loop */ > return (BSDDIALOG_ERROR); > - if (d->built) > + if (redraw) > refresh(); /* Important to fix grey lines expanding screen */ > TEXTPAD(d, HBOX + HBUTTONS); > > @@ -490,7 +491,7 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, > RETURN_ERROR("Cannot build WINDOW bar"); > b.y = b.x = 1; > b.fmt = "%d"; > - if (rangebox_redraw(&d, &b, &bigchange) != 0) > + if (rangebox_redraw(&d, false, &b, &bigchange) != 0) > return (BSDDIALOG_ERROR); > > loop = true; > @@ -568,12 +569,12 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, > break; > if (f1help_dialog(conf) != 0) > return (BSDDIALOG_ERROR); > - if (rangebox_redraw(&d, &b, &bigchange) != 0) > + if (rangebox_redraw(&d, true, &b, &bigchange) != 0) > return (BSDDIALOG_ERROR); > break; > case KEY_CTRL('l'): > case KEY_RESIZE: > - if (rangebox_redraw(&d, &b, &bigchange) != 0) > + if (rangebox_redraw(&d, true, &b, &bigchange) != 0) > return (BSDDIALOG_ERROR); > break; > default: > @@ -594,17 +595,17 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows, > return (retval); > } > > -static int pause_redraw(struct dialog *d, struct bar *b) > +static int pause_redraw(struct dialog *d, bool redraw, struct bar *b) > { > - if (d->built) { > + if (redraw) { > hide_dialog(d); > refresh(); /* Important for decreasing screen */ > } > if (dialog_size_position(d, HBOX, MIN_WBOX, NULL) != 0) > return (BSDDIALOG_ERROR); > - if (draw_dialog(d) != 0) > + if (draw_dialog(d) != 0) /* doupdate() in main loop */ > return (BSDDIALOG_ERROR); > - if (d->built) > + if (redraw) > refresh(); /* Important to fix grey lines expanding screen */ > TEXTPAD(d, HBOX + HBUTTONS); > > @@ -633,7 +634,7 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows, > RETURN_ERROR("Cannot build WINDOW bar"); > b.y = b.x = 1; > b.fmt = "%d"; > - if (pause_redraw(&d, &b) != 0) > + if (pause_redraw(&d, false, &b) != 0) > return (BSDDIALOG_ERROR); > > tout = *seconds; > @@ -687,12 +688,12 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows, > break; > if (f1help_dialog(conf) != 0) > return (BSDDIALOG_ERROR); > - if (pause_redraw(&d, &b) != 0) > + if (pause_redraw(&d, true, &b) != 0) > return (BSDDIALOG_ERROR); > break; > case KEY_CTRL('l'): > case KEY_RESIZE: > - if (pause_redraw(&d, &b) != 0) > + if (pause_redraw(&d, true, &b) != 0) > return (BSDDIALOG_ERROR); > break; > default: > diff --git a/contrib/bsddialog/lib/bsddialog.3 b/contrib/bsddialog/lib/bsddialog.3 > index cbf1653a2aca..bbd756661a78 100644 > --- a/contrib/bsddialog/lib/bsddialog.3 > +++ b/contrib/bsddialog/lib/bsddialog.3 > @@ -1,5 +1,5 @@ > .\" > -.\" Copyright (c) 2021-2024 Alfonso Sabato Siciliano > +.\" Copyright (c) 2021-2025 Alfonso Sabato Siciliano > .\" > .\" Redistribution and use in source and binary forms, with or without > .\" modification, are permitted provided that the following conditions > @@ -22,11 +22,12 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > -.Dd March 16, 2024 > +.Dd June 22, 2025 > .Dt BSDDIALOG 3 > .Os > .Sh NAME > .Nm bsddialog_backtitle , > +.Nm bsddialog_backtitle_rf , > .Nm bsddialog_calendar , > .Nm bsddialog_clear , > .Nm bsddialog_color , > @@ -65,6 +66,8 @@ > .Ft int > .Fn bsddialog_backtitle "struct bsddialog_conf *conf" "const char *backtitle" > .Ft int > +.Fn bsddialog_backtitle_rf "struct bsddialog_conf *conf" "const char *backtitle" > +.Ft int > .Fo bsddialog_calendar > .Fa "struct bsddialog_conf *conf" > .Fa "const char *text" > @@ -292,7 +295,7 @@ and before > .Dv false > otherwise. > .Pp > -.Fn bsddialog_backtitle > +.Fn bsddialog_backtitle_rf > prints > .Fa backtitle > on the top of the screen. > @@ -302,6 +305,11 @@ and > .Fa conf.no_lines > described later. > .Pp > +.Fn bsddialog_backtitle > +is like > +.Fn bsddialog_backtitle_rf > +but it does not update the screen, using if a dialog is built later. > +.Pp > .Fn bsddialog_error > returns a string to describe the last error. > The function should be called after a > @@ -902,7 +910,7 @@ provides a dialog for a > the labels on buttons are > .Dq Yes > and > -.Dq No . > +.Dq &No . > .Ss Keys > .Bl -tag -width Ds > .It Ctrl-l > diff --git a/contrib/bsddialog/lib/bsddialog.h b/contrib/bsddialog/lib/bsddialog.h > index fd0e2bc02580..fc59071c6fa0 100644 > --- a/contrib/bsddialog/lib/bsddialog.h > +++ b/contrib/bsddialog/lib/bsddialog.h > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano > + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -30,7 +30,7 @@ > > #include > > -#define LIBBSDDIALOG_VERSION "1.0.4" > +#define LIBBSDDIALOG_VERSION "1.0.5" > > /* Return values */ > #define BSDDIALOG_ERROR -1 > @@ -179,6 +179,7 @@ int bsddialog_init_notheme(void); > bool bsddialog_inmode(void); > int bsddialog_end(void); > int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle); > +int bsddialog_backtitle_rf(struct bsddialog_conf *conf, const char *backtitle); > int bsddialog_initconf(struct bsddialog_conf *conf); > void bsddialog_clear(unsigned int y); > void bsddialog_refresh(void); > diff --git a/contrib/bsddialog/lib/bsddialog_theme.h b/contrib/bsddialog/lib/bsddialog_theme.h > index 2071896b61f0..77938c65b6ce 100644 > --- a/contrib/bsddialog/lib/bsddialog_theme.h > +++ b/contrib/bsddialog/lib/bsddialog_theme.h > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano > + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > diff --git a/contrib/bsddialog/lib/datebox.c b/contrib/bsddialog/lib/datebox.c > index ee955471799e..66f36f5f4a99 100644 > --- a/contrib/bsddialog/lib/datebox.c > +++ b/contrib/bsddialog/lib/datebox.c > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2022-2024 Alfonso Sabato Siciliano > + * Copyright (c) 2022-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -296,20 +296,20 @@ print_calendar(struct bsddialog_conf *conf, WINDOW *win, int yy, int mm, int dd, > } > > static int > -calendar_redraw(struct dialog *d, WINDOW *yy_win, WINDOW *mm_win, > +calendar_draw(struct dialog *d, bool redraw, WINDOW *yy_win, WINDOW *mm_win, > WINDOW *dd_win) > { > int ycal, xcal; > > - if (d->built) { > + if (redraw) { > hide_dialog(d); > refresh(); /* Important for decreasing screen */ > } > if (dialog_size_position(d, MINHCAL, MINWCAL, NULL) != 0) > return (BSDDIALOG_ERROR); > - if (draw_dialog(d) != 0) > + if (draw_dialog(d) != 0) /* doupdate in main loop */ > return (BSDDIALOG_ERROR); > - if (d->built) > + if (redraw) > refresh(); /* Important to fix grey lines expanding screen */ > TEXTPAD(d, MINHCAL + HBUTTONS); > > @@ -354,7 +354,7 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, > if ((dd_win = newwin(1, 1, 1, 1)) == NULL) > RETURN_ERROR("Cannot build WINDOW for dd"); > wbkgd(dd_win, t.dialog.color); > - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) > + if (calendar_draw(&d, false, yy_win, mm_win, dd_win) != 0) > return (BSDDIALOG_ERROR); > > sel = -1; > @@ -503,12 +503,12 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, > break; > if (f1help_dialog(conf) != 0) > return (BSDDIALOG_ERROR); > - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) > + if (calendar_draw(&d, true, yy_win, mm_win, dd_win) != 0) > return (BSDDIALOG_ERROR); > break; > case KEY_CTRL('l'): > case KEY_RESIZE: > - if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0) > + if (calendar_draw(&d, true, yy_win, mm_win, dd_win) != 0) > return (BSDDIALOG_ERROR); > break; > default: > @@ -533,11 +533,11 @@ bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows, > return (retval); > } > > -static int datebox_redraw(struct dialog *d, struct dateitem *di) > +static int datebox_draw(struct dialog *d, bool redraw, struct dateitem *di) > { > int y, x; > > - if (d->built) { > + if (redraw) { > hide_dialog(d); > refresh(); /* Important for decreasing screen */ > } > @@ -545,7 +545,7 @@ static int datebox_redraw(struct dialog *d, struct dateitem *di) > return (BSDDIALOG_ERROR); > if (draw_dialog(d) != 0) > return (BSDDIALOG_ERROR); > - if (d->built) > + if (redraw) > refresh(); /* Important to fix grey lines expanding screen */ > TEXTPAD(d, 3 /*windows*/ + HBUTTONS); > > @@ -624,7 +624,7 @@ bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows, > set_buttons(&d, true, OK_LABEL, CANCEL_LABEL); > if (build_dateitem(conf->date.format, &yy, &mm, &dd, di) != 0) > return (BSDDIALOG_ERROR); > - if (datebox_redraw(&d, di) != 0) > + if (datebox_draw(&d, false, di) != 0) > return (BSDDIALOG_ERROR); > > sel = -1; > @@ -716,12 +716,12 @@ bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows, > break; > if (f1help_dialog(conf) != 0) > return (BSDDIALOG_ERROR); > - if (datebox_redraw(&d, di) != 0) > + if (datebox_draw(&d, true, di) != 0) > return (BSDDIALOG_ERROR); > break; > case KEY_CTRL('l'): > case KEY_RESIZE: > - if (datebox_redraw(&d, di) != 0) > + if (datebox_draw(&d, true, di) != 0) > return (BSDDIALOG_ERROR); > break; > default: > diff --git a/contrib/bsddialog/lib/formbox.c b/contrib/bsddialog/lib/formbox.c > index ca473356e350..a072461c43e1 100644 > --- a/contrib/bsddialog/lib/formbox.c > +++ b/contrib/bsddialog/lib/formbox.c > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano > + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -601,11 +601,11 @@ static int form_size_position(struct dialog *d, struct privateform *f) > } > > static int > -form_redraw(struct dialog *d, struct privateform *f, bool focusinform) > +form_draw(struct dialog *d, bool redraw, struct privateform *f, bool focusinform) > { > unsigned int i; > > - if (d->built) { > + if (redraw) { > hide_dialog(d); > refresh(); /* Important for decreasing screen */ > } > @@ -613,9 +613,9 @@ form_redraw(struct dialog *d, struct privateform *f, bool focusinform) > f->w = f->wmin; > if (form_size_position(d, f) != 0) > return (BSDDIALOG_ERROR); > - if (draw_dialog(d) != 0) > + if (draw_dialog(d) != 0) /* doupdate() in main loop */ > return (BSDDIALOG_ERROR); > - if (d->built) > + if (redraw) > refresh(); /* Important to fix grey lines expanding screen */ > TEXTPAD(d, 2 /* box borders */ + f->viewrows + HBUTTONS); > > @@ -707,7 +707,7 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, > } > > form.formheight = formheight; > - if (form_redraw(&d, &form, focusinform) != 0) > + if (form_draw(&d, false, &form, focusinform) != 0) > return (BSDDIALOG_ERROR); > > changeitem = switchfocus = false; > @@ -719,10 +719,16 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, > switch(input) { > case KEY_ENTER: > case 10: /* Enter */ > - if (focusinform && conf->button.always_active == false) > - break; > - retval = BUTTONVALUE(d.bs); > - loop = false; > + if (focusinform && conf->button.always_active == false) { > + next = nextitem(form.nitems, form.pritems, form.sel); > + if (next > form.sel) > + changeitem = true; /* needs next */ > + else > + switchfocus = true; > + } else { > + retval = BUTTONVALUE(d.bs); > + loop = false; > + } > break; > case 27: /* Esc */ > if (conf->key.enable_esc) { > @@ -732,7 +738,12 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, > break; > case '\t': /* TAB */ > if (focusinform) { > - switchfocus = true; > + next = nextitem(form.nitems, form.pritems, > + form.sel); > + if (next > form.sel) > + changeitem = true; /* needs next */ > + else > + switchfocus = true; > } else { > if (d.bs.curr + 1 < (int)d.bs.nbuttons) { > d.bs.curr++; > @@ -839,12 +850,12 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, > retval = BSDDIALOG_ERROR; > loop = false; > } > - if (form_redraw(&d, &form, focusinform) != 0) > + if (form_draw(&d, true, &form, focusinform) != 0) > return (BSDDIALOG_ERROR); > break; > case KEY_CTRL('l'): > case KEY_RESIZE: > - if (form_redraw(&d, &form, focusinform) != 0) > + if (form_draw(&d, true, &form, focusinform) != 0) > return (BSDDIALOG_ERROR); > break; > default: > @@ -884,11 +895,20 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows, > conf->button.always_active || !focusinform, > !focusinform); > wnoutrefresh(d.widget); > - DRAWITEM_TRICK(&form, form.sel, focusinform); > + if (focusinform == false) > + DRAWITEM_TRICK(&form, form.sel, false); > + else { > + next = firstitem(form.nitems, form.pritems); > + if (next == form.sel) > + DRAWITEM_TRICK(&form, form.sel, true); > + else > + changeitem = true; > + } > switchfocus = false; > } > > if (changeitem) { > + /* useless after if(switchfocus) */ > DRAWITEM_TRICK(&form, form.sel, false); > form.sel = next; > item = &form.pritems[form.sel]; > diff --git a/contrib/bsddialog/lib/lib_util.c b/contrib/bsddialog/lib/lib_util.c > index d673a1a74d72..f042a2832eb9 100644 > --- a/contrib/bsddialog/lib/lib_util.c > +++ b/contrib/bsddialog/lib/lib_util.c > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano > + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -25,6 +25,7 @@ > * SUCH DAMAGE. > */ > > +#include > #include > #include > #include > diff --git a/contrib/bsddialog/lib/lib_util.h b/contrib/bsddialog/lib/lib_util.h > index 526f65b4bfaa..1adc34f3b80a 100644 > --- a/contrib/bsddialog/lib/lib_util.h > +++ b/contrib/bsddialog/lib/lib_util.h > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano > + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -62,7 +62,7 @@ extern bool hastermcolors; > RETURN_ERROR("*" #p " is NULL"); \ > } while (0) > #define CHECK_ARRAY(nitem, a) do { \ > - if (nitem > 0 && a == NULL) \ > + if (nitem > 0 && a == NULL) \ > RETURN_FMTERROR(#nitem " is %d but *" #a " is NULL", nitem); \ > } while (0) > /* widget utils */ > diff --git a/contrib/bsddialog/lib/libbsddialog.c b/contrib/bsddialog/lib/libbsddialog.c > index 555d060ebcbd..cdb5e1e251dc 100644 > --- a/contrib/bsddialog/lib/libbsddialog.c > +++ b/contrib/bsddialog/lib/libbsddialog.c > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2021-2023 Alfonso Sabato Siciliano > + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -114,11 +114,21 @@ int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle) > mvhline_set(1, 1, WACS_HLINE, SCREENCOLS - 2); > } > > - refresh(); > + wnoutrefresh(stdscr); > > return (BSDDIALOG_OK); > } > > +int bsddialog_backtitle_rf(struct bsddialog_conf *conf, const char *backtitle) > +{ > + int rv; > + > + rv = bsddialog_backtitle(conf, backtitle); > + doupdate(); > + > + return (rv); > +} > + > bool bsddialog_inmode(void) > { > return (in_bsddialog_mode); > diff --git a/contrib/bsddialog/lib/menubox.c b/contrib/bsddialog/lib/menubox.c > index 896306b2881d..e6e2e7e3e63e 100644 > --- a/contrib/bsddialog/lib/menubox.c > +++ b/contrib/bsddialog/lib/menubox.c > @@ -1,7 +1,7 @@ > /*- > * SPDX-License-Identifier: BSD-2-Clause > * > - * Copyright (c) 2021-2024 Alfonso Sabato Siciliano > + * Copyright (c) 2021-2025 Alfonso Sabato Siciliano > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -391,7 +391,7 @@ drawitem(struct bsddialog_conf *conf, struct privatemenu *m, int y, bool focus) > attron(t.menu.bottomdesccolor); > addstr(pritem->bottomdesc); > attroff(t.menu.bottomdesccolor); > - refresh(); > + wnoutrefresh(stdscr); > } > } > } > @@ -454,18 +454,18 @@ static int menu_size_position(struct dialog *d, struct privatemenu *m) > return (0); > } > > -static int mixedlist_redraw(struct dialog *d, struct privatemenu *m) > +static int mixedlist_draw(struct dialog *d, bool redraw, struct privatemenu *m) > { > - if (d->built) { > + if (redraw) { > hide_dialog(d); > refresh(); /* Important for decreasing screen */ > } > m->menurows = m->apimenurows; > if (menu_size_position(d, m) != 0) > return (BSDDIALOG_ERROR); > - if (draw_dialog(d) != 0) > + if (draw_dialog(d) != 0) /* doupdate() in main loop */ > return (BSDDIALOG_ERROR); > - if (d->built) > + if (redraw) > refresh(); /* Important to fix grey lines expanding screen */ > TEXTPAD(d, 2/*bmenu*/ + m->menurows + HBUTTONS); > > @@ -532,7 +532,7 @@ do_mixedlist(struct bsddialog_conf *conf, const char *text, int rows, int cols, > drawitem(d.conf, &m, m.sel, true); > m.ypad = 0; > m.apimenurows = menurows; > - if (mixedlist_redraw(&d, &m) != 0) > + if (mixedlist_draw(&d, false, &m) != 0) > return (BSDDIALOG_ERROR); > > changeitem = false; > @@ -575,12 +575,12 @@ do_mixedlist(struct bsddialog_conf *conf, const char *text, int rows, int cols, > break; > if (f1help_dialog(conf) != 0) > return (BSDDIALOG_ERROR); > - if (mixedlist_redraw(&d, &m) != 0) > + if (mixedlist_draw(&d, true, &m) != 0) > return (BSDDIALOG_ERROR); > break; > case KEY_CTRL('l'): > *** 610 LINES SKIPPED *** > -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Tue Nov 4 19:58:59 2025 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 4d1K6B2Hszz6FC1B for ; Tue, 04 Nov 2025 19:59:14 +0000 (UTC) (envelope-from asiciliano.freebsd@gmail.com) Received: from mail-yw1-x1135.google.com (mail-yw1-x1135.google.com [IPv6:2607:f8b0:4864:20::1135]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1K6B0pB1z46Kw for ; Tue, 04 Nov 2025 19:59:14 +0000 (UTC) (envelope-from asiciliano.freebsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-x1135.google.com with SMTP id 00721157ae682-7814273415cso53737837b3.1 for ; Tue, 04 Nov 2025 11:59:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762286348; x=1762891148; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=VDqDCzCB/3lrFB1ubv29g+TDw0tbJE8iK3WswxrrBVo=; b=Q0JeZHwT3AWGFauOXl0Y0Le4UigT/Y2bfa7scX3520vGmN5EKVTaIgGJvVnNHmCIcN l01pS2tLKUpOUAIhcMXC9PrPdnLoXtOgc+sSl3L+wYEaGR2E0kTiU5IgPpoSrXOFN1fj oiu1eEQTQSL0aB+6k6QnYbvvthCLUDoEqh5GWS8yxGDb+1Mw6pozF6j8G/HiXQn0wCqj RN+Qnd1AwnSSNGyX4hPE1i14X2Nex+fSRYcBK/GBT+cY+kt+cg8UiyZPTwlUzxDREUcv lsW2YqoXJA8ihS7b4kv5660dWr2g8zzu2wq2nFjoXKGUL1QO7v45JpMh9Yb3yasuDDZU 4VFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762286348; x=1762891148; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VDqDCzCB/3lrFB1ubv29g+TDw0tbJE8iK3WswxrrBVo=; b=fH5eOAdNtEUUAf+386dZqgJtnd3N6AmQxQ9awQ9ZfU11aJ7ppTAIzhF1+O6mR+vTKK dcw/qssckY6s1Rt7tovt8xb9atmimWvI7RnWj5BQVYzU9UkSCvNgiej/i8aRtzhaIrYx faziUv3Ux/v5dTfRfrgKGG/XXEm+866YHpX8KcAD+v1gJ6fDw75WnxgdNq1UVlVbzAbu gz5TA8o/Dq9m+QYQqqSoFQ+b62XwA4ucd4NjysStzs84yTTBz/ga1T09a9YUoiZooVEY dA7DYnddMtP9KsSmDU8kKxRphPqqxhy8DSIgzWgVGjVFhoMQppzEQxtYsDIww2HWtAwi 6GJw== X-Forwarded-Encrypted: i=1; AJvYcCURlpZZwFPMYOa7q46gxztz+oBRxyMeiT+sHL80szVdmrMU4J6lQ7AAT6ywahqftRJuBmbkt2rjsZraGRVO9m8RjeVNjY2Wi0A=@freebsd.org X-Gm-Message-State: AOJu0Yw3ynOKwbuKTvO1XjYDA/cp6dpZhoatZQnenIJfL29tkHBAJws2 qXKXLo463eBjEY7bdqs6Q6qHt5DHEF/yM+x+1QjRnCpVI4ZrOGkvgjYh4kPD9dMmlkJTVSiqrm7 /WFuJnuQkNE7w8gxcS0jcinEakmDMh0a4Ji8quXM= X-Gm-Gg: ASbGnctFfJoUVlX1Po+ARkhejh2wTzDATC5ORIEwvKDHNtmE0G8lkeiMwhi8BSPa3TC lC/88KKJ6RzE5KGeYI65TPNWXqAA67HS1bRdmkf6DQR5mWLaZ3iQ4oe6PT0DJWdV46DQTFccPKh 6PrVpExnS7mEq/MWu7MVZNk4DgghlPVVDPzadAocxuYDpb0s2A5FEUc1alyFegbZPn9SdZz4EeM R1dBcU3tehy1TM+M7/BNi9jx55pOByDYwHPm1baCeldHB0p+11jcLJn/w== X-Google-Smtp-Source: AGHT+IGVsS545f+06CJuwGM/yBqZGWypwh6O0LtKIkZiRjXaiErpmIcbDVa/9/ZlmAcsjgrAdUHzvHwJw2VV5d/kmio= X-Received: by 2002:a05:690e:2596:b0:63f:a6da:4b32 with SMTP id 956f58d0204a3-63fd34bea93mr557507d50.7.1762286348386; Tue, 04 Nov 2025 11:59:08 -0800 (PST) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 References: <202511041831.5A4IVcwP050150@gitrepo.freebsd.org> <0100019a504a0fcf-07113e1c-7b48-4d28-890d-e41291beb203-000000@email.amazonses.com> In-Reply-To: <0100019a504a0fcf-07113e1c-7b48-4d28-890d-e41291beb203-000000@email.amazonses.com> From: Alfonso Siciliano Date: Tue, 4 Nov 2025 20:58:59 +0100 X-Gm-Features: AWmQ_bnpc-h2-XSsLYYvl-6LBJJCBHZqiCnaP-um03RPpuXxblTSrjDvukTNhBY Message-ID: Subject: Re: git: 0595e10ec773 - releng/15.0 - contrib/bsddialog: Import version 1.0.5 To: Colin Percival Cc: "Alfonso S. Siciliano" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org, FreeBSD Release Engineering Team Content-Type: multipart/alternative; boundary="000000000000c9c70a0642ca43c2" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d1K6B0pB1z46Kw --000000000000c9c70a0642ca43c2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Not a big issue in this case, but the correct process here was for you to > merge to stable/15 (as you did) and then send an email to re@ asking for > us to cherry-pick the commit to releng/15.0 (rather than merging it there > yourself). > > Colin Percival > > My error, thanks for catching that. I=E2=80=99ll remember for next time. Alfonso S. Siciliano --000000000000c9c70a0642ca43c2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Not a big issue in this case, but the correct process here was for you to merge to stable/15 (as you did) and then send an email to re@ asking for us to cherry-pick the commit to releng/15.0 (rather than merging it there yourself).

Colin Percival


=C2=A0
My = error, thanks for catching that.=C2=A0I=E2=80=99ll remember for next time.<= /div>

Alfonso S. Siciliano
--000000000000c9c70a0642ca43c2-- From nobody Tue Nov 4 20:25:23 2025 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 4d1KhN37Hpz6FF6y; Tue, 04 Nov 2025 20:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1KhN2nG4z3DZW; Tue, 04 Nov 2025 20:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762287924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zT+JP8pYVjJOmuAWaM9qKVp5PJa+1bs81yQzF1yPV7w=; b=LT4c68dAtxIWbG/yjXOEQ3ZcT/7PHsUjRuIfvzum8hCX5wSBhEfa3sFi4GmMFdjfOXZFOg QVqBE8lQoGpffjMh9StbcjNw+HMPaUrnyax+v8e+bRtSh8iSZs8E7zKLOWDZjaPlTpOzI3 EaHgfnJSkEXDSzDTVCy1f22hR6JS9dE6mZutfak7Ajm5pr6/GMsZM9ebDMspZhL0E4Wu+B yBnkZmeaJh9CZkrmL61OnvYZUoBW+yIO6LvkXVPwmg54KC6IGVVu0AauHX9AJASq4v/5Up EomP1gNxnwcYcDwXGayF0v6sH7ntHVoDpPbLQ1aekwYFjlhoHIi2tWsGMuNq7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762287924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zT+JP8pYVjJOmuAWaM9qKVp5PJa+1bs81yQzF1yPV7w=; b=VX1lV1h3MOMN8UewfWSWoOdq8hdG9zvLE9vsfK9hcLj7Y0LypCDWegoPeTFT7TirMvGhmh VZiTKk1lo4ZcMJ1uJsOs8XxBxJf0m/dEboF3Q29BqPuUch9XWsO9974BFIFnnyOHRw+l5m y/VxIy8r9DdQgSUmFgMEDeNM5W38+ZqsoLprc7w/drWQgEo76TyAP07ExNV86mkcAVVqHE LDlIXCUxcROPbWooC4552GTb6V1h06+YskNuQAiH52ZOvF+I7jPe+k28bw4DJjMlIr0D9U c9v83rIVIN9QxsJezRsTMQ6G/ouT273J38yrLFGe4hXNV5Lv3y9DoUF9HhTxsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762287924; a=rsa-sha256; cv=none; b=SFOVPGQ71tevwcEE9ZW+E45t2feO17sQx7OiHbcwfjZtw3WWBk/vp1GjF7BMvUqk7VCoTC gSNkZvQrb3iyhLcNb57HbMWaByCa7/w1RN4Xfnj2KQofAdezs8oGbMd7uf2IvxW2Zg0Yxp M/r/vQgHI+GhjhH/dKkJnlWpzRBrG/C13rWsajwHb+dAtaoqCJ17cdazGl9hkWtguDcsmH 3o5hSkKYlrO2HDnoaDYAXMsyOty0LsLbqPKyXnFj5V4e5INUt+3xwOwTQmsn/feS+OgVnl r+w4sr8UvqTnZdOS6cVjLeObvrWKLrCv8VLJr3DacTWd/G7qIi1Ng/EYuKOzQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1KhN2JyJz1BYj; Tue, 04 Nov 2025 20:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4KPObR065286; Tue, 4 Nov 2025 20:25:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4KPN47065280; Tue, 4 Nov 2025 20:25:23 GMT (envelope-from git) Date: Tue, 4 Nov 2025 20:25:23 GMT Message-Id: <202511042025.5A4KPN47065280@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 50376dcb22cb - stable/13 - contrib/bc: MFC upgrade from version 7.02 to 7.1.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 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/13 X-Git-Reftype: branch X-Git-Commit: 50376dcb22cbf92addc299934cf4e85397995685 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=50376dcb22cbf92addc299934cf4e85397995685 commit 50376dcb22cbf92addc299934cf4e85397995685 Author: Stefan Eßer AuthorDate: 2025-09-11 14:16:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-04 20:24:57 +0000 contrib/bc: MFC upgrade from version 7.02 to 7.1.0 This update fixes a few bugs: - Improper response to double SIGINT with editline. - Not letting libedit handle terminal size changes. - A dc crash from improperly handling an error. - A duplicate check for reference arrays. - Build failures with GCC 15. Add extra defines required for bc-7.1.0 to the Makefiles. The “all.sh” script in version 7.1.0 accepts one less parameter for selecting the tests to be run. (cherry picked from commit 4c178fe36e01f84f3c65f6953cbe8dbe5b3fc908) (cherry picked from commit ab36487a79cd0093d76ec3cdc8eb8c0e114835db) --- contrib/bc/LICENSE.md | 4 +- contrib/bc/MAINTENANCE-TERMS.md | 80 + contrib/bc/Makefile.in | 285 +- contrib/bc/NEWS.md | 23 + contrib/bc/NOTICE.md | 2 +- contrib/bc/README.md | 21 +- contrib/bc/VERSION.txt | 1 + contrib/bc/build.gaml | 402 + contrib/bc/build.pkg.rig | 2345 ++++++ contrib/bc/build.rig | 575 ++ contrib/bc/compile_flags.txt | 3 + contrib/bc/configure.sh | 477 +- contrib/bc/gen/bc_help.txt | 4 +- contrib/bc/gen/dc_help.txt | 4 +- contrib/bc/gen/lib.bc | 2 +- contrib/bc/gen/lib2.bc | 115 +- contrib/bc/gen/strgen.c | 4 +- contrib/bc/gen/strgen.sh | 4 +- contrib/bc/include/args.h | 2 +- contrib/bc/include/bc.h | 8 +- contrib/bc/include/bcl.h | 2 +- contrib/bc/include/dc.h | 2 +- contrib/bc/include/file.h | 2 +- contrib/bc/include/history.h | 26 +- contrib/bc/include/lang.h | 6 +- contrib/bc/include/lex.h | 2 +- contrib/bc/include/library.h | 2 +- contrib/bc/include/num.h | 2 +- contrib/bc/include/opt.h | 2 +- contrib/bc/include/ossfuzz.h | 2 +- contrib/bc/include/parse.h | 2 +- contrib/bc/include/program.h | 16 +- contrib/bc/include/rand.h | 2 +- contrib/bc/include/read.h | 2 +- contrib/bc/include/status.h | 7 +- contrib/bc/include/vector.h | 2 +- contrib/bc/include/version.h | 42 - contrib/bc/include/vm.h | 3 +- contrib/bc/locales/de_DE.ISO8859-1.msg | 2 +- contrib/bc/locales/de_DE.UTF-8.msg | 2 +- contrib/bc/locales/en_US.msg | 2 +- contrib/bc/locales/es_ES.ISO8859-1.msg | 2 +- contrib/bc/locales/es_ES.UTF-8.msg | 2 +- contrib/bc/locales/fr_FR.ISO8859-1.msg | 2 +- contrib/bc/locales/fr_FR.UTF-8.msg | 2 +- contrib/bc/locales/ja_JP.UTF-8.msg | 2 +- contrib/bc/locales/ja_JP.eucJP.msg | 2 +- contrib/bc/locales/nl_NL.ISO8859-1.msg | 2 +- contrib/bc/locales/nl_NL.UTF-8.msg | 2 +- contrib/bc/locales/pl_PL.ISO8859-2.msg | 2 +- contrib/bc/locales/pl_PL.UTF-8.msg | 2 +- contrib/bc/locales/pt_PT.ISO8859-1.msg | 2 +- contrib/bc/locales/pt_PT.UTF-8.msg | 2 +- contrib/bc/locales/ru_RU.CP1251.msg | 2 +- contrib/bc/locales/ru_RU.CP866.msg | 2 +- contrib/bc/locales/ru_RU.ISO8859-5.msg | 2 +- contrib/bc/locales/ru_RU.KOI8-R.msg | 2 +- contrib/bc/locales/ru_RU.UTF-8.msg | 2 +- contrib/bc/locales/zh_CN.GB18030.msg | 2 +- contrib/bc/locales/zh_CN.GB2312.msg | 2 +- contrib/bc/locales/zh_CN.GBK.msg | 2 +- contrib/bc/locales/zh_CN.UTF-8.msg | 2 +- contrib/bc/locales/zh_CN.eucCN.msg | 2 +- contrib/bc/manuals/bc/A.1 | 15 +- contrib/bc/manuals/bc/A.1.md | 14 +- contrib/bc/manuals/bc/E.1 | 4 +- contrib/bc/manuals/bc/E.1.md | 4 +- contrib/bc/manuals/bc/EH.1 | 4 +- contrib/bc/manuals/bc/EH.1.md | 4 +- contrib/bc/manuals/bc/EHN.1 | 4 +- contrib/bc/manuals/bc/EHN.1.md | 4 +- contrib/bc/manuals/bc/EN.1 | 4 +- contrib/bc/manuals/bc/EN.1.md | 4 +- contrib/bc/manuals/bc/H.1 | 15 +- contrib/bc/manuals/bc/H.1.md | 14 +- contrib/bc/manuals/bc/HN.1 | 15 +- contrib/bc/manuals/bc/HN.1.md | 14 +- contrib/bc/manuals/bc/N.1 | 15 +- contrib/bc/manuals/bc/N.1.md | 14 +- contrib/bc/manuals/bcl.3 | 4 +- contrib/bc/manuals/bcl.3.md | 4 +- contrib/bc/manuals/build.md | 6 +- contrib/bc/manuals/dc/A.1 | 4 +- contrib/bc/manuals/dc/A.1.md | 4 +- contrib/bc/manuals/dc/E.1 | 4 +- contrib/bc/manuals/dc/E.1.md | 4 +- contrib/bc/manuals/dc/EH.1 | 4 +- contrib/bc/manuals/dc/EH.1.md | 4 +- contrib/bc/manuals/dc/EHN.1 | 4 +- contrib/bc/manuals/dc/EHN.1.md | 4 +- contrib/bc/manuals/dc/EN.1 | 4 +- contrib/bc/manuals/dc/EN.1.md | 4 +- contrib/bc/manuals/dc/H.1 | 4 +- contrib/bc/manuals/dc/H.1.md | 4 +- contrib/bc/manuals/dc/HN.1 | 4 +- contrib/bc/manuals/dc/HN.1.md | 4 +- contrib/bc/manuals/dc/N.1 | 4 +- contrib/bc/manuals/dc/N.1.md | 4 +- contrib/bc/project/README.md | 32 + contrib/bc/project/gitea.db | Bin 0 -> 86016 bytes contrib/bc/project/github_issues.json | 3667 ++++++++++ contrib/bc/project/github_prs.json | 7729 ++++++++++++++++++++ contrib/bc/project/issue10.md | 104 + contrib/bc/scripts/exec-install.sh | 2 +- contrib/bc/scripts/format.sh | 2 +- contrib/bc/scripts/functions.sh | 2 +- contrib/bc/scripts/karatsuba.py | 2 +- contrib/bc/scripts/link.sh | 2 +- contrib/bc/scripts/lint.sh | 2 +- contrib/bc/scripts/locale_install.sh | 2 +- contrib/bc/scripts/locale_uninstall.sh | 2 +- contrib/bc/scripts/os.c | 2 +- contrib/bc/scripts/release.pkg.yao | 1410 ++++ contrib/bc/scripts/sqrt_frac_guess.bc | 2 +- contrib/bc/scripts/sqrt_int_guess.bc | 2 +- contrib/bc/scripts/sqrt_random.bc | 2 +- contrib/bc/scripts/sqrt_random.sh | 2 +- contrib/bc/src/args.c | 2 +- contrib/bc/src/bc.c | 2 +- contrib/bc/src/bc_fuzzer.c | 3 +- contrib/bc/src/bc_lex.c | 2 +- contrib/bc/src/bc_parse.c | 2 +- contrib/bc/src/data.c | 142 +- contrib/bc/src/dc.c | 2 +- contrib/bc/src/dc_fuzzer.c | 3 +- contrib/bc/src/dc_lex.c | 2 +- contrib/bc/src/dc_parse.c | 2 +- contrib/bc/src/file.c | 5 +- contrib/bc/src/history.c | 16 +- contrib/bc/src/lang.c | 7 +- contrib/bc/src/lex.c | 2 +- contrib/bc/src/library.c | 2 +- contrib/bc/src/main.c | 3 +- contrib/bc/src/num.c | 3 +- contrib/bc/src/opt.c | 2 +- contrib/bc/src/parse.c | 2 +- contrib/bc/src/program.c | 67 +- contrib/bc/src/rand.c | 2 +- contrib/bc/src/read.c | 23 +- contrib/bc/src/vector.c | 2 +- contrib/bc/src/vm.c | 35 +- contrib/bc/tests/all.sh | 42 +- contrib/bc/tests/bc/all.txt | 131 +- contrib/bc/tests/bc/errors/39.txt | 1 + contrib/bc/tests/bc/lib2.txt | 477 -- contrib/bc/tests/bc/lib2_a2.txt | 18 + contrib/bc/tests/bc/lib2_a2_results.txt | 18 + contrib/bc/tests/bc/lib2_bytes.txt | 46 + contrib/bc/tests/bc/lib2_bytes_results.txt | 46 + contrib/bc/tests/bc/lib2_ceil.txt | 24 + contrib/bc/tests/bc/lib2_ceil_results.txt | 24 + contrib/bc/tests/bc/lib2_d2r.txt | 16 + contrib/bc/tests/bc/lib2_d2r_results.txt | 16 + contrib/bc/tests/bc/lib2_fac.txt | 6 + contrib/bc/tests/bc/lib2_fac_results.txt | 6 + contrib/bc/tests/bc/lib2_gcd.txt | 7 + contrib/bc/tests/bc/lib2_gcd_results.txt | 7 + contrib/bc/tests/bc/lib2_log.txt | 32 + contrib/bc/tests/bc/lib2_log_results.txt | 32 + contrib/bc/tests/bc/lib2_p.txt | 4 + contrib/bc/tests/bc/lib2_p_results.txt | 5 + contrib/bc/tests/bc/lib2_perm.txt | 9 + contrib/bc/tests/bc/lib2_perm_results.txt | 8 + contrib/bc/tests/bc/lib2_pi.txt | 5 + contrib/bc/tests/bc/lib2_pi_results.txt | 6 + contrib/bc/tests/bc/lib2_r.txt | 23 + contrib/bc/tests/bc/lib2_r2d.txt | 17 + contrib/bc/tests/bc/lib2_r2d_results.txt | 16 + contrib/bc/tests/bc/lib2_r_results.txt | 23 + contrib/bc/tests/bc/lib2_rand.txt | 11 + contrib/bc/tests/bc/lib2_rand_results.txt | 7 + contrib/bc/tests/bc/lib2_root.txt | 13 + contrib/bc/tests/bc/lib2_root_results.txt | 13 + contrib/bc/tests/bc/lib2_tan.txt | 30 + contrib/bc/tests/bc/lib2_tan_results.txt | 29 + contrib/bc/tests/bc/lib2_uint.txt | 218 + .../bc/{lib2_results.txt => lib2_uint_results.txt} | 256 - .../bc/tests/bc/scripts/{add.bc => add_00100.bc} | 2 +- contrib/bc/tests/bc/scripts/add_00200.bc | 17 + contrib/bc/tests/bc/scripts/add_00300.bc | 17 + contrib/bc/tests/bc/scripts/add_00400.bc | 17 + contrib/bc/tests/bc/scripts/add_00500.bc | 17 + contrib/bc/tests/bc/scripts/add_00600.bc | 17 + contrib/bc/tests/bc/scripts/add_00700.bc | 17 + contrib/bc/tests/bc/scripts/add_00800.bc | 17 + contrib/bc/tests/bc/scripts/add_00900.bc | 17 + contrib/bc/tests/bc/scripts/add_01000.bc | 17 + contrib/bc/tests/bc/scripts/add_01100.bc | 17 + contrib/bc/tests/bc/scripts/add_01200.bc | 17 + contrib/bc/tests/bc/scripts/add_01300.bc | 17 + contrib/bc/tests/bc/scripts/add_01400.bc | 17 + contrib/bc/tests/bc/scripts/add_01500.bc | 17 + contrib/bc/tests/bc/scripts/add_01600.bc | 17 + contrib/bc/tests/bc/scripts/add_01700.bc | 17 + contrib/bc/tests/bc/scripts/add_01800.bc | 17 + contrib/bc/tests/bc/scripts/add_01900.bc | 17 + contrib/bc/tests/bc/scripts/add_02000.bc | 17 + contrib/bc/tests/bc/scripts/add_02100.bc | 17 + contrib/bc/tests/bc/scripts/add_02200.bc | 17 + contrib/bc/tests/bc/scripts/add_02300.bc | 17 + contrib/bc/tests/bc/scripts/add_02400.bc | 17 + contrib/bc/tests/bc/scripts/add_02500.bc | 17 + contrib/bc/tests/bc/scripts/add_02600.bc | 17 + contrib/bc/tests/bc/scripts/add_02700.bc | 17 + contrib/bc/tests/bc/scripts/add_02800.bc | 17 + contrib/bc/tests/bc/scripts/add_02900.bc | 17 + contrib/bc/tests/bc/scripts/add_03000.bc | 17 + contrib/bc/tests/bc/scripts/add_03100.bc | 17 + contrib/bc/tests/bc/scripts/add_03200.bc | 17 + contrib/bc/tests/bc/scripts/add_03300.bc | 17 + contrib/bc/tests/bc/scripts/add_03400.bc | 17 + contrib/bc/tests/bc/scripts/add_03500.bc | 17 + contrib/bc/tests/bc/scripts/add_03600.bc | 17 + contrib/bc/tests/bc/scripts/add_03700.bc | 17 + contrib/bc/tests/bc/scripts/add_03800.bc | 17 + contrib/bc/tests/bc/scripts/add_03900.bc | 17 + contrib/bc/tests/bc/scripts/add_04000.bc | 17 + contrib/bc/tests/bc/scripts/add_04100.bc | 17 + contrib/bc/tests/bc/scripts/add_04200.bc | 17 + contrib/bc/tests/bc/scripts/add_04300.bc | 17 + contrib/bc/tests/bc/scripts/add_04400.bc | 17 + contrib/bc/tests/bc/scripts/add_04500.bc | 17 + contrib/bc/tests/bc/scripts/add_04600.bc | 17 + contrib/bc/tests/bc/scripts/add_04700.bc | 17 + contrib/bc/tests/bc/scripts/add_04800.bc | 17 + contrib/bc/tests/bc/scripts/add_04900.bc | 17 + contrib/bc/tests/bc/scripts/add_05000.bc | 17 + contrib/bc/tests/bc/scripts/add_05100.bc | 17 + contrib/bc/tests/bc/scripts/add_05200.bc | 17 + contrib/bc/tests/bc/scripts/add_05300.bc | 17 + contrib/bc/tests/bc/scripts/add_05400.bc | 17 + contrib/bc/tests/bc/scripts/add_05500.bc | 17 + contrib/bc/tests/bc/scripts/add_05600.bc | 17 + contrib/bc/tests/bc/scripts/add_05700.bc | 17 + contrib/bc/tests/bc/scripts/add_05800.bc | 17 + contrib/bc/tests/bc/scripts/add_05900.bc | 17 + contrib/bc/tests/bc/scripts/add_06000.bc | 17 + contrib/bc/tests/bc/scripts/add_06100.bc | 17 + contrib/bc/tests/bc/scripts/add_06200.bc | 17 + contrib/bc/tests/bc/scripts/add_06300.bc | 17 + contrib/bc/tests/bc/scripts/add_06400.bc | 17 + contrib/bc/tests/bc/scripts/add_06500.bc | 17 + contrib/bc/tests/bc/scripts/add_06600.bc | 17 + contrib/bc/tests/bc/scripts/add_06700.bc | 17 + contrib/bc/tests/bc/scripts/add_06800.bc | 17 + contrib/bc/tests/bc/scripts/add_06900.bc | 17 + contrib/bc/tests/bc/scripts/add_07000.bc | 17 + contrib/bc/tests/bc/scripts/add_07100.bc | 17 + contrib/bc/tests/bc/scripts/add_07200.bc | 17 + contrib/bc/tests/bc/scripts/add_07300.bc | 17 + contrib/bc/tests/bc/scripts/add_07400.bc | 17 + contrib/bc/tests/bc/scripts/add_07500.bc | 17 + contrib/bc/tests/bc/scripts/add_07600.bc | 17 + contrib/bc/tests/bc/scripts/add_07700.bc | 17 + contrib/bc/tests/bc/scripts/add_07800.bc | 17 + contrib/bc/tests/bc/scripts/add_07900.bc | 17 + contrib/bc/tests/bc/scripts/add_08000.bc | 17 + contrib/bc/tests/bc/scripts/add_08100.bc | 17 + contrib/bc/tests/bc/scripts/add_08200.bc | 17 + contrib/bc/tests/bc/scripts/add_08300.bc | 17 + contrib/bc/tests/bc/scripts/add_08400.bc | 17 + contrib/bc/tests/bc/scripts/add_08500.bc | 17 + contrib/bc/tests/bc/scripts/add_08600.bc | 17 + contrib/bc/tests/bc/scripts/add_08700.bc | 17 + contrib/bc/tests/bc/scripts/add_08800.bc | 17 + contrib/bc/tests/bc/scripts/add_08900.bc | 17 + contrib/bc/tests/bc/scripts/add_09000.bc | 17 + contrib/bc/tests/bc/scripts/add_09100.bc | 17 + contrib/bc/tests/bc/scripts/add_09200.bc | 17 + contrib/bc/tests/bc/scripts/add_09300.bc | 17 + contrib/bc/tests/bc/scripts/add_09400.bc | 17 + contrib/bc/tests/bc/scripts/add_09500.bc | 17 + contrib/bc/tests/bc/scripts/add_09600.bc | 17 + contrib/bc/tests/bc/scripts/add_09700.bc | 17 + contrib/bc/tests/bc/scripts/add_09800.bc | 17 + contrib/bc/tests/bc/scripts/add_09900.bc | 17 + contrib/bc/tests/bc/scripts/add_10000.bc | 17 + contrib/bc/tests/bc/scripts/all.txt | 406 +- .../bc/scripts/{divide.bc => divide_00100.bc} | 2 +- contrib/bc/tests/bc/scripts/divide_00200.bc | 23 + contrib/bc/tests/bc/scripts/divide_00300.bc | 23 + contrib/bc/tests/bc/scripts/divide_00400.bc | 23 + contrib/bc/tests/bc/scripts/divide_00500.bc | 23 + contrib/bc/tests/bc/scripts/divide_00600.bc | 23 + contrib/bc/tests/bc/scripts/divide_00700.bc | 23 + contrib/bc/tests/bc/scripts/divide_00800.bc | 23 + contrib/bc/tests/bc/scripts/divide_00900.bc | 23 + contrib/bc/tests/bc/scripts/divide_01000.bc | 23 + contrib/bc/tests/bc/scripts/divide_01100.bc | 23 + contrib/bc/tests/bc/scripts/divide_01200.bc | 23 + contrib/bc/tests/bc/scripts/divide_01300.bc | 23 + contrib/bc/tests/bc/scripts/divide_01400.bc | 23 + contrib/bc/tests/bc/scripts/divide_01500.bc | 23 + contrib/bc/tests/bc/scripts/divide_01600.bc | 23 + contrib/bc/tests/bc/scripts/divide_01700.bc | 23 + contrib/bc/tests/bc/scripts/divide_01800.bc | 23 + contrib/bc/tests/bc/scripts/divide_01900.bc | 23 + contrib/bc/tests/bc/scripts/divide_02000.bc | 23 + contrib/bc/tests/bc/scripts/divide_02100.bc | 23 + contrib/bc/tests/bc/scripts/divide_02200.bc | 23 + contrib/bc/tests/bc/scripts/divide_02300.bc | 23 + contrib/bc/tests/bc/scripts/divide_02400.bc | 23 + contrib/bc/tests/bc/scripts/divide_02500.bc | 23 + contrib/bc/tests/bc/scripts/divide_02600.bc | 23 + contrib/bc/tests/bc/scripts/divide_02700.bc | 23 + contrib/bc/tests/bc/scripts/divide_02800.bc | 23 + contrib/bc/tests/bc/scripts/divide_02900.bc | 23 + contrib/bc/tests/bc/scripts/divide_03000.bc | 23 + contrib/bc/tests/bc/scripts/divide_03100.bc | 23 + contrib/bc/tests/bc/scripts/divide_03200.bc | 23 + contrib/bc/tests/bc/scripts/divide_03300.bc | 23 + contrib/bc/tests/bc/scripts/divide_03400.bc | 23 + contrib/bc/tests/bc/scripts/divide_03500.bc | 23 + contrib/bc/tests/bc/scripts/divide_03600.bc | 23 + contrib/bc/tests/bc/scripts/divide_03700.bc | 23 + contrib/bc/tests/bc/scripts/divide_03800.bc | 23 + contrib/bc/tests/bc/scripts/divide_03900.bc | 23 + contrib/bc/tests/bc/scripts/divide_04000.bc | 23 + contrib/bc/tests/bc/scripts/divide_04100.bc | 23 + contrib/bc/tests/bc/scripts/divide_04200.bc | 23 + contrib/bc/tests/bc/scripts/divide_04300.bc | 23 + contrib/bc/tests/bc/scripts/divide_04400.bc | 23 + contrib/bc/tests/bc/scripts/divide_04500.bc | 23 + contrib/bc/tests/bc/scripts/divide_04600.bc | 23 + contrib/bc/tests/bc/scripts/divide_04700.bc | 23 + contrib/bc/tests/bc/scripts/divide_04800.bc | 23 + contrib/bc/tests/bc/scripts/divide_04900.bc | 23 + contrib/bc/tests/bc/scripts/divide_05000.bc | 23 + contrib/bc/tests/bc/scripts/divide_05100.bc | 23 + contrib/bc/tests/bc/scripts/divide_05200.bc | 23 + contrib/bc/tests/bc/scripts/divide_05300.bc | 23 + contrib/bc/tests/bc/scripts/divide_05400.bc | 23 + contrib/bc/tests/bc/scripts/divide_05500.bc | 23 + contrib/bc/tests/bc/scripts/divide_05600.bc | 23 + contrib/bc/tests/bc/scripts/divide_05700.bc | 23 + contrib/bc/tests/bc/scripts/divide_05800.bc | 23 + contrib/bc/tests/bc/scripts/divide_05900.bc | 23 + contrib/bc/tests/bc/scripts/divide_06000.bc | 23 + contrib/bc/tests/bc/scripts/divide_06100.bc | 23 + contrib/bc/tests/bc/scripts/divide_06200.bc | 23 + contrib/bc/tests/bc/scripts/divide_06300.bc | 23 + contrib/bc/tests/bc/scripts/divide_06400.bc | 23 + contrib/bc/tests/bc/scripts/divide_06500.bc | 23 + contrib/bc/tests/bc/scripts/divide_06600.bc | 23 + contrib/bc/tests/bc/scripts/divide_06700.bc | 23 + contrib/bc/tests/bc/scripts/divide_06800.bc | 23 + contrib/bc/tests/bc/scripts/divide_06900.bc | 23 + contrib/bc/tests/bc/scripts/divide_07000.bc | 23 + contrib/bc/tests/bc/scripts/divide_07100.bc | 23 + contrib/bc/tests/bc/scripts/divide_07200.bc | 23 + contrib/bc/tests/bc/scripts/divide_07300.bc | 23 + contrib/bc/tests/bc/scripts/divide_07400.bc | 23 + contrib/bc/tests/bc/scripts/divide_07500.bc | 23 + contrib/bc/tests/bc/scripts/divide_07600.bc | 23 + contrib/bc/tests/bc/scripts/divide_07700.bc | 23 + contrib/bc/tests/bc/scripts/divide_07800.bc | 23 + contrib/bc/tests/bc/scripts/divide_07900.bc | 23 + contrib/bc/tests/bc/scripts/divide_08000.bc | 23 + contrib/bc/tests/bc/scripts/divide_08100.bc | 23 + contrib/bc/tests/bc/scripts/divide_08200.bc | 23 + contrib/bc/tests/bc/scripts/divide_08300.bc | 23 + contrib/bc/tests/bc/scripts/divide_08400.bc | 23 + contrib/bc/tests/bc/scripts/divide_08500.bc | 23 + contrib/bc/tests/bc/scripts/divide_08600.bc | 23 + contrib/bc/tests/bc/scripts/divide_08700.bc | 23 + contrib/bc/tests/bc/scripts/divide_08800.bc | 23 + contrib/bc/tests/bc/scripts/divide_08900.bc | 23 + contrib/bc/tests/bc/scripts/divide_09000.bc | 23 + contrib/bc/tests/bc/scripts/divide_09100.bc | 23 + contrib/bc/tests/bc/scripts/divide_09200.bc | 23 + contrib/bc/tests/bc/scripts/divide_09300.bc | 23 + contrib/bc/tests/bc/scripts/divide_09400.bc | 23 + contrib/bc/tests/bc/scripts/divide_09500.bc | 23 + contrib/bc/tests/bc/scripts/divide_09600.bc | 23 + contrib/bc/tests/bc/scripts/divide_09700.bc | 23 + contrib/bc/tests/bc/scripts/divide_09800.bc | 23 + contrib/bc/tests/bc/scripts/divide_09900.bc | 23 + contrib/bc/tests/bc/scripts/divide_10000.bc | 23 + .../bc/scripts/{multiply.bc => multiply_00100.bc} | 2 +- contrib/bc/tests/bc/scripts/multiply_00200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_10000.bc | 20 + contrib/bc/tests/bc/scripts/parse.bc | 20 - contrib/bc/tests/bc/scripts/parse_02.bc | 19 + contrib/bc/tests/bc/scripts/parse_03.bc | 19 + contrib/bc/tests/bc/scripts/parse_04.bc | 19 + contrib/bc/tests/bc/scripts/parse_05.bc | 19 + contrib/bc/tests/bc/scripts/parse_06.bc | 19 + contrib/bc/tests/bc/scripts/parse_07.bc | 19 + contrib/bc/tests/bc/scripts/parse_08.bc | 19 + contrib/bc/tests/bc/scripts/parse_09.bc | 19 + contrib/bc/tests/bc/scripts/parse_11.bc | 19 + contrib/bc/tests/bc/scripts/parse_12.bc | 19 + contrib/bc/tests/bc/scripts/parse_13.bc | 19 + contrib/bc/tests/bc/scripts/parse_14.bc | 19 + contrib/bc/tests/bc/scripts/parse_15.bc | 19 + contrib/bc/tests/bc/scripts/parse_16.bc | 19 + contrib/bc/tests/bc/scripts/print.bc | 25 - contrib/bc/tests/bc/scripts/print_002.bc | 22 + contrib/bc/tests/bc/scripts/print_003.bc | 22 + contrib/bc/tests/bc/scripts/print_004.bc | 22 + contrib/bc/tests/bc/scripts/print_005.bc | 22 + contrib/bc/tests/bc/scripts/print_006.bc | 22 + contrib/bc/tests/bc/scripts/print_007.bc | 22 + contrib/bc/tests/bc/scripts/print_008.bc | 22 + contrib/bc/tests/bc/scripts/print_009.bc | 22 + contrib/bc/tests/bc/scripts/print_011.bc | 22 + contrib/bc/tests/bc/scripts/print_012.bc | 22 + contrib/bc/tests/bc/scripts/print_013.bc | 22 + contrib/bc/tests/bc/scripts/print_014.bc | 22 + contrib/bc/tests/bc/scripts/print_015.bc | 22 + contrib/bc/tests/bc/scripts/print_016.bc | 22 + contrib/bc/tests/bc/scripts/print_017.bc | 22 + contrib/bc/tests/bc/scripts/print_018.bc | 22 + contrib/bc/tests/bc/scripts/print_019.bc | 22 + contrib/bc/tests/bc/scripts/print_020.bc | 22 + contrib/bc/tests/bc/scripts/print_021.bc | 22 + contrib/bc/tests/bc/scripts/print_022.bc | 22 + contrib/bc/tests/bc/scripts/print_023.bc | 22 + contrib/bc/tests/bc/scripts/print_024.bc | 22 + contrib/bc/tests/bc/scripts/print_025.bc | 22 + contrib/bc/tests/bc/scripts/print_026.bc | 22 + contrib/bc/tests/bc/scripts/print_027.bc | 22 + contrib/bc/tests/bc/scripts/print_028.bc | 22 + contrib/bc/tests/bc/scripts/print_029.bc | 22 + contrib/bc/tests/bc/scripts/print_030.bc | 22 + contrib/bc/tests/bc/scripts/print_031.bc | 22 + contrib/bc/tests/bc/scripts/print_032.bc | 22 + contrib/bc/tests/bc/scripts/print_033.bc | 22 + contrib/bc/tests/bc/scripts/print_034.bc | 22 + contrib/bc/tests/bc/scripts/print_035.bc | 22 + contrib/bc/tests/bc/scripts/print_036.bc | 22 + contrib/bc/tests/bc/scripts/print_037.bc | 22 + contrib/bc/tests/bc/scripts/print_038.bc | 22 + contrib/bc/tests/bc/scripts/print_039.bc | 22 + contrib/bc/tests/bc/scripts/print_040.bc | 22 + contrib/bc/tests/bc/scripts/print_041.bc | 22 + contrib/bc/tests/bc/scripts/print_042.bc | 22 + contrib/bc/tests/bc/scripts/print_043.bc | 22 + contrib/bc/tests/bc/scripts/print_044.bc | 22 + contrib/bc/tests/bc/scripts/print_045.bc | 22 + contrib/bc/tests/bc/scripts/print_046.bc | 22 + contrib/bc/tests/bc/scripts/print_047.bc | 22 + contrib/bc/tests/bc/scripts/print_048.bc | 22 + contrib/bc/tests/bc/scripts/print_049.bc | 22 + contrib/bc/tests/bc/scripts/print_050.bc | 22 + contrib/bc/tests/bc/scripts/print_051.bc | 22 + contrib/bc/tests/bc/scripts/print_052.bc | 22 + contrib/bc/tests/bc/scripts/print_053.bc | 22 + contrib/bc/tests/bc/scripts/print_054.bc | 22 + contrib/bc/tests/bc/scripts/print_055.bc | 22 + contrib/bc/tests/bc/scripts/print_056.bc | 22 + contrib/bc/tests/bc/scripts/print_057.bc | 22 + contrib/bc/tests/bc/scripts/print_058.bc | 22 + contrib/bc/tests/bc/scripts/print_059.bc | 22 + contrib/bc/tests/bc/scripts/print_060.bc | 22 + contrib/bc/tests/bc/scripts/print_061.bc | 22 + contrib/bc/tests/bc/scripts/print_062.bc | 22 + contrib/bc/tests/bc/scripts/print_063.bc | 22 + contrib/bc/tests/bc/scripts/print_064.bc | 22 + contrib/bc/tests/bc/scripts/print_065.bc | 22 + contrib/bc/tests/bc/scripts/print_066.bc | 22 + contrib/bc/tests/bc/scripts/print_067.bc | 22 + contrib/bc/tests/bc/scripts/print_068.bc | 22 + contrib/bc/tests/bc/scripts/print_069.bc | 22 + contrib/bc/tests/bc/scripts/print_070.bc | 22 + contrib/bc/tests/bc/scripts/print_071.bc | 22 + contrib/bc/tests/bc/scripts/print_072.bc | 22 + contrib/bc/tests/bc/scripts/print_073.bc | 22 + contrib/bc/tests/bc/scripts/print_074.bc | 22 + contrib/bc/tests/bc/scripts/print_075.bc | 22 + contrib/bc/tests/bc/scripts/print_076.bc | 22 + contrib/bc/tests/bc/scripts/print_077.bc | 22 + contrib/bc/tests/bc/scripts/print_078.bc | 22 + contrib/bc/tests/bc/scripts/print_079.bc | 22 + contrib/bc/tests/bc/scripts/print_080.bc | 22 + contrib/bc/tests/bc/scripts/print_081.bc | 22 + contrib/bc/tests/bc/scripts/print_082.bc | 22 + contrib/bc/tests/bc/scripts/print_083.bc | 22 + contrib/bc/tests/bc/scripts/print_084.bc | 22 + contrib/bc/tests/bc/scripts/print_085.bc | 22 + contrib/bc/tests/bc/scripts/print_086.bc | 22 + contrib/bc/tests/bc/scripts/print_087.bc | 22 + contrib/bc/tests/bc/scripts/print_088.bc | 22 + contrib/bc/tests/bc/scripts/print_089.bc | 22 + contrib/bc/tests/bc/scripts/print_090.bc | 22 + contrib/bc/tests/bc/scripts/print_091.bc | 22 + contrib/bc/tests/bc/scripts/print_092.bc | 22 + contrib/bc/tests/bc/scripts/print_093.bc | 22 + contrib/bc/tests/bc/scripts/print_094.bc | 22 + contrib/bc/tests/bc/scripts/print_095.bc | 22 + contrib/bc/tests/bc/scripts/print_096.bc | 22 + contrib/bc/tests/bc/scripts/print_097.bc | 22 + contrib/bc/tests/bc/scripts/print_098.bc | 22 + contrib/bc/tests/bc/scripts/print_099.bc | 22 + contrib/bc/tests/bc/scripts/print_100.bc | 22 + .../bc/scripts/{subtract.bc => subtract_00100.bc} | 2 +- contrib/bc/tests/bc/scripts/subtract_00200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_10000.bc | 17 + contrib/bc/tests/bc/timeconst.sh | 5 +- contrib/bc/tests/bcl.c | 2 +- contrib/bc/tests/dc/scripts/easter.dc | 49 + contrib/bc/tests/dc/scripts/easter.sh | 93 - contrib/bc/tests/dc/scripts/easter.txt | 5 + contrib/bc/tests/dc/scripts/prime.dc | 2 +- contrib/bc/tests/error.sh | 4 +- contrib/bc/tests/errors.sh | 4 +- contrib/bc/tests/extra_required.txt | 17 +- contrib/bc/tests/history.py | 4 +- contrib/bc/tests/history.sh | 2 +- contrib/bc/tests/other.sh | 593 -- contrib/bc/tests/read.sh | 166 - contrib/bc/tests/script.sh | 25 +- contrib/bc/tests/scripts.sh | 17 +- contrib/bc/tests/stdin.sh | 2 +- contrib/bc/tests/test.sh | 24 +- contrib/bc/vs/bc.vcxproj | 1 - contrib/bc/vs/bc.vcxproj.filters | 3 - contrib/bc/vs/bcl.vcxproj | 1 - contrib/bc/vs/bcl.vcxproj.filters | 3 - usr.bin/gh-bc/Makefile | 6 +- usr.bin/gh-bc/tests/Makefile | 9 +- 715 files changed, 28229 insertions(+), 3016 deletions(-) diff --git a/contrib/bc/LICENSE.md b/contrib/bc/LICENSE.md index c8f6758e6d4b..e5d44dee6dab 100644 --- a/contrib/bc/LICENSE.md +++ b/contrib/bc/LICENSE.md @@ -1,6 +1,6 @@ # License -Copyright (c) 2018-2024 Gavin D. Howard +Copyright (c) 2018-2025 Gavin D. Howard Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -60,7 +60,7 @@ The files `src/rand.c` and `include/rand.h` are under the following copyrights and license: Copyright (c) 2014-2017 Melissa O'Neill and PCG Project contributors
-Copyright (c) 2018-2024 Gavin D. Howard +Copyright (c) 2018-2025 Gavin D. Howard Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/contrib/bc/MAINTENANCE-TERMS.md b/contrib/bc/MAINTENANCE-TERMS.md new file mode 100644 index 000000000000..ef24202cc6c2 --- /dev/null +++ b/contrib/bc/MAINTENANCE-TERMS.md @@ -0,0 +1,80 @@ +# Maintenance Terms + +> Last Updated: 27 June 2025 + +The code, text, and other materials in this repository are provided as-is under +the terms of the repository's [`LICENSE.md`][0] file, as a gift to the commons +and the common good. In providing this software as-is, its author(s) admit no +further obligations from anyone using the software for any reason, particularly +with respect to: + +* Releases, +* Response time, +* Change review and integration, +* Disclosure schedules, +* Discretionary, proprietary or otherwise secretive communications, and +* Any other non-contractual obligations or conventions, regardless of their + presumed urgency or severity. + +Should anyone wish to make a contract with me (Gavin Howard) to ensure that work +he or she deems critical gets done, the terms are as follows: + +* Compute time will be charged at \$25/hr. +* My time will be charged at \$100/hr. +* All issues deemed critical by either me or the requester, that also change the + source code (anything in `gen`, `include`, or `src`) will require at least two + weeks of fuzzing without error. + * If errors are found, those hours will still be charged on top of the final + two weeks. +* All changes will require running the [release script][2] on Linux (GCC), Linux + (Clang), FreeBSD, OpenBSD, macOS, Windows. +* Any hours spent on bugs or code that have been, or are suspected to have been, + generated by "AI" will be charged double rates. + +Compute time includes, but is not limited to: + +* Fuzzing. +* Running my [release script][2]. +* Running tests and my [release script][2] on macOS. + +My time includes, but is not limited to: + +* Code review. +* Reading bug reports. +* Design. +* Coding. +* Any compute time that interferes with my ability to do any other work: + * Fuzzing makes my computer unusable, so fuzzing for the 8-12 hours of the + day that I could be working will be charged at \$100/hr. + * Same with running my [release script][2] because I run two instances on my + machine and two in VMs at the same time. + * Running my [release script][2] or any other compute time on Windows + because Windows blocks me from doing my main work on Linux. + * Any other instances of blocking compute time. + +All amounts will be billed by, and paid to, [Yzena, LLC][2]. Invoices will be +provided, including line items for what each hour was spent on. + +It is suggested that the following amounts be budgeted: + +* At least \$3000 for a non-critical issue or change. + + The release script takes about 10 hours, and I would need to run it once on + Linux (and others at the same time) and once on Windows, which is 20 hours. + Most of that won't be at the \$100/hr rate, but some probably will be. Then + an extra \$1000 for other work. + +* At least \$15,000 for a critical issue or change. + + The \$3000 above is the start, which leaves \$12,000. Fuzzing is expected to + cost \$11,400 (6 days a week, 8 hours a day, at \$100, the rest at \$25), and + rounded up to \$12,000 for good measure. + +--- + +This document is inspired by [Mike Hoye's Maintenance Terms][1]. + +[0]: LICENSE.md +[1]: https://github.com/mhoye/maintenance-terms +[2]: scripts/release.sh +[3]: https://yzena.com/ diff --git a/contrib/bc/Makefile.in b/contrib/bc/Makefile.in index c63dc242e79a..f8b120c1328e 100644 --- a/contrib/bc/Makefile.in +++ b/contrib/bc/Makefile.in @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2018-2024 Gavin D. Howard and contributors. +# Copyright (c) 2018-2025 Gavin D. Howard and contributors. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -38,6 +38,8 @@ GENDIR = $(ROOTDIR)/gen BUILDDIR = %%BUILDDIR%% +VERSION = %%VERSION%% + SRC = %%SRC%% OBJ = %%OBJ%% GCDA = %%GCDA%% @@ -99,17 +101,16 @@ BC_FUZZER_C = $(BIN)/$(BC)_fuzzer_C DC_FUZZER = $(BIN)/$(DC)_fuzzer_c DC_FUZZER_C = $(BIN)/$(DC)_fuzzer_C -BC_TEST_OUTPUTS = tests/bc_outputs BC_FUZZ_OUTPUTS = tests/fuzzing/bc_outputs1 tests/fuzzing/bc_outputs2 tests/fuzzing/bc_outputs3 -DC_TEST_OUTPUTS = tests/dc_outputs DC_FUZZ_OUTPUTS = tests/fuzzing/dc_outputs LIB = libbcl LIB_NAME = $(LIB).a LIBBC = $(BIN)/$(LIB_NAME) BCL = bcl -BCL_TEST = $(BIN)/$(BCL) -BCL_TEST_C = $(TESTSDIR)/$(BCL).c + +GENERATE_TESTS = %%GENERATE_TESTS%% +PROBLEMATIC_TESTS = %%PROBLEMATIC_TESTS%% MANUALS = manuals BC_MANPAGE_NAME = $(EXEC_PREFIX)$(BC)$(EXEC_SUFFIX).1 @@ -152,11 +153,11 @@ BC_ENABLE_EXTRA_MATH = %%EXTRA_MATH%% BC_ENABLE_NLS = %%NLS%% BC_EXCLUDE_EXTRA_MATH = %%EXCLUDE_EXTRA_MATH%% -BC_ENABLE_AFL = %%FUZZ%% -BC_ENABLE_OSSFUZZ = %%OSSFUZZ%% -BC_ENABLE_MEMCHECK = %%MEMCHECK%% +BC_ENABLE_AFL = 0 +BC_ENABLE_OSSFUZZ = 0 +BC_ENABLE_MEMCHECK = 0 -LIB_FUZZING_ENGINE = %%LIB_FUZZING_ENGINE%% +LIB_FUZZING_ENGINE = 0 BC_DEFAULT_BANNER = %%BC_DEFAULT_BANNER%% BC_DEFAULT_SIGINT_RESET = %%BC_DEFAULT_SIGINT_RESET%% @@ -189,10 +190,6 @@ KARATSUBA = $(SCRIPTSDIR)/karatsuba.py LOCALE_INSTALL = $(SCRIPTSDIR)/locale_install.sh LOCALE_UNINSTALL = $(SCRIPTSDIR)/locale_uninstall.sh -VALGRIND_ARGS = --error-exitcode=100 --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all - -TEST_STARS = *********************************************************************** - BC_NUM_KARATSUBA_LEN = %%KARATSUBA_LEN%% BC_DEFS0 = -DBC_DEFAULT_BANNER=$(BC_DEFAULT_BANNER) @@ -218,7 +215,7 @@ CPPFLAGS6 = $(CPPFLAGS5) -DBC_ENABLE_NLS=$(BC_ENABLE_NLS) CPPFLAGS7 = $(CPPFLAGS6) -D$(BC_ENABLE_EXTRA_MATH_NAME)=$(BC_ENABLE_EXTRA_MATH) CPPFLAGS8 = $(CPPFLAGS7) -DBC_ENABLE_HISTORY=$(BC_ENABLE_HISTORY) -DBC_ENABLE_LIBRARY=$(BC_ENABLE_LIBRARY) CPPFLAGS9 = $(CPPFLAGS8) -DBC_ENABLE_MEMCHECK=$(BC_ENABLE_MEMCHECK) -DBC_ENABLE_AFL=$(BC_ENABLE_AFL) -CPPFLAGS = $(CPPFLAGS9) -DBC_ENABLE_OSSFUZZ=$(BC_ENABLE_OSSFUZZ) +CPPFLAGS = -DVERSION=$(VERSION) $(CPPFLAGS9) -DBC_ENABLE_OSSFUZZ=$(BC_ENABLE_OSSFUZZ) CFLAGS = $(CPPFLAGS) $(BC_DEFS) $(DC_DEFS) %%CPPFLAGS%% %%CFLAGS%% LDFLAGS = %%LDFLAGS%% @@ -293,236 +290,10 @@ help: @printf ' check alias for `make test`\n' @printf ' clean removes all build files\n' @printf ' clean_config removes all build files as well as the generated Makefile\n' - @printf ' clean_tests removes all build files, the generated Makefile,\n' - @printf ' and generated tests\n' @printf ' install installs binaries to "%s%s"\n' "$(DESTDIR)" "$(BINDIR)" @printf ' and (if enabled) manpages to "%s%s"\n' "$(DESTDIR)" "$(MAN1DIR)" - @printf ' karatsuba runs the karatsuba script (requires Python 3)\n' - @printf ' karatsuba_test runs the karatsuba script while running tests\n' - @printf ' (requires Python 3)\n' @printf ' uninstall uninstalls binaries from "%s%s"\n' "$(DESTDIR)" "$(BINDIR)" @printf ' and (if enabled) manpages from "%s%s"\n' "$(DESTDIR)" "$(MAN1DIR)" - @printf ' test runs the test suite\n' - @printf ' test_bc runs the bc test suite, if bc has been built\n' - @printf ' test_dc runs the dc test suite, if dc has been built\n' - @printf ' time_test runs the test suite, displaying times for some things\n' - @printf ' time_test_bc runs the bc test suite, displaying times for some things\n' - @printf ' time_test_dc runs the dc test suite, displaying times for some things\n' - @printf ' timeconst runs the test on the Linux timeconst.bc script,\n' - @printf ' if it exists and bc has been built\n' - -run_all_tests: bc_all_tests timeconst_all_tests dc_all_tests - -run_all_tests_np: bc_all_tests_np timeconst_all_tests dc_all_tests_np - -bc_all_tests: - %%BC_ALL_TESTS%% - -bc_all_tests_np: - %%BC_ALL_TESTS_NP%% - -timeconst_all_tests: - %%TIMECONST_ALL_TESTS%% - -dc_all_tests: - %%DC_ALL_TESTS%% - -dc_all_tests_np: - %%DC_ALL_TESTS_NP%% - -history_all_tests: - %%HISTORY_TESTS%% - -check: test - -test: %%TESTS%% - -test_bc: test_bc_header test_bc_tests test_bc_scripts test_bc_errors test_bc_stdin test_bc_read test_bc_other - @printf '\nAll bc tests passed.\n\n$(TEST_STARS)\n' - -test_bc_tests:%%BC_TESTS%% - -test_bc_scripts:%%BC_SCRIPT_TESTS%% - -test_bc_stdin: *** 37552 LINES SKIPPED *** From nobody Wed Nov 5 01:33:15 2025 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 4d1SWb45Sxz6Fxqh; Wed, 05 Nov 2025 01:33: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1SWb3GXsz3nCl; Wed, 05 Nov 2025 01:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762306395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SnVKyirxoCyWUkIknMXtqEfz+O4NhPnFf5lfNo4Y2qE=; b=P9oA/rxn72yfwQOeqF0sPi83MbzgVl+N5BbbkybmTHzGScIYLf/iixLsO4RUe1WKqMnE3S 1Z93HX6e54B2b1gn+eM6nfluBDWnvYwwApxqzdeQkw0hIGOV9fAj9H+vAXgNsaDGDbZtS8 3CW51Cny3SDZDWrGNhz8Zu9OcQeDWJS0b9VaJZ8Z3PXryCXIGgCMdjuBSdijncDOqrGZ28 VsRoi9v2ctBHHB3/11u6ruu2Fpaldm8p4YPjZgalbGmxQTF0GNtXMtpNQuJl+2UHOs931j moesdYGCBVFSzcRlvWTDCAJAnahAyqP87jEkJo2kvNpS0HmXoTC8aady1es6Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762306395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SnVKyirxoCyWUkIknMXtqEfz+O4NhPnFf5lfNo4Y2qE=; b=UmspwAxmPIMC19oroCxvnQznCuc87I4mzPlYQIeyo5tUU1uc7MgkYwZgHApXRuw8ExTxnV NtCtmljXXXeiC0rHMFYEeArNrEkWd+oaN8xc8rh1Ir3QV5djXmeaq7rzpHhVs3/9YNeOEl W4LDuUR4SzYF2t0Sg9RLT4GlhyrTROjgPjEAlWLnEwN3RbzEdS5pMasL/Av3zbXfuI1WyS o1sVe5Foj3pD15RMomDlpUZC431l/G4e+skKIAfyDY/vRTTozdz6YsX3H1j3ii801NQX+X 6T1TB8WqdTw0fC5U/X6r8MFJ2Gzdp0mvA8ZdrT18uQMuAEHaq9TP7yp+6YZSHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762306395; a=rsa-sha256; cv=none; b=FJEOID9xRBHBnqQpVbRuaTAsoVS0KWnziVUDjP0ezkFh/m0I8oaG63R0lVFP4bt1WR7RSJ kIqRVAxYutIhFfpoPBET4WFgzeTjtZ4PJLpr/w4sKyt+hlrcap/M4yAIhJ7fT1m9IMeU5n QDqUkrLZ5gWMvwpsGeurG9C8OWShq09uThvxL7o/TFLy/IgzhK4KsCmLLa9jrM4k8UxCJd IEdbpydwmsWAYS61jHdUyzsQW3jcmZ5sMbpyIfk1h8XY8p+1cdtXAxcsmJFAYrvpkhMuFF FboN6oHVt6ESKTQ91yNpl6I3CK1xdFUGA2Sy3ZE03oVJIM44ptdGN+xck8xEFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1SWb2fVwz6t6; Wed, 05 Nov 2025 01:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A51XF5x047012; Wed, 5 Nov 2025 01:33:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A51XFlM047009; Wed, 5 Nov 2025 01:33:15 GMT (envelope-from git) Date: Wed, 5 Nov 2025 01:33:15 GMT Message-Id: <202511050133.5A51XFlM047009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 3a64c667f16f - stable/15 - nfs: Add support for the NFSv4 archive attribute List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 3a64c667f16fbc3c1cedee081de895aa911be523 Auto-Submitted: auto-generated The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3a64c667f16fbc3c1cedee081de895aa911be523 commit 3a64c667f16fbc3c1cedee081de895aa911be523 Author: Rick Macklem AuthorDate: 2025-10-22 21:16:48 +0000 Commit: Rick Macklem CommitDate: 2025-11-05 02:29:27 +0000 nfs: Add support for the NFSv4 archive attribute The archive attribute (UF_ARCHIVE) is listed as deprecated in RFC8881. However, the Windows NFSv4.1 client folk disagree with this and say they need support for it. This patch adds support for it, in a manner similar to what is done for UF_SYSTEM and UF_HIDDEN. (cherry picked from commit 3b6d4c6cdffd6e37b8fa6e0b0fe3067210582c9c) --- sys/fs/nfs/nfs_commonsubs.c | 24 +++++++++++++++++++++--- sys/fs/nfs/nfsproto.h | 4 ++++ sys/fs/nfsclient/nfs_clrpcops.c | 3 +++ sys/fs/nfsclient/nfs_clvnops.c | 8 ++++++-- sys/fs/nfsserver/nfs_nfsdport.c | 11 +++++++---- sys/fs/nfsserver/nfs_nfsdserv.c | 12 +++++++++++- 6 files changed, 52 insertions(+), 10 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index abfec9edc485..8e1a26eef354 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -641,6 +641,7 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, if ((flags & NFSSATTR_FULL) && vap->va_size != VNOVAL) NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_SIZE); if ((flags & NFSSATTR_FULL) && vap->va_flags != VNOVAL) { + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); } @@ -1672,9 +1673,17 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_ARCHIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - if (compare && !(*retcmpp)) - *retcmpp = NFSERR_ATTRNOTSUPP; + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (compare) { + if (!(*retcmpp) && ((*tl == newnfs_true && + (nap->na_flags & UF_ARCHIVE) == 0) || + (*tl == newnfs_false && + (nap->na_flags & UF_ARCHIVE) != 0))) + *retcmpp = NFSERR_NOTSAME; + } else if (nap != NULL) { + if (*tl == newnfs_true) + nap->na_flags |= UF_ARCHIVE; + } attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_CANSETTIME: @@ -2804,6 +2813,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, if (!has_hiddensystem) { NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); + NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); } if (clone_blksize == 0) NFSCLRBIT_ATTRBIT(&attrbits, @@ -2888,6 +2898,14 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, *tl = txdr_unsigned(NFSV4ACE_SUPTYPES); retnum += NFSX_UNSIGNED; break; + case NFSATTRBIT_ARCHIVE: + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + if ((vap->va_flags & UF_ARCHIVE) != 0) + *tl = newnfs_true; + else + *tl = newnfs_false; + retnum += NFSX_UNSIGNED; + break; case NFSATTRBIT_CANSETTIME: NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); if (fsinf.fs_properties & NFSV3FSINFO_CANSETTIME) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index d628108bdc1a..13fec8a102a3 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -1135,6 +1135,7 @@ struct nfsv3_sattr { NFSATTRBM_RDATTRERROR | \ NFSATTRBM_ACL | \ NFSATTRBM_ACLSUPPORT | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_CANSETTIME | \ NFSATTRBM_CASEINSENSITIVE | \ NFSATTRBM_CASEPRESERVING | \ @@ -1217,6 +1218,7 @@ struct nfsv3_sattr { #define NFSATTRBIT_SETABLE0 \ (NFSATTRBM_SIZE | \ NFSATTRBM_HIDDEN | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_ACL) #define NFSATTRBIT_SETABLE1 \ (NFSATTRBM_MODE | \ @@ -1262,6 +1264,7 @@ struct nfsv3_sattr { NFSATTRBM_CHANGE | \ NFSATTRBM_SIZE | \ NFSATTRBM_FSID | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_FILEID | \ NFSATTRBM_HIDDEN | \ NFSATTRBM_MAXREAD) @@ -1298,6 +1301,7 @@ struct nfsv3_sattr { NFSATTRBM_CHANGE | \ NFSATTRBM_SIZE | \ NFSATTRBM_FSID | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_FILEID | \ NFSATTRBM_HIDDEN | \ NFSATTRBM_MAXREAD) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 544b1962de26..bad3e69ca5cf 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -4162,9 +4162,12 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, NFSATTRBIT_TIMECREATE)) NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); if (!NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, + NFSATTRBIT_ARCHIVE) || + !NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN) || !NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM)) { + NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); } diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index eee571a04821..5ce764fcedea 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1081,12 +1081,14 @@ nfs_setattr(struct vop_setattr_args *ap) #endif /* - * Only setting of UF_HIDDEN and UF_SYSTEM are supported and + * Only setting of UF_ARCHIVE, UF_HIDDEN and UF_SYSTEM are supported and * only for NFSv4 servers that support them. */ nmp = VFSTONFS(vp->v_mount); if (vap->va_flags != VNOVAL && (!NFSHASNFSV4(nmp) || - (vap->va_flags & ~(UF_HIDDEN | UF_SYSTEM)) != 0 || + (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 && @@ -4835,6 +4837,8 @@ nfs_pathconf(struct vop_pathconf_args *ap) break; case _PC_HAS_HIDDENSYSTEM: if (NFS_ISV4(vp) && 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)) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 5ba86314ead1..ff28b089da5d 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3193,7 +3193,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, bitpos = NFSATTRBIT_MAX; } else { bitpos = 0; - if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN) || + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_ARCHIVE) || + NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN) || NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_SYSTEM)) nvap->na_flags = 0; } @@ -3226,9 +3227,11 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, attrsum += aclsize; break; case NFSATTRBIT_ARCHIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - if (!nd->nd_repstat) - nd->nd_repstat = NFSERR_ATTRNOTSUPP; + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (nd->nd_repstat == 0) { + if (*tl == newnfs_true) + nvap->na_flags |= UF_ARCHIVE; + } attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_HIDDEN: diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 9dda65d5cbcf..217675173add 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -436,6 +436,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, /* For NFSv4, only va_uid and va_flags is used from nva2. */ NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_OWNER); + NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_ARCHIVE); NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_HIDDEN); NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_SYSTEM); preat_ret = nfsvno_getattr(vp, &nva2, nd, p, 1, &retbits); @@ -569,8 +570,15 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, } } if (!nd->nd_repstat && - (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN) || + (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE) || + NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN) || NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM))) { + if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE)) { + if ((nva.na_flags & UF_ARCHIVE) != 0) + oldflags |= UF_ARCHIVE; + else + oldflags &= ~UF_ARCHIVE; + } if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN)) { if ((nva.na_flags & UF_HIDDEN) != 0) oldflags |= UF_HIDDEN; @@ -588,6 +596,8 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, nd->nd_repstat = nfsvno_setattr(vp, &nva2, nd->nd_cred, p, exp); if (!nd->nd_repstat) { + if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE)) + NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_ARCHIVE); if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN)) NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_HIDDEN); if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM)) From nobody Wed Nov 5 02:25:18 2025 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 4d1Tgf5pzKz6G2sK; Wed, 05 Nov 2025 02:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1Tgf4hCZz3s6g; Wed, 05 Nov 2025 02:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762309518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EJD+sAnVExp79WfcyQFnhESBnYD7Rsa+PtAQjDZa5JA=; b=O5XPLlPw8YECGzFEV8PmNu8oYeFZBDOr4tgMyq3g5ck2Kwgpg5pjDJKyOBPRnSCCxEFfmb ILcUYy2bqTVF+9YvJP61uAI6KW+SQv+oEBuVOO0YLa1NkVm0K5XNRVK3MA9Rcwu+XmGY76 x6ealocr/6RChzv7JWVpXlo12Et69IAdz03Ylz62+6Eldf534ZFEMy6FDdNrUzxqqIeKCE Asd6nBHSEW12qPC7agWtymStFYenDksf6SRT64exEEWVrvMW98MRQ7A9e2ys/GjREG+gJn VhSLJkt6w/WzYaT5QjCszAfHHAtLvtp2h80n2+uIOySVpYAcmHPFzlXC2jOYyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762309518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EJD+sAnVExp79WfcyQFnhESBnYD7Rsa+PtAQjDZa5JA=; b=QPCyub6e4VSxCDyRTnPXkTFy9/2zKPm/gPPRRrc0gQjpSiN0zIGjYPpjjUcLU2k3E4j3hs 4w0K3OSuWQ86tMUVhGTgnxEV5JLIEfxKz9cGpM+ZpDz2amaldjW56g9olyI5verYxLo85R QWCWQEK0O8KCMPOjixWbZOVbGhBpJ1Pmq4JY47B2NbHrrSoeZBC78YkIaAkjj7lnTJV950 bNwhQsYmStSgctEf7dBy814QAt0txs/e2RKAgXcsaWFYTFzFeKYnwbEkRYdar4Boytytb3 vMJIAjdoWs+nt7+adbNhWYDLtWDByOD8PI+nTCeqFZyZsSO88u14/zLWQtBFDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762309518; a=rsa-sha256; cv=none; b=CT649az/Jp/h0rAZmC3IZN6wm3TI2CaIoyGitERT+5XLLRpFWpTnO/8TBkwOH/BWTt6ntV W0obI9f6+5X/3sDA365iEUtqq0SuHVoPlfd8pzwTiuwxb09WTiTHzNGgBXU7I9MJNzMTRD 5RyYn9VuvFvyUa2Gpc+rXAMr62wNR431gvfawCzc/18m3rz94WJdgGCCGtjP1EmOTZpUux e0JtVThNPVK9rR9F2Axv1vPfkhzQknpw1WbEDEwpHDzYrRsARRYUsyH602+2aqfYiRaOlt TrKF5FSORXNnbdL8akl65BQjy4Z4e5CDpo7uMtqki/YEiVF+gVQQqR5TWC2r+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1Tgf4Gp7z86s; Wed, 05 Nov 2025 02:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A52PIao042290; Wed, 5 Nov 2025 02:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A52PISR042287; Wed, 5 Nov 2025 02:25:18 GMT (envelope-from git) Date: Wed, 5 Nov 2025 02:25:18 GMT Message-Id: <202511050225.5A52PISR042287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b72337250610 - stable/15 - kern/subr_syscalls.c: declare 'traced' local variables boolean List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: b72337250610eb9a26f3a1bb65959f2093e794a8 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b72337250610eb9a26f3a1bb65959f2093e794a8 commit b72337250610eb9a26f3a1bb65959f2093e794a8 Author: Konstantin Belousov AuthorDate: 2025-10-30 18:35:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-05 02:25:00 +0000 kern/subr_syscalls.c: declare 'traced' local variables boolean (cherry picked from commit a6a9d97708ec18bf307b01141d84aabd01289159) --- sys/kern/subr_syscall.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index d5b3b62f0821..48896529f685 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -55,8 +55,8 @@ syscallenter(struct thread *td) struct proc *p; struct syscall_args *sa; struct sysent *se; - int error, traced; - bool sy_thr_static; + int error; + bool sy_thr_static, traced; VM_CNT_INC(v_syscall); p = td->td_proc; @@ -219,7 +219,7 @@ syscallret(struct thread *td) struct proc *p; struct syscall_args *sa; ksiginfo_t ksi; - int traced; + bool traced; KASSERT(td->td_errno != ERELOOKUP, ("ERELOOKUP not consumed syscall %d", td->td_sa.code)); @@ -250,9 +250,9 @@ syscallret(struct thread *td) } #endif - traced = 0; + traced = false; if (__predict_false(p->p_flag & P_TRACED)) { - traced = 1; + traced = true; PROC_LOCK(p); td->td_dbgflags |= TDB_SCX; PROC_UNLOCK(p); From nobody Wed Nov 5 07:15:45 2025 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 4d1c6p1zKcz6FkD8; Wed, 05 Nov 2025 07:15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1c6p0VXBz3Jxb; Wed, 05 Nov 2025 07:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762326946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RVVOyH4t3W5ZXRx5r0WVPRap71EwycFn/VLqwWIJwI=; b=Cnm4p4SfLeXIvuyLwfid5WyaRgCb5KO7TPO4hQKjn5ITD42mgA6R9wKDrk8r123L/g2FV2 WRdvMXV1x8Vbl+oHGt934x8q9bzx3acv5Orh9HaOwby1Khv/mLYC5aEyV0NYW5LUKK7MuC WD0bVCOAc4zPqCrmz8kWRPhNEbeuoLal5JhwfUnQNcKxSX/4hwdbTP4h+LtXfR6C6Yw4As RFpgzgSO5yKG+eAffrVO8yKRuvH6HLjMe8lIz1h/QDNreYpALazCYakShS3dCE5BFQLF0Q KkWVVkoLZdMv8PuRgMZVxxAca4lbOMKl/sMYn9zIyqcE1YktGMRbAWCP+d+3Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762326946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RVVOyH4t3W5ZXRx5r0WVPRap71EwycFn/VLqwWIJwI=; b=n8T1vZ+GMnHWD26ZCcCF3VvZed9i5jFUd1kmdc+Ueq0hRhr2p7sV2pJ0em8oV2/nY/olvS R/tQuMSickRt6yFfzif90a8Im6t6G6qyF0Int6veaJ8jwmMg3TpYAMeA9AMDFpSsbxGGm+ bk9nwamDasqsiIkq/wE64POomNrjGT3YbHVaQeXWCW14gBbCn79bF2LBMQmVG+g4FCNkeA hlxmjOcgChKXyLHP/HoqgYsQr9e3joFw8qEVomN6WjXFK3KQiO2VHk1crsJg5Yd3/lqv/y G7Vg6Ozh3zjId/epCoM4hQa0Y765XqSWXSIOOK4kPhmypEf5VYoy9wxcGxge/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762326946; a=rsa-sha256; cv=none; b=IydDtNAeuzHGFIIdBi5fI6hsF5jSO/hHjf+ZpPmIZZwdONahnzw2YzSo3a5oZ55DXubG+z MRgC2uw8eXE51wPVwnZKxwzakL35WRa7nvQU1lOrHLzyZaeQFk5vXNQlGMZS7PvUcb+u72 r1mia6SxUr/AmKNp8A+x1lkq6xMFOd1uhNGW4xEu2rp6bOuKlbuigUtmOMf6lmI/Ce5wCt Wlke3oBR91WmaaofPPymZpctbjTyDwpxfYoBrfae9o7epjA5GSQsMHSHsz+ZjTD4FdVW7D 0yEQRrur1tlvZ0KVN87VTt5GrQ9VMQNMFrA24sTYriiRxKZDf+o3mXIwTgBlYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1c6n6wTwzY97; Wed, 05 Nov 2025 07:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A57Fj7W088822; Wed, 5 Nov 2025 07:15:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A57Fjoq088819; Wed, 5 Nov 2025 07:15:45 GMT (envelope-from git) Date: Wed, 5 Nov 2025 07:15:45 GMT Message-Id: <202511050715.5A57Fjoq088819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 7f4c2bf8ea6c - stable/14 - netinet: provide "at offset" variant of the in_delayed_cksum() API List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f4c2bf8ea6cdbdcca1eccce9508206e2cf05cce Auto-Submitted: auto-generated The branch stable/14 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=7f4c2bf8ea6cdbdcca1eccce9508206e2cf05cce commit 7f4c2bf8ea6cdbdcca1eccce9508206e2cf05cce Author: Maxim Sobolev AuthorDate: 2025-08-25 22:12:56 +0000 Commit: Maxim Sobolev CommitDate: 2025-11-05 07:14:04 +0000 netinet: provide "at offset" variant of the in_delayed_cksum() API The need for such a variant comes from the fact that we need to re-calculate checksum aftet ng_nat(4) transformations while getting mbufs from the layer 2 (ethernet) directly. Reviewed by: markj, tuexen Approved by: tuexen Sponsored by: Sippy Software, Inc. Differential Revision: https://reviews.freebsd.org/D49677 (cherry picked from commit 5feb38e37847c10af86f5c75dc768518973c6aaa) --- sys/netinet/ip_output.c | 13 ++++++++++--- sys/netinet/ip_var.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 66051c9c711c..e3ef8e2c7dd9 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1045,14 +1045,14 @@ done: } void -in_delayed_cksum(struct mbuf *m) +in_delayed_cksum_o(struct mbuf *m, uint16_t iph_offset) { struct ip *ip; struct udphdr *uh; uint16_t cklen, csum, offset; - ip = mtod(m, struct ip *); - offset = ip->ip_hl << 2 ; + ip = (struct ip *)mtodo(m, iph_offset); + offset = iph_offset + (ip->ip_hl << 2); if (m->m_pkthdr.csum_flags & CSUM_UDP) { /* if udp header is not in the first mbuf copy udplen */ @@ -1079,6 +1079,13 @@ in_delayed_cksum(struct mbuf *m) *(u_short *)mtodo(m, offset) = csum; } +void +in_delayed_cksum(struct mbuf *m) +{ + + in_delayed_cksum_o(m, 0); +} + /* * IP socket option processing. */ diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 3220679d749f..a1402f4fa268 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -259,6 +259,7 @@ VNET_DECLARE(struct pfil_head *, inet_local_pfil_head); #define PFIL_INET_LOCAL_NAME "inet-local" void in_delayed_cksum(struct mbuf *m); +void in_delayed_cksum_o(struct mbuf *m, uint16_t o); /* Hooks for ipfw, dummynet, divert etc. Most are declared in raw_ip.c */ /* From nobody Wed Nov 5 15:21:08 2025 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 4d1pts4Pz9z6GSd7; Wed, 05 Nov 2025 15:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1ptr5bHyz4PqG; Wed, 05 Nov 2025 15:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aa2NfW3SIufLYp51Ut+QtACeB+wegUe/PnkJcWj0Bzg=; b=yIHhRFid4RqJ8C4ZsUNAqMynPFFzv2VKXEaIh/b8QPE5O9d0GQ62njjgcS3MNHjgpLkTro dxSpMFpeXPnU9w5ff1qjyz4XOwOP8qvNsEyw2rA8NpP3HVIuWOdORyn+OMLOgAQ9srIKMH X/9RYGrKLwA/uWMrWV7KmtzrnlbWEhjm99Chbvy7eax2cJVY35AwtjiKkCmnaQsyKKyQEC inNX6oNTyj0av+xmVca32HeYYJ17WbwnPYlsWClTxwv7wt21zag151Zwj47AAF/qISGkm6 6AMhmeU67Hwpvc7JGzuz7fW+dMwFZYh80Ew7SdVNG9SMCjBuax3i8rPwmgV8wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aa2NfW3SIufLYp51Ut+QtACeB+wegUe/PnkJcWj0Bzg=; b=fBL76gjSfP3dh7x8I3RRdwLrn+TtpaLUJZ+UIFExNHxxohDWjQrEIieOh3uK441tq1BkAS UgwgsXFQhKBLhdklg8E86mil0go6p8EIVscSLUypY3WQVqPSayNmGxUgkwna4SXAbtAToe LRYTQFcJ9707kbTKQZfEVHAsx7XPDJDsIeFqFEzLPLgpVT599FlCtxPw5AYuuX+Obc/Ofc wFS6qXwzfy2fdgxWPDagiFpxeZRIs+LCOLQLuL0gFKe9KbiWlzE61KfwkATlNXAbGLMKfO kSo2XDdj9NM2wexDWO1MG4cz2J0Rt+tZsMHbr5wppfNaLFHqMv57f8JP4CeYsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762356068; a=rsa-sha256; cv=none; b=YSz7jG/hnJSaY9p5TRmTC/Rbk6suSUYTvGkqLJXDPeY4uJZXzZlHgAc5Evauko4V8TMfMV 3UOcYa+AU7+FHKXiKuZME7/TaJ+A7HSgOc/vpOPSVojlz07A9ExcxJfxiqSAwAfrwAprM+ Eqc7yWoIhvrWC3OFfm+1DhrhKQDieAuV50zgWISn6ixEWMX8KqnZWIXE3tSqWd4pE3mm4D 4FGVtugPQQK5GeC79CL1qk7se8nJfef1xbykvW/FkLu+AsmyKULrK7ysWCiHLDGHYUhdVw gYA5PGCd2S/5CaM6fIdE3mZK//NZOqfWI5iWe/fhfy+vC+G9N6ncCi+JGViBnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1ptr59jhzpQt; Wed, 05 Nov 2025 15:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5FL80e010092; Wed, 5 Nov 2025 15:21:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5FL86H010089; Wed, 5 Nov 2025 15:21:08 GMT (envelope-from git) Date: Wed, 5 Nov 2025 15:21:08 GMT Message-Id: <202511051521.5A5FL86H010089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 6985b90cd0fc - stable/14 - blocklist: Update the blacklistd-helper script List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6985b90cd0fcdd6a6ddff23a87f5609d1113a187 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=6985b90cd0fcdd6a6ddff23a87f5609d1113a187 commit 6985b90cd0fcdd6a6ddff23a87f5609d1113a187 Author: Jose Luis Duran AuthorDate: 2025-11-05 15:06:17 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-05 15:20:00 +0000 blocklist: Update the blacklistd-helper script Update the blacklistd-helper script, it provides a better mechanism for detecting the active packet filter. This is a direct commit to stable/14, as blacklist has been renamed to blocklist. PR: 290645 --- contrib/blocklist/libexec/blacklistd-helper | 172 +++++++++++++++++++++++++--- 1 file changed, 155 insertions(+), 17 deletions(-) diff --git a/contrib/blocklist/libexec/blacklistd-helper b/contrib/blocklist/libexec/blacklistd-helper index f92eab8b29bd..fa53c8c84932 100644 --- a/contrib/blocklist/libexec/blacklistd-helper +++ b/contrib/blocklist/libexec/blacklistd-helper @@ -17,24 +17,41 @@ if [ -f "/etc/ipfw-blacklist.rc" ]; then fi if [ -z "$pf" ]; then - for f in npf pf ipf; do - if [ -f "/etc/$f.conf" ]; then + for f in npf pf ipfilter ipfw; do + if [ -x /etc/rc.d/$f ]; then + if /etc/rc.d/$f status >/dev/null 2>&1; then + pf="$f" + break + fi + elif [ -f "/etc/$f.conf" ]; then + # xxx assume a config file means it can be enabled -- + # and the first one wins! pf="$f" break fi done fi +if [ -z "$pf" -a -x "/sbin/iptables" ]; then + pf="iptables" +fi + if [ -z "$pf" ]; then echo "$0: Unsupported packet filter" 1>&2 exit 1 fi +flags= if [ -n "$3" ]; then + raw_proto="$3" proto="proto $3" + if [ $3 = "tcp" ]; then + flags="flags S/SAFR" + fi fi if [ -n "$6" ]; then + raw_port="$6" port="port $6" fi @@ -51,12 +68,65 @@ esac case "$1" in add) case "$pf" in - ipf) - /sbin/ipfstat -io | /sbin/ipf -I -f - >/dev/null 2>&1 - echo block in quick $proto from $addr/$mask to \ - any port=$6 head port$6 | \ - /sbin/ipf -I -f - -s >/dev/null 2>&1 && echo OK + ipfilter) + # N.B.: If you reload /etc/ipf.conf then you need to stop and + # restart blacklistd (and make sure blacklistd_flags="-r"). + # This should normally already be implemented in + # /etc/rc.d/ipfilter, but if then not add the following lines to + # the end of the ipfilter_reload() function: + # + # if checkyesnox blacklistd; then + # /etc/rc.d/blacklistd restart + # fi + # + # XXX we assume the following rule is present in /etc/ipf.conf: + # (should we check? -- it probably cannot be added dynamically) + # + # block in proto tcp/udp from any to any head blacklistd + # + # where "blacklistd" is the default rulename (i.e. "$2") + # + # This rule can come before any rule that logs connections, + # etc., and should be followed by final rules such as: + # + # # log all as-yet unblocked incoming TCP connection + # # attempts + # log in proto tcp from any to any flags S/SAFR + # # last "pass" match wins for all non-blocked packets + # pass in all + # pass out all + # + # I.e. a "pass" rule which will be the final match and override + # the "block". This way the rules added by blacklistd will + # actually block packets, and prevent logging of them as + # connections, because they include the "quick" flag. + # + # N.b.: $port is not included/used in rules -- abusers are cut + # off completely from all services! + # + # Note RST packets are not returned for blocked SYN packets of + # active attacks, so the port will not appear to be closed. + # This will probably give away the fact that a firewall has been + # triggered to block connections, but it prevents generating + # extra outbound traffic, and it may also slow down the attacker + # somewhat. + # + # Note also that we don't block all packets, just new attempts + # to open connections (see $flags above). This allows us to do + # counterespionage against the attacker (or continue to make use + # of any other services that might be on the same subnet as the + # supposed attacker). However it does not kill any active + # connections -- we rely on the reporting daemon to do its own + # protection and cleanup. + # + # N.B.: The rule generated here must exactly match the + # corresponding rule generated for the "rem" command below! + # + echo block in log quick $proto \ + from $addr/$mask to any $flags group $2 | \ + /sbin/ipf -A -f - >/dev/null 2>&1 && echo OK ;; + ipfw) # use $ipfw_offset+$port for rule number rule=$(($ipfw_offset + $6)) @@ -69,10 +139,23 @@ add) table"("$tname")" to any dst-port $6 >/dev/null && \ echo OK ;; + + iptables) + if ! /sbin/iptables --list "$2" >/dev/null 2>&1; then + /sbin/iptables --new-chain "$2" + fi + /sbin/iptables --append INPUT --proto "$raw_proto" \ + --dport "$raw_port" --jump "$2" + /sbin/iptables --append "$2" --proto "$raw_proto" \ + --source "$addr/$mask" --dport "$raw_port" --jump DROP + echo OK + ;; + npf) /sbin/npfctl rule "$2" add block in final $proto from \ "$addr/$mask" to any $port ;; + pf) # if the filtering rule does not exist, create it /sbin/pfctl -a "$2/$6" -sr 2>/dev/null | \ @@ -83,45 +166,100 @@ add) /sbin/pfctl -qa "$2/$6" -t "port$6" -T add "$addr/$mask" && \ /sbin/pfctl -qk "$addr" && echo OK ;; + esac ;; rem) case "$pf" in - ipf) - /sbin/ipfstat -io | /sbin/ipf -I -f - >/dev/null 2>&1 - echo block in quick $proto from $addr/$mask to \ - any port=$6 head port$6 | \ - /sbin/ipf -I -r -f - -s >/dev/null 2>&1 && echo OK + ipfilter) + # N.B.: The rule generated here must exactly match the + # corresponding rule generated for the "add" command above! + # + echo block in log quick $proto \ + from $addr/$mask to any $flags group $2 | \ + /sbin/ipf -A -r -f - >/dev/null 2>&1 && echo OK ;; + ipfw) /sbin/ipfw table "port$6" delete "$addr/$mask" 2>/dev/null && \ echo OK ;; + + iptables) + if /sbin/iptables --list "$2" >/dev/null 2>&1; then + /sbin/iptables --delete "$2" --proto "$raw_proto" \ + --source "$addr/$mask" --dport "$raw_port" \ + --jump DROP + fi + echo OK + ;; + npf) /sbin/npfctl rule "$2" rem-id "$7" ;; + pf) /sbin/pfctl -qa "$2/$6" -t "port$6" -T delete "$addr/$mask" && \ echo OK ;; + esac ;; flush) case "$pf" in - ipf) - /sbin/ipf -Z -I -Fi -s > /dev/null && echo OK + ipfilter) + # + # N.B. WARNING: This is obviously not reentrant! + # + # First we flush all the rules from the inactive set, then we + # reload the ones that do not belong to the group "$2", and + # finally we swap the active and inactive rule sets. + # + /sbin/ipf -I -F a + # + # "ipf -I -F a" also flushes active accounting rules! + # + # Note that accounting rule groups are unique to accounting + # rules and have nothing to do with filter rules, though of + # course theoretically one could use the same group name for + # them too. + # + # In theory anyone using any such accounting rules should have a + # wrapper /etc/rc.conf.d/blacklistd script (and corresponding + # /etc/rc.conf.d/ipfilter script) that will record and + # consolidate the values accumulated by such accounting rules + # before they are flushed, since otherwise their counts will be + # lost forever. + # + /usr/sbin/ipfstat -io | fgrep -v "group $2" | \ + /sbin/ipf -I -f - >/dev/null 2>&1 + # + # This MUST be done last and separately as "-s" is executed + # _while_ the command arguments are being processed! + # + /sbin/ipf -s && echo OK ;; + ipfw) /sbin/ipfw table "port$6" flush 2>/dev/null && echo OK ;; + + iptables) + if /sbin/iptables --list "$2" >/dev/null 2>&1; then + /sbin/iptables --flush "$2" + fi + echo OK + ;; + npf) /sbin/npfctl rule "$2" flush ;; + pf) # dynamically determine which anchors exist - for anchor in $(/sbin/pfctl -a "$2" -s Anchors); do - /sbin/pfctl -a $anchor -t "port${anchor##*/}" -T flush - /sbin/pfctl -a $anchor -F rules + for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do + /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush + /sbin/pfctl -a "$anchor" -F rules done echo OK ;; From nobody Wed Nov 5 15:21:24 2025 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 4d1pv91Ddxz6GSbH; Wed, 05 Nov 2025 15:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1pv90gjxz4QSD; Wed, 05 Nov 2025 15:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26Sd7qTKQ7SiHs/oIVwmnJ5QDdyd6LkQQGTv9DaWlsk=; b=VK1zlE/wuUTIgQYgyv+Q6Wv+PF6OuG7dz2NpuOy4u0mKWw/1sqp6ced/xi7K655wJSWk6n BHDxLkaPjwrWPI07UxUD+WLW5hpvkQ8PjNn10TR4BBSTgMpnatIAOikMj839BcQC38ZCrQ +qTHdslAwtlIL6k8bKpQBV6blcx2THs/M8sEGYhpHR5Z2EQEMI8OU3cpOEX4m88hBcht1I R/27o1VAJNlFtvo+YO/xBrXorOWUBQ+dWpGGN1xa1FHzpgrmGfgedAor91C3GK/4tGuEg/ i1X61xsv+dOkFpYr/zMYnroZs4VWsy3zzdVPwTZ3PN4+sNMDkSe/+E8YFVqftg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26Sd7qTKQ7SiHs/oIVwmnJ5QDdyd6LkQQGTv9DaWlsk=; b=XhRr4qkC6YsgGtiVTbK/H+jvnFA43IfmT1UZOX1p+x7q7tdOVS82U2IgIwu5wfJ5eAOb9J zJ8uDqu41z3OhKVS01AkqGV/EnVb8xRBDvXrMvAWhElfx3ODLC7vJIRTQIz/J+sj8UkMp8 dSkOf07iHJE/PNmAXUA2qm0+Ionst+2tkeziVu4nh/Oa2gMWQ/7EkFY6/zmN7AnPzusbVF 0CBVaN1INA5c+ZK7cLa/xhqz3EVSH4cp+yX1gcNQJanEnNsSmOVi0qz917ntRYeLV6662O PC7ecDJag8Ns2/K2DQBLjw38wJEZktIxSaVLsJTUBQOcBxcMIWD7YHoqLkDDqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762356085; a=rsa-sha256; cv=none; b=ywHLJA51HWRQyMsEQaVYtXacpm81RrBw6f/B6ca1+703uKLaXO/eEipdEhzzd3oCuTquOK vJglGhOPuXzdGzxt5ZDMG3m8Iy17MARJAgEd547aUHRCSkYCOLXWfhxFPvUjeeypjugJwD HZykW40X4m4aYqFG4vlOLy5FhNFw6JQAOT1QqlZcWYWe70tboG1W6GbFzJNtEG1JmMGEeV jRE7Yfhw4a26A/urXadyd9bQYH2vW23CiN9zJ7V29I/5VEYZBRkbfj94ZT8H8Dg9aE8ZeV 6rajQbN2Ip36Tfy7FhK17EmoT+lPn678GlNszCE5AqsQ5OwibNK8Z3WC013fEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1pv87228zpR1; Wed, 05 Nov 2025 15:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5FLOgY010282; Wed, 5 Nov 2025 15:21:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5FLOe0010279; Wed, 5 Nov 2025 15:21:24 GMT (envelope-from git) Date: Wed, 5 Nov 2025 15:21:24 GMT Message-Id: <202511051521.5A5FLOe0010279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: b781ee1e0b85 - stable/13 - blacklist: Update the blacklistd-helper script List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b781ee1e0b8523ff42d798288225d802164abab5 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=b781ee1e0b8523ff42d798288225d802164abab5 commit b781ee1e0b8523ff42d798288225d802164abab5 Author: Jose Luis Duran AuthorDate: 2025-11-05 15:18:15 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-05 15:18:48 +0000 blacklist: Update the blacklistd-helper script Update the blacklistd-helper script, it provides a better mechanism for detecting the active packet filter. This is a direct commit to stable/13, as blacklist has been renamed to blocklist. PR: 290645 --- contrib/blacklist/libexec/blacklistd-helper | 175 +++++++++++++++++++++++++--- 1 file changed, 156 insertions(+), 19 deletions(-) diff --git a/contrib/blacklist/libexec/blacklistd-helper b/contrib/blacklist/libexec/blacklistd-helper index 1af320d426b0..fa53c8c84932 100644 --- a/contrib/blacklist/libexec/blacklistd-helper +++ b/contrib/blacklist/libexec/blacklistd-helper @@ -17,24 +17,41 @@ if [ -f "/etc/ipfw-blacklist.rc" ]; then fi if [ -z "$pf" ]; then - for f in npf pf ipf; do - if [ -f "/etc/$f.conf" ]; then + for f in npf pf ipfilter ipfw; do + if [ -x /etc/rc.d/$f ]; then + if /etc/rc.d/$f status >/dev/null 2>&1; then + pf="$f" + break + fi + elif [ -f "/etc/$f.conf" ]; then + # xxx assume a config file means it can be enabled -- + # and the first one wins! pf="$f" break fi done fi +if [ -z "$pf" -a -x "/sbin/iptables" ]; then + pf="iptables" +fi + if [ -z "$pf" ]; then echo "$0: Unsupported packet filter" 1>&2 exit 1 fi +flags= if [ -n "$3" ]; then + raw_proto="$3" proto="proto $3" + if [ $3 = "tcp" ]; then + flags="flags S/SAFR" + fi fi if [ -n "$6" ]; then + raw_port="$6" port="port $6" fi @@ -51,12 +68,65 @@ esac case "$1" in add) case "$pf" in - ipf) - /sbin/ipfstat -io | /sbin/ipf -I -f - >/dev/null 2>&1 - echo block in quick $proto from $addr/$mask to \ - any port=$6 head port$6 | \ - /sbin/ipf -I -f - -s >/dev/null 2>&1 && echo OK + ipfilter) + # N.B.: If you reload /etc/ipf.conf then you need to stop and + # restart blacklistd (and make sure blacklistd_flags="-r"). + # This should normally already be implemented in + # /etc/rc.d/ipfilter, but if then not add the following lines to + # the end of the ipfilter_reload() function: + # + # if checkyesnox blacklistd; then + # /etc/rc.d/blacklistd restart + # fi + # + # XXX we assume the following rule is present in /etc/ipf.conf: + # (should we check? -- it probably cannot be added dynamically) + # + # block in proto tcp/udp from any to any head blacklistd + # + # where "blacklistd" is the default rulename (i.e. "$2") + # + # This rule can come before any rule that logs connections, + # etc., and should be followed by final rules such as: + # + # # log all as-yet unblocked incoming TCP connection + # # attempts + # log in proto tcp from any to any flags S/SAFR + # # last "pass" match wins for all non-blocked packets + # pass in all + # pass out all + # + # I.e. a "pass" rule which will be the final match and override + # the "block". This way the rules added by blacklistd will + # actually block packets, and prevent logging of them as + # connections, because they include the "quick" flag. + # + # N.b.: $port is not included/used in rules -- abusers are cut + # off completely from all services! + # + # Note RST packets are not returned for blocked SYN packets of + # active attacks, so the port will not appear to be closed. + # This will probably give away the fact that a firewall has been + # triggered to block connections, but it prevents generating + # extra outbound traffic, and it may also slow down the attacker + # somewhat. + # + # Note also that we don't block all packets, just new attempts + # to open connections (see $flags above). This allows us to do + # counterespionage against the attacker (or continue to make use + # of any other services that might be on the same subnet as the + # supposed attacker). However it does not kill any active + # connections -- we rely on the reporting daemon to do its own + # protection and cleanup. + # + # N.B.: The rule generated here must exactly match the + # corresponding rule generated for the "rem" command below! + # + echo block in log quick $proto \ + from $addr/$mask to any $flags group $2 | \ + /sbin/ipf -A -f - >/dev/null 2>&1 && echo OK ;; + ipfw) # use $ipfw_offset+$port for rule number rule=$(($ipfw_offset + $6)) @@ -69,10 +139,23 @@ add) table"("$tname")" to any dst-port $6 >/dev/null && \ echo OK ;; + + iptables) + if ! /sbin/iptables --list "$2" >/dev/null 2>&1; then + /sbin/iptables --new-chain "$2" + fi + /sbin/iptables --append INPUT --proto "$raw_proto" \ + --dport "$raw_port" --jump "$2" + /sbin/iptables --append "$2" --proto "$raw_proto" \ + --source "$addr/$mask" --dport "$raw_port" --jump DROP + echo OK + ;; + npf) /sbin/npfctl rule "$2" add block in final $proto from \ "$addr/$mask" to any $port ;; + pf) # if the filtering rule does not exist, create it /sbin/pfctl -a "$2/$6" -sr 2>/dev/null | \ @@ -81,48 +164,102 @@ add) /sbin/pfctl -a "$2/$6" -f - # insert $ip/$mask into per-protocol/port anchored table /sbin/pfctl -qa "$2/$6" -t "port$6" -T add "$addr/$mask" && \ - /sbin/pfctl -q -k $addr && echo OK + /sbin/pfctl -qk "$addr" && echo OK ;; + esac ;; rem) case "$pf" in - ipf) - /sbin/ipfstat -io | /sbin/ipf -I -f - >/dev/null 2>&1 - echo block in quick $proto from $addr/$mask to \ - any port=$6 head port$6 | \ - /sbin/ipf -I -r -f - -s >/dev/null 2>&1 && echo OK + ipfilter) + # N.B.: The rule generated here must exactly match the + # corresponding rule generated for the "add" command above! + # + echo block in log quick $proto \ + from $addr/$mask to any $flags group $2 | \ + /sbin/ipf -A -r -f - >/dev/null 2>&1 && echo OK ;; + ipfw) /sbin/ipfw table "port$6" delete "$addr/$mask" 2>/dev/null && \ echo OK ;; + + iptables) + if /sbin/iptables --list "$2" >/dev/null 2>&1; then + /sbin/iptables --delete "$2" --proto "$raw_proto" \ + --source "$addr/$mask" --dport "$raw_port" \ + --jump DROP + fi + echo OK + ;; + npf) /sbin/npfctl rule "$2" rem-id "$7" ;; + pf) /sbin/pfctl -qa "$2/$6" -t "port$6" -T delete "$addr/$mask" && \ echo OK ;; + esac ;; flush) case "$pf" in - ipf) - /sbin/ipf -Z -I -Fi -s > /dev/null && echo OK + ipfilter) + # + # N.B. WARNING: This is obviously not reentrant! + # + # First we flush all the rules from the inactive set, then we + # reload the ones that do not belong to the group "$2", and + # finally we swap the active and inactive rule sets. + # + /sbin/ipf -I -F a + # + # "ipf -I -F a" also flushes active accounting rules! + # + # Note that accounting rule groups are unique to accounting + # rules and have nothing to do with filter rules, though of + # course theoretically one could use the same group name for + # them too. + # + # In theory anyone using any such accounting rules should have a + # wrapper /etc/rc.conf.d/blacklistd script (and corresponding + # /etc/rc.conf.d/ipfilter script) that will record and + # consolidate the values accumulated by such accounting rules + # before they are flushed, since otherwise their counts will be + # lost forever. + # + /usr/sbin/ipfstat -io | fgrep -v "group $2" | \ + /sbin/ipf -I -f - >/dev/null 2>&1 + # + # This MUST be done last and separately as "-s" is executed + # _while_ the command arguments are being processed! + # + /sbin/ipf -s && echo OK ;; + ipfw) /sbin/ipfw table "port$6" flush 2>/dev/null && echo OK ;; + + iptables) + if /sbin/iptables --list "$2" >/dev/null 2>&1; then + /sbin/iptables --flush "$2" + fi + echo OK + ;; + npf) /sbin/npfctl rule "$2" flush ;; + pf) # dynamically determine which anchors exist - anchors=$(/sbin/pfctl -a $2 -s Anchors) - for anchor in $anchors; do - /sbin/pfctl -a $anchor -t "port${anchor##*/}" -T flush - /sbin/pfctl -a $anchor -F rules + for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do + /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush + /sbin/pfctl -a "$anchor" -F rules done echo OK ;; From nobody Wed Nov 5 15:29:30 2025 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 4d1q4V4HF8z6GTPQ; Wed, 05 Nov 2025 15:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1q4V3TjBz3C9y; Wed, 05 Nov 2025 15:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+PQgAsAUJwEJIhkdoz4tQjVBHhkF+tkEo4Z0Tx2Kt0=; b=uEsCS7+s2+bHF4KDqhu1SiVD8Z8z0h6QO+B2JqgOlRHXTGXUNzMjb3CA9i1zmhHzwnNKBF tCNjE8sXU5ZBFg1jLg67hQqBFmmxXyxvlISdiIfMjZ8NfjM4prlMNuuOkilixfRYdciZez E2y0on9FHcaXYeJ0A9KlyC+gjFToJgJGgj3mXtV7q4Pd8XnR7FhgtBgVGEdZgqEc8eSUUR le2kpQ6bMbdo46riFkdRuX34oQxk5m2e35+60fNtMHwB1V/HoZV1F83plVhJPVGi4hVufa T/yuCnZf7y3rD1qIij8NJS+oWYzkfh2JQABiC4D+hSUhCZIrUhLfQceNvGI0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+PQgAsAUJwEJIhkdoz4tQjVBHhkF+tkEo4Z0Tx2Kt0=; b=IIK6AzfJVeMO5WqdE0RWPQlAK9RgcsAaXKstyBL9pzJ94pRYYyIFkrD64E6SYhXh+PLYaC zpXVl7bqKIWv3xTlgm2H1N6pWlwNSPVpBy9sn7/jn4XOU15QJ2EpxtRxKQyM85BoYBFPF8 oeMSt933jNxBjz+VM9I04F0bsU0ucrDFEA8OzJwuzy/xL0EIKCe5yQdHx345B1a8Xk8ley hmjoBfvXZVH1K7Y3VbR+N3uWqwMrqAiJSNFfhorQCz3DR6r5BhxQvqBRfIPREgJGR866kB yhvukwOyb5RS6QMK0R55vuJGy++d2Dwq0tgLaqU3/M/cJPbeL80qn4cz4/Ra1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762356570; a=rsa-sha256; cv=none; b=YAiKwSR8QkY0TtoOgHxQI1XkL4WbVBXyflKpoC7Nw7c+78kbre0sSOWvadsiBbghtcQBXr BRR+3byfs6XsEL0gwM1zvl+29OJ8Y2yEb65FFCyA++RkM4iHobThOojvDw1M/1GuR/fipe RMEXDEfJ1UnpqNL81HBfwhABLhxz8TkZXM8MyPXkFs0pg9ij/8aICTDqRowHKLC6Vz6lRo QcZQseiPXMGjm3M/Ul5JrWHF+CBu3PEVACm85VF8ivei0Xrr9cTG4GnNpU/nNWc5sOhD0Z ZD+0wqwvSRaHUszlqW1yG+6x8uR8iDC226HdeTqdTFGloaXCEZ/L1yWJQc4egg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1q4V2LGTzq5S; Wed, 05 Nov 2025 15:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5FTUt5014699; Wed, 5 Nov 2025 15:29:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5FTUba014696; Wed, 5 Nov 2025 15:29:30 GMT (envelope-from git) Date: Wed, 5 Nov 2025 15:29:30 GMT Message-Id: <202511051529.5A5FTUba014696@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: a6ae5d3a2ed3 - stable/15 - truss: Properly display first argument to nmount List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: a6ae5d3a2ed313eee8aabece5c8d8347f4db7baf Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ae5d3a2ed313eee8aabece5c8d8347f4db7baf commit a6ae5d3a2ed313eee8aabece5c8d8347f4db7baf Author: Tiago Gasiba AuthorDate: 2025-10-29 20:09:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-05 13:54:57 +0000 truss: Properly display first argument to nmount The first argument to nmount(2) is an nvlist in the form of an iovec, which truss already knows how to decode. Set the correct flag so this happens automatically. MFC after: 1 week PR: 290667 (cherry picked from commit b9f848ecbafce4e56ba9c8b7993b85347e83484a) --- usr.bin/truss/syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c index 656d642e1f19..7b299bd2e1ff 100644 --- a/usr.bin/truss/syscalls.c +++ b/usr.bin/truss/syscalls.c @@ -403,7 +403,7 @@ static const struct syscall_decode decoded_syscalls[] = { { .name = "nanosleep", .ret_type = 1, .nargs = 1, .args = { { Timespec, 0 } } }, { .name = "nmount", .ret_type = 1, .nargs = 3, - .args = { { Ptr, 0 }, { UInt, 1 }, { Mountflags, 2 } } }, + .args = { { Iovec | IN, 0 }, { UInt, 1 }, { Mountflags, 2 } } }, { .name = "open", .ret_type = 1, .nargs = 3, .args = { { Name | IN, 0 }, { Open, 1 }, { Octal, 2 } } }, { .name = "openat", .ret_type = 1, .nargs = 4, From nobody Wed Nov 5 15:29:31 2025 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 4d1q4W60pRz6GT38; Wed, 05 Nov 2025 15:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1q4W3WKCz3CJb; Wed, 05 Nov 2025 15:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tanQh//eowrELkBUHNYXwSoOQOG7ZxieAj22sygrU+A=; b=LqI0d2Px3ANQEoCqsZuO0QUt2X6O6rDH1Yenz0mqhPSwjlpa4t21Go0WrajL/F7mKBstdy QrXxov6RJ3XfGbmDJuhFV5RdPLHWdTURK6yhrrE2zOuYNq10D+/s3GEfzjo0XtRK0hz1BC XAvqsB9rHdUMqqhWlmQewji9XEOv6JigkaQT0faxiofcEWj2FjqR1qngK3rh6Yje6yWlMO Iq+wXNRNZGuUzsaB7VZJyZizCDsv/6ucvuOFvUQzVYP8L2avT6i8/0VVxeenoHjhz86bO4 enJTlP3wSYOITLBogs8PXhc8PFMm6Ru6V9lnndpOhXUNZiOw8sOrn8rSXqFuzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tanQh//eowrELkBUHNYXwSoOQOG7ZxieAj22sygrU+A=; b=XJDgShnxtj4xoh7PsUZFjtTEKcjijEYF7Udi0RSc2Lhn2ykxWXLX50BZobaskKjWlZxxyX CeLh61rYVlzgwLcT5fpa5NNipvsVel04azluFuPOKPHufAIKaQcSaFc8uyWZPJLpQT13NU nFsAV76hjFkoZZ9xi3W5Q+f6Chrkz9CT29k1C4BkwNS/RrDC6McCbT8Xb7Dy9FcTGvRjv4 X5hKDKwfghSl0xJGh2UtI6ZWDwlMUzTtqbSy1Dr3jgzC9JJOFwwXm+GPhCzDTvZqolrLhf wtdIBN1gwzfEe3J2ZydZ3KQBAttS8kSxyyqKlqTaYBfJDR4No+ljfPTKo8O1Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762356571; a=rsa-sha256; cv=none; b=U/FoFqpZkd+YqRyI3Mgpza7ZmHiGI2KbzTsmXR3dNoPTn+EwcvD0rtwgCzXDpL29WguWG7 0QCrZP5SUSqZTttQKTa2kVx4DgYKxiqtto9XCjQtOUxEbybtBnJhep9j3BuMYE22yGl4BL hcyNjfCC5MlB+iqVJsCBQBNfs3MBPksn9vDrBziYEXMqRkdEJbTxoCM+fB4i234IYyjOTC iJ90UBg4EeuIF6aimGc17sps2UDE80xnnMvrwFVDLcXOnf2DLAEqkAQpBt99aBAxk1Yo58 pYDdVxCFfTXC34qgSvozUJW6qnBz+47NnfVI5GQ78o8DGr/6nkdnV1qUC43i7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1q4W2wknzq5T; Wed, 05 Nov 2025 15:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5FTVFT014737; Wed, 5 Nov 2025 15:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5FTVxp014734; Wed, 5 Nov 2025 15:29:31 GMT (envelope-from git) Date: Wed, 5 Nov 2025 15:29:31 GMT Message-Id: <202511051529.5A5FTVxp014734@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: f809d3f3ee1c - stable/15 - tzcode: Fix early tz change detection List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: f809d3f3ee1cf2d5b2c24283b42fa11871b8b6b8 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f809d3f3ee1cf2d5b2c24283b42fa11871b8b6b8 commit f809d3f3ee1cf2d5b2c24283b42fa11871b8b6b8 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:51:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-05 13:54:58 +0000 tzcode: Fix early tz change detection Assume tzdata is not fresh if last_checked is zero, as comparing the current time to last_checked less than __tz_change_interval after boot may produce a false negative. While here, invert the return value from tzdata_is_fresh() to better match its new name (it was previously called recheck_tzdata(), so zero for fresh and non-zero for stale made sense, but it doesn't now). PR: 269207 MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53502 (cherry picked from commit a38c2f99f81c2fc35c8ca209931c1c46e3e81023) --- contrib/tzcode/localtime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 1668475ea646..58099d234e2b 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -1583,15 +1583,15 @@ tzdata_is_fresh(void) struct timespec now; if (clock_gettime(CLOCK_MONOTONIC, &now) < 0) - return 0; + return 1; - if ((now.tv_sec - last_checked >= __tz_change_interval) || - (last_checked > now.tv_sec)) { + if (last_checked == 0 || last_checked > now.tv_sec || + now.tv_sec - last_checked >= __tz_change_interval) { last_checked = now.tv_sec; - return 1; + return 0; } - return 0; + return 1; } #endif /* DETECT_TZ_CHANGES */ @@ -1642,7 +1642,7 @@ tzset_unlocked_name(char const *name) ? lcl_is_set < 0 : 0 < lcl_is_set && strcmp(lcl_TZname, name) == 0) #ifdef DETECT_TZ_CHANGES - if (tzdata_is_fresh() == 0) + if (tzdata_is_fresh()) #endif /* DETECT_TZ_CHANGES */ return; # ifdef ALL_STATE From nobody Wed Nov 5 15:29:38 2025 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 4d1q4f2bLsz6GTMY; Wed, 05 Nov 2025 15:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1q4f1gx8z3CXr; Wed, 05 Nov 2025 15:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+QomN7tJjbkFiVk8RrNBAtzovrSzOUX43CWym3gv08=; b=X/0bObgpYexxjXvy7YlRWOBJ6fltozZVcAF8kj7bBlvbR/ttJpiohCIdNKQPK2g/M8MYPS 29UGQ5OJ0HKlYftkFB8t+YwFI9F5jlXgDkvIivFSt1Ls4tb0tZJnn/dZ5XGcmDifZyzdZo sVVu3F83VJJrmfmiCLwgjZPo+hk0Fag6Uj2bBbdOw0hJDZsRWfO+tH5u2poIPLZzzkk4Fd rzlAJkgY1CIthRk7KqWtysIRlUE2uIxJdiNORYQJ7KMSdF60KMqjPlCmgRDziMfcBoVHoG gNK3H7t87ceZkx6k1d1bfy0Nx/5Oxswvd5Hb4JZBIloZOqAPw64dVLhlIdMJ0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+QomN7tJjbkFiVk8RrNBAtzovrSzOUX43CWym3gv08=; b=ZV6H2Ru2xr7sj5SqUFdtzQmM9uVu3PNoG68eiHzu/Z4RK89omsCcfC4yxDehS2OO1ii9Rr 10vtiUbprrEUDRhrOK6k2oWc3i5Z5UTF5AfQVGP6yyDTTByLoaX97V5dpOg2gHd/KAonm7 chzrFxCIkFqJwlY7b1AKQWZJTDtZwGMKAeDNhwKX1bnqp6q9mDeyTbrmdK8isLO2nihtX2 vfpCGE1xrpgrCN7jeToHMQCV+E5B399sfP8DJzsvJB+Q5WfYT4QIPAQSs/et9VFN1xs3c6 JYSZ42hNil8fsG6W+nefGHKi1RY7k42gq+UkBYVR1qUurY39x5+ecnZeIkUkxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762356578; a=rsa-sha256; cv=none; b=A0SThz+mjk8vJO1hkUZB1Q8nwCrPF1sTmt80GZmn7eQhoML0HMxSRrDQLt+sSEcGnT0LBR L//nZG98J+dsqbymLlStWZTb6SrajI4hYAEIKLssd6uBR8LhChfz/Tk+uzv/70LMlPGIdR JJTxG9n2wIIKP3bowj/9WGzP4wVLtR/B97GXE7Vfi/DgZjfYVLoNbJtCB/3kg3Bs+/hzpE blSzPgnj+C5KxFm8J03V2QtG79sEz2/GSNWX53g5E8rSAwce0clW3FLUdThAXeSZPYlY/L 73/o/fBRReBuz1Ppx6BIIMs50lf/cdJQ6aBOylcEz+8ncfoY+raxJuhiylfpWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1q4f197tzpsb; Wed, 05 Nov 2025 15:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5FTcJP015050; Wed, 5 Nov 2025 15:29:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5FTcIg015047; Wed, 5 Nov 2025 15:29:38 GMT (envelope-from git) Date: Wed, 5 Nov 2025 15:29:38 GMT Message-Id: <202511051529.5A5FTcIg015047@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: b775b191b6bf - stable/14 - truss: Properly display first argument to nmount List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: b775b191b6bf02bab3322ffe7a2c2396a54e9f7b Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b775b191b6bf02bab3322ffe7a2c2396a54e9f7b commit b775b191b6bf02bab3322ffe7a2c2396a54e9f7b Author: Tiago Gasiba AuthorDate: 2025-10-29 20:09:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-05 15:29:19 +0000 truss: Properly display first argument to nmount The first argument to nmount(2) is an nvlist in the form of an iovec, which truss already knows how to decode. Set the correct flag so this happens automatically. MFC after: 1 week PR: 290667 (cherry picked from commit b9f848ecbafce4e56ba9c8b7993b85347e83484a) --- usr.bin/truss/syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c index 47d6aef8f6ff..a6b6d4ec187e 100644 --- a/usr.bin/truss/syscalls.c +++ b/usr.bin/truss/syscalls.c @@ -401,7 +401,7 @@ static const struct syscall_decode decoded_syscalls[] = { { .name = "nanosleep", .ret_type = 1, .nargs = 1, .args = { { Timespec, 0 } } }, { .name = "nmount", .ret_type = 1, .nargs = 3, - .args = { { Ptr, 0 }, { UInt, 1 }, { Mountflags, 2 } } }, + .args = { { Iovec | IN, 0 }, { UInt, 1 }, { Mountflags, 2 } } }, { .name = "open", .ret_type = 1, .nargs = 3, .args = { { Name | IN, 0 }, { Open, 1 }, { Octal, 2 } } }, { .name = "openat", .ret_type = 1, .nargs = 4, From nobody Wed Nov 5 15:38:07 2025 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 4d1qGS19MTz6GV06; Wed, 05 Nov 2025 15:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1qGS0hxSz3JKc; Wed, 05 Nov 2025 15:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762357088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu2CzGgp88J81zokyyqdyGCNd9SlqXlcjq19pGMqJSU=; b=nEU+WXRfygkXsufSx7ifl2tH3/jRBEGuPOU1f+rigEPRqJM7KDV3Vyl6aEPKIr4p4Kn2Mp Nw6VVVNOJU7bq1PT/GtbID1AGGOnTe90Ht28fKkwZxEkSxsrLzX95Hv8Cl5Dajl2rqjj1r jDxYQSpbuQiF7syMTLhjUKtma5YUL0tC/FKoe4WPcLxHEVTy7gxmisDkbddUtK0CNjP5jP zSBZu/0yU+ijXR8LGnsBszN2k3SMCezsmOgUgvfNipL2rMgSuJuPeyMLoHcC/MTR0sJD1b Yll+Cj4yZ0Fpdw+JtviFPnE0+F8/LXHCuWHBjlxmlyY0oTf2fkOWXLklNZlpCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762357088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu2CzGgp88J81zokyyqdyGCNd9SlqXlcjq19pGMqJSU=; b=HgzTm0RePfdkyBR5jgPKLVjeCo3Hxd0NWZMNMACO+jK1iKA9GGBdfIbK05SJ1WReD9Co07 gkhphXASPPgvA1bYR/mk8VH5L/egSq6tsQavW3NPFI71bKawpu0hn5PojjfvFhZMY5Xzdz 730JP+GZlenf+MEY+mmYQE/DTkPwQJbUWksPa2Mj1thVhNXbv/USekxwm0p3EI+5mkkkq9 a8JU0/p6Wr2p7IjGBdfq7WAyWWSL/5FutZx3CDn8hUn9EKd8Hc8QK75KDBJxgsosUJ8it2 15T1mqmb+AebDMRIEFJNxY2+QSNF0EUlEVYNDcuTIq03rqWQDogAh6KMyJX/vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762357088; a=rsa-sha256; cv=none; b=H/OGlc+efSBqe1itxfBCLIiTWfhLCOFnUg88u2cCGRTcg4XfJ88w+3azyC3twJgKPBmeRv FKyIkI3vKzDmdBHqdgR3rUSgcmkvHYcxEg1NJobmDOMspje9tMF9o6vq5vcfb84ztC21Si i79NQV5GcfxqiXX663E2DVtIzlIUJZw7r79RwQftPKIBYbTrOIYxTFjWdcZdXk0kSVn5lJ UA826GuzSKO5N4gxoSyA7eALuXCMLQT3xpu/Z4t1xylZnAXU1m67F2yZqZkbacRClqEDIB hMyxXUCaW+QuMzmL6zRazebiVmTvm4W1/42p80nAqJpgTEJZ4LJ1Ty+OPzd5ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1qGS05XszpbN; Wed, 05 Nov 2025 15:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5Fc76r034791; Wed, 5 Nov 2025 15:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5Fc77W034788; Wed, 5 Nov 2025 15:38:07 GMT (envelope-from git) Date: Wed, 5 Nov 2025 15:38:07 GMT Message-Id: <202511051538.5A5Fc77W034788@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 58f534ec408c - stable/13 - truss: Properly display first argument to nmount List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/13 X-Git-Reftype: branch X-Git-Commit: 58f534ec408c77d365426a03e8037d874151c421 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=58f534ec408c77d365426a03e8037d874151c421 commit 58f534ec408c77d365426a03e8037d874151c421 Author: Tiago Gasiba AuthorDate: 2025-10-29 20:09:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-05 15:37:44 +0000 truss: Properly display first argument to nmount The first argument to nmount(2) is an nvlist in the form of an iovec, which truss already knows how to decode. Set the correct flag so this happens automatically. MFC after: 1 week PR: 290667 (cherry picked from commit b9f848ecbafce4e56ba9c8b7993b85347e83484a) --- usr.bin/truss/syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c index e7b937c78cbc..6aced2770e2b 100644 --- a/usr.bin/truss/syscalls.c +++ b/usr.bin/truss/syscalls.c @@ -402,7 +402,7 @@ static const struct syscall_decode decoded_syscalls[] = { { .name = "nanosleep", .ret_type = 1, .nargs = 1, .args = { { Timespec, 0 } } }, { .name = "nmount", .ret_type = 1, .nargs = 3, - .args = { { Ptr, 0 }, { UInt, 1 }, { Mountflags, 2 } } }, + .args = { { Iovec | IN, 0 }, { UInt, 1 }, { Mountflags, 2 } } }, { .name = "open", .ret_type = 1, .nargs = 3, .args = { { Name | IN, 0 }, { Open, 1 }, { Octal, 2 } } }, { .name = "openat", .ret_type = 1, .nargs = 4, From nobody Wed Nov 5 16:33:52 2025 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 4d1rVm4x87z6GZhW; Wed, 05 Nov 2025 16:33: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1rVm4SfTz3XZx; Wed, 05 Nov 2025 16:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762360432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aie8lhyLiZlRDFVqU0/2rXmh+aPW2Vfv/ygWwCJCkZE=; b=bO3ll4tRKtakQQ7Myzlv32tn1BniNwF3fStpGKNUME8QHYlJqYAG5BRDdp4zGbSkARHblz tl6q+dwyA/nyhGGz/9LzBby7eQcqicqOn8yL+ulljJwwdhFpApNm4oGbAkfL9PtjWhhz8I fvPWCHdZIiK8Blm3eQQuylMVyZPe1E+bPKniEnv85exSVzRyn073Am+VtBBwxLbNWdi/at liuJA0KVyfx5Y9/LjQlX+TscjHPb6bJl3cbAqVoqm5yl95QBqGzm1HUJxYaTUZCXLptZn0 mWmiMppiJdpzT59qFTmL8lojO7dXzT8nFkMMviV5Cr2diKPQO//j0vPqKtjQuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762360432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aie8lhyLiZlRDFVqU0/2rXmh+aPW2Vfv/ygWwCJCkZE=; b=vhDs8TVKvgQdaUtEGjzt2WROSi79rWCttcjXoRomtt1TU7u6gWRiC39fqM4BODgdCx8ce3 718LbUCZzu2+NxOrMD4ZoDoVDVM3lu4bMUu51R9h7jUeVfYmXMcYAqwPnkWAFDTT6tbdwW MB/YuGEdtT+XMm1dbihzgZSmCj+1Itsv0QculKJFbexGkAkgnwKdTpQgKjdRa5YtqMM97U eU0dLwLOcZqW2lkuweDX78V4FyV9Urq6e4NOZ3lkRc4vS65BZTyxkuYpnJsa8CvZrIi3B2 TV/2gGchOKS97wUcFMGVu2rIrx/7VCe1XqYh6b+ojGx0ndfEdo2xy38WcnFL5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762360432; a=rsa-sha256; cv=none; b=RY+qDfWwGOdPQklVzLNXQvBWQjV0ehu6HL9KVH5Hj+MZoSetLFXL7Xou02ujieMTSusnX4 IJR22Eg8uauBhAD2CIbQsD6827MrcOeNtOpj7hBJZuDEh/+1CjXsDR76NtPVfCjI1GrrsN RG2rvjc8HKHQ/xm2Q5NRrt+bu4Q7r+XYYKOFB9282QcXX1GgJL+JmrXPsk7Kz+uteA9TFY h7sQrO5tVNrSlm98WQQuoZPMwTBaNjtxBCnKqC9C/K2LZW0VW/SnALNtEgVX9GvjXl+mQP z8rNa5oezDXS+aoERxNkFCAhQURgZGIDHD122PAUTP+Rqiqa5SHDWQKe6rHBgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1rVm40RRzs1b; Wed, 05 Nov 2025 16:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5GXqJS047587; Wed, 5 Nov 2025 16:33:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5GXqKZ047584; Wed, 5 Nov 2025 16:33:52 GMT (envelope-from git) Date: Wed, 5 Nov 2025 16:33:52 GMT Message-Id: <202511051633.5A5GXqKZ047584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0a45aa9e954a - stable/15 - openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 0a45aa9e954acc75484d59ad42ee440aa7f034c7 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0a45aa9e954acc75484d59ad42ee440aa7f034c7 commit 0a45aa9e954acc75484d59ad42ee440aa7f034c7 Author: Ed Maste AuthorDate: 2025-10-31 17:04:51 +0000 Commit: Ed Maste CommitDate: 2025-11-05 16:33:06 +0000 openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" Apply openssh-portable commit 8b6c1f402feb by deraadt@openbsd.org Obtained from: openssh-portable PR: 288773 Reported by: wosch Sponsored by: The FreeBSD Foundation (cherry picked from commit ce03706ab26c5770150f1ef96aca36b69baa535f) --- crypto/openssh/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index dd0bd032ae3c..1ed71646ebe4 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -2535,8 +2535,10 @@ format_absolute_time(uint64_t t, char *buf, size_t len) time_t tt = t > SSH_TIME_T_MAX ? SSH_TIME_T_MAX : t; struct tm tm; - localtime_r(&tt, &tm); - strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); + if (localtime_r(&tt, &tm) == NULL) + strlcpy(buf, "UNKNOWN-TIME", len); + else + strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); } /* From nobody Wed Nov 5 16:34:26 2025 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 4d1rWR1d6Fz6Gb2b; Wed, 05 Nov 2025 16:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1rWR0vTyz3Xfb; Wed, 05 Nov 2025 16:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762360467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t2ORV7GeUAg133nLuemKxDb+dHUNorUaiJ+k5XBahcg=; b=DAnn1N61G9X+WEWgccM/846XEqupczgqil1fOlp+QoiV0NHsQzuIkaVpeRf+stf089t/0t CpRH69vBwgTE3NBqrWz9ri8jYLjs/I5MVu0NBI+KUodAhev8DD+hFD+T2qXe/UAKE4KayQ 2XZ2N5124pV+T/CGZ9CWyy0U0B0A2u+Pr65wxno7KD32CnAiY/WkSmM0GXOdNk1Fa/9VOX EenfH3mytO4GUmf9S78p71qveLOZRyQl8/lCA73TSHJgdMjP+Q6vqPDnJ/ikxFvzC75P4I giUM/+keEs1vPrBEewR1cLDFEBFYnqcaxGjCnnfK5Kh1ccHpBkO+15HGXZAx7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762360467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t2ORV7GeUAg133nLuemKxDb+dHUNorUaiJ+k5XBahcg=; b=Hmrm8I/By4Rj4UR3k0VqIjRjc3ZeLrNeEEDwSz3SdQfxxJ+TsRZWO0T54KeY2T9vKwGM76 e2zhmlQC5IN/+/whqr6fDx0QV83AAt5hwJnmeAAvnyG26v6NIA72M+egiZZ7jWTFcLuMNx nVJFB/mghgCLmcr51A4ladddcTObfi767IqIRo+81+eRBiWvOJKCVM1vYLelB6hDsskT+e PyDNqe4BABMZK+ogQ7hDTou/e7wOxT+5DxK7/TWavvrXwF/wAQgF8oI37r4Y3ctn0vMDAW mjqNLxlVbGa9+7ZYts4faqllnEV1Ft8TLfe0+ltxlGtxK0exZXgLVjbJr+ywwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762360467; a=rsa-sha256; cv=none; b=G2x8up29Rga/uMyH5kZcy6rcbKNl5ANCT47Q4iPm9ukLg/6HiMfHpXkcN+rTvzUj8qbjfH y1OYtvmNcosVMISp9XqAnSYMpt0FgP4jcQ8Wyart+WLQBTVNU8n+Zx6zHEnHhZ1HohjASa j31fLR7lRJsAx2pYXcGmT4ACRJuskPvTpsTllyazeWohX+/c7j56iWfZv1MWesSnJ7K/bR 6PnFTEEpz69rajRgq6lbl8153ULq3QDDD6kToq7fH2EOWaM8eGuDjDqNzEXWXzXhKS6QY+ v7kTWWKcpqRUiqbfLrdI1eyPkT22yd0dDNeGSnHNgVl1eymjE2C5U40B/EETAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1rWR0N6vzrvt; Wed, 05 Nov 2025 16:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5GYQ9o047872; Wed, 5 Nov 2025 16:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5GYQl6047869; Wed, 5 Nov 2025 16:34:26 GMT (envelope-from git) Date: Wed, 5 Nov 2025 16:34:26 GMT Message-Id: <202511051634.5A5GYQl6047869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4fbf901a2925 - stable/14 - openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 4fbf901a2925ec2598167c1c4f04e78c06960869 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4fbf901a2925ec2598167c1c4f04e78c06960869 commit 4fbf901a2925ec2598167c1c4f04e78c06960869 Author: Ed Maste AuthorDate: 2025-10-31 17:04:51 +0000 Commit: Ed Maste CommitDate: 2025-11-05 16:34:06 +0000 openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" Apply openssh-portable commit 8b6c1f402feb by deraadt@openbsd.org Obtained from: openssh-portable PR: 288773 Reported by: wosch Sponsored by: The FreeBSD Foundation (cherry picked from commit ce03706ab26c5770150f1ef96aca36b69baa535f) (cherry picked from commit 0a45aa9e954acc75484d59ad42ee440aa7f034c7) --- crypto/openssh/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index 1b4b55c5034d..e129218cdd5c 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -2534,8 +2534,10 @@ format_absolute_time(uint64_t t, char *buf, size_t len) time_t tt = t > SSH_TIME_T_MAX ? SSH_TIME_T_MAX : t; struct tm tm; - localtime_r(&tt, &tm); - strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); + if (localtime_r(&tt, &tm) == NULL) + strlcpy(buf, "UNKNOWN-TIME", len); + else + strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); } /* From nobody Wed Nov 5 19:37:24 2025 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 4d1wZY1kW6z651Z9; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZY0b5tz3s7t; Wed, 05 Nov 2025 19:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ru9Xz24eyQoWwneOK4rdTXX259PhWomUTx8RXPBbKU=; b=IclshHWvJOFDEfy062J3uWErxdkNhHUxQVODYoUPKhcQX98SdRbI8ssz66BD5j9cSrhCqO BoyrdjI+Rfi7Zh1g9jHIn8ScMJI1QgMzchL2Cet1P/fO/Anf25AFRC01n0ldOVt71tcXFa cQYnOSUqTNIPb/RpFEshRmigF3zNZff2j1Xpoclfk93FrgvENor5qOTJicPJ1VyV1b1Pfs y0FOnlb2+GSM+8p4a8hvovcWHZvoIrpT0qLeREXeN76LwpWJouQLCUMObtJJFwf4H+/Ofq IUIWPqk80mpToHqWH5fHQT0kjoAcVyfga/PxRiZCBylb+dR0mgraSz46JzWltA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ru9Xz24eyQoWwneOK4rdTXX259PhWomUTx8RXPBbKU=; b=YnfS6Gg6Ya9F8JB62be8exPLWWMKoJwPMUBU9Aah4ZaO9Qz7rZ8Q4nP2G/pu2/9Eom4QtS S+xJWygYBBQtzs1/sb21dQMOkPly4PIsnD0dw4Coyr67ExFq3fS9lt+AeRf+twqKOfMGE3 BIHWCnpP515zJ+CV8A4k1dmVBJCCifavVbN4WzpS2IfcDXDmsvjry116a5LvgZJSur7zY6 sCpqFxJJKUg5fs6PHe9aQjrogiVhIIChMHcbmVLcTRIvLlnwnvSsTxvpTUf7i7INT2IEFi WZEcEF1t4xKf6l8A3Em1asMCMlCShA39EKver3NMmjp8SAD9sket7eQTLsl3fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371445; a=rsa-sha256; cv=none; b=JtiW4mLR0sXIDHynN1xV5yzXtN5e574V4/a1KOV9IPjEqVeGcvIOvmGcVMOtvEUJvLh8vX 3VA4stHsiFob5PL0Dbqa/VbohpwYVA+zXzZFZn5ngEFz3k+uIRCHRz1XKkyMbVO5gvzPve Jk9CP/RgYDc3wNQ5G0cBsuaSAx+XGp1OcuhtOAdjPAdcAU4cwfqB8MbmBTG8afnYkJimlJ HIT1nKH0rcLCCtYMPVLCqsNwlQCzWClPkWgsPTOKy5c0Ck91Vz7ViTpHIlU923Zy5Udh8O PYe7B7tFDTOjgm8nRYw82Z5kCErFi3GkdsBi8JMcnc/GvaaFqCd0bpXox6eh4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZX71jFzwng; Wed, 05 Nov 2025 19:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbO8D086107; Wed, 5 Nov 2025 19:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbOLA086104; Wed, 5 Nov 2025 19:37:24 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:24 GMT Message-Id: <202511051937.5A5JbOLA086104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 88c5a4996b90 - releng/15.0 - ifconfig: Fix invalid free() in ifbridge List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 88c5a4996b90fb70e5990169170a4e93d19aff23 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=88c5a4996b90fb70e5990169170a4e93d19aff23 commit 88c5a4996b90fb70e5990169170a4e93d19aff23 Author: Lexi Winter AuthorDate: 2025-11-04 00:53:25 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:12 +0000 ifconfig: Fix invalid free() in ifbridge parse_vlans() does 's = strdup(str)', then calls strsep(&s, ...), then attempts to free(s) at the end of the function. For the success case, this is fine (s is NULL, so it's a trivial memory leak), but in the error case, we will attempt to free an invalid pointer. Fix this by storing the original return value from strdup() and freeing that instead. Approved by: re (cperciva) MFC after: 3 seconds Reported by: David Gwynne Reviewed by: zlei, kevans Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53545 (cherry picked from commit 0899f7a3b791ed4878e7cb3859636ec980c76832) (cherry picked from commit fe2e534433778c038138510ff6a8f07066e72703) --- sbin/ifconfig/ifbridge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index eff443447c13..8bcf4a638adf 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -811,7 +811,7 @@ unsetbridge_private(if_ctx *ctx, const char *val, int dummy __unused) static int parse_vlans(ifbvlan_set_t *set, const char *str) { - char *s, *token; + char *s, *free_s, *token; /* "none" means the empty vlan set */ if (strcmp(str, "none") == 0) { @@ -829,6 +829,8 @@ parse_vlans(ifbvlan_set_t *set, const char *str) if ((s = strdup(str)) == NULL) return (-1); + /* Keep the original value of s, since strsep() will modify it */ + free_s = s; while ((token = strsep(&s, ",")) != NULL) { unsigned long first, last; @@ -856,11 +858,11 @@ parse_vlans(ifbvlan_set_t *set, const char *str) BRVLAN_SET(set, vlan); } - free(s); + free(free_s); return (0); err: - free(s); + free(free_s); return (-1); } From nobody Wed Nov 5 19:37:25 2025 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 4d1wZZ25dvz651tr; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZZ0zYpz3sSH; Wed, 05 Nov 2025 19:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w8/RiuT46mZcPl2TYBJ9LamgPlx3yv3Sp/3+SWbNx0=; b=ktMYBKdrwO86HVUZ2ydCMsrm9U8k/Ixt8RgIKqV1Y3kNi/JnymwsAw38NA/Xrge3Llx+sJ w+1PimZrCK+fQozpF2IhfgtjKQbK4RyybMcpmQeGHGcdhBBJczT14WGXNkf7r9a2LHXIKl CFceiMNLHHc/496jyqtKHufzxQjI9PhJlHqt8YOYz+tEqZqHjo51ye7NFs5L1hbSC5F+P3 lvwlzx2Lcf4FU7XPKj55ea59AZihGtUVblzzYA6ktj7xfVR7Gag0gnm65hXllbLVHQGQDh Re0BYLS51F3M0mYtvCz7Jw1OLyShbliNoyKvYrDIfduq1kHOms96IVGp5Iq6Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w8/RiuT46mZcPl2TYBJ9LamgPlx3yv3Sp/3+SWbNx0=; b=n7bMGsLVkhDsAhTXYPtTUtoDxUUmxr6R3ypdh8HYUc7wnbhmtf6i8vSD4GKJvHSSsjV0ju CAHOLaW/EMLH/hCEE7ynRbCuODPJNJZRSZNH0GxZK7WwVlRx+CHiI2DM8cMcDSgE7VVBpp +kiL+MgC1QHazr4x6VEcAWlZh+OFqzYRuuKQx9q4QWpuWk31l+ZZz2+f/zPovBIE3QBDHm xmK7hWrMYouZHwr1/iRSaosYn/nieVvHygs/jRoSGD4HdlMNaJEDjb+VOpnP4FGWXKAcD7 LrFgDe/fJhSJaQYbDC6JxVwataoiTGRxCG5sjuUrh+8kBxwdJqre+kU+qoADaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371446; a=rsa-sha256; cv=none; b=atR18GalzEWQ81/6E5aMmU08nuOFVJfJ5kVnwE2VPGplpaCtCUwFAtlsuNSxNCDDbQmh6z EcvR+ZzP+xEjK280ULB9GqNdra4gQO737TmhMiM42z79whhvgINnwRfYwVHjNoR7ggEndj wmXX1q0yxqigYTvLSDC+iloWz0Irk1WSKDjphgQ+yNYsnQ5AQPGOrfiUuvM2c/pUoJrJLx QDgN2p9454EfQR9M+SoOvy/hav05/iIaI+V9z6+FMEmBA2G/69St6okt3uK6rzyoSYrbRO N+hlDcI2R+7LfZ6jTzDnmWHSn2e3mWHYKH+48twEz1DOV332gE+PqKlRBx+4zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZZ0PlPzx26; Wed, 05 Nov 2025 19:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbP2g086142; Wed, 5 Nov 2025 19:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbPlL086139; Wed, 5 Nov 2025 19:37:25 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:25 GMT Message-Id: <202511051937.5A5JbPlL086139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 593f5b29ef7c - releng/15.0 - static_libpam: Don't install pam.d.5 twice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 593f5b29ef7c79d09e39c2a32861d4ecdb9049ad Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=593f5b29ef7c79d09e39c2a32861d4ecdb9049ad commit 593f5b29ef7c79d09e39c2a32861d4ecdb9049ad Author: Lexi Winter AuthorDate: 2025-11-01 13:38:26 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:18 +0000 static_libpam: Don't install pam.d.5 twice static_libpam's Makefile includes libpam's Makefile after setting some variables (like MAN) to empty to avoid installing the manpages twice. After commit 031e711647c3, it neglected to do this for MANNODEVLINKS, causing pam.d.5.gz to be installed twice. This is harmless for installworld, but breaks some things that rely on METALOG (NO_ROOT installs) since it causes two METALOG entries to be generated for the same file. Approved by: re (cperciva) Fixes: 031e711647c3 ("packages: Install development manpages in the -dev package") MFC after: 3 days PR: 290708 Reported by: emaste Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53512 (cherry picked from commit a1806e6ff37a606277ab9657b951e918164e9f63) (cherry picked from commit 92a081bc2d1ad2c06749d5fbcf31697db05a2001) --- lib/libpam/static_libpam/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libpam/static_libpam/Makefile b/lib/libpam/static_libpam/Makefile index 8830f09ef0da..703e6a4a2f00 100644 --- a/lib/libpam/static_libpam/Makefile +++ b/lib/libpam/static_libpam/Makefile @@ -45,6 +45,7 @@ MAN= MANNODEV= INCS= MLINKS= +MANNODEVLINKS= MK_TESTS= no # From nobody Wed Nov 5 19:37:27 2025 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 4d1wZb41mCz652Md; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZb22NDz3s85; Wed, 05 Nov 2025 19:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=82iClnNBXTqhCgpfh3mJ/02yH/aEdoi3Qht6jQR6Lm8=; b=bHlLBO0FVFU9u1C6Z9zf6ti27BUE/6pJxYJ73XwvjW75a4MRvaC1diI8N46OqUWStDs4ye Cdy5zOW9sIaUpSEwhDsAvYnHjt7QvmzlZHSvOCZyu5PQmkm/wp0va7lHzg8NjsQDGRTn+s e8gH4of/Gvp2USafBcC4vECp/NM+uFxz+E2+DNBvJOnWlhqKyWKE61m3f96nEFc5k11Gnx bsMqxjW4IbVMT7UxWzKsK9vt8m8FPn59918q4yIGo32ZCAw4KoMYfTWhU/tBFZiJM21dni 2O7BPwCHP3AVEctP11TQMImgCy31sjp8p4a6HzLoU6Q4k4CTFc9Tnd5Hql6OMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=82iClnNBXTqhCgpfh3mJ/02yH/aEdoi3Qht6jQR6Lm8=; b=smwCi+E5wClBNwr67ICKBms8ebsfFuTxkwadw07n7qMLzAk35uwTN/c4ChgqCOqSxti5GU zX+vZeCpR0CADwm1loIZulCE7zwzsMpPZpz9T5H8D0WEx9/2o6MFyII5L7HCeKtPLrm+vn lEsCl8kYsQybT4W0K+puB2YV8TtcuUs9Pe41kuNFUan+g7cAEUQfs/ks0KQDojm2u6Wvgb m2Q1CDReGz5uQALdWFtamtrJFa6yjrotBfzR22XkBz7isDFzUYo6fJcTfQa+K+VPNFHg1w lFTDcKNae7vcoveVdY4Gz1DFPpIAqywru9Fkod11/Wc67SBGpFJizlwJEMp1lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371447; a=rsa-sha256; cv=none; b=xtFdQjqYgAGElc+9l34CrIApnFG2+MBGerOHaoBgznc47FZvva5Prf83CzCOFK3WaP0ksY 6Gv5oZhGB+ugIGSsJDXKOpvky8nj+FYBzjouXl7tikDlFBGxql6hBlV78QkBj7reEavaZK ZVeQsVcRXFMtaODREtpBL8C3DYfrrVmMo+m0KzyN2XVN2w8QFS+AjujEfj6XblSb3+AWcY xTK7CNlfKJjvQx970AhkOCIYTFcNnnOMyr18u8HRiaVu7Jr1YEojTsyICXOAJjm7QHVdTC Ddpa6Mf3yKLV51PYax8bWadI9jsGQvjE+qMcbwQVDpI1ElQ8xQ7ahN4m4k8E4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZb1PJ6zx27; Wed, 05 Nov 2025 19:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbRLg086178; Wed, 5 Nov 2025 19:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbRIu086175; Wed, 5 Nov 2025 19:37:27 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:27 GMT Message-Id: <202511051937.5A5JbRIu086175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 433730c1cbdb - releng/15.0 - mtree: Remove stray an (Aironet) directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 433730c1cbdb9215182502b6f37f22e578fd7cb6 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=433730c1cbdb9215182502b6f37f22e578fd7cb6 commit 433730c1cbdb9215182502b6f37f22e578fd7cb6 Author: Jose Luis Duran AuthorDate: 2025-10-22 22:41:53 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:21 +0000 mtree: Remove stray an (Aironet) directory Approved by: re (cperciva) Reviewed by: imp Fixes: 663b174b5b53 ("an: Remove driver") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53265 (cherry picked from commit f7ccf051016fe3989ef6fbf10adea3ce4131f91b) (cherry picked from commit 3281756a24e24da3cb0f6a41cecfdf6c74a74532) --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 454657183c58..06afcebdfa86 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -127,8 +127,6 @@ .. agp .. - an - .. ciss .. evdev From nobody Wed Nov 5 19:37:28 2025 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 4d1wZc3pW1z651pf; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZc2WpYz3sbl; Wed, 05 Nov 2025 19:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TKBWMflM0prYcnASZpV8w+ouWg6ADJqkg8rJMWmkBjU=; b=N67vc7r8a7o8mmohAudM3/GETzYQgYtbzesqCuYUpomiBNO1w6x5NGvnpKaWz9DjH2czhd QmZ7b+Lws7w606Emz1pHG4slDscxJCx5Id29vAfixJ1+0kX2UKl7u8vyYdz5mYPvK9c4Dw 5yUPUMjD+vlp3fpD6Z8WIWece/V7ZUKH0iTsG8tvSGtrw3eZtLKrIJqvi+DJvwVIVmS842 g0t6eNdXMurx5+rW5qQwahs68XQIocZS56euX8KEl6reVywznbIFT6gsLW2f1l3PsKk0xy Q1Rj7EIBf9F4thKjIRiYFoisZtjyVCjNE/D+futQiLDzUsRtJToaAL91LiXhSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TKBWMflM0prYcnASZpV8w+ouWg6ADJqkg8rJMWmkBjU=; b=Qvx9kBknJO4w+cJ/pqUxdu3hvOdwAYVbofwmdsDSiI1CPld2+MaSJmxlrYxql+lyp9WU1G w+H42OBeosWqv62waRdajBXFQRRFBA7uBnk43nRrMmh7vm77MkjBOgCZISVzh6Z2bfAqbF GbWr5uV8AdEtkPugf8Qj6uckuUCaOCCqVDPjRcx1gHASQPiKJLbSjJydQHFZXNOSybvAOt VpvH1l6ho4KQ3n6f/C8xzqV+hXVk0Wcqio31eamZOVc5B0JzGoYKhScTN5+h2jyyZXV33C QzptPAVDj82I3bKzFzTz7V76f6++sCFnGS6AUFqIN03nXTVKDB+xCasRbAJ1kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371448; a=rsa-sha256; cv=none; b=w9l13WFQsR2RtZ4Ik+sArRzrmyRtr3res/J8/LpO24bx2REwPMfINdUqzP4YRcHpQwePHv 8Bz9OUllQ57AKJlzyC2e18ckUWgg2xABT/LOt1kH4196ahM/iAS2QFQu6iVyO9hOYtouIL xb+sA9pOW6Y7QWma3sxV1ngRdIPtUZRJF5+pungeNEJ5ObDw5jCkto8U63i3p1VgyGJOo2 2v3pgX8zr0q5wHaQLJqcg7mAl3hs7qwl6W+KgOA++Kp1VYVE4vGeEHOLZNPkLU9cYh5njL ycHZPLOgsTAk0tde5OBaROrGppgSd22bCMPHxNfCX0eG8sxoN7o1W2Jg7JlO2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZc23Bmzwnh; Wed, 05 Nov 2025 19:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbSV1086211; Wed, 5 Nov 2025 19:37:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbSgZ086208; Wed, 5 Nov 2025 19:37:28 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:28 GMT Message-Id: <202511051937.5A5JbSgZ086208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: eef41b04b3a5 - releng/15.0 - mtree: Remove stray wi directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: eef41b04b3a5720554f7e67cb3940d17ece6e35a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eef41b04b3a5720554f7e67cb3940d17ece6e35a commit eef41b04b3a5720554f7e67cb3940d17ece6e35a Author: Jose Luis Duran AuthorDate: 2025-10-22 22:41:03 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:24 +0000 mtree: Remove stray wi directory Approved by: re (cperciva) Reviewed by: imp, emaste Fixes: a21def4d568f ("pccard: Remove wi(4) driver") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53264 (cherry picked from commit f942a7465469008f7538436a70f15a44cabecbb0) (cherry picked from commit 0b45751456aa3411deef96b9f245359005d5ebd2) --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 06afcebdfa86..bc2df93840e9 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -189,8 +189,6 @@ .. wg .. - wi - .. .. devdctl .. From nobody Wed Nov 5 19:37:29 2025 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 4d1wZd5f7Fz651Qk; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZd4DvLz3sby; Wed, 05 Nov 2025 19:37:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJZ7VZAo8f5rwHT5itlRo9NddF3+ua3kgorl0VxHiGs=; b=pO+r44u6E5B7eO+zR1MyY0M1oZ2yTrbXXR8yEAq6yFuSymWhMSHf4/Efoixd9fLypRTr8j 4072zvCTF8AO0WUNAYL2WmwlPu1AMVXEsZQjFrI3FcXDciignB9UVQIniyFt26EbGR+fHH Beax0RM3s+EcLDq0zarXR1kd7MI9AkEQMlo3M20Xa7IFWta12jXBpBugyAaf5jtMdq5KMi 4xKO3Y+38y/ieQlMVYfURMrwWvAZLvkQ8t6jl+cHsiRt8Ie0g9cVjayLpMK4maOaupLAL+ b2CcCj+v106KZmexfcyEAmziSfF5c23HMOt0DC1OU5HQe7m+NzKJJOvRDVH5gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJZ7VZAo8f5rwHT5itlRo9NddF3+ua3kgorl0VxHiGs=; b=tNJiTst9Jkm1/fArMBH8YnsPXZz7rCyQntXHLbIkNFpDLRvnYXmtXYZpzS555nC5eZs7SR /g8SqPSdK5YfXgYW4m+j0vPLv+lbIdK66dPl/wVqoPG4njkveFk3ksV8qKhJAocR25BrFI Kw92aZ0EANhvznHQ4oaG0qrv9yj3QcWQYXcnEjXmE4Pnz5ILIYmfg82fBxMNWkeKo5LFFA 7M/+6KGoMZJZEFe/y8WKYuA74PZdpILfvsZbZHGiJ7sdqQlp1Fag4nJyubOFuuWqdd4tEn vgKijuSq15SyqwTJEmHOEKcN/qogdpjWzdhJbMgfeZQvSmtQuRtSUqX9BE+NLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371449; a=rsa-sha256; cv=none; b=MWzv06xsi9NCVbgCSxjD0Ju6aGIrg9uBxk5u61QDD2ZivNm3as036TzgVgmBoIS0TRx1O9 bSGtomEEdwMcq5EZr9l6v8ovHZe9iQspuDlnhQgybXK3QF7uHMk3AoXsPrzBalRlBPdRMr jfUS2sKe4/NRtFJKmB+HnOx2l9cnPH5h3/aiKcTjetpLduOR8La/3fC96gmprIHH6mETGj dZsWf+ziqjU3M93B9ISdlfGZCVsRuacEoienggyfkRiOYl6LVXQ0kxSdLk2OabhiqLNlry WOmhMX9BWD7VD04bNMXrxGWgIkkwB390EjxDJNGz7qDjc+O40N7dbmuRf4tiTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZd3PKbzxJJ; Wed, 05 Nov 2025 19:37:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbTm5086244; Wed, 5 Nov 2025 19:37:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbTCR086241; Wed, 5 Nov 2025 19:37:29 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:29 GMT Message-Id: <202511051937.5A5JbTCR086241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6e1d4406f137 - releng/15.0 - mtree: Remove stray atm directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 6e1d4406f13707c2d9ea30d54b5e45033bebb609 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6e1d4406f13707c2d9ea30d54b5e45033bebb609 commit 6e1d4406f13707c2d9ea30d54b5e45033bebb609 Author: Jose Luis Duran AuthorDate: 2025-10-22 15:34:30 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:26 +0000 mtree: Remove stray atm directory ATM support for netgraph was removed in af0cc0b22362 ("NgATM: Remove netgraph ATM support") Remove the directory from the mtree specification. Approved by: re (cperciva) Reviewed by: emaste Fixes: 21735dfaebdf ("include: Remove no longer existing netgraph/atm") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53260 (cherry picked from commit 8e8ee8bbe2a112f7d1cc1b005dbdb8868522b640) (cherry picked from commit 002ce2c9d081cad959606fd4793e4287d7d299e0) --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index bc2df93840e9..ea333a38d889 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -299,8 +299,6 @@ net80211 .. netgraph - atm - .. bluetooth include .. From nobody Wed Nov 5 19:37:30 2025 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 4d1wZg0XYKz651yt; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZf4VnDz3sTG; Wed, 05 Nov 2025 19:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DMDuESvOwKY9Whc4NlfGinsZutZKJFK2h5ySp+16ZaQ=; b=imJo8krAVw4VAKa3EG5rnu8/JSV6AHUUm6tbbMYjCglb5B56a+TQCpmriTivkR4H0/5WD6 +QMPx5cCnkDBTS/dAROyFLV0AykvquDexGFfw1lH+qgju2fFHYsd0z3NrS/Fejnp/nLiXr 63uPptpXEgw+z8La/OaqnQf7vad7UA2tTEOzgTYBGyLhBLFZtrWzMI9mOZs67CHnH2lRsO bDm7eOdJPe63WXmGMFXN1zmPpxtRcninyBPwxTWGeoF8UfCEDHhXtQFBqnoeHRnQv56Y/x ylmHEzRk8Rb0xFiKNVSR1aCSvq2VzwdFHKR+eNvdCglbnbRAI/iV+wEw7L8N/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DMDuESvOwKY9Whc4NlfGinsZutZKJFK2h5ySp+16ZaQ=; b=nInoMB0n2qkOOAtecfRf8SXPUfozYW37TTRAfco3lpckyS8dEPNk/79wV9RYAavJWA0NG4 otKnGG8OQXV92qpovIFn1SdFGV7R+QKmBfMJ13WA8teAe6ps0gcJygetj2Wz8kl7O9ZJwG nuqwnF77ss4taHVVAXgQcDrrxStaa3TYW5yLKxDiU3NdTFvbFqqO+9J3B4mAUW5pYP1DDJ goyKu8Ba9i9Vx5ESRJTmakdKAkOtTUX/vqhdfTkznXV+HJW3mgpvQ805i3JpMe3LGMZOT9 66vSp9d1oFzx6w7WaenKCuaaUwrXmLvtm0bAEJ91H6zdWl+tqmvl0e9CrHmemw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371450; a=rsa-sha256; cv=none; b=bFnUfC/98uxH+6QSyU0vWGy0Xv5gfT7dsajQEEbte9H8YEZ8j/bGH/H0qY79K99nBTNtKN Wc09hajDPnCcO2bgJnL/j68BjRzAgor0ikEEvAFrA5YtTPWVRQ5Jea6sFseZNPCvqI6arQ QfyeAU7OSs9vbJ9S/r2I1QEWtIlL1NVQY9QVkjX+sXq39j74CfMJ05bg1h+LdQnQP5uud2 C5nm6sJYoVmOhAQmyDkinIJAJnuRjkJw/92aVU5KzBa3Lf7BvLk6PVdUd7Dyw8PkhhI02S kSb65feb4IWZxWzmdpUzNA8UFZ0uI4cmFivjFj//2WPN3qEP8y5Z007T9y6TJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZf3zxRzxTr; Wed, 05 Nov 2025 19:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbU5R086277; Wed, 5 Nov 2025 19:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbU4s086274; Wed, 5 Nov 2025 19:37:30 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:30 GMT Message-Id: <202511051937.5A5JbU4s086274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 72777e9bf6ad - releng/15.0 - mld6: Properly initialize MLD packet 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 72777e9bf6ad2dec0dadfaa5fe595536f17f7695 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=72777e9bf6ad2dec0dadfaa5fe595536f17f7695 commit 72777e9bf6ad2dec0dadfaa5fe595536f17f7695 Author: Andrey V. Elsukov AuthorDate: 2025-11-02 15:56:14 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:29 +0000 mld6: Properly initialize MLD packet options After commit 530c2c30b0c7 we need to set flags to ensure that hop-by-hop and hop limit options are included. Approved by: re (cperciva) PR: 290407 Reviewed by: zlei, markj MFC after: 3 days Fixes: 530c2c30b0c7 ("ip6_output: Reduce cache misses on pktopts") (cherry picked from commit 5568fba657c260286b9f1f1e837ab83ef6ce572d) (cherry picked from commit 5c4144fe1f41b16368a3785b7edd6d2d70c24d1b) --- sys/netinet6/mld6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index a825658bd9ee..5dfe48908a4f 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -3267,6 +3267,7 @@ mld_init(void *unused __unused) mld_po.ip6po_hbh = &mld_ra.hbh; mld_po.ip6po_prefer_tempaddr = IP6PO_TEMPADDR_NOTPREFER; mld_po.ip6po_flags = IP6PO_DONTFRAG; + mld_po.ip6po_valid = IP6PO_VALID_HLIM | IP6PO_VALID_HBH; callout_init(&mldslow_callout, 1); callout_reset(&mldslow_callout, hz / MLD_SLOWHZ, mld_slowtimo, NULL); From nobody Wed Nov 5 19:37:31 2025 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 4d1wZh2yctz651wj; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZg5gd9z3scV; Wed, 05 Nov 2025 19:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vq/b1524GOxSJyn4uw40ifSAViKoH8p0Jf8iod639ZI=; b=HSJiu5jrKmrrbuAc2pB4GO1NJ3jbSLvxTQlCjIa1/gwBBE4olS4RVPxZMAFHgESvvYST1L AC1QgebDBX63W2GvWZD7rdE8tmBTgXckV88b1XkuQJ76iQaTfQJETkxKPkNtUA0NIgByz3 uvQ1TBwSVFzqetB0ICjpljPUIKw6U0fVeao/6NpxZogVUnctCWT3h7ZN53NeyZdgvXRTZE 9jevUDpP4CnWYfcGT5y2sNlCv5y+D5Ulw1FFUJRPPc3+BlOU1I9+OVFOy96nQUsPucdewQ 7aUFja6jt30dTzaz/JzIDam8kTgHbmSN+JhMl7XHja//1ZE1NAvQv9LeAKoVNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vq/b1524GOxSJyn4uw40ifSAViKoH8p0Jf8iod639ZI=; b=nGp3qegGX27yDVjkfepURlfrxPgNt/ZcewpAeFfpN+61hIl+X3jg++246bhOVt2uxkgDPe 7JjcWznJw61Lx6q5dA/bkoHwn8Ofb/Royqih9jK5r5+6PIW6ZYW3VI4yXNn2e8c4A8cjrR XdgFenV+OAuZdOCzgIruLG6KHeEmHlgFCFvOtl8ceAsgJhpG0pK+/dJkef0dUvlEhhbVzd +mb20ev0navoMKRgh3Qbi587UJAgyf83cdSot5g6ESFaC9P/ETfiYSftfuJ/73g7nyAGlo Dr0y4wmbUX4Zr/E82YJ/PleTzxOPFcMpM/Pr6NCij/UcAQwc3mxURRaNK9YFVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371451; a=rsa-sha256; cv=none; b=IpFBCqpLuuskxXTtnOoybLVOPrkRh6sKuMDve3DpUoLFG5jFVYiV9CxTU+R1XPOYGwhFua zW5nC03ug3ZtUPwTfOeLvGEENI5CoBqSasSTe+r0uXRQt3LMAwYCkSIh/XB/LV+7qmZhu7 D+prSP7HAEH9KsRvsUvYVr2im3CMKan5rDfTw9MgRS+a1CDGlM3XlsKRH8WamTAnkFEKfQ 7XgGM9+qPgcanLqovfesEnvINazb3WMD6oKEUSA6KzCMPY2fcDuwMmElXcoDVEJipTGdtS XLhuF/I1Us9T+GcJ1en+b5CNqXzrvxKO959WUE8kpd704xb195Gvi2Zb/y7jdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZg5DfZzxTs; Wed, 05 Nov 2025 19:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbVr9086315; Wed, 5 Nov 2025 19:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbVLs086312; Wed, 5 Nov 2025 19:37:31 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:31 GMT Message-Id: <202511051937.5A5JbVLs086312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4e80f9f6432e - releng/15.0 - dtrace/arm64: properly traverse the symbol table List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 4e80f9f6432e99474310bb792a791beb72a881b5 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4e80f9f6432e99474310bb792a791beb72a881b5 commit 4e80f9f6432e99474310bb792a791beb72a881b5 Author: Konrad Witaszczyk AuthorDate: 2025-10-28 16:09:24 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:32 +0000 dtrace/arm64: properly traverse the symbol table LINKER_EACH_FUNCTION_NAMEVAL() stops processing the symbol table if a callback function returns a non-zero value. The fbt_provide_module_function() callback should not return 1 when ignoring symbols. Instead, always return 0, as in dtrace/x86. Approved by: re (cperciva) Fixes: 30b68ecda84e ("Changes that improve DTrace FBT reliability on freebsd/arm64:") Reviewed by: markj, oshogbo Approved by: oshogbo (mentor) Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D53399 (cherry picked from commit 2acdec9e4d915ec61d0ca45b408f9beb7aa4b772) (cherry picked from commit 76a0a5f91d2c8f30760cb223d732863761e268a9) --- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index ffe2f37a6d16..6c789530442d 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -104,7 +104,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx, */ if (strcmp(name, "handle_el1h_sync") == 0 || strcmp(name, "do_el1h_sync") == 0) - return (1); + return (0); instr = (uint32_t *)(symval->value); limit = (uint32_t *)(symval->value + symval->size); From nobody Wed Nov 5 19:37:32 2025 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 4d1wZj1KGfz651v6; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZh6c4fz3sWt; Wed, 05 Nov 2025 19:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kBC9Tzd6Q4U4d6F7bot7pS96N/hJDPBfKlCzpqveyE=; b=GjOpgDMII+n3vqnL8KGaUH9/w/NSBzj13nU2Inw0MeDot8Lx3Z0lyC/3O4TT0TRIbgX7dZ E/go8PJ7ABUZx+Pc9AoDFlfhNEhFAYCETR30aoiJMKdiLnPOCdoKpLFgCRa6glhgCw/ztj 7GT8SzuAsxDl3K+64GFVFva46ckHIzACeirI3R0DqWgj89uoTmz3xBUMx4I4HRZbbKfXEG CZdSw0rSCQHGJvUqAKmbTa0fmXvQM6cGI2Y/Kw8zx+abKZRDuBB69H3QeqHnuSuPPetlnJ xz477IdbnPKD15p0j1TJzPObtIUxsRa96z/BOWI9jqbQyuomUl7YjNzpKn0Q4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kBC9Tzd6Q4U4d6F7bot7pS96N/hJDPBfKlCzpqveyE=; b=jKuE4benc255hdNATij7HJctgIXHdJCZhwb82F3oyJkSOs6+OYGiF4Mg6ND+x4BoeQj0s/ UDnU43etxCFcg9eHQZ6Ys9gDJG7zbN5lMWFe4Px2VbLa8I2rsS+QCuoEegCUN6heqFRLza ckzR2RNDV3nOy5ZL+vjRQbsA4NZ/v5CGmY7/o9YLWbf6oz4BaUfZQQgaw/+FT+sOXFbmmc TumuI/GwBmRRbn82resrvqgpr/9KJR2g9l9kKoLMLq9KmVvyvMYEjSOw+34vyZN3w58YZc 3ZOuP44T8zYtQ4n9soK2Y+JvchHVVZvatsPgeNZXpNLndbZAcTA2+QqG2PifAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371453; a=rsa-sha256; cv=none; b=psSQf200BvAZKVOtsTjpwvdHeODATHWr8Z3nXFmv3WiMhjep7QcXFeGjtHVNILXxq6hTmn xPHZh+4crjTtc8U5F+Cxkpk8Eq7l9YZhZ7lwKiRMIC0MM1pMhfdJehde4af4Ue/+lj4sk8 Oim5mSSayVl2QLi7LYUufOiv6pFmXqVCicRDqKzfZQRej5sR/7PmFeEznDE1xxzqn+gp23 hQIcpp00vtpVN6F2NHAIXBazQLdWHldRaBdfl33csa6BXIjiMnhX5mst3GH/JVv3bip9rb i5hqvGY5f9RYURGeYmwLRJHhvt900wWUN3d7DTrp3leGfll1kBSdwAySt+t5tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZh6BzszwwK; Wed, 05 Nov 2025 19:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbWZt086352; Wed, 5 Nov 2025 19:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbWqQ086349; Wed, 5 Nov 2025 19:37:32 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:32 GMT Message-Id: <202511051937.5A5JbWqQ086349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 290b9b6b262b - releng/15.0 - id: Fix WITHOUT_AUDIT build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 290b9b6b262bfbc5559d638ef88b83fd27ebd385 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=290b9b6b262bfbc5559d638ef88b83fd27ebd385 commit 290b9b6b262bfbc5559d638ef88b83fd27ebd385 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:45:12 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:35 +0000 id: Fix WITHOUT_AUDIT build Rather than add more ifdefs, trust the compiler to optimize Aflag away. Approved by: re (cperciva) Fixes: 70b72ede982f ("id: Clean up") PR: 290740 MFC after: 3 days (cherry picked from commit 92a533ed1d3c81a772815f90cc9aff9237a4429c) (cherry picked from commit 05a3f80efe91b2cb9856ffd6c4a68d06117da824) --- usr.bin/id/id.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 5f9d2670caa3..7ba07daad11e 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -67,19 +67,13 @@ main(int argc, char *argv[]) { struct group *gr; struct passwd *pw; -#ifdef USE_BSM_AUDIT - bool Aflag; -#endif - bool Gflag, Mflag, Pflag; + bool Aflag, Gflag, Mflag, Pflag; bool cflag, dflag, gflag, nflag, pflag, rflag, sflag, uflag; int ch, combo, error, id; const char *myname, *optstr; char loginclass[MAXLOGNAME]; -#ifdef USE_BSM_AUDIT - Aflag = false; -#endif - Gflag = Mflag = Pflag = false; + Aflag = Gflag = Mflag = Pflag = false; cflag = dflag = gflag = nflag = pflag = rflag = sflag = uflag = false; myname = getprogname(); From nobody Wed Nov 5 19:37:33 2025 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 4d1wZk1Xpvz652Q1; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZk0ZTQz3sRJ; Wed, 05 Nov 2025 19:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Izm5beHYqZs/erSas2rZVHYSJvnICSjj3EhsZE6ClF0=; b=Q1GBXEOh/oQExo8kNy3Y61cxvrjvQwTURCC68PywlmheG/uaUMi3ylX3vXvbIVdkAzk2sH gs5xF5mt6akgxpCK7f51zx5Tgrg2yB6GvxPcvv/OB2m5fz0oAlpYUqmXMc6kNLBzjmj6cG IJuDj2MZeEmQyEaorBa/5gm6osRrgzaK7+SJp0ccLCnGPXnrFtkCfb8JYJah03VSLtosZ0 c0CsQZPu0VM+c5SVUPHQ0Ma3Zt85BCTp0ecnAOKYOQMwLF/y/2EnK2Ky/xCYtQKcl87Kwx vIlcrNVebU+DBkDs4MfwsWJinkCV5o0ydfvu/0rOBpsJgi9jgDJlgFzL2HngZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Izm5beHYqZs/erSas2rZVHYSJvnICSjj3EhsZE6ClF0=; b=FG4zgyXMI/7Sgoaay+ipOQ5lrIK5IghUxtjr/yF5VVa0W8yvi4C3XXczA/kNT2xFUvfMf+ qoIkgPhmABu+sccsC5rA+OKLAcy00/TIHBevW8E8dMkJLd6Zu/hiPgAn9goPkCLyC+BDxI jnDNnD8yAg5ns2JG1xE/TIlzPv6zO2T/kUDKiuCso2WPn4kpDMYnL1HdTPUPx6Ufx3uCkx tPJmezYA/lWVjbtsEfZMnXsvHZFADJRcyVAUtZAsRNr2y7JWsLpTJMu0Abux2L+SXWI0wH sEqDkntrXrjCHjUpvJxD3UqIZVeNTX38RzSMjQlgJcEPs6+7IekB91AUCX8PYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371454; a=rsa-sha256; cv=none; b=sVU2aEQ3ANCizoQ/NpglpDLVJuzoGy3cZA0lPgzfvQBgvhyyY+YxcCsOtN5WyDdninknOL VujDcfvOR8wckdM6KCtvi2Pyv9iH703kb5a84gNqtIv3NHvbSPuL8FlJOjz9dFepmXikLn PrLIxIYMQ+j2wHDxkrJXKGSRmeXx1yylV4+QUhAQpeiElTpWJqhSWOwCH/o9BrnzP4rEqM MDFElBup6aFMlG9Rg/+/RJby8xAw3yz/WU9vOy5VXPrVs9ZWGCQxfM4fqahARAgewEGcZO nrqo++IsQ9K3Y3GczgDGRRieEg8GV9A8VvfhpwcmgDu8hc75S31K1t9cKLZXKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZk04D9zwyp; Wed, 05 Nov 2025 19:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbXvT086386; Wed, 5 Nov 2025 19:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbXZO086383; Wed, 5 Nov 2025 19:37:33 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:33 GMT Message-Id: <202511051937.5A5JbXZO086383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 508f9b68379f - releng/15.0 - ipfw: pmod: avoid further rule processing after tcp-mod failures List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 508f9b68379f2aae57444f67f2a0e971c338d305 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=508f9b68379f2aae57444f67f2a0e971c338d305 commit 508f9b68379f2aae57444f67f2a0e971c338d305 Author: Kyle Evans AuthorDate: 2025-11-01 17:34:11 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:38 +0000 ipfw: pmod: avoid further rule processing after tcp-mod failures m_pullup() here will have freed the mbuf chain, but we pass back an IP_FW_DENY without any signal that the outer loop should finish. Thus, rule processing continues without an mbuf and there's a chance that we conclude that the packet may pass (but there's no mbuf remaining) depending on the rules that follow it. Approved by: re (cperciva) PR: 284606 Reviewed by: ae (cherry picked from commit c0382512bfce872102d213b9bc2550de0bc30b67) (cherry picked from commit 21d55ae111aada3c5426632253ad8df9103d3423) --- sys/netpfil/ipfw/pmod/tcpmod.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/netpfil/ipfw/pmod/tcpmod.c b/sys/netpfil/ipfw/pmod/tcpmod.c index 0338dc792c64..50074ee98cca 100644 --- a/sys/netpfil/ipfw/pmod/tcpmod.c +++ b/sys/netpfil/ipfw/pmod/tcpmod.c @@ -57,7 +57,8 @@ VNET_DEFINE_STATIC(uint32_t, tcpmod_setmss_eid) = 0; #define V_tcpmod_setmss_eid VNET(tcpmod_setmss_eid) static int -tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) +tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss, + int *done) { struct mbuf *m; u_char *cp; @@ -72,8 +73,10 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) * TCP header with options. */ *mp = m = m_pullup(m, m->m_pkthdr.len); - if (m == NULL) + if (m == NULL) { + *done = 1; return (ret); + } } /* Parse TCP options. */ for (tlen -= sizeof(struct tcphdr), cp = (u_char *)(tcp + 1); @@ -114,7 +117,7 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) #ifdef INET6 static int -tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct ip6_hdr *ip6; struct ip6_hbh *hbh; @@ -142,13 +145,13 @@ tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET6 */ #ifdef INET static int -tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct tcphdr *tcp; struct ip *ip; @@ -162,7 +165,7 @@ tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET */ @@ -206,19 +209,23 @@ ipfw_tcpmod(struct ip_fw_chain *chain, struct ip_fw_args *args, switch (args->f_id.addr_type) { #ifdef INET case 4: - ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1), + done); break; #endif #ifdef INET6 case 6: - ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1), + done); break; #endif } /* * We return zero in both @ret and @done on success, and ipfw_chk() * will update rule counters. Otherwise a packet will not be matched - * by rule. + * by rule. We passed @done around above in case we hit a fatal error + * somewhere, we'll return non-zero but signal that rule processing + * cannot succeed. */ return (ret); } From nobody Wed Nov 5 19:37:35 2025 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 4d1wZl4pzVz651Qt; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZl2L8Hz3sj5; Wed, 05 Nov 2025 19:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzEkUeI1gG29Q6p8tVrprV1ICyNb+a4UCsCriz1adn8=; b=h7mBVO5KEpikPtD/O24V+v4MXbdpnXMayy4wYGO1YIROa6YxvSf64cM98Y7fAf4F32o4ot CIjlNysCY05juWY4wD3x4YDTSLhVg+iFT/qKprypF9hVvbt2JzLvv3IW18380ZYPW2EJDd DXBFV9RedNxoiNbI/x48/JkeLrx/xv14i9R0s2wQQj74MD5qwVVctvNRCI3YNdL63+voUV Nu4vTqvXd3LFYj8zCtkAAOcle/5r+69HKFrfM6MRSpJLTMQm+qZ3ZW8Ayg3PB9n5FHTZGR DjFZr3MIjGLOLAWCbJCWDRnjmYJRHYp5q+8lB9sxdBD1HVp438R7q3ChTCFcEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzEkUeI1gG29Q6p8tVrprV1ICyNb+a4UCsCriz1adn8=; b=ZrDs6EI08di5mmzK6sVjzmi1iOnTNxxWT9fEPZNguDfLD+nIDagIfy6G81tQMlgZvmdfdU aY7ZdS4oX3DY2oNqCGCoZDLZFE2TN8yZ3/gaFCIR2XcDkunzX8ihRoI4fAKcvUkQ4UI0jW zaqxQr4zSEDcUse76uEOsM8i1xyzSMIj9YOSJh5maObc+ZfRiuY6EpG3+MiNN7IrGIFyyx O6YBpNemOFw44H7hmD0TX4TtVfGG2807J/iBxsa8LG8LSGE5PpRjwVuePUsXM5OWAebGUX bkWg2s3TsoKdcFoDxv1zDuiiuJlqztZhkeobr9W8iWou/rs4b3WSZGKKdBnxhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371455; a=rsa-sha256; cv=none; b=CApiHexRmEz0qV7lCPuBvtbWLCxFpJu90rzVT7bmsijQ5WDkwXxHPRjhiB99/5sIxmPttG I7N+da7Iy1so6BwvsZ5qHj2QdE3Fxgc2b9PJ9bBcrwjV3hjQKJzm2IX2OsckAXpxNwIyFI PInKo3xq32A61G+yz3C3alurpjfbH+U93ylRjDmstceLq3YELrHqHVGU2KCYDws/fGgq7t 2B1wR98zRn66+adEjqgTZCS/OYj6BQL0HsZqAAjZTBBqZO0CWYsJTIb31x3TNB/8Mhj3rl 5TCwmGYU/v+YLP4jUyYcYp1D4p2m3ev7YseHlX0l3NAd7GWhmCENJfNgvg9vAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZl1rF1zxSN; Wed, 05 Nov 2025 19:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbZLJ086421; Wed, 5 Nov 2025 19:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbZSi086418; Wed, 5 Nov 2025 19:37:35 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:35 GMT Message-Id: <202511051937.5A5JbZSi086418@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 8b1dd80fd2cc - releng/15.0 - Update the installed manpages to match OpenSSL 3.5.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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 8b1dd80fd2cc4c430eacae7298977f032e488307 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8b1dd80fd2cc4c430eacae7298977f032e488307 commit 8b1dd80fd2cc4c430eacae7298977f032e488307 Author: Enji Cooper AuthorDate: 2025-09-07 21:23:01 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:41 +0000 Update the installed manpages to match OpenSSL 3.5.1 Approved by: re (cperciva) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52008 (cherry picked from commit fdb3b695a4d19f098367be4fe2df51bec991170d) (cherry picked from commit 3e979746ab99a2f5c99813cc2083c69fcbadbbb2) --- secure/lib/libcrypto/man/man3/Makefile | 4883 +++++++++++++++++++------------- secure/lib/libcrypto/man/man7/Makefile | 38 +- 2 files changed, 2853 insertions(+), 2068 deletions(-) diff --git a/secure/lib/libcrypto/man/man3/Makefile b/secure/lib/libcrypto/man/man3/Makefile index 46d20013e0ac..0fc9cc100077 100644 --- a/secure/lib/libcrypto/man/man3/Makefile +++ b/secure/lib/libcrypto/man/man3/Makefile @@ -670,67 +670,81 @@ MAN+= i2d_PKCS7_bio_stream.3 MAN+= i2d_re_X509_tbs.3 MAN+= o2i_SCT_LIST.3 MAN+= s2i_ASN1_IA5STRING.3 -MLINKS+= X509_dup.3 ACCESS_DESCRIPTION_free.3 -MLINKS+= X509_dup.3 ACCESS_DESCRIPTION_new.3 -MLINKS+= X509_dup.3 ADMISSIONS_free.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_get0_admissionAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_get0_namingAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_get0_professionInfos.3 -MLINKS+= X509_dup.3 ADMISSIONS_new.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_set0_admissionAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_set0_namingAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSIONS_set0_professionInfos.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX.3 -MLINKS+= X509_dup.3 ADMISSION_SYNTAX_free.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX_get0_admissionAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX_get0_contentsOfAdmissions.3 -MLINKS+= X509_dup.3 ADMISSION_SYNTAX_new.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX_set0_admissionAuthority.3 MLINKS+= ADMISSIONS.3 ADMISSION_SYNTAX_set0_contentsOfAdmissions.3 -MLINKS+= X509_dup.3 ASIdOrRange_free.3 -MLINKS+= X509_dup.3 ASIdOrRange_new.3 -MLINKS+= X509_dup.3 ASIdentifierChoice_free.3 -MLINKS+= X509_dup.3 ASIdentifierChoice_new.3 -MLINKS+= X509_dup.3 ASIdentifiers_free.3 -MLINKS+= X509_dup.3 ASIdentifiers_new.3 -MLINKS+= ASN1_aux_cb.3 ASN1_AUX.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_get0_authorityId.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_get0_authorityText.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_get0_authorityURL.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_set0_authorityId.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_set0_authorityText.3 +MLINKS+= ADMISSIONS.3 NAMING_AUTHORITY_set0_authorityURL.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFOS.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_addProfessionInfo.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_namingAuthority.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_professionItems.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_professionOIDs.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_get0_registrationNumber.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_addProfessionInfo.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_namingAuthority.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_professionItems.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_professionOIDs.3 +MLINKS+= ADMISSIONS.3 PROFESSION_INFO_set0_registrationNumber.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_d2i.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_d2i_ex.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_free_func.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_i2d.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_new_ex_func.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_new_func.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_print_func.3 +MLINKS+= ASN1_EXTERN_FUNCS.3 IMPLEMENT_EXTERN_ASN1.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_get.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_get_int64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_set.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_set_int64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_ENUMERATED_to_BN.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_adj.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_check.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_dup.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_print.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_set.3 -MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_set_string.3 -MLINKS+= ASN1_INTEGER_new.3 ASN1_INTEGER_free.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_get.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_get_uint64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_set.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_set_int64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_set_uint64.3 MLINKS+= ASN1_INTEGER_get_int64.3 ASN1_INTEGER_to_BN.3 -MLINKS+= X509_dup.3 ASN1_ITEM.3 +MLINKS+= ASN1_INTEGER_get_int64.3 BN_to_ASN1_ENUMERATED.3 +MLINKS+= ASN1_INTEGER_get_int64.3 BN_to_ASN1_INTEGER.3 +MLINKS+= ASN1_INTEGER_new.3 ASN1_INTEGER_free.3 MLINKS+= ASN1_ITEM_lookup.3 ASN1_ITEM_get.3 MLINKS+= ASN1_OBJECT_new.3 ASN1_OBJECT_free.3 -MLINKS+= ASN1_aux_cb.3 ASN1_PRINT_ARG.3 -MLINKS+= ASN1_aux_cb.3 ASN1_STREAM_ARG.3 MLINKS+= ASN1_STRING_TABLE_add.3 ASN1_STRING_TABLE.3 MLINKS+= ASN1_STRING_TABLE_add.3 ASN1_STRING_TABLE_cleanup.3 MLINKS+= ASN1_STRING_TABLE_add.3 ASN1_STRING_TABLE_get.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_cmp.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_data.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_dup.3 -MLINKS+= ASN1_STRING_new.3 ASN1_STRING_free.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_get0_data.3 -MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print.3 -MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print_ex_fp.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_set.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_to_UTF8.3 MLINKS+= ASN1_STRING_length.3 ASN1_STRING_type.3 +MLINKS+= ASN1_STRING_new.3 ASN1_STRING_free.3 MLINKS+= ASN1_STRING_new.3 ASN1_STRING_type_new.3 +MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print.3 +MLINKS+= ASN1_STRING_print_ex.3 ASN1_STRING_print_ex_fp.3 +MLINKS+= ASN1_STRING_print_ex.3 ASN1_tag2str.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_adj.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_check.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_dup.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_print.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_set.3 +MLINKS+= ASN1_TIME_set.3 ASN1_GENERALIZEDTIME_set_string.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_adj.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_check.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_cmp_time_t.3 @@ -744,11 +758,6 @@ MLINKS+= ASN1_TIME_set.3 ASN1_TIME_set_string.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_set_string_X509.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_to_generalizedtime.3 MLINKS+= ASN1_TIME_set.3 ASN1_TIME_to_tm.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_cmp.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_pack_sequence.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_set.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_set1.3 -MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_unpack_sequence.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_adj.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_check.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_cmp_time_t.3 @@ -756,15 +765,15 @@ MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_dup.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_print.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_set.3 MLINKS+= ASN1_TIME_set.3 ASN1_UTCTIME_set_string.3 -MLINKS+= OPENSSL_load_builtin_modules.3 ASN1_add_oid_module.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_cmp.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_pack_sequence.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_set.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_set1.3 +MLINKS+= ASN1_TYPE_get.3 ASN1_TYPE_unpack_sequence.3 +MLINKS+= ASN1_aux_cb.3 ASN1_AUX.3 +MLINKS+= ASN1_aux_cb.3 ASN1_PRINT_ARG.3 +MLINKS+= ASN1_aux_cb.3 ASN1_STREAM_ARG.3 MLINKS+= ASN1_aux_cb.3 ASN1_aux_const_cb.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_d2i.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_d2i_ex.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_free_func.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_i2d.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_new_ex_func.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_new_func.3 -MLINKS+= ASN1_EXTERN_FUNCS.3 ASN1_ex_print_func.3 MLINKS+= ASN1_generate_nconf.3 ASN1_generate_v3.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i_bio_ex.3 @@ -772,15 +781,15 @@ MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i_ex.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i_fp.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_d2i_fp_ex.3 MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_i2d_mem_bio.3 +MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_pack.3 +MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_unpack.3 +MLINKS+= ASN1_item_d2i_bio.3 ASN1_item_unpack_ex.3 MLINKS+= ASN1_item_new.3 ASN1_item_new_ex.3 MLINKS+= ASN1_item_sign.3 ASN1_item_sign_ctx.3 MLINKS+= ASN1_item_sign.3 ASN1_item_sign_ex.3 MLINKS+= ASN1_item_sign.3 ASN1_item_verify.3 MLINKS+= ASN1_item_sign.3 ASN1_item_verify_ctx.3 MLINKS+= ASN1_item_sign.3 ASN1_item_verify_ex.3 -MLINKS+= ASN1_STRING_print_ex.3 ASN1_tag2str.3 -MLINKS+= X509_dup.3 ASRange_free.3 -MLINKS+= X509_dup.3 ASRange_new.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_STATUS_EAGAIN.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_STATUS_ERR.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_STATUS_OK.3 @@ -795,21 +804,19 @@ MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_WAIT_CTX_get_status.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_WAIT_CTX_set_callback.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_WAIT_CTX_set_status.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_WAIT_CTX_set_wait_fd.3 -MLINKS+= ASYNC_start_job.3 ASYNC_block_pause.3 MLINKS+= ASYNC_WAIT_CTX_new.3 ASYNC_callback_fn.3 +MLINKS+= ASYNC_start_job.3 ASYNC_block_pause.3 MLINKS+= ASYNC_start_job.3 ASYNC_cleanup_thread.3 MLINKS+= ASYNC_start_job.3 ASYNC_get_current_job.3 +MLINKS+= ASYNC_start_job.3 ASYNC_get_mem_functions.3 MLINKS+= ASYNC_start_job.3 ASYNC_get_wait_ctx.3 MLINKS+= ASYNC_start_job.3 ASYNC_init_thread.3 MLINKS+= ASYNC_start_job.3 ASYNC_is_capable.3 MLINKS+= ASYNC_start_job.3 ASYNC_pause_job.3 +MLINKS+= ASYNC_start_job.3 ASYNC_set_mem_functions.3 +MLINKS+= ASYNC_start_job.3 ASYNC_stack_alloc_fn.3 +MLINKS+= ASYNC_start_job.3 ASYNC_stack_free_fn.3 MLINKS+= ASYNC_start_job.3 ASYNC_unblock_pause.3 -MLINKS+= X509_dup.3 AUTHORITY_INFO_ACCESS_free.3 -MLINKS+= X509_dup.3 AUTHORITY_INFO_ACCESS_new.3 -MLINKS+= X509_dup.3 AUTHORITY_KEYID_free.3 -MLINKS+= X509_dup.3 AUTHORITY_KEYID_new.3 -MLINKS+= X509_dup.3 BASIC_CONSTRAINTS_free.3 -MLINKS+= X509_dup.3 BASIC_CONSTRAINTS_new.3 MLINKS+= BF_encrypt.3 BF_cbc_encrypt.3 MLINKS+= BF_encrypt.3 BF_cfb64_encrypt.3 MLINKS+= BF_encrypt.3 BF_decrypt.3 @@ -817,13 +824,9 @@ MLINKS+= BF_encrypt.3 BF_ecb_encrypt.3 MLINKS+= BF_encrypt.3 BF_ofb64_encrypt.3 MLINKS+= BF_encrypt.3 BF_options.3 MLINKS+= BF_encrypt.3 BF_set_key.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_address.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_family.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_free.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_next.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_protocol.3 -MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_socktype.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_clear.3 +MLINKS+= BIO_ADDR.3 BIO_ADDR_copy.3 +MLINKS+= BIO_ADDR.3 BIO_ADDR_dup.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_family.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_free.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_hostname_string.3 @@ -833,190 +836,275 @@ MLINKS+= BIO_ADDR.3 BIO_ADDR_rawaddress.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_rawmake.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_rawport.3 MLINKS+= BIO_ADDR.3 BIO_ADDR_service_string.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_address.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_family.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_free.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_next.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_protocol.3 +MLINKS+= BIO_ADDRINFO.3 BIO_ADDRINFO_socktype.3 +MLINKS+= BIO_ADDRINFO.3 BIO_lookup.3 +MLINKS+= BIO_ADDRINFO.3 BIO_lookup_ex.3 +MLINKS+= BIO_ADDRINFO.3 BIO_lookup_type.3 MLINKS+= BIO_connect.3 BIO_accept_ex.3 -MLINKS+= BIO_s_file.3 BIO_append_filename.3 MLINKS+= BIO_connect.3 BIO_bind.3 -MLINKS+= BIO_ctrl.3 BIO_callback_ctrl.3 -MLINKS+= BIO_set_callback.3 BIO_callback_fn.3 -MLINKS+= BIO_set_callback.3 BIO_callback_fn_ex.3 MLINKS+= BIO_connect.3 BIO_closesocket.3 -MLINKS+= BIO_s_datagram.3 BIO_ctrl_dgram_connect.3 -MLINKS+= BIO_s_bio.3 BIO_ctrl_get_read_request.3 -MLINKS+= BIO_s_bio.3 BIO_ctrl_get_write_guarantee.3 +MLINKS+= BIO_connect.3 BIO_listen.3 +MLINKS+= BIO_connect.3 BIO_socket.3 +MLINKS+= BIO_ctrl.3 BIO_callback_ctrl.3 MLINKS+= BIO_ctrl.3 BIO_ctrl_pending.3 -MLINKS+= BIO_s_bio.3 BIO_ctrl_reset_read_request.3 -MLINKS+= BIO_s_datagram.3 BIO_ctrl_set_connected.3 MLINKS+= BIO_ctrl.3 BIO_ctrl_wpending.3 -MLINKS+= BIO_set_callback.3 BIO_debug_callback.3 -MLINKS+= BIO_set_callback.3 BIO_debug_callback_ex.3 -MLINKS+= BIO_s_bio.3 BIO_destroy_bio_pair.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_get_mtu_overhead.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_get_peer.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_recv_timedout.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_send_timedout.3 -MLINKS+= BIO_s_datagram.3 BIO_dgram_set_peer.3 -MLINKS+= BIO_s_accept.3 BIO_do_accept.3 -MLINKS+= BIO_s_connect.3 BIO_do_connect.3 -MLINKS+= BIO_socket_wait.3 BIO_do_connect_retry.3 -MLINKS+= BIO_f_ssl.3 BIO_do_handshake.3 MLINKS+= BIO_ctrl.3 BIO_eof.3 MLINKS+= BIO_ctrl.3 BIO_flush.3 -MLINKS+= BIO_new.3 BIO_free.3 -MLINKS+= BIO_new.3 BIO_free_all.3 -MLINKS+= BIO_s_accept.3 BIO_get_accept_ip_family.3 -MLINKS+= BIO_s_accept.3 BIO_get_accept_name.3 -MLINKS+= BIO_s_accept.3 BIO_get_accept_port.3 -MLINKS+= BIO_get_ex_new_index.3 BIO_get_app_data.3 -MLINKS+= BIO_s_accept.3 BIO_get_bind_mode.3 -MLINKS+= BIO_f_buffer.3 BIO_get_buffer_num_lines.3 -MLINKS+= BIO_set_callback.3 BIO_get_callback.3 -MLINKS+= BIO_set_callback.3 BIO_get_callback_arg.3 -MLINKS+= BIO_set_callback.3 BIO_get_callback_ex.3 -MLINKS+= BIO_f_cipher.3 BIO_get_cipher_ctx.3 -MLINKS+= BIO_f_cipher.3 BIO_get_cipher_status.3 MLINKS+= BIO_ctrl.3 BIO_get_close.3 -MLINKS+= BIO_s_connect.3 BIO_get_conn_address.3 -MLINKS+= BIO_s_connect.3 BIO_get_conn_hostname.3 -MLINKS+= BIO_s_connect.3 BIO_get_conn_ip_family.3 -MLINKS+= BIO_s_connect.3 BIO_get_conn_port.3 -MLINKS+= BIO_get_ex_new_index.3 BIO_get_ex_data.3 -MLINKS+= BIO_s_fd.3 BIO_get_fd.3 -MLINKS+= BIO_s_file.3 BIO_get_fp.3 -MLINKS+= BIO_f_prefix.3 BIO_get_indent.3 +MLINKS+= BIO_ctrl.3 BIO_get_conn_mode.3 MLINKS+= BIO_ctrl.3 BIO_get_info_callback.3 -MLINKS+= BIO_get_data.3 BIO_get_init.3 MLINKS+= BIO_ctrl.3 BIO_get_ktls_recv.3 MLINKS+= BIO_ctrl.3 BIO_get_ktls_send.3 -MLINKS+= BIO_read.3 BIO_get_line.3 -MLINKS+= BIO_f_md.3 BIO_get_md.3 -MLINKS+= BIO_f_md.3 BIO_get_md_ctx.3 -MLINKS+= BIO_s_mem.3 BIO_get_mem_data.3 -MLINKS+= BIO_s_mem.3 BIO_get_mem_ptr.3 -MLINKS+= BIO_meth_new.3 BIO_get_new_index.3 -MLINKS+= BIO_f_ssl.3 BIO_get_num_renegotiates.3 -MLINKS+= BIO_s_accept.3 BIO_get_peer_name.3 -MLINKS+= BIO_s_accept.3 BIO_get_peer_port.3 -MLINKS+= BIO_s_bio.3 BIO_get_read_request.3 -MLINKS+= BIO_should_retry.3 BIO_get_retry_BIO.3 -MLINKS+= BIO_should_retry.3 BIO_get_retry_reason.3 -MLINKS+= BIO_get_data.3 BIO_get_shutdown.3 -MLINKS+= BIO_f_ssl.3 BIO_get_ssl.3 -MLINKS+= BIO_s_bio.3 BIO_get_write_buf_size.3 -MLINKS+= BIO_s_bio.3 BIO_get_write_guarantee.3 -MLINKS+= BIO_read.3 BIO_gets.3 -MLINKS+= BIO_parse_hostserv.3 BIO_hostserv_priorities.3 MLINKS+= BIO_ctrl.3 BIO_info_cb.3 MLINKS+= BIO_ctrl.3 BIO_int_ctrl.3 -MLINKS+= BIO_connect.3 BIO_listen.3 -MLINKS+= BIO_ADDRINFO.3 BIO_lookup.3 -MLINKS+= BIO_ADDRINFO.3 BIO_lookup_ex.3 -MLINKS+= BIO_ADDRINFO.3 BIO_lookup_type.3 -MLINKS+= BIO_s_bio.3 BIO_make_bio_pair.3 -MLINKS+= BIO_meth_new.3 BIO_meth_free.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_callback_ctrl.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_create.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_ctrl.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_destroy.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_gets.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_puts.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_read.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_read_ex.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_write.3 -MLINKS+= BIO_meth_new.3 BIO_meth_get_write_ex.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_callback_ctrl.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_create.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_ctrl.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_destroy.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_gets.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_puts.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_read.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_read_ex.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_write.3 -MLINKS+= BIO_meth_new.3 BIO_meth_set_write_ex.3 -MLINKS+= BIO_find_type.3 BIO_method_type.3 -MLINKS+= BIO_s_accept.3 BIO_new_accept.3 -MLINKS+= BIO_s_bio.3 BIO_new_bio_pair.3 -MLINKS+= BIO_f_ssl.3 BIO_new_buffer_ssl_connect.3 -MLINKS+= BIO_s_connect.3 BIO_new_connect.3 -MLINKS+= BIO_s_datagram.3 BIO_new_dgram.3 -MLINKS+= BIO_new.3 BIO_new_ex.3 -MLINKS+= BIO_s_fd.3 BIO_new_fd.3 -MLINKS+= BIO_s_file.3 BIO_new_file.3 -MLINKS+= BIO_s_file.3 BIO_new_fp.3 -MLINKS+= BIO_s_core.3 BIO_new_from_core_bio.3 -MLINKS+= BIO_s_mem.3 BIO_new_mem_buf.3 -MLINKS+= BIO_s_socket.3 BIO_new_socket.3 -MLINKS+= BIO_f_ssl.3 BIO_new_ssl.3 -MLINKS+= BIO_f_ssl.3 BIO_new_ssl_connect.3 -MLINKS+= BIO_find_type.3 BIO_next.3 MLINKS+= BIO_ctrl.3 BIO_pending.3 -MLINKS+= BIO_push.3 BIO_pop.3 MLINKS+= BIO_ctrl.3 BIO_ptr_ctrl.3 -MLINKS+= BIO_read.3 BIO_puts.3 -MLINKS+= BIO_read.3 BIO_read_ex.3 -MLINKS+= BIO_s_file.3 BIO_read_filename.3 MLINKS+= BIO_ctrl.3 BIO_reset.3 -MLINKS+= BIO_should_retry.3 BIO_retry_type.3 -MLINKS+= BIO_s_file.3 BIO_rw_filename.3 -MLINKS+= BIO_s_mem.3 BIO_s_secmem.3 MLINKS+= BIO_ctrl.3 BIO_seek.3 -MLINKS+= BIO_s_accept.3 BIO_set_accept_bios.3 -MLINKS+= BIO_s_accept.3 BIO_set_accept_ip_family.3 -MLINKS+= BIO_s_accept.3 BIO_set_accept_name.3 -MLINKS+= BIO_s_accept.3 BIO_set_accept_port.3 -MLINKS+= BIO_get_ex_new_index.3 BIO_set_app_data.3 -MLINKS+= BIO_s_accept.3 BIO_set_bind_mode.3 +MLINKS+= BIO_ctrl.3 BIO_set_close.3 +MLINKS+= BIO_ctrl.3 BIO_set_conn_mode.3 +MLINKS+= BIO_ctrl.3 BIO_set_info_callback.3 +MLINKS+= BIO_ctrl.3 BIO_set_tfo.3 +MLINKS+= BIO_ctrl.3 BIO_tell.3 +MLINKS+= BIO_ctrl.3 BIO_wpending.3 +MLINKS+= BIO_f_buffer.3 BIO_get_buffer_num_lines.3 MLINKS+= BIO_f_buffer.3 BIO_set_buffer_read_data.3 MLINKS+= BIO_f_buffer.3 BIO_set_buffer_size.3 -MLINKS+= BIO_set_callback.3 BIO_set_callback_arg.3 -MLINKS+= BIO_set_callback.3 BIO_set_callback_ex.3 +MLINKS+= BIO_f_buffer.3 BIO_set_read_buffer_size.3 +MLINKS+= BIO_f_buffer.3 BIO_set_write_buffer_size.3 +MLINKS+= BIO_f_cipher.3 BIO_get_cipher_ctx.3 +MLINKS+= BIO_f_cipher.3 BIO_get_cipher_status.3 MLINKS+= BIO_f_cipher.3 BIO_set_cipher.3 -MLINKS+= BIO_ctrl.3 BIO_set_close.3 -MLINKS+= BIO_s_connect.3 BIO_set_conn_address.3 -MLINKS+= BIO_s_connect.3 BIO_set_conn_hostname.3 -MLINKS+= BIO_s_connect.3 BIO_set_conn_ip_family.3 -MLINKS+= BIO_s_connect.3 BIO_set_conn_port.3 -MLINKS+= BIO_get_data.3 BIO_set_data.3 -MLINKS+= BIO_get_ex_new_index.3 BIO_set_ex_data.3 -MLINKS+= BIO_s_fd.3 BIO_set_fd.3 -MLINKS+= BIO_s_file.3 BIO_set_fp.3 +MLINKS+= BIO_f_md.3 BIO_get_md.3 +MLINKS+= BIO_f_md.3 BIO_get_md_ctx.3 +MLINKS+= BIO_f_md.3 BIO_set_md.3 +MLINKS+= BIO_f_prefix.3 BIO_get_indent.3 MLINKS+= BIO_f_prefix.3 BIO_set_indent.3 -MLINKS+= BIO_ctrl.3 BIO_set_info_callback.3 -MLINKS+= BIO_get_data.3 BIO_set_init.3 -MLINKS+= BIO_f_md.3 BIO_set_md.3 -MLINKS+= BIO_s_mem.3 BIO_set_mem_buf.3 -MLINKS+= BIO_s_mem.3 BIO_set_mem_eof_return.3 -MLINKS+= BIO_s_connect.3 BIO_set_nbio.3 -MLINKS+= BIO_s_accept.3 BIO_set_nbio_accept.3 -MLINKS+= BIO_push.3 BIO_set_next.3 MLINKS+= BIO_f_prefix.3 BIO_set_prefix.3 -MLINKS+= BIO_f_buffer.3 BIO_set_read_buffer_size.3 -MLINKS+= BIO_should_retry.3 BIO_set_retry_reason.3 -MLINKS+= BIO_get_data.3 BIO_set_shutdown.3 +MLINKS+= BIO_f_ssl.3 BIO_do_handshake.3 +MLINKS+= BIO_f_ssl.3 BIO_get_num_renegotiates.3 +MLINKS+= BIO_f_ssl.3 BIO_get_ssl.3 +MLINKS+= BIO_f_ssl.3 BIO_new_buffer_ssl_connect.3 +MLINKS+= BIO_f_ssl.3 BIO_new_ssl.3 +MLINKS+= BIO_f_ssl.3 BIO_new_ssl_connect.3 MLINKS+= BIO_f_ssl.3 BIO_set_ssl.3 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_mode.3 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_renegotiate_bytes.3 MLINKS+= BIO_f_ssl.3 BIO_set_ssl_renegotiate_timeout.3 -MLINKS+= BIO_s_bio.3 BIO_set_write_buf_size.3 -MLINKS+= BIO_f_buffer.3 BIO_set_write_buffer_size.3 -MLINKS+= BIO_should_retry.3 BIO_should_io_special.3 -MLINKS+= BIO_should_retry.3 BIO_should_read.3 -MLINKS+= BIO_should_retry.3 BIO_should_write.3 -MLINKS+= BIO_s_bio.3 BIO_shutdown_wr.3 -MLINKS+= BIO_printf.3 BIO_snprintf.3 -MLINKS+= BIO_connect.3 BIO_socket.3 MLINKS+= BIO_f_ssl.3 BIO_ssl_copy_session_id.3 MLINKS+= BIO_f_ssl.3 BIO_ssl_shutdown.3 -MLINKS+= BIO_ctrl.3 BIO_tell.3 +MLINKS+= BIO_find_type.3 BIO_method_type.3 +MLINKS+= BIO_find_type.3 BIO_next.3 +MLINKS+= BIO_get_data.3 BIO_get_init.3 +MLINKS+= BIO_get_data.3 BIO_get_shutdown.3 +MLINKS+= BIO_get_data.3 BIO_set_data.3 +MLINKS+= BIO_get_data.3 BIO_set_init.3 +MLINKS+= BIO_get_data.3 BIO_set_shutdown.3 +MLINKS+= BIO_get_ex_new_index.3 BIO_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 BIO_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 BIO_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 BIO_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 DH_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 DH_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 DH_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 DSA_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 DSA_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 DSA_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 EC_KEY_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 EC_KEY_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 EC_KEY_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 ENGINE_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 ENGINE_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 ENGINE_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 EVP_PKEY_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 EVP_PKEY_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 EVP_PKEY_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 RSA_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_CTX_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_SESSION_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 SSL_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 UI_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 UI_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 UI_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 UI_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 UI_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_get_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_set_app_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_CTX_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 X509_STORE_set_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_get_ex_data.3 +MLINKS+= BIO_get_ex_new_index.3 X509_get_ex_new_index.3 +MLINKS+= BIO_get_ex_new_index.3 X509_set_ex_data.3 +MLINKS+= BIO_get_rpoll_descriptor.3 BIO_get_wpoll_descriptor.3 +MLINKS+= BIO_meth_new.3 BIO_get_new_index.3 +MLINKS+= BIO_meth_new.3 BIO_meth_free.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_callback_ctrl.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_create.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_ctrl.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_destroy.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_gets.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_puts.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_read.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_read_ex.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_recvmmsg.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_sendmmsg.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_write.3 +MLINKS+= BIO_meth_new.3 BIO_meth_get_write_ex.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_callback_ctrl.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_create.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_ctrl.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_destroy.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_gets.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_puts.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_read.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_read_ex.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_recvmmsg.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_sendmmsg.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_write.3 +MLINKS+= BIO_meth_new.3 BIO_meth_set_write_ex.3 +MLINKS+= BIO_new.3 BIO_free.3 +MLINKS+= BIO_new.3 BIO_free_all.3 +MLINKS+= BIO_new.3 BIO_new_ex.3 MLINKS+= BIO_new.3 BIO_up_ref.3 MLINKS+= BIO_new.3 BIO_vfree.3 +MLINKS+= BIO_parse_hostserv.3 BIO_hostserv_priorities.3 +MLINKS+= BIO_printf.3 BIO_snprintf.3 MLINKS+= BIO_printf.3 BIO_vprintf.3 MLINKS+= BIO_printf.3 BIO_vsnprintf.3 -MLINKS+= BIO_socket_wait.3 BIO_wait.3 -MLINKS+= BIO_ctrl.3 BIO_wpending.3 +MLINKS+= BIO_push.3 BIO_pop.3 +MLINKS+= BIO_push.3 BIO_set_next.3 +MLINKS+= BIO_read.3 BIO_get_line.3 +MLINKS+= BIO_read.3 BIO_gets.3 +MLINKS+= BIO_read.3 BIO_puts.3 +MLINKS+= BIO_read.3 BIO_read_ex.3 MLINKS+= BIO_read.3 BIO_write.3 MLINKS+= BIO_read.3 BIO_write_ex.3 +MLINKS+= BIO_s_accept.3 BIO_do_accept.3 +MLINKS+= BIO_s_accept.3 BIO_get_accept_ip_family.3 +MLINKS+= BIO_s_accept.3 BIO_get_accept_name.3 +MLINKS+= BIO_s_accept.3 BIO_get_accept_port.3 +MLINKS+= BIO_s_accept.3 BIO_get_bind_mode.3 +MLINKS+= BIO_s_accept.3 BIO_get_peer_name.3 +MLINKS+= BIO_s_accept.3 BIO_get_peer_port.3 +MLINKS+= BIO_s_accept.3 BIO_new_accept.3 +MLINKS+= BIO_s_accept.3 BIO_set_accept_bios.3 +MLINKS+= BIO_s_accept.3 BIO_set_accept_ip_family.3 +MLINKS+= BIO_s_accept.3 BIO_set_accept_name.3 +MLINKS+= BIO_s_accept.3 BIO_set_accept_port.3 +MLINKS+= BIO_s_accept.3 BIO_set_bind_mode.3 +MLINKS+= BIO_s_accept.3 BIO_set_nbio_accept.3 +MLINKS+= BIO_s_accept.3 BIO_set_tfo_accept.3 +MLINKS+= BIO_s_bio.3 BIO_ctrl_get_read_request.3 +MLINKS+= BIO_s_bio.3 BIO_ctrl_get_write_guarantee.3 +MLINKS+= BIO_s_bio.3 BIO_ctrl_reset_read_request.3 +MLINKS+= BIO_s_bio.3 BIO_destroy_bio_pair.3 +MLINKS+= BIO_s_bio.3 BIO_get_read_request.3 +MLINKS+= BIO_s_bio.3 BIO_get_write_buf_size.3 +MLINKS+= BIO_s_bio.3 BIO_get_write_guarantee.3 +MLINKS+= BIO_s_bio.3 BIO_make_bio_pair.3 +MLINKS+= BIO_s_bio.3 BIO_new_bio_pair.3 +MLINKS+= BIO_s_bio.3 BIO_set_write_buf_size.3 +MLINKS+= BIO_s_bio.3 BIO_shutdown_wr.3 +MLINKS+= BIO_s_connect.3 BIO_do_connect.3 +MLINKS+= BIO_s_connect.3 BIO_get0_dgram_bio.3 +MLINKS+= BIO_s_connect.3 BIO_get_conn_address.3 +MLINKS+= BIO_s_connect.3 BIO_get_conn_hostname.3 +MLINKS+= BIO_s_connect.3 BIO_get_conn_ip_family.3 +MLINKS+= BIO_s_connect.3 BIO_get_conn_port.3 +MLINKS+= BIO_s_connect.3 BIO_get_sock_type.3 +MLINKS+= BIO_s_connect.3 BIO_new_connect.3 +MLINKS+= BIO_s_connect.3 BIO_set_conn_address.3 +MLINKS+= BIO_s_connect.3 BIO_set_conn_hostname.3 +MLINKS+= BIO_s_connect.3 BIO_set_conn_ip_family.3 +MLINKS+= BIO_s_connect.3 BIO_set_conn_port.3 +MLINKS+= BIO_s_connect.3 BIO_set_nbio.3 +MLINKS+= BIO_s_connect.3 BIO_set_sock_type.3 +MLINKS+= BIO_s_core.3 BIO_new_from_core_bio.3 +MLINKS+= BIO_s_datagram.3 BIO_ctrl_dgram_connect.3 +MLINKS+= BIO_s_datagram.3 BIO_ctrl_set_connected.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_detect_peer_addr.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_get_mtu_overhead.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_get_peer.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_recv_timedout.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_send_timedout.3 +MLINKS+= BIO_s_datagram.3 BIO_dgram_set_peer.3 +MLINKS+= BIO_s_datagram.3 BIO_new_dgram.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_get_caps.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_get_effective_caps.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_get_mtu.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_get_no_trunc.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_set0_local_addr.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_set_caps.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_set_mtu.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_dgram_set_no_trunc.3 +MLINKS+= BIO_s_dgram_pair.3 BIO_new_bio_dgram_pair.3 +MLINKS+= BIO_s_fd.3 BIO_get_fd.3 +MLINKS+= BIO_s_fd.3 BIO_new_fd.3 +MLINKS+= BIO_s_fd.3 BIO_set_fd.3 +MLINKS+= BIO_s_file.3 BIO_append_filename.3 +MLINKS+= BIO_s_file.3 BIO_get_fp.3 +MLINKS+= BIO_s_file.3 BIO_new_file.3 +MLINKS+= BIO_s_file.3 BIO_new_fp.3 +MLINKS+= BIO_s_file.3 BIO_read_filename.3 +MLINKS+= BIO_s_file.3 BIO_rw_filename.3 +MLINKS+= BIO_s_file.3 BIO_set_fp.3 MLINKS+= BIO_s_file.3 BIO_write_filename.3 +MLINKS+= BIO_s_mem.3 BIO_get_mem_data.3 +MLINKS+= BIO_s_mem.3 BIO_get_mem_ptr.3 +MLINKS+= BIO_s_mem.3 BIO_new_mem_buf.3 +MLINKS+= BIO_s_mem.3 BIO_s_dgram_mem.3 +MLINKS+= BIO_s_mem.3 BIO_s_secmem.3 +MLINKS+= BIO_s_mem.3 BIO_set_mem_buf.3 +MLINKS+= BIO_s_mem.3 BIO_set_mem_eof_return.3 +MLINKS+= BIO_s_socket.3 BIO_new_socket.3 +MLINKS+= BIO_sendmmsg.3 BIO_dgram_get_local_addr_cap.3 +MLINKS+= BIO_sendmmsg.3 BIO_dgram_get_local_addr_enable.3 +MLINKS+= BIO_sendmmsg.3 BIO_dgram_set_local_addr_enable.3 +MLINKS+= BIO_sendmmsg.3 BIO_err_is_non_fatal.3 +MLINKS+= BIO_sendmmsg.3 BIO_recvmmsg.3 +MLINKS+= BIO_set_callback.3 BIO_callback_fn.3 +MLINKS+= BIO_set_callback.3 BIO_callback_fn_ex.3 +MLINKS+= BIO_set_callback.3 BIO_debug_callback.3 +MLINKS+= BIO_set_callback.3 BIO_debug_callback_ex.3 +MLINKS+= BIO_set_callback.3 BIO_get_callback.3 +MLINKS+= BIO_set_callback.3 BIO_get_callback_arg.3 +MLINKS+= BIO_set_callback.3 BIO_get_callback_ex.3 +MLINKS+= BIO_set_callback.3 BIO_set_callback_arg.3 +MLINKS+= BIO_set_callback.3 BIO_set_callback_ex.3 +MLINKS+= BIO_should_retry.3 BIO_get_retry_BIO.3 +MLINKS+= BIO_should_retry.3 BIO_get_retry_reason.3 +MLINKS+= BIO_should_retry.3 BIO_retry_type.3 +MLINKS+= BIO_should_retry.3 BIO_set_retry_reason.3 +MLINKS+= BIO_should_retry.3 BIO_should_io_special.3 +MLINKS+= BIO_should_retry.3 BIO_should_read.3 +MLINKS+= BIO_should_retry.3 BIO_should_write.3 +MLINKS+= BIO_socket_wait.3 BIO_do_connect_retry.3 +MLINKS+= BIO_socket_wait.3 BIO_wait.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_convert.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_convert_ex.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_create_param.3 @@ -1030,96 +1118,90 @@ MLINKS+= BN_BLINDING_new.3 BN_BLINDING_set_current_thread.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_set_flags.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_unlock.3 MLINKS+= BN_BLINDING_new.3 BN_BLINDING_update.3 -MLINKS+= BN_CTX_start.3 BN_CTX_end.3 MLINKS+= BN_CTX_new.3 BN_CTX_free.3 -MLINKS+= BN_CTX_start.3 BN_CTX_get.3 MLINKS+= BN_CTX_new.3 BN_CTX_new_ex.3 MLINKS+= BN_CTX_new.3 BN_CTX_secure_new.3 MLINKS+= BN_CTX_new.3 BN_CTX_secure_new_ex.3 +MLINKS+= BN_CTX_start.3 BN_CTX_end.3 +MLINKS+= BN_CTX_start.3 BN_CTX_get.3 +MLINKS+= BN_add.3 BN_div.3 +MLINKS+= BN_add.3 BN_exp.3 +MLINKS+= BN_add.3 BN_gcd.3 +MLINKS+= BN_add.3 BN_mod.3 +MLINKS+= BN_add.3 BN_mod_add.3 +MLINKS+= BN_add.3 BN_mod_exp.3 +MLINKS+= BN_add.3 BN_mod_mul.3 +MLINKS+= BN_add.3 BN_mod_sqr.3 +MLINKS+= BN_add.3 BN_mod_sqrt.3 +MLINKS+= BN_add.3 BN_mod_sub.3 +MLINKS+= BN_add.3 BN_mul.3 +MLINKS+= BN_add.3 BN_nnmod.3 +MLINKS+= BN_add.3 BN_sqr.3 +MLINKS+= BN_add.3 BN_sub.3 +MLINKS+= BN_add_word.3 BN_div_word.3 +MLINKS+= BN_add_word.3 BN_mod_word.3 +MLINKS+= BN_add_word.3 BN_mul_word.3 +MLINKS+= BN_add_word.3 BN_sub_word.3 +MLINKS+= BN_bn2bin.3 BN_bin2bn.3 +MLINKS+= BN_bn2bin.3 BN_bn2binpad.3 +MLINKS+= BN_bn2bin.3 BN_bn2dec.3 +MLINKS+= BN_bn2bin.3 BN_bn2hex.3 +MLINKS+= BN_bn2bin.3 BN_bn2lebinpad.3 +MLINKS+= BN_bn2bin.3 BN_bn2mpi.3 +MLINKS+= BN_bn2bin.3 BN_bn2nativepad.3 +MLINKS+= BN_bn2bin.3 BN_dec2bn.3 +MLINKS+= BN_bn2bin.3 BN_hex2bn.3 +MLINKS+= BN_bn2bin.3 BN_lebin2bn.3 +MLINKS+= BN_bn2bin.3 BN_mpi2bn.3 +MLINKS+= BN_bn2bin.3 BN_native2bn.3 +MLINKS+= BN_bn2bin.3 BN_print.3 +MLINKS+= BN_bn2bin.3 BN_print_fp.3 +MLINKS+= BN_bn2bin.3 BN_signed_bin2bn.3 +MLINKS+= BN_bn2bin.3 BN_signed_bn2bin.3 +MLINKS+= BN_bn2bin.3 BN_signed_bn2lebin.3 +MLINKS+= BN_bn2bin.3 BN_signed_bn2native.3 +MLINKS+= BN_bn2bin.3 BN_signed_lebin2bn.3 +MLINKS+= BN_bn2bin.3 BN_signed_native2bn.3 +MLINKS+= BN_cmp.3 BN_abs_is_word.3 +MLINKS+= BN_cmp.3 BN_are_coprime.3 +MLINKS+= BN_cmp.3 BN_is_odd.3 +MLINKS+= BN_cmp.3 BN_is_one.3 +MLINKS+= BN_cmp.3 BN_is_word.3 +MLINKS+= BN_cmp.3 BN_is_zero.3 +MLINKS+= BN_cmp.3 BN_ucmp.3 +MLINKS+= BN_copy.3 BN_dup.3 +MLINKS+= BN_copy.3 BN_with_flags.3 MLINKS+= BN_generate_prime.3 BN_GENCB_call.3 MLINKS+= BN_generate_prime.3 BN_GENCB_free.3 MLINKS+= BN_generate_prime.3 BN_GENCB_get_arg.3 MLINKS+= BN_generate_prime.3 BN_GENCB_new.3 MLINKS+= BN_generate_prime.3 BN_GENCB_set.3 MLINKS+= BN_generate_prime.3 BN_GENCB_set_old.3 +MLINKS+= BN_generate_prime.3 BN_check_prime.3 +MLINKS+= BN_generate_prime.3 BN_generate_prime_ex.3 +MLINKS+= BN_generate_prime.3 BN_generate_prime_ex2.3 +MLINKS+= BN_generate_prime.3 BN_is_prime.3 +MLINKS+= BN_generate_prime.3 BN_is_prime_ex.3 +MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest.3 +MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest_ex.3 +MLINKS+= BN_mod_exp_mont.3 BN_mod_exp_mont_consttime.3 +MLINKS+= BN_mod_exp_mont.3 BN_mod_exp_mont_consttime_x2.3 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_copy.3 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_free.3 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_new.3 MLINKS+= BN_mod_mul_montgomery.3 BN_MONT_CTX_set.3 +MLINKS+= BN_mod_mul_montgomery.3 BN_from_montgomery.3 +MLINKS+= BN_mod_mul_montgomery.3 BN_to_montgomery.3 MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_free.3 MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_new.3 MLINKS+= BN_mod_mul_reciprocal.3 BN_RECP_CTX_set.3 -MLINKS+= BN_cmp.3 BN_abs_is_word.3 -MLINKS+= BN_bn2bin.3 BN_bin2bn.3 -MLINKS+= BN_bn2bin.3 BN_bn2binpad.3 -MLINKS+= BN_bn2bin.3 BN_bn2dec.3 -MLINKS+= BN_bn2bin.3 BN_bn2hex.3 -MLINKS+= BN_bn2bin.3 BN_bn2lebinpad.3 -MLINKS+= BN_bn2bin.3 BN_bn2mpi.3 -MLINKS+= BN_bn2bin.3 BN_bn2nativepad.3 -MLINKS+= BN_generate_prime.3 BN_check_prime.3 +MLINKS+= BN_mod_mul_reciprocal.3 BN_div_recp.3 MLINKS+= BN_new.3 BN_clear.3 -MLINKS+= BN_set_bit.3 BN_clear_bit.3 MLINKS+= BN_new.3 BN_clear_free.3 -MLINKS+= BN_bn2bin.3 BN_dec2bn.3 -MLINKS+= BN_add.3 BN_div.3 -MLINKS+= BN_mod_mul_reciprocal.3 BN_div_recp.3 -MLINKS+= BN_add_word.3 BN_div_word.3 -MLINKS+= BN_copy.3 BN_dup.3 -MLINKS+= BN_add.3 BN_exp.3 MLINKS+= BN_new.3 BN_free.3 -MLINKS+= BN_mod_mul_montgomery.3 BN_from_montgomery.3 -MLINKS+= BN_add.3 BN_gcd.3 -MLINKS+= BN_generate_prime.3 BN_generate_prime_ex.3 -MLINKS+= BN_generate_prime.3 BN_generate_prime_ex2.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_192.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_224.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_256.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_384.3 -MLINKS+= DH_get_1024_160.3 BN_get0_nist_prime_521.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc2409_prime_1024.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc2409_prime_768.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_1536.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_2048.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_3072.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_4096.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_6144.3 -MLINKS+= DH_get_1024_160.3 BN_get_rfc3526_prime_8192.3 -MLINKS+= BN_zero.3 BN_get_word.3 -MLINKS+= BN_bn2bin.3 BN_hex2bn.3 -MLINKS+= BN_set_bit.3 BN_is_bit_set.3 -MLINKS+= BN_cmp.3 BN_is_odd.3 -MLINKS+= BN_cmp.3 BN_is_one.3 -MLINKS+= BN_generate_prime.3 BN_is_prime.3 -MLINKS+= BN_generate_prime.3 BN_is_prime_ex.3 -MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest.3 -MLINKS+= BN_generate_prime.3 BN_is_prime_fasttest_ex.3 -MLINKS+= BN_cmp.3 BN_is_word.3 -MLINKS+= BN_cmp.3 BN_is_zero.3 -MLINKS+= BN_bn2bin.3 BN_lebin2bn.3 -MLINKS+= BN_set_bit.3 BN_lshift.3 -MLINKS+= BN_set_bit.3 BN_lshift1.3 -MLINKS+= BN_set_bit.3 BN_mask_bits.3 -MLINKS+= BN_add.3 BN_mod.3 -MLINKS+= BN_add.3 BN_mod_add.3 -MLINKS+= BN_add.3 BN_mod_exp.3 -MLINKS+= BN_mod_exp_mont.3 BN_mod_exp_mont_consttime.3 -MLINKS+= BN_mod_exp_mont.3 BN_mod_exp_mont_consttime_x2.3 -MLINKS+= BN_add.3 BN_mod_mul.3 -MLINKS+= BN_add.3 BN_mod_sqr.3 -MLINKS+= BN_add.3 BN_mod_sqrt.3 -MLINKS+= BN_add.3 BN_mod_sub.3 -MLINKS+= BN_add_word.3 BN_mod_word.3 -MLINKS+= BN_bn2bin.3 BN_mpi2bn.3 -MLINKS+= BN_add.3 BN_mul.3 -MLINKS+= BN_add_word.3 BN_mul_word.3 -MLINKS+= BN_bn2bin.3 BN_native2bn.3 -MLINKS+= BN_add.3 BN_nnmod.3 +MLINKS+= BN_new.3 BN_secure_new.3 MLINKS+= BN_num_bytes.3 BN_num_bits.3 MLINKS+= BN_num_bytes.3 BN_num_bits_word.3 -MLINKS+= BN_zero.3 BN_one.3 -MLINKS+= BN_bn2bin.3 BN_print.3 -MLINKS+= BN_bn2bin.3 BN_print_fp.3 MLINKS+= BN_rand.3 BN_priv_rand.3 MLINKS+= BN_rand.3 BN_priv_rand_ex.3 MLINKS+= BN_rand.3 BN_priv_rand_range.3 @@ -1129,39 +1211,51 @@ MLINKS+= BN_rand.3 BN_pseudo_rand_range.3 MLINKS+= BN_rand.3 BN_rand_ex.3 MLINKS+= BN_rand.3 BN_rand_range.3 MLINKS+= BN_rand.3 BN_rand_range_ex.3 +MLINKS+= BN_set_bit.3 BN_clear_bit.3 +MLINKS+= BN_set_bit.3 BN_is_bit_set.3 +MLINKS+= BN_set_bit.3 BN_lshift.3 +MLINKS+= BN_set_bit.3 BN_lshift1.3 +MLINKS+= BN_set_bit.3 BN_mask_bits.3 MLINKS+= BN_set_bit.3 BN_rshift.3 MLINKS+= BN_set_bit.3 BN_rshift1.3 -MLINKS+= BN_new.3 BN_secure_new.3 +MLINKS+= BN_zero.3 BN_get_word.3 +MLINKS+= BN_zero.3 BN_one.3 MLINKS+= BN_zero.3 BN_set_word.3 -MLINKS+= BN_add.3 BN_sqr.3 -MLINKS+= BN_add.3 BN_sub.3 -MLINKS+= BN_add_word.3 BN_sub_word.3 -MLINKS+= ASN1_INTEGER_get_int64.3 BN_to_ASN1_ENUMERATED.3 -MLINKS+= ASN1_INTEGER_get_int64.3 BN_to_ASN1_INTEGER.3 -MLINKS+= BN_mod_mul_montgomery.3 BN_to_montgomery.3 -MLINKS+= BN_cmp.3 BN_ucmp.3 MLINKS+= BN_zero.3 BN_value_one.3 -MLINKS+= BN_copy.3 BN_with_flags.3 MLINKS+= BUF_MEM_new.3 BUF_MEM_free.3 MLINKS+= BUF_MEM_new.3 BUF_MEM_grow.3 MLINKS+= BUF_MEM_new.3 BUF_MEM_grow_clean.3 MLINKS+= BUF_MEM_new.3 BUF_MEM_new_ex.3 MLINKS+= BUF_MEM_new.3 BUF_reverse.3 -MLINKS+= X509_dup.3 CERTIFICATEPOLICIES_free.3 -MLINKS+= X509_dup.3 CERTIFICATEPOLICIES_new.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_cleanup.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_copy.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_free.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_get0_cipher_ctx.3 +MLINKS+= CMAC_CTX.3 CMAC_CTX_new.3 +MLINKS+= CMAC_CTX.3 CMAC_Final.3 +MLINKS+= CMAC_CTX.3 CMAC_Init.3 +MLINKS+= CMAC_CTX.3 CMAC_Update.3 +MLINKS+= CMAC_CTX.3 CMAC_resume.3 +MLINKS+= CMS_EncryptedData_decrypt.3 CMS_EnvelopedData_decrypt.3 +MLINKS+= CMS_EncryptedData_encrypt.3 CMS_EncryptedData_encrypt_ex.3 MLINKS+= CMS_EnvelopedData_create.3 CMS_AuthEnvelopedData_create.3 MLINKS+= CMS_EnvelopedData_create.3 CMS_AuthEnvelopedData_create_ex.3 -MLINKS+= X509_dup.3 CMS_ContentInfo_free.3 -MLINKS+= X509_dup.3 CMS_ContentInfo_new.3 -MLINKS+= X509_dup.3 CMS_ContentInfo_new_ex.3 -MLINKS+= X509_dup.3 CMS_ContentInfo_print_ctx.3 -MLINKS+= CMS_EncryptedData_encrypt.3 CMS_EncryptedData_encrypt_ex.3 MLINKS+= CMS_EnvelopedData_create.3 CMS_EnvelopedData_create_ex.3 -MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0.3 -MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0_ex.3 -MLINKS+= X509_dup.3 CMS_ReceiptRequest_free.3 -MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_get0_values.3 -MLINKS+= X509_dup.3 CMS_ReceiptRequest_new.3 +MLINKS+= CMS_add0_cert.3 CMS_add0_crl.3 +MLINKS+= CMS_add0_cert.3 CMS_add1_cert.3 +MLINKS+= CMS_add0_cert.3 CMS_add1_crl.3 +MLINKS+= CMS_add0_cert.3 CMS_get1_certs.3 +MLINKS+= CMS_add0_cert.3 CMS_get1_crls.3 +MLINKS+= CMS_add1_recipient_cert.3 CMS_add0_recipient_key.3 +MLINKS+= CMS_add1_recipient_cert.3 CMS_add1_recipient.3 +MLINKS+= CMS_add1_signer.3 CMS_SignerInfo_sign.3 +MLINKS+= CMS_data_create.3 CMS_data_create_ex.3 +MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_password.3 +MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_pkey.3 +MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_pkey_and_peer.3 +MLINKS+= CMS_digest_create.3 CMS_digest_create_ex.3 +MLINKS+= CMS_encrypt.3 CMS_encrypt_ex.3 +MLINKS+= CMS_final.3 CMS_final_digest.3 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_decrypt.3 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_encrypt.3 MLINKS+= CMS_get0_RecipientInfos.3 CMS_RecipientInfo_kari_set0_pkey.3 @@ -1177,80 +1271,82 @@ MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_cert_cmp.3 MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_get0_signature.3 MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_get0_signer_id.3 MLINKS+= CMS_get0_SignerInfos.3 CMS_SignerInfo_set1_signer_cert.3 -MLINKS+= CMS_add1_signer.3 CMS_SignerInfo_sign.3 -MLINKS+= CMS_add0_cert.3 CMS_add0_crl.3 -MLINKS+= CMS_add1_recipient_cert.3 CMS_add0_recipient_key.3 -MLINKS+= CMS_get1_ReceiptRequest.3 CMS_add1_ReceiptRequest.3 -MLINKS+= CMS_add0_cert.3 CMS_add1_cert.3 -MLINKS+= CMS_add0_cert.3 CMS_add1_crl.3 -MLINKS+= CMS_add1_recipient_cert.3 CMS_add1_recipient.3 -MLINKS+= CMS_data_create.3 CMS_data_create_ex.3 -MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_password.3 -MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_pkey.3 -MLINKS+= CMS_decrypt.3 CMS_decrypt_set1_pkey_and_peer.3 -MLINKS+= CMS_digest_create.3 CMS_digest_create_ex.3 -MLINKS+= CMS_encrypt.3 CMS_encrypt_ex.3 MLINKS+= CMS_get0_type.3 CMS_get0_content.3 MLINKS+= CMS_get0_type.3 CMS_get0_eContentType.3 -MLINKS+= CMS_verify.3 CMS_get0_signers.3 -MLINKS+= CMS_add0_cert.3 CMS_get1_certs.3 -MLINKS+= CMS_add0_cert.3 CMS_get1_crls.3 MLINKS+= CMS_get0_type.3 CMS_set1_eContentType.3 +MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0.3 +MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0_ex.3 +MLINKS+= CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_get0_values.3 +MLINKS+= CMS_get1_ReceiptRequest.3 CMS_add1_ReceiptRequest.3 MLINKS+= CMS_sign.3 CMS_sign_ex.3 -MLINKS+= CONF_modules_load_file.3 CONF_get1_default_config_file.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_add1_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_add1_attr_by_NID.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_add1_attr_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_add1_attr_by_txt.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_delete_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_get0_data_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_get_attr_by_NID.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_get_attr_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_signed_get_attr_count.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_add1_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_add1_attr_by_NID.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_add1_attr_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_add1_attr_by_txt.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_delete_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get0_data_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get_attr.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get_attr_by_NID.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get_attr_by_OBJ.3 +MLINKS+= CMS_signed_get_attr.3 CMS_unsigned_get_attr_count.3 +MLINKS+= CMS_verify.3 CMS_SignedData_verify.3 +MLINKS+= CMS_verify.3 CMS_get0_signers.3 +MLINKS+= COMP_CTX_new.3 BIO_f_brotli.3 +MLINKS+= COMP_CTX_new.3 BIO_f_zlib.3 +MLINKS+= COMP_CTX_new.3 BIO_f_zstd.3 +MLINKS+= COMP_CTX_new.3 COMP_CTX_free.3 +MLINKS+= COMP_CTX_new.3 COMP_CTX_get_method.3 +MLINKS+= COMP_CTX_new.3 COMP_CTX_get_type.3 +MLINKS+= COMP_CTX_new.3 COMP_brotli.3 +MLINKS+= COMP_CTX_new.3 COMP_brotli_oneshot.3 +MLINKS+= COMP_CTX_new.3 COMP_compress_block.3 +MLINKS+= COMP_CTX_new.3 COMP_expand_block.3 +MLINKS+= COMP_CTX_new.3 COMP_get_name.3 +MLINKS+= COMP_CTX_new.3 COMP_get_type.3 +MLINKS+= COMP_CTX_new.3 COMP_zlib.3 +MLINKS+= COMP_CTX_new.3 COMP_zlib_oneshot.3 +MLINKS+= COMP_CTX_new.3 COMP_zstd.3 +MLINKS+= COMP_CTX_new.3 COMP_zstd_oneshot.3 MLINKS+= CONF_modules_free.3 CONF_modules_finish.3 +MLINKS+= CONF_modules_free.3 CONF_modules_unload.3 +MLINKS+= CONF_modules_load_file.3 CONF_get1_default_config_file.3 MLINKS+= CONF_modules_load_file.3 CONF_modules_load.3 MLINKS+= CONF_modules_load_file.3 CONF_modules_load_file_ex.3 -MLINKS+= CONF_modules_free.3 CONF_modules_unload.3 -MLINKS+= X509_dup.3 CRL_DIST_POINTS_free.3 -MLINKS+= X509_dup.3 CRL_DIST_POINTS_new.3 -MLINKS+= CRYPTO_get_ex_new_index.3 CRYPTO_EX_dup.3 -MLINKS+= CRYPTO_get_ex_new_index.3 CRYPTO_EX_free.3 -MLINKS+= CRYPTO_get_ex_new_index.3 CRYPTO_EX_new.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_lock_free.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_lock_new.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_read_lock.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_unlock.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_THREAD_write_lock.3 -MLINKS+= CRYPTO_get_ex_new_index.3 CRYPTO_alloc_ex_data.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_add.3 +MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_add64.3 +MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_and.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_load.3 +MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_load_int.3 MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_or.3 -MLINKS+= OPENSSL_malloc.3 CRYPTO_clear_free.3 -MLINKS+= OPENSSL_malloc.3 CRYPTO_clear_realloc.3 -MLINKS+= OPENSSL_malloc.3 CRYPTO_free.3 +MLINKS+= CRYPTO_THREAD_run_once.3 CRYPTO_atomic_store.3 +MLINKS+= CRYPTO_THREAD_run_once.3 OSSL_THREAD_SUPPORT_FLAG_DEFAULT_SPAWN.3 +MLINKS+= CRYPTO_THREAD_run_once.3 OSSL_THREAD_SUPPORT_FLAG_THREAD_POOL.3 +MLINKS+= CRYPTO_THREAD_run_once.3 OSSL_get_max_threads.3 *** 5601 LINES SKIPPED *** From nobody Wed Nov 5 19:37:36 2025 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 4d1wZm4zDSz65206; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZm30FDz3sZn; Wed, 05 Nov 2025 19:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NH+7+wzypKZ90yWTL7+fJ/lNgVGJbd2bo1WY6P62THg=; b=EY2FIATA8jFcs9daQMLGGMPkWKOatIvQSKJ5FujzBGP20mjtqVQdHEPRI09ryou1udjR8/ AqqqA8sbZw4XpaEOIoydodoDfgH2DFLjWUupfsAEIjbi4p44wX9XTmfmXR+CjQ3MFJdCDn SJzRBDeqPADjDPnuk1O5oUWIA8mAjokIskPBFBlqF6rCRGZHj53i+rBRYI6Mw+CEi+G59H RrIBjX2fdnc1Cpia8XfIITnZdy01ScYnqOo+6chvwjfvzXtWlYtS5c5uTXsqHo+jm2dmmk wtchr4yiWr/LpEffbM8oko+AOuho5h4nfRcsHE7lM8VF3jtKASfaHfzwDnd08w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NH+7+wzypKZ90yWTL7+fJ/lNgVGJbd2bo1WY6P62THg=; b=Mr6vFYIE+bz8jT0e9h4PZj+UMhQvbZBLOLaJIMSGLrkj/kbfB5XEq3+Z6jEbWo4KNljNmh RdTmYvZl/Ayw9s5lSSzZmEdeWgQ/hy/tm9M59b++9oRlegAU/8HOuyheovAhEM+FfiFgas dxOkp+DaNQAAj7ALiNNXbk2fUkGB50lVYiZPt7Fr5rJ2tSxTeoyW25747i29SfP/b3G+w2 BtL7oJnL20rMtv9yqLgMWrq77v76VbFkfWCRm7vbCrbAguYYfHtTZ+LUejPqLHCrAlfzRS pNOX4loMdKeQrKXaLWq3QFVEFGry5E5ozOeBHwx9zvOUhHQU/pD5bNATDOQpVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371456; a=rsa-sha256; cv=none; b=jsvy7mbeBNxsSyinNT6QvoAlbpYEW5ee395KkTz0pLM8W5fd68IKrLvK+0Ooxh8lEkgBhj owwciRuf92pXtu5MfdT+I4RuFokWjVvc0hLOfk3je7zSOI5GUjSw4rEwpzWJ7Auwv+/wcQ smeIPggNad1ty4I6+4ElIiTZH/Qp4GX/MAvwofaz7+j8Kh0vbqvpHhbaHCQje0NsjCntH1 Ru34Dz9C+80INcBV0kLLsMnQb5FENc3WzJcMRj5mkWOmX818HjXUxTj8THiu8wdPml4dlx rwft1gKMThX/RX0D+s50trnyF+te+8gSxK0wKznJIUTvDoea8HOgTD2rDFZplg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZm2bFDzwwL; Wed, 05 Nov 2025 19:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbatR086459; Wed, 5 Nov 2025 19:37:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbaBo086456; Wed, 5 Nov 2025 19:37:36 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:36 GMT Message-Id: <202511051937.5A5JbaBo086456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2e31b9635ca1 - releng/15.0 - crypto/openssl: apply polish to new vendor import 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 2e31b9635ca18a9c57295bace041a5fd6f59bfaf Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2e31b9635ca18a9c57295bace041a5fd6f59bfaf commit 2e31b9635ca18a9c57295bace041a5fd6f59bfaf Author: Enji Cooper AuthorDate: 2025-08-22 00:19:25 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:44 +0000 crypto/openssl: apply polish to new vendor import process This change does the following 2 things: - Makes the build more repeatable by isolating the environment. This prevents bmake from leaking variables into gmake and makes the overall process a bit more robust. - Add debug printouts to make the process more straightforward to the reader and whoever is executing doing the current vendor import. Approved by: re (cperciva) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D52420 (cherry picked from commit d18058b7b850c78f2ca1be746ab411c0bed5acc9) (cherry picked from commit 22382d9e706baddac193f66c3a48b086fc53e98c) --- crypto/openssl/BSDmakefile | 73 ++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile index bd2bfe0ea033..514c87ae3a8e 100644 --- a/crypto/openssl/BSDmakefile +++ b/crypto/openssl/BSDmakefile @@ -12,8 +12,10 @@ LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc CAT?= /bin/cat +GMAKE?= gmake MV?= /bin/mv PERL?= perl +SETENVI= /usr/bin/env -i BN_CONF_H= include/crypto/bn_conf.h BN_CONF_H_ORIG= ${BN_CONF_H}.orig @@ -23,8 +25,11 @@ CONFIGURATION_H_ORIG= ${CONFIGURATION_H}.orig .PHONY: configure patch all .ORDER: configure patch all +LOCALBASE= /usr/local +WRK_ENV= PATH=${LOCALBASE}/bin:/bin:/usr/bin + configure: - @cd ${.CURDIR} && \ + @(cd ${.CURDIR} && ${SETENVI} \ ${PERL} ./Configure \ disable-aria \ disable-egd \ @@ -37,34 +42,45 @@ configure: enable-ktls \ enable-sctp \ --openssldir=etc \ - --prefix=/usr - @cd ${.CURDIR} && gmake configdata.pm - @cd ${LCRYPTO_SRC} && ${PERL} \ - ${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \ - ${SRCTOP}/secure/lib/libcrypto/Makefile.version + --prefix=/usr) + @echo "Building configdata.pm for later use." + @(cd ${.CURDIR} && \ + ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} configdata.pm) -all: patch - # Passing `-j ${.MAKE.JOBS}` doesn't work here for some reason. - @cd ${.CURDIR} && gmake build_all_generated + @echo "Populating Makefile.version with release information" + @(cd ${LCRYPTO_SRC} && ${SETENVI} ${WRK_ENV} ${PERL} \ + ${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \ + ${SRCTOP}/secure/lib/libcrypto/Makefile.version) - # Clean the pkgconfig files: - # 1. Fix --prefix (not sure why configure --prefix isn't honored properly). +all: patch + @echo "==> Building generated files (headers, manpages, etc)" + @(cd ${.CURDIR} && \ + ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} build_all_generated) + + # 1. Fix --prefix. + # a. Not sure why --prefix isn't honored properly, even though it's + # passed to Configure; the files might be getting rebuilt + # post-Configure, somehow. # 2. Remove duplicate path in CFLAGS. # 3. Remove duplicate path in includedir(s). + @echo "==> Fixing pkgconfig files" @find . -name \*.pc -print -exec sed -i '' -E \ -e 's,^prefix=.+,prefix=/usr,' \ -e 's,[[:space:]]+(\-I)?\$\{prefix\}/\./include[[:space:]]*,,g' \ {} + - @cd ${SRCTOP}/secure/lib/libcrypto && \ - ${MAKE} cleanasm && \ - ${MAKE} buildasm + @echo "==> Cleaning / rebuilding ASM" + @(cd ${SRCTOP}/secure/lib/libcrypto && \ + ${SETENVI} ${WRK_ENV} ${MAKE} cleanasm && \ + ${SETENVI} ${WRK_ENV} ${MAKE} buildasm) + @echo "==> Syncing manpages (section 1)" @rsync -a --delete \ --exclude 'Makefile*' --exclude '*.1' \ ${LCRYPTO_DOC}/man/ \ ${SRCTOP}/secure/lib/libcrypto/man + @echo "==> Syncing manpages (sections {3,5,7})" @rsync -a --delete \ --exclude 'Makefile*' --exclude '*.[357]' \ ${LCRYPTO_DOC}/man/man1/ \ @@ -75,25 +91,26 @@ all: patch # depending on the host architecture. patch: configure # Spam arch-specific overrides to config files. + @echo "==> Patching headers" + @(cd ${.CURDIR} && ${SETENVI} ${WRK_ENV} ${GMAKE} ${BN_CONF_H} && \ + ${MV} ${BN_CONF_H} ${BN_CONF_H_ORIG} && \ + ${CAT} ${BN_CONF_H}.orig \ + ${LCRYPTO_SRC}/freebsd/${BN_CONF_H} >> \ + ${BN_CONF_H}) - @cd ${.CURDIR} && gmake ${BN_CONF_H} && \ - ${MV} ${BN_CONF_H} ${BN_CONF_H_ORIG} && \ - ${CAT} ${BN_CONF_H}.orig \ - ${LCRYPTO_SRC}/freebsd/${BN_CONF_H} >> \ - ${BN_CONF_H} - - @cd ${.CURDIR} && \ - ${MV} ${CONFIGURATION_H} ${CONFIGURATION_H_ORIG} && \ - ${CAT} ${CONFIGURATION_H_ORIG} \ - ${LCRYPTO_SRC}/freebsd/${CONFIGURATION_H} >> \ - ${CONFIGURATION_H} + @(cd ${.CURDIR} && \ + ${MV} ${CONFIGURATION_H} ${CONFIGURATION_H_ORIG} && \ + ${CAT} ${CONFIGURATION_H_ORIG} \ + ${LCRYPTO_SRC}/freebsd/${CONFIGURATION_H} >> \ + ${CONFIGURATION_H}) clean: .PHONY - @cd ${.CURDIR} && rm -f ${BN_CONF_H_ORIG} ${CONFIGURATION_H_ORIG} + @(cd ${.CURDIR} && rm -f ${BN_CONF_H_ORIG} ${CONFIGURATION_H_ORIG}) - @cd ${SRCTOP}/secure/lib/libcrypto && ${MAKE} cleanasm + @(cd ${SRCTOP}/secure/lib/libcrypto && \ + ${SETENVI} ${WRK_ENV} ${MAKE} cleanasm) - -@cd ${.CURDIR} && gmake ${.TARGET} + -@(cd ${.CURDIR} && ${GMAKE} ${.TARGET}) .include From nobody Wed Nov 5 19:37:37 2025 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 4d1wZn6qZ1z652QD; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZn4Tgcz3sVP; Wed, 05 Nov 2025 19:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ohOuD2lCcPDicKEdngGnGfROYG82kpRPXiT31d1zSmo=; b=P8BPP0pWLbeXBFdlGiGJgkqEV4QuswvSJtBNo75SlacTAxwvN+9LOQrB3T9OQFQApfzd0m ZVaBIKVIX7UTcKIIWXe5ztq4/ttlVLyngAH/sMb/PE5rQD0JzH1To/ms1ZRb7ZOuB66WW/ VKanuTuGaz89XlQVza8g3g8yC1WiA+dv84SSRY59uYN1XJZB2lTSSzKnfRRSw1yHFmzdC3 UIOUKNbXEdTcmeWBlLfnCz8I9aqOhlNPle7pj7hCzM2SNgA08V3Moehiw9PSIB3SEsilmm QderYb7e6KieahNYzYiLfYoBTgvBS7MbO0rWAnk1qDzfMW5ATWSndI5kJhRjpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ohOuD2lCcPDicKEdngGnGfROYG82kpRPXiT31d1zSmo=; b=GOvjkgTZWv9j3vS2khie4kFbkganuW9A6RnBsLow1+yVu/Q33RCOyUSCeAe2pwgQ9x9ZyT eHu+5PCXJf07GfnCCzafp8W3GWU2rMCl5YoEyUQK4RjDWDZvl1uVXeY/VwSgaaSMEL8iNH TJ/chjOy2tuiUKilgJJ21niZ9b7QCijSXJTqu/qezNCvcaTr4EcsBhMRtsZqEDpqLfeVyA ms5qgiquu+fnVD3yGZc08br+zTU0MOAvFAxE3W3kRK1UhyGGlTui6nR3E4QgvD2PUTuuL1 zjwSp1CvxBKWSBjaniSs1iYAVKh3D3EqIdYcaD6ezFo0xPl9vxC+EoeBCEKzPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371457; a=rsa-sha256; cv=none; b=rQR5fLH7l9xH2Aqn+ELQ+KqFh+2mngTTieWYDBsjwW6ExKGOzh9i1mngj0PiGvpE/WKSUN rjxylia4nZ3v6aiLH/9NskeDhP1wAJjJlFKGLh26ZW3k2pxn1NLad08H+3bnSvH2VXQvpD kto6mPmvsUdoG7ZDEjcUEjkUsNUQJFpAodaOGfp9F1aLeq6ZlsuYUJPhptwFs7geq3tGIT TUhRrM1bQM+ihqfdIDkVUgXNjPQiSxyVwFNMbWqrn4ZhlwPKuDTAWAtGOeRhxBnOztHqcY sVjDcWcBX6NxOROSNpVjeTMXY6pWUtl/xfdKCTOTuFdYZdkY050YlbADJ6RDZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZn3wthzwyq; Wed, 05 Nov 2025 19:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbbK5086493; Wed, 5 Nov 2025 19:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbbUc086490; Wed, 5 Nov 2025 19:37:37 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:37 GMT Message-Id: <202511051937.5A5JbbUc086490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 136987f89887 - releng/15.0 - crypto/openssl: update component to 3.5.3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 136987f898877469eecfed640f84996a56ae5c8f Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=136987f898877469eecfed640f84996a56ae5c8f commit 136987f898877469eecfed640f84996a56ae5c8f Author: Enji Cooper AuthorDate: 2025-09-22 22:31:10 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:48 +0000 crypto/openssl: update component to 3.5.3 This change updates the sources for crypto/openssl. The subsequent commit will update the build artifacts to match the 3.5.3 release. More details about the update can be found in the related vendor branch commits. Approved by: re (cperciva) MFC after: 1 week Merge commit 'aed904c48f330dc76da942a8ee2d6eef9d11f572' (cherry picked from commit 779e075df98da07468ec5dd13b44241110a2abf2) --- crypto/openssl/.ctags.d/add-dir.ctags | 11 + crypto/openssl/.ctags.d/exclude.ctags | 13 + .../openssl-stage1/10extrac-macrodefs.ctags | 18 + .../.ctags.d/openssl-stage2/10expand-macros.ctags | 9 + crypto/openssl/CHANGES.md | 57 +++ crypto/openssl/Configurations/unix-Makefile.tmpl | 14 +- crypto/openssl/NEWS.md | 14 + crypto/openssl/NOTES-WINDOWS.md | 2 +- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/asn1parse.c | 2 +- crypto/openssl/apps/cms.c | 1 + crypto/openssl/apps/enc.c | 2 + crypto/openssl/apps/include/apps.h | 1 - crypto/openssl/apps/lib/apps.c | 49 -- crypto/openssl/apps/ocsp.c | 21 +- crypto/openssl/apps/rand.c | 4 +- crypto/openssl/crypto/aes/asm/aes-s390x.pl | 5 +- crypto/openssl/crypto/asn1/asn_mime.c | 22 +- crypto/openssl/crypto/bio/bss_dgram.c | 25 +- crypto/openssl/crypto/dh/dh_check.c | 36 +- crypto/openssl/crypto/dh/dh_key.c | 14 +- crypto/openssl/crypto/dh/dh_pmeth.c | 2 +- crypto/openssl/crypto/encode_decode/decoder_lib.c | 28 ++ crypto/openssl/crypto/encode_decode/decoder_pkey.c | 72 ++- .../openssl/crypto/encode_decode/encoder_local.h | 2 + crypto/openssl/crypto/err/openssl.txt | 1 + crypto/openssl/crypto/evp/asymcipher.c | 8 +- crypto/openssl/crypto/evp/keymgmt_meth.c | 4 +- crypto/openssl/crypto/evp/m_sigver.c | 24 +- crypto/openssl/crypto/evp/p_seal.c | 7 +- crypto/openssl/crypto/evp/skeymgmt_meth.c | 2 +- crypto/openssl/crypto/pkcs7/pk7_doit.c | 7 +- crypto/openssl/crypto/provider_core.c | 10 +- crypto/openssl/crypto/rand/randfile.c | 6 +- crypto/openssl/crypto/riscv32cpuid.pl | 5 +- crypto/openssl/crypto/riscv64cpuid.pl | 5 +- crypto/openssl/crypto/rsa/rsa_gen.c | 15 + crypto/openssl/crypto/rsa/rsa_pmeth.c | 8 +- crypto/openssl/crypto/sleep.c | 39 +- crypto/openssl/crypto/slh_dsa/slh_dsa_key.c | 24 +- crypto/openssl/crypto/slh_dsa/slh_hash.c | 3 + crypto/openssl/crypto/sm2/sm2_sign.c | 6 +- crypto/openssl/crypto/store/store_lib.c | 25 +- crypto/openssl/crypto/x509/by_store.c | 34 +- crypto/openssl/crypto/x509/t_req.c | 6 +- crypto/openssl/crypto/x509/v3_attrdesc.c | 4 +- crypto/openssl/crypto/x509/v3_purp.c | 2 +- crypto/openssl/crypto/x509/x509_ext.c | 20 +- crypto/openssl/crypto/x509/x509_local.h | 1 + crypto/openssl/crypto/x509/x509_lu.c | 6 +- crypto/openssl/crypto/x509/x509_vpm.c | 5 + crypto/openssl/crypto/x509/x_crl.c | 15 +- crypto/openssl/demos/bio/saccept.c | 7 +- crypto/openssl/demos/bio/server-arg.c | 7 +- crypto/openssl/demos/bio/server-cmod.c | 7 +- crypto/openssl/demos/bio/server-conf.c | 7 +- crypto/openssl/demos/certs/mkcerts.sh | 2 +- crypto/openssl/demos/certs/ocspquery.sh | 2 +- crypto/openssl/demos/certs/ocsprun.sh | 4 +- crypto/openssl/demos/cms/cms_ddec.c | 4 +- crypto/openssl/demos/cms/cms_denc.c | 4 +- crypto/openssl/demos/pkey/EVP_PKEY_RSA_keygen.c | 4 +- .../openssl/doc/internal/man3/ossl_namemap_new.pod | 15 +- crypto/openssl/doc/man1/openssl-enc.pod.in | 7 +- crypto/openssl/doc/man1/openssl-fipsinstall.pod.in | 10 +- crypto/openssl/doc/man3/BN_generate_prime.pod | 6 +- crypto/openssl/doc/man3/EVP_EncryptInit.pod | 2 +- crypto/openssl/doc/man3/EVP_PKEY_new.pod | 14 +- crypto/openssl/doc/man3/EVP_aes_128_gcm.pod | 4 +- crypto/openssl/doc/man3/EVP_aria_128_gcm.pod | 4 +- crypto/openssl/doc/man3/EVP_chacha20.pod | 4 +- crypto/openssl/doc/man3/OPENSSL_secure_malloc.pod | 9 +- crypto/openssl/doc/man3/OSSL_CALLBACK.pod | 11 +- crypto/openssl/doc/man3/PEM_read_CMS.pod | 8 +- crypto/openssl/doc/man3/RAND_load_file.pod | 8 +- .../openssl/doc/man3/SSL_CTX_set_domain_flags.pod | 2 +- .../doc/man3/SSL_CTX_set_tmp_dh_callback.pod | 10 +- crypto/openssl/doc/man3/SSL_poll.pod | 24 +- crypto/openssl/doc/man3/d2i_X509.pod | 5 +- crypto/openssl/doc/man5/fips_config.pod | 16 +- crypto/openssl/doc/man7/EVP_ASYM_CIPHER-RSA.pod | 5 +- crypto/openssl/doc/man7/EVP_PKEY-DSA.pod | 4 +- crypto/openssl/doc/man7/EVP_PKEY-FFC.pod | 4 +- crypto/openssl/doc/man7/EVP_SIGNATURE-ML-DSA.pod | 2 +- crypto/openssl/doc/man7/EVP_SIGNATURE-SLH-DSA.pod | 2 +- crypto/openssl/doc/man7/OSSL_PROVIDER-FIPS.pod | 96 ++-- crypto/openssl/doc/man7/provider-base.pod | 31 ++ crypto/openssl/fuzz/dtlsserver.c | 5 +- crypto/openssl/include/crypto/dh.h | 4 +- crypto/openssl/include/crypto/rsa.h | 6 +- crypto/openssl/include/crypto/slh_dsa.h | 2 + crypto/openssl/include/internal/quic_ackm.h | 4 +- crypto/openssl/include/internal/quic_record_rx.h | 11 + crypto/openssl/include/openssl/core_dispatch.h | 4 + crypto/openssl/include/openssl/crypto.h.in | 8 +- crypto/openssl/include/openssl/opensslv.h.in | 9 +- crypto/openssl/include/openssl/pem.h | 1 + crypto/openssl/include/openssl/proverr.h | 1 + crypto/openssl/include/openssl/self_test.h | 2 + crypto/openssl/providers/common/provider_err.c | 2 + .../openssl/providers/common/securitycheck_fips.c | 25 +- crypto/openssl/providers/fips-sources.checksums | 76 +-- crypto/openssl/providers/fips.checksum | 2 +- crypto/openssl/providers/fips/fipsprov.c | 9 + .../providers/fips/include/fips/fipsindicator.h | 3 +- crypto/openssl/providers/fips/self_test.c | 13 +- crypto/openssl/providers/fips/self_test_data.inc | 235 ++++----- .../implementations/asymciphers/rsa_enc.c | 19 +- .../implementations/encode_decode/decode_pem2der.c | 1 + .../providers/implementations/kem/ml_kem_kem.c | 2 +- .../providers/implementations/keymgmt/dh_kmgmt.c | 15 +- .../providers/implementations/keymgmt/ec_kmgmt.c | 17 + .../providers/implementations/keymgmt/ecx_kmgmt.c | 23 +- .../implementations/keymgmt/ml_dsa_kmgmt.c | 13 +- .../implementations/keymgmt/ml_kem_kmgmt.c | 4 +- .../providers/implementations/keymgmt/rsa_kmgmt.c | 1 + .../implementations/keymgmt/slh_dsa_kmgmt.c | 29 +- .../providers/implementations/macs/hmac_prov.c | 17 +- .../providers/implementations/signature/dsa_sig.c | 2 +- .../implementations/signature/ecdsa_sig.c | 2 +- .../providers/implementations/signature/rsa_sig.c | 8 +- crypto/openssl/providers/legacyprov.c | 11 +- crypto/openssl/ssl/d1_lib.c | 2 +- crypto/openssl/ssl/quic/quic_ackm.c | 33 +- crypto/openssl/ssl/quic/quic_channel.c | 18 +- crypto/openssl/ssl/quic/quic_impl.c | 1 + crypto/openssl/ssl/quic/quic_port.c | 3 +- crypto/openssl/ssl/quic/quic_record_rx.c | 10 + crypto/openssl/ssl/quic/quic_record_tx.c | 4 +- crypto/openssl/ssl/quic/quic_rx_depack.c | 28 +- crypto/openssl/ssl/statem/extensions_clnt.c | 10 +- crypto/openssl/test/crltest.c | 127 ++++- crypto/openssl/test/evp_extra_test.c | 43 ++ crypto/openssl/test/fake_rsaprov.c | 548 ++++++++++++++++++++- crypto/openssl/test/ml_kem_internal_test.c | 14 +- crypto/openssl/test/provider_pkey_test.c | 289 ++++++++++- .../hq-interop/quic-hq-interop.c | 3 +- crypto/openssl/test/quic_ackm_test.c | 5 +- crypto/openssl/test/quic_fifd_test.c | 5 +- crypto/openssl/test/quic_txp_test.c | 3 +- crypto/openssl/test/quicapitest.c | 57 +++ crypto/openssl/test/radix/quic_bindings.c | 4 +- crypto/openssl/test/recipes/15-test_ec.t | 14 +- crypto/openssl/test/recipes/20-test_cli_list.t | 25 + .../recipes/30-test_evp_data/evppkey_ecdsa.txt | 11 +- crypto/openssl/test/recipes/80-test_cms.t | 17 + crypto/openssl/test/recipes/90-test_store_cases.t | 26 +- .../recipes/90-test_store_cases_data/test-BER.p12 | Bin 0 -> 2126 bytes .../recipes/90-test_threads_data/store/8489a545.0 | 19 + .../oqsprovider-ca.sh | 58 +++ .../oqsprovider.sh | 2 + crypto/openssl/test/sanitytest.c | 81 ++- crypto/openssl/test/slh_dsa_test.c | 9 +- crypto/openssl/test/testec-sm2.pem | 5 + crypto/openssl/test/threadstest.c | 70 ++- crypto/openssl/test/tls13groupselection_test.c | 19 +- crypto/openssl/test/x509_test.c | 111 ++++- crypto/openssl/util/perl/TLSProxy/Proxy.pm | 27 +- 158 files changed, 2705 insertions(+), 653 deletions(-) diff --git a/crypto/openssl/.ctags.d/add-dir.ctags b/crypto/openssl/.ctags.d/add-dir.ctags new file mode 100644 index 000000000000..ec20b51bd4ca --- /dev/null +++ b/crypto/openssl/.ctags.d/add-dir.ctags @@ -0,0 +1,11 @@ +# +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# + +# Allow ctags to load configuration file under the sub directories. +--optlib-dir=+./.ctags.d diff --git a/crypto/openssl/.ctags.d/exclude.ctags b/crypto/openssl/.ctags.d/exclude.ctags new file mode 100644 index 000000000000..c932464e6dbd --- /dev/null +++ b/crypto/openssl/.ctags.d/exclude.ctags @@ -0,0 +1,13 @@ +# +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# + +# List file names or patterns you want ctags to ignore. +--exclude=.ctags.d +--exclude=test +--exclude=check-format-test-positives.c diff --git a/crypto/openssl/.ctags.d/openssl-stage1/10extrac-macrodefs.ctags b/crypto/openssl/.ctags.d/openssl-stage1/10extrac-macrodefs.ctags new file mode 100644 index 000000000000..ddd4fd54bd04 --- /dev/null +++ b/crypto/openssl/.ctags.d/openssl-stage1/10extrac-macrodefs.ctags @@ -0,0 +1,18 @@ +# +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# + +# This file is only for extracting macro definitions. +--langmap=C:+.h +-o - +--sort=no +--languages=C +-R + +--fields-C=+{macrodef} +--fields=+{signature} diff --git a/crypto/openssl/.ctags.d/openssl-stage2/10expand-macros.ctags b/crypto/openssl/.ctags.d/openssl-stage2/10expand-macros.ctags new file mode 100644 index 000000000000..5cf5000df3af --- /dev/null +++ b/crypto/openssl/.ctags.d/openssl-stage2/10expand-macros.ctags @@ -0,0 +1,9 @@ +# +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html +# +--param-CPreProcessor._expand=1 diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md index 2978ebfa2d10..5f5ba3ef1751 100644 --- a/crypto/openssl/CHANGES.md +++ b/crypto/openssl/CHANGES.md @@ -28,6 +28,63 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Changes between 3.5.2 and 3.5.3 [16 Sep 2025] + + * Avoided a potential race condition introduced in 3.5.1, where + `OSSL_STORE_CTX` kept open during lookup while potentially being used + by multiple threads simultaneously, that could lead to potential crashes + when multiple concurrent TLS connections are served. + + *Matt Caswell* + + * The FIPS provider no longer performs a PCT on key import for RSA, DH, + and EC keys (that was introduced in 3.5.2), following the latest update + on that requirement in FIPS 140-3 IG 10.3.A additional comment 1. + + *Dr Paul Dale* + + * Secure memory allocation calls are no longer used for HMAC keys. + + *Dr Paul Dale* + + * `openssl req` no longer generates certificates with an empty extension list + when SKID/AKID are set to `none` during generation. + + *David Benjamin* + + * The man page date is now derived from the release date provided + in `VERSION.dat` and not the current date for the released builds. + + *Enji Cooper* + + * Hardened the provider implementation of the RSA public key "encrypt" + operation to add a missing check that the caller-indicated output buffer + size is at least as large as the byte count of the RSA modulus. The issue + was reported by Arash Ale Ebrahim from SYSPWN. + + This operation is typically invoked via `EVP_PKEY_encrypt(3)`. Callers that + in fact provide a sufficiently large buffer, but fail to correctly indicate + its size may now encounter unexpected errors. In applications that attempt + RSA public encryption into a buffer that is too small, an out-of-bounds + write is now avoided and an error is reported instead. + + *Viktor Dukhovni* + + * Added FIPS 140-3 PCT on DH key generation. + + *Nikola Pajkovsky* + + * Fixed the synthesised `OPENSSL_VERSION_NUMBER`. + + *Richard Levitte* + +### Changes between 3.5.1 and 3.5.2 [5 Aug 2025] + + * The FIPS provider now performs a PCT on key import for RSA, EC and ECX. + This is mandated by FIPS 140-3 IG 10.3.A additional comment 1. + + *Dr Paul Dale* + ### Changes between 3.5.0 and 3.5.1 [1 Jul 2025] * Fix x509 application adds trusted use instead of rejected use. diff --git a/crypto/openssl/Configurations/unix-Makefile.tmpl b/crypto/openssl/Configurations/unix-Makefile.tmpl index a6f666957ec0..81f49926ce92 100644 --- a/crypto/openssl/Configurations/unix-Makefile.tmpl +++ b/crypto/openssl/Configurations/unix-Makefile.tmpl @@ -3,6 +3,8 @@ ## ## {- join("\n## ", @autowarntext) -} {- + use Time::Piece; + use OpenSSL::Util; our $makedep_scheme = $config{makedep_scheme}; @@ -74,6 +76,15 @@ FIPSKEY={- $config{FIPSKEY} -} VERSION={- "$config{full_version}" -} VERSION_NUMBER={- "$config{version}" -} +RELEASE_DATE={- my $t = localtime; + if ($config{"release_date"}) { + # Provide the user with a more meaningful error message + # than the default internal parsing error from + # `Time::Piece->strptime(..)`. + eval { $t = Time::Piece->strptime($config{"release_date"}, "%d %b %Y"); } || + die "Parsing \$config{release_date} ('$config{release_date}') failed: $@"; + } + $t->strftime("%Y-%m-%d") -} MAJOR={- $config{major} -} MINOR={- $config{minor} -} SHLIB_VERSION_NUMBER={- $config{shlib_version} -} @@ -1565,7 +1576,8 @@ EOF return <<"EOF"; $args{src}: $pod pod2man --name=$name --section=$section\$(MANSUFFIX) --center=OpenSSL \\ - --release=\$(VERSION) $pod >\$\@ + --date=\$(RELEASE_DATE) --release=\$(VERSION) \\ + $pod >\$\@ EOF } elsif (platform->isdef($args{src})) { # diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index e5fe94779035..5d8a83f43068 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -23,6 +23,20 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Major changes between OpenSSL 3.5.2 and OpenSSL 3.5.3 [16 Sep 2025] + + * Added FIPS 140-3 PCT on DH key generation. + + *Nikola Pajkovsky* + + * Fixed the synthesised `OPENSSL_VERSION_NUMBER`. + + *Richard Levitte* + +### Major changes between OpenSSL 3.5.1 and OpenSSL 3.5.2 [5 Aug 2025] + + * none + ### Major changes between OpenSSL 3.5.0 and OpenSSL 3.5.1 [1 Jul 2025] OpenSSL 3.5.1 is a security patch release. The most severe CVE fixed in this diff --git a/crypto/openssl/NOTES-WINDOWS.md b/crypto/openssl/NOTES-WINDOWS.md index e903376db530..5d6287a8e8fd 100644 --- a/crypto/openssl/NOTES-WINDOWS.md +++ b/crypto/openssl/NOTES-WINDOWS.md @@ -125,7 +125,7 @@ format: `\\HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432node\OpenSSL--` Where `` is the major.minor version of the library being -built, and `` is the value specified by `-DOPENSSL_WINCTX`. This allows +built, and `` is the value specified by `-DOSSL_WINCTX`. This allows for multiple openssl builds to be created and installed on a single system, in which each library can use its own set of registry keys. diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat index f931934a1972..8a2893b68006 100644 --- a/crypto/openssl/VERSION.dat +++ b/crypto/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=5 -PATCH=1 +PATCH=3 PRE_RELEASE_TAG= BUILD_METADATA= -RELEASE_DATE="1 Jul 2025" +RELEASE_DATE="16 Sep 2025" SHLIB_VERSION=3 diff --git a/crypto/openssl/apps/asn1parse.c b/crypto/openssl/apps/asn1parse.c index 4f882396d03d..4540d5f5fb6e 100644 --- a/crypto/openssl/apps/asn1parse.c +++ b/crypto/openssl/apps/asn1parse.c @@ -40,8 +40,8 @@ const OPTIONS asn1parse_options[] = { {"length", OPT_LENGTH, 'p', "length of section in file"}, {"strparse", OPT_STRPARSE, 'p', "offset; a series of these can be used to 'dig'"}, - {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"}, {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"}, + {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"}, {"genconf", OPT_GENCONF, 's', "file to generate ASN1 structure from"}, {"strictpem", OPT_STRICTPEM, 0, "equivalent to '-inform pem' (obsolete)"}, diff --git a/crypto/openssl/apps/cms.c b/crypto/openssl/apps/cms.c index 919d306ff687..6f19414880c9 100644 --- a/crypto/openssl/apps/cms.c +++ b/crypto/openssl/apps/cms.c @@ -1280,6 +1280,7 @@ int cms_main(int argc, char **argv) goto end; } if (ret <= 0) { + BIO_printf(bio_err, "Error writing CMS output\n"); ret = 6; goto end; } diff --git a/crypto/openssl/apps/enc.c b/crypto/openssl/apps/enc.c index 3f45ba15e576..33949d402dd7 100644 --- a/crypto/openssl/apps/enc.c +++ b/crypto/openssl/apps/enc.c @@ -260,6 +260,8 @@ int enc_main(int argc, char **argv) goto opthelp; if (k) n *= 1024; + if (n > INT_MAX) + goto opthelp; bsize = (int)n; break; case OPT_K: diff --git a/crypto/openssl/apps/include/apps.h b/crypto/openssl/apps/include/apps.h index ceebfde72786..11381ea7da8c 100644 --- a/crypto/openssl/apps/include/apps.h +++ b/crypto/openssl/apps/include/apps.h @@ -103,7 +103,6 @@ int wrap_password_callback(char *buf, int bufsiz, int verify, void *cb_data); /* progress callback for dsaparam, dhparam, req, genpkey, etc. */ int progress_cb(EVP_PKEY_CTX *ctx); -int chopup_args(ARGS *arg, char *buf); void dump_cert_text(BIO *out, X509 *x); void print_name(BIO *out, const char *title, const X509_NAME *nm); void print_bignum_var(BIO *, const BIGNUM *, const char *, diff --git a/crypto/openssl/apps/lib/apps.c b/crypto/openssl/apps/lib/apps.c index d4e72307de58..1b9c9e3e9a19 100644 --- a/crypto/openssl/apps/lib/apps.c +++ b/crypto/openssl/apps/lib/apps.c @@ -83,55 +83,6 @@ static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl); int app_init(long mesgwin); -int chopup_args(ARGS *arg, char *buf) -{ - int quoted; - char c = '\0', *p = NULL; - - arg->argc = 0; - if (arg->size == 0) { - arg->size = 20; - arg->argv = app_malloc(sizeof(*arg->argv) * arg->size, "argv space"); - } - - for (p = buf;;) { - /* Skip whitespace. */ - while (*p && isspace(_UC(*p))) - p++; - if (*p == '\0') - break; - - /* The start of something good :-) */ - if (arg->argc >= arg->size) { - char **tmp; - - arg->size += 20; - tmp = OPENSSL_realloc(arg->argv, sizeof(*arg->argv) * arg->size); - if (tmp == NULL) - return 0; - arg->argv = tmp; - } - quoted = *p == '\'' || *p == '"'; - if (quoted) - c = *p++; - arg->argv[arg->argc++] = p; - - /* now look for the end of this */ - if (quoted) { - while (*p && *p != c) - p++; - *p++ = '\0'; - } else { - while (*p && !isspace(_UC(*p))) - p++; - if (*p) - *p++ = '\0'; - } - } - arg->argv[arg->argc] = NULL; - return 1; -} - #ifndef APP_INIT int app_init(long mesgwin) { diff --git a/crypto/openssl/apps/ocsp.c b/crypto/openssl/apps/ocsp.c index 79b76a2ca747..95a95f56cb99 100644 --- a/crypto/openssl/apps/ocsp.c +++ b/crypto/openssl/apps/ocsp.c @@ -662,7 +662,8 @@ redo_accept: resp = OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, NULL); - send_ocsp_response(cbio, resp); + if (resp != NULL) + send_ocsp_response(cbio, resp); } goto done_resp; } @@ -764,16 +765,18 @@ redo_accept: BIO_free(derbio); } - i = OCSP_response_status(resp); - if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) { - BIO_printf(out, "Responder Error: %s (%d)\n", - OCSP_response_status_str(i), i); - if (!ignore_err) + if (resp != NULL) { + i = OCSP_response_status(resp); + if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) { + BIO_printf(out, "Responder Error: %s (%d)\n", + OCSP_response_status_str(i), i); + if (!ignore_err) goto end; - } + } - if (resp_text) - OCSP_RESPONSE_print(out, resp, 0); + if (resp_text) + OCSP_RESPONSE_print(out, resp, 0); + } /* If running as responder don't verify our own response */ if (cbio != NULL) { diff --git a/crypto/openssl/apps/rand.c b/crypto/openssl/apps/rand.c index b123a151ea74..da747c1783e4 100644 --- a/crypto/openssl/apps/rand.c +++ b/crypto/openssl/apps/rand.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -199,7 +199,7 @@ int rand_main(int argc, char **argv) int chunk; chunk = scaled_num > buflen ? (int)buflen : (int)scaled_num; - r = RAND_bytes(buf, chunk); + r = RAND_bytes_ex(app_get0_libctx(), buf, chunk, 0); if (r <= 0) goto end; if (format != FORMAT_TEXT) { diff --git a/crypto/openssl/crypto/aes/asm/aes-s390x.pl b/crypto/openssl/crypto/aes/asm/aes-s390x.pl index 5d1283f57690..2345d4574a41 100755 --- a/crypto/openssl/crypto/aes/asm/aes-s390x.pl +++ b/crypto/openssl/crypto/aes/asm/aes-s390x.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -1431,6 +1431,9 @@ $code.=<<___ if (!$softonly); st${g} $s3,0($sp) # backchain la %r1,$stdframe($sp) + xc $stdframe+0(64,$sp),$stdframe+0($sp) # clear reserved/unused + # in parameter block + lmg $s2,$s3,0($key) # copy key stg $s2,$stdframe+80($sp) stg $s3,$stdframe+88($sp) diff --git a/crypto/openssl/crypto/asn1/asn_mime.c b/crypto/openssl/crypto/asn1/asn_mime.c index 806adade7ffc..9afe249965e9 100644 --- a/crypto/openssl/crypto/asn1/asn_mime.c +++ b/crypto/openssl/crypto/asn1/asn_mime.c @@ -168,6 +168,19 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs) BIO_write(out, ",", 1); write_comma = 1; md_nid = OBJ_obj2nid(sk_X509_ALGOR_value(mdalgs, i)->algorithm); + + /* RFC 8702 does not define a micalg for SHAKE, assuming "shake-" */ + if (md_nid == NID_shake128) { + if (BIO_puts(out, "shake-128") < 0) + goto err; + continue; + } + if (md_nid == NID_shake256) { + if (BIO_puts(out, "shake-256") < 0) + goto err; + continue; + } + md = EVP_get_digestbynid(md_nid); if (md && md->md_ctrl) { int rv; @@ -204,15 +217,15 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs) case NID_id_GostR3411_94: BIO_puts(out, "gostr3411-94"); - goto err; + break; case NID_id_GostR3411_2012_256: BIO_puts(out, "gostr3411-2012-256"); - goto err; + break; case NID_id_GostR3411_2012_512: BIO_puts(out, "gostr3411-2012-512"); - goto err; + break; default: if (have_unknown) { @@ -272,7 +285,8 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags, BIO_printf(bio, "Content-Type: multipart/signed;"); BIO_printf(bio, " protocol=\"%ssignature\";", mime_prefix); BIO_puts(bio, " micalg=\""); - asn1_write_micalg(bio, mdalgs); + if (!asn1_write_micalg(bio, mdalgs)) + return 0; BIO_printf(bio, "\"; boundary=\"----%s\"%s%s", bound, mime_eol, mime_eol); BIO_printf(bio, "This is an S/MIME signed message%s%s", diff --git a/crypto/openssl/crypto/bio/bss_dgram.c b/crypto/openssl/crypto/bio/bss_dgram.c index ea2550859ccd..784a1abb00bb 100644 --- a/crypto/openssl/crypto/bio/bss_dgram.c +++ b/crypto/openssl/crypto/bio/bss_dgram.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2005-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -464,11 +464,11 @@ static int dgram_write(BIO *b, const char *in, int inl) return ret; } -static long dgram_get_mtu_overhead(bio_dgram_data *data) +static long dgram_get_mtu_overhead(BIO_ADDR *addr) { long ret; - switch (BIO_ADDR_family(&data->peer)) { + switch (BIO_ADDR_family(addr)) { case AF_INET: /* * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP @@ -480,7 +480,8 @@ static long dgram_get_mtu_overhead(bio_dgram_data *data) { # ifdef IN6_IS_ADDR_V4MAPPED struct in6_addr tmp_addr; - if (BIO_ADDR_rawaddress(&data->peer, &tmp_addr, NULL) + + if (BIO_ADDR_rawaddress(addr, &tmp_addr, NULL) && IN6_IS_ADDR_V4MAPPED(&tmp_addr)) /* * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP @@ -666,11 +667,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) &sockopt_len)) < 0 || sockopt_val < 0) { ret = 0; } else { - /* - * we assume that the transport protocol is UDP and no IP - * options are used. - */ - data->mtu = sockopt_val - 8 - 20; + data->mtu = sockopt_val - dgram_get_mtu_overhead(&addr); ret = data->mtu; } break; @@ -682,11 +679,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) || sockopt_val < 0) { ret = 0; } else { - /* - * we assume that the transport protocol is UDP and no IPV6 - * options are used. - */ - data->mtu = sockopt_val - 8 - 40; + data->mtu = sockopt_val - dgram_get_mtu_overhead(&addr); ret = data->mtu; } break; @@ -700,7 +693,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) # endif break; case BIO_CTRL_DGRAM_GET_FALLBACK_MTU: - ret = -dgram_get_mtu_overhead(data); + ret = -dgram_get_mtu_overhead(&data->peer); switch (BIO_ADDR_family(&data->peer)) { case AF_INET: ret += 576; @@ -956,7 +949,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) } break; case BIO_CTRL_DGRAM_GET_MTU_OVERHEAD: - ret = dgram_get_mtu_overhead(data); + ret = dgram_get_mtu_overhead(&data->peer); break; /* diff --git a/crypto/openssl/crypto/dh/dh_check.c b/crypto/openssl/crypto/dh/dh_check.c index ae23f61839ea..2d899dc96f67 100644 --- a/crypto/openssl/crypto/dh/dh_check.c +++ b/crypto/openssl/crypto/dh/dh_check.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -16,6 +16,7 @@ #include #include "internal/cryptlib.h" #include +#include #include "dh_local.h" #include "crypto/dh.h" @@ -329,17 +330,27 @@ end: * FFC pairwise check from SP800-56A R3. * Section 5.6.2.1.4 Owner Assurance of Pair-wise Consistency */ -int ossl_dh_check_pairwise(const DH *dh) +int ossl_dh_check_pairwise(const DH *dh, int return_on_null_numbers) { int ret = 0; BN_CTX *ctx = NULL; BIGNUM *pub_key = NULL; + OSSL_SELF_TEST *st = NULL; + OSSL_CALLBACK *stcb = NULL; + void *stcbarg = NULL; if (dh->params.p == NULL || dh->params.g == NULL || dh->priv_key == NULL || dh->pub_key == NULL) - return 0; + return return_on_null_numbers; + + OSSL_SELF_TEST_get_callback(dh->libctx, &stcb, &stcbarg); + st = OSSL_SELF_TEST_new(stcb, stcbarg); + if (st == NULL) + goto err; + OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT, + OSSL_SELF_TEST_DESC_PCT_DH); ctx = BN_CTX_new_ex(dh->libctx); if (ctx == NULL) @@ -351,10 +362,27 @@ int ossl_dh_check_pairwise(const DH *dh) /* recalculate the public key = (g ^ priv) mod p */ if (!ossl_dh_generate_public_key(ctx, dh, dh->priv_key, pub_key)) goto err; + +#ifdef FIPS_MODULE + { + int len; + unsigned char bytes[1024] = {0}; /* Max key size of 8192 bits */ + + if (BN_num_bytes(pub_key) > (int)sizeof(bytes)) + goto err; + len = BN_bn2bin(pub_key, bytes); + OSSL_SELF_TEST_oncorrupt_byte(st, bytes); + if (BN_bin2bn(bytes, len, pub_key) == NULL) + goto err; + } +#endif /* check it matches the existing public_key */ ret = BN_cmp(pub_key, dh->pub_key) == 0; -err: + err: BN_free(pub_key); BN_CTX_free(ctx); + + OSSL_SELF_TEST_onend(st, ret); + OSSL_SELF_TEST_free(st); return ret; } diff --git a/crypto/openssl/crypto/dh/dh_key.c b/crypto/openssl/crypto/dh/dh_key.c index 7132b9b68e53..052d4d29ed22 100644 --- a/crypto/openssl/crypto/dh/dh_key.c +++ b/crypto/openssl/crypto/dh/dh_key.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -267,7 +267,7 @@ static int generate_key(DH *dh) int ok = 0; int generate_new_key = 0; #ifndef FIPS_MODULE - unsigned l; + int l; #endif BN_CTX *ctx = NULL; BIGNUM *pub_key = NULL, *priv_key = NULL; @@ -327,11 +327,13 @@ static int generate_key(DH *dh) goto err; #else if (dh->params.q == NULL) { - /* secret exponent length, must satisfy 2^(l-1) <= p */ - if (dh->length != 0 - && dh->length >= BN_num_bits(dh->params.p)) + /* secret exponent length, must satisfy 2^l < (p-1)/2 */ + l = BN_num_bits(dh->params.p); + if (dh->length >= l) goto err; - l = dh->length ? dh->length : BN_num_bits(dh->params.p) - 1; + l -= 2; + if (dh->length != 0 && dh->length < l) + l = dh->length; if (!BN_priv_rand_ex(priv_key, l, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY, 0, ctx)) goto err; diff --git a/crypto/openssl/crypto/dh/dh_pmeth.c b/crypto/openssl/crypto/dh/dh_pmeth.c index 3b75a537b3e0..74bef9370d3a 100644 --- a/crypto/openssl/crypto/dh/dh_pmeth.c +++ b/crypto/openssl/crypto/dh/dh_pmeth.c @@ -408,7 +408,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, } dh = (DH *)EVP_PKEY_get0_DH(ctx->pkey); dhpub = EVP_PKEY_get0_DH(ctx->peerkey); - if (dhpub == NULL) { + if (dhpub == NULL || dh == NULL) { ERR_raise(ERR_LIB_DH, DH_R_KEYS_NOT_SET); return 0; } diff --git a/crypto/openssl/crypto/encode_decode/decoder_lib.c b/crypto/openssl/crypto/encode_decode/decoder_lib.c index ffcf3cde1155..dedfb24e569e 100644 --- a/crypto/openssl/crypto/encode_decode/decoder_lib.c +++ b/crypto/openssl/crypto/encode_decode/decoder_lib.c @@ -537,6 +537,14 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg) } } +static int decoder_sk_cmp(const OSSL_DECODER_INSTANCE *const *a, + const OSSL_DECODER_INSTANCE *const *b) +{ + if ((*a)->score == (*b)->score) + return (*a)->order - (*b)->order; + return (*a)->score - (*b)->score; +} + int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx, OSSL_LIB_CTX *libctx, const char *propq) { @@ -595,6 +603,26 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx, OSSL_DECODER_do_all_provided(libctx, collect_all_decoders, skdecoders); numdecoders = sk_OSSL_DECODER_num(skdecoders); + /* + * If there are provided or default properties, sort the initial decoder list + * by property matching score so that the highest scored provider is selected + * first. + */ + if (propq != NULL || ossl_ctx_global_properties(libctx, 0) != NULL) { + int num_decoder_insts = sk_OSSL_DECODER_INSTANCE_num(ctx->decoder_insts); + int i; + OSSL_DECODER_INSTANCE *di; + sk_OSSL_DECODER_INSTANCE_compfunc old_cmp = + sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, decoder_sk_cmp); + + for (i = 0; i < num_decoder_insts; i++) { + di = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i); + di->order = i; + } + sk_OSSL_DECODER_INSTANCE_sort(ctx->decoder_insts); + sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, old_cmp); + } + memset(&data, 0, sizeof(data)); data.ctx = ctx; data.w_prev_start = 0; diff --git a/crypto/openssl/crypto/encode_decode/decoder_pkey.c b/crypto/openssl/crypto/encode_decode/decoder_pkey.c index f99566bde744..9fc4e2312331 100644 --- a/crypto/openssl/crypto/encode_decode/decoder_pkey.c +++ b/crypto/openssl/crypto/encode_decode/decoder_pkey.c @@ -222,15 +222,21 @@ struct collect_data_st { int total; /* number of matching results */ char error_occurred; char keytype_resolved; + OSSL_PROPERTY_LIST *pq; STACK_OF(EVP_KEYMGMT) *keymgmts; }; -static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, - void *provctx, struct collect_data_st *data) +/* + * Add decoder instance to the decoder context if it is compatible. Returns 1 + * if a decoder was added, 0 otherwise. + */ +static int collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, + void *provctx, struct collect_data_st *data) { void *decoderctx = NULL; OSSL_DECODER_INSTANCE *di = NULL; + const OSSL_PROPERTY_LIST *props; /* * We already checked the EVP_KEYMGMT is applicable in check_keymgmt so we @@ -239,17 +245,17 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, if (keymgmt->name_id != decoder->base.id) /* Mismatch is not an error, continue. */ - return; + return 0; if ((decoderctx = decoder->newctx(provctx)) == NULL) { data->error_occurred = 1; - return; + return 0; } if ((di = ossl_decoder_instance_new(decoder, decoderctx)) == NULL) { decoder->freectx(decoderctx); data->error_occurred = 1; - return; + return 0; } /* @@ -263,7 +269,7 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, || OPENSSL_strcasecmp(data->ctx->start_input_type, "PEM") != 0)) { /* Mismatch is not an error, continue. */ ossl_decoder_instance_free(di); - return; + return 0; } OSSL_TRACE_BEGIN(DECODER) { @@ -275,13 +281,30 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder, OSSL_DECODER_get0_properties(decoder)); } OSSL_TRACE_END(DECODER); + /* + * Get the property match score so the decoders can be prioritized later. + */ + props = ossl_decoder_parsed_properties(decoder); + if (data->pq != NULL && props != NULL) { + di->score = ossl_property_match_count(data->pq, props); *** 6154 LINES SKIPPED *** From nobody Wed Nov 5 19:37:38 2025 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 4d1wZq1BwWz652QG; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZq0GZsz3sls; Wed, 05 Nov 2025 19:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Q8eMa42WAWIrykSg1HrafE1mTLljDrguuLhaglMi3s=; b=FXUg/aM2KghVx/JgdkTm41NLi6TB78ahyH6QWv0L6BwOz6ES6Mg0fm9+mFqRG7yrKF178Y yAn5FylWyRrf/6wzoxqrFHDQWnlJ/m43aLIOt/vyfq3ywQ7gVGjcYu+e3KWxA2jm1AtJZS 4RM748B9phzoj9udekpbj2XPaOs19bpzunP78RX9tpAT8SgJx5l51d/iOqjPstSboKraSt Siew1ae/FtWtoft/1hp03ZBOLUIJHOQgFqFxLP+q0fcDvqbQ3dN/b4GlOe5yMMBmI60TVy gn+nryJ8d+UGWpJSK3eOeS/PdbgKnnvyug+dUb5VDxyTqGumAeK7jh1vYMnoyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Q8eMa42WAWIrykSg1HrafE1mTLljDrguuLhaglMi3s=; b=mk0Y8YsYJsPuiVDUAjqkDGeLIhPA0ClIGHd9MWcM0L6CJtajLFU3zYp1IWILciU5Eu+589 0nxoOyOJN5e2rWUtqkcU8ZuJXCjMb5qNLc/FhI3RTRRQfevpOJ9btEby1CEsNLetkX7M2t RMwSLrVK4JeIEx0kylhg26jbX6z6iQMbRdRh+e7OJvWE2a1s+bNdDq034DlaLhz5ShA8O3 X1EaVpby7ekkA/7Wh07YjAyTKs9quKgcBJ2vMfvEoG3QHg1LN9pQ+JJZeVW95n0lH9Idpf fFZ3ZNwbldQW5bq85ZWjWX0GtsE69ug3mnLSH0BP2nEFZe/BjwJe+Z1k9SU+Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371459; a=rsa-sha256; cv=none; b=fVUM3DuXeIbT7vl4yCqJrUSUUo2VNNQls9XKLjINhVIe22yr/woTYzqcS+S+JvgKB7XDjf sj9+5KijwVznHY86H2UdUVktCZqRZvwarQ5g7flrpJ4BNxfrQJNerpLEZjnmJQsYfIOJLX 3smq1z7eoPktBNgCeuy+e1/1sjcPuGge4uer1KoFmhmQLWKsn8xK3SzMG1JsNsqIfw4KsA 64Y6uKj06EH3DfmW7V053GLe9R2QMY09TW25fLpyFBW8qwUi8hceQw3t0WmmMH1Qg/0/iz W/1HO/ciN6V5+XMxN6g6/+z4j4yPgayYFN+RQAxjW+qMBdyNdKFMkQZXZ+bBVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZp6pTLzwwM; Wed, 05 Nov 2025 19:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5Jbcac086538; Wed, 5 Nov 2025 19:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbcnO086530; Wed, 5 Nov 2025 19:37:38 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:38 GMT Message-Id: <202511051937.5A5JbcnO086530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 27ae9da27a79 - releng/15.0 - crypto/openssl: update build artifacts for the 3.5.3 release List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 27ae9da27a79133da886ad2ef3153bf4ea14c878 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=27ae9da27a79133da886ad2ef3153bf4ea14c878 commit 27ae9da27a79133da886ad2ef3153bf4ea14c878 Author: Enji Cooper AuthorDate: 2025-09-18 19:20:31 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:52 +0000 crypto/openssl: update build artifacts for the 3.5.3 release This change updates the build artifacts to match the 3.5.3 release. Much of the change involves updating version numbers and release dates to match the release version's metadata. Approved by: re (cperciva) MFC after: 1 week MFC with: 88b8b7f0c4e9948667a2279e78e975a784049cba (cherry picked from commit d9cc3d558d00ee7f62dbef2032f099033c91d2a1) (cherry picked from commit 41955f207f506035169451a6d9e8351df9984a97) --- crypto/openssl/configdata.pm | 15 ++-- crypto/openssl/exporters/libcrypto.pc | 2 +- crypto/openssl/exporters/libssl.pc | 2 +- crypto/openssl/exporters/openssl.pc | 2 +- crypto/openssl/include/openssl/crypto.h | 8 +- crypto/openssl/include/openssl/opensslv.h | 19 ++--- crypto/openssl/libcrypto.pc | 2 +- crypto/openssl/libssl.pc | 2 +- crypto/openssl/openssl.pc | 2 +- secure/lib/libcrypto/Makefile.version | 4 +- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 | 2 +- .../libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_sign.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- .../lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- .../libcrypto/man/man3/BIO_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_core.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_datagram.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_dgram_pair.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_sendmmsg.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_socket_wait.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 8 +- secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMAC_CTX.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_decrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_encrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EnvelopedData_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- .../libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_data_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_digest_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- .../libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- .../lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- .../libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- .../lib/libcrypto/man/man3/CMS_signed_get_attr.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/COMP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- .../libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- .../libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- .../libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- .../man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- .../libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 2 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- .../libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- .../libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_get_timeout.3 | 2 +- .../lib/libcrypto/man/man3/DTLSv1_handle_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_sign.3 | 2 +- .../lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- .../lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- .../lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- .../libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_new.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- .../lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_original_iv.3 | 2 +- .../lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- .../lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 4 +- secure/lib/libcrypto/man/man3/EVP_KDF.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEM_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MAC.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get_algor.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_copy_parameters.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- .../man/man3/EVP_PKEY_digestsign_supports_digest.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_attr.3 | 2 +- .../man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_field_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_gettable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 16 +++- .../libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- .../man/man3/EVP_PKEY_set1_encoded_public_key.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_settable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_RAND.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEY.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- .../lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_des_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- .../lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- .../man/man3/EVP_set_default_properties.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/GENERAL_NAME.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/NCONF_new_ex.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- .../libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- .../libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- .../man/man3/OPENSSL_load_builtin_modules.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_load_u16_le.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_riscvcap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 11 ++- secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 | 8 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ATAV_set0.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 | 2 +- .../man/man3/OSSL_CMP_HDR_get0_transactionID.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_ITAV_new_caCerts.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 | 2 +- .../libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set0_validity.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 | 2 +- .../man/man3/OSSL_DECODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 | 2 +- .../man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ERR_STATE_save.3 | 2 +- .../man/man3/OSSL_ESS_check_signing_certs.3 | 2 +- .../libcrypto/man/man3/OSSL_GENERAL_NAMES_print.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HPKE_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_IETF_ATTR_SYNTAX.3 | 2 +- .../man/man3/OSSL_IETF_ATTR_SYNTAX_print.3 | 2 +- .../man/man3/OSSL_INDICATOR_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ITEM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 | 2 +- .../man/man3/OSSL_LIB_CTX_set_conf_diagnostics.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 | 2 +- .../man/man3/OSSL_PARAM_allocate_from_text.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 | 2 +- .../libcrypto/man/man3/OSSL_PARAM_print_to_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 | 2 +- .../libcrypto/man/man3/OSSL_QUIC_client_method.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 | 2 +- .../man/man3/OSSL_SELF_TEST_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_sleep.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 | 2 +- .../man/man3/OSSL_trace_get_category_num.3 | 2 +- .../libcrypto/man/man3/OSSL_trace_set_channel.3 | 2 +- .../man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_version.3 | 2 +- .../libcrypto/man/man3/PBMAC1_get1_pbkdf2_param.3 | 2 +- .../libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 10 +-- .../libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- .../libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- .../man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 | 2 +- .../man/man3/PKCS12_SAFEBAG_create_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_set0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 | 2 +- .../libcrypto/man/man3/PKCS12_add_CSPName_asc.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 | 2 +- .../man/man3/PKCS12_add_friendlyname_asc.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 | 2 +- .../libcrypto/man/man3/PKCS12_get_friendlyname.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_init.3 | 2 +- .../libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 | 2 +- .../libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- .../libcrypto/man/man3/PKCS7_get_octet_string.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_type_is_other.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 | 2 +- .../lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_get0_primary.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 10 ++- secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 | 2 +- .../lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- .../man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- .../lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- .../man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_Calc_B.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 | 2 +- .../lib/libcrypto/man/man3/SRP_create_verifier.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 2 +- .../man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- .../man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- .../man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- .../man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- .../man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- .../man/man3/SSL_CTX_set1_cert_comp_preference.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- .../man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- .../man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- .../man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- .../man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- .../man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- .../man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_domain_flags.3 | 4 +- .../man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- .../man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- .../man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- .../man/man3/SSL_CTX_set_new_pending_conn_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- .../man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- .../man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- .../man/man3/SSL_CTX_set_security_level.3 | 2 +- .../man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- .../man/man3/SSL_CTX_set_session_id_context.3 | 2 +- .../man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- .../man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_srp_password.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- .../man/man3/SSL_CTX_set_tmp_dh_callback.3 | 12 +-- .../lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- .../man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 2 +- .../man/man3/SSL_SESSION_get0_id_context.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- .../man/man3/SSL_SESSION_get_compress_id.3 | 2 +- .../man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept_stream.3 | 2 +- .../lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- .../man/man3/SSL_export_keying_material.3 | 2 +- .../libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_connection.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_rpk.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- .../libcrypto/man/man3/SSL_get1_builtin_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- .../libcrypto/man/man3/SSL_get_conn_close_info.3 | 2 +- .../libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_event_timeout.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_handshake_rtt.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- .../man/man3/SSL_get_peer_signature_nid.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- .../libcrypto/man/man3/SSL_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- .../libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_stream_id.3 | 2 +- .../libcrypto/man/man3/SSL_get_stream_read_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_value_uint.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_group_to_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_handle_events.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- .../lib/libcrypto/man/man3/SSL_inject_net_dgram.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- .../libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_domain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_listener.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_stream.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_poll.3 | 26 ++++--- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- .../lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- .../man/man3/SSL_set1_initial_peer_addr.3 | 2 +- .../libcrypto/man/man3/SSL_set1_server_cert_type.3 | 2 +- .../libcrypto/man/man3/SSL_set_async_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_blocking_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- .../man/man3/SSL_set_default_stream_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- .../man/man3/SSL_set_incoming_stream_policy.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_quic_tls_cbs.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_retry_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- .../libcrypto/man/man3/SSL_set_session_secret_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- .../lib/libcrypto/man/man3/SSL_stream_conclude.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_stream_reset.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/TS_VERIFY_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_add1_attr.3 | 2 +- .../libcrypto/man/man3/X509_ACERT_add_attr_nconf.3 | 2 +- .../man/man3/X509_ACERT_get0_holder_baseCertId.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_get_attr.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ATTRIBUTE.3 | 2 +- .../libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- .../libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- .../man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- .../man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- .../man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_REQ_get_attr.3 | 2 +- .../libcrypto/man/man3/X509_REQ_get_extensions.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- .../man/man3/X509_STORE_CTX_get_by_subject.3 | 2 +- .../libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- .../man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- .../man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- .../man/man3/X509_VERIFY_PARAM_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- .../libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- .../man/man3/X509_get0_distinguishing_id.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- .../man/man3/X509_get_default_cert_file.3 | 2 +- .../libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_load_http.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 | 2 +- .../libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 7 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- .../lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 | 2 +- secure/lib/libcrypto/man/man5/config.5 | 2 +- secure/lib/libcrypto/man/man5/fips_config.5 | 18 ++--- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 | 7 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-ARGON2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PVKKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 | 2 +- .../lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-KECCAK.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-common.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 | 6 +- secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 | 6 +- secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SLH-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CRNG-TEST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-JITTER.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ML-DSA.7 | 4 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-SLH-DSA.7 | 4 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 | 87 ++++++++++------------ secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_STORE-winstore.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/fips_module.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-digest.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-mac.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-pkey.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-rand.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-core.h.7 | 2 +- .../libcrypto/man/man7/openssl-core_dispatch.h.7 | 2 +- .../lib/libcrypto/man/man7/openssl-core_names.h.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-env.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-glossary.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-qlog.7 | 2 +- .../libcrypto/man/man7/openssl-quic-concurrency.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-quic.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-threads.7 | 2 +- .../lib/libcrypto/man/man7/openssl_user_macros.7 | 2 +- .../libcrypto/man/man7/ossl-guide-introduction.7 | 2 +- .../man/man7/ossl-guide-libcrypto-introduction.7 | 2 +- .../man/man7/ossl-guide-libraries-introduction.7 | 2 +- .../man/man7/ossl-guide-libssl-introduction.7 | 2 +- .../lib/libcrypto/man/man7/ossl-guide-migration.7 | 2 +- .../man/man7/ossl-guide-quic-client-block.7 | 2 +- .../man/man7/ossl-guide-quic-client-non-block.7 | 2 +- .../man/man7/ossl-guide-quic-introduction.7 | 2 +- .../man/man7/ossl-guide-quic-multi-stream.7 | 2 +- .../man/man7/ossl-guide-quic-server-block.7 | 2 +- .../man/man7/ossl-guide-quic-server-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-introduction.7 | 2 +- .../man/man7/ossl-guide-tls-server-block.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- .../lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/property.7 | 2 +- .../lib/libcrypto/man/man7/provider-asym_cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-base.7 | 29 +++++++- secure/lib/libcrypto/man/man7/provider-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-decoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-digest.7 | 2 +- secure/lib/libcrypto/man/man7/provider-encoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kem.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keyexch.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-mac.7 | 2 +- secure/lib/libcrypto/man/man7/provider-object.7 | 2 +- secure/lib/libcrypto/man/man7/provider-rand.7 | 2 +- secure/lib/libcrypto/man/man7/provider-signature.7 | 2 +- secure/lib/libcrypto/man/man7/provider-skeymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-storemgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/openssl-asn1parse.1 | 2 +- secure/usr.bin/openssl/man/openssl-ca.1 | 2 +- secure/usr.bin/openssl/man/openssl-ciphers.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmds.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmp.1 | 2 +- secure/usr.bin/openssl/man/openssl-cms.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-dgst.1 | 2 +- secure/usr.bin/openssl/man/openssl-dhparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsaparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-ec.1 | 2 +- secure/usr.bin/openssl/man/openssl-ecparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-enc.1 | 11 ++- secure/usr.bin/openssl/man/openssl-engine.1 | 2 +- secure/usr.bin/openssl/man/openssl-errstr.1 | 2 +- secure/usr.bin/openssl/man/openssl-fipsinstall.1 | 12 +-- .../usr.bin/openssl/man/openssl-format-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-gendsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-genpkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-genrsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-info.1 | 2 +- secure/usr.bin/openssl/man/openssl-kdf.1 | 2 +- secure/usr.bin/openssl/man/openssl-list.1 | 2 +- secure/usr.bin/openssl/man/openssl-mac.1 | 2 +- .../openssl/man/openssl-namedisplay-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-nseq.1 | 2 +- secure/usr.bin/openssl/man/openssl-ocsp.1 | 2 +- .../openssl/man/openssl-passphrase-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-passwd.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs12.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs8.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-prime.1 | 2 +- secure/usr.bin/openssl/man/openssl-rand.1 | 2 +- secure/usr.bin/openssl/man/openssl-rehash.1 | 2 +- secure/usr.bin/openssl/man/openssl-req.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsautl.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_client.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_server.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_time.1 | 2 +- secure/usr.bin/openssl/man/openssl-sess_id.1 | 2 +- secure/usr.bin/openssl/man/openssl-skeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-smime.1 | 2 +- secure/usr.bin/openssl/man/openssl-speed.1 | 2 +- secure/usr.bin/openssl/man/openssl-spkac.1 | 2 +- secure/usr.bin/openssl/man/openssl-srp.1 | 2 +- secure/usr.bin/openssl/man/openssl-storeutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-ts.1 | 2 +- .../openssl/man/openssl-verification-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-verify.1 | 2 +- secure/usr.bin/openssl/man/openssl-version.1 | 2 +- secure/usr.bin/openssl/man/openssl-x509.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- 903 files changed, 1078 insertions(+), 1036 deletions(-) diff --git a/crypto/openssl/configdata.pm b/crypto/openssl/configdata.pm index ec70eaba9f07..8ea23bf8a681 100755 --- a/crypto/openssl/configdata.pm +++ b/crypto/openssl/configdata.pm @@ -30,6 +30,7 @@ our %config = ( "FIPSKEY" => "f4556650ac31d35461610bac4ed81b1a181b2d8a43ea2854cbae22ca74560813", "FIPS_VENDOR" => "OpenSSL non-compliant FIPS Provider", "HASHBANGPERL" => "/usr/bin/env perl", + "LD" => "ld", "LDFLAGS" => [], "LDLIBS" => [], "OBJCOPY" => "objcopy", @@ -167,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "1", "ex_libs" => [], - "full_version" => "3.5.1", + "full_version" => "3.5.3", "includes" => [], "ktls" => "", "lflags" => [], @@ -231,10 +232,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "etc", "options" => "enable-ec_nistp_64_gcc_128 enable-ktls enable-sctp --openssldir=etc --prefix=/usr no-acvp-tests no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips no-fips-jitter no-fips-post no-fips-securitychecks no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", - "patch" => "1", + "patch" => "3", "perl_archname" => "amd64-freebsd-thread-multi", "perl_cmd" => "/usr/local/bin/perl", - "perl_version" => "5.40.2", + "perl_version" => "5.40.3", "perlargv" => [ "disable-aria", "disable-egd", @@ -255,7 +256,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => undef, + "CC" => "cc", "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -265,7 +266,7 @@ our %config = ( "CXX" => undef, "CXXFLAGS" => undef, "HASHBANGPERL" => undef, - "LD" => undef, + "LD" => "ld", "LDFLAGS" => undef, "LDLIBS" => undef, "MT" => undef, @@ -290,11 +291,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "1 Jul 2025", + "release_date" => "16 Sep 2025", *** 12458 LINES SKIPPED *** From nobody Wed Nov 5 19:37:39 2025 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 4d1wZr3GGFz651vN; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZr1ZRwz3sxP; Wed, 05 Nov 2025 19:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYhJ82DBHtycZSIlrpeXIM6n+U2Tzm8bEBQUYhdV43c=; b=vU2KN5PDxcuMlKwuoBVyhMeguzvTh/Yx5aKYy/nwzhfc4C49/ZMPPVKB8fp+Ex13w4us/8 rc/z5Fx7a4GI3aeiJhU/gD7KfIc7KVS/IQ3xsjoX2W/RpxaUqQPvz0kkL77RMKItkOixaS uXdNB+TP6K+2K56qeGCgrDKeWyndS5L61dP/sIki2I2TTjh/zfL9Un2XeeTVHqdWWnjQkz iwRpSG/faLf4wkq4fQ4QUk9ruXbtoN9uLhbMBXKX/0oJltTE1jSmsx5NVBm8amR37yhH7z nA4+gzzfQSRP5bFRmKXcrkhco4HK+Nw6c9l9LJ+e0fOvON1EsLEbDc2lzvQ+ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYhJ82DBHtycZSIlrpeXIM6n+U2Tzm8bEBQUYhdV43c=; b=LTxGnfGATWPEpfYa8RJ/hCIKp3eaFLivu9CrFC6DTKCazv9g0Z1WzY0NWgoj5hmCUOoWqm 3OqeB7oWt2Sjqxl7dkNPaw05ztn+gtiVudOfMdoswBkSzlizXaZ0ElHDzBDU4sB08+Ecwv nkaBRT9mpTFDntnZfurtG6g8R67j5qdiMHRvJrdejPlouEB+klEuuBTqtOqnPxzoGy7BkY Lg8ZlBCd0XOFnBPedTMZzdXP+k2CGZ17M1xtnSfrGCaH9238dn55jHmCZ+eBKcHuTWwE6U o5YWpvh14EuSByY7D6qk3oPrFTDT49VdIDxlVQX8IUd1dmGPnBYJdJgQm9VzXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371460; a=rsa-sha256; cv=none; b=BNVggSxHFUI6bsEA9qetdkX7J2rxcPogh/p+5xn7W7csuV9yS+jQiG6vBMv56MkM3Yf+6f heZEn3QFBPGtgl7kOZ3DGPvOs2FWuQ/G3iKMWnGli9bivlyR0G+U1tCLifQn8DA/lhC4f0 Ynhmt6iTQy0nEfLbPqMWrMoFsAQFrXZ+BjQdcJpgzx2ZY3vvO0gvSTUXDlubuEZxPP0SVm ZIJnWOtv4U4J5DC1vIP0cVJuMCUx/5clPL7vKIkILNgSE4TiXM67g+JE1cL7v4BSyWIIoR IadADb0a1iJxfEE1Q6p3pPTiW7WIjrDK+xiy5BiK7RA2tJL8dqMpdVtjkVf0YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZr0nBVzxJK; Wed, 05 Nov 2025 19:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbeqG086572; Wed, 5 Nov 2025 19:37:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5Jbdf5086569; Wed, 5 Nov 2025 19:37:39 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:39 GMT Message-Id: <202511051937.5A5Jbdf5086569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c0366f908ff4 - releng/15.0 - crypto/openssl: update to 3.5.4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c0366f908ff44e1af39c40135dc3804bdcdd505e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c0366f908ff44e1af39c40135dc3804bdcdd505e commit c0366f908ff44e1af39c40135dc3804bdcdd505e Author: Enji Cooper AuthorDate: 2025-10-04 03:26:18 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:54 +0000 crypto/openssl: update to 3.5.4 This change includes all necessary changes required to update to OpenSSL 3.5.4. More information about the 3.5.4 release can be found in the relevant release notes (see 8e12a5c4eb3507846b5 for more details). Merge commit '8e12a5c4eb3507846b507d0afe87d115af41df40' Approved by: re (cperciva) (cherry picked from commit 046c625e9382e17da953767b881aaa782fa73af8) (cherry picked from commit 57d1d2c49707d1d74cdae2946d89bbd427661dca) --- crypto/openssl/CHANGES.md | 69 ++++++ crypto/openssl/NEWS.md | 40 +++- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/storeutl.c | 16 +- crypto/openssl/crypto/bio/bss_file.c | 2 +- crypto/openssl/crypto/ec/ecp_sm2p256.c | 2 +- crypto/openssl/crypto/evp/bio_ok.c | 27 ++- crypto/openssl/crypto/evp/ctrl_params_translate.c | 2 +- crypto/openssl/crypto/evp/p_lib.c | 17 +- crypto/openssl/crypto/info.c | 14 +- crypto/openssl/crypto/ml_dsa/ml_dsa_key.c | 4 +- crypto/openssl/crypto/ml_kem/ml_kem.c | 2 +- crypto/openssl/crypto/modes/siv128.c | 3 + crypto/openssl/crypto/property/property_parse.c | 2 +- crypto/openssl/crypto/rsa/rsa_gen.c | 15 -- crypto/openssl/crypto/rsa/rsa_sign.c | 4 +- crypto/openssl/crypto/threads_pthread.c | 12 +- crypto/openssl/crypto/x509/t_x509.c | 3 +- crypto/openssl/crypto/x509/x509_lu.c | 1 - crypto/openssl/doc/man3/DEFINE_STACK_OF.pod | 19 +- crypto/openssl/doc/man3/OpenSSL_version.pod | 9 +- crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod | 4 +- .../openssl/doc/man3/SSL_SESSION_get0_hostname.pod | 10 +- crypto/openssl/include/crypto/rsa.h | 4 - crypto/openssl/include/openssl/opensslv.h.in | 4 +- crypto/openssl/providers/fips-sources.checksums | 20 +- crypto/openssl/providers/fips.checksum | 2 +- crypto/openssl/providers/fips/self_test_data.inc | 42 ++++ crypto/openssl/providers/fips/self_test_kats.c | 100 ++++++++ .../providers/implementations/kdfs/krb5kdf.c | 7 +- .../providers/implementations/keymgmt/ecx_kmgmt.c | 8 - crypto/openssl/ssl/quic/quic_impl.c | 7 +- crypto/openssl/ssl/record/methods/tls_common.c | 11 +- crypto/openssl/ssl/ssl_rsa.c | 5 +- crypto/openssl/ssl/t1_trce.c | 4 + crypto/openssl/test/build.info | 3 +- crypto/openssl/test/fake_rsaprov.c | 4 +- crypto/openssl/test/fake_rsaprov.h | 11 +- crypto/openssl/test/ml_kem_evp_extra_test.c | 10 + crypto/openssl/test/property_test.c | 19 +- crypto/openssl/test/provider_pkey_test.c | 72 ++++++ crypto/openssl/test/quicapitest.c | 95 +------- crypto/openssl/test/radix/terp.c | 6 +- crypto/openssl/test/recipes/03-test_fipsinstall.t | 12 +- crypto/openssl/test/recipes/25-test_verify.t | 5 +- .../test/recipes/30-test_evp_data/evpkdf_krb5.txt | 10 +- .../30-test_evp_data/evppkey_rsa_sigalg.txt | 4 +- crypto/openssl/test/recipes/90-test_sslapi.t | 17 +- .../90-test_sslapi_data/ssltraceref-zlib.txt | 255 +++++++++++++++++++++ .../recipes/90-test_sslapi_data/ssltraceref.txt | 253 ++++++++++++++++++++ crypto/openssl/test/sslapitest.c | 87 +++++++ crypto/openssl/test/testutil.h | 2 + crypto/openssl/test/testutil/compare.c | 88 +++++++ crypto/openssl/test/threadstest.c | 11 +- crypto/openssl/test/wpackettest.c | 2 +- 55 files changed, 1241 insertions(+), 220 deletions(-) diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md index 5f5ba3ef1751..b991285aedb2 100644 --- a/crypto/openssl/CHANGES.md +++ b/crypto/openssl/CHANGES.md @@ -28,6 +28,72 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Changes between 3.5.3 and 3.5.4 [30 Sep 2025] + + * Fix Out-of-bounds read & write in RFC 3211 KEK Unwrap + + Issue summary: An application trying to decrypt CMS messages encrypted using + password based encryption can trigger an out-of-bounds read and write. + + Impact summary: This out-of-bounds read may trigger a crash which leads to + Denial of Service for an application. The out-of-bounds write can cause + a memory corruption which can have various consequences including + a Denial of Service or Execution of attacker-supplied code. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9230]) + + *Viktor Dukhovni* + + * Fix Timing side-channel in SM2 algorithm on 64 bit ARM + + Issue summary: A timing side-channel which could potentially allow remote + recovery of the private key exists in the SM2 algorithm implementation on + 64 bit ARM platforms. + + Impact summary: A timing side-channel in SM2 signature computations on + 64 bit ARM platforms could allow recovering the private key by an attacker. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9231]) + + *Stanislav Fort and Tomáš Mráz* + + * Fix Out-of-bounds read in HTTP client no_proxy handling + + Issue summary: An application using the OpenSSL HTTP client API functions + may trigger an out-of-bounds read if the "no_proxy" environment variable is + set and the host portion of the authority component of the HTTP URL is an + IPv6 address. + + Impact summary: An out-of-bounds read can trigger a crash which leads to + Denial of Service for an application. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9232]) + + *Stanislav Fort* + + * The FIPS provider no longer performs a PCT on key import for ECX keys + (that was introduced in 3.5.2), following the latest update + on that requirement in FIPS 140-3 IG 10.3.A additional comment 1. + + *Eugene Syromiatnikov* + + * Fixed the length of the ASN.1 sequence for the SM3 digests of RSA-encrypted + signatures. + + *Xiao Lou Dong Feng* + + * Reverted the synthesised `OPENSSL_VERSION_NUMBER` change for the release + builds, as it broke some exiting applications that relied on the previous + 3.x semantics, as documented in `OpenSSL_version(3)`. + + *Richard Levitte* + ### Changes between 3.5.2 and 3.5.3 [16 Sep 2025] * Avoided a potential race condition introduced in 3.5.1, where @@ -21284,6 +21350,9 @@ ndif +[CVE-2025-9232]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9232 +[CVE-2025-9231]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9231 +[CVE-2025-9230]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9230 [CVE-2025-4575]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-4575 [CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176 [CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143 diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index 5d8a83f43068..b194dfb7cb06 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -23,19 +23,46 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Major changes between OpenSSL 3.5.3 and OpenSSL 3.5.4 [30 Sep 2025] + +OpenSSL 3.5.4 is a security patch release. The most severe CVE fixed in this +release is Moderate. + +This release incorporates the following bug fixes and mitigations: + + * Fix Out-of-bounds read & write in RFC 3211 KEK Unwrap. + ([CVE-2025-9230]) + + * Fix Timing side-channel in SM2 algorithm on 64 bit ARM. + ([CVE-2025-9231]) + + * Fix Out-of-bounds read in HTTP client no_proxy handling. + ([CVE-2025-9232]) + + * Reverted the synthesised `OPENSSL_VERSION_NUMBER` change for the release + builds, as it broke some exiting applications that relied on the previous + 3.x semantics, as documented in `OpenSSL_version(3)`. + ### Major changes between OpenSSL 3.5.2 and OpenSSL 3.5.3 [16 Sep 2025] - * Added FIPS 140-3 PCT on DH key generation. +OpenSSL 3.5.3 is a bug fix release. + +This release incorporates the following bug fixes and mitigations: - *Nikola Pajkovsky* + * Added FIPS 140-3 PCT on DH key generation. * Fixed the synthesised `OPENSSL_VERSION_NUMBER`. - *Richard Levitte* + * Removed PCT on key import in the FIPS provider as it is not required by + the standard. ### Major changes between OpenSSL 3.5.1 and OpenSSL 3.5.2 [5 Aug 2025] - * none +OpenSSL 3.5.2 is a bug fix release. + +This release incorporates the following bug fixes and mitigations: + + * The FIPS provider now performs a PCT on key import for RSA, EC and ECX. ### Major changes between OpenSSL 3.5.0 and OpenSSL 3.5.1 [1 Jul 2025] @@ -45,7 +72,7 @@ release is Low. This release incorporates the following bug fixes and mitigations: * Fix x509 application adds trusted use instead of rejected use. - ([CVE-2025-4575]) + ([CVE-2025-4575]) ### Major changes between OpenSSL 3.4 and OpenSSL 3.5.0 [8 Apr 2025] @@ -1913,6 +1940,9 @@ OpenSSL 0.9.x * Support for various new platforms +[CVE-2025-9232]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9232 +[CVE-2025-9231]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9231 +[CVE-2025-9230]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9230 [CVE-2025-4575]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-4575 [CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176 [CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143 diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat index 8a2893b68006..a8eb3ac9c421 100644 --- a/crypto/openssl/VERSION.dat +++ b/crypto/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=5 -PATCH=3 +PATCH=4 PRE_RELEASE_TAG= BUILD_METADATA= -RELEASE_DATE="16 Sep 2025" +RELEASE_DATE="30 Sep 2025" SHLIB_VERSION=3 diff --git a/crypto/openssl/apps/storeutl.c b/crypto/openssl/apps/storeutl.c index 62f0e6135640..f8ebde44481c 100644 --- a/crypto/openssl/apps/storeutl.c +++ b/crypto/openssl/apps/storeutl.c @@ -331,14 +331,22 @@ int storeutl_main(int argc, char *argv[]) static int indent_printf(int indent, BIO *bio, const char *format, ...) { va_list args; - int ret; + int ret, vret; + + ret = BIO_printf(bio, "%*s", indent, ""); + if (ret < 0) + return ret; va_start(args, format); + vret = BIO_vprintf(bio, format, args); + va_end(args); - ret = BIO_printf(bio, "%*s", indent, "") + BIO_vprintf(bio, format, args); + if (vret < 0) + return vret; + if (vret > INT_MAX - ret) + return INT_MAX; - va_end(args); - return ret; + return ret + vret; } static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata, diff --git a/crypto/openssl/crypto/bio/bss_file.c b/crypto/openssl/crypto/bio/bss_file.c index 2743a14417cf..ddcb4feb6a58 100644 --- a/crypto/openssl/crypto/bio/bss_file.c +++ b/crypto/openssl/crypto/bio/bss_file.c @@ -287,7 +287,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) if (fp == NULL) { ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(), "calling fopen(%s, %s)", - ptr, p); + (const char *)ptr, p); ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB); ret = 0; break; diff --git a/crypto/openssl/crypto/ec/ecp_sm2p256.c b/crypto/openssl/crypto/ec/ecp_sm2p256.c index ffb58399dfd0..4c39be2186fb 100644 --- a/crypto/openssl/crypto/ec/ecp_sm2p256.c +++ b/crypto/openssl/crypto/ec/ecp_sm2p256.c @@ -1,5 +1,5 @@ /* - * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2023-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/crypto/evp/bio_ok.c b/crypto/openssl/crypto/evp/bio_ok.c index 20811ffded6f..d7f6c71ee1ad 100644 --- a/crypto/openssl/crypto/evp/bio_ok.c +++ b/crypto/openssl/crypto/evp/bio_ok.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -560,7 +560,7 @@ static int block_in(BIO *b) { BIO_OK_CTX *ctx; EVP_MD_CTX *md; - unsigned long tl = 0; + size_t tl = 0; unsigned char tmp[EVP_MAX_MD_SIZE]; int md_size; @@ -571,15 +571,18 @@ static int block_in(BIO *b) goto berr; assert(sizeof(tl) >= OK_BLOCK_BLOCK); /* always true */ - tl = ctx->buf[0]; - tl <<= 8; - tl |= ctx->buf[1]; - tl <<= 8; - tl |= ctx->buf[2]; - tl <<= 8; - tl |= ctx->buf[3]; - - if (ctx->buf_len < tl + OK_BLOCK_BLOCK + md_size) + tl = ((size_t)ctx->buf[0] << 24) + | ((size_t)ctx->buf[1] << 16) + | ((size_t)ctx->buf[2] << 8) + | ((size_t)ctx->buf[3]); + + if (tl > OK_BLOCK_SIZE) + goto berr; + + if (tl > SIZE_MAX - OK_BLOCK_BLOCK - (size_t)md_size) + goto berr; + + if (ctx->buf_len < tl + OK_BLOCK_BLOCK + (size_t)md_size) return 1; if (!EVP_DigestUpdate(md, @@ -587,7 +590,7 @@ static int block_in(BIO *b) goto berr; if (!EVP_DigestFinal_ex(md, tmp, NULL)) goto berr; - if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, md_size) == 0) { + if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, (size_t)md_size) == 0) { /* there might be parts from next block lurking around ! */ ctx->buf_off_save = tl + OK_BLOCK_BLOCK + md_size; ctx->buf_len_save = ctx->buf_len; diff --git a/crypto/openssl/crypto/evp/ctrl_params_translate.c b/crypto/openssl/crypto/evp/ctrl_params_translate.c index ed73fc0fbb8d..c846353200b2 100644 --- a/crypto/openssl/crypto/evp/ctrl_params_translate.c +++ b/crypto/openssl/crypto/evp/ctrl_params_translate.c @@ -1356,7 +1356,7 @@ static int fix_rsa_padding_mode(enum state state, if (i == OSSL_NELEM(str_value_map)) { ERR_raise_data(ERR_LIB_RSA, RSA_R_UNKNOWN_PADDING_TYPE, "[action:%d, state:%d] padding name %s", - ctx->action_type, state, ctx->p1); + ctx->action_type, state, (const char *)ctx->p2); ctx->p1 = ret = -2; } else if (state == POST_CTRL_TO_PARAMS) { /* EVP_PKEY_CTRL_GET_RSA_PADDING weirdness explained further up */ diff --git a/crypto/openssl/crypto/evp/p_lib.c b/crypto/openssl/crypto/evp/p_lib.c index 7f4508169dfa..63953a84e1f5 100644 --- a/crypto/openssl/crypto/evp/p_lib.c +++ b/crypto/openssl/crypto/evp/p_lib.c @@ -1146,15 +1146,14 @@ int EVP_PKEY_can_sign(const EVP_PKEY *pkey) } else { const OSSL_PROVIDER *prov = EVP_KEYMGMT_get0_provider(pkey->keymgmt); OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov); - const char *supported_sig = - pkey->keymgmt->query_operation_name != NULL - ? pkey->keymgmt->query_operation_name(OSSL_OP_SIGNATURE) - : EVP_KEYMGMT_get0_name(pkey->keymgmt); - EVP_SIGNATURE *signature = NULL; - - signature = EVP_SIGNATURE_fetch(libctx, supported_sig, NULL); - if (signature != NULL) { - EVP_SIGNATURE_free(signature); + EVP_SIGNATURE *sig; + const char *name; + + name = evp_keymgmt_util_query_operation_name(pkey->keymgmt, + OSSL_OP_SIGNATURE); + sig = EVP_SIGNATURE_fetch(libctx, name, NULL); + if (sig != NULL) { + EVP_SIGNATURE_free(sig); return 1; } } diff --git a/crypto/openssl/crypto/info.c b/crypto/openssl/crypto/info.c index 4d70471be255..e760ec094027 100644 --- a/crypto/openssl/crypto/info.c +++ b/crypto/openssl/crypto/info.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -23,6 +23,9 @@ #if defined(__arm__) || defined(__arm) || defined(__aarch64__) # include "arm_arch.h" # define CPU_INFO_STR_LEN 128 +#elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC) +# include "crypto/ppc_arch.h" +# define CPU_INFO_STR_LEN 128 #elif defined(__s390__) || defined(__s390x__) # include "s390x_arch.h" # define CPU_INFO_STR_LEN 2048 @@ -77,6 +80,15 @@ DEFINE_RUN_ONCE_STATIC(init_info_strings) BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str), sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str), " env:%s", env); +# elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC) + const char *env; + + BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str), + CPUINFO_PREFIX "OPENSSL_ppccap=0x%x", OPENSSL_ppccap_P); + if ((env = getenv("OPENSSL_ppccap")) != NULL) + BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str), + sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str), + " env:%s", env); # elif defined(__s390__) || defined(__s390x__) const char *env; diff --git a/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c b/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c index 41df1a956fb8..50e3b5433085 100644 --- a/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c +++ b/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c @@ -311,6 +311,7 @@ int ossl_ml_dsa_key_has(const ML_DSA_KEY *key, int selection) static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx, VECTOR *t1, VECTOR *t0) { + int ret = 0; const ML_DSA_PARAMS *params = key->params; uint32_t k = params->k, l = params->l; POLY *polys; @@ -343,9 +344,10 @@ static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx, /* Zeroize secret */ vector_zero(&s1_ntt); + ret = 1; err: OPENSSL_free(polys); - return 1; + return ret; } int ossl_ml_dsa_key_public_from_private(ML_DSA_KEY *key) diff --git a/crypto/openssl/crypto/ml_kem/ml_kem.c b/crypto/openssl/crypto/ml_kem/ml_kem.c index 4474af0f87cb..716c3bf4275e 100644 --- a/crypto/openssl/crypto/ml_kem/ml_kem.c +++ b/crypto/openssl/crypto/ml_kem/ml_kem.c @@ -2046,5 +2046,5 @@ int ossl_ml_kem_pubkey_cmp(const ML_KEM_KEY *key1, const ML_KEM_KEY *key2) * No match if just one of the public keys is not available, otherwise both * are unavailable, and for now such keys are considered equal. */ - return (ossl_ml_kem_have_pubkey(key1) ^ ossl_ml_kem_have_pubkey(key2)); + return (!(ossl_ml_kem_have_pubkey(key1) ^ ossl_ml_kem_have_pubkey(key2))); } diff --git a/crypto/openssl/crypto/modes/siv128.c b/crypto/openssl/crypto/modes/siv128.c index 72526b849eaf..4e52d8eb8782 100644 --- a/crypto/openssl/crypto/modes/siv128.c +++ b/crypto/openssl/crypto/modes/siv128.c @@ -202,9 +202,12 @@ int ossl_siv128_init(SIV128_CONTEXT *ctx, const unsigned char *key, int klen, || !EVP_MAC_final(mac_ctx, ctx->d.byte, &out_len, sizeof(ctx->d.byte))) { EVP_CIPHER_CTX_free(ctx->cipher_ctx); + ctx->cipher_ctx = NULL; EVP_MAC_CTX_free(ctx->mac_ctx_init); + ctx->mac_ctx_init = NULL; EVP_MAC_CTX_free(mac_ctx); EVP_MAC_free(ctx->mac); + ctx->mac = NULL; return 0; } EVP_MAC_CTX_free(mac_ctx); diff --git a/crypto/openssl/crypto/property/property_parse.c b/crypto/openssl/crypto/property/property_parse.c index 3a67754224f0..23963c89bc46 100644 --- a/crypto/openssl/crypto/property/property_parse.c +++ b/crypto/openssl/crypto/property/property_parse.c @@ -641,7 +641,7 @@ static void put_str(const char *str, char **buf, size_t *remain, size_t *needed) } quotes = quote != '\0'; - if (*remain == 0) { + if (*remain <= (size_t)quotes) { *needed += 2 * quotes; return; } diff --git a/crypto/openssl/crypto/rsa/rsa_gen.c b/crypto/openssl/crypto/rsa/rsa_gen.c index 033f66714add..f76bb7748369 100644 --- a/crypto/openssl/crypto/rsa/rsa_gen.c +++ b/crypto/openssl/crypto/rsa/rsa_gen.c @@ -734,18 +734,3 @@ err: return ret; } - -#ifdef FIPS_MODULE -int ossl_rsa_key_pairwise_test(RSA *rsa) -{ - OSSL_CALLBACK *stcb; - void *stcbarg; - int res; - - OSSL_SELF_TEST_get_callback(rsa->libctx, &stcb, &stcbarg); - res = rsa_keygen_pairwise_test(rsa, stcb, stcbarg); - if (res <= 0) - ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT_IMPORT); - return res; -} -#endif /* FIPS_MODULE */ diff --git a/crypto/openssl/crypto/rsa/rsa_sign.c b/crypto/openssl/crypto/rsa/rsa_sign.c index 78e4bad69e49..bb6e99acf9d3 100644 --- a/crypto/openssl/crypto/rsa/rsa_sign.c +++ b/crypto/openssl/crypto/rsa/rsa_sign.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -129,7 +129,7 @@ static const unsigned char digestinfo_ripemd160_der[] = { # ifndef OPENSSL_NO_SM3 /* SM3 (1 2 156 10197 1 401) */ static const unsigned char digestinfo_sm3_der[] = { - ASN1_SEQUENCE, 0x0f + SM3_DIGEST_LENGTH, + ASN1_SEQUENCE, 0x10 + SM3_DIGEST_LENGTH, ASN1_SEQUENCE, 0x0c, ASN1_OID, 0x08, 1 * 40 + 2, 0x81, 0x1c, 0xcf, 0x55, 1, 0x83, 0x78, ASN1_NULL, 0x00, diff --git a/crypto/openssl/crypto/threads_pthread.c b/crypto/openssl/crypto/threads_pthread.c index 44d6ebe09231..ace2dc499061 100644 --- a/crypto/openssl/crypto/threads_pthread.c +++ b/crypto/openssl/crypto/threads_pthread.c @@ -62,8 +62,10 @@ __tsan_mutex_post_lock((x), 0, 0) /* * The Non-Stop KLT thread model currently seems broken in its rwlock * implementation + * Likewise is there a problem with the glibc implementation on riscv. */ -# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) +# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) \ + && !defined(__riscv) # define USE_RWLOCK # endif @@ -279,7 +281,7 @@ static struct rcu_qp *get_hold_current_qp(struct rcu_lock_st *lock) /* if the idx hasn't changed, we're good, else try again */ if (qp_idx == ATOMIC_LOAD_N(uint32_t, &lock->reader_idx, - __ATOMIC_RELAXED)) + __ATOMIC_ACQUIRE)) break; ATOMIC_SUB_FETCH(&lock->qp_group[qp_idx].users, (uint64_t)1, @@ -403,8 +405,12 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id) *curr_id = lock->id_ctr; lock->id_ctr++; + /* + * make the current state of everything visible by this release + * when get_hold_current_qp acquires the next qp + */ ATOMIC_STORE_N(uint32_t, &lock->reader_idx, lock->current_alloc_idx, - __ATOMIC_RELAXED); + __ATOMIC_RELEASE); /* * this should make sure that the new value of reader_idx is visible in diff --git a/crypto/openssl/crypto/x509/t_x509.c b/crypto/openssl/crypto/x509/t_x509.c index 7d693669cd36..d849e642ce8b 100644 --- a/crypto/openssl/crypto/x509/t_x509.c +++ b/crypto/openssl/crypto/x509/t_x509.c @@ -219,7 +219,8 @@ int X509_ocspid_print(BIO *bp, X509 *x) goto err; if ((der = dertmp = OPENSSL_malloc(derlen)) == NULL) goto err; - i2d_X509_NAME(subj, &dertmp); + if (i2d_X509_NAME(subj, &dertmp) < 0) + goto err; md = EVP_MD_fetch(x->libctx, SN_sha1, x->propq); if (md == NULL) diff --git a/crypto/openssl/crypto/x509/x509_lu.c b/crypto/openssl/crypto/x509/x509_lu.c index 05ee7c8c6b51..eb2d47955b2e 100644 --- a/crypto/openssl/crypto/x509/x509_lu.c +++ b/crypto/openssl/crypto/x509/x509_lu.c @@ -408,7 +408,6 @@ static int x509_store_add(X509_STORE *store, void *x, int crl) } if (!X509_STORE_lock(store)) { - obj->type = X509_LU_NONE; X509_OBJECT_free(obj); return 0; } diff --git a/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod b/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod index ff2074820f68..eeb882f291e4 100644 --- a/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod +++ b/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod @@ -170,15 +170,14 @@ B_set>() sets element I of I to I replacing the current element. The new element value is returned or NULL if an error occurred: this will only happen if I is NULL or I is out of range. -B_find>() searches I for the element I. In the case -where no comparison function has been specified, the function performs -a linear search for a pointer equal to I. The index of the first -matching element is returned or B<-1> if there is no match. In the case -where a comparison function has been specified, I is sorted and -B_find>() returns the index of a matching element or B<-1> if there -is no match. Note that, in this case the comparison function will usually -compare the values pointed to rather than the pointers themselves and -the order of elements in I can change. +B_find>() searches I for the element I. In the +case where no comparison function has been specified, the function +performs a linear search for a pointer equal to I. In the case +where a comparison function has been specified, the function performs +a search for a element that the comparison function indicates is a +match. If the stack is sorted, a binary search is used, otherwise, a +linear search is used. B_find>() returns the index of a +matching element or B<-1> if there is no match. B_find_ex>() operates like B_find>() except when a comparison function has been specified and no matching element is found. @@ -301,7 +300,7 @@ was changed to return 0 in this condition as for other errors. =head1 COPYRIGHT -Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/OpenSSL_version.pod b/crypto/openssl/doc/man3/OpenSSL_version.pod index e5dff33dcdda..6b899cbe5438 100644 --- a/crypto/openssl/doc/man3/OpenSSL_version.pod +++ b/crypto/openssl/doc/man3/OpenSSL_version.pod @@ -256,9 +256,16 @@ L The macros and functions described here were added in OpenSSL 3.0, except for OPENSSL_VERSION_NUMBER and OpenSSL_version_num(). +=head1 BUGS + +There was a discrepancy between this manual and commentary + code +in F<< >>, where the latter suggested that the +four least significant bits of B could be +C<0x0f> in released OpenSSL versions. + =head1 COPYRIGHT -Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2018-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod b/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod index 09b7280bdd58..a10942433aa7 100644 --- a/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod +++ b/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod @@ -37,7 +37,7 @@ SSL_CIPHER_get_protocol_id int SSL_CIPHER_is_aead(const SSL_CIPHER *c); const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr); uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c); - uint32_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c); + uint16_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c); =head1 DESCRIPTION @@ -203,7 +203,7 @@ The OPENSSL_cipher_name() function was added in OpenSSL 1.1.1. =head1 COPYRIGHT -Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod b/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod index f7add16d7bdd..0140deee9a5e 100644 --- a/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod +++ b/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod @@ -23,9 +23,10 @@ SSL_SESSION_set1_alpn_selected =head1 DESCRIPTION -SSL_SESSION_get0_hostname() retrieves the SNI value that was sent by the -client when the session was created if it was accepted by the server. Otherwise -NULL is returned. +SSL_SESSION_get0_hostname() retrieves the Server Name Indication (SNI) value +that was sent by the client when the session was created if the server +acknowledged the client's SNI extension by including an empty SNI extension +in response. Otherwise NULL is returned. The value returned is a pointer to memory maintained within B and should not be free'd. @@ -44,8 +45,7 @@ B. =head1 RETURN VALUES -SSL_SESSION_get0_hostname() returns either a string or NULL based on if there -is the SNI value sent by client. +SSL_SESSION_get0_hostname() returns the SNI string if available, or NULL if not. SSL_SESSION_set1_hostname() returns 1 on success or 0 on error. diff --git a/crypto/openssl/include/crypto/rsa.h b/crypto/openssl/include/crypto/rsa.h index ffbc95a77888..55cc814ce913 100644 --- a/crypto/openssl/include/crypto/rsa.h +++ b/crypto/openssl/include/crypto/rsa.h @@ -124,10 +124,6 @@ ASN1_STRING *ossl_rsa_ctx_to_pss_string(EVP_PKEY_CTX *pkctx); int ossl_rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx, const X509_ALGOR *sigalg, EVP_PKEY *pkey); -# ifdef FIPS_MODULE -int ossl_rsa_key_pairwise_test(RSA *rsa); -# endif /* FIPS_MODULE */ - # if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS) int ossl_rsa_acvp_test_gen_params_new(OSSL_PARAM **dst, const OSSL_PARAM src[]); void ossl_rsa_acvp_test_gen_params_free(OSSL_PARAM *dst); diff --git a/crypto/openssl/include/openssl/opensslv.h.in b/crypto/openssl/include/openssl/opensslv.h.in index e547281ff527..69b9caacf4dc 100644 --- a/crypto/openssl/include/openssl/opensslv.h.in +++ b/crypto/openssl/include/openssl/opensslv.h.in @@ -89,12 +89,12 @@ extern "C" { # define OPENSSL_VERSION_TEXT "OpenSSL {- "$config{full_version} $config{release_date}" -}" -/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ +/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PP0L */ # define OPENSSL_VERSION_NUMBER \ ( (OPENSSL_VERSION_MAJOR<<28) \ |(OPENSSL_VERSION_MINOR<<20) \ |(OPENSSL_VERSION_PATCH<<4) \ - |{- @config{prerelease} ? "0x0L" : "0xfL" -} ) + |0x0L ) # ifdef __cplusplus } diff --git a/crypto/openssl/providers/fips-sources.checksums b/crypto/openssl/providers/fips-sources.checksums index d48a9c85f57b..334b4ad6b7f2 100644 --- a/crypto/openssl/providers/fips-sources.checksums +++ b/crypto/openssl/providers/fips-sources.checksums @@ -250,7 +250,7 @@ c685813be6ad35b0861ba888670ef54aa2b399d003472698e39426de6e52db59 crypto/initthr f866aafae928db1b439ac950dc90744a2397dfe222672fe68b3798396190c8b0 crypto/mem_clr.c 18127868d868ca5705444c24f7dc385391ba31154fc04ff54949739e8fa7fdfc crypto/ml_dsa/ml_dsa_encoders.c 825105b0a2c4844b2b4229001650ff7e61e1348e52f1072210f70b97cd4adb71 crypto/ml_dsa/ml_dsa_hash.h -c82201cf1a17ff2d4b169dcd4402d3d56f4685e460a1447e021db4abd67f7f0e crypto/ml_dsa/ml_dsa_key.c +c467f4400d399aad6b51746ef2575d1e04d260a1bf901b35ca55624fe62e650e crypto/ml_dsa/ml_dsa_key.c 579c1a12a5c5f014476a6bf695dc271f63074fb187e23ffc3f9ccb5b7ea044f1 crypto/ml_dsa/ml_dsa_key.h 3f98eb0467033d0a40867ef1c1036dcfea5d231eeac2321196f7d7c7243edace crypto/ml_dsa/ml_dsa_key_compress.c 983d164bfa3dbe8d85ad1fdc24d897e79d9246d96d9c1862855c6c538b387ad9 crypto/ml_dsa/ml_dsa_local.h @@ -263,7 +263,7 @@ ff65c82c56e341f47df03d0c74de7fb537de0e68a4fa23fa07a9fdb51c511f1c crypto/ml_dsa/ 1d7f57a41034988a4e7d4c9a998760d2ef802c5e90275d09a3ca31c5f3403d94 crypto/ml_dsa/ml_dsa_sign.c 5217ef237e21872205703b95577290c34898423466a465c7bd609b2eb4627964 crypto/ml_dsa/ml_dsa_sign.h abd934284bcd8061027a69f437fa4410c6b72cd950be1ebe048244d036371208 crypto/ml_dsa/ml_dsa_vector.h -defc2e4e81ff1b78056c795bc0565f4241a259c2957abe84a51bcbc1e4ace3f1 crypto/ml_kem/ml_kem.c +8c4f7238f68f959f2ad1e2529c567364c5a8818898355c82818521e03239ea76 crypto/ml_kem/ml_kem.c 36e24eae5d38cc9666ae40e4e8a2dc12328e1159fea68447cb19dab174d25adf crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl 33357356cd739d4ae89d52f0804b6900e4b94d8829323819c6f64c8908e978df crypto/modes/asm/aes-gcm-armv8_64.pl bcc09bdb474f045d04c983fa09c31a010c5a25513f53a5d3653ade91304f0f96 crypto/modes/asm/aes-gcm-avx512.pl @@ -306,7 +306,7 @@ f50450f7e5f6896fb8e3cde2fdc11cc543124c854ef9d88252a166606ca80081 crypto/params_ 467c416422ecf61e3b713c5eb259fdbcb4aa73ae8dee61804d0b85cfd3fff4f7 crypto/property/defn_cache.c 91c1f1f8eb5588ed9da17386c244ae68a6a81717b1c7ab6c9f1a6a57973a039f crypto/property/property.c 66da4f28d408133fb544b14aeb9ad4913e7c5c67e2826e53f0dc5bf4d8fada26 crypto/property/property_local.h -d32105cb087d708d0504a787f74bc163cc398c299faf2e98d6bb5ae02f5ce9b7 crypto/property/property_parse.c +1e99a3934812f99dad79cbfbb6727ad61b6093711c1a6c74d4b50f9318152611 crypto/property/property_parse.c a7cefda6a117550e2c76e0f307565ce1e11640b11ba10c80e469a837fd1212a3 crypto/property/property_query.c 20e69b9d594dfc443075eddbb0e6bcc0ed36ca51993cd50cc5a4f86eb31127f8 crypto/property/property_string.c 10644e9d20214660706de58d34edf635c110d4e4f2628cd5284a08c60ed9aff8 crypto/provider_core.c @@ -322,7 +322,7 @@ f0c8792a99132e0b9c027cfa7370f45594a115934cdc9e8f23bdd64abecaf7fd crypto/rsa/rsa 1b828f428f0e78b591378f7b780164c4574620c68f9097de041cbd576f811bf6 crypto/rsa/rsa_backend.c 38a102cd1da1f6ca5a46e6a22f018237964336274385f5c70cbedcaa6997647e crypto/rsa/rsa_chk.c e762c599b17d5c89f4b1c9eb7d0ca1f04a95d815c86a3e72c30b231ce57fb199 crypto/rsa/rsa_crpt.c -0fa3e4687510e2d91c8f4b1c460b1d51375d9855ed825b3d6697620b146b52d1 crypto/rsa/rsa_gen.c +a3d20f27ae3cb41af5b62febd0bb19025e59d401b136306d570cdba103b15542 crypto/rsa/rsa_gen.c f22bc4e2c3acab83e67820c906c1caf048ec1f0d4fcb7472c1bec753c75f8e93 crypto/rsa/rsa_lib.c 5ae8edaf654645996385fbd420ef73030762fc146bf41deb5294d6d83e257a16 crypto/rsa/rsa_local.h cf0b75cd54b61b9b9a290ef18d0ddce9fb26a029a54eb3f720d9b25188440f00 crypto/rsa/rsa_mp_names.c @@ -416,7 +416,7 @@ a00e16963e1e2a0126c6a8e62da8a14f98de9736027654c925925dadd0ca3cc1 crypto/thread/ 27ec0090f4243c96e4fbe1babfd4320c2a16615ffa368275433217d50a1ef76c crypto/thread/internal.c 67ba8d87fbbb7c9a9e438018e7ecfd1cedd4d00224be05755580d044f5f1317a crypto/threads_lib.c b1a828491d9ce305802662561788facac92dff70cca9ead807f3e28741ff21e0 crypto/threads_none.c -c659f7ce5c4b59d2a1cff78485fa8e89c8d20d5798df4afc1b94ff635ffc0262 crypto/threads_pthread.c +491e9c29d4a7b4dd627ea25c20ce4a33103565b3108b618c41c6816dfc675569 crypto/threads_pthread.c 9c3bf7b4baa302a4017150fbcaa114ee9df935b18d5a3a8c8015003780d4e7de crypto/threads_win.c 7edd638df588b14711a50c98d458c4fc83f223ed03bc6c39c7c8edf7915b7cfa crypto/time.c 88c5f9f4d2611223d283ebd2ae10ae5ecbb9972d00f747d93fcb74b62641e3f9 crypto/x86_64cpuid.pl @@ -445,7 +445,7 @@ bbe5e52d84e65449a13e42cd2d6adce59b8ed6e73d6950917aa77dc1f3f5dff6 include/crypto 6e7762e7fb63f56d25b24f70209f4dc834c59a87f74467531ec81646f565dbe3 include/crypto/modes.h 920bc48a4dad3712bdcef188c0ce8e8a8304e0ce332b54843bab366fc5eab472 include/crypto/rand.h 71f23915ea74e93971fb0205901031be3abea7ffef2c52e4cc4848515079f68d include/crypto/rand_pool.h -b1df067691f9741ef9c42b2e5f12461bcd87b745514fc5701b9c9402fb10b224 include/crypto/rsa.h +6f16685ffbc97dc2ac1240bfddf4bbac2dd1ad83fff6da91aee6f3f64c6ee8ff include/crypto/rsa.h 32f0149ab1d82fddbdfbbc44e3078b4a4cc6936d35187e0f8d02cc0bc19f2401 include/crypto/security_bits.h 80338f3865b7c74aab343879432a6399507b834e2f55dd0e9ee7a5eeba11242a include/crypto/sha.h dc7808729c3231a08bbe470b3e1b562420030f59f7bc05b14d7b516fa77b4f3a include/crypto/slh_dsa.h @@ -546,7 +546,7 @@ a8a45996fd21411cb7ed610bc202dbd06570cdfa0a2d14f7dfc8bfadc820e636 include/openss cb6bca3913c60a57bac39583eee0f789d49c3d29be3ecde9aecc7f3287117aa5 include/openssl/objects.h d25537af264684dff033dd8ae62b0348f868fcfec4aa51fa8f07bcfa4bd807ad include/openssl/objectserr.h fe6acd42c3e90db31aaafc2236a7d30ebfa53c4c07ea4d8265064c7fcb951970 include/openssl/opensslconf.h -fc914a750d798ac9fc9287e6359cfa1da214b91651deaaaa7e1a46b595cd0425 include/openssl/opensslv.h.in +6c1a8837bbba633db2a8951ff29ccfe09e7d2a24a37ee2af90f2d897c190da9a include/openssl/opensslv.h.in 767d9d7d5051c937a3ce8a268c702902fda93eeaa210a94dfde1f45c23277d20 include/openssl/param_build.h 1c442aaaa4dda7fbf727a451bc676fb4d855ef617c14dc77ff2a5e958ae33c3e include/openssl/params.h 44f178176293c6ce8142890ff9dc2d466364c734e4e811f56bd62010c5403183 include/openssl/pkcs7.h.in @@ -618,8 +618,8 @@ f2581d7b4e105f2bb6d30908f3c2d9959313be08cec6dbeb49030c125a7676d3 providers/fips 669f76f742bcaaf28846b057bfab97da7c162d69da244de71b7c743bf16e430f providers/fips/include/fipscommon.h f111fd7e016af8cc6f96cd8059c28227b328dd466ed137ae0c0bc0c3c3eec3ba providers/fips/self_test.c 5c2c6c2f69e2eb01b88fa35630f27948e00dd2c2fd351735c74f34ccb2005cbe providers/fips/self_test.h -663441de9aba1d1b81ce02b3acded520b88cc460330d4d98adb7450d9664c474 providers/fips/self_test_data.inc -2e568e2b161131240e97bd77a730c2299f961c2f1409ea8466422fc07f9be23f providers/fips/self_test_kats.c +df83c901ad13675fbbb4708b6087feba6099870ad3dd0e8d09cfdb6798419770 providers/fips/self_test_data.inc +6779d5afb3f48d82868b247ffb0a6a572f6e3964738296ad47e7ccafdb263c88 providers/fips/self_test_kats.c dde79dfdedfe0e73006a0cf912fdde1ff109dfbc5ba6ecab319c938bc4275950 providers/implementations/asymciphers/rsa_enc.c c2f1b12c64fc369dfc3b9bc9e76a76de7280e6429adaee55d332eb1971ad1879 providers/implementations/ciphers/cipher_aes.c 6ba7d817081cf0d87ba7bfb38cd9d70e41505480bb8bc796ef896f68d4514ea6 providers/implementations/ciphers/cipher_aes.h @@ -699,7 +699,7 @@ c764555b9dc9b273c280514a5d2d44156f82f3e99155a77c627f2c773209bcd7 providers/impl 24cc3cc8e8681c77b7f96c83293bd66045fd8ad69f756e673ca7f8ca9e82b0af providers/implementations/keymgmt/dsa_kmgmt.c 36a9c1c8658ce7918453827cb58ed52787e590e3f148c5510deeb2c16c25a29d providers/implementations/keymgmt/ec_kmgmt.c 258ae17bb2dd87ed1511a8eb3fe99eed9b77f5c2f757215ff6b3d0e8791fc251 providers/implementations/keymgmt/ec_kmgmt_imexport.inc -9728d696d249b2d224724c9872138a60e1998e5cfa5c49f3f48ad0666f7eed34 providers/implementations/keymgmt/ecx_kmgmt.c +11c27cc3c9f38885c484f25d11987e93f197aa90bef2fc1d6e8f508c2d014d4d providers/implementations/keymgmt/ecx_kmgmt.c daf35a7ab961ef70aefca981d80407935904c5da39dca6692432d6e6bc98759d providers/implementations/keymgmt/kdf_legacy_kmgmt.c d97d7c8d3410b3e560ef2becaea2a47948e22205be5162f964c5e51a7eef08cb providers/implementations/keymgmt/mac_legacy_kmgmt.c a428de71082fd01e5dcfa030a6fc34f6700b86d037b4e22f015c917862a158ce providers/implementations/keymgmt/ml_dsa_kmgmt.c diff --git a/crypto/openssl/providers/fips.checksum b/crypto/openssl/providers/fips.checksum index 7fa4ea19bba3..5d1117361d27 100644 --- a/crypto/openssl/providers/fips.checksum +++ b/crypto/openssl/providers/fips.checksum @@ -1 +1 @@ -8d0c2c2b986f4c98f511c9aa020e98aa984dce5976d8e1966a7721f8b559cda8 providers/fips-sources.checksums +c342f9dc7075a6ecd0e4b3c9db06e180765278a7bbae233ec1a65095a0e524ec providers/fips-sources.checksums diff --git a/crypto/openssl/providers/fips/self_test_data.inc b/crypto/openssl/providers/fips/self_test_data.inc index b6aa433ca93c..6abab0a7a173 100644 --- a/crypto/openssl/providers/fips/self_test_data.inc +++ b/crypto/openssl/providers/fips/self_test_data.inc @@ -1308,6 +1308,18 @@ static const ST_KAT_PARAM rsa_priv_key[] = { ST_KAT_PARAM_END() }; +/*- + * Using OSSL_PKEY_RSA_PAD_MODE_NONE directly in the expansion of the + * ST_KAT_PARAM_UTF8STRING macro below causes a failure on ancient + * HP/UX PA-RISC compilers. + */ +static const char pad_mode_none[] = OSSL_PKEY_RSA_PAD_MODE_NONE; + +static const ST_KAT_PARAM rsa_enc_params[] = { + ST_KAT_PARAM_UTF8STRING(OSSL_ASYM_CIPHER_PARAM_PAD_MODE, pad_mode_none), + ST_KAT_PARAM_END() +}; + static const unsigned char rsa_sig_msg[] = "Hello World!"; static const unsigned char rsa_expected_sig[256] = { @@ -3497,3 +3509,33 @@ static const ST_KAT_ASYM_KEYGEN st_kat_asym_keygen_tests[] = { # endif }; #endif /* !OPENSSL_NO_ML_DSA || !OPENSSL_NO_SLH_DSA */ + +static const ST_KAT_ASYM_CIPHER st_kat_asym_cipher_tests[] = { + { + OSSL_SELF_TEST_DESC_ASYM_RSA_ENC, + "RSA", + 1, + rsa_pub_key, + rsa_enc_params, + ITM(rsa_asym_plaintext_encrypt), + ITM(rsa_asym_expected_encrypt), + }, + { + OSSL_SELF_TEST_DESC_ASYM_RSA_DEC, + "RSA", + 0, + rsa_priv_key, + rsa_enc_params, + ITM(rsa_asym_expected_encrypt), + ITM(rsa_asym_plaintext_encrypt), + }, + { + OSSL_SELF_TEST_DESC_ASYM_RSA_DEC, + "RSA", + 0, + rsa_crt_key, + rsa_enc_params, + ITM(rsa_asym_expected_encrypt), + ITM(rsa_asym_plaintext_encrypt), + }, +}; diff --git a/crypto/openssl/providers/fips/self_test_kats.c b/crypto/openssl/providers/fips/self_test_kats.c index 35ecb43598ee..acb0b85f7343 100644 --- a/crypto/openssl/providers/fips/self_test_kats.c +++ b/crypto/openssl/providers/fips/self_test_kats.c @@ -812,6 +812,93 @@ err: } #endif +/* + * Test an encrypt or decrypt KAT.. + * + * FIPS 140-2 IG D.9 states that separate KAT tests are needed for encrypt + * and decrypt.. + */ +static int self_test_asym_cipher(const ST_KAT_ASYM_CIPHER *t, OSSL_SELF_TEST *st, + OSSL_LIB_CTX *libctx) +{ + int ret = 0; + OSSL_PARAM *keyparams = NULL, *initparams = NULL; + OSSL_PARAM_BLD *keybld = NULL, *initbld = NULL; + EVP_PKEY_CTX *encctx = NULL, *keyctx = NULL; + EVP_PKEY *key = NULL; + BN_CTX *bnctx = NULL; + unsigned char out[256]; + size_t outlen = sizeof(out); + + OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_KAT_ASYM_CIPHER, t->desc); + + bnctx = BN_CTX_new_ex(libctx); + if (bnctx == NULL) + goto err; + + /* Load a public or private key from data */ + keybld = OSSL_PARAM_BLD_new(); + if (keybld == NULL + || !add_params(keybld, t->key, bnctx)) + goto err; + keyparams = OSSL_PARAM_BLD_to_param(keybld); + keyctx = EVP_PKEY_CTX_new_from_name(libctx, t->algorithm, NULL); + if (keyctx == NULL || keyparams == NULL) + goto err; + if (EVP_PKEY_fromdata_init(keyctx) <= 0 + || EVP_PKEY_fromdata(keyctx, &key, EVP_PKEY_KEYPAIR, keyparams) <= 0) + goto err; + + /* Create a EVP_PKEY_CTX to use for the encrypt or decrypt operation */ + encctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL); + if (encctx == NULL + || (t->encrypt && EVP_PKEY_encrypt_init(encctx) <= 0) + || (!t->encrypt && EVP_PKEY_decrypt_init(encctx) <= 0)) + goto err; + + /* Add any additional parameters such as padding */ + if (t->postinit != NULL) { + initbld = OSSL_PARAM_BLD_new(); + if (initbld == NULL) + goto err; + if (!add_params(initbld, t->postinit, bnctx)) + goto err; + initparams = OSSL_PARAM_BLD_to_param(initbld); + if (initparams == NULL) + goto err; + if (EVP_PKEY_CTX_set_params(encctx, initparams) <= 0) + goto err; + } + + if (t->encrypt) { + if (EVP_PKEY_encrypt(encctx, out, &outlen, + t->in, t->in_len) <= 0) + goto err; + } else { + if (EVP_PKEY_decrypt(encctx, out, &outlen, *** 1479 LINES SKIPPED *** From nobody Wed Nov 5 19:37:41 2025 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 4d1wZs679Mz652QJ; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZs3Njjz3t0m; Wed, 05 Nov 2025 19:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f2Ipsrq2pPgSrPrltNnWKE7xGse/OxVhWEBL8tuiLuI=; b=xJkKknISAajpO8tXobtjrdEEFGFNEX8MQhvUTyVUeRVGuuR7cZN3en+iy4n8Mi9ab1KYXW fBJdJAzVwGyP2ORtiRD1FYPK37eM8VchMC9Fxa1l2ApjosLbeVUFJr0L4eckHdlLkoHosU G988miEUQuUSIVTqucySJSRzwtFdAVlRqnNBgEH1Ho9V1JCf1LV78RhY4TdbvvCacKluAR HygL4Ua0R//ow+1Cghy8BTHC9Co1zx3wjzfn8RzpAZUN1p9DTlyBvFJ1pI5aPy6FHyA40X /3aQL0R9UDAIdQD6kEhvp1D+NbuQxsYXxl3GY8ONL5K1BUdLtLjRNIi6mh9Xyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f2Ipsrq2pPgSrPrltNnWKE7xGse/OxVhWEBL8tuiLuI=; b=vGBbxky1qTrRColmQdumkg1E8qUQVdNvYJpLcDyrF5DQRfJn7bbEKAJDFRBS/J8EL13VHd SuhC23h1JZVTGOX9Npb9kyVNybpuHycOKvg7HJxsi9SBI+Pdwzf+V7/QUYIqUqrL4wctN6 hP2W9YJHiUjqhxAXLaZhel/honvjnfSZjMcwiaQVNITRvBnPxnJIAuCx7FZEMNs8P1fNDf dDxK9t8mxzTyOF/ZedQtP6axxGav2KtxVIwdaXNl1nZ4B0+4q5q7qooqgu577zMtKnhfmt MNOe6aQTYyKbqxULNMYz57P+o/r68VFOxGWzwdBvlPF3kzXa0fQIGQqa1OVmgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371461; a=rsa-sha256; cv=none; b=VOZtlhcsPtVQChd6jGJpR8GOIqg1GaKYRh1CYYN1irCbS5MTn/9g/1J0W3KjzaywztkgAr 20C2gvlD4vK2FRHnvjDcS3T7j+p9PQe9XW257J/GK7pdwpAudRjebsoTVIri4xRuIMKQ9W Abt+QSfFrN3ybL4PiqdH6hsbYYlA8roTVwXdHpc6ePz0vSpIUzXrzz0BTTEJ46/xA6rnVu ksyTzbMotXxDA7FFKscvFOQO39kteCR7AR73YvDP/C/JCzw3FGHtvmbeo2K8Gw/IdVyDau 5wnFaelfS2UDLKS3rB2csjUur6czPs7R54i4ndAWIdqF6zDLvgtSpoDlTeJZXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZs2vVgzx28; Wed, 05 Nov 2025 19:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbfDt086606; Wed, 5 Nov 2025 19:37:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbfpD086603; Wed, 5 Nov 2025 19:37:41 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:41 GMT Message-Id: <202511051937.5A5JbfpD086603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: af0eda4f3310 - releng/15.0 - crypto/openssl: update generated files to match 3.5.4 artifacts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: af0eda4f3310f8dbb7986ca27a49ba16e9be726d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=af0eda4f3310f8dbb7986ca27a49ba16e9be726d commit af0eda4f3310f8dbb7986ca27a49ba16e9be726d Author: Enji Cooper AuthorDate: 2025-10-07 23:14:13 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:59 +0000 crypto/openssl: update generated files to match 3.5.4 artifacts Approved by: re (cperciva) MFC with: 046c625e9382 Fixes: 046c625e9382 ("crypto/openssl: update to 3.5.4") Reported by: Herbert J. Skuhra (cherry picked from commit d4033e6d37747f5213bb245c8e605406703a8766) (cherry picked from commit 505aec2bf3b1576fd9b6dad5d6c9a6522e20ad92) --- crypto/openssl/configdata.pm | 569 ++++++++++++++++++++- crypto/openssl/exporters/libcrypto.pc | 2 +- crypto/openssl/exporters/libssl.pc | 2 +- crypto/openssl/exporters/openssl.pc | 2 +- crypto/openssl/include/openssl/opensslv.h | 14 +- crypto/openssl/libcrypto.pc | 2 +- crypto/openssl/libssl.pc | 2 +- crypto/openssl/openssl.pc | 2 +- crypto/openssl/util/wrap.pl | 6 +- secure/lib/libcrypto/Makefile.version | 4 +- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 | 2 +- .../libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_sign.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- .../lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- .../libcrypto/man/man3/BIO_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_core.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_datagram.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_dgram_pair.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_sendmmsg.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_socket_wait.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMAC_CTX.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_decrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_encrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EnvelopedData_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- .../libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_data_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_digest_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- .../libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- .../lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- .../libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- .../lib/libcrypto/man/man3/CMS_signed_get_attr.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/COMP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- .../libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- .../libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- .../libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- .../man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- .../libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 21 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- .../libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- .../libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_get_timeout.3 | 2 +- .../lib/libcrypto/man/man3/DTLSv1_handle_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_sign.3 | 2 +- .../lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- .../lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- .../lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- .../libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_new.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- .../lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_original_iv.3 | 2 +- .../lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- .../lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KDF.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEM_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MAC.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get_algor.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_copy_parameters.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- .../man/man3/EVP_PKEY_digestsign_supports_digest.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_attr.3 | 2 +- .../man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_field_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_gettable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- .../man/man3/EVP_PKEY_set1_encoded_public_key.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_settable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_RAND.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEY.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- .../lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_des_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- .../lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- .../man/man3/EVP_set_default_properties.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/GENERAL_NAME.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/NCONF_new_ex.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- .../libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- .../libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- .../man/man3/OPENSSL_load_builtin_modules.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_load_u16_le.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_riscvcap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ATAV_set0.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 | 2 +- .../man/man3/OSSL_CMP_HDR_get0_transactionID.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_ITAV_new_caCerts.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 | 2 +- .../libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set0_validity.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 | 2 +- .../man/man3/OSSL_DECODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 | 2 +- .../man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ERR_STATE_save.3 | 2 +- .../man/man3/OSSL_ESS_check_signing_certs.3 | 2 +- .../libcrypto/man/man3/OSSL_GENERAL_NAMES_print.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HPKE_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_IETF_ATTR_SYNTAX.3 | 2 +- .../man/man3/OSSL_IETF_ATTR_SYNTAX_print.3 | 2 +- .../man/man3/OSSL_INDICATOR_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ITEM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 | 2 +- .../man/man3/OSSL_LIB_CTX_set_conf_diagnostics.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 | 2 +- .../man/man3/OSSL_PARAM_allocate_from_text.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 | 2 +- .../libcrypto/man/man3/OSSL_PARAM_print_to_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 | 2 +- .../libcrypto/man/man3/OSSL_QUIC_client_method.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 | 2 +- .../man/man3/OSSL_SELF_TEST_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_sleep.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 | 2 +- .../man/man3/OSSL_trace_get_category_num.3 | 2 +- .../libcrypto/man/man3/OSSL_trace_set_channel.3 | 2 +- .../man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_version.3 | 10 +- .../libcrypto/man/man3/PBMAC1_get1_pbkdf2_param.3 | 2 +- .../libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 +- .../libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- .../libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- .../man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 | 2 +- .../man/man3/PKCS12_SAFEBAG_create_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_set0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 | 2 +- .../libcrypto/man/man3/PKCS12_add_CSPName_asc.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 | 2 +- .../man/man3/PKCS12_add_friendlyname_asc.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 | 2 +- .../libcrypto/man/man3/PKCS12_get_friendlyname.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_init.3 | 2 +- .../libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 | 2 +- .../libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- .../libcrypto/man/man3/PKCS7_get_octet_string.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_type_is_other.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 | 2 +- .../lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_get0_primary.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 | 2 +- .../lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- .../man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- .../lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- .../man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_Calc_B.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 | 2 +- .../lib/libcrypto/man/man3/SRP_create_verifier.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 6 +- .../man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- .../man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- .../man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- .../man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- .../man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- .../man/man3/SSL_CTX_set1_cert_comp_preference.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- .../man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- .../man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- .../man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- .../man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- .../man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- .../man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_domain_flags.3 | 2 +- .../man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- .../man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- .../man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- .../man/man3/SSL_CTX_set_new_pending_conn_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- .../man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- .../man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- .../man/man3/SSL_CTX_set_security_level.3 | 2 +- .../man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- .../man/man3/SSL_CTX_set_session_id_context.3 | 2 +- .../man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- .../man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_srp_password.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- .../man/man3/SSL_CTX_set_tmp_dh_callback.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- .../man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 12 +- .../man/man3/SSL_SESSION_get0_id_context.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- .../man/man3/SSL_SESSION_get_compress_id.3 | 2 +- .../man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept_stream.3 | 2 +- .../lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- .../man/man3/SSL_export_keying_material.3 | 2 +- .../libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_connection.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_rpk.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- .../libcrypto/man/man3/SSL_get1_builtin_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- .../libcrypto/man/man3/SSL_get_conn_close_info.3 | 2 +- .../libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_event_timeout.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_handshake_rtt.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- .../man/man3/SSL_get_peer_signature_nid.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- .../libcrypto/man/man3/SSL_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- .../libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_stream_id.3 | 2 +- .../libcrypto/man/man3/SSL_get_stream_read_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_value_uint.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_group_to_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_handle_events.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- .../lib/libcrypto/man/man3/SSL_inject_net_dgram.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- .../libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_domain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_listener.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_stream.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_poll.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- .../lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- .../man/man3/SSL_set1_initial_peer_addr.3 | 2 +- .../libcrypto/man/man3/SSL_set1_server_cert_type.3 | 2 +- .../libcrypto/man/man3/SSL_set_async_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_blocking_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- .../man/man3/SSL_set_default_stream_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- .../man/man3/SSL_set_incoming_stream_policy.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_quic_tls_cbs.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_retry_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- .../libcrypto/man/man3/SSL_set_session_secret_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- .../lib/libcrypto/man/man3/SSL_stream_conclude.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_stream_reset.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/TS_VERIFY_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_add1_attr.3 | 2 +- .../libcrypto/man/man3/X509_ACERT_add_attr_nconf.3 | 2 +- .../man/man3/X509_ACERT_get0_holder_baseCertId.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_get_attr.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ATTRIBUTE.3 | 2 +- .../libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- .../libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- .../man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- .../man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- .../man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_REQ_get_attr.3 | 2 +- .../libcrypto/man/man3/X509_REQ_get_extensions.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- .../man/man3/X509_STORE_CTX_get_by_subject.3 | 2 +- .../libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- .../man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- .../man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- .../man/man3/X509_VERIFY_PARAM_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- .../libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- .../man/man3/X509_get0_distinguishing_id.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- .../man/man3/X509_get_default_cert_file.3 | 2 +- .../libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_load_http.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 | 2 +- .../libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- .../lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 | 2 +- secure/lib/libcrypto/man/man5/config.5 | 2 +- secure/lib/libcrypto/man/man5/fips_config.5 | 2 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-ARGON2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PVKKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 | 2 +- .../lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-KECCAK.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-common.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SLH-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CRNG-TEST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-JITTER.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ML-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-SLH-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_STORE-winstore.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/fips_module.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-digest.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-mac.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-pkey.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-rand.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-core.h.7 | 2 +- .../libcrypto/man/man7/openssl-core_dispatch.h.7 | 2 +- .../lib/libcrypto/man/man7/openssl-core_names.h.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-env.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-glossary.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-qlog.7 | 2 +- .../libcrypto/man/man7/openssl-quic-concurrency.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-quic.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-threads.7 | 2 +- .../lib/libcrypto/man/man7/openssl_user_macros.7 | 2 +- .../libcrypto/man/man7/ossl-guide-introduction.7 | 2 +- .../man/man7/ossl-guide-libcrypto-introduction.7 | 2 +- .../man/man7/ossl-guide-libraries-introduction.7 | 2 +- .../man/man7/ossl-guide-libssl-introduction.7 | 2 +- .../lib/libcrypto/man/man7/ossl-guide-migration.7 | 2 +- .../man/man7/ossl-guide-quic-client-block.7 | 2 +- .../man/man7/ossl-guide-quic-client-non-block.7 | 2 +- .../man/man7/ossl-guide-quic-introduction.7 | 2 +- .../man/man7/ossl-guide-quic-multi-stream.7 | 2 +- .../man/man7/ossl-guide-quic-server-block.7 | 2 +- .../man/man7/ossl-guide-quic-server-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-introduction.7 | 2 +- .../man/man7/ossl-guide-tls-server-block.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- .../lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/property.7 | 2 +- .../lib/libcrypto/man/man7/provider-asym_cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-base.7 | 2 +- secure/lib/libcrypto/man/man7/provider-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-decoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-digest.7 | 2 +- secure/lib/libcrypto/man/man7/provider-encoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kem.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keyexch.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-mac.7 | 2 +- secure/lib/libcrypto/man/man7/provider-object.7 | 2 +- secure/lib/libcrypto/man/man7/provider-rand.7 | 2 +- secure/lib/libcrypto/man/man7/provider-signature.7 | 2 +- secure/lib/libcrypto/man/man7/provider-skeymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-storemgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/openssl-asn1parse.1 | 2 +- secure/usr.bin/openssl/man/openssl-ca.1 | 2 +- secure/usr.bin/openssl/man/openssl-ciphers.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmds.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmp.1 | 2 +- secure/usr.bin/openssl/man/openssl-cms.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-dgst.1 | 2 +- secure/usr.bin/openssl/man/openssl-dhparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsaparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-ec.1 | 2 +- secure/usr.bin/openssl/man/openssl-ecparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-enc.1 | 2 +- secure/usr.bin/openssl/man/openssl-engine.1 | 2 +- secure/usr.bin/openssl/man/openssl-errstr.1 | 2 +- secure/usr.bin/openssl/man/openssl-fipsinstall.1 | 2 +- .../usr.bin/openssl/man/openssl-format-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-gendsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-genpkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-genrsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-info.1 | 2 +- secure/usr.bin/openssl/man/openssl-kdf.1 | 2 +- secure/usr.bin/openssl/man/openssl-list.1 | 2 +- secure/usr.bin/openssl/man/openssl-mac.1 | 2 +- .../openssl/man/openssl-namedisplay-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-nseq.1 | 2 +- secure/usr.bin/openssl/man/openssl-ocsp.1 | 2 +- .../openssl/man/openssl-passphrase-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-passwd.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs12.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs8.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-prime.1 | 2 +- secure/usr.bin/openssl/man/openssl-rand.1 | 2 +- secure/usr.bin/openssl/man/openssl-rehash.1 | 2 +- secure/usr.bin/openssl/man/openssl-req.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsautl.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_client.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_server.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_time.1 | 2 +- secure/usr.bin/openssl/man/openssl-sess_id.1 | 2 +- secure/usr.bin/openssl/man/openssl-skeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-smime.1 | 2 +- secure/usr.bin/openssl/man/openssl-speed.1 | 2 +- secure/usr.bin/openssl/man/openssl-spkac.1 | 2 +- secure/usr.bin/openssl/man/openssl-srp.1 | 2 +- secure/usr.bin/openssl/man/openssl-storeutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-ts.1 | 2 +- .../openssl/man/openssl-verification-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-verify.1 | 2 +- secure/usr.bin/openssl/man/openssl-version.1 | 2 +- secure/usr.bin/openssl/man/openssl-x509.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- 903 files changed, 1494 insertions(+), 938 deletions(-) diff --git a/crypto/openssl/configdata.pm b/crypto/openssl/configdata.pm index 8ea23bf8a681..4a2c9307aa86 100755 --- a/crypto/openssl/configdata.pm +++ b/crypto/openssl/configdata.pm @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "1", "ex_libs" => [], - "full_version" => "3.5.3", + "full_version" => "3.5.4", "includes" => [], "ktls" => "", "lflags" => [], @@ -232,7 +232,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "etc", "options" => "enable-ec_nistp_64_gcc_128 enable-ktls enable-sctp --openssldir=etc --prefix=/usr no-acvp-tests no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips no-fips-jitter no-fips-post no-fips-securitychecks no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", - "patch" => "3", + "patch" => "4", "perl_archname" => "amd64-freebsd-thread-multi", "perl_cmd" => "/usr/local/bin/perl", "perl_version" => "5.40.3", @@ -291,11 +291,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "16 Sep 2025", + "release_date" => "30 Sep 2025", "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.5.3" + "version" => "3.5.4" ); our %target = ( "AR" => "ar", @@ -1097,9 +1097,18 @@ our %unified_info = ( "test/buildtest_c_aes" => { "noinst" => "1" }, + "test/buildtest_c_asn1" => { + "noinst" => "1" + }, + "test/buildtest_c_asn1t" => { + "noinst" => "1" + }, "test/buildtest_c_async" => { "noinst" => "1" }, + "test/buildtest_c_bio" => { + "noinst" => "1" + }, "test/buildtest_c_blowfish" => { "noinst" => "1" }, @@ -1121,9 +1130,21 @@ our %unified_info = ( "test/buildtest_c_cmac" => { "noinst" => "1" }, + "test/buildtest_c_cmp" => { + "noinst" => "1" *** 13011 LINES SKIPPED *** From nobody Wed Nov 5 19:37:42 2025 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 4d1wZt6p9Hz652Sx; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZt4Fqgz3t10; Wed, 05 Nov 2025 19:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYKot1G99Eg4EWCK0jsa9ChrgSohVGr+5y/pW5XC8Vs=; b=QSJpBHI0b8gUx9XTXCd7bJwhHwbFwlmM2B6+6E9i8VBNQAIsbkqdcL3/hHFbpRqgu8mLHD /kb6f7aMI4Yjs6qUg1TEE8ypb49UCplrNI0VjppjpzpZyP++Vyd3RO/OMnz7esuBSgKffQ rx87xZb1vSfDSVOSTjsjf572ywJWxEtbj18tA8I78V79gJs5sgzQZ+NOJqp8FZO6LzZQw3 L3Jzk4Xqmqp2vyi+SDDy4lrfzqStV13qRL6ep2u9iDgoS++OCdGC88haERq8TqD/Jw7jbT dSNiYy9WW+xhtSItxZaHRLc5glqRuC/73Hf1rCSLtEHVI+dbd+gH3/46aGeBtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYKot1G99Eg4EWCK0jsa9ChrgSohVGr+5y/pW5XC8Vs=; b=Ow5SEUbf3APUg+CtFWvN47txR0E61p97zYsdBnxSuoebqXi6JMnn1ZCzTGvyPbFZ0MgbAF qQSTIlJ7mY50mFwwkDcN74IQSj4UrhjYmecKwLDn6vPsUpLFtkXQboKBv/JRkKQW+H7KZ2 qIrJoDLMIayDndt2jGDNaIJCejdMduZvRvUjz/ExIm6Xf8mzscJc/KMpYT12COIg+eUdj4 FSaSPphtpIe+dHe2mJE7CuLflAwK3kzRNistCtPxKFmKZzEBUyTSoQoqO37QhdvGt3O5kh Z491RLkHS41Ijs8GAiE/c5KVy3DbwjFJhRGSk9RlgP4+zgBib35ANcyROlw8PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371462; a=rsa-sha256; cv=none; b=X7QE9z24P0CNa86BB3ZRISI9VD6Z9Go6VjLNA2M2ea7U6Nyy6aR1a0b7CnSUlaavcUAU7i 8tb5kyWjB6+5PwKsPtLcTU7aVp0mfsYPKjv4ciHJZxz/YVWKnM5Ahl3pxW+f+qwmN59pwW WUfI1wytzzgnxpYxLh3HPKrCn+JekFF89n1iy/mMUm6Cz/+u5fvrnRx52WvIrOlOWZTnod fN2HGFNotw8qcBSgz9+H97rABT2VCNedu3JmCiSZusDJlHISwDe5GPL+2hEOvKlrQT5Et4 M61JMkdpGm+E4iQCyDASVUsMqeAEkrwKcAb8PiV0cZMze498cR2PJKdLsbxvxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZt3qV8zxSP; Wed, 05 Nov 2025 19:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbgMi086641; Wed, 5 Nov 2025 19:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbgQJ086638; Wed, 5 Nov 2025 19:37:42 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:42 GMT Message-Id: <202511051937.5A5JbgQJ086638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a7c692e02293 - releng/15.0 - openssl: add a simple smoke test for the legacy provider List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: a7c692e02293ca2380f94016465d0043aac80156 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a7c692e02293ca2380f94016465d0043aac80156 commit a7c692e02293ca2380f94016465d0043aac80156 Author: Enji Cooper AuthorDate: 2025-10-11 20:45:20 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:37:03 +0000 openssl: add a simple smoke test for the legacy provider This change adds a simple smoke test for the legacy provider to ensure that the provider doesn't break in the future when performing updates. This is not a functional or system test; the OpenSSL test suite does a much better job at doing this than we can. Approved by: re (cperciva) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53045 (cherry picked from commit 3b6442370a17c57c4c290b9a8e1e8328da820705) (cherry picked from commit 9b3c89ce8b2b6455d50e364708988c832672a042) --- etc/mtree/BSD.tests.dist | 2 ++ secure/lib/libcrypto/Makefile | 3 +++ secure/lib/libcrypto/tests/Makefile | 5 ++++ secure/lib/libcrypto/tests/libcrypto_test.sh | 40 ++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 9ab2f3e972d6..520b41c8b88f 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -520,6 +520,8 @@ .. secure lib + libcrypto + .. .. libexec .. diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 75ebb6e65327..6f9dd62d8610 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -673,6 +673,9 @@ buildasm cleanasm: ${.TARGET:S/build/all/:S/asm$//} .endfor +HAS_TESTS= yes +SUBDIR.${MK_TESTS}= tests + .include .if ${MACHINE} == "powerpc" diff --git a/secure/lib/libcrypto/tests/Makefile b/secure/lib/libcrypto/tests/Makefile new file mode 100644 index 000000000000..d309a1b1100c --- /dev/null +++ b/secure/lib/libcrypto/tests/Makefile @@ -0,0 +1,5 @@ +PACKAGE= tests + +ATF_TESTS_SH+= libcrypto_test + +.include diff --git a/secure/lib/libcrypto/tests/libcrypto_test.sh b/secure/lib/libcrypto/tests/libcrypto_test.sh new file mode 100755 index 000000000000..83ef1686089d --- /dev/null +++ b/secure/lib/libcrypto/tests/libcrypto_test.sh @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Enji Cooper + +atf_test_case legacy_provider +legacy_provider_head() { + atf_set "descr" "daemon should drop privileges" +} +legacy_provider_body() { + local passphrase="test" + local plaintext="test" + + export OPENSSL_CONF="$PWD/openssl.conf" + cat > "$OPENSSL_CONF" < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f7717bbe1350 - releng/15.0 - OpenSSL: install .pc files from the exporters subdir List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f7717bbe1350323289a94aaebe49b2a0d26c5ece Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f7717bbe1350323289a94aaebe49b2a0d26c5ece commit f7717bbe1350323289a94aaebe49b2a0d26c5ece Author: Enji Cooper AuthorDate: 2025-10-11 20:47:20 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:37:11 +0000 OpenSSL: install .pc files from the exporters subdir The .pc files generated in the root directory are used as part of the build; they should never be installed. Use the versions from the exporters subdirectory--which should be installed--as the .pc files which are distributed with FreeBSD. This avoids the need for "fixing up" these files after the fact (see `crypto/openssl/BSDmakefile` for more details as part of this change). Garbage collect `secure/lib/libcrypto/Makefile.version`, et al, as they're orphaned files. They were technically unused prior to this change as the vendor process properly embeds the version numbers in various files, but this commit formalizes the removal. This correction/clarification on the .pc files will be made in an upcoming release of OpenSSL [1]. References: 1. https://github.com/openssl/openssl/issues/28803 Approved by: re (cperciva) Suggested by: Richard Levitte (OpenSSL project) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53043 (cherry picked from commit 97388e7215e080f2cb9fd446f4be4e46a9aeb114) (cherry picked from commit 9b84a17c0adc85f32eb6a284011730f5d645fd2c) --- crypto/openssl/BSDmakefile | 20 -------------------- .../openssl/freebsd/dump_version_from_configdata.pl | 21 --------------------- secure/lib/libcrypto/Makefile.inc | 12 +++--------- secure/lib/libcrypto/Makefile.version | 2 -- 4 files changed, 3 insertions(+), 52 deletions(-) diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile index 514c87ae3a8e..c6b539be0432 100644 --- a/crypto/openssl/BSDmakefile +++ b/crypto/openssl/BSDmakefile @@ -43,32 +43,12 @@ configure: enable-sctp \ --openssldir=etc \ --prefix=/usr) - @echo "Building configdata.pm for later use." - @(cd ${.CURDIR} && \ - ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} configdata.pm) - - @echo "Populating Makefile.version with release information" - @(cd ${LCRYPTO_SRC} && ${SETENVI} ${WRK_ENV} ${PERL} \ - ${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \ - ${SRCTOP}/secure/lib/libcrypto/Makefile.version) all: patch @echo "==> Building generated files (headers, manpages, etc)" @(cd ${.CURDIR} && \ ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} build_all_generated) - # 1. Fix --prefix. - # a. Not sure why --prefix isn't honored properly, even though it's - # passed to Configure; the files might be getting rebuilt - # post-Configure, somehow. - # 2. Remove duplicate path in CFLAGS. - # 3. Remove duplicate path in includedir(s). - @echo "==> Fixing pkgconfig files" - @find . -name \*.pc -print -exec sed -i '' -E \ - -e 's,^prefix=.+,prefix=/usr,' \ - -e 's,[[:space:]]+(\-I)?\$\{prefix\}/\./include[[:space:]]*,,g' \ - {} + - @echo "==> Cleaning / rebuilding ASM" @(cd ${SRCTOP}/secure/lib/libcrypto && \ ${SETENVI} ${WRK_ENV} ${MAKE} cleanasm && \ diff --git a/crypto/openssl/freebsd/dump_version_from_configdata.pl b/crypto/openssl/freebsd/dump_version_from_configdata.pl deleted file mode 100644 index b6137718ba54..000000000000 --- a/crypto/openssl/freebsd/dump_version_from_configdata.pl +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env perl -# -# This dumps out the values needed to generate manpages and other artifacts -# which include the release version/date. -# -# See also: `secure/lib/libcrypto/Makefile.version`. - -use Cwd qw(realpath); -use File::Basename qw(dirname); -use Time::Piece; - -use lib dirname(dirname(realpath($0))); - -use configdata qw(%config); - -$OPENSSL_DATE = Time::Piece->strptime($config{"release_date"}, "%d %b %Y")->strftime("%Y-%m-%d"); - -$OPENSSL_VER = "$config{'major'}.$config{'minor'}.$config{'patch'}"; - -print("OPENSSL_VER=\t${OPENSSL_VER}\n"); -print("OPENSSL_DATE=\t${OPENSSL_DATE}\n"); diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 4d5e9c68a1fe..5b281166df61 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -3,9 +3,6 @@ PACKAGE= openssl LIB_PACKAGE= -# OpenSSL version used for manual page generation -.include "Makefile.version" - LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc @@ -15,10 +12,7 @@ CFLAGS+= -I${LCRYPTO_SRC}/providers/common/include CFLAGS+= -I${LCRYPTO_SRC}/providers/fips/include CFLAGS+= -I${LCRYPTO_SRC}/providers/implementations/include -.include "Makefile.common" +.SUFFIXES: .pc +.PATH.pc: ${LCRYPTO_SRC}/exporters -.for pcfile in ${PCFILES} -${pcfile}: ${pcfile}.in - sed -e 's,@openssl_ver@,${OPENSSL_VER},g' ${.ALLSRC} > ${.TARGET} -.endfor -CLEANFILES+= ${PCFILES} +.include "Makefile.common" diff --git a/secure/lib/libcrypto/Makefile.version b/secure/lib/libcrypto/Makefile.version deleted file mode 100644 index 81636b8adfe8..000000000000 --- a/secure/lib/libcrypto/Makefile.version +++ /dev/null @@ -1,2 +0,0 @@ -OPENSSL_VER= 3.5.4 -OPENSSL_DATE= 2025-09-30 From nobody Wed Nov 5 19:37:43 2025 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 4d1wZw3TQSz652WK; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZw0W8Gz3spq; Wed, 05 Nov 2025 19:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kFpzUa0upJy1fucIn7xfz5EOJgJ/9mmat+tFeVV7sbU=; b=Fu8l1rZFok7SBn5n1wBueEcE2GIxhQ8Gbp0E9sA+y4HsSe1KtFw3BUIxJ3xPqrWHQJZ3Tz MS+K44laSM8B9ZK1s2I5x5Wqwuq+vBVTgCoD11+cnZQhCfeErwss4jc86eLBue9V/FLcN+ U22PocvzwwEWb0dtabsJdZf5CfFhfNUO58/g2j9jZnFqDcr2k35LqME5OtSBS6TPAJJ9iE ieIwhi3B4WIvvcGc+H4IIW+u/VHeA7fcBrHBwW5y4am5W1kFtscToDPAn1x8A5SfUGjZYZ IuPhxfGa21JBAMQ5P7MCvZGd1j3AiOonYJ7Ad2WjUucJwszlF5GgUr4piEYnZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kFpzUa0upJy1fucIn7xfz5EOJgJ/9mmat+tFeVV7sbU=; b=hR47ETOmSAYuCWNQS2m0wHC1r8RYE/+2xrs8EgFkumDnHSYixVq7iuCS9ZyXQ3YNSzmi7v yMofB7ELtj1FjdwqubLbupbeVZ2Ji74t7sh/Kxm3zsLH0sqRsr5QVoQlRE70McIy9ty/UD OK3hDyAcoap3y0OsTdTDD6CIFRjmPoDcoS3j87mqcBNTn29SJXNtEZOvVideQA9s3yxU6Q AbUycrs2Z0mzqJhpnZi6Fe8rQcp0JmsiLmBleET8kjpn0C5hKt7tM0FifQCmn6MZ7NgXHa I3UEYgf0yrIgzcprkBzGChtepul633iXS+lCWMZ+j2nZ1hAszIQdrMJZInb7XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371464; a=rsa-sha256; cv=none; b=w3WX7mRJx5E7IYpd8NUGeHpJRlZtsF4UCBkaU+fNSr5RIw4f8PhIIgymgWI1qu/ga+ZZX/ v1h3NsJ6XuElKk2v0XH9MpOUUSpNqwUboq2DZ1CEMGIxKCl2ox3YW0xmRU/A9fcv7lT8Ov 49D6A04PXZPJUDdDJkhjc9abz40cO3H5brWi9DoA9mnlChpzF4Ey9atQ4liWAeqv953kUy 4KsiqtDpzbDwdZUTzjeHmiNu1+eV5UoML5W0qyhrXnJnXZjZaRbNBLptedZDhNApyArlw5 cVSTgAeVqX9wvGh3hFgOn7MJHLbxzkW5emXnJG+z3Z6v2bK80y/78fymS9O+cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZw062nzwwN; Wed, 05 Nov 2025 19:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbhN4086679; Wed, 5 Nov 2025 19:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbhmI086671; Wed, 5 Nov 2025 19:37:43 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:43 GMT Message-Id: <202511051937.5A5JbhmI086671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1b0202b4b6da - releng/15.0 - crypto/openssl: remove autogenerated files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 1b0202b4b6da9aef97035996d8ec93c411b0532f Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0202b4b6da9aef97035996d8ec93c411b0532f commit 1b0202b4b6da9aef97035996d8ec93c411b0532f Author: Enji Cooper AuthorDate: 2025-10-11 16:48:10 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:37:07 +0000 crypto/openssl: remove autogenerated files These files contain build host paths and other configuration details that can be regenerated via the standard vendor import process. Don't clutter up the FreeBSD tree with these files. Add the paths to .gitignore to prevent them from accidentally being added in a future update. Approved by: re (cperciva) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53044 (cherry picked from commit d271d2ce152435b14e309bd8b25f47a0f4a2040f) (cherry picked from commit 0d5ef734e91e6b03312b54ab3463ed5608ed27fa) --- crypto/.gitignore | 78 + crypto/openssl/configdata.pm | 36871 ----------------------------------------- crypto/openssl/libcrypto.pc | 13 - crypto/openssl/libssl.pc | 11 - crypto/openssl/openssl.pc | 9 - crypto/openssl/util/wrap.pl | 133 - 6 files changed, 78 insertions(+), 37037 deletions(-) diff --git a/crypto/.gitignore b/crypto/.gitignore new file mode 100644 index 000000000000..4c6e1f0fe03f --- /dev/null +++ b/crypto/.gitignore @@ -0,0 +1,78 @@ +# OpenSSL: the following are generated paths that generally should not be committed to FreeBSD. +openssl/apps/tsget.pl +openssl/crypto/buildinf.h +openssl/doc/html +openssl/doc/man +openssl/test/buildtest_*.c +openssl/util/wrap.pl +openssl/**/*.cmake +openssl/**/*.ld +openssl/**/*.s +openssl/*.pc +openssl/Makefile +openssl/Makefile.in +openssl/builddata.pm +openssl/configdata.pm +openssl/installdata.pm +openssl/pod2htmd.tmp + +# .pod files generated from .pod.in files. +# +# List can be easily updated via this command: +# +# % find openssl/doc -name \*.pod.in | sed -e 's,\.in,,g' +openssl/doc/man1/openssl-asn1parse.pod +openssl/doc/man1/openssl-ca.pod +openssl/doc/man1/openssl-ciphers.pod +openssl/doc/man1/openssl-cmds.pod +openssl/doc/man1/openssl-cmp.pod +openssl/doc/man1/openssl-cms.pod +openssl/doc/man1/openssl-crl.pod +openssl/doc/man1/openssl-crl2pkcs7.pod +openssl/doc/man1/openssl-dgst.pod +openssl/doc/man1/openssl-dhparam.pod +openssl/doc/man1/openssl-dsa.pod +openssl/doc/man1/openssl-dsaparam.pod +openssl/doc/man1/openssl-ec.pod +openssl/doc/man1/openssl-ecparam.pod +openssl/doc/man1/openssl-enc.pod +openssl/doc/man1/openssl-engine.pod +openssl/doc/man1/openssl-errstr.pod +openssl/doc/man1/openssl-fipsinstall.pod +openssl/doc/man1/openssl-gendsa.pod +openssl/doc/man1/openssl-genpkey.pod +openssl/doc/man1/openssl-genrsa.pod +openssl/doc/man1/openssl-info.pod +openssl/doc/man1/openssl-kdf.pod +openssl/doc/man1/openssl-list.pod +openssl/doc/man1/openssl-mac.pod +openssl/doc/man1/openssl-nseq.pod +openssl/doc/man1/openssl-ocsp.pod +openssl/doc/man1/openssl-passwd.pod +openssl/doc/man1/openssl-pkcs12.pod +openssl/doc/man1/openssl-pkcs7.pod +openssl/doc/man1/openssl-pkcs8.pod +openssl/doc/man1/openssl-pkey.pod +openssl/doc/man1/openssl-pkeyparam.pod +openssl/doc/man1/openssl-pkeyutl.pod +openssl/doc/man1/openssl-prime.pod +openssl/doc/man1/openssl-rand.pod +openssl/doc/man1/openssl-rehash.pod +openssl/doc/man1/openssl-req.pod +openssl/doc/man1/openssl-rsa.pod +openssl/doc/man1/openssl-rsautl.pod +openssl/doc/man1/openssl-s_client.pod +openssl/doc/man1/openssl-s_server.pod +openssl/doc/man1/openssl-s_time.pod +openssl/doc/man1/openssl-sess_id.pod +openssl/doc/man1/openssl-skeyutl.pod +openssl/doc/man1/openssl-smime.pod +openssl/doc/man1/openssl-speed.pod +openssl/doc/man1/openssl-spkac.pod +openssl/doc/man1/openssl-srp.pod +openssl/doc/man1/openssl-storeutl.pod +openssl/doc/man1/openssl-ts.pod +openssl/doc/man1/openssl-verify.pod +openssl/doc/man1/openssl-version.pod +openssl/doc/man1/openssl-x509.pod +openssl/doc/man7/openssl_user_macros.pod diff --git a/crypto/openssl/configdata.pm b/crypto/openssl/configdata.pm deleted file mode 100755 index 4a2c9307aa86..000000000000 --- a/crypto/openssl/configdata.pm +++ /dev/null @@ -1,36871 +0,0 @@ -#! /usr/bin/env perl -# -*- mode: perl -*- - -package configdata; - -use strict; -use warnings; - -use Exporter; -our @ISA = qw(Exporter); -our @EXPORT = qw( - %config %target %disabled %withargs %unified_info - @disablables @disablables_int -); - -our %config = ( - "AR" => "ar", - "ARFLAGS" => [ - "qc" - ], - "ASFLAGS" => [], - "CC" => "cc", - "CFLAGS" => [ - "-Wall -O3" - ], - "CPPDEFINES" => [], - "CPPFLAGS" => [], - "CPPINCLUDES" => [], - "CXXFLAGS" => [], - "FIPSKEY" => "f4556650ac31d35461610bac4ed81b1a181b2d8a43ea2854cbae22ca74560813", - "FIPS_VENDOR" => "OpenSSL non-compliant FIPS Provider", - "HASHBANGPERL" => "/usr/bin/env perl", - "LD" => "ld", - "LDFLAGS" => [], - "LDLIBS" => [], - "OBJCOPY" => "objcopy", - "PERL" => "/usr/local/bin/perl", - "RANLIB" => "ranlib", - "RC" => "windres", - "RCFLAGS" => [], - "afalgeng" => "", - "api" => "30500", - "b32" => "0", - "b64" => "0", - "b64l" => "1", - "bn_ll" => "0", - "build_file" => "Makefile", - "build_file_templates" => [ - "Configurations/common0.tmpl", - "Configurations/unix-Makefile.tmpl" - ], - "build_infos" => [ - "./build.info", - "crypto/build.info", - "ssl/build.info", - "apps/build.info", - "util/build.info", - "tools/build.info", - "fuzz/build.info", - "providers/build.info", - "doc/build.info", - "test/build.info", - "engines/build.info", - "exporters/build.info", - "crypto/objects/build.info", - "crypto/buffer/build.info", - "crypto/bio/build.info", - "crypto/stack/build.info", - "crypto/lhash/build.info", - "crypto/hashtable/build.info", - "crypto/rand/build.info", - "crypto/evp/build.info", - "crypto/asn1/build.info", - "crypto/pem/build.info", - "crypto/x509/build.info", - "crypto/conf/build.info", - "crypto/txt_db/build.info", - "crypto/pkcs7/build.info", - "crypto/pkcs12/build.info", - "crypto/ui/build.info", - "crypto/kdf/build.info", - "crypto/store/build.info", - "crypto/property/build.info", - "crypto/md4/build.info", - "crypto/md5/build.info", - "crypto/sha/build.info", - "crypto/ml_kem/build.info", - "crypto/hmac/build.info", - "crypto/ripemd/build.info", - "crypto/whrlpool/build.info", - "crypto/poly1305/build.info", - "crypto/siphash/build.info", - "crypto/des/build.info", - "crypto/aes/build.info", - "crypto/rc2/build.info", - "crypto/rc4/build.info", - "crypto/bf/build.info", - "crypto/cast/build.info", - "crypto/camellia/build.info", - "crypto/seed/build.info", - "crypto/chacha/build.info", - "crypto/modes/build.info", - "crypto/bn/build.info", - "crypto/ec/build.info", - "crypto/rsa/build.info", - "crypto/dsa/build.info", - "crypto/dh/build.info", - "crypto/dso/build.info", - "crypto/engine/build.info", - "crypto/err/build.info", - "crypto/comp/build.info", - "crypto/http/build.info", - "crypto/ocsp/build.info", - "crypto/cms/build.info", - "crypto/ts/build.info", - "crypto/srp/build.info", - "crypto/cmac/build.info", - "crypto/ct/build.info", - "crypto/async/build.info", - "crypto/ess/build.info", - "crypto/crmf/build.info", - "crypto/cmp/build.info", - "crypto/encode_decode/build.info", - "crypto/ffc/build.info", - "crypto/hpke/build.info", - "crypto/thread/build.info", - "crypto/ml_dsa/build.info", - "crypto/slh_dsa/build.info", - "ssl/record/build.info", - "ssl/rio/build.info", - "ssl/quic/build.info", - "apps/lib/build.info", - "providers/common/build.info", - "providers/implementations/build.info", - "doc/man1/build.info", - "ssl/record/methods/build.info", - "providers/common/der/build.info", - "providers/implementations/digests/build.info", - "providers/implementations/ciphers/build.info", - "providers/implementations/rands/build.info", - "providers/implementations/macs/build.info", - "providers/implementations/kdfs/build.info", - "providers/implementations/exchange/build.info", - "providers/implementations/keymgmt/build.info", - "providers/implementations/signature/build.info", - "providers/implementations/asymciphers/build.info", - "providers/implementations/encode_decode/build.info", - "providers/implementations/storemgmt/build.info", - "providers/implementations/kem/build.info", - "providers/implementations/skeymgmt/build.info", - "providers/implementations/rands/seeding/build.info" - ], - "build_metadata" => "", - "build_type" => "release", - "builddir" => ".", - "cflags" => [ - "-Wa,--noexecstack", - "-Qunused-arguments" - ], - "conf_files" => [ - "Configurations/00-base-templates.conf", - "Configurations/10-main.conf" - ], - "cppflags" => [], - "cxxflags" => [], - "defines" => [ - "NDEBUG" - ], - "dynamic_engines" => "1", - "ex_libs" => [], - "full_version" => "3.5.4", - "includes" => [], - "ktls" => "", - "lflags" => [], - "lib_defines" => [ - "OPENSSL_PIC" - ], - "libdir" => "", - "major" => "3", - "makedep_scheme" => "gcc", - "minor" => "5", - "openssl_api_defines" => [ - "OPENSSL_CONFIGURED_API=30500" - ], - "openssl_feature_defines" => [ - "OPENSSL_RAND_SEED_OS", - "OPENSSL_THREADS", - "OPENSSL_NO_ACVP_TESTS", - "OPENSSL_NO_AFALGENG", - "OPENSSL_NO_ARIA", - "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", - "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_CRYPTO_MDEBUG", - "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", - "OPENSSL_NO_DEMOS", - "OPENSSL_NO_EGD", - "OPENSSL_NO_EXTERNAL_TESTS", - "OPENSSL_NO_FIPS_JITTER", - "OPENSSL_NO_FIPS_POST", - "OPENSSL_NO_FIPS_SECURITYCHECKS", - "OPENSSL_NO_FUZZ_AFL", - "OPENSSL_NO_FUZZ_LIBFUZZER", - "OPENSSL_NO_H3DEMO", - "OPENSSL_NO_HQINTEROP", - "OPENSSL_NO_IDEA", - "OPENSSL_NO_JITTER", - "OPENSSL_NO_MD2", - "OPENSSL_NO_MDC2", - "OPENSSL_NO_MSAN", - "OPENSSL_NO_PIE", - "OPENSSL_NO_RC5", - "OPENSSL_NO_SM2", - "OPENSSL_NO_SM3", - "OPENSSL_NO_SM4", - "OPENSSL_NO_SSL3", - "OPENSSL_NO_SSL3_METHOD", - "OPENSSL_NO_SSLKEYLOG", - "OPENSSL_NO_TFO", - "OPENSSL_NO_TRACE", - "OPENSSL_NO_UBSAN", - "OPENSSL_NO_UNIT_TEST", - "OPENSSL_NO_UPLINK", - "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", - "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", - "OPENSSL_NO_ZSTD_DYNAMIC", - "OPENSSL_NO_STATIC_ENGINE" - ], - "openssl_sys_defines" => [], - "openssldir" => "etc", - "options" => "enable-ec_nistp_64_gcc_128 enable-ktls enable-sctp --openssldir=etc --prefix=/usr no-acvp-tests no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips no-fips-jitter no-fips-post no-fips-securitychecks no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", - "patch" => "4", - "perl_archname" => "amd64-freebsd-thread-multi", - "perl_cmd" => "/usr/local/bin/perl", - "perl_version" => "5.40.3", - "perlargv" => [ - "disable-aria", - "disable-egd", - "disable-idea", - "disable-mdc2", - "disable-sm2", - "disable-sm3", - "disable-sm4", - "enable-ec_nistp_64_gcc_128", - "enable-ktls", - "enable-sctp", - "--openssldir=etc", - "--prefix=/usr" - ], - "perlenv" => { - "AR" => undef, - "ARFLAGS" => undef, - "AS" => undef, - "ASFLAGS" => undef, - "BUILDFILE" => undef, - "CC" => "cc", - "CFLAGS" => undef, - "CPP" => undef, - "CPPDEFINES" => undef, - "CPPFLAGS" => undef, - "CPPINCLUDES" => undef, - "CROSS_COMPILE" => undef, - "CXX" => undef, - "CXXFLAGS" => undef, - "HASHBANGPERL" => undef, - "LD" => "ld", - "LDFLAGS" => undef, - "LDLIBS" => undef, - "MT" => undef, - "MTFLAGS" => undef, - "OBJCOPY" => undef, - "OPENSSL_LOCAL_CONFIG_DIR" => undef, - "PERL" => undef, - "RANLIB" => undef, - "RC" => undef, - "RCFLAGS" => undef, - "RM" => undef, - "WINDRES" => undef, - "__CNF_CFLAGS" => undef, - "__CNF_CPPDEFINES" => undef, - "__CNF_CPPFLAGS" => undef, - "__CNF_CPPINCLUDES" => undef, - "__CNF_CXXFLAGS" => undef, - "__CNF_LDFLAGS" => undef, - "__CNF_LDLIBS" => undef - }, - "prefix" => "/usr", - "prerelease" => "", - "processor" => "", - "rc4_int" => "unsigned int", - "release_date" => "30 Sep 2025", - "shlib_version" => "3", - "sourcedir" => ".", - "target" => "BSD-x86_64", - "version" => "3.5.4" -); -our %target = ( - "AR" => "ar", - "ARFLAGS" => "qc", - "CC" => "cc", - "CFLAGS" => "-Wall -O3", - "HASHBANGPERL" => "/usr/bin/env perl", - "OBJCOPY" => "objcopy", - "RANLIB" => "ranlib", - "RC" => "windres", - "_conf_fname_int" => [ - "Configurations/00-base-templates.conf", - "Configurations/00-base-templates.conf", - "Configurations/10-main.conf", - "Configurations/10-main.conf", - "Configurations/10-main.conf", - "Configurations/shared-info.pl" - ], - "asm_arch" => "x86_64", - "bin_cflags" => "", - "bin_lflags" => "", - "bn_ops" => "SIXTY_FOUR_BIT_LONG", - "build_file" => "Makefile", - "build_scheme" => [ - "unified", - "unix" - ], - "cflags" => "-pthread", - "cppflags" => "-D_THREAD_SAFE -D_REENTRANT", - "defines" => [ - "OPENSSL_BUILDING_OPENSSL" - ], - "disable" => [], - "dso_ldflags" => "-Wl,-z,defs", - "dso_scheme" => "dlfcn", - "enable" => [ - "devcryptoeng" - ], - "ex_libs" => "-pthread", - "includes" => [], - "lflags" => "", - "lib_cflags" => "", - "lib_cppflags" => "-DL_ENDIAN", - "lib_defines" => [], - "module_cflags" => "-fPIC", - "module_cxxflags" => undef, - "module_ldflags" => "-shared -Wl,-Bsymbolic", - "perl_platform" => "Unix", - "perlasm_scheme" => "elf", - "shared_cflag" => "-fPIC", - "shared_defflag" => "-Wl,--version-script=", - "shared_defines" => [], - "shared_ldflag" => "-shared -Wl,-Bsymbolic", - "shared_rcflag" => "", - "shared_sonameflag" => "-Wl,-soname=", - "shared_target" => "bsd-gcc-shared", - "template" => "1", - "thread_defines" => [], - "thread_scheme" => "pthreads", - "unistd" => "" -); -our @disablables = ( - "acvp-tests", - "afalgeng", - "apps", - "argon2", - "aria", - "asan", - "asm", - "async", - "atexit", - "autoalginit", - "autoerrinit", - "autoload-config", - "bf", - "blake2", - "brotli", - "brotli-dynamic", - "buildtest-c++", - "bulk", - "cached-fetch", - "camellia", - "capieng", - "winstore", - "cast", - "chacha", - "cmac", - "cmp", - "cms", - "comp", - "crypto-mdebug", - "ct", - "default-thread-pool", - "demos", - "h3demo", - "hqinterop", - "deprecated", - "des", - "devcryptoeng", - "dgram", - "dh", - "docs", - "dsa", - "dso", - "dtls", - "dynamic-engine", - "ec", - "ec2m", - "ec_nistp_64_gcc_128", - "ecdh", - "ecdsa", - "ecx", - "egd", - "engine", - "err", - "external-tests", - "filenames", - "fips", - "fips-securitychecks", - "fips-post", - "fips-jitter", - "fuzz-afl", - "fuzz-libfuzzer", - "gost", - "http", - "idea", - "integrity-only-ciphers", - "jitter", - "ktls", - "legacy", - "loadereng", - "makedepend", - "md2", - "md4", - "mdc2", - "ml-dsa", - "ml-kem", - "module", - "msan", - "multiblock", - "nextprotoneg", - "ocb", - "ocsp", - "padlockeng", - "pic", - "pie", - "pinshared", - "poly1305", - "posix-io", - "psk", - "quic", - "unstable-qlog", - "rc2", - "rc4", - "rc5", - "rdrand", - "rfc3779", - "rmd160", - "scrypt", - "sctp", - "secure-memory", - "seed", - "shared", - "siphash", - "siv", - "slh-dsa", - "sm2", - "sm2-precomp", - "sm3", - "sm4", - "sock", - "srp", - "srtp", - "sse2", - "ssl", - "ssl-trace", - "static-engine", - "stdio", - "sslkeylog", - "tests", - "tfo", - "thread-pool", - "threads", - "tls", - "tls-deprecated-ec", - "trace", - "ts", - "ubsan", - "ui-console", - "unit-test", - "uplink", - "weak-ssl-ciphers", - "whirlpool", - "zlib", - "zlib-dynamic", - "zstd", - "zstd-dynamic", - "ssl3", - "ssl3-method", - "tls1", - "tls1-method", - "tls1_1", - "tls1_1-method", - "tls1_2", - "tls1_2-method", - "tls1_3", - "dtls1", - "dtls1-method", - "dtls1_2", - "dtls1_2-method" -); -our @disablables_int = ( - "crmf" -); -our %disabled = ( - "acvp-tests" => "cascade", - "afalgeng" => "not-linux", - "aria" => "option", - "asan" => "default", - "brotli" => "default", - "brotli-dynamic" => "default", - "buildtest-c++" => "default", - "crypto-mdebug" => "default", - "crypto-mdebug-backtrace" => "default", - "demos" => "default", - "egd" => "option", - "external-tests" => "default", - "fips" => "default", - "fips-jitter" => "default", - "fips-post" => "cascade", - "fips-securitychecks" => "cascade", - "fuzz-afl" => "default", - "fuzz-libfuzzer" => "default", - "h3demo" => "default", - "hqinterop" => "default", - "idea" => "option", - "jitter" => "default", - "md2" => "default", - "mdc2" => "option", - "msan" => "default", - "pie" => "default", - "rc5" => "default", - "sm2" => "option", - "sm3" => "option", - "sm4" => "option", - "ssl3" => "default", - "ssl3-method" => "default", - "sslkeylog" => "default", - "tfo" => "default", - "trace" => "default", - "ubsan" => "default", - "unit-test" => "default", - "uplink" => "no uplink_arch", - "weak-ssl-ciphers" => "default", - "winstore" => "not-windows", - "zlib" => "default", - "zlib-dynamic" => "default", - "zstd" => "default", - "zstd-dynamic" => "default" -); -our %withargs = (); -our %unified_info = ( - "attributes" => { - "depends" => { - "doc/man1/openssl-asn1parse.pod" => { - "doc/man1/openssl-asn1parse.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ca.pod" => { - "doc/man1/openssl-ca.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ciphers.pod" => { - "doc/man1/openssl-ciphers.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-cmds.pod" => { - "doc/man1/openssl-cmds.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-cmp.pod" => { - "doc/man1/openssl-cmp.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-cms.pod" => { - "doc/man1/openssl-cms.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-crl.pod" => { - "doc/man1/openssl-crl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-crl2pkcs7.pod" => { - "doc/man1/openssl-crl2pkcs7.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-dgst.pod" => { - "doc/man1/openssl-dgst.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-dhparam.pod" => { - "doc/man1/openssl-dhparam.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-dsa.pod" => { - "doc/man1/openssl-dsa.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-dsaparam.pod" => { - "doc/man1/openssl-dsaparam.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ec.pod" => { - "doc/man1/openssl-ec.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ecparam.pod" => { - "doc/man1/openssl-ecparam.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-enc.pod" => { - "doc/man1/openssl-enc.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-engine.pod" => { - "doc/man1/openssl-engine.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-errstr.pod" => { - "doc/man1/openssl-errstr.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-fipsinstall.pod" => { - "doc/man1/openssl-fipsinstall.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-gendsa.pod" => { - "doc/man1/openssl-gendsa.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-genpkey.pod" => { - "doc/man1/openssl-genpkey.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-genrsa.pod" => { - "doc/man1/openssl-genrsa.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-info.pod" => { - "doc/man1/openssl-info.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-kdf.pod" => { - "doc/man1/openssl-kdf.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-list.pod" => { - "doc/man1/openssl-list.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-mac.pod" => { - "doc/man1/openssl-mac.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-nseq.pod" => { - "doc/man1/openssl-nseq.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ocsp.pod" => { - "doc/man1/openssl-ocsp.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-passwd.pod" => { - "doc/man1/openssl-passwd.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkcs12.pod" => { - "doc/man1/openssl-pkcs12.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkcs7.pod" => { - "doc/man1/openssl-pkcs7.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkcs8.pod" => { - "doc/man1/openssl-pkcs8.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkey.pod" => { - "doc/man1/openssl-pkey.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkeyparam.pod" => { - "doc/man1/openssl-pkeyparam.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-pkeyutl.pod" => { - "doc/man1/openssl-pkeyutl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-prime.pod" => { - "doc/man1/openssl-prime.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-rand.pod" => { - "doc/man1/openssl-rand.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-rehash.pod" => { - "doc/man1/openssl-rehash.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-req.pod" => { - "doc/man1/openssl-req.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-rsa.pod" => { - "doc/man1/openssl-rsa.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-rsautl.pod" => { - "doc/man1/openssl-rsautl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-s_client.pod" => { - "doc/man1/openssl-s_client.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-s_server.pod" => { - "doc/man1/openssl-s_server.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-s_time.pod" => { - "doc/man1/openssl-s_time.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-sess_id.pod" => { - "doc/man1/openssl-sess_id.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-skeyutl.pod" => { - "doc/man1/openssl-skeyutl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-smime.pod" => { - "doc/man1/openssl-smime.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-speed.pod" => { - "doc/man1/openssl-speed.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-spkac.pod" => { - "doc/man1/openssl-spkac.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-srp.pod" => { - "doc/man1/openssl-srp.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-storeutl.pod" => { - "doc/man1/openssl-storeutl.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-ts.pod" => { - "doc/man1/openssl-ts.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-verify.pod" => { - "doc/man1/openssl-verify.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-version.pod" => { - "doc/man1/openssl-version.pod.in" => { - "pod" => "1" - } - }, - "doc/man1/openssl-x509.pod" => { - "doc/man1/openssl-x509.pod.in" => { - "pod" => "1" - } - }, - "doc/man7/openssl_user_macros.pod" => { - "doc/man7/openssl_user_macros.pod.in" => { - "pod" => "1" - } - }, - "providers/libcommon.a" => { - "libcrypto" => { - "weak" => "1" - } - } - }, - "generate" => { - "exporters/OpenSSLConfig.cmake" => { - "exporter" => "cmake" - }, - "exporters/OpenSSLConfigVersion.cmake" => { - "exporter" => "cmake" - }, - "exporters/libcrypto.pc" => { - "exporter" => "pkg-config" - }, - "exporters/libssl.pc" => { - "exporter" => "pkg-config" - }, - "exporters/openssl.pc" => { - "exporter" => "pkg-config" - }, - "include/openssl/configuration.h" => { - "skip" => "1" - } *** 36199 LINES SKIPPED *** From nobody Wed Nov 5 19:56:23 2025 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 4d1x0R4PG1z653sP; Wed, 05 Nov 2025 19:56: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1x0R3l1Kz428L; Wed, 05 Nov 2025 19:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762372583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bgLvleotC0XvVOFVCu+DcpTyMjYiSEjn2aB+ww2KwU=; b=vysEeyGM7iC9/iPFUF0o7ftLcTDy8ARtDwctahyHdxJao9afsB3UdKFTq0Dhmsy3bpVFHO 9DHP+gocGuhFsfD7DqSA++Pgz20m5vbt+pD94AE9A0GT+XxheZ6A52tnbGqLGzwx/x/EF0 QFMHDxdvQXXwVzzp0DI7ffmipDMgPm5pxb2rAzB8G1Ygkgnt9w5VrlkE5UbVeK9n1m39Kn yzQJJRd6yusrbzMS+GURstHKI9fkZIe8VoOI6Q4EXnOCYwF5eprvX/InnrTXi+VLjIT51v CMhH3njNhXZokVI0OG8PqXrrHPJ82Wd4Cl4MNskERsdAwqeux7+eNumMbmGxKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762372583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bgLvleotC0XvVOFVCu+DcpTyMjYiSEjn2aB+ww2KwU=; b=GW5vfVd2bd1hm30FMoNBLM1rubnZi3sI317NTdh6pRm5TN70hNmp+A2V5CfPh9CApaJ+Bj 35Hr7ZiuFfgDXuS8wrOuJVoCt4fqN0ujeR692CdLbXCHBTtTpMPrDMRbFEBjdKYudCxaPk rlh4hVHX4L1/FrPR+WSesMKTtRjxn3Nm8R0sIV42lGhqyyoIepq1Pi6QGvbB3rMNFdqpL+ G0sG2URtdghyjfLSZEbmcHY1qEkPCHvbv09tXwiOIO23Ia7ZrqJzxi/gCoaf/FMLrTd0/h Ww5/i3wsVP6m9U+2QikBXI9tDtpsdNDiEx3ZvfjdYywk3BhoQJO6j83YqlXfRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762372583; a=rsa-sha256; cv=none; b=ix9sxe9EF9jU9DkvJJ2L3gkOOcW79u88t1XxVWvDYn/XbcJNdbtsRQPkNZWPkCfwgRjFM8 NKDc7NDRkwuynUwd5af7ZLqEUhIw3dk48CJr/Zth4beiCBkzoUqGa1W2RxyAbX/XW9kVix dmbEyrM2yh4BjwRQuDsxRxnh8WvhGXf6xCu0Bw9oNbJpdHwwdKQZ1zeIoLNQGEEmx6UydW t9aMN8B4CVDM6LVGmlquuMIAbKOrxvMy1rXPWr2IdFZjLGM+H1Gs3ac8cd8C7+ir9Tw+KX ypvzKLQx9ZOi5BP2spjDS2y6xKuR57DVa89TBunHvFZ/1noj3gGnGUWe/aR6aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1x0R3JtYzy59; Wed, 05 Nov 2025 19:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JuNtJ023456; Wed, 5 Nov 2025 19:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JuNIn023453; Wed, 5 Nov 2025 19:56:23 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:56:23 GMT Message-Id: <202511051956.5A5JuNIn023453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 222ea8bff5db - stable/15 - mksnap_ffs: fix running unded chroot List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 222ea8bff5db75711c7459f4b794b0a40e11a463 Auto-Submitted: auto-generated The branch stable/15 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=222ea8bff5db75711c7459f4b794b0a40e11a463 commit 222ea8bff5db75711c7459f4b794b0a40e11a463 Author: Maxim Sobolev AuthorDate: 2025-09-23 16:24:44 +0000 Commit: Maxim Sobolev CommitDate: 2025-11-05 19:56:13 +0000 mksnap_ffs: fix running unded chroot Fix "run-under-chroot" workaround by replacing strlcpy(2) with memmove(2) since strings overlap. Reviewed by: arrowd Differential Revision: https://reviews.freebsd.org/D52670 (cherry picked from commit 60be0d71daab4247dc61c323777b0c593eb76975) --- sbin/mksnap_ffs/mksnap_ffs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mksnap_ffs/mksnap_ffs.c b/sbin/mksnap_ffs/mksnap_ffs.c index 0d8e32a15ab3..58939cc69029 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.c +++ b/sbin/mksnap_ffs/mksnap_ffs.c @@ -150,7 +150,7 @@ main(int argc, char **argv) errx(1, "%s: Not a mount point", stfsbuf.f_mntonname); } if (cp != stfsbuf.f_mntonname) - strlcpy(stfsbuf.f_mntonname, cp, sizeof(stfsbuf.f_mntonname)); + memmove(stfsbuf.f_mntonname, cp, strlen(cp) + 1); /* * Having verified access to the directory in which the From nobody Wed Nov 5 20:16:49 2025 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 4d1xS224T9z655V6; Wed, 05 Nov 2025 20:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1xS20VCFz44GC; Wed, 05 Nov 2025 20:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762373810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xF3BDKVRv7e0Eg3OKy9raolLOL94lx0FTRQLKp9w/08=; b=flO/b5O1GvZJK4oKuIgV5ehMpA1jDaYVMjaPCgalz/C/T6G3IIDm+TIwR10JWBNqqxdzkP zbd0I8118iYX83/gSaPmEmhf6Z9FLISGyVs3N1WeHcMwdKIV5LdeX1Ecugzpv1CT8hYHc8 XjQhVYCMtnorFtiIb/F1VJc9hTYfGwjjg6OOqmnu8YtSBq8izuSF/mycQgppv1+NCn5UnW +wWrJePcwzxyfhImOVbR0NGA+cYqZnqoWyahOcHYAqIj0mJNFxdGcggOjie9/9DlJH9Vby g1MdqlW2Xqjf6RvtYIQGQTfIBPG6cmiVHyXxWAPitBlj93VvzLsSihcSutbvSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762373810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xF3BDKVRv7e0Eg3OKy9raolLOL94lx0FTRQLKp9w/08=; b=MZ3mXbh8s2wz1cAQdLN5UZ9/KRg3t7+6dLuoA8K/f+5QdUM5GdmdNdMnUzMRtVt0X690GZ eF2U7KOYek+KTYPZvSnQWOZA9rkYyPVuGa81ysGT/zmD6SjOzJX8KqkJL8GvxbSxmM58du ipF2Fl8YTdmDVUoshRtiMe5ZLqHqLF5uIZMAh+YemZRJIW9uB2C6bp7YkugAYcp8XAxjN3 YWRWisYuusHEg+MD9O+/ovh27kpF4xvnIQ9Kx7+esu4QhYrJA0zvmb9oXsvVrJqGLrZaBb VawXUAe/EfAgBWaz+XEm0Ib03KP2GyOL3ZhBXdCbhLZYOjPl97r5wOHf1LnyWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762373810; a=rsa-sha256; cv=none; b=HR7iHkuXgD8rHAH4Lq3TvtH5ftTiiTNcU35GliMQ8I7LW9uaJ1U5ZNht9tH7/C8CF0nKcH FV+aoojEGNG/5RrXsQc+XQXQk+AHpFvalxlt600FSJ5m/yk3ZcOtPJ3UfjwjJbZmMi3dww HI0HAaRoW1NA1MuqPLSonITDJH/XmUZ/EheLl0UZMRyNPpk6a7POCct/hDP57MB76LBoVj XVOJtV9Oeks0yiqiWwfPwwUTq60Dm53Fm5/7+tZd1BHu8H5w92t+mrnOcsNCIesT7coXuE Xrfh18OIazitRoe54COMx9b7atgLMkkEMjQQODABeeMObs27aMohTSUcrVnhkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1xS16vz4zy3g; Wed, 05 Nov 2025 20:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5KGn2u062039; Wed, 5 Nov 2025 20:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5KGnTa062036; Wed, 5 Nov 2025 20:16:49 GMT (envelope-from git) Date: Wed, 5 Nov 2025 20:16:49 GMT Message-Id: <202511052016.5A5KGnTa062036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0b5e4af65d0d - stable/15 - riscv: Treat pointer register as an input in fpe_store List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0b5e4af65d0d3dfaa318b8e6adaaa4297f94af17 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0b5e4af65d0d3dfaa318b8e6adaaa4297f94af17 commit 0b5e4af65d0d3dfaa318b8e6adaaa4297f94af17 Author: John Baldwin AuthorDate: 2025-10-30 19:52:51 +0000 Commit: Colin Percival CommitDate: 2025-11-05 20:16:08 +0000 riscv: Treat pointer register as an input in fpe_store The contents of the memory is an output, but the pointer to that memory is an input. This was correct in the original version of D45697, but when adding appropriate clobbers, the pointer operand was incorrectly switched to an output rather than left an input for fpe_store. Reviewed by: jrtc27 Obtained from: CheriBSD Fixes: 44d4ee7f3dad ("riscv: add FPE code.") MFC after: 1 day Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D53441 (cherry picked from commit 91f66f9b377e09f59f481e653d8f64120a183806) --- sys/riscv/riscv/fpe.c | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/sys/riscv/riscv/fpe.c b/sys/riscv/riscv/fpe.c index b6c66e5e4f09..63103a794a8e 100644 --- a/sys/riscv/riscv/fpe.c +++ b/sys/riscv/riscv/fpe.c @@ -69,39 +69,39 @@ fpe_store(struct fpreg *regs) __asm __volatile( "frcsr %0 \n" - "fsd f0, (16 * 0)(%1)\n" - "fsd f1, (16 * 1)(%1)\n" - "fsd f2, (16 * 2)(%1)\n" - "fsd f3, (16 * 3)(%1)\n" - "fsd f4, (16 * 4)(%1)\n" - "fsd f5, (16 * 5)(%1)\n" - "fsd f6, (16 * 6)(%1)\n" - "fsd f7, (16 * 7)(%1)\n" - "fsd f8, (16 * 8)(%1)\n" - "fsd f9, (16 * 9)(%1)\n" - "fsd f10, (16 * 10)(%1)\n" - "fsd f11, (16 * 11)(%1)\n" - "fsd f12, (16 * 12)(%1)\n" - "fsd f13, (16 * 13)(%1)\n" - "fsd f14, (16 * 14)(%1)\n" - "fsd f15, (16 * 15)(%1)\n" - "fsd f16, (16 * 16)(%1)\n" - "fsd f17, (16 * 17)(%1)\n" - "fsd f18, (16 * 18)(%1)\n" - "fsd f19, (16 * 19)(%1)\n" - "fsd f20, (16 * 20)(%1)\n" - "fsd f21, (16 * 21)(%1)\n" - "fsd f22, (16 * 22)(%1)\n" - "fsd f23, (16 * 23)(%1)\n" - "fsd f24, (16 * 24)(%1)\n" - "fsd f25, (16 * 25)(%1)\n" - "fsd f26, (16 * 26)(%1)\n" - "fsd f27, (16 * 27)(%1)\n" - "fsd f28, (16 * 28)(%1)\n" - "fsd f29, (16 * 29)(%1)\n" - "fsd f30, (16 * 30)(%1)\n" - "fsd f31, (16 * 31)(%1)\n" - : "=&r"(fcsr), "=r"(fp_x), "=m"(*fp_x)); + "fsd f0, (16 * 0)(%2)\n" + "fsd f1, (16 * 1)(%2)\n" + "fsd f2, (16 * 2)(%2)\n" + "fsd f3, (16 * 3)(%2)\n" + "fsd f4, (16 * 4)(%2)\n" + "fsd f5, (16 * 5)(%2)\n" + "fsd f6, (16 * 6)(%2)\n" + "fsd f7, (16 * 7)(%2)\n" + "fsd f8, (16 * 8)(%2)\n" + "fsd f9, (16 * 9)(%2)\n" + "fsd f10, (16 * 10)(%2)\n" + "fsd f11, (16 * 11)(%2)\n" + "fsd f12, (16 * 12)(%2)\n" + "fsd f13, (16 * 13)(%2)\n" + "fsd f14, (16 * 14)(%2)\n" + "fsd f15, (16 * 15)(%2)\n" + "fsd f16, (16 * 16)(%2)\n" + "fsd f17, (16 * 17)(%2)\n" + "fsd f18, (16 * 18)(%2)\n" + "fsd f19, (16 * 19)(%2)\n" + "fsd f20, (16 * 20)(%2)\n" + "fsd f21, (16 * 21)(%2)\n" + "fsd f22, (16 * 22)(%2)\n" + "fsd f23, (16 * 23)(%2)\n" + "fsd f24, (16 * 24)(%2)\n" + "fsd f25, (16 * 25)(%2)\n" + "fsd f26, (16 * 26)(%2)\n" + "fsd f27, (16 * 27)(%2)\n" + "fsd f28, (16 * 28)(%2)\n" + "fsd f29, (16 * 29)(%2)\n" + "fsd f30, (16 * 30)(%2)\n" + "fsd f31, (16 * 31)(%2)\n" + : "=&r"(fcsr), "=m"(*fp_x) : "r"(fp_x)); regs->fp_fcsr = fcsr; } From nobody Wed Nov 5 20:18:09 2025 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 4d1xTZ2Ng8z655g3; Wed, 05 Nov 2025 20:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1xTZ1jvZz44kr; Wed, 05 Nov 2025 20:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762373890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M5O/yxj69jINxwbZQ7Kqx2i06K86XS9IhNcdk1/HSfE=; b=PvhlxgrJ0cKx9HqC4WtOMaZ1gb8u1RfARB3qrmJrWrICLVMNGY3Ys52MCV8wM7HlrT+Fq1 glJy7G9bY7SqJDHHSS2NdjIyro8APLSX+yBlqqC/F1Ap0S4wW/ciWTJJEf2RSgS3tm76h1 2QVgk3NwHfllyxB+KqhVtDYIPnU0dbAfcGjTDcPZ2BJA23mUki17A+1ymzhnIQvx8B5kup fyhBf11iNCM++n+nJZHoiky4Uw4tE4C3TbqA7XZBnLgsnRTPiGX0tOXBhlHaeGAxrzRSN+ r1og+RL3w0H8tPVdIRnHUYCcMViQAxn1cmN4LOgKqCJPbSuRsrLadpQ1jD2B2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762373890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M5O/yxj69jINxwbZQ7Kqx2i06K86XS9IhNcdk1/HSfE=; b=MMxu2gvDfiw1wCoS6hmlTNhSldOBcq6n4/P4mdcoV/Ogk5utZzTCsgskTC5Ok8SZKkWBP7 2DztNlXq0oaZHsuiw/6JXhimilTxrRjerykifIV+gwx6/WEDUIzrCeUORUVvrOAjvG5Hpl ns1edjfWH8DEHZS5EQ+eVT1CJjPoKFn9bBh/xMejykM7Kj6g8tOnHZAoAPSaYncT2ZWLEV uXToV9duepUTxuSlSOd5Te5j4RLKPyza1bW4K59XWcugYFzUMRa21nW9QdIf+f3dOu//+v UXU59sqjCNEEWYisPOd8IKIFDxMrWBnGnUgPvAwfeBjxwuIe1qxWv+vWQuBwGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762373890; a=rsa-sha256; cv=none; b=AeXC7K29wx+04gJN9AiolXUWNis+B18fTXftH/qHmN4nq2jU2tguv8XxHzGzWrn42JUjfL suwVQoKkByF6TVnw0aRT17ZZ7291I7Q/xr2oBSovxpdhQEX+AM6SGeTiVhHF2Uzrm5zVhr 12GSgUrxHrnDPRx7LaHG51ChRAi1OwzjEa/hhkaqCDIPaVaPjI3JEWpWNzObV5kn9Fn42c Z84tOfZ21dcUGm2BErwkHX9j+GI2kE1X4xfG09cU0QR/VUUsTLFNaq5XMhPBbehIh1H293 E8/Cr1MB3LKQr6XdD9aRTIhGTQRk97N3YiX1coasTOFsDeFtydrQPBC2jETOXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1xTZ0v1Bzy3h; Wed, 05 Nov 2025 20:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5KI9fY062563; Wed, 5 Nov 2025 20:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5KI9VV062560; Wed, 5 Nov 2025 20:18:09 GMT (envelope-from git) Date: Wed, 5 Nov 2025 20:18:09 GMT Message-Id: <202511052018.5A5KI9VV062560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 054da4a6d033 - releng/15.0 - riscv: Treat pointer register as an input in fpe_store List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 054da4a6d033feb1948d609a0dc20a1c82bc8943 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=054da4a6d033feb1948d609a0dc20a1c82bc8943 commit 054da4a6d033feb1948d609a0dc20a1c82bc8943 Author: John Baldwin AuthorDate: 2025-10-30 19:52:51 +0000 Commit: Colin Percival CommitDate: 2025-11-05 20:18:00 +0000 riscv: Treat pointer register as an input in fpe_store The contents of the memory is an output, but the pointer to that memory is an input. This was correct in the original version of D45697, but when adding appropriate clobbers, the pointer operand was incorrectly switched to an output rather than left an input for fpe_store. Approved by: re (cperciva) Reviewed by: jrtc27 Obtained from: CheriBSD Fixes: 44d4ee7f3dad ("riscv: add FPE code.") MFC after: 1 day Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D53441 (cherry picked from commit 91f66f9b377e09f59f481e653d8f64120a183806) (cherry picked from commit 0b5e4af65d0d3dfaa318b8e6adaaa4297f94af17) --- sys/riscv/riscv/fpe.c | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/sys/riscv/riscv/fpe.c b/sys/riscv/riscv/fpe.c index b6c66e5e4f09..63103a794a8e 100644 --- a/sys/riscv/riscv/fpe.c +++ b/sys/riscv/riscv/fpe.c @@ -69,39 +69,39 @@ fpe_store(struct fpreg *regs) __asm __volatile( "frcsr %0 \n" - "fsd f0, (16 * 0)(%1)\n" - "fsd f1, (16 * 1)(%1)\n" - "fsd f2, (16 * 2)(%1)\n" - "fsd f3, (16 * 3)(%1)\n" - "fsd f4, (16 * 4)(%1)\n" - "fsd f5, (16 * 5)(%1)\n" - "fsd f6, (16 * 6)(%1)\n" - "fsd f7, (16 * 7)(%1)\n" - "fsd f8, (16 * 8)(%1)\n" - "fsd f9, (16 * 9)(%1)\n" - "fsd f10, (16 * 10)(%1)\n" - "fsd f11, (16 * 11)(%1)\n" - "fsd f12, (16 * 12)(%1)\n" - "fsd f13, (16 * 13)(%1)\n" - "fsd f14, (16 * 14)(%1)\n" - "fsd f15, (16 * 15)(%1)\n" - "fsd f16, (16 * 16)(%1)\n" - "fsd f17, (16 * 17)(%1)\n" - "fsd f18, (16 * 18)(%1)\n" - "fsd f19, (16 * 19)(%1)\n" - "fsd f20, (16 * 20)(%1)\n" - "fsd f21, (16 * 21)(%1)\n" - "fsd f22, (16 * 22)(%1)\n" - "fsd f23, (16 * 23)(%1)\n" - "fsd f24, (16 * 24)(%1)\n" - "fsd f25, (16 * 25)(%1)\n" - "fsd f26, (16 * 26)(%1)\n" - "fsd f27, (16 * 27)(%1)\n" - "fsd f28, (16 * 28)(%1)\n" - "fsd f29, (16 * 29)(%1)\n" - "fsd f30, (16 * 30)(%1)\n" - "fsd f31, (16 * 31)(%1)\n" - : "=&r"(fcsr), "=r"(fp_x), "=m"(*fp_x)); + "fsd f0, (16 * 0)(%2)\n" + "fsd f1, (16 * 1)(%2)\n" + "fsd f2, (16 * 2)(%2)\n" + "fsd f3, (16 * 3)(%2)\n" + "fsd f4, (16 * 4)(%2)\n" + "fsd f5, (16 * 5)(%2)\n" + "fsd f6, (16 * 6)(%2)\n" + "fsd f7, (16 * 7)(%2)\n" + "fsd f8, (16 * 8)(%2)\n" + "fsd f9, (16 * 9)(%2)\n" + "fsd f10, (16 * 10)(%2)\n" + "fsd f11, (16 * 11)(%2)\n" + "fsd f12, (16 * 12)(%2)\n" + "fsd f13, (16 * 13)(%2)\n" + "fsd f14, (16 * 14)(%2)\n" + "fsd f15, (16 * 15)(%2)\n" + "fsd f16, (16 * 16)(%2)\n" + "fsd f17, (16 * 17)(%2)\n" + "fsd f18, (16 * 18)(%2)\n" + "fsd f19, (16 * 19)(%2)\n" + "fsd f20, (16 * 20)(%2)\n" + "fsd f21, (16 * 21)(%2)\n" + "fsd f22, (16 * 22)(%2)\n" + "fsd f23, (16 * 23)(%2)\n" + "fsd f24, (16 * 24)(%2)\n" + "fsd f25, (16 * 25)(%2)\n" + "fsd f26, (16 * 26)(%2)\n" + "fsd f27, (16 * 27)(%2)\n" + "fsd f28, (16 * 28)(%2)\n" + "fsd f29, (16 * 29)(%2)\n" + "fsd f30, (16 * 30)(%2)\n" + "fsd f31, (16 * 31)(%2)\n" + : "=&r"(fcsr), "=m"(*fp_x) : "r"(fp_x)); regs->fp_fcsr = fcsr; } From nobody Wed Nov 5 21:36:07 2025 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 4d1zCW5B1nz65D2K; Wed, 05 Nov 2025 21:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zCW4MXdz3GYK; Wed, 05 Nov 2025 21:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762378567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1nA+5zedihrVh8B6xBa+wcUT1LwjkX2Ae1hWUJ9i9EY=; b=VH6og365CF5Mk0NhbbkvqnLhtqO1rMvWh9ZEx1X5OIoCucrWjBF8m8s5m/8DpAHcC0BW+e dddWnWW4lOGGMbIQKE1Lv3+jTUEZjqFqNoF3gbLi50eOxhm8ogNZ/9wsk4ax4f01OgztOs RzMyftlpvqvLuC0ULjlfnWgGxifsXTAupyrC0PTyHsedJhZfttJMRlmRymcGu6xLTG7StL suxlX5C+TWH/GY8y9rKGsLpwD8UOe4e2Ss/JUX4zj+VfQ6zo/hfu1xmrrvKgZsxiC46nJ8 m4uIfOk0iLqeznIGu+vGov3TsMfylV+vRuQbww4PDBKKLzT5rWvHiMCyoMmP3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762378567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1nA+5zedihrVh8B6xBa+wcUT1LwjkX2Ae1hWUJ9i9EY=; b=fPgq1NtsGkR34qAbMIOqi8Andt/6gZ/lD/jH42YkGlYORZKbxQVzYf6HhghwNzMoXoeh+5 2fkBQRfRL0Y7SYjLQsQs70LtkYOrGfHtjs/33IH+DC/ti2wDjtScwq2L/F3HfZh6NMBfwv EReQEZE+HnBAZ9qR0OeFB+dXDTZj+eyicd7sf/o2flkhW6ECRScVy+aVSl1FmfzCHqJ/ve S0mX1ryuRn/kElRPEPvGQyMRJT7JzQ27IxpWVrrVLds5okLQrHHMeqoL1TT7jaMQ2F8tT6 e8E20l7mQCjsHfN3cBlCQiKGyGApaKo/Pr3OiTpGC05+M5O6oheHnmmE65yuPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762378567; a=rsa-sha256; cv=none; b=d37ZPUjlm+qZpZtLHHNmZMPHJO4jMUUXWvNQ1CiRP3DevmKGOJwZc9bzxZUJ5ttMvrW8nP mBe4CS+jC26ZoGyMPuymv58ulejMr2Kv4rxkNCgKwVfQ9A7mpicZBrjKZlAz+Nl2LNU5rf 3IZpTkyOwYk7zpfk8DB4MVR4a5lsxvtQ3TszAaRISI3z2CUqNuP1vtaUspx3Otp0Sn0bgI glDR9BKU5obZZtdPMGv63lNilh3Uj3kuFx0sYMaLBziwFH3oOmdL2SDd+qqTGm17wGukJn 0MD2uxsFhAvbzbDPhYfogiz4IRXwxUwH9ahy6NJnJRT4foXtH17XUrf2PfM8qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zCW3tp1z11Lr; Wed, 05 Nov 2025 21:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5La7nH011994; Wed, 5 Nov 2025 21:36:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5La7Li011992; Wed, 5 Nov 2025 21:36:07 GMT (envelope-from git) Date: Wed, 5 Nov 2025 21:36:07 GMT Message-Id: <202511052136.5A5La7Li011992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 736771f63155 - stable/15 - etc/mtree: Add package tags for /usr/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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 736771f631557213269692f3a5611a1f0bdab2bd Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=736771f631557213269692f3a5611a1f0bdab2bd commit 736771f631557213269692f3a5611a1f0bdab2bd Author: Lexi Winter AuthorDate: 2025-11-04 23:45:04 +0000 Commit: Lexi Winter CommitDate: 2025-11-05 21:27:03 +0000 etc/mtree: Add package tags for /usr/include Set the default package to clibs-dev, since that's where the vast majority of include files comes from. Add explicit package tags for the directories which are installed in their own package. MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53577 (cherry picked from commit 436618a427b4baaf42d8221ef07d14e3ba787d3a) --- etc/mtree/BSD.include.dist | 56 +++++++++++++++++++++++----------------------- etc/mtree/BSD.usr.dist | 32 +++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index ea333a38d889..97f2194a3fa1 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -2,17 +2,17 @@ # Please see the file src/etc/mtree/README before making changes to this file. # -/set type=dir uname=root gname=wheel mode=0755 +/set type=dir uname=root gname=wheel mode=0755 tags=package=clibs-dev . arpa .. - atf-c + atf-c tags=package=atf-dev .. - atf-c++ + atf-c++ tags=package=atf-dev .. - bsm + bsm tags=package=audit-dev .. - bsnmp + bsnmp tags=package=bsnmp-dev .. c++ v1 @@ -118,7 +118,7 @@ scsi .. .. - casper + casper tags=package=libcasper-dev .. crypto .. @@ -190,10 +190,10 @@ wg .. .. - devdctl + devdctl tags=package=utilities-dev .. - edit - readline + edit tags=package=runtime-dev + readline tags=package=runtime-dev .. .. fs @@ -252,39 +252,39 @@ virstor .. .. - gssapi + gssapi tags=package=kerberos-dev .. - gssrpc + gssrpc tags=package=kerberos-dev .. - infiniband - complib + infiniband tags=package=utilities-dev + complib tags=package=utilities-dev .. - iba + iba tags=package=utilities-dev .. - opensm + opensm tags=package=utilities-dev .. - vendor + vendor tags=package=utilities-dev .. .. isofs cd9660 .. .. - kadm5 + kadm5 tags=package=kerberos-dev .. krb5 tags=package=kerberos-dev .. - lib80211 + lib80211 tags=package=runtime-dev .. - lib9p + lib9p tags=package=lib9p-dev .. - libipt + libipt tags=package=libipt-dev .. - libmilter + libmilter tags=package=libmilter-dev .. - libxo + libxo tags=package=runtime-dev .. - lzma + lzma tags=package=xz-dev .. machine pc @@ -323,7 +323,7 @@ .. .. netpfil - pf + pf tags=package=pf-dev .. .. netsmb @@ -348,20 +348,20 @@ stm .. .. - openssl + openssl tags=package=openssl-dev .. - pcap + pcap tags=package=utilities-dev .. protocols .. - rdma + rdma tags=package=utilities-dev .. rpc .. rpcsvc .. security - audit + audit tags=package=audit-dev .. mac_biba .. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 6a8c155e5e73..54d408865fa5 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -6,35 +6,35 @@ . bin .. - include - private - bsddialog + include tags=package=clibs-dev + private tags=package=clibs-dev + bsddialog tags=package=utilities-dev .. - bsdstat + bsdstat tags=package=libbsdstat-dev .. - event1 + event1 tags=package=libevent1-dev .. - gmock - internal - custom + gmock tags=package=utilities-dev + internal tags=package=utilities-dev + custom tags=package=utilities-dev .. .. .. - gtest - internal - custom + gtest tags=package=utilities-dev + internal tags=package=utilities-dev + custom tags=package=utilities-dev .. .. .. - samplerate + samplerate tags=package=sound-dev .. - sqlite3 + sqlite3 tags=package=libsqlite3-dev .. - ucl + ucl tags=package=libucl-dev .. - yaml + yaml tags=package=libyaml-dev .. - zstd + zstd tags=package=runtime-dev .. .. .. From nobody Wed Nov 5 21:36:08 2025 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 4d1zCY0w7cz65D4x; Wed, 05 Nov 2025 21:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zCX5FcWz3G4j; Wed, 05 Nov 2025 21:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762378568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ksvp9J7ClVD1CPbWHH5ckn36Qq7JhKswLxZFpEWCALY=; b=GpZTOJTIB3iTaiBnCQRwFMEDTBbvxhy5ridDaO0G7bLObWFQw2NBO19Ht6Dy8n7Fj+H0fM ChmGh0qpY7cMdJRQifuQAuxVDnbJ2VLYq5yzqwyalx+qxr72gNeXVtxNYPK89avMA2/434 ApX6DtShSP/uRACe5RHp+qx06hk/dzJbRJ4AkbB3PAJVrM6GFf/C+6aFRqC9zZm+bStE6m HUxv0Szrh7De3zgvPz6yRF9bm5vpEHiS15aDMnUAYe9ltE7KsRDvzgJiibat1ngglhH+pw Y0QBucPP0f8fBMGWAQDyfXv03YHx1iCzCLZo94UEhOPW8jOO6l0DV5wbnapu7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762378568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ksvp9J7ClVD1CPbWHH5ckn36Qq7JhKswLxZFpEWCALY=; b=RGZ3PdZYIE6fJXmGbhF0cTR1MNPtcfz4Fa6anzoZN6fqMY5wjMuJu8O03ZKP3ohZOSzGwh ug0A1kRN4OBccmTwcfwG84pcNAwWr4wP/E5j7UMpssC64y8v9iIvyL5m8ZEhkaEWnfXfMd RE+yC8EsHSzKxy3mBPQiJ/B7ZjtmgRYzmAAbikzgGTurEdQdAG3frU1fzI98qu4khU/WnD b3BfYoI4DfyMqAzo1mw3NWr0jAZe7PnZGEuQyJTnnZFAo+L8tgj66wwOMuxh3ZSUmltru4 Lety+hwtpBShUtPjThMHSl5ArqNJrEgXnaXYHSJKY7oTnmXYtb1R/RX7ezFu6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762378568; a=rsa-sha256; cv=none; b=BOLeXmKOP8fy71OT2tqlcAe5f65n79RA5K5gDWa3mWvSvs1lR1LXBP6L9Tsp5gpxjakNoy MPaVWysSnbUpN0im1QoK14RkPVO37tDW30Z294yVNXP7vQGdglk+UezMX36R33mCUDMyXG 52iS5dtlqA/EaUy99KX33GVyS0oYylwZqy4oHPSni7mVHUVx2F60vIiFCLPsIcmN1/t/23 sUfsSZ/uk2V8ylaqObmo96xA9IGU7Y/Mp8GnYx4D6kMvbXxExNYtf4Q3U7UKUsm5Rz06qw uuGr/EERIuodBlURCyhUHGMQBjffC1XDnpuX7dsMQWXy8ntAR0CDwKmya90RkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zCX4qF7z11Ls; Wed, 05 Nov 2025 21:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5La89j012027; Wed, 5 Nov 2025 21:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5La8ai012024; Wed, 5 Nov 2025 21:36:08 GMT (envelope-from git) Date: Wed, 5 Nov 2025 21:36:08 GMT Message-Id: <202511052136.5A5La8ai012024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 5f1d2ef1f52f - stable/15 - packages: Make set-base-dbg depend on set-optional-dbg List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5f1d2ef1f52f50c255d96dfdfe84980fcf638509 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=5f1d2ef1f52f50c255d96dfdfe84980fcf638509 commit 5f1d2ef1f52f50c255d96dfdfe84980fcf638509 Author: Lexi Winter AuthorDate: 2025-11-04 23:51:34 +0000 Commit: Lexi Winter CommitDate: 2025-11-05 21:27:25 +0000 packages: Make set-base-dbg depend on set-optional-dbg As set-base depends on set-optional, so should set-base-dbg depend on set-optional-dbg. Otherwise, people who install set-base-dbg will be missing a bunch of debug packages. MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53575 (cherry picked from commit 3bcb2977704556ebf5c8847eaa7a46692b0bc1d0) --- release/packages/sets/base-dbg.ucl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/packages/sets/base-dbg.ucl b/release/packages/sets/base-dbg.ucl index 79e5de22522e..c96b10416dcb 100644 --- a/release/packages/sets/base-dbg.ucl +++ b/release/packages/sets/base-dbg.ucl @@ -28,5 +28,8 @@ deps { }, "set-devel-dbg" { version = "${VERSION}" + }, + "set-optional-dbg" { + version = "${VERSION}" } } From nobody Wed Nov 5 21:36:09 2025 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 4d1zCZ131dz65D54; Wed, 05 Nov 2025 21:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zCY70FGz3GTh; Wed, 05 Nov 2025 21:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762378570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBFXLTMpvwUaeOxhjyFumpDcCrdFPxzdmn0N5hWbz1k=; b=k1TvHBKvwW+WQib9V3UO595ceTUtzTfVEP7VFV0Hb5zsjCAtwIZxB7a4pjLqIgoVKJWAJc Wy+5VxXnUXbDRi73cpIzZTgIFuo/svQjFaLkjEV2OhwNOGb70wpGL5UcYlVbGZ6Glu/ylc K3Q5eu6KnCTF6Z0Es3Jd1lHj1cxUorWoyqUmaiCk6iZ/4bu+NH2TtA5nyLfDr/cMsyVQco lMfTg8lmV5ka6DBbae2skNMPEoS/nopnmZ2iNT8cUOQ2HgXyphb9cV/WLZ3mzv2MDg2RRG OGr7hguy5zsZbjFciVCzUacVA8eBlEbAoXQOQiZ2+UBO4BqNFzflUmplwdjsRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762378570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBFXLTMpvwUaeOxhjyFumpDcCrdFPxzdmn0N5hWbz1k=; b=MPqcuDXEqhDSIe1osk/2dwEMBsmeFOzFV4LQp/FLJIbGmKSOAoS4SADawQx/eRevIlUCZr /sMhM3891N79Fgzrdg/WWxj5ynwEzY8ALy+4ljmlcKd2UXyENDUaX3+suZ6Wkh4xocQQFp CGCQAW8uydcYsYoLUsRfRSbQQI9Tt0sjsEblr0oLnJZ5KeyN4wLFcVH6CgKrHCenVC+Ftn VenS/WzW7puA87vnvGy497fjP33IvmMP+16ldEUqGsPa7TV61kQvAZPpoGcvri5gfuK2YP lXl/75aUQLLRhTm55SdcbV6O0W9SUB4paxcMUtrM57msj48VhtW/wTW6BuJ+ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762378570; a=rsa-sha256; cv=none; b=vbHcnMRa6G1eYvNBZQPUgXRPqPhx4+vKdO7cFgLmnaBxGVOX/v+MCAXkXU9YzEbQSSZRBD ktjUt/v7+aPqmWXuD9SpFQFXQT/hRS1/ejm2YgzvTnk5ohsiBRJDJfOngaGdZhIOS0G5VY 5FR+z9kicaqBhPtz2ZAvdXWJ6DP4tfOn11zZu69WVDsfjKz+uwgWMR5R3vxrYf3/1xGt5y uHaQh2e9ZaA26Btm5ApSKMYJ4fkNhcTz9+0IC9L6/uuEMiYzWtuShNoJJtDf9ZFVzR1ZaC 0+MMObfDQnHmg560y/VOuxZfphyZTZlgCM4mp8LO+0zLmvzUQ+GigbXRMVTsqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zCY5ntQz11KY; Wed, 05 Nov 2025 21:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5La9pL012059; Wed, 5 Nov 2025 21:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5La93x012056; Wed, 5 Nov 2025 21:36:09 GMT (envelope-from git) Date: Wed, 5 Nov 2025 21:36:09 GMT Message-Id: <202511052136.5A5La93x012056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: dd9ba3201b1c - stable/15 - libkadm5clnt: Fix library symlink install List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dd9ba3201b1c46a9412b499289e65f5ebebb6ee5 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=dd9ba3201b1c46a9412b499289e65f5ebebb6ee5 commit dd9ba3201b1c46a9412b499289e65f5ebebb6ee5 Author: Lexi Winter AuthorDate: 2025-11-04 23:53:21 +0000 Commit: Lexi Winter CommitDate: 2025-11-05 21:27:36 +0000 libkadm5clnt: Fix library symlink install libkadm5clnt_mit installs a symlink from libkadm5clnt.so for backward compatibility, but it neglected to include the package tags, so the symlink was missing from pkgbase builds. Add ${DEV_TAG_ARGS} to the install command. Reported by: Mark Millard MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53574 (cherry picked from commit 707507c27f69f16de0ce3efee21b20d4f76328f8) --- krb5/lib/kadm5clnt/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile index 52a7187cf9bb..ef01a5f779e3 100644 --- a/krb5/lib/kadm5clnt/Makefile +++ b/krb5/lib/kadm5clnt/Makefile @@ -86,7 +86,8 @@ ${CHPASS_UTIL_STRINGS_ERR_C}: ${CHPASS_UTIL_STRINGS_ERR} rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c afterinstall: - ${INSTALL_LIBSYMLINK} ${SHLIB_LINK} ${DESTDIR}${LIBDIR}/libkadm5clnt.so + ${INSTALL_LIBSYMLINK} ${DEV_TAG_ARGS} ${SHLIB_LINK} \ + ${DESTDIR}${LIBDIR}/libkadm5clnt.so .include From nobody Wed Nov 5 21:36:10 2025 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 4d1zCb1Gl1z65Cs3; Wed, 05 Nov 2025 21:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zCb04HGz3G5C; Wed, 05 Nov 2025 21:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762378571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GN1jA3VQdtmaXvdPMNpdYRk8rhhLnciJZsMRL0edFqI=; b=syoHbexexZnXEJ2E/td+kopUOXiP/is0PQnkKEm1VdtwOIE0jfTkVCrHL41Psl+VF4JtX+ 5OUSJpXIR/NgAgV9ovkxAUml2zQybgoUw2p0ZfEgc8RDHw6+XH7oQIOrZwXQbQsNmvXdyW h+tXSJLF3VHZlFIWWmmeLHhD3Ob02kMvFijsHlbaLYGs1el8vSdjyp/rPZyD013la4rLkU tNPTTFItA1V57fGAg5p9Fuok5lt4yfMWfeHN9xGxTIqP++ueOH87CpgFQMFNBZMmfU2ecJ mzAm2L6NZGbAn//R2jNe70uP1fQ4QmcsEibMXpli8IXoTNIR7UuShWURsi0fuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762378571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GN1jA3VQdtmaXvdPMNpdYRk8rhhLnciJZsMRL0edFqI=; b=A6NMvItLYuSdh2IfnNg4DtioGQl/jLonL4JfqF0Fd7rUJ1S4AlJvd3YIV38OH82GHWCpaA T1ww45X7LZrKBcqetrVlG9K32hd3F6mlgFNIyEG7JIEblVo+cnB1/O3NkXJcbJ+BxcnHRn hd7rM0Zar7Fl7Dm/B7aF5kL1ZmHRcYfNFdLlRLQVSMumb00IqC1P2xX5Fi7n4la9JQvmLY vUTboEwvgNdL3Qu+jHX45BekNQI90I2Mw8cRWcAknBybMJV7QPBqa83DY1W98fFVa0cgxJ 07n2f/JUpB7DEH2IUGzuLuBcySnQhpvOZcYSHULSzm+tA8Zoe3B5u8I4VisHvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762378571; a=rsa-sha256; cv=none; b=f8zYDQPvhmXTfdWZCCedhTVAggy5xsJ3UXKuLdp413JhgvKZENa7wVxcF2E7Y1nYTmlQt9 NO00sJz18ltmDVVc0ighOesOmKG5gQOt0DwJdVy2o0yU4nu3xR08wNdkW3YnaPAmT57nRG Uq64v0E0jm1GmMN89tZROqqccOoZYIlgY6Xv/ByjlRHYl4PXoSMnXg1BddIP6+Yx9oMRds /EGcKqyUNPNoLQ+PzCpsXO25OUf+KyK6Tzv3Nfu9d910sYsHnyg+OvLQ0hAtOq5xiGfzLH OxEWInXsHdlDzKht6z2eGIDujNuvSbWHxMhqXDh0CjtacKQ+hcpj0bQA9bpPSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zCZ6Ynkz11KZ; Wed, 05 Nov 2025 21:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5LaA9q012091; Wed, 5 Nov 2025 21:36:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5LaAxB012088; Wed, 5 Nov 2025 21:36:10 GMT (envelope-from git) Date: Wed, 5 Nov 2025 21:36:10 GMT Message-Id: <202511052136.5A5LaAxB012088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 25eb50f68bd5 - stable/15 - libcasper: Move everything to the libcasper package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 25eb50f68bd59c28364fd187e935885e6e360f17 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=25eb50f68bd59c28364fd187e935885e6e360f17 commit 25eb50f68bd59c28364fd187e935885e6e360f17 Author: Lexi Winter AuthorDate: 2025-11-05 00:26:54 +0000 Commit: Lexi Winter CommitDate: 2025-11-05 21:27:46 +0000 libcasper: Move everything to the libcasper package The libcasper package exists to contain libcasper, but for some reason only the libcap_net service was in the package, with libcasper itself and the rest of the services being in runtime. Move everything to the libcasper package, except tests which stay in the tests package. MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53576 (cherry picked from commit b8697ac70ebfce2d8e3df6c67bbf37910793b199) --- lib/libcasper/Makefile.inc | 2 ++ lib/libcasper/libcasper/Makefile | 2 -- lib/libcasper/services/cap_dns/Makefile | 2 -- lib/libcasper/services/cap_fileargs/Makefile | 2 -- lib/libcasper/services/cap_grp/Makefile | 2 -- lib/libcasper/services/cap_net/Makefile | 2 -- lib/libcasper/services/cap_netdb/Makefile | 2 -- lib/libcasper/services/cap_pwd/Makefile | 2 -- lib/libcasper/services/cap_sysctl/Makefile | 2 -- lib/libcasper/services/cap_syslog/Makefile | 2 -- lib/libcasper/services/tests/Makefile | 2 ++ lib/libcasper/tests/Makefile | 2 ++ 12 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/libcasper/Makefile.inc b/lib/libcasper/Makefile.inc index 00bd221feb27..73a761ba4ce3 100644 --- a/lib/libcasper/Makefile.inc +++ b/lib/libcasper/Makefile.inc @@ -1,5 +1,7 @@ .include +PACKAGE?= libcasper + .if ${MK_CASPER} != "no" CFLAGS+=-DWITH_CASPER .endif diff --git a/lib/libcasper/libcasper/Makefile b/lib/libcasper/libcasper/Makefile index 4db26f665f19..1a794791570f 100644 --- a/lib/libcasper/libcasper/Makefile +++ b/lib/libcasper/libcasper/Makefile @@ -1,5 +1,3 @@ -PACKAGE= runtime - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile index 4b11c97d29e5..b090c553bd28 100644 --- a/lib/libcasper/services/cap_dns/Makefile +++ b/lib/libcasper/services/cap_dns/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile index 2c52d0887a48..9d70d0ab9237 100644 --- a/lib/libcasper/services/cap_fileargs/Makefile +++ b/lib/libcasper/services/cap_fileargs/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile index a921dfa87e7c..13e695813bcf 100644 --- a/lib/libcasper/services/cap_grp/Makefile +++ b/lib/libcasper/services/cap_grp/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile index 1ba35a674a05..4e9814118c41 100644 --- a/lib/libcasper/services/cap_net/Makefile +++ b/lib/libcasper/services/cap_net/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE=libcasper - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile index 853052e78d04..a330eeedeb11 100644 --- a/lib/libcasper/services/cap_netdb/Makefile +++ b/lib/libcasper/services/cap_netdb/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile index a1e97845c736..ba8df80d5ad7 100644 --- a/lib/libcasper/services/cap_pwd/Makefile +++ b/lib/libcasper/services/cap_pwd/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile index 522313df4ffc..4408bad4efb4 100644 --- a/lib/libcasper/services/cap_sysctl/Makefile +++ b/lib/libcasper/services/cap_sysctl/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile index 88979d8bed23..d18ad6d76ede 100644 --- a/lib/libcasper/services/cap_syslog/Makefile +++ b/lib/libcasper/services/cap_syslog/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/tests/Makefile b/lib/libcasper/services/tests/Makefile index 29b1b564beca..4b6c72fd86e8 100644 --- a/lib/libcasper/services/tests/Makefile +++ b/lib/libcasper/services/tests/Makefile @@ -1,4 +1,6 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests KYUAFILE= yes .include diff --git a/lib/libcasper/tests/Makefile b/lib/libcasper/tests/Makefile index 29b1b564beca..4b6c72fd86e8 100644 --- a/lib/libcasper/tests/Makefile +++ b/lib/libcasper/tests/Makefile @@ -1,4 +1,6 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests KYUAFILE= yes .include From nobody Wed Nov 5 22:03:27 2025 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 4d1zq33wXCz6DvgM; Wed, 05 Nov 2025 22:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zq32J2wz3KrK; Wed, 05 Nov 2025 22:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8o7fJ/FiNnBXMd73v48NHLWqZJung2MEFPptteaabIs=; b=T2qvfiWr1yUas+5JtI4Y2cGwjiRRH6N88G41iP1ZbyCBPka7lMkvawZMUK2khB6R+cN2HG VkCrJhoNE9sPlrbYntMrq6wFeRDFkOC/Yk7dNu/Ltw7GlSYLJWgE6GRxk4CEdjGpnzvqeN m9zgYqW++q7S0KokGzq1MJvxWDXyagPDmpW/mVPWiCbjWN7Gu6gGtVyV4f+vIIMGEqO1tb GSJHC0ULHB21C3YMhYK+yXNu0bskKSrxF5ewVGA0g8wkem+3t8J1BoeKOHSyoYYER/u+YB u6/B1HV/y41LlLahMBFh78nEGwVF1eJluXXtC3jV5wjHivDsM1EX496aQwPiIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8o7fJ/FiNnBXMd73v48NHLWqZJung2MEFPptteaabIs=; b=ldKfqpS1yQEkHj/xE1HUApAXP5ObvcWlJW0SI7eGDsJx4+349xVnIuvGzSOWZ3+SGM23Qu mbbJxe2t/DdGJdi2zxOYu3RzAfEoI3HPFfwBORGikBAGRYcQI3dUfxq2O+jq6Fc8BS+SgK oPXY0nACXhEXcaHlWnIkrwqTMtAxaUPwFFLAuQQ2go0tgVFwahXdPcwHMtJzEli5qz0sCe R8QodrUM0a8jOuKpWeOe4l+Y1Q/0pRZd+QLEhE6+RLktl7CKTVhyH0n96zbgqzPTiOxrJM QB1aeFyp/eVOnwvLEHG9l/7rU2to9GgjntibjnjC1olzNM5sUiYIMhPeCW/N1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762380207; a=rsa-sha256; cv=none; b=lK57Ggeg658WXjP2L6GdbsX/ApugiFZbkvMruSGMnVd81kTg/UoBG6r6XtqndrpaqdZwIO U01GxMRZWaDI0A7ExIrZtIuvIUyK525ASF+CcTDjMahYAcPsvPRxDtChA/rysbmtCZbhML ujSDLKr1uZOJPnYYBrKKnCZDd8XEFF3Ljz1KL+zW01HobJhBbdoBCfq6XbUHt/7xtYzdiZ /Vai+Bn0bQQM06xD3oRbkAUmWFZGLnusxWxVsqIXqGnl+fODFej+Ru9XboG/b6veB6RFpq j9e5qnO/qUER6POuF58ZX/7LhHFXuZ1C1ExJ/CySE+Wc3RaN0CeNFznu9cT7Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zq31vmrz12GQ; Wed, 05 Nov 2025 22:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5M3RcW068388; Wed, 5 Nov 2025 22:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5M3R76068385; Wed, 5 Nov 2025 22:03:27 GMT (envelope-from git) Date: Wed, 5 Nov 2025 22:03:27 GMT Message-Id: <202511052203.5A5M3R76068385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 40e50d6d198e - stable/15 - release: Spell metalog_add_data conventionally List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 40e50d6d198e9821e7e14ef11a3eb9e55721cd84 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=40e50d6d198e9821e7e14ef11a3eb9e55721cd84 commit 40e50d6d198e9821e7e14ef11a3eb9e55721cd84 Author: Colin Percival AuthorDate: 2025-11-02 00:16:35 +0000 Commit: Colin Percival CommitDate: 2025-11-05 22:03:21 +0000 release: Spell metalog_add_data conventionally Reviewed by: markj MFC after: 3 days Fixes: f1995d6fc13f ("release: Prepare GCE cloudware images for building as non-root") Differential Revision: https://reviews.freebsd.org/D53530 (cherry picked from commit c3a3af1346684eedf836fb62f874092ce602697e) --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index a7ccfc27a75c..b0a65c2981e1 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -21,7 +21,7 @@ vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf echo 'nameserver 8.8.8.8' >> ${DESTDIR}/etc/resolv.conf - metalog_add ./etc/resolv.conf + metalog_add_data ./etc/resolv.conf } vm_extra_pre_umount() { From nobody Wed Nov 5 22:03:28 2025 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 4d1zq455q2z6Dw5B; Wed, 05 Nov 2025 22:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zq42zwQz3KVM; Wed, 05 Nov 2025 22:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh/sr37spTzHjSML91zRH3hpL27MFaE5tfHtqREy1IQ=; b=pe5YIVvooTt1i7DWtOrCDSq6MI67w1cA0ma7MO0oTd5QxflKNHy9qkqc/2CEb85Lv/NOfC njRZJpfRN6lEp/DHE3l8ZDd4TJZ4BthiqxflAq6kSSUuhpHoyzkdOJWqJVMhs6PmjdoHrb l9pTxHGMmg+tBj9GxlUDklO1R+3dTZ4fCDZrw1JaqApdXl2nIGdZ1QO8UC45s3o8rboV57 uhIftpM3pjZpsD/PULmanUoktH4cnA+il6nBqrlHySSxJ7lynVnyT8WqP1DG2gXiQKsg88 jchzRg3vbyrfKO/fLUSYVdWXCllcQKtvQJkrMAowaDA0Dp9nJoQUvII6LvUkpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh/sr37spTzHjSML91zRH3hpL27MFaE5tfHtqREy1IQ=; b=MAQFSfDRp0++ekMJcE2OLdDpqhThY82LHGidQBTlhV9f398NEpzDnWevzgmeQmuzt57sey SKVC42DG/4u3Z9USIAuFcpCtDU/12VGTTxo6IlxbEM81WI+plrcHW0tmFR+yGxhk93yMGI dehk/y46Hj0YMrkvQmssu16O/n3I0CUobfi23uMKSeachObwUvaTsZ7hO2b+Az0kUVQvDn Ilibv7CfJpp8T5DHXGZtIg7XEEWo1AqlNzH3of86NE5yr9750t980XQ2eouEbe1wgpmSYe P2QskYgyhvsw+/an1US8DRbT8928pmlnK4RaCem+fw/qKCOPOdnz350hjS6dGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762380208; a=rsa-sha256; cv=none; b=ZnTFdlb3Wh0pHjt5a9sNCUf06ylHohq0MlyuYWt3K+3RvL/SOftCi7ax8iRNOvzXDHEgld 7q2B4zUzn2CgpJF4FPULsWVN2otY5bqhGyiW9ThxcimdXQUJSV5dN8RaWaU+NSJIN72wxf gyz+KKgZPZkdqbGIsdkV9HMZs2qPEJeow5wdv10KCCnrFoqFHnIjcTv1JZTZ/DjJSSN4Jx KE2gxs+/d6u5U9KNYvhwIYCU27pQasuTym89ezXORIx7mdL6R+ldMWBT/iunMQsHh6nfZk BO1nvZeYx83Vlw9UlvpDpUL+ZGclD2ODt4wEhXoajQDJZ3yECJsa6Q7pjjnJcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zq42Zmwz1211; Wed, 05 Nov 2025 22:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5M3Sws068423; Wed, 5 Nov 2025 22:03:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5M3SMH068420; Wed, 5 Nov 2025 22:03:28 GMT (envelope-from git) Date: Wed, 5 Nov 2025 22:03:28 GMT Message-Id: <202511052203.5A5M3SMH068420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b9e5c888ef28 - stable/15 - Makefile.incl1: .WAIT before distribute in etc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b9e5c888ef28d02caff974938bbfb1d5fff3b20b Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b9e5c888ef28d02caff974938bbfb1d5fff3b20b commit b9e5c888ef28d02caff974938bbfb1d5fff3b20b Author: Colin Percival AuthorDate: 2025-11-02 04:22:26 +0000 Commit: Colin Percival CommitDate: 2025-11-05 22:03:21 +0000 Makefile.incl1: .WAIT before distribute in etc In order to make sure that man pages are all installed before we run makewhatis to generate mandoc.db files, we have long placed etc at the end of the list of subdirectories being recursed into by the build. In order to support installworld -jN, a .WAIT was more recently added here. With the recent adoption by the release engineering team of parallel *release* builds (aka 'make release -jN') it is now also necessary to add the same .WAIT before recursing for the 'distribute' target, as we otherwise end up with distribution sets containing incomplete mandoc.db files. Reviewed by: bdrewery PR: 289683 MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53533 (cherry picked from commit dcb6706ba494f34e2a2ce97e5c5f2867b9e1f5ef) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index dcd4fd23c087..3f93e1065622 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -466,7 +466,7 @@ SUBDIR+= ${_DIR} # by calling 'makedb' in share/man. This is only relevant for # install/distribute so they build the whatis file after every manpage is # installed. -.if make(installworld) || make(install) +.if make(installworld) || make(install) || make(distributeworld) || make(distribute) SUBDIR+=.WAIT .endif SUBDIR+=etc From nobody Wed Nov 5 22:03:29 2025 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 4d1zq60hgMz6Dw3G; Wed, 05 Nov 2025 22:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zq53ynrz3KVR; Wed, 05 Nov 2025 22:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y1l0A2myFCGaL/TfWH35CzVuCep2NqU4+1eYmagdR14=; b=m8PqrP799cJwGIbK0gvlr5jNuQUv7jviPTT3/RZYVkqD9u0Y+Jows+QepYTESpi/pauteu 5iqPRyfDCzV33/Tj/Tsz9ENJcuC3AvegFX6ssPGLJAN82D12nb4yhV1Vj+Z/MSf7JX3QcS pFE4c+mIq9kH6Xn0Fg+mltPQLJuc1kg3lui76uBI5jBasb4zaEiMpaoGUQmZXzTqk5fMxn wmoeFSzjaKyZdsDni9qc6JwMCTPC++5SbhPWiQke0VaxgEJIZ++QiL3/QvdMODx079ztNB bYituXVhNcfHo0KCPYiRlxqdntKj978i4+PmMe0fOfDgyCzAuZqRDnBLalnizw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y1l0A2myFCGaL/TfWH35CzVuCep2NqU4+1eYmagdR14=; b=a374Cxwyw2/vplVuz86jHEPPZGwf+Y9Gwqr2q+CdtmEzzbES4D/SVyYHAEk9v3U7mWu0uT bD7pyWRz3zgFsE2ab1y6NYcyfNePTjLpp0XzTUNBXZuP7qWIFIYT0eXDv5d2CUcZDg702n ylOahok0aHaBRn0VNrEY3k8AZQCwSD8W51E7zOsHbRJo2tlJ5ZwZ/Yr2oZkVRDwdB+KbpD QdFNjN/5WGsQ4tk3yOngop5+XUWIZ4Wa0/Qj2kfDsKFtdf7iG1Gta95xFeutxYb8QC5rb7 mimzzuRqpxe4iEzxxJL37ZnmJe5ByV42JHUGyzuTXu+OL1AZlEu/3YzhAHRSqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762380209; a=rsa-sha256; cv=none; b=AEnMqGcXssnficZ5Oi4Wgv6GdFxkTmRG3CVmjChSkKbV4ET3BwwJ9AuXDIYy2s05sVUuR4 JyE4gIH2SlJ7EJnjeYoaywr1eSr2sQESXxFalbf/UNhwLcdFFbxsq4pTuT3vKpzXK33/Kq n01T+V8se+dPB9LKKoyTCHKTZxPEk0+aW61ZMzJBLvCnQiCd+t+dbToxxrdEmPuRSYD7TN wK3zg8N0dyvpefH65BBJBoh5KfV2HqyAPArrdP5IroJknrEZiYN4t8UV5GO8e19O8sGCpd Cm8X1xkWupfo/lM+yfNf69RWJP8Co19PEPwsIhfIXxRb0LgzRk6jCqnacqBfpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zq53TSdz1212; Wed, 05 Nov 2025 22:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5M3TYM068460; Wed, 5 Nov 2025 22:03:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5M3TG0068457; Wed, 5 Nov 2025 22:03:29 GMT (envelope-from git) Date: Wed, 5 Nov 2025 22:03:29 GMT Message-Id: <202511052203.5A5M3TG0068457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 8105ba118be2 - stable/15 - vmimage.subr: pkg autoremove after pkg install List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8105ba118be2c65b27deff3bd9e8ad999f8e22a9 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8105ba118be2c65b27deff3bd9e8ad999f8e22a9 commit 8105ba118be2c65b27deff3bd9e8ad999f8e22a9 Author: Colin Percival AuthorDate: 2025-11-03 01:16:19 +0000 Commit: Colin Percival CommitDate: 2025-11-05 22:03:21 +0000 vmimage.subr: pkg autoremove after pkg install A bug in pkg, which somehow only surfaced as a consequence of pkgbase, results in pkg install sometimes pulling in false dependencies. This problem might be limited to cases when the lib32 pkgbase packages are not installed. In the case of EC2 "small" images, installing the ebsnvme-id package results in binutils, gcc12-devel, gmp, indexinfo, liblz4, mpc, mpfr, and zstd packages being installed. These false dependencies are however not recorded as dependencies -- at some level pkg does understand that they're not needed -- so running pkg autoremove immediately after pkg install cleans them up. Note: This does not remove lines from METALOG corresponding to these packages, and makefs emits an error when it attempts to create the filesystem but cannot find the files listed in METALOG -- but makefs does seem to complete normally despite the error messages. This change should be reverted once the pkg issue has been located and fixed. Reviewed by: ivy MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53543 (cherry picked from commit 6a13aeac3c1f98db7cf156f24a4d6bc8d3c321f6) --- release/tools/vmimage.subr | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3bfef585f613..8531e9b8f2d6 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -212,6 +212,13 @@ vm_extra_install_packages() { -r ${DESTDIR} \ install -y -r ${PKG_REPO_NAME} $pkg done + INSTALL_AS_USER=yes \ + ${PKG_CMD} \ + -o ABI=${PKG_ABI} \ + -o REPOS_DIR=${PKG_REPOS_DIR} \ + -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ + -r ${DESTDIR} \ + autoremove metalog_add_data ./var/db/pkg/local.sqlite else if [ -n "${WITHOUT_QEMU}" ]; then @@ -224,6 +231,8 @@ vm_extra_install_packages() { chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${p} done + chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg autoremove fi return 0 From nobody Wed Nov 5 22:03:30 2025 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 4d1zq71116z6Dw3P; Wed, 05 Nov 2025 22:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zq65D2Tz3KpS; Wed, 05 Nov 2025 22:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUafTnmcV2QJcExXHUJg8GdEWPb8GW2du9HwcWJIiFQ=; b=ya2MSb+A0hKLaaLLaZN54sGe09fLAthxULSDiZkiazJ4vc+gn4ZD5kdFQoxL3d9/Cohvnc w5loM9vjr5kldvIqnUcW0EUTwx3uDWiVbQYNt3VyQLKJb97GPWUBseBWIPzJmEIk56eXyN 7lMy/FY0TQw9zPevogwD4z1AscXtbvBCy314RkUSQKVb8cvj1RtbRYQ5asp27BfndwpIws 8xwgbz0SyJQgaN5SWZ7CBH6JeOHJwUDiXT3pahnIdGuFvIV0FLg2BB+HHe/7EVh4FE9QhD 0l9lvPLixGrlEqd6o7Wvl7XEf0LTDhXtC+yHtlyZ0qVlaK944RjnYkClQD1GGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUafTnmcV2QJcExXHUJg8GdEWPb8GW2du9HwcWJIiFQ=; b=vBTdeWtYVWIMReBkex1chDEMNw2sHwyIzHYHmK1hgo4Q5EhRmf8yNmauLNiHIrkN23jD3n TfFBeH4/mpnVcCV+yEG8lSXiY6saXCvWM+EFZIDPTkI5P35YzEp8xB8vQc4x8QNZHOJ9Cz 7L4jpho2AgNeK25SLXwajTztB+CGcA5CTDWDrusUuI0HEHTZnSNZ2BqKSoIFoAnei0LFeH 9PD0x5JPc7W+DAk9391K6/BBRyUnf6Mp6lfolwx4XbMDaClMYy7zn7hc6SWo8Jf734RiYZ vYVrMfwbY7A/WRL8BtuQzrr1O10KGcODkuVdWahahWVtmK6hNwxqZkRv+XY6Jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762380210; a=rsa-sha256; cv=none; b=vHQ/rGqNmdVOYI+BKiwJ1K/3kML0TpPnzNVjkvYSb7sFwm9JxjaBb+65AiIWS60tbys7eP wZWSsxa5ZYWrwNBsFCPSelfMl1ZXNr+4z2l/UywAx34AWd0n6HijMiNsDChyf+KBxM/kCX pPQjE08ClIOKhNuhVZU3sGPQMqy1isxc7uejOxYqPLtvr/ZamYgIuYer2kiN0VWhxDojRK 8CNoOXdA6AcDCJh7pTBPtV11BSa0Xc5R/uQJt3GQetkxspfXdkRKpe5Mq2xjTSrsWohaTZ 1ZYCgsM4fPJpxVNP2i5Gjsfg40EATTvUS4K5P9HoLjZl0rmjAV3bZSdYyd2D+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zq64h6Kz12Kv; Wed, 05 Nov 2025 22:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5M3UN7068494; Wed, 5 Nov 2025 22:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5M3UiL068491; Wed, 5 Nov 2025 22:03:30 GMT (envelope-from git) Date: Wed, 5 Nov 2025 22:03:30 GMT Message-Id: <202511052203.5A5M3UiL068491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 271e14722983 - stable/15 - release: GCE builds depend on ftp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 271e14722983f73dbe02a31bb92ee095356e802e Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=271e14722983f73dbe02a31bb92ee095356e802e commit 271e14722983f73dbe02a31bb92ee095356e802e Author: Colin Percival AuthorDate: 2025-11-03 21:41:14 +0000 Commit: Colin Percival CommitDate: 2025-11-05 22:03:21 +0000 release: GCE builds depend on ftp GCE images are required by Google to include their source code; we do this by extracting {src,ports}.txz into the images, from the (legacy) distribution sets. Make sure those distribution sets actually exist. Reviewed by: ivy MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53567 (cherry picked from commit 7f536b1c1146c4bc5cde336e1fe7a083f2874f11) --- release/Makefile.vm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index a04f779ebebb..142fd6e7bdf5 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -129,6 +129,13 @@ ${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE= ${_CW:tl}.${_FS}.${_FMT} cw-${_CW:tl}-${_FS}-${_FMT}: cw-ec2-base-${_FS}-${_FMT} .endif +# Special handling: GCE images ingest src.txz and ports.txz and expect them +# to be in the /ftp/ directory. Note: This will need to be reworked before +# distribution sets go away! +.if ${_CW} == GCE +cw-${_CW:tl}-${_FS}-${_FMT}: ftp +.endif + cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} ${PKGBASE_REPO_DIR} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ From nobody Wed Nov 5 22:03:31 2025 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 4d1zq80KgFz6DvT1; Wed, 05 Nov 2025 22:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zq75j53z3Krl; Wed, 05 Nov 2025 22:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pl2nEwX1kfNNZRdUmXHsCiUpQcSOACYY0k75TAwMQVk=; b=p9AyYdTSzPxmqFfrHzkTWqG5BX2gZkIyjp3xsXJ2h9Z4KIhHtBXFhftRf+QxmFogFr8TJJ i2BjecIx+qL76VlIEtOyI08EjP11BwSORTiby5R29lHhN5rUYeTP1UMiiWiRa2rxoK8F5E clcHDMXUKvIWSYFJMQyW6x/w7pno5DWOyr4pZaZS5Tx7v9KodfGyBm83+feVfog5Ab/La/ oGOYNnugE0+R/4kqDRJdqBnZ6iQkCYCNHnIHCmFGfuXHK5RpBuxKNmQC4JzsWLlHM7dVc/ wivbLh7hBBB21UJfJ1LGoVH7oHPtbFYHmvlmBNtHtpgaMFmtKx0Eb3XNZC0bvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pl2nEwX1kfNNZRdUmXHsCiUpQcSOACYY0k75TAwMQVk=; b=xwleaA6RXl410LE6hPFXqodqSG1QOvd1BGqtTGnP0uoi9SZN/DBgPKX57gPU8Y4WxF7t8L K4FfcArEwbRGI++Cyked+f+7eVODoYNy0fD7njaspBuhi9GFqupQsCr+CSLBm11mPqM0JR mJEZZbJtQsKEV3HFwCY2WxGQSVrf/lg/2KGLZbmutOj/ciZCQtMAXCPcMfD1N6qSma53dh o9tvIBX9Df3hH+eCyj6sezaEDYT+DKpZwF0dB9biT6k7+CTNmyDbHmPUNIwM2RFq6fStP1 zE+qmfjPTA+Afzqt00nQYLkk99HlGVZOmWpMmHDtPMnlAezMgqTx+oUPPropuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762380211; a=rsa-sha256; cv=none; b=rkvAnmVKFS2x5GV/aoWoL3hCJ+BC5fu0ix2UUN8iIB7DSw/bUT+9V/V8Hg7CPtjoRzGsiW GG98uo3IGMeV8AUuUxcWOgAGNj2zxhTHi6wWa2LK3T1iLcXKzv2v+p/8V1ChmF4bp6/ZS1 hmiKoLHfIgasT+txtlmSQIo1S06MokNS++bKnz4FqvtjB3SJlxp8w8HbUDg9f5qvSrLnti nTN83AmlP4/Kj2ye6CHlPkNuraj+m/Y3eUgZeap73iEVdujC3BJ15ZolC9lV1FZOmMp+gU hPNGzrEN0/QmJ1A5iLEv+AH5coMGMjkeVjJqg1FupKo90r/oPJ22+IOhfi4BqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zq75Cp9z11rp; Wed, 05 Nov 2025 22:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5M3VZm068528; Wed, 5 Nov 2025 22:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5M3V61068525; Wed, 5 Nov 2025 22:03:31 GMT (envelope-from git) Date: Wed, 5 Nov 2025 22:03:31 GMT Message-Id: <202511052203.5A5M3V61068525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: dc1a819de181 - stable/15 - release: Don't try to fetch distfiles for pkgbase List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dc1a819de181cebdab6ec51cff02e397e8c4471c Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dc1a819de181cebdab6ec51cff02e397e8c4471c commit dc1a819de181cebdab6ec51cff02e397e8c4471c Author: Colin Percival AuthorDate: 2025-11-03 21:42:56 +0000 Commit: Colin Percival CommitDate: 2025-11-05 22:03:21 +0000 release: Don't try to fetch distfiles for pkgbase In order to comply with the require that GCE images must include their source code, we fetch distfiles for all of the packages installed into GCE images. This fails for obvious reasons for packages with an origin of base/*; filter those out to generate the list to fetch. Reviewed by: ivy MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53568 (cherry picked from commit 05b3a45cd065c93cc1262d31675e3e102784400a) --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index b0a65c2981e1..ef1cf7e8f985 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -100,7 +100,7 @@ EOF fi if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} - _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a) + _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a | grep -v ^base/) for PACKAGE in ${_INSTALLED_PACKAGES}; do make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \ DISTDIR=${DESTDIR}/usr/ports/distfiles From nobody Wed Nov 5 22:03:32 2025 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 4d1zq917vKz6Dw75; Wed, 05 Nov 2025 22:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1zq86Zgbz3Kxt; Wed, 05 Nov 2025 22:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGfjTqUOjp1FPneDQ4orQ+NSgKWTynhLBx1xRVou9eI=; b=kXazB/iwLidKeZ8zWCpCo9DOKMLVt2cQYpDO/jxcRu9QhYHu8EWti1jXrLuQgS4vPO1MPb Rr2W8ZgHK6TRKVJ2705b06Y65JUyki63Ki6cI9m7OpKT44XGxfNWuFEn6rxGIj0vCT//io cAiFwjfAfDhtIgyoYvFMmpRYRyOXfVc9RR5d/Z9PtTrs+M+4C7v/G4Q+EhkCJMxMuywYS2 kcPWG73O4r78i1BsF8UUGooHmaFWRQVep5TTLPL9p5i6LQXquHhMQaVbL2tRPQeRrhddvN pHEtK/CsE9AOlkJa8BdXZo34Tr9zWlfXmgpsu4M6UEYhRl3KL9G2KXYzLz9JHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGfjTqUOjp1FPneDQ4orQ+NSgKWTynhLBx1xRVou9eI=; b=Zt+utkrsNNlJTeLBZq0HoF6EJUZ47csM0KihUOStqPL0kltchsgLL4W9F3GawYwHVpAC/j 28sahop+jL9TTokJoR9IbjEKcMmXqvuh3rTOux7fU5BXPtPDMJtATP4Ul+bnaBsYtlm1c7 z3RYH1PlDIKAVDc89fEwp8IijjVwlOjwtgGBLMpINvueDUfmWvB/SszB7jUxsb7HMbrejd 4zEpMXCZsYLQSnzDOHeG88AsLPMbkcb8UQCNBxrunh8D2a9osX0np93/21vHRfx80DWVyd TixQZMtq01EvPv29BbzQG8M+oLIDZepVZvE3U4JBouq1JdTZz12rlFZwdshJyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762380212; a=rsa-sha256; cv=none; b=wNB6FmPBqhtPYzQr3L/Y91cNrOy52DYtvNCP+LB39A7pjXDAq/UYuQoqpWgs2dQb0r2yHz euLRjuf+b9OhBOX4D6+N68e/HN8THAMCYp5lO2SRnTRNhwPEO5IN5aaC1IyB0T8cw6qkk9 O/2ku7VgtduyGZ+5zDHM0JVBt4yxNmbJYVRexkEHmVkUJMuOPNANzQtJvgUnZMsUDKOkCi IEw7KWsbkJfjKzZjsrhLMSxkmj6h9fzi/pJHy/VQzuGQkNB1RIKGslzwHxmCTTTkehx9d/ D//06zZFpPMSCWqUjZfYkkyWtfZTtTjapZqRXMR3/bXE8D2ZXakndSGlW+SXvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1zq85qqDz12GR; Wed, 05 Nov 2025 22:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5M3Wr7068562; Wed, 5 Nov 2025 22:03:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5M3WHU068559; Wed, 5 Nov 2025 22:03:32 GMT (envelope-from git) Date: Wed, 5 Nov 2025 22:03:32 GMT Message-Id: <202511052203.5A5M3WHU068559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: cd4f1705af83 - stable/15 - release: Make fetch happen in GCE images List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd4f1705af8382257b16148f855289a92d9ef82f Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cd4f1705af8382257b16148f855289a92d9ef82f commit cd4f1705af8382257b16148f855289a92d9ef82f Author: Colin Percival AuthorDate: 2025-11-03 21:44:46 +0000 Commit: Colin Percival CommitDate: 2025-11-05 22:03:22 +0000 release: Make fetch happen in GCE images We want to fetch distfiles, regardless of whether they contain known vulnerabilities or we're building images for a different version of FreeBSD. Reviewed by: ivy MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53569 (cherry picked from commit 8234c1899b305bcd23323a5870e459028b91bfe4) --- release/tools/gce.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index ef1cf7e8f985..2fa23f6e54f4 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -103,8 +103,9 @@ EOF _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a | grep -v ^base/) for PACKAGE in ${_INSTALLED_PACKAGES}; do make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \ - DISTDIR=${DESTDIR}/usr/ports/distfiles - + DISTDIR=${DESTDIR}/usr/ports/distfiles \ + DISABLE_VULNERABILITIES=YES \ + I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES done fi From nobody Thu Nov 6 00:38:37 2025 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 4d23G53FlYz6FBDV; Thu, 06 Nov 2025 00:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d23G52pyvz3dKN; Thu, 06 Nov 2025 00:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762389517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M17EUw7zyZz2WdHovyv33ah9H/IBLU8am7rc/Yqcc5A=; b=SVBTMluSfL6d08NCH8nFWQI+l4b975/mvSnLSb6YEnZJhwo13yw4YshpgKCTWwtOzFnklr IHGcQVJLsHGQlzSbLz458u61jiBcvv0PgavNFRuWgTXyyNzOaiw5p/UASQ49CnFJyi6OxL uaotf4ZsWswiMBQslGursqH+qXJH5TzFhZGAq2ayG9C1cbAW7XmeQT8ZRXmXfr6OJd216b 465jW6A9hgb0fvCUJf58mMsIKdpxP60GfGegf6gkqEPAou8OfwGfjxbxzwhc1kEBxCPYhh 8fL1huuquYtVQNhrJ2PJeTJMGLcSCgCckrvVRkvADDAHjBLNYERsP8zBbjxBWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762389517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M17EUw7zyZz2WdHovyv33ah9H/IBLU8am7rc/Yqcc5A=; b=YrlZKoLWjoc6pAkKu8ztZZYtYz/LG/26u0EsJEQrig6thvc7ju2/EttoSVFtC5tvMV0D26 j93GLSHCMrVD9Bw9/veGP+2MP1j4je0V6hvvyKUeLal02+lI19Mp/qYYV4IvXrTySuD9Zu SXHmekG0Vrt2TM7A3lKMUXRGYAaa1CRndWPgmVlpHEVKrZIGCzwnXSzMMosevC8zH6Hjcj DglRE+oWkxENyyYQZIWSIh6ZH6CHbjgMaYX9ZxILgN5zFWsxULqjv6cll+cW05reTNynil yJIMjPNGuRB0AwhDKmo4UyFR7j8O00rNQVpCkEY2F3Qr5G6BVIc5p3tMrIECww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762389517; a=rsa-sha256; cv=none; b=qELAH3sOpsSj4Ukb6Ed0a4fMWQYtVhqj6YuyJC/p2r6eA5sK/6ZEn0aoyQJpGWQpDmBHwz qpdT/zBtE3Dy6v/07w9+e5bbKSWU2CKptQa1leSfmq7bDFamkooGQ9PyUDpi2+112YFdnZ fN4SRsY1+kLrj1TExCN/xk8kxer/OuEbgdRH5+pke3JOTozN7haVA+rDyAVdmiDV/Qoz9V IqxKNZJW7BzzA/NZZUL9m74nfuFYA1Fm3nRAeT4zhvzFt8dFk1kp9CoMjmGxyayxDk9mYm UqiqGbatqxmwfWw4uETJYpmAR0cx3AjbZyzWBckX5ZI29g+u/89kXMdyqQEpUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d23G52QgKz15Mt; Thu, 06 Nov 2025 00:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A60cbX1052176; Thu, 6 Nov 2025 00:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A60cbwv052171; Thu, 6 Nov 2025 00:38:37 GMT (envelope-from git) Date: Thu, 6 Nov 2025 00:38:37 GMT Message-Id: <202511060038.5A60cbwv052171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: a1c3537148a5 - stable/15 - fusefs: fix intermittency in the BadServer.ShortWrite 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a1c3537148a59f6a1c86ebcb686b2e2c8e404b5f Auto-Submitted: auto-generated The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=a1c3537148a59f6a1c86ebcb686b2e2c8e404b5f commit a1c3537148a59f6a1c86ebcb686b2e2c8e404b5f Author: Alan Somers AuthorDate: 2025-10-14 02:18:48 +0000 Commit: Alan Somers CommitDate: 2025-11-06 00:25:19 +0000 fusefs: fix intermittency in the BadServer.ShortWrite test This test implicitly depended on the order in which two threads completed. If the test thread finished first, the test would pass. But if the mock file system thread did, it would attempt to read from an unmounted file system, and fail. As a result, the test would randomly fail once out of every several thousand executions. Fix it by telling the mock file system's event loop to exit without attempting to read any more events. Reported by: Siva Mahadevan MFC after: 1 week Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53080 (cherry picked from commit d1bd541b385d49d2ae3a8bad9df72779b606e208) --- tests/sys/fs/fusefs/bad_server.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index af2ca146e431..c3d195735446 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -65,6 +65,11 @@ TEST_F(BadServer, ShortWrite) out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; m_mock->write_response(out); + /* + * Tell the event loop to quit. The kernel has already disconnected us + * because of the short write. + */ + m_mock->m_quit = true; } /* From nobody Thu Nov 6 00:38:38 2025 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 4d23G65KF9z6FB3F; Thu, 06 Nov 2025 00:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d23G63Fkmz3dHT; Thu, 06 Nov 2025 00:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762389518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Avjrm4ckyo+pbtMVXGLBz2AiXLkODC5OrMXJdQjwly4=; b=JRoSdKrh1SezGeKOytkidi8de//9RnMYAk6KOQbLj0q4V18j8u9Eu+F0y8m73hPLth0Pc6 Q95ErzztE8q/q5iINoG5fVAm/KejRxHdMjwbLKB62x6fvhHXKjefNYXZpc9XPdTBWLPmMO gkoYRIvgwuoDGdVSIiRsLSvn3R992kiKl1QkU30o2xrvrocSTtBlxvHwnE3pIIMaUmWYiQ CMzFj+pSO1pNacSz3a4JYXf1r79Tu/a8sRMhRZ6j5ke7XACIxLowFfvNKOmeTp7KVcyV7m pOy2nDb33a+RXj1SnoSwEMJwLMIbd7Rs5qgoCOLtfwZcoEuCIRSO8E8N2eKDZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762389518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Avjrm4ckyo+pbtMVXGLBz2AiXLkODC5OrMXJdQjwly4=; b=AVCFL9b5j592qc7AvjxkY8E2gu2qNYMW9r09pBoVnnYC3lyKGHaek5Cxxy+M1F6rIDIFx5 YzS2q2WwCAtLqmBft6uUiO1qeQX5G5v2PNNBaioh7fWoipEPR1PKlUE6VsYjLy8QiVNace Z+fvTbL5Jtdd3MpTSCZhYqbWlu9NriDtTBRThj3M41KTFzs9ZeoTyxhaSIQAhTUj8CjemY hpL7o+LlFO4dKxL65VPRI4tuafVBWM7RPaW/gT6iea66k5LSnRRivJOlzb+I1XZF4ixl48 ImsqjclhXo9IFrQsyqp5H3dYEXsfh0hOr9f1vcslku8990i4gHaWvOTn+S72iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762389518; a=rsa-sha256; cv=none; b=FjWbzxWOUPQDCHUZmfvPEXDPSSw2RLF2hG6wkyMAi0bdH/GTZbSg0mdX5x13H3h6FVSosN GdQTd4s/cc0+xRpqzXPtoztiGOGy29XTVKmR7BFD7P+toJKVtdNaKFbZYoEZh46aAJse7I ZD7QAqc1RGNzCrl1RIChdGR2uwUWzee/4iy5XRN9QQXYkqqNIWgFtGbCKXfTBouE3OOID4 kVA8kfS9l4k30Ixkpx1QiOPpUhRmL0KDUG9nRTNtUegixOBluB3A4t3BulxOjCORvH3rzN chXSnkh7CNprDw7JgsFQ/XqYd3QQkLPmsQCj2vMQF3oQ7XEzESAuOYaVsvknzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d23G62sdKz15tK; Thu, 06 Nov 2025 00:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A60ccTM052217; Thu, 6 Nov 2025 00:38:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A60ccno052214; Thu, 6 Nov 2025 00:38:38 GMT (envelope-from git) Date: Thu, 6 Nov 2025 00:38:38 GMT Message-Id: <202511060038.5A60ccno052214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f0cf086c05d8 - stable/15 - fusefs: Fix intermittency in the BadServer.ShortWrite test case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0cf086c05d86f962d259895bcb50ba8ca4c10e0 Auto-Submitted: auto-generated The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f0cf086c05d86f962d259895bcb50ba8ca4c10e0 commit f0cf086c05d86f962d259895bcb50ba8ca4c10e0 Author: Alan Somers AuthorDate: 2025-10-25 22:38:30 +0000 Commit: Alan Somers CommitDate: 2025-11-06 00:25:23 +0000 fusefs: Fix intermittency in the BadServer.ShortWrite test case We were using the m_quit bit for two similar but distinct uses: * To instruct the server to quit * To cope with the kernel forcibly unmounting the fs Fix the intermittent test failure by adding a separate bit, m_expect_unmount, to handle cases like the latter. Reported by: Siva Mahadevan MFC after: 1 week Revied by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53357 (cherry picked from commit d86025c1d49c84c4dc8c3635c83c078ad56e5a53) --- tests/sys/fs/fusefs/bad_server.cc | 8 ++++---- tests/sys/fs/fusefs/mockfs.cc | 5 +++-- tests/sys/fs/fusefs/mockfs.hh | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index c3d195735446..825523cac2bb 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -64,12 +64,12 @@ TEST_F(BadServer, ShortWrite) out.header.error = 0; out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; - m_mock->write_response(out); /* - * Tell the event loop to quit. The kernel has already disconnected us + * Tell the event loop to quit. The kernel will disconnect us * because of the short write. */ - m_mock->m_quit = true; + m_mock->m_expect_unmount = true; + m_mock->write_response(out); } /* @@ -98,7 +98,7 @@ TEST_F(BadServer, ErrorWithPayload) out.push_back(std::move(out1)); // The kernel may disconnect us for bad behavior, so don't try - // to read any more. + // to read or write any more. m_mock->m_quit = true; })); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 55c191716629..b6a32d9b60af 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -433,7 +433,8 @@ MockFS::MockFS(int max_read, int max_readahead, bool allow_other, m_child_pid(-1), m_maxwrite(MIN(max_write, max_max_write)), m_nready(-1), - m_quit(false) + m_quit(false), + m_expect_unmount(false) { struct sigaction sa; struct iovec *iov = NULL; @@ -979,7 +980,7 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && !m_quit) { + if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { m_quit = true; FAIL() << "read: " << strerror(errno); } diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index 4b0628d34dd7..f98a5337c9d1 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -360,6 +360,9 @@ class MockFS { /* Tell the daemon to shut down ASAP */ bool m_quit; + /* Tell the daemon that the server might forcibly unmount us */ + bool m_expect_unmount; + /* Create a new mockfs and mount it to a tempdir */ MockFS(int max_read, int max_readahead, bool allow_other, bool default_permissions, bool push_symlinks_in, bool ro, From nobody Thu Nov 6 00:38:39 2025 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 4d23G767rvz6FB5m; Thu, 06 Nov 2025 00:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d23G74Hvtz3dKS; Thu, 06 Nov 2025 00:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762389519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j76NDAXS63ptblTrD9t9/GMT4P/rIVPfcm+aqhstBrk=; b=gUGzKMO/NAHyRE7ReHzrprQ5grtJdLafFb67M/6LRj1BOodIm3BVuDZM0r+DqL6OU73p8p GkUEUNI11NnVdq5FsDBl481ETpd3rsSOL0eEx8Zqzh06/Xx5jUXg+qkyRs0ezH3hEMKcrw 8PwUjeIEoYZLdijUXpmuY6lnKcjrCArAPKYNwi+lM+OOWSOicUw6aXgnMlc77NiN0F5NUs nDNBE1f+c0G9iUmOqBqpJwsCOXdIjcVRkTsrzLQOKpy9O2s8nCpv4Vp+xlPV0iyabZaIqP yy6m2rpnu7np7arNkxs+vadvrN9NHyVI+IRz0Eckey2um0+KZUi0dHpgKiDCqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762389519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j76NDAXS63ptblTrD9t9/GMT4P/rIVPfcm+aqhstBrk=; b=mLG6e+ajbZh1Do3pdtGl/kVta/rOUvYScskNhQg0QS2jxuEphQXucOrS9ef1IaI6d8KOAg WBzGar8pNe70hWSvIjmXVZPoh+w1B0bRQv03Ne3O3arM0S60eP72CiFNlJy2G+yUKjT3a5 6FVcjuErWhJNu7ryY0ammqsuLTWj8xtXsimT1BWHmplTST+H6Bh41y01VGY+TzOyi37Fz0 zoGzcsMq9C0lPn5glcbMHJr93Ilpqf00Hzq/px4/WgCT+MBBZkVmd+Q3zDLFOnMLg6oj4d vTOUuDES1a7eY6NXs+ZrGM+LeJQfNLuHrd+yc035DbSZ4DrZUEw9/eY+qWxWiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762389519; a=rsa-sha256; cv=none; b=xUEGCHKA6AJ+oVjs6H0SUC9FdSeUIukxQYjrOl7LPVJY4zbR7E7pdcgzz9kZgeGTrJUZG1 iuuKMxgGYwR1pv/CEAgVjut635bOCL5GP/6Xd9DrmgeOJNCAAqZVtl7M8vSGIHyilrnerV hri0hgl7k17a2xK/c/t/ssz+VJ9Vj28MM8KmaAZAAUFkSvfhSB0/vJJlFU3Z7Ofy68Gxof oKqUl8venGXxAawPB0ggR9UnOYp9gDR45RqklSxG83YDGBP4IWESU03BtjFIbDvn+zkuZd 4ujgEukVmG4uEW6wEn3utQ+3fRT0LEwv0BOUPHSvilpBh6gVloHEJAXUANnhnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d23G73lQ5z166V; Thu, 06 Nov 2025 00:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A60cdkm052254; Thu, 6 Nov 2025 00:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A60cde9052251; Thu, 6 Nov 2025 00:38:39 GMT (envelope-from git) Date: Thu, 6 Nov 2025 00:38:39 GMT Message-Id: <202511060038.5A60cde9052251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: a23bd71deaad - stable/15 - fusefs: respect the server's FUSE_SETXATTR_EXT flag List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a23bd71deaad478cbe41ae756b96ea7a32537311 Auto-Submitted: auto-generated The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=a23bd71deaad478cbe41ae756b96ea7a32537311 commit a23bd71deaad478cbe41ae756b96ea7a32537311 Author: Alan Somers AuthorDate: 2025-10-26 18:06:51 +0000 Commit: Alan Somers CommitDate: 2025-11-06 00:25:27 +0000 fusefs: respect the server's FUSE_SETXATTR_EXT flag FUSE protocol 7.33 extended the FUSE_SETXATTR request format. But the extension is optional. The server must opt-in by setting the FUSE_SETXATTR_IN flag during FUSE_INIT. We were wrongly using the extended format for any server using protocol 7.33 or later. PR: 290547 Co-authored-by: CismonX Fixes: d5e3cf41e89 ("fusefs: Upgrade FUSE protocol to version 7.33") MFC after: 3 days (cherry picked from commit e8449c0e0fcb8a3eb5872cbee5c3dde4b05a5f50) --- sys/fs/fuse/fuse_internal.c | 5 +++- sys/fs/fuse/fuse_ipc.h | 1 + sys/fs/fuse/fuse_vnops.c | 4 +-- tests/sys/fs/fusefs/xattr.cc | 67 ++++++++++++++++++++++++++++++++++---------- 4 files changed, 59 insertions(+), 18 deletions(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index 61fe2ed032f6..eba0a8a79ff3 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -1063,6 +1063,8 @@ fuse_internal_init_callback(struct fuse_ticket *tick, struct uio *uio) if (!fuse_libabi_geq(data, 7, 28)) fsess_set_notimpl(data->mp, FUSE_COPY_FILE_RANGE); + if (fuse_libabi_geq(data, 7, 33) && (fiio->flags & FUSE_SETXATTR_EXT)) + data->dataflags |= FSESS_SETXATTR_EXT; out: if (err) { fdata_set_dead(data); @@ -1115,7 +1117,8 @@ fuse_internal_send_init(struct fuse_data *data, struct thread *td) */ fiii->flags = FUSE_ASYNC_READ | FUSE_POSIX_LOCKS | FUSE_EXPORT_SUPPORT | FUSE_BIG_WRITES | FUSE_WRITEBACK_CACHE - | FUSE_NO_OPEN_SUPPORT | FUSE_NO_OPENDIR_SUPPORT; + | FUSE_NO_OPEN_SUPPORT | FUSE_NO_OPENDIR_SUPPORT + | FUSE_SETXATTR_EXT; fuse_insert_callback(fdi.tick, fuse_internal_init_callback); fuse_insert_message(fdi.tick, false); diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h index 3bfc859dbac9..d9d79f38c269 100644 --- a/sys/fs/fuse/fuse_ipc.h +++ b/sys/fs/fuse/fuse_ipc.h @@ -243,6 +243,7 @@ struct fuse_data { #define FSESS_MNTOPTS_MASK ( \ FSESS_DAEMON_CAN_SPY | FSESS_PUSH_SYMLINKS_IN | \ FSESS_DEFAULT_PERMISSIONS | FSESS_INTR) +#define FSESS_SETXATTR_EXT 0x8000000 /* extended fuse_setxattr_in */ extern int fuse_data_cache_mode; diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index be600b57f0a3..00ad11108ee0 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2777,7 +2777,7 @@ fuse_vnop_setextattr(struct vop_setextattr_args *ap) strlen(ap->a_name) + 1; /* older FUSE servers use a smaller fuse_setxattr_in struct*/ - if (fuse_libabi_geq(fuse_get_mpdata(mp), 7, 33)) + if (fuse_get_mpdata(mp)->dataflags & FSESS_SETXATTR_EXT) struct_size = sizeof(*set_xattr_in); fdisp_init(&fdi, len + struct_size + uio->uio_resid); @@ -2786,7 +2786,7 @@ fuse_vnop_setextattr(struct vop_setextattr_args *ap) set_xattr_in = fdi.indata; set_xattr_in->size = uio->uio_resid; - if (fuse_libabi_geq(fuse_get_mpdata(mp), 7, 33)) { + if (fuse_get_mpdata(mp)->dataflags & FSESS_SETXATTR_EXT) { set_xattr_in->setxattr_flags = 0; set_xattr_in->padding = 0; } diff --git a/tests/sys/fs/fusefs/xattr.cc b/tests/sys/fs/fusefs/xattr.cc index 0ab203c96254..afeacd4a249e 100644 --- a/tests/sys/fs/fusefs/xattr.cc +++ b/tests/sys/fs/fusefs/xattr.cc @@ -100,7 +100,11 @@ void expect_removexattr(uint64_t ino, const char *attr, int error) ).WillOnce(Invoke(ReturnErrno(error))); } -void expect_setxattr(uint64_t ino, const char *attr, const char *value, +/* + * Expect a FUSE_SETXATTR request in the format used by protocol 7.33 and + * later, with the FUSE_SETXATTR_EXT bit set. + */ +void expect_setxattr_ext(uint64_t ino, const char *attr, const char *value, ProcessMockerT r) { EXPECT_CALL(*m_mock, process( @@ -119,16 +123,10 @@ void expect_setxattr(uint64_t ino, const char *attr, const char *value, ).WillOnce(Invoke(r)); } -}; - -class Xattr_7_32:public FuseTest { -public: -virtual void SetUp() -{ - m_kernel_minor_version = 32; - FuseTest::SetUp(); -} - +/* + * Expect a FUSE_SETXATTR request in the format used by protocol 7.32 and + * earlier. + */ void expect_setxattr_7_32(uint64_t ino, const char *attr, const char *value, ProcessMockerT r) { @@ -148,6 +146,15 @@ void expect_setxattr_7_32(uint64_t ino, const char *attr, const char *value, } }; +class Xattr_7_32: public Xattr { +public: +virtual void SetUp() +{ + m_kernel_minor_version = 32; + Xattr::SetUp(); +} +}; + class Getxattr: public Xattr {}; class Listxattr: public Xattr {}; @@ -182,6 +189,13 @@ void TearDown() { class Removexattr: public Xattr {}; class Setxattr: public Xattr {}; +class SetxattrExt: public Setxattr { +public: +virtual void SetUp() { + m_init_flags |= FUSE_SETXATTR_EXT; + Setxattr::SetUp(); +} +}; class Setxattr_7_32:public Xattr_7_32 {}; class RofsXattr: public Xattr { public: @@ -773,7 +787,7 @@ TEST_F(Setxattr, enosys) ssize_t r; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 2); - expect_setxattr(ino, "user.foo", value, ReturnErrno(ENOSYS)); + expect_setxattr_7_32(ino, "user.foo", value, ReturnErrno(ENOSYS)); r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, value_len); @@ -800,7 +814,7 @@ TEST_F(Setxattr, enotsup) ssize_t r; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); - expect_setxattr(ino, "user.foo", value, ReturnErrno(ENOTSUP)); + expect_setxattr_7_32(ino, "user.foo", value, ReturnErrno(ENOTSUP)); r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, value_len); @@ -820,7 +834,7 @@ TEST_F(Setxattr, user) ssize_t r; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); - expect_setxattr(ino, "user.foo", value, ReturnErrno(0)); + expect_setxattr_7_32(ino, "user.foo", value, ReturnErrno(0)); r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, value_len); @@ -839,7 +853,7 @@ TEST_F(Setxattr, system) ssize_t r; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); - expect_setxattr(ino, "system.foo", value, ReturnErrno(0)); + expect_setxattr_7_32(ino, "system.foo", value, ReturnErrno(0)); r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, value_len); @@ -847,6 +861,10 @@ TEST_F(Setxattr, system) } +/* + * For servers using protocol 7.32 and older, the kernel should use the older + * FUSE_SETXATTR format. + */ TEST_F(Setxattr_7_32, ok) { uint64_t ino = 42; @@ -863,6 +881,25 @@ TEST_F(Setxattr_7_32, ok) ASSERT_EQ(value_len, r) << strerror(errno); } +/* + * Successfully set a user attribute using the extended format + */ +TEST_F(SetxattrExt, user) +{ + uint64_t ino = 42; + const char value[] = "whatever"; + ssize_t value_len = strlen(value) + 1; + int ns = EXTATTR_NAMESPACE_USER; + ssize_t r; + + expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); + expect_setxattr_ext(ino, "user.foo", value, ReturnErrno(0)); + + r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, + value_len); + ASSERT_EQ(value_len, r) << strerror(errno); +} + TEST_F(RofsXattr, deleteextattr_erofs) { uint64_t ino = 42; From nobody Thu Nov 6 03:38:05 2025 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 4d27F95zw4z6Fk5M; Thu, 06 Nov 2025 03:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d27F95KSsz3wQr; Thu, 06 Nov 2025 03:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762400285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wHGXSi55GMhctkQX71BZLjgcEdzm91YhbDu7Uk3IQg=; b=ymQrorFjpDOhSxvOhjIGtQB05lDi6w+3pD20HTKosks5TSmmhW5KmaPIJ+W81AAKtxUnI8 Hf9mamHnPx8X6xGKyO1WDrxbA7BA4NpTJKEdxBdaPQlpCgGmzk5I6TThK2rgp9l941FZgq NDjH2uwkmpwmnPWTLKgZ9StRi9fJxCFQWEchk0xne7x6/sgm/E8CSLl8HZuQ0mbANF+6Kg uoTYWhxYMxMm5latUQdz4v3ja6Y7kZ8L7K1jYlaJI3q1VrlcMgI1hPh+9JdArrRnSiW9Uw mrxX+5slJUiFh5t4gVDDsyRfMA/zuLCkLupTerqKcza7cU9KQ6fnjT1dgtFBnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762400285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wHGXSi55GMhctkQX71BZLjgcEdzm91YhbDu7Uk3IQg=; b=ZEF91V92aM1LvEGszjhlcupl5ZyIOo5OyBduu0/jidS7vqycjh8NUv+DszQW94s4+1IizH II9jubhR2q9vXZucioJT26DdslrYFS/ZkhqcqSAIRRYYLI7ryhVIP4zbsmvZv8JrTxr0YE EFfSF16uYbwyrg2TCGeBJcSVSpIRhZdYUi0UzDDfE+rxxG8gt/6fTd9houtvvx3eGdfZJJ XbQHHk3xc2fuJmhbvXy614YQ/KctJ1EtkEr2x8f3BWrjSOt+MAU3ZdB7+ODg/kVYAjx3eA /e6QnZFYaWqLTKJvaac6jWay1SbjHT9oTtrbMxUEuApuKoYdiMlEuLpSkZJF1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762400285; a=rsa-sha256; cv=none; b=URvoSS77T1U7IuPs5vWcgeMQNhk20wy9VFIxas4vsUVvHp+EjLC3l6Yvt98HBBFkdJTB0f Pb6BHZ3rWmIFQzFtJC+Cv0AiXkFh+asNO1NWaISkGS/bK2qsHRNCr0FSxbq7Sp6+KUAVJa MRz5IF1gb3bLO7Yb5P2SSOzqBiCyNkQnskl2IPjWwoUkogntb5k1NUndG8g1vfrLcDu4Cx FfkK9fiH3RYNns30v9iFMi78w83Ezpb5qTeyJDhca5J6z7ZvJRGPdc3FKNhzYj+s7KQT+w sbv2lAb1zqdAmNpGoCeqYSHfjyl2sRbIMpHFSukRM1/PLDqVHWz+6HImCm9E3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d27F94FQFz1BB2; Thu, 06 Nov 2025 03:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A63c5Ov090254; Thu, 6 Nov 2025 03:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A63c569090251; Thu, 6 Nov 2025 03:38:05 GMT (envelope-from git) Date: Thu, 6 Nov 2025 03:38:05 GMT Message-Id: <202511060338.5A63c569090251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 3ee596eeee19 - stable/15 - racct: Simplify skipping idle process in the throttling 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3ee596eeee198ede6860cf0c862fb5f8cfc81411 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3ee596eeee198ede6860cf0c862fb5f8cfc81411 commit 3ee596eeee198ede6860cf0c862fb5f8cfc81411 Author: Olivier Certner AuthorDate: 2025-10-29 15:47:25 +0000 Commit: Olivier Certner CommitDate: 2025-11-06 03:36:28 +0000 racct: Simplify skipping idle process in the throttling daemon In racctd(), commit c72188d85a79 ("racct: Improve handling of the pcpu resource") added a superfluous test to skip the idle process when computing the resource usage and checking for limits, consisting of a comparison of the considered process' pointer with that of the process of the first CPU's idle thread. The P_IDLEPROC flag introduced in commit 33be1632047c ("racct: Fix accounting of CPU time for the system idle process") is sufficient and simpler for this purpose. In the second loop throttling processes based on their %CPU usage, the test excluding processes not in PRS_NORMAL was not consistent with that of the first loop (which tests for the idle process also). This had no practical consequences except a superfluous call to racct_pcpu_available() as the RACCT_PCTCPU counter stays at 0 on the idle process (because of the first loop). Factor out the test in the new racct_proc_to_skip() function. No functional change intended. Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53455 (cherry picked from commit 9530c6f082ada9e6d0323f36697ce53997ab2326) --- sys/kern/kern_racct.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c index 7351e9cb6313..61e92678b54d 100644 --- a/sys/kern/kern_racct.c +++ b/sys/kern/kern_racct.c @@ -1236,16 +1236,20 @@ racct_updatepcpu_containers(void) racct_updatepcpu_post, NULL, NULL); } +static bool +racct_proc_to_skip(const struct proc *p) +{ + PROC_LOCK_ASSERT(p, MA_OWNED); + return (p->p_state != PRS_NORMAL || (p->p_flag & P_IDLEPROC) != 0); +} + static void racctd(void) { struct proc *p; - struct proc *idle; ASSERT_RACCT_ENABLED(); - idle = STAILQ_FIRST(&cpuhead)->pc_idlethread->td_proc; - for (;;) { racct_decay(); @@ -1253,12 +1257,7 @@ racctd(void) FOREACH_PROC_IN_SYSTEM(p) { PROC_LOCK(p); - if (p == idle) { - PROC_UNLOCK(p); - continue; - } - if (p->p_state != PRS_NORMAL || - (p->p_flag & P_IDLEPROC) != 0) { + if (racct_proc_to_skip(p)) { PROC_UNLOCK(p); continue; } @@ -1284,7 +1283,7 @@ racctd(void) */ FOREACH_PROC_IN_SYSTEM(p) { PROC_LOCK(p); - if (p->p_state != PRS_NORMAL) { + if (racct_proc_to_skip(p)) { PROC_UNLOCK(p); continue; } From nobody Thu Nov 6 03:38:06 2025 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 4d27FC0dRDz6Fk7Y; Thu, 06 Nov 2025 03:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d27FB6Z1Bz3wbr; Thu, 06 Nov 2025 03:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762400286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0W+iVrZuH9x4aDyePoI3+hZbQXPe2C13qiQ+OaAuSoI=; b=AOCmdtF12ZO3PHGMFbUyu/5r7Jh29S4mX2T5bfglk1wTsHCfhEz9K21yjnd3AJt5z8fkU0 9C9o5fjbay2K1Yxngg/zE2Lv0S8OFOkei1CybD6FOASWIefoKggxL3vjsoetcRj0FLKqox W1boS89nsFWchRnWgTxi5Vau7G2tjOUsr3Fwe4OS/dAQlW3EHecttzewyS5ukQl90sTCmF vYiN7O29+tvFqHYTiLFk9LY3NprFOs1jGaLuS38/9dKqn0WfoSLKA7xVdTXzuanb8TR4/k IBtczBT0v70jLx/JqJRrzVOgfobrutoGWmjD3UJm722RiBVOGwMzFQwISfTdLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762400286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0W+iVrZuH9x4aDyePoI3+hZbQXPe2C13qiQ+OaAuSoI=; b=o7ihpOWMuqpNvyqCTaxAQiCtD2BH9gdjTiGZF/qLmY2A2dR818Hu9xlSuxh/kBY18nJj67 7srX3fz9H4DcytVfzRTZ/X2KiV0xgCYYsDVgZUSsEFgXqQMsUAFghMHKWZpVJgjDXkjQ41 aUivcM7I7ENvnURIIudTejqPV6w+IsqhHb5kAEcuTT1xQNnwus3pU3LQNkXWU1ybutJb2u N7MR8KUJVeGQrZoEhKE5dkQE+wMAaF8HbdgEvHfKr4X4UWh2Xr4ZZbj43ms6nWFSMtwhkv PMoZ1lmad8qlGO39c7DWBKl/jvMnClh16iZoY5N56le+KSGcIyD7fbHq6Yt6vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762400286; a=rsa-sha256; cv=none; b=XL+78kqviTlzDBR8SMdns0ey+2IFO14SCMGu1556gUzQEeqt7ougmo6JXqOS2Hf10xYhGu D88s5QzPqDEabCGxYbXlk9FrTxU9KWb/iOci+S8lkbpYwOZaEngF7Qlnn+FEs6U4HCrzKq xSrfU+EDUP3kMl7zrrUMr8UFFewcDxoCPWc140VEqp9+WR/MJ/0UscCYUj7M8nrbAf2Pda R78J1987akZcLCtgAgOm9Rjw/6Yi1Ld2mrQg/MDDVAhrPGIlyTTwQWurCw61qLVWxVrzH1 263XNXvLNOnFl5ISvJ4e+bFHGvDGBLktfVaHfER0orS48FnICcDpJvkmEFuAGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d27FB59sYz1BB3; Thu, 06 Nov 2025 03:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A63c6IM090288; Thu, 6 Nov 2025 03:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A63c6a7090284; Thu, 6 Nov 2025 03:38:06 GMT (envelope-from git) Date: Thu, 6 Nov 2025 03:38:06 GMT Message-Id: <202511060338.5A63c6a7090284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 4db768b01cd7 - stable/15 - kern: Fix credentials leaks on RACCT but no RCTL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4db768b01cd78666949bbd67ba611e9e47ed710d Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4db768b01cd78666949bbd67ba611e9e47ed710d commit 4db768b01cd78666949bbd67ba611e9e47ed710d Author: Olivier Certner AuthorDate: 2025-10-29 16:46:39 +0000 Commit: Olivier Certner CommitDate: 2025-11-06 03:36:33 +0000 kern: Fix credentials leaks on RACCT but no RCTL Affected system calls: setuid(), setreuid(), setresuid(), jail_attach(), setloginclass(). In these system calls, the crhold() calls that, on RACCT, make the just-installed process credentials survive a concurrent change of the same credentials just after PROC_UNLOCK() were not matched by a corresponding crfree() when RCTL is off. In fact, in that latter case, they are simply not necessary, so wrap them with '#ifdef RCTL' stances. 'kern_rctl.c' causes a compile error if RACCT is not defined but RCTL is, so ease reading by not nesting '#ifdef's. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53456 (cherry picked from commit f4315ff8b3fee71eb0098864a84618f2f8ba85d5) --- sys/kern/kern_jail.c | 2 ++ sys/kern/kern_loginclass.c | 2 ++ sys/kern/kern_prot.c | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 267b60ffb5bc..523b7e314a10 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3047,6 +3047,8 @@ do_jail_attach(struct thread *td, struct prison *pr, int drflags) setsugid(p); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); diff --git a/sys/kern/kern_loginclass.c b/sys/kern/kern_loginclass.c index 55db6c28a1db..0c111c4f78d8 100644 --- a/sys/kern/kern_loginclass.c +++ b/sys/kern/kern_loginclass.c @@ -225,6 +225,8 @@ sys_setloginclass(struct thread *td, struct setloginclass_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index a4c5bcc52529..df725cfebd97 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -982,6 +982,8 @@ sys_setuid(struct thread *td, struct setuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); @@ -1390,6 +1392,8 @@ sys_setreuid(struct thread *td, struct setreuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); @@ -1536,6 +1540,8 @@ sys_setresuid(struct thread *td, struct setresuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); From nobody Thu Nov 6 03:38:07 2025 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 4d27FD6347z6Fk31; Thu, 06 Nov 2025 03:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d27FD1GSQz3wff; Thu, 06 Nov 2025 03:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762400288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s2iR5MM/tgl6uZmOYdRCnS27cKALNP9uACUJUYjm5Ho=; b=H0dkiMdBH/7jxypg+j2JPWx9+7EtD9vT7SEt9HrMpwxMkfcVTvioohbVpsMbtL38uyJYm9 uq37D5XMyEYI9W09vPrzhx/XH8bEwT4eUjdDzaiRmFCTj/W5gScyHY0ZnBm5YFZi7Boa2P K/3G3WFbdxdX6dax4kFEVyUonGGLc8Mf1w5Ck+ISfp5ntzjL2LD7FEazRReIloxJgUNcxz DxU4fChgmw9OAUK4drndJpxCIA5smLiAmRpprDDfL4iU1wxN3HnxJ1gRcAx+x3C1lUNB9H TPidrcMOHDNrDlCX1+lWInnWOfWFdOkNrF6inmpzw8/uyHLyrdjsEhVkbQLhVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762400288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s2iR5MM/tgl6uZmOYdRCnS27cKALNP9uACUJUYjm5Ho=; b=DIHP7PeexvGA+XZG6mv/kurWNyED5r/FmrzlncrX1Sd0F25lBL0H1ceulIzypv92jIt1cx 9Ck5/r6uKWPxGyGhEI+UyIfV65t3g47NrxjBHfiPkiwbElXoYdgqj1lhSvsON+CsMiKQj2 xIonUgOmpIMUSjRJfPVtUT0GB8HsKoCazYocjl233/b17OAhGniSae7rhyBfRNB+r9c0Jq 1hXOYS4UwvkGkE5S0j3LyxlkgNP/ks3ZsaW4B8gQzTauWC5RhSQ+X7S9DwOj54t3bd1YOM aEOrhb4tu11VqDGrgHmuNH6xG/upGksPJIl1Ts3FSChEAFYmlhP3rIEWBuVCSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762400288; a=rsa-sha256; cv=none; b=lie+lPwaLlxXhUqUtj1YZe7MW1X2Xomi1FGlbSHgHY7WjDL5+RMVZS7vliLxaepCFFmH7A OqDecYM1MOXYM6iUZhijHW1Carweb79hWhdmjMSzVfsAed1LMpYn86XKVThEbvsUP9OX+/ xm8whP12j0XkLlZa9THN/YPdI/XjtNw4PBI0p0H42HbKwU8za+bHRi6mSjtLXTxoO6o1g1 ahym1+4XSyaizOXRknekBTSoAoTgPQZbI0ZKqpjJ4dvN6H5yrTLXQFj/9TlKP6IWQof6YZ 3pxLEFzMpkafmOHN83rRilN2hQ1Z4Fei9V80F3s3F9vpSXL4YVy9sM6sVJ8UCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d27FC5dzpz1BFD; Thu, 06 Nov 2025 03:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A63c7Q8090323; Thu, 6 Nov 2025 03:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A63c7Ni090320; Thu, 6 Nov 2025 03:38:07 GMT (envelope-from git) Date: Thu, 6 Nov 2025 03:38:07 GMT Message-Id: <202511060338.5A63c7Ni090320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 2e76660cb71d - stable/15 - setcred(): Fix RACCT resource accounting on credentials change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2e76660cb71dc113a4f4e0eb05eb190d7fc99e7f Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2e76660cb71dc113a4f4e0eb05eb190d7fc99e7f commit 2e76660cb71dc113a4f4e0eb05eb190d7fc99e7f Author: Olivier Certner AuthorDate: 2025-10-29 17:07:59 +0000 Commit: Olivier Certner CommitDate: 2025-11-06 03:36:33 +0000 setcred(): Fix RACCT resource accounting on credentials change When credentials are changed, we need to adjust the sum of resources associated to the initial and new process' user IDs (and old and new login classes and jails, but setcred() does not change them) for them to stay consistent. PR: 290352 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53457 (cherry picked from commit 2be5127c4a31bacac9b4158395bfa844f6033626) --- sys/kern/kern_prot.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index df725cfebd97..3c145851b683 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -696,7 +696,7 @@ kern_setcred(struct thread *const td, const u_int flags, gid_t *groups = NULL; gid_t smallgroups[CRED_SMALLGROUPS_NB]; int error; - bool cred_set; + bool cred_set = false; /* Bail out on unrecognized flags. */ if (flags & ~SETCREDF_MASK) @@ -839,17 +839,32 @@ kern_setcred(struct thread *const td, const u_int flags, if (cred_set) { setsugid(p); to_free_cred = old_cred; +#ifdef RACCT + racct_proc_ucred_changed(p, old_cred, new_cred); +#endif +#ifdef RCTL + crhold(new_cred); +#endif MPASS(error == 0); } else error = EAGAIN; unlock_finish: PROC_UNLOCK(p); + /* * Part 3: After releasing the process lock, we perform cleanups and * finishing operations. */ +#ifdef RCTL + if (cred_set) { + rctl_proc_ucred_changed(p, new_cred); + /* Paired with the crhold() just above. */ + crfree(new_cred); + } +#endif + #ifdef MAC if (mac_set_proc_data != NULL) mac_set_proc_finish(td, proc_label_set, mac_set_proc_data); From nobody Thu Nov 6 04:01:13 2025 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 4d27ls5SXjz6FlmD; Thu, 06 Nov 2025 04:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d27ls4zLCz40VK; Thu, 06 Nov 2025 04:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762401673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vw9oHkVJ7A/JeW4+FBzlxzD2RWMa2HJMvMUA+5BooMg=; b=AQy0TKmnfZY5+aQI1m9ayAc4EaJqeeYWm3I/Z6vi3NZd+ets8X2mdnZQYNFuVuDJVXA6PY t9n3pv+Pq/28xPyykudo1hkChM6pknzQmSawFBTzHnimxrEnWVQQtXShkFHTBDQp8xfYSS R1wxU+88tTSpGMpIYcWN9QSR1Wn6szpTGJoP+y9XMB3PdllkMELbkOfgXBkx52YO6kjMMq e1MWBkycGfcH977wPKc3/8vbmyVLmFbbSO4YEzFXDA47I81bA31bzx6sj22ET4f8OXSPCR Ii1zHhY55WdjsKLTur5Y6Ljypq8VQRImm9RDKrisM1cx6kuDqvG7LzFllAonmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762401673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vw9oHkVJ7A/JeW4+FBzlxzD2RWMa2HJMvMUA+5BooMg=; b=bzDNktfqaVzpXGAmXI419zA8BzVuSwCmoxVWSRlUXuou9iBjlFrnqFwHWFUqlvZa1XoI2l 8m4R8V+9fOmJwAHZfeIGTea5CBPCpmluwbFVxQGqcJYrFGRFTARz0yq8LKLp7X43gqhlu2 LBJ0EsCCeFfxplFRZIix4IZcIgdaZ8KTiTiM8LqOKFbMKv6IMFcmmpI2wSQO66/dYLPyfC beFDCRkpHWKbyTje8bV7pT3CVhZ56tXezaPK0Xbzaa9a5GQwU3V5T1G02kmGSJ8YuUPoAD YMAPQ8ctZnDVKHlenXuLMfsQ544+VPhhJPZMXBA9L1+D9W9xWnoHre8ceHJkVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762401673; a=rsa-sha256; cv=none; b=th/s8OCXqTxXmxUr4oKPEfeR+nZ8XT8APw7/JzaXZitOAI7wRo786UbKGzFiVfoxMiHLqe i8Rlk4VyGBjt1Cr9P49ConmAUexdhFBjwQhR5zgNOtdYoJkJ65DJ6VPW96d3Jtq/2R1R5i EPXM4d5UcUt35vrd/Ogl5DsUQPQQ2Evo2hSy73ZbYB2GXHtGRZCP47zUnTNx1w9oa27TDo ISaWlmMi+tTO8QlHXjqlYIaTYTrzI3wZ1McwEFff/0UbYoxjwHSRpQT+eQNrD3b1uRbYHk 4wpmR42zhLRL9GVWqL9NQoDIA+3TWKxumRJmFeLMIVoukADJ0SYSIvqr8/HvEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d27ls4ZZzz1C1T; Thu, 06 Nov 2025 04:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A641DqN039416; Thu, 6 Nov 2025 04:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A641Dvx039413; Thu, 6 Nov 2025 04:01:13 GMT (envelope-from git) Date: Thu, 6 Nov 2025 04:01:13 GMT Message-Id: <202511060401.5A641Dvx039413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0401498ab1ac - stable/15 - ipsec offload: never return error from the newkey/spdadd callbacks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 0401498ab1ac8e6e0dbd603c7a31eff1b8efc6da Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0401498ab1ac8e6e0dbd603c7a31eff1b8efc6da commit 0401498ab1ac8e6e0dbd603c7a31eff1b8efc6da Author: Konstantin Belousov AuthorDate: 2025-10-29 16:37:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-06 04:00:57 +0000 ipsec offload: never return error from the newkey/spdadd callbacks (cherry picked from commit 8b2f4e6b3a478faaa4b0b23efc9c65f5db913df4) --- sys/netipsec/ipsec_offload.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 8a09d5f37b4a..59a107881676 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -300,7 +300,7 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) dprintf("ipsec_accel_sa_install_newkey: cannot alloc " "drv_spi if %s spi %#x\n", if_name(ifp), be32toh(tq->sav->spi)); - return (ENOMEM); + return (0); } error = ifp->if_ipsec_accel_m->if_sa_newkey(ifp, tq->sav, drv_spi, &priv); @@ -329,7 +329,7 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) } } out: - return (error); + return (0); } static void @@ -663,7 +663,7 @@ ipsec_accel_spdadd_cb(if_t ifp, void *arg) if (error != 0) { dprintf("ipsec_accel_spdadd: %s if_spdadd %p remember res %d\n", if_name(ifp), sp, error); - return (error); + return (0); } error = ifp->if_ipsec_accel_m->if_spdadd(ifp, sp, inp, &i->ifdata); if (error != 0) { @@ -671,7 +671,7 @@ ipsec_accel_spdadd_cb(if_t ifp, void *arg) dprintf("ipsec_accel_spdadd: %s if_spdadd %p res %d\n", if_name(ifp), sp, error); } - return (error); + return (0); } static void From nobody Thu Nov 6 04:55:11 2025 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 4d28yC5Xf7z6Fr2t; Thu, 06 Nov 2025 04:55:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d28yC4mrBz44vR; Thu, 06 Nov 2025 04:55:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762404915; h=from:from:reply-to:subject: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=+QndTabOr1zsnhjxki1Ge21ZjcqjVSl77jjcBKsG/oA=; b=RaKOP3T/284MoMiYYxP8P2FT/tIcV8ssFDH4/Y0YlfINE3NsSgpJiAYtny3ho77EP0gb07 v+LtzwDHo2Mv0Bn/EsKOqk5pTyGPh/xQtNBRB3a+KuDtDb6NHVFYpsALrNHZ5PhOSws+l0 EsUARf9Bww9UEWFT7QmwaNRdQ1ZhrwGmooIlWUkSM++BE0UaUoV55kmyR1ujUKH/J1fUkn Srb6j0mTlgS8tD6g95MnVRv+/RF8umWGtGj0PQAebufiHAAIeMKcW7ZmQOazPPt4JCGgV6 5iGAFDE7EdyHUHuW68CuriGQXF7CcexVHsxiHmW2+8gs8Tw03usojUBtVrrRZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762404915; h=from:from:reply-to:subject: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=+QndTabOr1zsnhjxki1Ge21ZjcqjVSl77jjcBKsG/oA=; b=GW5Uvn8wTwRG323iuXORiS65r6ltycKriPtJFQPSSCrV8SrUiDPdst851L1o0i5BqjtqKs Ez5/sD3rlD49sU8A7oK4qb7IsZQ8tYR0uEVa/5eLQnI9y0huCNlbuDhSGEhYMaoFKhf+AN 9SYMuITIXC+77S9h52td2g01Ptq/qQea0V+9tgho5tuMEQl23Ge717ZMKvJfUjQkGUC/e2 TTJWnEKZZYF8HlnBpbl9woRbnU7rt5ydx368PLE4FRBSh9dqelDzbWv/t72jjy+oalyIZL 8RtlGnXfJrvpOuVmc0sjgjpMO18XpJsFUn2PpdkkGaT8kOjwrTirNS81RTSXAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762404915; a=rsa-sha256; cv=none; b=uGucR661H1zmNv9deoouc/0qdbs8WO7A/GjOxr21W09FnuAx7A6chvfLT5BXirVenJl/El Q+7F5q+RFVRb+ZsaLz/rok7r8MsKLgi4vwCRFmi1rEgMg9FZWYL4r2lucfExZHLUg1quhi s5lJ2SPCvQHhA6PYOgyOrpdrIxUzXQtY/PAEMweHLiQ8TOMoKJjQqCKGThQ5wuOmAYvNXE JBcGXYENYUzISB/86QAfnmfqsONzPwN25YBi6pE+RF0s7kKL6f2ASJrhzhjoq2OWCmKf56 ChGktqCsY8wx5MPGoe0C/6GXj15Mmr6WBJkTqCMAdIeCpXue1c7TvgOMHSK23Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.11.170] (unknown [12.47.130.94]) (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 4d28yB37h0zG7m; Thu, 06 Nov 2025 04:55:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <4cf64b67-dd2c-4a22-bc0c-f3c98559830c@FreeBSD.org> Date: Wed, 5 Nov 2025 20:55:11 -0800 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 0b5e4af65d0d - stable/15 - riscv: Treat pointer register as an input in fpe_store Content-Language: en-US To: Colin Percival , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202511052016.5A5KGnTa062036@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202511052016.5A5KGnTa062036@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/5/25 15:16, Colin Percival wrote: > The branch stable/15 has been updated by cperciva: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0b5e4af65d0d3dfaa318b8e6adaaa4297f94af17 > > commit 0b5e4af65d0d3dfaa318b8e6adaaa4297f94af17 > Author: John Baldwin > AuthorDate: 2025-10-30 19:52:51 +0000 > Commit: Colin Percival > CommitDate: 2025-11-05 20:16:08 +0000 > > riscv: Treat pointer register as an input in fpe_store > > The contents of the memory is an output, but the pointer to that memory > is an input. This was correct in the original version of D45697, but > when adding appropriate clobbers, the pointer operand was incorrectly > switched to an output rather than left an input for fpe_store. > > Reviewed by: jrtc27 > Obtained from: CheriBSD > Fixes: 44d4ee7f3dad ("riscv: add FPE code.") > MFC after: 1 day > Sponsored by: AFRL, DARPA > Differential Revision: https://reviews.freebsd.org/D53441 > > (cherry picked from commit 91f66f9b377e09f59f481e653d8f64120a183806) Thanks for merging this for me. -- John Baldwin From nobody Thu Nov 6 07:13:02 2025 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 4d2D1C0f9Cz65BMw; Thu, 06 Nov 2025 07:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2D1C085rz3J3m; Thu, 06 Nov 2025 07:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762413183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tbq5P007gkTS0rqNMH1Q4omtW9jLrzPR1IDLfwT5dqU=; b=GV0wDnO08eg8LL3FL+Lo4sw9JHTm7C2Hj0lq9KMu8j1T6uj7xBBVjeYbOTorJFbv8ugVRv HDP55yn68PWmp+k2TFBwmzfxssoaHKQX6X15SQkimsnB/2N+eJBXj1tpXmuk6YrJXx6Uqr 13ErgqOdve5FH1h12YhLawoUW2McPKjknur1Z3tk4y3t2m/sd0cHaeM2Gwf9ORIf6z5Uwf sx2ll5LoHzPMugU/D/e+3EJErG6efA7JB2rCGZT2xqjpZkVs6gV9ccTJu9BKNJj+uXemNk f/M+jocSb7bzJNBqlvsGbs8XGUGvvPWcj18y4Oaio5Q/PhdRio+0xaLlbYKElw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762413183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tbq5P007gkTS0rqNMH1Q4omtW9jLrzPR1IDLfwT5dqU=; b=YIVpPoY7hYMZFh85mFHmIDPEbZvjyX3aHz2UQFk97X6zHfgF5Vb51o0vKBYIf/f9nCT6jV rB/0ULI7hsEY/B0Y3OEek8DhJX+578wdXqvnRz/afRaMFZ7agDEERlT7oiRWkyVd6uTC96 C8bjua8wzXW6tM0Gel+ufFyzKdYs2IJnxHX/K7bikRXc/r8ezsuQZvLyfhcPgXrGLaJqa+ 3clQ1JfHsTcACf8OreQWfpYVLE6/le78zXvmHP9ZrIaNeOSCP0L0sJiXxOMYzuL6r/w2WU shv2hwfjgPQ9Fo2nCql3eM0q6w2cSyY7B28eLPG+jvs7yLtkesT0I0qW/Jc+ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762413183; a=rsa-sha256; cv=none; b=eJhdpLPL6UPsIhPDNoFvBFj0Kq9bWFtkKFg/20YxehE7OX1QE0ttisNtK39QtTjNr2KLnz tp6JrkH0LWm/OTZibtV3XMOmtFgK+fbC9Tgrigi4s+s9Wq2NIkSEFJOR6AZgEwkivn+tZO 7iwBFJWUwfXSazkPQ/6EF/fEVAS3q2DRAokaPQL3ARJiLkvDqbbMfgPrSHdJM5P3usnTb9 3gLx8icTIkSKGuwhD3DZt6934/BUdzwhAjh1zcW2bRCm0XIVIh8CGR64+ddbNgXcGjq6E8 KJVNajTXQLrsPJ+ZRDEm8OO+DHLeqET9vxLoMqOtK2y0rTswKmjODbk6gcKotg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2D1B6py6z1J4f; Thu, 06 Nov 2025 07:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A67D2tv002820; Thu, 6 Nov 2025 07:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A67D2L3002816; Thu, 6 Nov 2025 07:13:02 GMT (envelope-from git) Date: Thu, 6 Nov 2025 07:13:02 GMT Message-Id: <202511060713.5A67D2L3002816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: c23a589aa145 - stable/14 - cron: Use reallocarray() to prevent integer overflow List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c23a589aa145d2f14e7141601fec1b38bce9a6bd Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=c23a589aa145d2f14e7141601fec1b38bce9a6bd commit c23a589aa145d2f14e7141601fec1b38bce9a6bd Author: Xin LI AuthorDate: 2025-11-03 05:59:46 +0000 Commit: Xin LI CommitDate: 2025-11-06 07:12:52 +0000 cron: Use reallocarray() to prevent integer overflow Apply OpenBSD env.c,v 1.24 and 1.25, which replaces manual size calculations with reallocarray() to prevent possible integer overflow. (cherry picked from commit 40d21618382108fefa84f8576b14302f65452718) --- usr.sbin/cron/lib/env.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/cron/lib/env.c b/usr.sbin/cron/lib/env.c index 36c5fca12117..b4dcf4ac5325 100644 --- a/usr.sbin/cron/lib/env.c +++ b/usr.sbin/cron/lib/env.c @@ -58,7 +58,7 @@ env_copy(char **envp) for (count = 0; envp[count] != NULL; count++) ; - p = (char **) malloc((count+1) * sizeof(char *)); /* 1 for the NULL */ + p = (char **) reallocarray(NULL, count+1, sizeof(char *)); /* 1 for the NULL */ if (p == NULL) { errno = ENOMEM; return NULL; @@ -115,8 +115,7 @@ env_set(char **envp, char *envstr) * one, save our string over the old null pointer, and return resized * array. */ - p = (char **) realloc((void *) envp, - (unsigned) ((count+1) * sizeof(char *))); + p = (char **) reallocarray(envp, count+1, sizeof(char *)); if (p == NULL) { /* XXX env_free(envp); */ errno = ENOMEM; From nobody Thu Nov 6 07:13:03 2025 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 4d2D1D1yzJz65B88; Thu, 06 Nov 2025 07:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2D1D0hgCz3J7X; Thu, 06 Nov 2025 07:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762413184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulAAuLHt/KJyvU04eCkxEFP115iWasbJm373l6s42Xg=; b=g+aQw+5EVE0P1zvf+ZM9g4MMXWoECYpXJ1QlXxjvTJC0STu73B7lxOBGRzfLDK1tXWNvoX JJZRh1KMuthEGm1iYgQXj4WonUhJ0VblOzKCKxWsDwyyNURHnp0onfxe8xWtuc+nKjPfQr eVs2u0YuDZTu7dnaQkNELj4O3HNzmuM7cHyHbbEHoImsEHGTS1jXpOZujtxBRA5bYlyz2u j/HiA8TxRELVUvSqaXvngNK7sxP4A3FCBLYBII3YaB2oj6xGEhPODs37FDCvSepeqRXEtm Y00N9e8znbNcDpBj0QMYAdHxnb9IfG61hCFqwx6OU0PDrwTMGohSEh7GnVUiwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762413184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulAAuLHt/KJyvU04eCkxEFP115iWasbJm373l6s42Xg=; b=PV07BnqKSNsaKzH4FR+qV7qA3YHhsrElXuHGiWigWUV+R4OvpNVIQdHopCvCxo2a+wrTpp 1UE+X831jQ1EB3HpjZFwC1tiq1w11xONBPjRZVk5T0o5XJQEs/nUVvyAAmEahXtJyE6IXS +gXdIwHV+UugFi7BeRIIzCPg5intx/Qc6HM8eW1AAdqZFK99kEGIPYG+HTcqIC2zE134YM Ber1n2+H+siakrezciUxALTYbC5UPMgNWTWB7MYtmjDp8aXmaxGJ/YK7adFvwwYwKj7r0C jWyObMyMH2PkiLqi0mvBAxrYRJssnpDGdDv6yF2ARtc9mFPU55OmQomqm9cKUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762413184; a=rsa-sha256; cv=none; b=KjcPsLcS5gE/DIPpUak075HPgkt8Hn1FEz/NtSTNivKb054z/oo7yKw/rmaV1LV2lWffmr qciZe9bHiRJeyt4bt9jWalNEHxg45HXpE0Vxhq8LBeQHUl8T8N6S0BVf73wUEN2Xr6K0/u px/9vKsZIMOnIiz4o+MuONSN/rsRow/elIWtjATp0vp3fBh7gAXTN9Ass8J7LYvo65SrrR LnJaYELYBMVj/g8oNmDCil1oDSNtJ/FLtMtuiNTTV6+F5KjrImxMbsvlEKSdB8nCKYecD6 zRadbaSaUmDom9jfY5ptNXLfS7fuo0+mCBpMMB51fRgHuUrhrYUcAeyK86WWNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2D1D04Vbz1JLT; Thu, 06 Nov 2025 07:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A67D34n002873; Thu, 6 Nov 2025 07:13:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A67D3e1002870; Thu, 6 Nov 2025 07:13:03 GMT (envelope-from git) Date: Thu, 6 Nov 2025 07:13:03 GMT Message-Id: <202511060713.5A67D3e1002870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: ab0a1169ab6a - stable/15 - cron: Use reallocarray() to prevent integer overflow List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab0a1169ab6a9cad731c73dad95f0c9af86cdbe1 Auto-Submitted: auto-generated The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ab0a1169ab6a9cad731c73dad95f0c9af86cdbe1 commit ab0a1169ab6a9cad731c73dad95f0c9af86cdbe1 Author: Xin LI AuthorDate: 2025-11-03 05:59:46 +0000 Commit: Xin LI CommitDate: 2025-11-06 07:12:13 +0000 cron: Use reallocarray() to prevent integer overflow Apply OpenBSD env.c,v 1.24 and 1.25, which replaces manual size calculations with reallocarray() to prevent possible integer overflow. (cherry picked from commit 40d21618382108fefa84f8576b14302f65452718) --- usr.sbin/cron/lib/env.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/cron/lib/env.c b/usr.sbin/cron/lib/env.c index 287dd8636293..5a2d7ad60756 100644 --- a/usr.sbin/cron/lib/env.c +++ b/usr.sbin/cron/lib/env.c @@ -55,7 +55,7 @@ env_copy(char **envp) for (count = 0; envp[count] != NULL; count++) ; - p = (char **) malloc((count+1) * sizeof(char *)); /* 1 for the NULL */ + p = (char **) reallocarray(NULL, count+1, sizeof(char *)); /* 1 for the NULL */ if (p == NULL) { errno = ENOMEM; return NULL; @@ -112,8 +112,7 @@ env_set(char **envp, char *envstr) * one, save our string over the old null pointer, and return resized * array. */ - p = (char **) realloc((void *) envp, - (unsigned) ((count+1) * sizeof(char *))); + p = (char **) reallocarray(envp, count+1, sizeof(char *)); if (p == NULL) { /* XXX env_free(envp); */ errno = ENOMEM; From nobody Thu Nov 6 11:28:44 2025 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 4d2KhD6fVsz6G03r; Thu, 06 Nov 2025 11:28: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2KhD64FBz3j5X; Thu, 06 Nov 2025 11:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762428524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sf4mdVQiWPVE1Tzqgg/WbxvZgQXHBuoqdVoT/kGdwFI=; b=hIWa1Rh8Izw+bq43LphUlXGJEicOwcSHK34I1qRO8VyDVIQNElZg4fWKTA4erjOzbh6dnk GBUMqnAG7vNtYTxBj2p1687p5Ka8vbRnlA+wbVbPw+8DF+qRAXwKjR46rreaSRecQaDa31 zlYlkKkT/WLmVWrmbeX3QfGZ8UMPpRpITZGjk4C8IHxNlj9+S1xo2h2YPo1lG3tXP+0n2k ZtSGWSLrMZ+Z8dEcoy6SjbWqIc75oMLnifaAFrdBEN21RUIyzKPhLMmlS8MlH7hFUARxmj 7XzYTErzO27XH4vyaqdcWyEhYdL3ifeUN6mgThF95mkyR6V+M0gwqdpeJxD4Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762428524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sf4mdVQiWPVE1Tzqgg/WbxvZgQXHBuoqdVoT/kGdwFI=; b=dvuJx08MtgBZ5iuee0b5SSSmyFE4bWv1EMNdbyguHGJR6DkoAC/ncDW0ELSxEoryOzqAqw CnvRv6VdO7eV3j3qFB5v1tZouJxrXnz5boLa3yBcz3kj3oqgd+/xYaK28gckS26nhzZBjG rj5kuGUJSygWskPGJ2O7E4HEfKxkBtIMZs+CJuPxkG/Y9JjLJ0eMg0MCnXoLO7/NbGkwpE xXI5jIbmeZaiBQ1z4yAn5WdIvpY+KsH6j/nsPIvZWvFvrfgoEnjkPJRjAFUtR17U77AUXm jwpY0jsRZ53RvJdOO/Oh0RwonTnMLjmVwDS7UtRz8Ac79iUZ3ih/2XwiJvktLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762428524; a=rsa-sha256; cv=none; b=c1lnBJRiriIheSjVfldJ6DI9x7wTSXgC6SkEp1Qfpx50YhGo3HneQ19IT2xa8orQyxZEXP u8JkAcR4xTm6W+H7xsi+a2M/Sga04wiFzhEyA/gaHMu1JOZS93ncBWtZRBnCEplKnqNtg3 G2pgXDoXH0AXPSJjSkUzdJTHp8DOcyB0QZ1nyt2zw2KcliT1UjnjByFG9ATofJVE4K6xAs ZJsijT4sItsJGHXL2gw8v0BR2or7eI/dfOn5/D5UToDRR/vDRS+kkc/C+9yCPkI71uLaUc fANhsGWw+2NjcXi3G7A+TgW33JPIQ+erMJIqnkU5QTn+g3VoghI3FztUYRLmcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2KhD5fhgz1QK5; Thu, 06 Nov 2025 11:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6BSiBp073865; Thu, 6 Nov 2025 11:28:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6BSi5b073862; Thu, 6 Nov 2025 11:28:44 GMT (envelope-from git) Date: Thu, 6 Nov 2025 11:28:44 GMT Message-Id: <202511061128.5A6BSi5b073862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: ccd948829cc8 - stable/15 - etc/mtree/BSD.include.dist: Remove libipt-dev List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ccd948829cc8e2456123fbafcb694261f0109d94 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ccd948829cc8e2456123fbafcb694261f0109d94 commit ccd948829cc8e2456123fbafcb694261f0109d94 Author: Lexi Winter AuthorDate: 2025-11-06 10:19:22 +0000 Commit: Lexi Winter CommitDate: 2025-11-06 10:34:21 +0000 etc/mtree/BSD.include.dist: Remove libipt-dev This package only exists on amd64, which means on other platforms we produce an empty package containing nothing but this directory, and without a base package (libipt) that package fails to install due to a missing dependency. For now, fix this by removing the libipt-dev package tag, which moves this directory to clibs. Fixes: 436618a427b4 ("etc/mtree: Add package tags for /usr/include") Reported by: cperciva MFC after: 3 seconds (cherry picked from commit 2a8a6179eb6cef8ba1a417a4c8a1f7063c704533) --- etc/mtree/BSD.include.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 97f2194a3fa1..56d3a823a8f2 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -278,7 +278,7 @@ .. lib9p tags=package=lib9p-dev .. - libipt tags=package=libipt-dev + libipt .. libmilter tags=package=libmilter-dev .. From nobody Thu Nov 6 14:17:14 2025 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 4d2PQg1Vb0z6GD1g; Thu, 06 Nov 2025 14:17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2PQg0tTBz41wR; Thu, 06 Nov 2025 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762438635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0vbTVFKBGf7gjGbTVT+Gw8QdDwLq2lCpLB6uLvguSc=; b=ZJLR0hr5ULdGLgyhkc/MztPgPKxwHqpfvkrrR84NlQXpED56yE3UAZnMMqucvRFwIgyptx AnvRsh9o9OODvUyUdXi6AovY/0qKnq/SV2gPMpWI7wl0zDJmvEY9THr8yqcYa6Ch9OTV1P v9cwA/n3qVqLBZsqlNZreROGavFX3SiO+H7xoyzA71+OfEyqbYYVFolDr6Op8nITvKfkiB U9e/Rewms03vtDiHtR1okfm6IVUjclwpc+8E0vruODtGPNBdX1sV+LO9jwINcFqeNx7WEM zSq/a2QHNhaVLWOV5Y9EUbxhs7w6uTU/Lwg7tQbpQt56IMM7aAOcyP7vIggzlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762438635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0vbTVFKBGf7gjGbTVT+Gw8QdDwLq2lCpLB6uLvguSc=; b=gJDTxHCHWF20bqV0+75EbfPpQedo4yMOXOWXiVE4Yh6OKbz0CcPYel1y4TLAw/1yxid8ev v5vES3nDppTQdHIKrJfFpBanxO3jqryIJVRdkW/KUEFqhQoq37eVllj1jTuKgCdwl3DjGB zW3hwMX9kcfR0HAftbIqBNwtmflnn8CztSSZoQNCuEWY3m8VF3L0nn3dFnvHbW4LX3ITRN Dm+OhwJg0n7+DBb02TZxCn7baknf/6AV+eW3Jj6vgRzfVqnXxxFnlhY6MyKIUqvRxB9uZi daubi+AAfjE5FSf6+IP2xeFcQL1R+mF8+a4PpQmPShR1Uk0nu7yXG2pS+RnZZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762438635; a=rsa-sha256; cv=none; b=b4uEbi6gothsln13mmJQBzx0wvIlutyBHOder3tEou64UaMhbuUsU8z/FvUO5JGE9wEXtc wb6uQhipHMPFRln7M7tmDnneIw8n8LjeTHcn3ndpxZa7UPEswEHdpTcxGItRRWqYO9Ej6Q h8cnE/h6lzFNFXrl9BBgbkxgkE5BLvGtjOAHBZXDc1bIou1V0upX4VZfOHjfv02LEIs4PH XBNHxB+kYSHzTDFdpWtNp0DKx5pociDUfU2TXMhf8LHoT4ZuEdzDY2iIG4hGW1U4reAGX+ mv8CK8ssLhbQydWqaNCqpJ0L7aDSfx1NLREMe32CtlkresAeX7kjEHd0TxuKZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2PQg0Q5cz242; Thu, 06 Nov 2025 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6EHEOv092881; Thu, 6 Nov 2025 14:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6EHEfg092878; Thu, 6 Nov 2025 14:17:14 GMT (envelope-from git) Date: Thu, 6 Nov 2025 14:17:14 GMT Message-Id: <202511061417.5A6EHEfg092878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: e30db5381c6e - stable/15 - cut.1: Align option list 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 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: e30db5381c6e93b5af4755d1a5ba0641b804eac8 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e30db5381c6e93b5af4755d1a5ba0641b804eac8 commit e30db5381c6e93b5af4755d1a5ba0641b804eac8 Author: Alexander Ziaee AuthorDate: 2025-11-03 23:21:10 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 14:13:22 +0000 cut.1: Align option list and tag spdx MFC after: 3 days (cherry picked from commit 16f37d97b9500a4fe2d0719161025515d477a5cd) --- usr.bin/cut/cut.1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1 index 4f5b7b9bb9a5..42a1726e6e24 100644 --- a/usr.bin/cut/cut.1 +++ b/usr.bin/cut/cut.1 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -86,7 +89,7 @@ It is not an error to select columns or fields not present in the input line. .Pp The options are as follows: -.Bl -tag -width indent +.Bl -tag -width "-d delim" .It Fl b Ar list The .Ar list From nobody Thu Nov 6 14:17:16 2025 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 4d2PQh37Sjz6GCrP; Thu, 06 Nov 2025 14:17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2PQh22vQz4261; Thu, 06 Nov 2025 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762438636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=meOrKqEWRBGEytj6cM35xABnrZcBJNdn+dyKZZCi2yE=; b=setaei1PsRFsaeC+6Jruh96m/H15HQ0SuGajlFt9BhGnU7OZGEd2zDk7BQWsVGOPlryXXH EpPUE4hKUEiJuVjsYcZEoe5behRy7+dcM9JbHvmV4Zvp3VloQlllnMj/cevHOMdta/eaMt ZGOjk8qfp9EwxfIlhnKERVuVd+Q5O45QQ24Y2R62zWpmQpXe9qSA2VIk7zK5Ib3KLadZcn mhU7Lh8iC0YTqyaZZzdpCk70qI60qB2KwE4oV/YssY/+Ndo+Jvw+G9wG40lEmnftYjPgmf YnswxjTdZOZFSixzVddxe2MB6I5dHEOoSjeV2+uR3e5a4qDcg9Pe4/DbsvZlTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762438636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=meOrKqEWRBGEytj6cM35xABnrZcBJNdn+dyKZZCi2yE=; b=v+4v63TWps9CqMS/0GMTYsK+R5pyM4dPm5k0DkwwTmPcbLCURbd34XqVm4l2mxzs5dceQI qe5ieYrA5Dssd+mLR0aMXl41STsmxoPMgCLvfc3pzQKpmAAs5J6bicVwFOePQP4vLHTyYd x9rmWd4OJ6rI9IC1BAsrdm9+5R/e7pJQ2VHKphgAFA/xaTHLBGSRTVDs/8Y8xSpMgIYwxm +P31uZ+33FwmL4e3jLujgttf2WGi4poNxnwhrnGtaqqC5NUtzqWvroXseRsuJ6isjDJwyX ofyaBWH/Mi056qSS8gZsj+8e0EWSkbhNLqznQOVqru6cmo1TgO/qDBk3xKCi6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762438636; a=rsa-sha256; cv=none; b=t0tW5HokL3Jr+VfCniJC2v/n8OvO8wopvuJ1DUqvMkPy90bJyg4Y098ppvKAi/8/a+zI1d lK5NEMLO9THVNbauciTV8L+4TEYBKWWaOqtbFQlacWA7vx5vPS7N0cZImv2kWUGYeHKrsF V2CGSMJpiI9sR8XLtSbtAH0be22XIP3zg1PXf7V3dLTqAardllb5m/dqnOKZtuTbBIS/bR KAIL/mwnFgmbwoU3hcRJnJazgXOT/E/tDw9+iLmhGFDMpZ3xtEm/VCwdTaQ1Xgrnbu4hBz 1kPx6kN0VqY9rRVvbaD3CnAVCJQgGAIx0vMGiP1Zsx5xsnnOV9wkVOy2GnGV3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2PQh1fCCz2Lt; Thu, 06 Nov 2025 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6EHGdw092913; Thu, 6 Nov 2025 14:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6EHG3K092910; Thu, 6 Nov 2025 14:17:16 GMT (envelope-from git) Date: Thu, 6 Nov 2025 14:17:16 GMT Message-Id: <202511061417.5A6EHG3K092910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 0ee1546565d7 - stable/15 - ice.4: Avoid first person language List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 0ee1546565d774639a19623d87ff3bcebac13724 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee1546565d774639a19623d87ff3bcebac13724 commit 0ee1546565d774639a19623d87ff3bcebac13724 Author: Brad Davis AuthorDate: 2025-10-03 22:01:45 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 14:16:35 +0000 ice.4: Avoid first person language Approved by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52896 (cherry picked from commit 85531add28443e4202632fedcb3ae6038d4acb0c) --- share/man/man4/ice.4 | 92 +++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/share/man/man4/ice.4 b/share/man/man4/ice.4 index 172b5a197b64..c7675e627726 100644 --- a/share/man/man4/ice.4 +++ b/share/man/man4/ice.4 @@ -32,7 +32,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd March 28, 2025 +.Dd October 3, 2025 .Dt ICE 4 .Os .Sh NAME @@ -96,7 +96,7 @@ Intel\(rg Ethernet Connection E830\-XXV .El .Pp For questions related to hardware requirements, refer to the documentation -supplied with your adapter. +supplied with the adapter. .Pp Support for Jumbo Frames is provided via the interface MTU setting. Selecting an MTU larger than 1500 bytes with the @@ -144,17 +144,16 @@ See the .Dq Intel\(rg Ethernet Adapters and Devices User Guide for more details on DDP and Safe Mode. .Pp -If you encounter issues with the DDP package file, you may need to download -an updated driver or +If issues are encountered with the DDP package file, an updated driver or .Sy ice_ddp -module. +module may need to be downloaded. See the log messages for more information. .Pp -You cannot update the DDP package if any PF drivers are already loaded. +The DDP package cannot be updated if any PF drivers are already loaded. To overwrite a package, unload all PFs and then reload the driver with the new package. .Pp -You can only use one DDP package per driver, even if you have more than one +Only one DDP package can be used per driver, even if more than one device installed that uses the driver. .Pp Only the first loaded PF per device can download a package for that device. @@ -174,9 +173,9 @@ each jumbo packet. This should help to avoid buffer starvation issues when allocating receive packets. .Pp -Packet loss may have a greater impact on throughput when you use jumbo -frames. -If you observe a drop in performance after enabling jumbo frames, enabling +Packet loss may have a greater impact on throughput when jumbo frames are in +use. +If a drop in performance is observed after enabling jumbo frames, enabling flow control may mitigate the issue. .Ss Remote Direct Memory Access Remote Direct Memory Access, or RDMA, allows a network device to transfer data @@ -194,14 +193,14 @@ operating in multiport mode with more than 4 ports. For detailed installation and configuration information for RDMA, see .Xr irdma 4 . .Ss RDMA Monitoring -For debugging/testing purposes, you can use sysctl to set up a mirroring +For debugging/testing purposes, a sysctl can be used to set up a mirroring interface on a port. The interface can receive mirrored RDMA traffic for packet analysis tools like .Xr tcpdump 1 . This mirroring may impact performance. .Pp -To use RDMA monitoring, you may need to reserve more MSI\-X interrupts. +To use RDMA monitoring, more MSI\-X interrupts may need to be reserved. Before the .Nm driver loads, configure the following tunable provided by @@ -210,7 +209,7 @@ driver loads, configure the following tunable provided by dev.ice..iflib.use_extra_msix_vectors=4 .Ed .Pp -You may need to adjust the number of extra MSI\-X interrupt vectors. +The number of extra MSI\-X interrupt vectors may need to be adjusted. .Pp To create/delete the interface: .Bd -literal -offset indent @@ -286,7 +285,7 @@ To enable/disable priority flow control in software\-based DCBX mode: sysctl dev.ice..pfc=1 (or 0 to disable) .Ed .Pp -Enhanced Transmission Selection (ETS) allows you to assign bandwidth to certain +Enhanced Transmission Selection (ETS) allows bandwidth to be assigned to certain TCs, to help ensure traffic reliability. To view the assigned ETS configuration, use the following: .Bd -literal -offset indent @@ -320,7 +319,7 @@ Use the following sysctl to enable or disable L3 QoS: sysctl dev.ice..pfc_mode=1 (or 0 to disable) .Ed .Pp -If you disable L3 QoS mode, it returns to L2 QoS mode. +If the L3 QoS mode is disabled, it returns to L2 QoS mode. .Pp To map a DSCP value to a traffic class, separate the values by commas. For example, to map DSCPs 0\-3 and DSCP 8 to DCB TCs 0\-3 and 4, respectively: @@ -339,7 +338,7 @@ sysctl dev.ice..dscp2tc_map .Pp L3 QoS mode is not available when FW\-LLDP is enabled. .Pp -You also cannot enable FW\-LLDP if L3 QoS mode is active. +FW\-LLDP cannot be enabled if L3 QoS mode is active. .Pp Disable FW\-LLDP before switching to L3 QoS mode. .Pp @@ -365,11 +364,11 @@ To check the current LLDP setting: sysctl dev.ice..fw_lldp_agent .Ed .Pp -You must enable the UEFI HII LLDP Agent attribute for this setting +The UEFI HII LLDP Agent attribute must be enabled for this setting to take effect. If the .Dq LLDP AGENT -attribute is set to disabled, you cannot enable the FW\-LLDP Agent from the +attribute is set to disabled, the FW\-LLDP Agent cannot be enabled from the driver. .Ss Link\-Level Flow Control (LFC) Ethernet Flow Control (IEEE 802.3x) can be configured with sysctl to enable @@ -426,11 +425,11 @@ provide a stable link without FEC. .Pp For devices to benefit from this feature, link partners must have FEC enabled. .Pp -If you enable the sysctl -.Em allow_no_fec_modules_in_auto -Auto FEC negotiation will include +If the +.Va allow_no_fec_modules_in_auto +sysctl is enabled Auto FEC negotiation will include .Dq No FEC -in case your link partner does not have FEC enabled or is not FEC capable: +in case the link partner does not have FEC enabled or is not FEC capable: .Bd -literal -offset indent sysctl dev.ice..allow_no_fec_modules_in_auto=1 .Ed @@ -453,16 +452,16 @@ To see the valid FEC modes for the link: sysctl \-d dev.ice..requested_fec .Ed .Ss Speed and Duplex Configuration -You cannot set duplex or autonegotiation settings. +The speed and duplex settings cannot be hard set. .Pp -To have your device change the speeds it will use in auto-negotiation or +To have the device change the speeds it will use in auto-negotiation or force link with: .Bd -literal -offset indent sysctl dev.ice..advertise_speed= .Ed .Pp Supported speeds will vary by device. -Depending on the speeds your device supports, valid bits used in a speed mask +Depending on the speeds the device supports, valid bits used in a speed mask could include: .Bd -literal -offset indent 0x0 \- Auto @@ -503,13 +502,13 @@ At a high level, to capture a firmware log: .It Set the configuration for the firmware log. .It -Perform the necessary steps to generate the issue you are trying to debug. +Perform the necessary steps to reproduce the issue. .It Capture the firmware log. .It Stop capturing the firmware log. .It -Reset your firmware log settings as needed. +Reset the firmware log settings as needed. .It Work with Customer Support to debug the issue. .El @@ -593,8 +592,8 @@ PF Registration (Bit 30) Module Version (Bit 31) .El .Pp -You can change the verbosity level of the firmware logs. -You can set only one log level per module, and each level includes the +The verbosity level of the firmware logs can be modified. +It is possible to set only one log level per module, and each level includes the verbosity levels lower than it. For instance, setting the level to .Dq normal @@ -650,8 +649,8 @@ dmesg > log_output NOTE: Logging a large number of modules or too high of a verbosity level will add extraneous messages to dmesg and could hinder debug efforts. .Ss Debug Dump -Intel\(rg Ethernet 800 Series devices support debug dump, which allows you to -obtain runtime register values from the firmware for +Intel\(rg Ethernet 800 Series devices support debug dump, which allows +gathering of runtime register values from the firmware for .Dq clusters of events and then write the results to a single dump file, for debugging complicated issues in the field. @@ -664,7 +663,7 @@ stateless snapshot of the whole device. .Pp NOTE: Like with firmware logs, the contents of the debug dump are not human\-readable. -You must work with Customer Support to decode the file. +Work with Customer Support to decode the file. .Pp Debug dump is per device, not per PF. .Pp @@ -727,20 +726,19 @@ sysctl dev.ice.0.debug.dump.clusters=0 .Pp NOTE: Using 0 will skip Manageability Transactions data. .Pp -If you don't specify a cluster, the driver will dump all clusters to a +If a single cluster is not specified, the driver will dump all clusters to a single file. Issue the debug dump command, using the following: .Bd -literal -offset indent sysctl \-b dev.ice..debug.dump.dump=1 > dump.bin .Ed .Pp -NOTE: The driver will not receive the command if you do not write -.Dq 1 -to the sysctl. +NOTE: The driver will not receive the command if the sysctl is not set to +.Dq 1 . .Pp Replace .Dq dump.bin -above with the file name you want to use. +above with the preferred file name. .Pp To clear the .Va clusters @@ -754,7 +752,7 @@ The ice driver supports the ability to obtain the values of the PHY registers from Intel(R) Ethernet 810 Series devices in order to debug link and connection issues during runtime. .Pp -The driver allows you to obtain information about: +The driver provides information about: .Bl -bullet .It Rx and Tx Equalization parameters @@ -768,12 +766,12 @@ sysctl dev.ice..debug.phy_statistics .Ed .Pp NOTE: The contents of the registers are not human\-readable. -Like with firmware logs and debug dump, you must work with Customer Support +Like with firmware logs and debug dump, work with Customer Support to decode the file. .Ss Transmit Balancing -Some Intel(R) Ethernet 800 Series devices allow you to enable a transmit +Some Intel(R) Ethernet 800 Series devices allow for enabling a transmit balancing feature to improve transmit performance under certain conditions. -When the feature is enabled, you should experience more consistent transmit +When enabled, the feature should provide more consistent transmit performance across queues and/or PFs and VFs. .Pp By default, transmit balancing is disabled in the NVM. @@ -794,7 +792,7 @@ configures the device accordingly. .Pp NOTE: The user selection for transmit balancing in EPCT or HII is persistent across reboots. -You must reboot the system for the selected setting to take effect. +The system must be rebooted for the selected setting to take effect. .Pp This setting is device wide. .Pp @@ -811,7 +809,7 @@ sysctl dev.ice..temp may have a low number of network memory buffers (mbufs) by default. If the number of mbufs available is too low, it may cause the driver to fail to initialize and/or cause the system to become unresponsive. -You can check to see if the system is mbuf\-starved by running +Check to see if the system is mbuf\-starved by running .Ic netstat Fl m . Increase the number of mbufs by editing the lines below in .Pa /etc/sysctl.conf : @@ -823,7 +821,7 @@ kern.ipc.nmbjumbo16 kern.ipc.nmbufs .Ed .Pp -The amount of memory that you allocate is system specific, and may require some +The amount of memory that should be allocated is system specific, and may require some trial and error. Also, increasing the following in .Pa /etc/sysctl.conf @@ -918,8 +916,8 @@ link partner's switch ports. Some PCIe x8 slots are actually configured as x4 slots. These slots have insufficient bandwidth for full line rate with dual port and quad port devices. -In addition, if you put a PCIe v4.0 or v3.0\-capable adapter into a PCIe v2.x -slot, you cannot get full bandwidth. +In addition, if a PCIe v4.0 or v3.0\-capable adapter is placed into a PCIe v2.x +slot, full bandwidth will not be possible. .Pp The driver detects this situation and writes the following message in the system log: @@ -930,7 +928,7 @@ Please move the device to a different PCI\-e link with more lanes and/or higher transfer rate. .Ed .Pp -If this error occurs, moving your adapter to a true PCIe x8 or x16 slot will +If this error occurs, moving the adapter to a true PCIe x8 or x16 slot will resolve the issue. For best performance, install devices in the following PCI slots: .Bl -bullet From nobody Thu Nov 6 14:17:17 2025 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 4d2PQj4CjHz6GCtf; Thu, 06 Nov 2025 14:17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2PQj2HlMz426C; Thu, 06 Nov 2025 14:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762438637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xAr6vmJ3mfFo1AQW58C+B/yUSvD5CY7Ix6GSJCOxWjM=; b=pIBKoBQdBxupwYniZ31bpdl154PbO1TRBB4+gfLa6LJdma9Cho0DT3NlSKDgCWmybgd4ts o1u4+m9j2HDAT31wU5tOfKmpn1RxFiV2aOb+CXwbN08PBILaxL1OALiKMwxKKlcBe/oRvy 0m6g0JOkaoqooN2ktHVlQq8Z8mDSJ7Wv/Zpj4UCUxB1WWA+OU4apJSvt9PHj0s/GRE6t/0 IJHOyT5l7sDZmXAQVflEpa3LgfUNCT14AFAF9oi18SUFNIPPXy+pG6B/Iq5RTPiuSJkxx6 gD99NTmny+SQqMwWdnZBDuc5Fb6wDA2dPP+R9r4hMPLwBo3R66AFFgUWWAcESQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762438637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xAr6vmJ3mfFo1AQW58C+B/yUSvD5CY7Ix6GSJCOxWjM=; b=fRF8VTsPjM7ISIC1F3eRgnjonUglI5KQl6SfvRi8m/BIifgyiSCQB5ok0pEG1qfr+8rvTb 3WUcaZZt7AOp82MVJCla05NqJ7QBpP0taTclqOns0l4RRxvnfwiefArnX6/hlWUFNmKhXu kkwhMcx8xhnLKnxI/dY8raMGROFb1+2HP+DmdEpqf6jll4Xdhp/nAyfe3yR372WnF5XBCW RQkKJ772wMvm7IMMflhLpjM347c7IAl4F0qZd7QXq3JD+MPBRc7FWyl26vqD0CApsuK9nD VXHJESqhwMeVLgurWOA3tBL3yhmH4asGw2hIVIM8YBX1Q7UpfhDfg7U/+II+fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762438637; a=rsa-sha256; cv=none; b=lTmAU5wh1PxuwxxMCIm1AsRQooRgOPC15njMfQ0Ccg9mlWXiOQ3FfzkRB30aFQhdqBrZef fle2zsv4LHGjg8zAHlIE9VDqCmQQt+m6MjO96RPBHh5eC43HVatKlZDecVQo8hanR8nSVb rhmtO3MJQosCmLkG6PPAoVkQ+8PLN1mxOx03pZ2eu0cR+TdcGpTkhULI+s1kX2sHi3hxMu VSOz3FweTuwnO67EaBMICsHdS6LJwGRLTP4htNUB4OI5e5fvrTbWVZvAFlWAMMAXF28NSw FFy14vMlhrtlk233KuAqaAuCMJRSnxdYiJJZh1tbOTfCGfB+YB6SSszL0ghl2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2PQj1mw0z26K; Thu, 06 Nov 2025 14:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6EHHaE092946; Thu, 6 Nov 2025 14:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6EHHHM092943; Thu, 6 Nov 2025 14:17:17 GMT (envelope-from git) Date: Thu, 6 Nov 2025 14:17:17 GMT Message-Id: <202511061417.5A6EHHHM092943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 71bd17b879a7 - stable/15 - ice.4: Add ToC and E835 and editorial 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 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: 71bd17b879a74f57573d41ad21a9a0e7f984ab11 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=71bd17b879a74f57573d41ad21a9a0e7f984ab11 commit 71bd17b879a74f57573d41ad21a9a0e7f984ab11 Author: Alexander Ziaee AuthorDate: 2025-11-05 21:59:20 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 14:16:41 +0000 ice.4: Add ToC and E835 and editorial pass This manual is large enough and well structured enough that we can have a clickable table of contents. Use that to move some subsections which should not appear in Hardware Release Note to the description section. Adjust subsection names so this will work, preserving parentheticals for search by moving them to the bodies just below. Strip unnecessary copyright symbols and escaped hyphens. Copyright symbols never appear in the content of manual pages, including other Intel manual pages, and appear to break the Hardware Release Notes. Escaped hyphens were necessary decades ago for manual pages written in man(7), but this page is written in mdoc(7). Also misc touchups. Add the recently added E835 devices to the supported HARDWARE list. Add the speed ranges to description like the other ethernet drivers. PR: 290778 MFC after: 1 day Fixes: 09b48f811b4b (Add support for E835-XXV-4 adapter) Fixes: b202176dc76d (Add PCI IDs for E835 devices) Reviewed by: kgalazka (previous version) Reported by: kgalazka (additional hardware has been added) Reported by: bigsneaky@duck.com (HW Relnote is truncating) (cherry picked from commit f30335c5cb5e18a1ef08f5ba1d6fa6fc06f39348) --- share/man/man4/ice.4 | 372 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 224 insertions(+), 148 deletions(-) diff --git a/share/man/man4/ice.4 b/share/man/man4/ice.4 index c7675e627726..a54a6b3fd6f3 100644 --- a/share/man/man4/ice.4 +++ b/share/man/man4/ice.4 @@ -32,12 +32,12 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd October 3, 2025 +.Dd November 5, 2025 .Dt ICE 4 .Os .Sh NAME .Nm ice -.Nd Intel Ethernet 800 Series Driver +.Nd Intel Ethernet 800 Series 1GbE to 200GbE driver .Sh SYNOPSIS .Cd device iflib .Cd device ice @@ -62,42 +62,75 @@ or .Cd dev.ice.#.pba_number .Cd dev.ice.#.hw.mac.* .Sh DESCRIPTION -.Ss Features The .Nm driver provides support for any PCI Express adapter or LOM -(LAN On Motherboard) -in the Intel\(rg Ethernet 800 Series. -As of this writing, the series includes devices with these model numbers: +.Pq LAN On Motherboard +in the Intel Ethernet 800 Series. +.Pp +The following topics are covered in this manual: .Pp .Bl -bullet -compact .It -Intel\(rg Ethernet Controller E810\-C +.Sx Features +.It +.Sx Dynamic Device Personalization +.It +.Sx Jumbo Frames +.It +.Sx Remote Direct Memory Access +.It +.Sx RDMA Monitoring +.It +.Sx Data Center Bridging +.It +.Sx L3 QoS Mode +.It +.Sx Firmware Link Layer Discovery Protocol Agent +.It +.Sx Link-Level Flow Control +.It +.Sx Forward Error Correction +.It +.Sx Speed and Duplex Configuration +.It +.Sx Disabling physical link when the interface is brought down +.It +.Sx Firmware Logging +.It +.Sx Debug Dump +.It +.Sx Debugging PHY Statistics .It -Intel\(rg Ethernet Controller E810\-XXV +.Sx Transmit Balancing .It -Intel\(rg Ethernet Connection E822\-C +.Sx Thermal Monitoring .It -Intel\(rg Ethernet Connection E822\-L +.Sx Network Memory Buffer Allocation .It -Intel\(rg Ethernet Connection E823\-C +.Sx Additional Utilities .It -Intel\(rg Ethernet Connection E823\-L +.Sx Optics and auto-negotiation .It -Intel\(rg Ethernet Connection E825\-C +.Sx PCI-Express Slot Bandwidth .It -Intel\(rg Ethernet Connection E830\-C +.Sx HARDWARE .It -Intel\(rg Ethernet Connection E830\-CC +.Sx LOADER TUNABLES .It -Intel\(rg Ethernet Connection E830\-L +.Sx SYSCTL VARIABLES .It -Intel\(rg Ethernet Connection E830\-XXV +.Sx INTERRUPT STORMS +.It +.Sx IOVCTL OPTIONS +.It +.Sx SUPPORT +.It +.Sx SEE ALSO +.It +.Sx HISTORY .El -.Pp -For questions related to hardware requirements, refer to the documentation -supplied with the adapter. -.Pp +.Ss Features Support for Jumbo Frames is provided via the interface MTU setting. Selecting an MTU larger than 1500 bytes with the .Xr ifconfig 8 @@ -141,7 +174,7 @@ downloading a new driver or DDP package. Safe Mode only applies to the affected physical function and does not impact any other PFs. See the -.Dq Intel\(rg Ethernet Adapters and Devices User Guide +.Dq Intel Ethernet Adapters and Devices User Guide for more details on DDP and Safe Mode. .Pp If issues are encountered with the DDP package file, an updated driver or @@ -153,8 +186,8 @@ The DDP package cannot be updated if any PF drivers are already loaded. To overwrite a package, unload all PFs and then reload the driver with the new package. .Pp -Only one DDP package can be used per driver, even if more than one -device installed that uses the driver. +Only one DDP package can be used per driver, +even if more than one installed device uses the driver. .Pp Only the first loaded PF per device can download a package for that device. .Ss Jumbo Frames @@ -187,7 +220,7 @@ RoCEv2 (RDMA over Converged Ethernet) protocols. The major difference is that iWARP performs RDMA over TCP, while RoCEv2 uses UDP. .Pp -Devices based on the Intel\(rg Ethernet 800 Series do not support RDMA when +Devices based on the Intel Ethernet 800 Series do not support RDMA when operating in multiport mode with more than 4 ports. .Pp For detailed installation and configuration information for RDMA, see @@ -200,7 +233,7 @@ analysis tools like .Xr tcpdump 1 . This mirroring may impact performance. .Pp -To use RDMA monitoring, more MSI\-X interrupts may need to be reserved. +To use RDMA monitoring, more MSI-X interrupts may need to be reserved. Before the .Nm driver loads, configure the following tunable provided by @@ -209,7 +242,7 @@ driver loads, configure the following tunable provided by dev.ice..iflib.use_extra_msix_vectors=4 .Ed .Pp -The number of extra MSI\-X interrupt vectors may need to be adjusted. +The number of extra MSI-X interrupt vectors may need to be adjusted. .Pp To create/delete the interface: .Bd -literal -offset indent @@ -245,14 +278,15 @@ DCB is normally configured on the network using the DCBX protocol (802.1Qaz), a specialization of LLDP (802.1AB). The .Nm driver supports the following mutually exclusive variants of DCBX support: +.Pp .Bl -bullet -compact .It -Firmware\-based LLDP Agent +Firmware-based LLDP Agent .It -Software\-based LLDP Agent +Software-based LLDP Agent .El .Pp -In firmware\-based mode, firmware intercepts all LLDP traffic and handles DCBX +In firmware-based mode, firmware intercepts all LLDP traffic and handles DCBX negotiation transparently for the user. In this mode, the adapter operates in .Dq willing @@ -262,25 +296,25 @@ The local user can only query the negotiated DCB configuration. For information on configuring DCBX parameters on a switch, please consult the switch manufacturer'ss documentation. .Pp -In software\-based mode, LLDP traffic is forwarded to the network stack and user +In software-based mode, LLDP traffic is forwarded to the network stack and user space, where a software agent can handle it. In this mode, the adapter can operate in .Dq nonwilling DCBX mode and DCB configuration can be both queried and set locally. -This mode requires the FW\-based LLDP Agent to be disabled. +This mode requires the FW-based LLDP Agent to be disabled. .Pp -Firmware\-based mode and software\-based mode are controlled by the +Firmware-based mode and software-based mode are controlled by the .Dq fw_lldp_agent sysctl. Refer to the Firmware Link Layer Discovery Protocol Agent section for more information. .Pp -Link\-level flow control and priority flow control are mutually exclusive. +Link-level flow control and priority flow control are mutually exclusive. The ice driver will disable link flow control when priority flow control is enabled on any traffic class (TC). It will disable priority flow control when link flow control is enabled. .Pp -To enable/disable priority flow control in software\-based DCBX mode: +To enable/disable priority flow control in software-based DCBX mode: .Bd -literal -offset indent sysctl dev.ice..pfc=1 (or 0 to disable) .Ed @@ -307,10 +341,10 @@ For example, to map UP 0 and 1 to TC 0, UP 2 and 3 to TC 1, UP 4 and .Bd -literal -offset indent sysctl dev.ice..up2tc_map=0,0,1,1,2,2,3,3 .Ed -.Ss L3 QoS mode +.Ss L3 QoS Mode The .Nm -driver supports setting DSCP\-based Layer 3 Quality of Service (L3 QoS) +driver supports setting DSCP-based Layer 3 Quality of Service (L3 QoS) in the PF driver. The driver initializes in L2 QoS mode by default; L3 QoS is disabled by default. @@ -319,13 +353,13 @@ Use the following sysctl to enable or disable L3 QoS: sysctl dev.ice..pfc_mode=1 (or 0 to disable) .Ed .Pp -If the L3 QoS mode is disabled, it returns to L2 QoS mode. +If L3 QoS mode is disabled, it returns to L2 QoS mode. .Pp To map a DSCP value to a traffic class, separate the values by commas. -For example, to map DSCPs 0\-3 and DSCP 8 to DCB TCs 0\-3 and 4, respectively: +For example, to map DSCPs 0-3 and DSCP 8 to DCB TCs 0-3 and 4, respectively: .Bd -literal -offset indent -sysctl dev.ice..dscp2tc_map.0\-7=0,1,2,3,0,0,0,0 -sysctl dev.ice..dscp2tc_map.8\-15=4,0,0,0,0,0,0,0 +sysctl dev.ice..dscp2tc_map.0-7=0,1,2,3,0,0,0,0 +sysctl dev.ice..dscp2tc_map.8-15=4,0,0,0,0,0,0,0 .Ed .Pp To change the DSCP mapping back to the default traffic class, set all the @@ -336,25 +370,25 @@ To view the currently configured mappings, use the following: sysctl dev.ice..dscp2tc_map .Ed .Pp -L3 QoS mode is not available when FW\-LLDP is enabled. +L3 QoS mode is not available when FW-LLDP is enabled. .Pp -FW\-LLDP cannot be enabled if L3 QoS mode is active. +FW-LLDP cannot be enabled if L3 QoS mode is active. .Pp -Disable FW\-LLDP before switching to L3 QoS mode. +Disable FW-LLDP before switching to L3 QoS mode. .Pp Refer to the .Sx Firmware Link Layer Discovery Protocol Agent -section in this README for more information on disabling FW\-LLDP. +section in this README for more information on disabling FW-LLDP. .Ss Firmware Link Layer Discovery Protocol Agent -Use sysctl to change FW\-LLDP settings. -The FW\-LLDP setting is per port and persists across boots. +Use sysctl to change FW-LLDP settings. +The FW-LLDP setting is per port and persists across boots. .Pp -To enable the FW\-LLDP Agent: +To enable the FW-LLDP Agent: .Bd -literal -offset indent sysctl dev.ice..fw_lldp_agent=1 .Ed .Pp -To disable the FW\-LLDP Agebt: +To disable the FW-LLDP Agebt: .Bd -literal -offset indent sysctl dev.ice..fw_lldp_agent=0 .Ed @@ -368,11 +402,14 @@ The UEFI HII LLDP Agent attribute must be enabled for this setting to take effect. If the .Dq LLDP AGENT -attribute is set to disabled, the FW\-LLDP Agent cannot be enabled from the +attribute is set to disabled, the FW-LLDP Agent cannot be enabled from the driver. -.Ss Link\-Level Flow Control (LFC) -Ethernet Flow Control (IEEE 802.3x) can be configured with sysctl to enable -receiving and transmitting pause frames for +.Ss Link-Level Flow Control +Ethernet Flow Control +.Pq IEEE 802.3x or LFC +can be configured with +.Xr sysctl 8 +to enable receiving and transmitting pause frames for .Nm . When transmit is enabled, pause frames are generated when the receive packet buffer crosses a predefined threshold. @@ -434,7 +471,7 @@ in case the link partner does not have FEC enabled or is not FEC capable: sysctl dev.ice..allow_no_fec_modules_in_auto=1 .Ed .Pp -NOTE: This flag is currently not supported on the Intel\(rg Ethernet 830 +NOTE: This flag is currently not supported on the Intel Ethernet 830 Series. .Pp To show the current FEC settings that are negotiated on the link: @@ -449,7 +486,7 @@ sysctl dev.ice..requested_fec .Pp To see the valid FEC modes for the link: .Bd -literal -offset indent -sysctl \-d dev.ice..requested_fec +sysctl -d dev.ice..requested_fec .Ed .Ss Speed and Duplex Configuration The speed and duplex settings cannot be hard set. @@ -464,17 +501,17 @@ Supported speeds will vary by device. Depending on the speeds the device supports, valid bits used in a speed mask could include: .Bd -literal -offset indent -0x0 \- Auto -0x2 \- 100 Mbps -0x4 \- 1 Gbps -0x8 \- 2.5 Gbps -0x10 \- 5 Gbps -0x20 \- 10 Gbps -0x80 \- 25 Gbps -0x100 \- 40 Gbps -0x200 \- 50 Gbps -0x400 \- 100 Gbps -0x800 \- 200 Gbps +0x0 - Auto +0x2 - 100 Mbps +0x4 - 1 Gbps +0x8 - 2.5 Gbps +0x10 - 5 Gbps +0x20 - 10 Gbps +0x80 - 25 Gbps +0x100 - 40 Gbps +0x200 - 50 Gbps +0x400 - 100 Gbps +0x800 - 200 Gbps .Ed .Ss Disabling physical link when the interface is brought down When the @@ -494,7 +531,7 @@ The driver allows for the generation of firmware logs for supported categories of events, to help debug issues with Customer Support. Refer to the -.Dq Intel\(rg Ethernet Adapters and Devices User Guide +.Dq Intel Ethernet Adapters and Devices User Guide for an overview of this feature and additional tips. .Pp At a high level, to capture a firmware log: @@ -553,7 +590,7 @@ DCBx (Bit 11) .It Va dcb DCB (Bit 12) .It Va xlr -XLR (function\-level resets; Bit 13) +XLR (function-level resets; Bit 13) .It Va nvm NVM (Bit 14) .It Va auth @@ -561,7 +598,7 @@ Authentication (Bit 15) .It Va vpd Vital Product Data (Bit 16) .It Va iosf -Intel On\-Chip System Fabric (Bit 17) +Intel On-Chip System Fabric (Bit 17) .It Va parser Parser (Bit 18) .It Va sw @@ -649,8 +686,8 @@ dmesg > log_output NOTE: Logging a large number of modules or too high of a verbosity level will add extraneous messages to dmesg and could hinder debug efforts. .Ss Debug Dump -Intel\(rg Ethernet 800 Series devices support debug dump, which allows -gathering of runtime register values from the firmware for +Intel Ethernet 800 Series devices support debug dump, +which allows gathering of runtime register values from the firmware for .Dq clusters of events and then write the results to a single dump file, for debugging complicated issues in the field. @@ -662,7 +699,7 @@ Debug dump captures the current state of the specified cluster(s) and is a stateless snapshot of the whole device. .Pp NOTE: Like with firmware logs, the contents of the debug dump are not -human\-readable. +human-readable. Work with Customer Support to decode the file. .Pp Debug dump is per device, not per PF. @@ -685,7 +722,7 @@ pass the argument. For example: .Bd -literal -offset indent -sysctl \-d dev.ice.0.debug.dump.clusters +sysctl -d dev.ice.0.debug.dump.clusters .Ed .Pp Possible bitmask values for @@ -693,24 +730,24 @@ Possible bitmask values for are: .Bl -bullet -compact .It -0 \- Dump all clusters (only supported on Intel\(rg Ethernet E810 Series and -Intel\(rg Ethernet E830 Series) +0 - Dump all clusters (only supported on Intel Ethernet E810 Series and +Intel Ethernet E830 Series) .It -0x1 \- Switch +0x1 - Switch .It -0x2 \- ACL +0x2 - ACL .It -0x4 \- Tx Scheduler +0x4 - Tx Scheduler .It -0x8 \- Profile Configuration +0x8 - Profile Configuration .It -0x20 \- Link +0x20 - Link .It -0x80 \- DCB +0x80 - DCB .It -0x100 \- L2P +0x100 - L2P .It -0x400000 \- Manageability Transactions (only supported on Intel\(rg Ethernet +0x400000 - Manageability Transactions (only supported on Intel Ethernet E810 Series) .El .Pp @@ -726,11 +763,11 @@ sysctl dev.ice.0.debug.dump.clusters=0 .Pp NOTE: Using 0 will skip Manageability Transactions data. .Pp -If a single cluster is not specified, the driver will dump all clusters to a -single file. +If a single cluster is not specified, +the driver will dump all clusters to a single file. Issue the debug dump command, using the following: .Bd -literal -offset indent -sysctl \-b dev.ice..debug.dump.dump=1 > dump.bin +sysctl -b dev.ice..debug.dump.dump=1 > dump.bin .Ed .Pp NOTE: The driver will not receive the command if the sysctl is not set to @@ -765,13 +802,13 @@ Use the following sysctl to read the PHY registers: sysctl dev.ice..debug.phy_statistics .Ed .Pp -NOTE: The contents of the registers are not human\-readable. +NOTE: The contents of the registers are not human-readable. Like with firmware logs and debug dump, work with Customer Support to decode the file. .Ss Transmit Balancing Some Intel(R) Ethernet 800 Series devices allow for enabling a transmit balancing feature to improve transmit performance under certain conditions. -When enabled, the feature should provide more consistent transmit +When enabled, this feature should provide more consistent transmit performance across queues and/or PFs and VFs. .Pp By default, transmit balancing is disabled in the NVM. @@ -809,7 +846,7 @@ sysctl dev.ice..temp may have a low number of network memory buffers (mbufs) by default. If the number of mbufs available is too low, it may cause the driver to fail to initialize and/or cause the system to become unresponsive. -Check to see if the system is mbuf\-starved by running +Check to see if the system is mbuf-starved by running .Ic netstat Fl m . Increase the number of mbufs by editing the lines below in .Pa /etc/sysctl.conf : @@ -821,8 +858,8 @@ kern.ipc.nmbjumbo16 kern.ipc.nmbufs .Ed .Pp -The amount of memory that should be allocated is system specific, and may require some -trial and error. +The amount of memory that should be allocated is system specific, +and may require some trial and error. Also, increasing the following in .Pa /etc/sysctl.conf could help increase network performance: @@ -847,13 +884,91 @@ To change the behavior of the QSFP28 ports on E810-C adapters, use the Intel To update the firmware on an adapter, use the Intel .Sy Non-Volatile Memory (NVM) Update Utility for Intel Ethernet Network Adapters E810 series - FreeBSD .El +.Ss Optics and auto-negotiation +Modules based on 100GBASE-SR4, +active optical cable (AOC), and active copper cable (ACC) +do not support auto-negotiation per the IEEE specification. +To obtain link with these modules, +auto-negotiation must be turned off on the link partner's switch ports. +.Pp +Note that adapters also support +all passive and active limiting direct attach cables +that comply with SFF-8431 v4.1 and SFF-8472 v10.4 specifications. +.Ss PCI-Express Slot Bandwidth +Some PCIe x8 slots are actually configured as x4 slots. +These slots have insufficient bandwidth +for full line rate with dual port and quad port devices. +In addition, +if a PCIe v4.0 or v3.0-capable adapter is placed into into a PCIe v2.x +slot, full bandwidth will not be possible. +.Pp +The driver detects this situation and +writes the following message in the system log: +.Bd -ragged -offset indent +PCI-Express bandwidth available for this device +may be insufficient for optimal performance. +Please move the device to a different PCI-e link +with more lanes and/or higher transfer rate. +.Ed +.Pp +If this error occurs, +moving the adapter to a true PCIe x8 or x16 slot will resolve the issue. +For best performance, install devices in the following PCI slots: +.Bl -bullet +.It +Any 100Gbps-capable Intel(R) Ethernet 800 Series device: Install in a +PCIe v4.0 x8 or v3.0 x16 slot +.It +A 200Gbps-capable Intel(R) Ethernet 830 Series device: Install in a +PCIe v5.0 x8 or v4.0 x16 slot +.El +.Pp +For questions related to hardware requirements, +refer to the documentation supplied with the adapter. .Sh HARDWARE The .Nm -driver supports the Intel Ethernet 800 series. -Some adapters in this series with SFP28/QSFP28 cages -have firmware that requires that Intel qualified modules are used; these -qualified modules are listed below. +driver supports the following +Intel 800 series 1Gb to 200Gb Ethernet controllers: +.Pp +.Bl -bullet -compact +.It +Intel Ethernet Controller E810-C +.It +Intel Ethernet Controller E810-XXV +.It +Intel Ethernet Connection E822-C +.It +Intel Ethernet Connection E822-L +.It +Intel Ethernet Connection E823-C +.It +Intel Ethernet Connection E823-L +.It +Intel Ethernet Connection E825-C +.It +Intel Ethernet Connection E830-C +.It +Intel Ethernet Connection E830-CC +.It +Intel Ethernet Connection E830-L +.It +Intel Ethernet Connection E830-XXV +.It +Intel Ethernet Connection E835-C +.It +Intel Ethernet Connection E835-CC +.It +Intel Ethernet Connection E835-L +.It +Intel Ethernet Connection E835-XXV +.El +.Pp +The +.Nm +driver supports some adapters in this series with SFP28/QSFP28 cages +which have firmware that requires that Intel qualified modules are used; +these qualified modules are listed below. This qualification check cannot be disabled by the driver. .Pp The @@ -862,13 +977,13 @@ driver supports 100Gb Ethernet adapters with these QSFP28 modules: .Pp .Bl -bullet -compact .It -Intel\(rg 100G QSFP28 100GBASE-SR4 E100GQSFPSR28SRX +Intel 100G QSFP28 100GBASE-SR4 E100GQSFPSR28SRX .It -Intel\(rg 100G QSFP28 100GBASE-SR4 SPTMBP1PMCDF +Intel 100G QSFP28 100GBASE-SR4 SPTMBP1PMCDF .It -Intel\(rg 100G QSFP28 100GBASE-CWDM4 SPTSBP3CLCCO +Intel 100G QSFP28 100GBASE-CWDM4 SPTSBP3CLCCO .It -Intel\(rg 100G QSFP28 100GBASE-DR SPTSLP2SLCDF +Intel 100G QSFP28 100GBASE-DR SPTSLP2SLCDF .El .Pp The @@ -877,11 +992,11 @@ driver supports 25Gb and 10Gb Ethernet adapters with these SFP28 modules: .Pp .Bl -bullet -compact .It -Intel\(rg 10G/25G SFP28 25GBASE-SR E25GSFP28SR +Intel 10G/25G SFP28 25GBASE-SR E25GSFP28SR .It -Intel\(rg 25G SFP28 25GBASE-SR E25GSFP28SRX (Extended Temp) +Intel 25G SFP28 25GBASE-SR E25GSFP28SRX (Extended Temp) .It -Intel\(rg 25G SFP28 25GBASE-LR E25GSFP28LRX (Extended Temp) +Intel 25G SFP28 25GBASE-LR E25GSFP28LRX (Extended Temp) .El .Pp The @@ -890,54 +1005,15 @@ driver supports 10Gb and 1Gb Ethernet adapters with these SFP+ modules: .Pp .Bl -bullet -compact .It -Intel\(rg 1G/10G SFP+ 10GBASE-SR E10GSFPSR +Intel 1G/10G SFP+ 10GBASE-SR E10GSFPSR .It -Intel\(rg 1G/10G SFP+ 10GBASE-SR E10GSFPSRG1P5 +Intel 1G/10G SFP+ 10GBASE-SR E10GSFPSRG1P5 .It -Intel\(rg 1G/10G SFP+ 10GBASE-SR E10GSFPSRG2P5 +Intel 1G/10G SFP+ 10GBASE-SR E10GSFPSRG2P5 .It -Intel\(rg 10G SFP+ 10GBASE-SR E10GSFPSRX (Extended Temp) +Intel 10G SFP+ 10GBASE-SR E10GSFPSRX (Extended Temp) .It -Intel\(rg 1G/10G SFP+ 10GBASE-LR E10GSFPLR -.El -.Pp -Note that adapters also support all passive and active -limiting direct attach cables that comply with SFF-8431 v4.1 and -SFF-8472 v10.4 specifications. -.Pp -This is not an exhaustive list; please consult product documentation for an -up-to-date list of supported media. -.Ss Fiber optics and auto\-negotiation -Modules based on 100GBASE\-SR4, active optical cable (AOC), and active copper -cable (ACC) do not support auto\-negotiation per the IEEE specification. -To obtain link with these modules, auto\-negotiation must be turned off on the -link partner's switch ports. -.Ss PCI-Express Slot Bandwidth -Some PCIe x8 slots are actually configured as x4 slots. -These slots have insufficient bandwidth for full line rate with dual port and -quad port devices. -In addition, if a PCIe v4.0 or v3.0\-capable adapter is placed into a PCIe v2.x -slot, full bandwidth will not be possible. -.Pp -The driver detects this situation and writes the following message in the -system log: -.Bd -literal -offset indent -PCI\-Express bandwidth available for this device may be insufficient for -optimal performance. -Please move the device to a different PCI\-e link with more lanes and/or -higher transfer rate. -.Ed -.Pp -If this error occurs, moving the adapter to a true PCIe x8 or x16 slot will -resolve the issue. -For best performance, install devices in the following PCI slots: -.Bl -bullet -.It -Any 100Gbps\-capable Intel(R) Ethernet 800 Series device: Install in a -PCIe v4.0 x8 or v3.0 x16 slot -.It -A 200Gbps\-capable Intel(R) Ethernet 830 Series device: Install in a -PCIe v5.0 x8 or v4.0 x16 slot +Intel 1G/10G SFP+ 10GBASE-LR E10GSFPLR .El .Sh LOADER TUNABLES Tunables can be set at the @@ -1035,11 +1111,11 @@ on. Disabled by default. .It num-queues Pq uint16_t Specify the number of queues the VF will have. -By default, this is set to the number of MSI\-X vectors supported by the VF +By default, this is set to the number of MSI-X vectors supported by the VF minus one. .It mirror-src-vsi Pq uint16_t Specify which VSI the VF will mirror traffic from by setting this to a value -other than \-1. +other than -1. All traffic from that VSI will be mirrored to this VF. Can be used as an alternative method to mirror RDMA traffic to another interface than the method described in the From nobody Thu Nov 6 16:43:14 2025 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 4d2Sg64CV7z655xL; Thu, 06 Nov 2025 16:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2Sg63S3Tz3Flq; Thu, 06 Nov 2025 16:43:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762447394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VS3ELD4TVSKrxDXKcLkspaLPbQx5ZuYM4NmfZPWM6JA=; b=CGxXvl7NtYqsXHYDOl9Y5lRwILsFNMxirsUjqV1BmUu4a1TXwo/CU/3mAXGdTAzG/I6B1l pJaolUVGZLHtrmWnkj7q7Fz8DzrEAF09liigAFt9ASHEfd7c3s+2IT4cLNLLPtdP7pQymM UZHGHz+9EKU13d0P3LVmg2AjJ5QXPpoxG7sBKnnBeMlzg9xQ4aFMDCGkfHrXqGhWqTx654 6xz+2Xu6OAninT2uvpQN3AjMDmfhNYU+35sQP3P2sBn6wmQfB/RC1ll/8s7fABqRnBdriy pBbxozehyvax99A5Bwzvvf8pQrixVaPxZWdHfl5oWOIbpLpqOe1MDglkySUjdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762447394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VS3ELD4TVSKrxDXKcLkspaLPbQx5ZuYM4NmfZPWM6JA=; b=t+eDD3RFv0tsV5RgW+EHWobs85/7YpRiX9R7z+KGsRIZXWGsm4gziGuGVLqvvGEeyj5IVj r/kiX1KFxG3YroNqkov4OJQp8Huprv0zkZgYNvk73aOclTqOGF/AZyz8Fg5njY98IeMLqE 9QnnixhyCOQOD1AXxwWzuirwmJizGWkFyeQ/lu/80+GY7ARnun54MNGYSg7YW3QKWyJoHp T8jQbdsM700vge+swK2QQZuQ3P/E0IoVFVtEZ9E3fvRscBYolptD857GeVLqZEXXYUpRgE VqM6PfG1wHyp7lL6Q1AYOu+8uieoI/kyCXE3mwe/BUiAUayUlR5zO4yT/KHqIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762447394; a=rsa-sha256; cv=none; b=KRX+bEqyqFhCl68f6rUUI/flipP0HEjIWgfwCK9wXX4yhhHkgcKIM7nuBsiK3+yGSpCBoj fnPnU1zzXYWU8U6ChtN7hujp/65t9GLle4z76wHDp4/pj8vowyvY5FNXVrHPb4SX2yle74 VdZwN4dthnSEudOxle92K4+kN7YOob2xQ2kcVtnVPptnDylOqMzaLMMzcPSruXV0N7gMmx m5XsYBI2zvD3K6o9pQjf0IZGatH/aZ2Pi9yWts7khqY6Al6JJ5AR79lABty5leEq6R1f0F Dai86elJMwzytVOHj5CFbOTS1lEeJGJ01ubRFsWcOzVTRgFviFf8NcZZAvW2dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2Sg630RBz5XW; Thu, 06 Nov 2025 16:43:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6GhED2075664; Thu, 6 Nov 2025 16:43:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6GhEwK075661; Thu, 6 Nov 2025 16:43:14 GMT (envelope-from git) Date: Thu, 6 Nov 2025 16:43:14 GMT Message-Id: <202511061643.5A6GhEwK075661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 2608020ac8c3 - stable/15 - dumpon(8): Add a SYSCTL VARIABLES 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 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: 2608020ac8c3fe583eeaa782e99061ef54b80a0c Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2608020ac8c3fe583eeaa782e99061ef54b80a0c commit 2608020ac8c3fe583eeaa782e99061ef54b80a0c Author: Felix Johnson AuthorDate: 2025-11-06 16:32:42 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 16:42:56 +0000 dumpon(8): Add a SYSCTL VARIABLES section Document debug.minidump and machdep.dump_retry_count sysctl variables. PR: 259393 MFC after: 3 seconds Reviewed by: gbe (previous), markj, ziaee Differential Revision: https://reviews.freebsd.org/D32618 (cherry picked from commit 850841edf6c0867a170d2637f3dacfda33d5f3dd) --- sbin/dumpon/dumpon.8 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8 index a57dfef7096d..f2082a58851d 100644 --- a/sbin/dumpon/dumpon.8 +++ b/sbin/dumpon/dumpon.8 @@ -228,6 +228,20 @@ total amount of physical memory as reported by the .Va hw.physmem .Xr sysctl 8 variable. +.Sh SYSCTL VARIABLES +The following +.Xr sysctl 8 +variables can be used to modify or monitor the behavior of crash dumps: +.Bl -tag -width "machdep.dump_retry_count" +.It Va debug.minidump +Set the type of kernel crash dump. +Possible values are 0 for a full crash dump or 1 for a minidump. +The default is minidump. +.It Va machdep.dump_retry_count +The maximum number of times dump will retry before giving up. +The default value is 5. +This sysctl is only supported on PowerPC and AMD64. +.El .Sh IMPLEMENTATION NOTES Because the file system layer is already dead by the time a crash dump is taken, it is not possible to send crash dumps directly to a file. @@ -377,6 +391,7 @@ needed. .Xr loader 8 , .Xr rc 8 , .Xr savecore 8 , +.Xr sysctl 8 , .Xr swapon 8 , .Xr panic 9 .Sh HISTORY From nobody Thu Nov 6 16:44:48 2025 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 4d2Shx1PJNz656Mr; Thu, 06 Nov 2025 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2Shx0kc2z3Glf; Thu, 06 Nov 2025 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762447489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=osbQpqiO0yOgXraJihdSbjbpkBa3I4xi7tq4/hL74N4=; b=C8z58FHw+QQImSwWhpa7anfuOtYbv1IrZZnbRw4A9k80mXYnIYFVbn/PqMS/k7MFiPJg+w 8PoV+5263yeD06gJpgprHRUrsOEtMxOiQP6lex3u7oII+s/wLCrIKBBhjNw5M2GDYeo8Im YqaBh7xsHPkzoAoyPjTC+XiYMJSiRBL/EZTap4yz6VyyiSOErADGqRBx0hMN8FlodBrp9Q H+ZgEgVbie13f3Bh7ha8AAuNjky2/mAx1IZwrt9UMiH6zBP37CrJ3LFadT6vTMWwquCGIy ISW3jPjK2lkGDhzddPb4JCOt68aT+4UJQHW9Z01mKobGXR/7Ri2+4E6fBCLMSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762447489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=osbQpqiO0yOgXraJihdSbjbpkBa3I4xi7tq4/hL74N4=; b=GheZaXYL1SNdKAcFrCPT0ZC9xYA5FDtraNA/tHEaTcUn3zGqSlRBRGfEaHFcio17qDb8tx sv2M4dtuSl0pd1j/CM5BJU5ABFLeIPa0nM0wE1K7tMj4CMmXKyX0nNkYdtMwMFS0xrpnww gVeauFJnMUlzsqCTjZrfIzsQtKjXLCQ8bJAbUz4Gqc3lVnQfV8b+pPY9qymv+0UBeUiYmf m6CM5Vo54fbzC98SKkmsqqwN7Uvhr+vKd1+fBq73/CHpB+3O+Se7omK/5sjBcoMXxpoYEo aNRdCLnsFTb0Lpi76OUzwhyeg5E9HLNGNYPVNZowIQRPBcuhGn3M3JcGGWefHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762447489; a=rsa-sha256; cv=none; b=JzVPD96Z/LUFZ6VHXbz4NZKHbu4h3PHth+GacC6KORQoleN+qQF2st8eN/YFimh9ksmK3s h825QSGOBPhMy9yvXLZ6yLFZ2v7HwJbXBceJj9ArkhnVwOorc5z0r2Wr54M4I5Oy4T+2lk 5JfFC3AoXtC8HcI5+AVrGChuRJ+82ud6b0uMKqM/CSLNRlvOW276JKsKZHB0V/t3pOZ1Rk XxXpNQoeU7wrW/48ubuCeM2N13kLN8++DYcJRD8KI3mmEKqdKBl2YfjMHtYTXa9r+jd6sy +HDk7ERTINO0TsYJvM4ybF47c/ysrhjioTdfA235amevMCHsbeMb0KrpD/eUbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2Shx059Tz5Qx; Thu, 06 Nov 2025 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6GimTS076363; Thu, 6 Nov 2025 16:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6GimPT076360; Thu, 6 Nov 2025 16:44:48 GMT (envelope-from git) Date: Thu, 6 Nov 2025 16:44:48 GMT Message-Id: <202511061644.5A6GimPT076360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 7c8717183536 - stable/14 - dumpon(8): Add a SYSCTL VARIABLES 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 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/14 X-Git-Reftype: branch X-Git-Commit: 7c8717183536b99f455d6fefefb762f1d7e6f030 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7c8717183536b99f455d6fefefb762f1d7e6f030 commit 7c8717183536b99f455d6fefefb762f1d7e6f030 Author: Felix Johnson AuthorDate: 2025-11-06 16:32:42 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 16:43:43 +0000 dumpon(8): Add a SYSCTL VARIABLES section Document debug.minidump and machdep.dump_retry_count sysctl variables. PR: 259393 MFC after: 3 seconds Reviewed by: gbe (previous), markj, ziaee Differential Revision: https://reviews.freebsd.org/D32618 (cherry picked from commit 850841edf6c0867a170d2637f3dacfda33d5f3dd) --- sbin/dumpon/dumpon.8 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8 index 59d199a2de17..b607f8717ff9 100644 --- a/sbin/dumpon/dumpon.8 +++ b/sbin/dumpon/dumpon.8 @@ -230,6 +230,20 @@ total amount of physical memory as reported by the .Va hw.physmem .Xr sysctl 8 variable. +.Sh SYSCTL VARIABLES +The following +.Xr sysctl 8 +variables can be used to modify or monitor the behavior of crash dumps: +.Bl -tag -width "machdep.dump_retry_count" +.It Va debug.minidump +Set the type of kernel crash dump. +Possible values are 0 for a full crash dump or 1 for a minidump. +The default is minidump. +.It Va machdep.dump_retry_count +The maximum number of times dump will retry before giving up. +The default value is 5. +This sysctl is only supported on PowerPC and AMD64. +.El .Sh IMPLEMENTATION NOTES Because the file system layer is already dead by the time a crash dump is taken, it is not possible to send crash dumps directly to a file. @@ -379,6 +393,7 @@ needed. .Xr loader 8 , .Xr rc 8 , .Xr savecore 8 , +.Xr sysctl 8 , .Xr swapon 8 , .Xr panic 9 .Sh HISTORY From nobody Thu Nov 6 16:54:05 2025 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 4d2Svd420kz656kX; Thu, 06 Nov 2025 16:54: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2Svd3MjWz3LLB; Thu, 06 Nov 2025 16:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762448045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ff2Zq2ezHRv8sUd0192VSG2hOZUUrmjNwV0vmb2jStI=; b=LoOST93gOTOuuJ7YBOf8VB1EuEGl581NZWJYqMec2C+PLDJnNLpUXcKT2dPL8R2XcFmCYp CGtSe9okmULKk5gHrqEtlvwvV6L/6tx5aeYmB609oTApXA8+cQC99kKMiMz2lfBvfHUVP4 FZceg/oM6vh+meLZMzDsulu7iDmD7VTy/mEGJwlWL45vjeZa2Q1shj7OZaoALFPcRxsdvZ BiP1BxcMh2rscM5US0be390rJ38tic5hrJVTFqm34IbAfk/nD/UZu32Yy5hvJ6SrUi4fsl DMayFABmX/wfKk4yKbpje8IU742K7oJccGusQ5Hsa3olVd6FyWE+A1PXsRK6hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762448045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ff2Zq2ezHRv8sUd0192VSG2hOZUUrmjNwV0vmb2jStI=; b=M9LwQhv9+2rurHabMU6pyQSr39pPfsBZPR6EEfFTPd4CQFLL0lexPmwi6F/wYct79WptcG 96HLMLgq4E6FqDAQfOVtkGYOxP2bTsjHbR8DdCHkVltsY7Qf2593oL7znI6EC0xY0UsNQX 3Adwu9vX/6vHpvnd5byp8YrDLej9ELoreDBjkZgFjVUVERqEufiQVT6qA/+lXwdvK9w2h5 PxxSPgDHWCGWUkqEf61cpWabEAUe76wrwroZMB0qRvleU/Zz26g8Thx7L7ylN3FGBaAenk 0ipF1nM01keM5uUFTibA68FxcpLLTSzuRkti+eyKe97hJbugPxbVZLD5zbrO6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762448045; a=rsa-sha256; cv=none; b=xjxOMum1RtUpkim7uZXQHmAMt0/Vtg9INMTQZqm3mZBVpY3TU3WM3yhR54zGx9UieeFwtR Vbb6YtKsyUfRtfypji+HEm3mlUlEqwbZ50f/SSC+KSbXbPDNHa/gs1QLQtbJfBdsDblhSJ 7QF7sV1fyesOWCFWSkX6s68NqFXyOqMcTd3dTagxzrNisdINkmlhQrPSugMIsl5Sqye75R Yi8eUNO/B32wlIdDSARC3XJblsEi8CnnhA0bMrIcuBvHXzUEzyQvhUkIi6ftCamDNn48P1 L2L97+Bi0OsT/wGLpj9e67vm65ENGxK6dKa+hs4OYuQzIP99Q5N3Caf8FiGuzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2Svd2qB5z6V1; Thu, 06 Nov 2025 16:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6Gs5Zv095034; Thu, 6 Nov 2025 16:54:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6Gs5qr095031; Thu, 6 Nov 2025 16:54:05 GMT (envelope-from git) Date: Thu, 6 Nov 2025 16:54:05 GMT Message-Id: <202511061654.5A6Gs5qr095031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 801f10b8c704 - stable/15 - ciss.4: Add p440ar to HARDWARE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 801f10b8c70490f95f95adc9e474f33619cd9901 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=801f10b8c70490f95f95adc9e474f33619cd9901 commit 801f10b8c70490f95f95adc9e474f33619cd9901 Author: Alexander Ziaee AuthorDate: 2025-11-06 16:51:13 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 16:53:53 +0000 ciss.4: Add p440ar to HARDWARE PR: 290425 MFC after: 3 seconds, this fixes the HW relnotes Reported by: jwb (cherry picked from commit a41ffaa330f5dbfc6b10f32ea2879755e07ba932) --- share/man/man4/ciss.4 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index 28d6556ecd85..d731aaddad38 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -1,7 +1,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd January 26, 2012 +.Dd November 6, 2025 .Dt CISS 4 .Os .Sh NAME @@ -87,9 +87,10 @@ might be solved by updating the firmware and/or setting the .Va hw.ciss.nop_message_heartbeat tunable to non-zero at boot time. .Sh HARDWARE -Controllers supported by the +The .Nm -driver include: +driver supports controllers implementing +Common Interface for SCSI-3 Support Open Specification v1.04, including: .Pp .Bl -bullet -compact .It @@ -145,6 +146,8 @@ HP Smart Array P430i .It HP Smart Array P431 .It +HP Smart Array P440ar +.It HP Smart Array P530 .It HP Smart Array P531 From nobody Thu Nov 6 16:55:07 2025 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 4d2Swq3C21z6571w; Thu, 06 Nov 2025 16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2Swq2BjRz3LxZ; Thu, 06 Nov 2025 16: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=1762448107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fs2EiIfEY0zTdtcEddh4sFMHh2Bhot8uGDsHlVFgxow=; b=QdTOFScmxo2SRF0JJJJF/bOgosOnEBfaDGa4ZyqEYvHeHyXjSvubE34DVWY70UzLIsGg1V /Zwzm7k5rG0d7fMtS6Sq1J8NHnpJsbqxK11TWVeTaNDrsDGmerrRY6wiaYIrqJQTFW624d W0G0XuWkLiL2BH3dmDCvNiGf/yTTrj6DXRblBYc8ZgPVUBArcHZtcYXHGKlaFBxdG1wbQR 9UhIKP8W1qeNZy91qjNlbym00JX4OPF0T48t+zM+Ke6gywpjXmztr4dOWdEBK3StD21uaP w0aFjVO19Jb1fNEIMg3//qIQ4bEtkd4ZiUhSrXMTjYl2O4VfX5ZCiGdERtweeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762448107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fs2EiIfEY0zTdtcEddh4sFMHh2Bhot8uGDsHlVFgxow=; b=IHbR+ZLFrUO5s8ktXHxDoa+XH1XuYqvXo7GS/eiYQZyRJqWjMg9eIjptU5rewep1FVYHQ4 hEidJ4z4nAO+KI5AFzSpTDti0SiSVB6NX7AP5fVyhD/nMg7kcqevIhzDsrwtY3yZjYRExU vqFzISyJ/KUFTHvDNYVKGxHFYgQ0iSqI3sctmlZLmaiQr9DGtcD/3mIu9qfNedUbnm984+ XmOJOB3XEqnZAubi5wTd3MJtpvj9UqSBsJj4DJSxEx40PGlKKjVFBYnmKuZWkwNQL+w/YR qewRYnE3eWZaI2Dv8MxIajjgvGshhZZymbZ47K74v8xCa+n60a0+spBVwwonAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762448107; a=rsa-sha256; cv=none; b=p+3BraOW08RnQEyMw96wtTzRh+ma+mozPENiBiCCFHTapmhKP8TF0eUjDmVnnXrHJN8dks UPdaN6ij667ek+mGx0f1Fcgj/1lZvZNVY6E8KxQPQHMNLz0JSlzk/DWqe7667llFSVmPQM iyilUCl11iofiC7Vwgb4eKJ2XfZJcKkfMM9jTH5s75+9lr5leDFh3hY+r/ITOcgSujKYLG /EUjQ6MVFKR/wdm5lLPYeLqcCvWm81/B2lKmgPGAVhOxEp1k5YgaCXEyJJ5rWx/yKwlvJS MrKAEWrjNTCVytMgyS5+rlJNjWMTLLP7u+GxKABFM600RCXjrdXJFs/dyL3zsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2Swq1jclz68w; Thu, 06 Nov 2025 16:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6Gt7qO095474; Thu, 6 Nov 2025 16:55:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6Gt7Cw095471; Thu, 6 Nov 2025 16:55:07 GMT (envelope-from git) Date: Thu, 6 Nov 2025 16:55:07 GMT Message-Id: <202511061655.5A6Gt7Cw095471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: fa168bb244ee - stable/14 - ciss.4: Add p440ar to HARDWARE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: fa168bb244eea0e436ae7c14cca513590e648889 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=fa168bb244eea0e436ae7c14cca513590e648889 commit fa168bb244eea0e436ae7c14cca513590e648889 Author: Alexander Ziaee AuthorDate: 2025-11-06 16:51:13 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 16:54:59 +0000 ciss.4: Add p440ar to HARDWARE PR: 290425 MFC after: 3 seconds, this fixes the HW relnotes Reported by: jwb (cherry picked from commit a41ffaa330f5dbfc6b10f32ea2879755e07ba932) --- share/man/man4/ciss.4 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index 28d6556ecd85..d731aaddad38 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -1,7 +1,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd January 26, 2012 +.Dd November 6, 2025 .Dt CISS 4 .Os .Sh NAME @@ -87,9 +87,10 @@ might be solved by updating the firmware and/or setting the .Va hw.ciss.nop_message_heartbeat tunable to non-zero at boot time. .Sh HARDWARE -Controllers supported by the +The .Nm -driver include: +driver supports controllers implementing +Common Interface for SCSI-3 Support Open Specification v1.04, including: .Pp .Bl -bullet -compact .It @@ -145,6 +146,8 @@ HP Smart Array P430i .It HP Smart Array P431 .It +HP Smart Array P440ar +.It HP Smart Array P530 .It HP Smart Array P531 From nobody Thu Nov 6 18:46:39 2025 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 4d2WPW3c01z6FD3w; Thu, 06 Nov 2025 18:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2WPW2hLnz3m1l; Thu, 06 Nov 2025 18:46:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762454799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u8BDSZ0qhYo2hiUkjZ3D1B0t6oRTxf/HpWgGsAa02E0=; b=erqtnyAXUI1Zb+obE3kyTzvBLEVl59gacjdN1NDdtFuvpOJ27vXO8LF/b1yT/TKAcpXP7o 1KMIse0MUvVFF9l7ZcKRrMiP76rIUoso48p3QLRIe32w5NI8R+uv1L2xlJxV9gq+94rq9E TWoPvVeFqEz6NC+pa9ixgZ/Vt8x4s+PkW2Tjs48QZhnr4lI4GV4HFzi8kGzW7qrnD5JKvw fhsyaGX7AKeqn2dvGY4BHP6dg86zSCgAyLQ90n2bILM7gW8L3fwJxiGXsPo8Kx+3QuJScr /J41jJyQP5sCmY30O+6NniH9fhUucCfbOUmf2T6oWnh/HO4uP6Bjl67Lk8n8rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762454799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u8BDSZ0qhYo2hiUkjZ3D1B0t6oRTxf/HpWgGsAa02E0=; b=I6vKqu9J7xUoyvTZYtrhKV0uVVCIhd+7XNmtu2NagYY/1y/2RZYvUhCjQRypjcQJ5WM+K/ w/azWeuy5Eu3oHj9gWzdJ60iOeg8WxXEO+dJWkY5uVASBIlrxXXXoaHAg9f0pcHxR7KbiP +dQZYcagmYL2sgII4RxtnpC3hY6NjYp53wezqwJJTHcZmZ8Kgqcs6IYop/wT8Y+MWWOQQJ scrsvqjaGnbAO0B+le89FXKGHEfkajAlBgpBckKMACEL3FcbhtnqfvYvD3GByslV7ysi4w 8N0t4qahf4u4xhmEhsKirRetLxe6b9LepIKsC+T1+o374TrdtL7XeXulcJJe+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762454799; a=rsa-sha256; cv=none; b=efsIbTvvpmvM4mgxzzIYCKs7MyvRlGdHldG3zWb1FFwoZSw+yw3l8RF72G+ea5E6t7J3EA Nen+LkTJf5aFKLy4dzbQEbFXf5R03bHy3JqeCuV1CYLhRwEn3GsHovV9qAZb7gzFOmxerd s2ouHPIFV5lQpTeibRrrrSM7rgZOkFjTPUCKv2NNT9Xb1d5C4UqHQ4Bxn329SvqH0T6G6N 6dOyKk8id9gluQUBqOO44TiznzxUWZrNUzOOORvOFGnBKLd5Tadrgx1bWwU3JAL4L8jAC5 HIjWkDZZ//I2+k2dDoW/5lEGbhjTgOTidfmVdVT0O1ZVFDrlfbin7Uenf03Bag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2WPW2F5mz9F6; Thu, 06 Nov 2025 18:46:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6IkdAG005162; Thu, 6 Nov 2025 18:46:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6Ikdlb005159; Thu, 6 Nov 2025 18:46:39 GMT (envelope-from git) Date: Thu, 6 Nov 2025 18:46:39 GMT Message-Id: <202511061846.5A6Ikdlb005159@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 9a6e6e9edc7e - stable/15 - sysrc.8: Rewrite examples for mdoc conformance List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 9a6e6e9edc7eee4aeeb2f9f0e7be12eee656efaf Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=9a6e6e9edc7eee4aeeb2f9f0e7be12eee656efaf commit 9a6e6e9edc7eee4aeeb2f9f0e7be12eee656efaf Author: Alexander Ziaee AuthorDate: 2025-11-06 18:42:06 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 18:46:17 +0000 sysrc.8: Rewrite examples for mdoc conformance Tag SPDX while here. This is not a content change, so do not bump date. PR: 274164 MFC after: 3 seconds (cherry picked from commit 3f0dd7724658126dcfde488a994cf7698353a82c) --- usr.sbin/sysrc/sysrc.8 | 89 +++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 48 deletions(-) diff --git a/usr.sbin/sysrc/sysrc.8 b/usr.sbin/sysrc/sysrc.8 index bdf3353c2cf9..cb32f72ea587 100644 --- a/usr.sbin/sysrc/sysrc.8 +++ b/usr.sbin/sysrc/sysrc.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2011-2016 Devin Teske .\" All rights reserved. .\" @@ -408,62 +411,52 @@ and .It Pa /usr/local/etc/rc.conf.d/name/* .El .Sh EXAMPLES -Below are some simple examples of how -.Nm -can be used to query certain values from the -.Xr rc.conf 5 -collection of system configuration files: -.Pp -.Nm -sshd_enable -.Dl returns the value of $sshd_enable, usually YES or NO . +.Ss Working with rc.conf files +Ask the value of +.Cm sshd_enable , +usually YES or NO: +.Dl sysrc sshd_enable .Pp -.Nm -defaultrouter -.Dl returns IP address of default router Pq if configured . -.Pp -Working on other files, such as +Return the IP address of default router +.Pq if configured : +.Dl sysrc defaultrouter +.Ss Working with other files +Return the value of the MAILTO setting, if configured, from .Xr crontab 5 : +.Dl sysrc -f /etc/crontab MAILTO .Pp -.Nm --f /etc/crontab MAILTO -.Dl returns the value of the MAILTO setting Pq if configured . -.Pp -Appending to existing values: -.Pp -.Nm -\&cloned_interfaces+=gif0 -.Dl appends Qo gif0 Qc to $cloned_interfaces Pq see APPENDING VALUES . -.Pp -.Nm -\&cloned_interfaces-=gif0 -.Dl removes Qo gif0 Qc from $cloned_interfaces Pq see SUBTRACTING VALUES . -.Pp -In addition to the above syntax, -.Nm -also supports inline -.Xr sh 1 -PARAMETER expansion for changing the way values are reported, shown below: +Append +.Dq gif0 +to $cloned_interfaces +.Pq see Sx APPENDING VALUES : +.Dl sysrc cloned_interfaces+=gif0 .Pp -.Nm -\&'hostname%%.*' -.Dl returns $hostname up to (but not including) first `.' . +Remove +.Dq gif0 +from $cloned_interfaces +.Pq see Sx SUBTRACTING VALUES : +.Dl sysrc cloned_interfaces-=gif0 +.Ss Inline shell parameter expansion +Return $hostname up to, but not including, first +.Ql \&. : +.Dl sysrc 'hostname%%.*' .Pp -.Nm -\&'network_interfaces%%[$IFS]*' -.Dl returns first word of $network_interfaces . +Return first word of $network_interfaces: +.Dl sysrc 'network_interfaces%%[$IFS]*' .Pp -.Nm -\&'ntpdate_flags##*[$IFS]' -.Dl returns last word of $ntpdate_flags (time server address) . +Return last word of $ntpdate_flags +.Pq time server address : +.Dl sysrc 'ntpdate_flags##*[$IFS]' .Pp -.Nm -usbd_flags-"default" -.Dl returns $usbd_flags or "default" if unset or NULL . +Return $usbd_flags or +.Dq default +if unset or NULL: +.Dl sysrc usbd_flags-"default" .Pp -.Nm -cloned_interfaces+"alternate" -.Dl returns "alternate" if $cloned_interfaces is set . +Return +.Dq alternate +if $cloned_interfaces is set: +.Dl sysrc cloned_interfaces+"alternate" .Sh SEE ALSO .Xr rc.conf 5 , .Xr jail 8 , From nobody Thu Nov 6 18:46:57 2025 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 4d2WPs4nyYz6FDBB; Thu, 06 Nov 2025 18:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2WPs4Hshz3mLh; Thu, 06 Nov 2025 18:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762454817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iD2Ez+HqoAL+oxv3ka1aPVV05q0bV8UpeuvxgPJsUrg=; b=T6XnH4CHCQsUm70SrjHEjEv7tBH4ADcOw/I7p8BXFVb+yy8uxR8OpahNgGW+j5eBZI6XHA QfsjYLozx2vI9sUCutWjpdKRvTKgQoc7r3GI6bhfh9SFyc802XhQV4zyfMyw/6H6aSJGx9 TMY9CnAARI+dZcc75NR7y60FqOHZkG/oi/95x8CXsedFkzF0JiI2WmdXLJ+HEK+OVXdptF ynn286bHdBejnXrD8ppdv5qY3Ww9ulFIhAuvXFveha5UytNroVefIUlSDl0YXBbzcXRB+O qShX4WPZbLFWIRToRYmiwWT+lRz2g8uOoOfh75bDhNXtN335vkL4+ZHm0mFEWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762454817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iD2Ez+HqoAL+oxv3ka1aPVV05q0bV8UpeuvxgPJsUrg=; b=hbFULAZd01K3dZ4nQcWj2BNTNp00B8spC3HOiv5htGGsZmBfpY6UOYsUyS8G+fMx0FTq99 EnMw7cd13OWWRhCF6yTUzjTyiH8MZBfCEq0ZXguSbwmT7Gdh6J+uvzEyhF7xrkqvTp3Kgz qX5nTEZ+KzxjEeNDCO11P7elxlOidVw4Xxeq4FoXjjw0Js4zajw6kCEfB3YWTwrNMOy6+P qrk9rYxzMdGuII2OqWub1VtZGTFQPZt9wmrpbTTAIkXx7HIN6+JNiClpIp8eFmCa7EVcol bzn5Op6ZouwGsU5V6q0jqZcjTVa9qvIxKuC3uvpcD/qShvtY+tdqgGsHpozfSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762454817; a=rsa-sha256; cv=none; b=wTC7Hl7ZDhMUMWLRQdEHtWlWvlj23ztPj68wcU3n2VmMNynCbL9hN83oJkhfUXcz+b9UjD qNbEB0k6ifC6NIJOUKsnBL0IxWRWdj8459H1sSDvmERwWJSZYsOezKDKF5SI1DiuJybASG 680SA316wsDE9HIfDl/M4A/btdUFOyF0VZRi1D91Y0Mx/Kb2C52v/uR3KMRq6col0e/aoS bGMBVzHBjHscYs07ReqOHr94jl/cbSIS1HjzUkQgi7UtI6Ol3DtNrZZWWWm1KKYUZAKXnL Rt5hnucL65F7FgUpjtl17DQ/fu6seVw1g2XhI1arxiRzSXojH4THXkLk7Gl1oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2WPs3pSCz9CH; Thu, 06 Nov 2025 18:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6IkvFE005389; Thu, 6 Nov 2025 18:46:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6IkvcV005386; Thu, 6 Nov 2025 18:46:57 GMT (envelope-from git) Date: Thu, 6 Nov 2025 18:46:57 GMT Message-Id: <202511061846.5A6IkvcV005386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 920c94b71043 - stable/14 - sysrc.8: Rewrite examples for mdoc conformance List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 920c94b71043012c5ebad1b68a7349d5e11eac0d Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=920c94b71043012c5ebad1b68a7349d5e11eac0d commit 920c94b71043012c5ebad1b68a7349d5e11eac0d Author: Alexander Ziaee AuthorDate: 2025-11-06 18:42:06 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 18:46:57 +0000 sysrc.8: Rewrite examples for mdoc conformance Tag SPDX while here. This is not a content change, so do not bump date. PR: 274164 MFC after: 3 seconds (cherry picked from commit 3f0dd7724658126dcfde488a994cf7698353a82c) --- usr.sbin/sysrc/sysrc.8 | 89 +++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 48 deletions(-) diff --git a/usr.sbin/sysrc/sysrc.8 b/usr.sbin/sysrc/sysrc.8 index bdf3353c2cf9..cb32f72ea587 100644 --- a/usr.sbin/sysrc/sysrc.8 +++ b/usr.sbin/sysrc/sysrc.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2011-2016 Devin Teske .\" All rights reserved. .\" @@ -408,62 +411,52 @@ and .It Pa /usr/local/etc/rc.conf.d/name/* .El .Sh EXAMPLES -Below are some simple examples of how -.Nm -can be used to query certain values from the -.Xr rc.conf 5 -collection of system configuration files: -.Pp -.Nm -sshd_enable -.Dl returns the value of $sshd_enable, usually YES or NO . +.Ss Working with rc.conf files +Ask the value of +.Cm sshd_enable , +usually YES or NO: +.Dl sysrc sshd_enable .Pp -.Nm -defaultrouter -.Dl returns IP address of default router Pq if configured . -.Pp -Working on other files, such as +Return the IP address of default router +.Pq if configured : +.Dl sysrc defaultrouter +.Ss Working with other files +Return the value of the MAILTO setting, if configured, from .Xr crontab 5 : +.Dl sysrc -f /etc/crontab MAILTO .Pp -.Nm --f /etc/crontab MAILTO -.Dl returns the value of the MAILTO setting Pq if configured . -.Pp -Appending to existing values: -.Pp -.Nm -\&cloned_interfaces+=gif0 -.Dl appends Qo gif0 Qc to $cloned_interfaces Pq see APPENDING VALUES . -.Pp -.Nm -\&cloned_interfaces-=gif0 -.Dl removes Qo gif0 Qc from $cloned_interfaces Pq see SUBTRACTING VALUES . -.Pp -In addition to the above syntax, -.Nm -also supports inline -.Xr sh 1 -PARAMETER expansion for changing the way values are reported, shown below: +Append +.Dq gif0 +to $cloned_interfaces +.Pq see Sx APPENDING VALUES : +.Dl sysrc cloned_interfaces+=gif0 .Pp -.Nm -\&'hostname%%.*' -.Dl returns $hostname up to (but not including) first `.' . +Remove +.Dq gif0 +from $cloned_interfaces +.Pq see Sx SUBTRACTING VALUES : +.Dl sysrc cloned_interfaces-=gif0 +.Ss Inline shell parameter expansion +Return $hostname up to, but not including, first +.Ql \&. : +.Dl sysrc 'hostname%%.*' .Pp -.Nm -\&'network_interfaces%%[$IFS]*' -.Dl returns first word of $network_interfaces . +Return first word of $network_interfaces: +.Dl sysrc 'network_interfaces%%[$IFS]*' .Pp -.Nm -\&'ntpdate_flags##*[$IFS]' -.Dl returns last word of $ntpdate_flags (time server address) . +Return last word of $ntpdate_flags +.Pq time server address : +.Dl sysrc 'ntpdate_flags##*[$IFS]' .Pp -.Nm -usbd_flags-"default" -.Dl returns $usbd_flags or "default" if unset or NULL . +Return $usbd_flags or +.Dq default +if unset or NULL: +.Dl sysrc usbd_flags-"default" .Pp -.Nm -cloned_interfaces+"alternate" -.Dl returns "alternate" if $cloned_interfaces is set . +Return +.Dq alternate +if $cloned_interfaces is set: +.Dl sysrc cloned_interfaces+"alternate" .Sh SEE ALSO .Xr rc.conf 5 , .Xr jail 8 , From nobody Thu Nov 6 19:18:41 2025 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 4d2X6V00pPz6FGhR; Thu, 06 Nov 2025 19:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2X6T6XMjz42Dw; Thu, 06 Nov 2025 19:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762456721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9Ta69lpX+fnVYBrD23fySzQrOFDs2g5wFBuJ2Ijfzk=; b=k+YnENwqoMZ5OhisqnoItbT1BupfRChlwz4kKgvF5VL0alhfbxQIVdmeET2cOizB3BYzuL ZQBzRTGzRgg/kehw8EreRnWWCprrV3jn39h/jObMj4rc0fJjCozLpTdKSt4jX1uiFmjs6y QjurkHbIzSt1J2J1HlOBGhLd2qZOtqDIpzbP/BJDcfIbAlPKapvilPwKRCkkfMQQFqHGbA jd2WndMnYsFCPYbsgOsLQzqNpTkyzcNOt29ak+coJQfbGDHtJpaCaQYA+tzTvlbk+9kwO6 nh3syEmlFPtXI8XuVbuU1FjBtGEvlyd9g95XXmpYtkdT5QOdswF9/9UP4rUCwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762456721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9Ta69lpX+fnVYBrD23fySzQrOFDs2g5wFBuJ2Ijfzk=; b=hhIt+CAzH8GoVdR0dQ+KQlxNpdIpFnY2ySTY8aJmJNERzzICp7DBKks8qGVZ23W7VIyXby cmV7T3b+SkSGNx+js8ez3juW85otoFzSIi74y7ihklvqNUKyYccZFqc72Chzo4yREJIkcr CX7XGPTTXFdOR9GsEyvrXbd3VmVkJGfNfAqV3B8wAqhCjWZW5Yt4bF+Hi2oW8ftsk7Xudw xCCsTZUGpWxsuDz2joL46guYnGtWMEFEsQ/6wv/3VIisw2W5IFQe+hEBeF+HrMDTLOz7PV BgiZzP2CQwOafz3+A6JDnmuTmUYCWaG5JnvB4TpQo1QFq/Un+z76+MrEVJsdSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762456721; a=rsa-sha256; cv=none; b=ZqkcxreK5P2AKcn/gPPZydtEZKBvuSZCa36n8n4DLBDNirOUDoJUtZlBd5oRpZ8BuAlLL7 yTg4VfPprWpCs+HSURXdmTjNPNC7kZaANozWbsBXJR/Ed0R0DI0hHXVu5j0Hid+VeAyKjv tX7t8vxjHGqJt/y1iOc83X9c0f8rih8FUBkAIQkmpr0hc90I1Ps/iQJuD/fKOvF5AgIOQ/ 8R4w/Q3BBbhMs1WoJZmIUsEzPVLcKUrmFJjG3/Jew7yPeXGFXmU7Tt9g/c2M1N0S1Zqz0R kij/GzJdIMQ+zNU423D/i4sD/8B3WUmBxyhe+jC0v8JSNIsZ76cEnCXmFwISbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2X6T61zVzBK8; Thu, 06 Nov 2025 19:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6JIf6o063060; Thu, 6 Nov 2025 19:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6JIfFk063057; Thu, 6 Nov 2025 19:18:41 GMT (envelope-from git) Date: Thu, 6 Nov 2025 19:18:41 GMT Message-Id: <202511061918.5A6JIfFk063057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: d4824d1d5040 - stable/14 - find.1: Correct HISTORY grammar typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: d4824d1d50407c29d9c1d162219cf678a3cca10f Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=d4824d1d50407c29d9c1d162219cf678a3cca10f commit d4824d1d50407c29d9c1d162219cf678a3cca10f Author: Jeffrey R. Day AuthorDate: 2025-07-14 17:50:51 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 19:18:15 +0000 find.1: Correct HISTORY grammar typo PR: 286292 MFC after: 3 days Reviewed by: ziaee (cherry picked from commit b87dcd7004993417cf711f20a0924e3a768ae116) --- usr.bin/find/find.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1 index c10380ac499a..6da6e5a6dc19 100644 --- a/usr.bin/find/find.1 +++ b/usr.bin/find/find.1 @@ -1158,7 +1158,7 @@ and was removed in .At v3 . It was rewritten for .At v5 -and later be enhanced for the Programmer's Workbench (PWB). +and was later enhanced for the Programmer's Workbench (PWB). These changes were later incorporated in .At v7 . .Sh BUGS From nobody Thu Nov 6 21:55:56 2025 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 4d2bbx16Yyz6Flyb; Thu, 06 Nov 2025 21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2bbx0Yykz3SQm; Thu, 06 Nov 2025 21: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=1762466157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzWWUd6NXuOYqbkLTVB7o7boKiKoLx0yRys0kXSLdgc=; b=mm1/Sw/mhnGEFdBySxwUvlTm13rkDIo3ddSM0R2y1g2LNuO46WFhMj0A0IgkYpqw/ul90d a3bR/kP7gCLCvib7Kqr4NAG9ep+88qjUg3Iiyh6kcKM6uHC8tKoZ3hD9tVbnqmvik2l1pv +CU9d4KK4TPGrSTq9uYwsOIuGdaWYNVOzd4F3flVsRTkELQzdVxaKB/b54ClYmqLGTINKj LkSfGvrTrvYt9pEMwE557c87SoyMMzzbxXPWF8T8ovIb+Ht0Iqyj3dqeiVcrnJMliY/uxy 1BM04yos27aK2H0rfUTwf2Ad/+mQrPRVz1cGP9NU802rYPQjVC04yv3D/wSfwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762466157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzWWUd6NXuOYqbkLTVB7o7boKiKoLx0yRys0kXSLdgc=; b=cGYpKzI42ao8LGnvIk6VE0d1dWzEprCkWe9Ut37YsLdO5gfUjbWUQlH6stTosSu1+0y5zp ixRspAzr/Yk2JLpyoTfHYFpV30td/5mlm1RiOl8j1bi/T0AKj5pmX+Y+H1lsl8I/KIQW7A 2913ufFBSfFQEjnqaQgUUVHj0yLfKAqjIOJp8VhVov06F8WKpaosWK3M2hd2C23NV+WS62 h3dH+vDzC6fKTzyYdn0r/qdMWpplxgSc2fpaTEieFqA1RNItKSzqf6EtFKaVXLSkKCe2Xg enjmipR4zPnNRxgl6XddaOObul8fFEpmeN1bcIxT/Q51Uc1a0oZcuZyY3h+yJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762466157; a=rsa-sha256; cv=none; b=hihaRYPw7KN3PtSaZKsnL9FPOA5Hb4Iy6gLniZ1Ga6db1zCG+fQ6aqD57/389bRSX88kWR 6Wi467pu84o+0nGL8DaRUew7TRgdE2o7CjqSFhvAInSZXVN/hdtY0NhrC9VJT/3ZjCKvDP 3qZZ6zG3erlHxaWcOv6rIXtcQaPbS0DfBC41wrORrieIgQxQx+UAHyy6dGT5IHwwPchqGT k4v0g/WaPt1nCb0D8QKrOKjDQjT27WzrxBjFyIo+f6wp9NmQx9tFbyhK96pHu/2MkHPGOi dcrOqUNTEZ1TxpK5tDWlI64QjM0VSgLJFH3bGAWV6PzRFljLdMv+iYR3kegmjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2bbw6bjFzXZR; Thu, 06 Nov 2025 21:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6LtuZL063192; Thu, 6 Nov 2025 21:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6Ltu9Q063188; Thu, 6 Nov 2025 21:55:56 GMT (envelope-from git) Date: Thu, 6 Nov 2025 21:55:56 GMT Message-Id: <202511062155.5A6Ltu9Q063188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 37989ef996a5 - stable/14 - mkdir.2: Correct HISTORY List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 37989ef996a55bd6ebb4b3daa85ac19dda90d594 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=37989ef996a55bd6ebb4b3daa85ac19dda90d594 commit 37989ef996a55bd6ebb4b3daa85ac19dda90d594 Author: Ken Wong AuthorDate: 2025-07-14 17:32:54 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-06 21:55:20 +0000 mkdir.2: Correct HISTORY PR: 286064 MFC after: 3 days Reviewed by: mckusick (cherry picked from commit 26069bca2d64a76cfafb92d61d58c90140c1b28f) --- lib/libc/sys/mkdir.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/mkdir.2 b/lib/libc/sys/mkdir.2 index 3cbe9ad794ea..854c692f24e3 100644 --- a/lib/libc/sys/mkdir.2 +++ b/lib/libc/sys/mkdir.2 @@ -178,4 +178,4 @@ system call appeared in The .Fn mkdir system call appeared in -.At v1 . +.Bx 4.2 . From nobody Thu Nov 6 23:11:45 2025 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 4d2dHP4Qp5z6Ft3q; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHP3w0Pz3gb5; Thu, 06 Nov 2025 23:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E0yv0QPOQKtvew2xrj+uzgF1pWMsbQ6LeQf4dmwqNME=; b=EcDC//fYr+u+K2e6/50I/VIy3bvm6KjlD7iK2TCh1MhsnvjY/OOHDUMgU0VqO0dHQIvjFA zdoPQXF7bbC89r4LR4UiM9YYf54VqxAUH4TuBxkMcPaBQFpgzpQ9wnbcnoylFdzWxVkL5f 3mz9R9/ooUEAP/wyOg+JzwJqsvdm8Mu7EnJGtBDG2e0UQcMjtlTHF4GCsj7XCVrRVVXBAw fQR4epO+QNsZKuzveXxwL/EyAtv2xacNB6OsaZP0wydqudrpHbLpE3Ai87DqMFJxxOuoqq UwXo+Me9RZlJiG9faCOoNz4gVjo//JuXB4RJ2nWEDNkBucA51ZO+MhQ55hDZaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E0yv0QPOQKtvew2xrj+uzgF1pWMsbQ6LeQf4dmwqNME=; b=TfmC1R9JV+XWRL4w+Ci4ortDE04wfKbuYXYPkVu1NdhsYVYFiTP2qtHi/ou0zG4Z4SBVWN II7FvAvUgaQs7qnooiRg2SU6+0ITcFXtu1c28LOM3VcAEiyNfMMkipdFTLwGoWS+laKTDa p9qs+08TO1LJPX/i0+Ki3yBC3W30PH1Jlxlz4LFNbMTvX8BZbyJHuKvHhi4h//12xWrqJ9 tfMx3pE4tj2qmVqSnkCymBCO0RWoBiovXywFMPXf63QTQDimlr6Zdk21lCcHYllFKCoPG5 PWedQSVbV3QMMvK3nnaQLKOtPXhV2drUAftkV5l+9F5h20OiqHAJN3smOnLDDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470705; a=rsa-sha256; cv=none; b=UA+HUTKrIwfK7TIrOZaLr86dRyUBn527TbxnfD/1ANA5LhFYYbhgIXH4EkvithRc08irL0 APxi8A7g78RNQLFhpVRMzvo37fhmwU7YofmjJXu2GBfjulXfFN0UZiiqAV53PEX7HcXANr Mtwe+vUMpgbcY7ptk0dYoTGyzysN2ve8Nnft8kknYiHazsHIlo9i+3JnJucHmKQq7xL+6t llEK0crIlFHp1K3wuUO/A/c20HOH6yFRQPxtYF9jtAjjrG/XfNA7ICHtbyPt/yOSJYHK6i D7gddoHCwatUdBZVFEAOU4qjRn52IS6JkLBSVpVdFBaYVuxlcfOHT8hV05Oorw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHP2xxRzbCB; Thu, 06 Nov 2025 23:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBjLa010193; Thu, 6 Nov 2025 23:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBjfl010190; Thu, 6 Nov 2025 23:11:45 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:45 GMT Message-Id: <202511062311.5A6NBjfl010190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2e2e70bee754 - releng/15.0 - libcasper: Move everything to the libcasper package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 2e2e70bee754820e85e379a84756d5401d37f95d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2e2e70bee754820e85e379a84756d5401d37f95d commit 2e2e70bee754820e85e379a84756d5401d37f95d Author: Lexi Winter AuthorDate: 2025-11-05 00:26:54 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:10:36 +0000 libcasper: Move everything to the libcasper package The libcasper package exists to contain libcasper, but for some reason only the libcap_net service was in the package, with libcasper itself and the rest of the services being in runtime. Move everything to the libcasper package, except tests which stay in the tests package. Approved by: re (cperciva) MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53576 (cherry picked from commit b8697ac70ebfce2d8e3df6c67bbf37910793b199) (cherry picked from commit 25eb50f68bd59c28364fd187e935885e6e360f17) --- lib/libcasper/Makefile.inc | 2 ++ lib/libcasper/libcasper/Makefile | 2 -- lib/libcasper/services/cap_dns/Makefile | 2 -- lib/libcasper/services/cap_fileargs/Makefile | 2 -- lib/libcasper/services/cap_grp/Makefile | 2 -- lib/libcasper/services/cap_net/Makefile | 2 -- lib/libcasper/services/cap_netdb/Makefile | 2 -- lib/libcasper/services/cap_pwd/Makefile | 2 -- lib/libcasper/services/cap_sysctl/Makefile | 2 -- lib/libcasper/services/cap_syslog/Makefile | 2 -- lib/libcasper/services/tests/Makefile | 2 ++ lib/libcasper/tests/Makefile | 2 ++ 12 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/libcasper/Makefile.inc b/lib/libcasper/Makefile.inc index 00bd221feb27..73a761ba4ce3 100644 --- a/lib/libcasper/Makefile.inc +++ b/lib/libcasper/Makefile.inc @@ -1,5 +1,7 @@ .include +PACKAGE?= libcasper + .if ${MK_CASPER} != "no" CFLAGS+=-DWITH_CASPER .endif diff --git a/lib/libcasper/libcasper/Makefile b/lib/libcasper/libcasper/Makefile index 4db26f665f19..1a794791570f 100644 --- a/lib/libcasper/libcasper/Makefile +++ b/lib/libcasper/libcasper/Makefile @@ -1,5 +1,3 @@ -PACKAGE= runtime - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile index 4b11c97d29e5..b090c553bd28 100644 --- a/lib/libcasper/services/cap_dns/Makefile +++ b/lib/libcasper/services/cap_dns/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile index 2c52d0887a48..9d70d0ab9237 100644 --- a/lib/libcasper/services/cap_fileargs/Makefile +++ b/lib/libcasper/services/cap_fileargs/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile index a921dfa87e7c..13e695813bcf 100644 --- a/lib/libcasper/services/cap_grp/Makefile +++ b/lib/libcasper/services/cap_grp/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile index 1ba35a674a05..4e9814118c41 100644 --- a/lib/libcasper/services/cap_net/Makefile +++ b/lib/libcasper/services/cap_net/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE=libcasper - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile index 853052e78d04..a330eeedeb11 100644 --- a/lib/libcasper/services/cap_netdb/Makefile +++ b/lib/libcasper/services/cap_netdb/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile index a1e97845c736..ba8df80d5ad7 100644 --- a/lib/libcasper/services/cap_pwd/Makefile +++ b/lib/libcasper/services/cap_pwd/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile index 522313df4ffc..4408bad4efb4 100644 --- a/lib/libcasper/services/cap_sysctl/Makefile +++ b/lib/libcasper/services/cap_sysctl/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile index 88979d8bed23..d18ad6d76ede 100644 --- a/lib/libcasper/services/cap_syslog/Makefile +++ b/lib/libcasper/services/cap_syslog/Makefile @@ -2,8 +2,6 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper diff --git a/lib/libcasper/services/tests/Makefile b/lib/libcasper/services/tests/Makefile index 29b1b564beca..4b6c72fd86e8 100644 --- a/lib/libcasper/services/tests/Makefile +++ b/lib/libcasper/services/tests/Makefile @@ -1,4 +1,6 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests KYUAFILE= yes .include diff --git a/lib/libcasper/tests/Makefile b/lib/libcasper/tests/Makefile index 29b1b564beca..4b6c72fd86e8 100644 --- a/lib/libcasper/tests/Makefile +++ b/lib/libcasper/tests/Makefile @@ -1,4 +1,6 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests KYUAFILE= yes .include From nobody Thu Nov 6 23:11:46 2025 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 4d2dHQ72vMz6Ft08; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHQ3rMSz3gbF; Thu, 06 Nov 2025 23:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wy9bb2KfmgyJTzRBHn5tzoixihDwtlovXhO5ovcEO8U=; b=sohvOxTlsULZahQw4ROLx/FjSWFZn6yOi0H7XhjmkTVjMg+3ejaQXefncMQD7JVONKZeTT 8AJ5JOjkgTAhQvzRbHZETk+11rr2Kwoj7dzUF2xFUUPH+7yU4DRYytxM+zPAafPOKllCur s/ql1Ps8Cr6LFoCEQvHuqBxDwzb0/naHyEAsIKLp7TKMgXCSFYwJl5NPUeuhGZZ51EVmB/ OjWS7g3o6QyXHtrnFxvQQZGjOHHoPoVq2uniCBM6QQLKyAYNxJ1okI79L3quAEr5txfeHp SN8nFTEdMvXUAfXhRewCu1esq5uexdUh/7K2YfCBLYN5hkhRIWKCF+HdFLQsNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wy9bb2KfmgyJTzRBHn5tzoixihDwtlovXhO5ovcEO8U=; b=RQB/i9gdGc6a36oiC5qCSf/p4ONcaDptPvOIbx+fpw8moiexudzBJIN3HX7+n5MB0v3yOi +jBF4wuJDi+OEXYNvJqcz9D1gupXtTHtehh9qatSwJUqAHAcmbpK+0eRKEL8WDzL3yaNAH 0dH//qFJFnn64vkLqQRlpOMjMsFtA5BivwZ4HrEcz1GxZh4fZcaf4AngcXXr9zY14CGfa9 pgqfpLF5jsc/FL2ejUJKn9dN+W7mwjymer9tzuPBOYD20+QSh9/icirfxbifZi4hj9169L a3m36ZPj2iN389eFu1MiQRUGh/q4IyY5algzTL494DpgCZ4xeVKdaWkk5GifUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470706; a=rsa-sha256; cv=none; b=W35fO1GMwYBLikbtvJUMuNq8gjg7EbezbeevehGloLHxyFuUmOHX5oGN9FNB1T37n4YQbh /In501f5DAEdvkWAsss8k8ru75K/IrhsvmjMoHV4HBwEf37piMYrNgNY/Yz8ZYd1lyeSmF bplk57ttP2jM8mlYXc+rGRrJCx646QHodYyeeb1v5kxHcl9Iim8nH7re0L3bErUtSXOuQ9 nr/ue4VRvQrct0xy/iKSWgFHy1OdseLHYe2MVEpaFwLXrmIFsR1mhSU7ajDQDJha6nyWC0 4TZy382AyDKNDE74hofox9J1l9KNCaIHUzUdfwsJsFjgRS7ldo/uSiGinQzUwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHQ3PyszZF2; Thu, 06 Nov 2025 23:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBk5D010226; Thu, 6 Nov 2025 23:11:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBkTN010223; Thu, 6 Nov 2025 23:11:46 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:46 GMT Message-Id: <202511062311.5A6NBkTN010223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 190e1cd5a68d - releng/15.0 - libkadm5clnt: Fix library symlink install List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 190e1cd5a68d7f94a0bcc9ec4018c5f0a75e2b15 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=190e1cd5a68d7f94a0bcc9ec4018c5f0a75e2b15 commit 190e1cd5a68d7f94a0bcc9ec4018c5f0a75e2b15 Author: Lexi Winter AuthorDate: 2025-11-04 23:53:21 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:10:43 +0000 libkadm5clnt: Fix library symlink install libkadm5clnt_mit installs a symlink from libkadm5clnt.so for backward compatibility, but it neglected to include the package tags, so the symlink was missing from pkgbase builds. Add ${DEV_TAG_ARGS} to the install command. Approved by: re (cperciva) Reported by: Mark Millard MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53574 (cherry picked from commit 707507c27f69f16de0ce3efee21b20d4f76328f8) (cherry picked from commit dd9ba3201b1c46a9412b499289e65f5ebebb6ee5) --- krb5/lib/kadm5clnt/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile index 52a7187cf9bb..ef01a5f779e3 100644 --- a/krb5/lib/kadm5clnt/Makefile +++ b/krb5/lib/kadm5clnt/Makefile @@ -86,7 +86,8 @@ ${CHPASS_UTIL_STRINGS_ERR_C}: ${CHPASS_UTIL_STRINGS_ERR} rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c afterinstall: - ${INSTALL_LIBSYMLINK} ${SHLIB_LINK} ${DESTDIR}${LIBDIR}/libkadm5clnt.so + ${INSTALL_LIBSYMLINK} ${DEV_TAG_ARGS} ${SHLIB_LINK} \ + ${DESTDIR}${LIBDIR}/libkadm5clnt.so .include From nobody Thu Nov 6 23:11:48 2025 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 4d2dHT1D6Yz6Ft2M; Thu, 06 Nov 2025 23:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHS6HKcz3gbf; Thu, 06 Nov 2025 23:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYiBQo9aDtpnwmOfxBhXMEOP/GqIlcQZoKtyD2uUjLw=; b=xKf84csKM9s2AkOVhzMG11+yesgBiK9UkqbXCpj/cfIkZpjZ6M25OGmvHMJIPiEo5pzTCO 9uxQvIUaWFCgO6Qp28mZ1fSDsIDRqMVHMGjtZobem2mpbir995D3prVBEKJTk5Moj9plhr 0FjYkH97g+U6Vw47sq3PQnfJTc6PfzwT0VmBlDZAxtck8rQEt62QS9/M76QOHnxpkMo2wU yN85+zkrLEj67PBKmQN/g4vDOKnKcWHgrfjH7o7CMQRg0hGl9YrqpTwvhSQmv5xJgeFyMP Wl9OnPOJlsF8OyNW+l24qy0783RowtkfkUtaHlc+ZMUl902oTNZY7Z0JKZuP9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYiBQo9aDtpnwmOfxBhXMEOP/GqIlcQZoKtyD2uUjLw=; b=f3xSRYv+f4Y+gQRJsOPLmvg4Yu523XTtgeWSo/tzp938BWTn225yWq5cIR7HOSq9CTSL40 TzXYLicSu2qtTcVOBJHHpuSksBgc7TjWpl9gKLKADhkg8PpYYvBPIbxO4YKPP7oMNcSc63 pLyuSK/E9BfV0sz52idkmqHsU8yIx28PwXZ1+CAYAUplPRGOiShdJbYpRPHpuHxU0B+acr uqZ28MT4+BBA5607L9p0r2oT1HAKCKdGmUfOkhKuBtpmd0JJnjZxx23V/D7bPAP7K7cHDK iuPhCXuO61WRIGLiBUQsjWpB706/IkpDUPFdvQHRXQ76R8+FBHg8tD9soV4IIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470708; a=rsa-sha256; cv=none; b=mNd8FktWqnHLD8fGu6oKGjL2IYVvrfKxl5ajMGVDw1a/1DonhVivzi7DNnV4htLQCaK5+X 9YqD8lAE6qbRlExSquaggcb59D8+bTCU6k5KK3mHXEv2F9DJ+7BFWztfZdW0ZUFeMtuGRQ 2MD6W5ZAKqoWQQx6gBnAWFKRY8nEU5rWthvnKkn3WeNW1KvKpEs4uws2Al7F4eUofX2ryU 4li47dJOKZP2DJbwGibyRsufZ11zkV3Z1LtAiABIMbi+de1tDVPPBjlGNahAIiuVVdDhlh hQa3eOeTNJtK2+2p+ePvcMS175YSsP3eFjKTEnfNyQArVAeXJbcpZAvnoEtusA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHS5ZRtzZwZ; Thu, 06 Nov 2025 23:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBmRY010299; Thu, 6 Nov 2025 23:11:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBmFu010296; Thu, 6 Nov 2025 23:11:48 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:48 GMT Message-Id: <202511062311.5A6NBmFu010296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ba5626d398f4 - releng/15.0 - etc/mtree: Add package tags for /usr/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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ba5626d398f40bb77f3d06e4ee991773f7629a30 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ba5626d398f40bb77f3d06e4ee991773f7629a30 commit ba5626d398f40bb77f3d06e4ee991773f7629a30 Author: Lexi Winter AuthorDate: 2025-11-04 23:45:04 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:10:49 +0000 etc/mtree: Add package tags for /usr/include Set the default package to clibs-dev, since that's where the vast majority of include files comes from. Add explicit package tags for the directories which are installed in their own package. Approved by: re (cperciva) MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53577 (cherry picked from commit 436618a427b4baaf42d8221ef07d14e3ba787d3a) (cherry picked from commit 736771f631557213269692f3a5611a1f0bdab2bd) --- etc/mtree/BSD.include.dist | 56 +++++++++++++++++++++++----------------------- etc/mtree/BSD.usr.dist | 32 +++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index ea333a38d889..97f2194a3fa1 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -2,17 +2,17 @@ # Please see the file src/etc/mtree/README before making changes to this file. # -/set type=dir uname=root gname=wheel mode=0755 +/set type=dir uname=root gname=wheel mode=0755 tags=package=clibs-dev . arpa .. - atf-c + atf-c tags=package=atf-dev .. - atf-c++ + atf-c++ tags=package=atf-dev .. - bsm + bsm tags=package=audit-dev .. - bsnmp + bsnmp tags=package=bsnmp-dev .. c++ v1 @@ -118,7 +118,7 @@ scsi .. .. - casper + casper tags=package=libcasper-dev .. crypto .. @@ -190,10 +190,10 @@ wg .. .. - devdctl + devdctl tags=package=utilities-dev .. - edit - readline + edit tags=package=runtime-dev + readline tags=package=runtime-dev .. .. fs @@ -252,39 +252,39 @@ virstor .. .. - gssapi + gssapi tags=package=kerberos-dev .. - gssrpc + gssrpc tags=package=kerberos-dev .. - infiniband - complib + infiniband tags=package=utilities-dev + complib tags=package=utilities-dev .. - iba + iba tags=package=utilities-dev .. - opensm + opensm tags=package=utilities-dev .. - vendor + vendor tags=package=utilities-dev .. .. isofs cd9660 .. .. - kadm5 + kadm5 tags=package=kerberos-dev .. krb5 tags=package=kerberos-dev .. - lib80211 + lib80211 tags=package=runtime-dev .. - lib9p + lib9p tags=package=lib9p-dev .. - libipt + libipt tags=package=libipt-dev .. - libmilter + libmilter tags=package=libmilter-dev .. - libxo + libxo tags=package=runtime-dev .. - lzma + lzma tags=package=xz-dev .. machine pc @@ -323,7 +323,7 @@ .. .. netpfil - pf + pf tags=package=pf-dev .. .. netsmb @@ -348,20 +348,20 @@ stm .. .. - openssl + openssl tags=package=openssl-dev .. - pcap + pcap tags=package=utilities-dev .. protocols .. - rdma + rdma tags=package=utilities-dev .. rpc .. rpcsvc .. security - audit + audit tags=package=audit-dev .. mac_biba .. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 7d5b8620e5c4..1422a96c76ac 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -6,35 +6,35 @@ . bin .. - include - private - bsddialog + include tags=package=clibs-dev + private tags=package=clibs-dev + bsddialog tags=package=utilities-dev .. - bsdstat + bsdstat tags=package=libbsdstat-dev .. - event1 + event1 tags=package=libevent1-dev .. - gmock - internal - custom + gmock tags=package=utilities-dev + internal tags=package=utilities-dev + custom tags=package=utilities-dev .. .. .. - gtest - internal - custom + gtest tags=package=utilities-dev + internal tags=package=utilities-dev + custom tags=package=utilities-dev .. .. .. - samplerate + samplerate tags=package=sound-dev .. - sqlite3 + sqlite3 tags=package=libsqlite3-dev .. - ucl + ucl tags=package=libucl-dev .. - yaml + yaml tags=package=libyaml-dev .. - zstd + zstd tags=package=runtime-dev .. .. .. From nobody Thu Nov 6 23:11:47 2025 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 4d2dHS3VySz6FtBp; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHR4rJ0z3gwP; Thu, 06 Nov 2025 23:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TOMnF3cQAl+rMrs0M0Ac2KhW6hRicHqtryMtadE6G8=; b=cpvW3+9CuLUPDqxAMMzdjQ1NTtz/Xhf2QfGVpa+7yBcuBa8NZLKEM3XyJxGFpiRXMbH+EU B+khQWcVTDoqn1f/jp1OZD7xNuciUHRT5Q6uctJ7lHlU9fqKHTQjKYU+dl3caG/uskFjmQ evkY6cGVe0MYx0QwafAF33S7bQA+d2i2WHT7r19/W4zHso6cdI33YkQlct8yp65LvDljn5 ADZ+loxPPFsZuNHyZVoaa4ePDnIXcPrU2b7ID41flasr9vT5dt4cFsJcQqccMuLl0hXsA/ 5PW1a679VCGFzy4ldgC5kAPRMdvi3pCj0pF1fl7wZvfp+VwZuHRr2Tn/3YaWkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TOMnF3cQAl+rMrs0M0Ac2KhW6hRicHqtryMtadE6G8=; b=bqVEtqyfe6QM97afnIvqoIlJxaoPHQLhJu19Psl8NZKW1R0GVycH51GZ0XK+F+pfiQ9+0d mtITUOgd27R5+1NZSSz+n9yhekDe4BGQkQrGHp2Ic3LBxHaYyGpqOUvu3wvhWpGD8TRdRp CYOC7m2A9ljFy6/werUX7VXc/JiLDwzt3RTL7u2eiRTr4vixWioyHEyEKHEoe16Y/vQjyM gZSsnMUEEBUjlK/n+3CP2z+uwmGijU9QCwZG+2vctzu+JkDpwQ188NEqWSe827y7q+h14G elqQUte6X2uYSOVzS/42qPDedfzsUgbyyieQm4xMQwEvlR5WtW1wp+ly/iD9iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470707; a=rsa-sha256; cv=none; b=jvHLzwStnOSyZBZ9Bh2b/zs/+fSluwqhyuQRnNWMM72lHJLJNiOvtlKnz4p4PSEgY4ehk8 t0OXNUyGpDLFLOw3y/ixCeyOiN17LrJ55j1r1gsc6A/T3AVhr2/dVwG2nLtR9FDcTtrfq/ EnEITJEj3AGyrZm8qb7kai6QL3cCHCUXF0vCtgdfselYJYWAInuyOZcinUK9Qwz41cIRhA WvCppYUnDjrbn9BjZDf3fZrOsQ0X/Ch0hU0J+zKVg4DltCSve0uQqAX5qdN+aH/tzN3Z1u 1M6QimMtYmN7ob1si2XJvize0wGaf1sV12uJmqJwxK2Ehr5PpxZ91F3Bk+VtpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHR4LsszbCD; Thu, 06 Nov 2025 23:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBlvj010263; Thu, 6 Nov 2025 23:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBlRs010260; Thu, 6 Nov 2025 23:11:47 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:47 GMT Message-Id: <202511062311.5A6NBlRs010260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 011bfe6aae36 - releng/15.0 - packages: Make set-base-dbg depend on set-optional-dbg List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 011bfe6aae364dee5cec294f0ddea8ad9723ab34 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=011bfe6aae364dee5cec294f0ddea8ad9723ab34 commit 011bfe6aae364dee5cec294f0ddea8ad9723ab34 Author: Lexi Winter AuthorDate: 2025-11-04 23:51:34 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:10:46 +0000 packages: Make set-base-dbg depend on set-optional-dbg As set-base depends on set-optional, so should set-base-dbg depend on set-optional-dbg. Otherwise, people who install set-base-dbg will be missing a bunch of debug packages. Approved by: re (cperciva) MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53575 (cherry picked from commit 3bcb2977704556ebf5c8847eaa7a46692b0bc1d0) (cherry picked from commit 5f1d2ef1f52f50c255d96dfdfe84980fcf638509) --- release/packages/sets/base-dbg.ucl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/packages/sets/base-dbg.ucl b/release/packages/sets/base-dbg.ucl index 79e5de22522e..c96b10416dcb 100644 --- a/release/packages/sets/base-dbg.ucl +++ b/release/packages/sets/base-dbg.ucl @@ -28,5 +28,8 @@ deps { }, "set-devel-dbg" { version = "${VERSION}" + }, + "set-optional-dbg" { + version = "${VERSION}" } } From nobody Thu Nov 6 23:11:49 2025 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 4d2dHV1GBrz6Ft2N; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHT6wWdz3gwp; Thu, 06 Nov 2025 23:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90SZMqlBxf3FgIco7d2gUff/TAsfOknW2tsLeTCXX0A=; b=u3/1Bn6gRl3M3A9OgZugyJ4WyIsSXGsNQoJDRvHWuywp7WSXQpRVzXODLtmtqHZAEhSGUf SYxbnLD/SccZD/kF8AKJ2cPiTMkiIemwcr2dFS0T8kdpWCE5WSfqkTfmZpRFpQGwhCjd7q QzVZV1iVq3tvOYkdBe/AXEvONv3TnNE8oklTfnSzRb7MlxLAX24414YyITjuyqb5lRtZK6 n7ZurMnYGm0YCFW3vdK6QzRLK4YALNDJ8QymyJdz6dltTL0ytNtSiStDqzhRqf38Nvch/h 2gjszc3jLGwuVvyt1/acKDpJyOo7MPfMOOg0tK7RG/YL+15BOb2OXO6McDZbzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90SZMqlBxf3FgIco7d2gUff/TAsfOknW2tsLeTCXX0A=; b=xg4NRHw8OhyVY7uTuS/+EjPMavGvoEx0doEnlMKTO72cg3A2MiDAker3pbqa7ZUu4Z6bz0 YilxkKcnuqXfhNGowKeZZjllbw3mg0h9qntlC4uslRIQvRFqnVH0ENtHUg+hqaJ3PTxBVn g+Fgqn8xDQX7n++fAHLNoKDHOQSqSJlm1DpS5KdHDPhf4VHxXl2Yd7xw6G3X+/JP6V6jcb RYsqrkXndMGwmnaXsu0h1dZOUZeyBc16tGuLe0Ovckz7UlGmWWj5ZoKzEjIPd8orXr4hv0 hRSIJPRpVGY+QbFA0MRUGcy/acgiM4yOUTl0+tI+PMfvROdPHTWGLxlAmtOCJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470710; a=rsa-sha256; cv=none; b=wd4uQpdwa8vEAtK+ARhUXlXThrUj0mSK5nKVdiq5jOA2Q4/ZO/kcZQOKRz05KKd8s7Zm7N SmGqk6W28aV8gUkum1WhPWTTcLl0FaFRUiK9aNdNw5Ap3q+63exIlk62CdkZ2ClhtZs3v3 Yz06C6UZ4/YvKZrwVwnDfF42noUH7Qn3SwFL8rP/0ldf7pMXVFkMZSoWxZNpiSBddim4+P UtPDHYL6ao7k9M6lhRMnXUrF2tt+Plwf+/zPSo/JbAzkZ9htSwpqIDTwNJnzHL/gzaw73B 1+ZAi/0CUQFphsaHo9GLhMwccte8gpWn69hTfvXUV56YhlK6Gvorgpeh5bvZsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHT6X5Wzb33; Thu, 06 Nov 2025 23:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBnh5010333; Thu, 6 Nov 2025 23:11:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBnk0010330; Thu, 6 Nov 2025 23:11:49 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:49 GMT Message-Id: <202511062311.5A6NBnk0010330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a711949115b5 - releng/15.0 - fusefs: respect the server's FUSE_SETXATTR_EXT flag List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: a711949115b589590c19db8489e0a4ab80a6673c Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a711949115b589590c19db8489e0a4ab80a6673c commit a711949115b589590c19db8489e0a4ab80a6673c Author: Alan Somers AuthorDate: 2025-10-26 18:06:51 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:10:51 +0000 fusefs: respect the server's FUSE_SETXATTR_EXT flag FUSE protocol 7.33 extended the FUSE_SETXATTR request format. But the extension is optional. The server must opt-in by setting the FUSE_SETXATTR_IN flag during FUSE_INIT. We were wrongly using the extended format for any server using protocol 7.33 or later. Approved by: re (cperciva) PR: 290547 Co-authored-by: CismonX Fixes: d5e3cf41e89 ("fusefs: Upgrade FUSE protocol to version 7.33") MFC after: 3 days (cherry picked from commit e8449c0e0fcb8a3eb5872cbee5c3dde4b05a5f50) (cherry picked from commit a23bd71deaad478cbe41ae756b96ea7a32537311) --- sys/fs/fuse/fuse_internal.c | 5 +++- sys/fs/fuse/fuse_ipc.h | 1 + sys/fs/fuse/fuse_vnops.c | 4 +-- tests/sys/fs/fusefs/xattr.cc | 67 ++++++++++++++++++++++++++++++++++---------- 4 files changed, 59 insertions(+), 18 deletions(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index 61fe2ed032f6..eba0a8a79ff3 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -1063,6 +1063,8 @@ fuse_internal_init_callback(struct fuse_ticket *tick, struct uio *uio) if (!fuse_libabi_geq(data, 7, 28)) fsess_set_notimpl(data->mp, FUSE_COPY_FILE_RANGE); + if (fuse_libabi_geq(data, 7, 33) && (fiio->flags & FUSE_SETXATTR_EXT)) + data->dataflags |= FSESS_SETXATTR_EXT; out: if (err) { fdata_set_dead(data); @@ -1115,7 +1117,8 @@ fuse_internal_send_init(struct fuse_data *data, struct thread *td) */ fiii->flags = FUSE_ASYNC_READ | FUSE_POSIX_LOCKS | FUSE_EXPORT_SUPPORT | FUSE_BIG_WRITES | FUSE_WRITEBACK_CACHE - | FUSE_NO_OPEN_SUPPORT | FUSE_NO_OPENDIR_SUPPORT; + | FUSE_NO_OPEN_SUPPORT | FUSE_NO_OPENDIR_SUPPORT + | FUSE_SETXATTR_EXT; fuse_insert_callback(fdi.tick, fuse_internal_init_callback); fuse_insert_message(fdi.tick, false); diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h index 3bfc859dbac9..d9d79f38c269 100644 --- a/sys/fs/fuse/fuse_ipc.h +++ b/sys/fs/fuse/fuse_ipc.h @@ -243,6 +243,7 @@ struct fuse_data { #define FSESS_MNTOPTS_MASK ( \ FSESS_DAEMON_CAN_SPY | FSESS_PUSH_SYMLINKS_IN | \ FSESS_DEFAULT_PERMISSIONS | FSESS_INTR) +#define FSESS_SETXATTR_EXT 0x8000000 /* extended fuse_setxattr_in */ extern int fuse_data_cache_mode; diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index be600b57f0a3..00ad11108ee0 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2777,7 +2777,7 @@ fuse_vnop_setextattr(struct vop_setextattr_args *ap) strlen(ap->a_name) + 1; /* older FUSE servers use a smaller fuse_setxattr_in struct*/ - if (fuse_libabi_geq(fuse_get_mpdata(mp), 7, 33)) + if (fuse_get_mpdata(mp)->dataflags & FSESS_SETXATTR_EXT) struct_size = sizeof(*set_xattr_in); fdisp_init(&fdi, len + struct_size + uio->uio_resid); @@ -2786,7 +2786,7 @@ fuse_vnop_setextattr(struct vop_setextattr_args *ap) set_xattr_in = fdi.indata; set_xattr_in->size = uio->uio_resid; - if (fuse_libabi_geq(fuse_get_mpdata(mp), 7, 33)) { + if (fuse_get_mpdata(mp)->dataflags & FSESS_SETXATTR_EXT) { set_xattr_in->setxattr_flags = 0; set_xattr_in->padding = 0; } diff --git a/tests/sys/fs/fusefs/xattr.cc b/tests/sys/fs/fusefs/xattr.cc index 0ab203c96254..afeacd4a249e 100644 --- a/tests/sys/fs/fusefs/xattr.cc +++ b/tests/sys/fs/fusefs/xattr.cc @@ -100,7 +100,11 @@ void expect_removexattr(uint64_t ino, const char *attr, int error) ).WillOnce(Invoke(ReturnErrno(error))); } -void expect_setxattr(uint64_t ino, const char *attr, const char *value, +/* + * Expect a FUSE_SETXATTR request in the format used by protocol 7.33 and + * later, with the FUSE_SETXATTR_EXT bit set. + */ +void expect_setxattr_ext(uint64_t ino, const char *attr, const char *value, ProcessMockerT r) { EXPECT_CALL(*m_mock, process( @@ -119,16 +123,10 @@ void expect_setxattr(uint64_t ino, const char *attr, const char *value, ).WillOnce(Invoke(r)); } -}; - -class Xattr_7_32:public FuseTest { -public: -virtual void SetUp() -{ - m_kernel_minor_version = 32; - FuseTest::SetUp(); -} - +/* + * Expect a FUSE_SETXATTR request in the format used by protocol 7.32 and + * earlier. + */ void expect_setxattr_7_32(uint64_t ino, const char *attr, const char *value, ProcessMockerT r) { @@ -148,6 +146,15 @@ void expect_setxattr_7_32(uint64_t ino, const char *attr, const char *value, } }; +class Xattr_7_32: public Xattr { +public: +virtual void SetUp() +{ + m_kernel_minor_version = 32; + Xattr::SetUp(); +} +}; + class Getxattr: public Xattr {}; class Listxattr: public Xattr {}; @@ -182,6 +189,13 @@ void TearDown() { class Removexattr: public Xattr {}; class Setxattr: public Xattr {}; +class SetxattrExt: public Setxattr { +public: +virtual void SetUp() { + m_init_flags |= FUSE_SETXATTR_EXT; + Setxattr::SetUp(); +} +}; class Setxattr_7_32:public Xattr_7_32 {}; class RofsXattr: public Xattr { public: @@ -773,7 +787,7 @@ TEST_F(Setxattr, enosys) ssize_t r; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 2); - expect_setxattr(ino, "user.foo", value, ReturnErrno(ENOSYS)); + expect_setxattr_7_32(ino, "user.foo", value, ReturnErrno(ENOSYS)); r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, value_len); @@ -800,7 +814,7 @@ TEST_F(Setxattr, enotsup) ssize_t r; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); - expect_setxattr(ino, "user.foo", value, ReturnErrno(ENOTSUP)); + expect_setxattr_7_32(ino, "user.foo", value, ReturnErrno(ENOTSUP)); r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, value_len); @@ -820,7 +834,7 @@ TEST_F(Setxattr, user) ssize_t r; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); - expect_setxattr(ino, "user.foo", value, ReturnErrno(0)); + expect_setxattr_7_32(ino, "user.foo", value, ReturnErrno(0)); r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, value_len); @@ -839,7 +853,7 @@ TEST_F(Setxattr, system) ssize_t r; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); - expect_setxattr(ino, "system.foo", value, ReturnErrno(0)); + expect_setxattr_7_32(ino, "system.foo", value, ReturnErrno(0)); r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, value_len); @@ -847,6 +861,10 @@ TEST_F(Setxattr, system) } +/* + * For servers using protocol 7.32 and older, the kernel should use the older + * FUSE_SETXATTR format. + */ TEST_F(Setxattr_7_32, ok) { uint64_t ino = 42; @@ -863,6 +881,25 @@ TEST_F(Setxattr_7_32, ok) ASSERT_EQ(value_len, r) << strerror(errno); } +/* + * Successfully set a user attribute using the extended format + */ +TEST_F(SetxattrExt, user) +{ + uint64_t ino = 42; + const char value[] = "whatever"; + ssize_t value_len = strlen(value) + 1; + int ns = EXTATTR_NAMESPACE_USER; + ssize_t r; + + expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); + expect_setxattr_ext(ino, "user.foo", value, ReturnErrno(0)); + + r = extattr_set_file(FULLPATH, ns, "foo", (const void*)value, + value_len); + ASSERT_EQ(value_len, r) << strerror(errno); +} + TEST_F(RofsXattr, deleteextattr_erofs) { uint64_t ino = 42; From nobody Thu Nov 6 23:11:50 2025 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 4d2dHW29GJz6FtNf; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHW0YMDz3gf2; Thu, 06 Nov 2025 23:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ytsFrtLGRgKDVRNiF1u/qDM6PD14uCdGIRAFrabuic=; b=oh33BMIrt5D3J+KyqjyVquL57IIEWa85g6+kJtPr1Xr1gHzgCgFbkeKnjYHZ5gBMk3FblU kTNNk1jdeKxP5QWhbHXJe1gNG5WeraiqIpqpg7+tw0LklDgRGBmG+MGevsT/aNzzp50N21 dPRWZVC6GuKe+BUB7MrJGhn242x3omhGj9fCCGw8mWWaR1ZPl3U8BqN+vwL3sv+SJM5ZwU mKqKEtk6fdsaYX3vaiZfgShMJQ1+fi6Pbq3CGQjezOe6qDTxKE5KdUefHB76i49TDxYRdb 46OR0GCIK9rDAr2ELPFRFpL1WQM/LdM7BupEWWp4pusQWkWSVYKG63VAjsLjqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ytsFrtLGRgKDVRNiF1u/qDM6PD14uCdGIRAFrabuic=; b=bkPXkONAkI29PmIrdsu33WA1bxrf8YVVq4Uc9C/vJdteIOlQYgWaa6RqE0pAhFaNyLFC+v c6WBqKQyghWuj2J6qm5hyuV45CDX3vIPVauuYzCXFOm+vWUYEew+6sSIG0sm5kZjQsjnqT SsMVqKiw9m+KHEdR8JMdDUxi7aofuFGXgLCH20KeTl7kP7OMe/BGmAovRunVSikydaF8LU ax4HedHP3PTMoqsgQ/Bec7UP/Z/zXCpJJ66g1EDAednhqLSYqF+sQzw8wgZ8egGdPxt2pg 0eRzWuhWSDey4KY9T1Xw50bVcRS+JCFDnjxK59IACpjhNEvAlQJU5reRfRo67g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470711; a=rsa-sha256; cv=none; b=uccW+MahFbMnOoo/9+3dbIaCr8Pzv0wKXMM7v2Cyj9hV2iay1nFCJ5niUEjgMAd7rpyTeP vfvpkAsyanq1q8PQohTbAbuwrkDaOhLyvniImeBuwAgq90IhdfOhAiv2o0SrmWuB7XurQj QemSuvLQl61AnlQFwZ26PhA7Ykt2dRNeiWjrQ51iOWMMOge6J/SiFtBFi9l4km3hFuucV8 YgSvcZ8w3RInOuyRAo17r7in9tmShthz6qS8DTNKhrEeTckRMVReNo7TlUzN4a6spimQoI VZ7E6RRP5688nEcIdoQ1VRIJqqV3K2ymcyRb/lZUc+hMbVa0Rj2+40gSyAAAMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHW07X3zZjC; Thu, 06 Nov 2025 23:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBoDq010367; Thu, 6 Nov 2025 23:11:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBoBi010364; Thu, 6 Nov 2025 23:11:50 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:50 GMT Message-Id: <202511062311.5A6NBoBi010364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 914064cf193b - releng/15.0 - fusefs: fix intermittency in the BadServer.ShortWrite 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 914064cf193bb696734b7e5a08e8a7e594c33507 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=914064cf193bb696734b7e5a08e8a7e594c33507 commit 914064cf193bb696734b7e5a08e8a7e594c33507 Author: Alan Somers AuthorDate: 2025-10-14 02:18:48 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:10:55 +0000 fusefs: fix intermittency in the BadServer.ShortWrite test This test implicitly depended on the order in which two threads completed. If the test thread finished first, the test would pass. But if the mock file system thread did, it would attempt to read from an unmounted file system, and fail. As a result, the test would randomly fail once out of every several thousand executions. Fix it by telling the mock file system's event loop to exit without attempting to read any more events. Approved by: re (cperciva) Reported by: Siva Mahadevan MFC after: 1 week Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53080 (cherry picked from commit d1bd541b385d49d2ae3a8bad9df72779b606e208) (cherry picked from commit a1c3537148a59f6a1c86ebcb686b2e2c8e404b5f) --- tests/sys/fs/fusefs/bad_server.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index af2ca146e431..c3d195735446 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -65,6 +65,11 @@ TEST_F(BadServer, ShortWrite) out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; m_mock->write_response(out); + /* + * Tell the event loop to quit. The kernel has already disconnected us + * because of the short write. + */ + m_mock->m_quit = true; } /* From nobody Thu Nov 6 23:11:51 2025 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 4d2dHX318Tz6FtMx; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHX1CG7z3gfG; Thu, 06 Nov 2025 23:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1uZTmGWQ1OemZSiyieGBPZz34QGFJNVbzrXxo8it7K4=; b=xuRzgjRrr96tdflsqwTQt0LrI0W+ue/37plbcHltZCbQJhzRy0CYTaDUwY6dtr3hq7iWNc ouv/KH5TNgK23VHnqtbwgjkpqN9NIK1RLTlpT+ufgl0OYn9NdHOO6/Q0igI/UnRDO2a66q KyMWUmd6jVWijljp5kCsTitxfdc5oec32qWKEwpTMMQJjJ4RDHhLpt7ocbDyEWLjETcHkj 1qwqE3zCrvECvcu58uycIPna/mMxU3P5LBs0lcZTMzrOAX5Z6txUOVNMmvIN0Bcnl3+2GO hZ0VzD/CbC0BegAyub/Z5G+gqbmZEttpFPSVTTNFgfgdKCMQEOpOOszS5n/stA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1uZTmGWQ1OemZSiyieGBPZz34QGFJNVbzrXxo8it7K4=; b=UlpQVENTfw/L34KLcXi2Q0SKc3NJ5F68534Y0SayGyl/vGUi/Y49HE3ouL5Hc0Pv//DuHv XsvP8l9BpmOe2f7jSEIF10gC8MLV6VPEJvkMp1uAQ4tRHX32SDL/qluB4oHQaRZTbFeBwT 3Vc6XeTGSsgjFF6pdcJ36g1I1R07dJjW+QoY/Z05Ripa3K7hfTXh2Hl2CFo3SGo4fxF/sJ CZeR0KoPG3bixWXlU9tFustGW9TQaIbpmR8UWINsCxdvljtgq3YNffknYFYqsMdP2h9VQW /HSQWLyLcLl7m4sOEkwBE2ScLpN67i+cI6KFEDljng/syGHrwOCjae9Ez5sgMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470712; a=rsa-sha256; cv=none; b=X8mXbZn8XCbnWe936gk7AsTew6BgC6xkiq8n7gTUJQoA01haUgj1p+2lm9QGB/FrkOTgYF 4obQi6Y1sXf2C/uDNsPc7F1yz7oPIgoXN8hx7rNnAlAeQ5ISU4Dcyc4mEhx9tmL9WO3say SAHAFG05F279RdUH3p90koEze6tz5eoZnwPiIbuAlaVFtRThHARdEJp3HNiZ3Uy7FSDB5G B4M2bwRZEjzBLwNkTIpX+r2lmTvES0IsDpZT55cmw2iTyL3RI/LgJwp4ciJXE5aDDt3gpI 6JL+/pmsbDWXkTGh8xd+1uwsLPaV25harCjbUgmPvbo8rbz5Wn/JiST22mNcGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHX0ldvzbCH; Thu, 06 Nov 2025 23:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBqt6010402; Thu, 6 Nov 2025 23:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBpR0010399; Thu, 6 Nov 2025 23:11:51 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:51 GMT Message-Id: <202511062311.5A6NBpR0010399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 06edf53ab5c4 - releng/15.0 - fusefs: Fix intermittency in the BadServer.ShortWrite test case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 06edf53ab5c4e6466b0aba18ffe5fd7be585c636 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=06edf53ab5c4e6466b0aba18ffe5fd7be585c636 commit 06edf53ab5c4e6466b0aba18ffe5fd7be585c636 Author: Alan Somers AuthorDate: 2025-10-25 22:38:30 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:10:59 +0000 fusefs: Fix intermittency in the BadServer.ShortWrite test case We were using the m_quit bit for two similar but distinct uses: * To instruct the server to quit * To cope with the kernel forcibly unmounting the fs Fix the intermittent test failure by adding a separate bit, m_expect_unmount, to handle cases like the latter. Approved by: re (cperciva) Reported by: Siva Mahadevan MFC after: 1 week Revied by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53357 (cherry picked from commit d86025c1d49c84c4dc8c3635c83c078ad56e5a53) (cherry picked from commit f0cf086c05d86f962d259895bcb50ba8ca4c10e0) --- tests/sys/fs/fusefs/bad_server.cc | 8 ++++---- tests/sys/fs/fusefs/mockfs.cc | 5 +++-- tests/sys/fs/fusefs/mockfs.hh | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index c3d195735446..825523cac2bb 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -64,12 +64,12 @@ TEST_F(BadServer, ShortWrite) out.header.error = 0; out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; - m_mock->write_response(out); /* - * Tell the event loop to quit. The kernel has already disconnected us + * Tell the event loop to quit. The kernel will disconnect us * because of the short write. */ - m_mock->m_quit = true; + m_mock->m_expect_unmount = true; + m_mock->write_response(out); } /* @@ -98,7 +98,7 @@ TEST_F(BadServer, ErrorWithPayload) out.push_back(std::move(out1)); // The kernel may disconnect us for bad behavior, so don't try - // to read any more. + // to read or write any more. m_mock->m_quit = true; })); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 55c191716629..b6a32d9b60af 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -433,7 +433,8 @@ MockFS::MockFS(int max_read, int max_readahead, bool allow_other, m_child_pid(-1), m_maxwrite(MIN(max_write, max_max_write)), m_nready(-1), - m_quit(false) + m_quit(false), + m_expect_unmount(false) { struct sigaction sa; struct iovec *iov = NULL; @@ -979,7 +980,7 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && !m_quit) { + if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { m_quit = true; FAIL() << "read: " << strerror(errno); } diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index 4b0628d34dd7..f98a5337c9d1 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -360,6 +360,9 @@ class MockFS { /* Tell the daemon to shut down ASAP */ bool m_quit; + /* Tell the daemon that the server might forcibly unmount us */ + bool m_expect_unmount; + /* Create a new mockfs and mount it to a tempdir */ MockFS(int max_read, int max_readahead, bool allow_other, bool default_permissions, bool push_symlinks_in, bool ro, From nobody Thu Nov 6 23:11:53 2025 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 4d2dHY4Y8Mz6Ft6V; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHY2DN6z3h0C; Thu, 06 Nov 2025 23:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+vJ5MpMBVgDI+qFZF/BxL0pW+nRJBZGO9k5uB/X50aA=; b=BG2hfkJAgl4J1HrXRgP4vlXs8kbkCdr8lANinGJibhB/rxBAPLxrL2L4y7yxjCAqzNnPLV DbS0MLsBLIeSfhaku1ffq48Qekrooy2AoFMM+CGvhoeD2op7uT8XngB6kTxVdUOO1c4gTe 2Yvj1GLE00Vh3Dsm327BBC2luzOMbciUmCuu282TbcLDzcoPJxlEl8D+ezWV2O0K9tHDlK Dw8QD8waXI9c0ZPRxx2RQzvSPiPo7MvkuMzAeU9nctpjQcxY1qjZpl3B6zp8AQZYTnkOmZ RpEeshiw8LiexA/Dwczwazck4zRmLItQ0TSYPX5S7TE+BUVOsGYz0pWIltQ08Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+vJ5MpMBVgDI+qFZF/BxL0pW+nRJBZGO9k5uB/X50aA=; b=k3+5cmmL7W/rp4lP1ch7YYeyUShdYaXIk3jt0bHqMzVF9/eXg56AOmMTc19J+NmJqP7ssx eSiU+/nTYbtSwvlScKd2edZxwpDO5TH1nrPQrC3xC41r2h6oG5dX/RZYqJ+FXHxUFu8zNS dWYIGUd4O8LMVz79dbccFSLqlNdVI/Ee9PbP2jAKWjeFAS2/vyzOS0ESk8LnPSnjJuwcG8 Y0nRXpM44psAgep0k6CCMrVvbBLCLOW2ywHZm/iZNEEFIF/MHLXzUD6XE7+05sHV2GM54w +4NcVyFvJeO67WkBbayAvIOqMLgPC+HbqY4SVNuwekzRqA7LeAPFthzhHtv0bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470713; a=rsa-sha256; cv=none; b=lGA+DyR8VxL/uAYJ7fp7BucQvebJ0TgQ9zxLVxEeqAB/gn0cieeBFIfL+GeD5Lkz5gClbo oIvM6eHwRSTWqxqcD714R55Sx4h+2MC12HCLT48+fsxsAKjKG6irzwDVfKi1PZFc7bhycg +b6VuK3KD3eixWPqqL4WNaTn9pB0hgP7HoJPTBDBEHMX/lej/tSCbjbGWldh+6QQuK7Q3R 2Dd7j4047fMlxNjYZe76Rgw2xjbuQ0NdEUcEa1qNpS19HsCrq88zNMaZZqMMIaGEewA+3C LCcsX7SgVzSLOwCwMPVzCH3Qag4/EnWUBCNPkeiihbjOXv5kZSmnA93CxzXXGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHY1ggMzbCJ; Thu, 06 Nov 2025 23:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBrIQ010437; Thu, 6 Nov 2025 23:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBrXJ010434; Thu, 6 Nov 2025 23:11:53 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:53 GMT Message-Id: <202511062311.5A6NBrXJ010434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 05c3c8c0aba3 - releng/15.0 - pf: improve add state validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 05c3c8c0aba39362d88b76ea22ae80328bca9c13 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=05c3c8c0aba39362d88b76ea22ae80328bca9c13 commit 05c3c8c0aba39362d88b76ea22ae80328bca9c13 Author: Kristof Provost AuthorDate: 2025-10-29 10:40:52 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:02 +0000 pf: improve add state validation Both for the DIOCADDSTATE ioctl and for states imported through pfsync packets. Add a test case to exercise this code path. Approved by: re (cperciva) Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit faacc0d968816cf8714c974b6d8df6191cfb0e0d) (cherry picked from commit 4891e6f1c0ee9d81ca36b9d74d8ef4ef20690621) --- sys/netpfil/pf/if_pfsync.c | 3 +++ tests/sys/netpfil/pf/ioctl/validation.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 66bc99df2afa..de69ecbb0985 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -546,6 +546,9 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) PF_RULES_RASSERT(); + if (strnlen(sp->pfs_1301.ifname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + if (sp->pfs_1301.creatorid == 0) { if (V_pf_status.debug >= PF_DEBUG_MISC) printf("%s: invalid creator id: %08x\n", __func__, diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index 18fafe11c6ab..ff3f1bbcdadc 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -928,6 +928,30 @@ ATF_TC_CLEANUP(natlook, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(addstate); +ATF_TC_HEAD(addstate, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pfsync"); +} + +ATF_TC_BODY(addstate, tc) +{ + struct pfioc_state st; + + COMMON_HEAD(); + + memset(&st, 'a', sizeof(st)); + st.state.timeout = PFTM_TCP_FIRST_PACKET; + + ATF_CHECK_ERRNO(EINVAL, ioctl(dev, DIOCADDSTATE, &st) == -1); +} + +ATF_TC_CLEANUP(addstate, tc) +{ + COMMON_CLEANUP(); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, addtables); @@ -953,6 +977,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, rpool_mtx); ATF_TP_ADD_TC(tp, rpool_mtx2); ATF_TP_ADD_TC(tp, natlook); + ATF_TP_ADD_TC(tp, addstate); return (atf_no_error()); } From nobody Thu Nov 6 23:11:55 2025 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 4d2dHc0pBpz6Ft2T; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHb3hcMz3h93; Thu, 06 Nov 2025 23:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZKszgepW27hi11+FAZN6yaM9CkYkIDv+Y6G/x6HEK3Q=; b=Y7Jo/55uS7Go7RScd0M+25dyLVcygue6qQ3gCiri947za9zzyHOG9uN+RItikKaFsR/hqS Ti/soeLyf4/ESHeMSFI+zDiGdCV651dXWp6GR+fJSEX7C9HXynaesCzaaDlaSGVyeffyEz MN18I/ug+07E3DRBrgAJ5ZguA/HmcDVqMTQGRjhpGv/TTmZlZRJPTWRCTbKOCpZBSFTC83 OTABkkLh7yWPyI/jm+QHX/O70wu0CzCpaGYmhZF1AWoBTz4k9iU66266FU2pUd4MzjkARU 5AStRE+YOEKo+yh2gvyJh9xpTeVllPYSNSiHS+S/ZjCrNtWZehgcvNwVOTAikg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZKszgepW27hi11+FAZN6yaM9CkYkIDv+Y6G/x6HEK3Q=; b=BB0EXvZxYqywbSQNMhI5TzVEo8V1Jx/MIobipgLSMlgcQcpV+jwby0AoBMldDKFp0henZH IuU/CQeyCSvG2qG5OzchPf2Cr3ZExxR+BLrexeyFiw/9VudWPWzHZVYxUUnGatsXxYDkuM DpEi35J8GTHMUD4ZDzKZ9R9MuuSyuXHVrj7qitasbgQBcZOxYyBIvVMdUS7rum7OGwr/QT eLMt9yxon4vN5GrCsN34pprclXbOeBl1WjJSer/n051WYkBqE8tqwsM0U+GU9WTpmFn6vf /Sdk6iJib4P4nam6zdbfTDIC9gw46NefjxHMHYBpzfyY+e9MSdVogRCszReYbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470715; a=rsa-sha256; cv=none; b=SSJLA7UIFtDbZW0sLPdgzbXmXR+b6xcY8RW2ztnbigzEQn1jI9xHynvzAxL/2Q+XxBNCFI YnPp35DcTgCGN0iQhStEqPwLu8QTGcArTNeEt4lEebM7RUuOzMbKl82W0ODHIq4HrBmLhe +DRFTaeFeHy0Vszhyi3cf2k5XZmxeMmMd4uFAmgdnTGCIRTXu06FgKloDV0gO4QIiik9sQ ViyNmKAoJGjtiXo0meBUtwuO7SvyHvk3XMgk47xqeMPhhvH6T2MYcrJubVR5960YVVgY0C WFyMzPtun3vtopfdXbL/EpOCOV2RrmSJAl33i7e65Ali1ypYVkQRIxh/D+QvZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHb3GJbzZwb; Thu, 06 Nov 2025 23:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBtPw010516; Thu, 6 Nov 2025 23:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBt00010513; Thu, 6 Nov 2025 23:11:55 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:55 GMT Message-Id: <202511062311.5A6NBt00010513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c3a27fa06627 - releng/15.0 - kern: Fix credentials leaks on RACCT but no RCTL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c3a27fa0662724477239157a5a19e673798eabfe Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c3a27fa0662724477239157a5a19e673798eabfe commit c3a27fa0662724477239157a5a19e673798eabfe Author: Olivier Certner AuthorDate: 2025-10-29 16:46:39 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:08 +0000 kern: Fix credentials leaks on RACCT but no RCTL Affected system calls: setuid(), setreuid(), setresuid(), jail_attach(), setloginclass(). In these system calls, the crhold() calls that, on RACCT, make the just-installed process credentials survive a concurrent change of the same credentials just after PROC_UNLOCK() were not matched by a corresponding crfree() when RCTL is off. In fact, in that latter case, they are simply not necessary, so wrap them with '#ifdef RCTL' stances. 'kern_rctl.c' causes a compile error if RACCT is not defined but RCTL is, so ease reading by not nesting '#ifdef's. Approved by: re (cperciva) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53456 (cherry picked from commit f4315ff8b3fee71eb0098864a84618f2f8ba85d5) (cherry picked from commit 4db768b01cd78666949bbd67ba611e9e47ed710d) --- sys/kern/kern_jail.c | 2 ++ sys/kern/kern_loginclass.c | 2 ++ sys/kern/kern_prot.c | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 267b60ffb5bc..523b7e314a10 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3047,6 +3047,8 @@ do_jail_attach(struct thread *td, struct prison *pr, int drflags) setsugid(p); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); diff --git a/sys/kern/kern_loginclass.c b/sys/kern/kern_loginclass.c index 55db6c28a1db..0c111c4f78d8 100644 --- a/sys/kern/kern_loginclass.c +++ b/sys/kern/kern_loginclass.c @@ -225,6 +225,8 @@ sys_setloginclass(struct thread *td, struct setloginclass_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index a4c5bcc52529..df725cfebd97 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -982,6 +982,8 @@ sys_setuid(struct thread *td, struct setuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); @@ -1390,6 +1392,8 @@ sys_setreuid(struct thread *td, struct setreuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); @@ -1536,6 +1540,8 @@ sys_setresuid(struct thread *td, struct setresuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); From nobody Thu Nov 6 23:11:54 2025 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 4d2dHZ74hTz6FtN1; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHZ3Xxtz3hCK; Thu, 06 Nov 2025 23:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6sJLTuIlIiDFckfreoS369OkftIpl3LYpei24WCSIkg=; b=Gpx/Sn/SP2klcQi37wScy4/4rx7nLr1JYr6zr7Og0NWk9Td1zZ+tXtSIZv2tEct3YzEhCe 4CAk3HIEPiYFZmfNzQT8qa8WB4RtB1z2s4yz4Z7DNpecjx/WLCF1cYZ7yisJOQW7rIxEs9 +Mdw3jGVT9GLgvi0vlLIDN3Zm4shlgQhISFZ3nMoHJ4tNHLncuEb3kc0zzzf7kJwILmjhK crMR4I4vdMDw9y1ayFvNY4J/NXrWQwqqRfZqq4sC8yz15PgJYBhNaHlVem6Fvu05zddcO9 gvFelMpp8b5cwWuRzNY55qnxaDoqk/pKWB24/mv296waMWNAME1VgVwu8SqsyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6sJLTuIlIiDFckfreoS369OkftIpl3LYpei24WCSIkg=; b=KhJpn3sBuPYIsi8qw8vLh7BKRv8FInXIt1Fl1v/2vf/ySJBAgGqP/OIv2VD6sYdS/P1SBN H3Ia+/xJBHitXsqwUAkPBXsMo9tpsfgn9TycElUewVoam/ShTPROYpgNkUMcH+31lTld5w Igc4zFubFG1nryPkU8gU0qAN05QauaV8WSp6i1FcdySdLk9gZBT911nuZzadUsdIve7Kz7 CFu0shLL9A4SnzPZquXFX/ttDjjW8kei9ltHuG93kUeRa84QqN1Geen5t0ols/HgcH/i/c Nb5Rnkp1K93bNGpVJGWHDhG5ScgIKRUaHpulm66LqTUfkDYnxyfTZJJdgRjYLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470714; a=rsa-sha256; cv=none; b=LyPf62UYk8QnBfBZZcMbghXv6PIuPA8h8LxZerql7J0khuVaciBrLErluXTzCArv43qac1 8gmt4poDkpMD6GYvbhOGBwT5rDZUtYCrljaGlqRkVdiMZlZqR3yCWBJX8rbKpL1QC7ciqs EHFayyuGhAiooHcoGTZ+fEcRz4FPs0wmITY8SWTnjLEckdir8pAoW5b6k2Y1y+y6INF++u QtWxxzj/dou0M+DWi5Yl+pB2/vS23yp405oCFeN4zTDOCHA+c6pMzVWQjTbR2airgISTNA L1QaK5PxonmVQC3+QhAnLNZDV87cn9iow/4koHCpB7S8H4Vh7tDGw91vUSWatw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHZ2fnBzZjG; Thu, 06 Nov 2025 23:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBsGB010482; Thu, 6 Nov 2025 23:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBsFg010479; Thu, 6 Nov 2025 23:11:54 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:54 GMT Message-Id: <202511062311.5A6NBsFg010479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1e5405d6b50b - releng/15.0 - pf: improve DIOCRCLRTABLES validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 1e5405d6b50b527be94e4c179c40f2a866865cbc Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1e5405d6b50b527be94e4c179c40f2a866865cbc commit 1e5405d6b50b527be94e4c179c40f2a866865cbc Author: Kristof Provost AuthorDate: 2025-10-29 08:28:59 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:05 +0000 pf: improve DIOCRCLRTABLES validation Unterminated strings in the anchor or name could cause crashes. Validate them, and add a test case. Approved by: re (cperciva) Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1da3c0ca5b1decaa9cf55859cd134bdcd1218116) (cherry picked from commit 909528f8a13004e15c08c4793a6a349716f90447) --- sys/netpfil/pf/pf_ioctl.c | 11 +++++++++++ tests/sys/netpfil/pf/ioctl/validation.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index d7bb62977afb..856bbd6cb9cb 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -4788,6 +4788,17 @@ DIOCCHANGEADDR_error: error = ENODEV; goto fail; } + if (strnlen(io->pfrio_table.pfrt_anchor, MAXPATHLEN) + == MAXPATHLEN) { + error = EINVAL; + goto fail; + } + if (strnlen(io->pfrio_table.pfrt_name, PF_TABLE_NAME_SIZE) + == PF_TABLE_NAME_SIZE) { + error = EINVAL; + goto fail; + } + PF_RULES_WLOCK(); error = pfr_clr_tables(&io->pfrio_table, &io->pfrio_ndel, io->pfrio_flags | PFR_FLAG_USERIOCTL); diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index ff3f1bbcdadc..7a1d2b3800cd 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -193,6 +193,38 @@ ATF_TC_CLEANUP(gettables, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(clrtables); +ATF_TC_HEAD(clrtables, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pf"); +} + +ATF_TC_BODY(clrtables, tc) +{ + struct pfioc_table io; + struct pfr_table tbl; + int flags; + + COMMON_HEAD(); + + flags = 0; + + memset(&io, '/', sizeof(io)); + io.pfrio_flags = flags; + io.pfrio_buffer = &tbl; + io.pfrio_esize = 0; + io.pfrio_size = 1; + + if (ioctl(dev, DIOCRCLRTABLES, &io) == 0) + atf_tc_fail("Request with unterminated anchor name succeeded"); +} + +ATF_TC_CLEANUP(clrtables, tc) +{ + COMMON_CLEANUP(); +} + ATF_TC_WITH_CLEANUP(gettstats); ATF_TC_HEAD(gettstats, tc) { @@ -957,6 +989,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, addtables); ATF_TP_ADD_TC(tp, deltables); ATF_TP_ADD_TC(tp, gettables); + ATF_TP_ADD_TC(tp, clrtables); ATF_TP_ADD_TC(tp, getastats); ATF_TP_ADD_TC(tp, gettstats); ATF_TP_ADD_TC(tp, clrtstats); From nobody Thu Nov 6 23:11:56 2025 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 4d2dHc659Gz6FtNm; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHc56Wtz3h14; Thu, 06 Nov 2025 23:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Kq35j1Jq7NmEGsZ8cyLPdp+VNbNLmGnQ2cFoRqg+QA=; b=dFnYKmHScnHHOFHY7yyuXdnQwqnsng10DkqV+YAbzKVp5PhC9nsNLJwdn/OPXnmUl4NJ3A F9LOObHFfB5HAOuOWJhM0vRPT/Nl+4z8pSFP4+UzAs5jY8M9BUEc5UQQFNUULqChTycBxj LEok7Zd/roae+3UihBfNxLzua791t2tltoUy3YTK5VtdwthaMGBURmh/zaZqbr2/EO940D LPrkEede0rJIJrjm9ZhP/a9Qzfp4liGNNhmIPC4E1kJMfID5bSkaEnV/P6VQGiQILzS4h+ HxQUtcEQ3quVqDF0pY6Zbs52q0AHfk2Ng6OGnIQDfGGhMXez1LajKBSIPbECLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Kq35j1Jq7NmEGsZ8cyLPdp+VNbNLmGnQ2cFoRqg+QA=; b=PNmCzomLrG1jKAvR6mZu8OIA9fbZF4Xq2TV9F2Rh7U4uTwravrfXK+HMDJzc/rMMysZX7W nCuw2bMRLdScIBwRJzvrEtvKHTI3Oe7sLXdq3R8e22B9kPdS6Ef45PtvZh4bUtU5xp3FwX o6JBTBiakRjdtUk8vOmsOB6YdPWrDGE571kjEBJP4iQ3YIb1h7qMJVxW2pDN1105A5DTAX 5gq3K2fz+aiult2LzB/NiF1I+O9gABdklgUtJu0mVSlc8MWXqfFhJYw0mqahhM8D5hh/l1 4FGCmvneoDqe+/C23cNKsBRPMo+z3aFJcXMJSA7snqfCWZDNEm2mobit9ti1Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470716; a=rsa-sha256; cv=none; b=jGdNNc2MgXgePjuJwG1t9VIpotyveJWgmqxKEkXREYZ8Qa2vzOZbTqQka09kcJOhSXHRZW teHS3HtxV2kMwj4PBS1DCs4XTLEtXjTYCODdC2X089b+nGGEr2N8nNk90Jev88s3BNtZbs B6Dx4NkAJ44Ualg7HmFwTh7WTSKEfMl13plmr8Y/QuEw3gqrN2KVvZDmycfud4BCOa4a1V wJ4H4oPiozTjOrzArQYjpEeaTECWvgjE7XVfyCOR5zlLeM0jKO0qdbpm4SNGXe2oC23/uL 9Acz2IX3W8SH0CV0cWTvpNGoRZGrQDMdgrvRjY7XT3Ttjv6ELvKO6dpCdx5fTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHc4YsWzbCK; Thu, 06 Nov 2025 23:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBunO010551; Thu, 6 Nov 2025 23:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBulc010548; Thu, 6 Nov 2025 23:11:56 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:56 GMT Message-Id: <202511062311.5A6NBulc010548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 76fb5c23dcca - releng/15.0 - setcred(): Fix RACCT resource accounting on credentials change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 76fb5c23dcca4696d3682bec2dd0e60d81c6db1e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=76fb5c23dcca4696d3682bec2dd0e60d81c6db1e commit 76fb5c23dcca4696d3682bec2dd0e60d81c6db1e Author: Olivier Certner AuthorDate: 2025-10-29 17:07:59 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:10 +0000 setcred(): Fix RACCT resource accounting on credentials change When credentials are changed, we need to adjust the sum of resources associated to the initial and new process' user IDs (and old and new login classes and jails, but setcred() does not change them) for them to stay consistent. Approved by: re (cperciva) PR: 290352 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53457 (cherry picked from commit 2be5127c4a31bacac9b4158395bfa844f6033626) (cherry picked from commit 2e76660cb71dc113a4f4e0eb05eb190d7fc99e7f) --- sys/kern/kern_prot.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index df725cfebd97..3c145851b683 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -696,7 +696,7 @@ kern_setcred(struct thread *const td, const u_int flags, gid_t *groups = NULL; gid_t smallgroups[CRED_SMALLGROUPS_NB]; int error; - bool cred_set; + bool cred_set = false; /* Bail out on unrecognized flags. */ if (flags & ~SETCREDF_MASK) @@ -839,17 +839,32 @@ kern_setcred(struct thread *const td, const u_int flags, if (cred_set) { setsugid(p); to_free_cred = old_cred; +#ifdef RACCT + racct_proc_ucred_changed(p, old_cred, new_cred); +#endif +#ifdef RCTL + crhold(new_cred); +#endif MPASS(error == 0); } else error = EAGAIN; unlock_finish: PROC_UNLOCK(p); + /* * Part 3: After releasing the process lock, we perform cleanups and * finishing operations. */ +#ifdef RCTL + if (cred_set) { + rctl_proc_ucred_changed(p, new_cred); + /* Paired with the crhold() just above. */ + crfree(new_cred); + } +#endif + #ifdef MAC if (mac_set_proc_data != NULL) mac_set_proc_finish(td, proc_label_set, mac_set_proc_data); From nobody Thu Nov 6 23:11:58 2025 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 4d2dHg1Vvcz6FtTQ; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHf6R6Zz3hK7; Thu, 06 Nov 2025 23:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sl4ftnq8gO5GXadaEWjaX/2M9Rsw0BpVSljT3OKkkAs=; b=LUUJMMzmCLVEhO5Q/rFlgfYrux+wM5Y72Qw+duFx6hdwAw1fIRYp/Atgo+K1WJ5Bnt1hY7 slEWnoHBHLaSZ6bt773zPBuBaJgglFuy2UR7FFcQj25HC3USuQX+JV7hIhvsynAiXWEFyX 3Np/4teH1KdG6XPb9pgLTy/lMfTkdLTcPWtw7lSFdnPX9qe+5hVcEEung0c2sZqelnQPJ+ vnXqj0E7D6XBRzHX3gG/4n/qnoebK00BnPN9v+4pXV9UdpnvfSTWN3kpkukhIDev3v82um ZT9g30T6oOr+8GgMCb9fLBBmP/AWMpMgvCmX3hcAhHQ/dbBms+EF5ZHUqmkLeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sl4ftnq8gO5GXadaEWjaX/2M9Rsw0BpVSljT3OKkkAs=; b=CPfXYfsUqqvy+JksaSji8CSTNxqQwGJUpfxN618VVnFQXbJiIeq8eMv5GKR7gQSrr4Im7e HvzHTW2gyAFX0bOUtpOQkT5NR6elijc04o0rqwZE51OJHBDCC0cZyPDkmx9DNLfUNPY7oe 2xzujRnD/tC7MzdzoDeJ/5S0trpQviq8eQlYIjLkSE3rHZVNs68tcGIGMh88q9hciNjeFQ GgieaUpUwcQf/C84r76riRaqCuQDtuLOp9ZtKBLbHp5JL4Iu/DSKz2Pp/s3VVeDLcukjqL wyc0d2gLY/gaCjn5wRona8Gq4gKC4zRRxJ1bjbeZc/lXIQIOepqZ5aMlutlm/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470718; a=rsa-sha256; cv=none; b=WqycVHz0xh1jx4ADZElgrJsni58a4nayN9vuZQRiyfEJvO84JWNb5pjHaFdVWv9me7DHma GHu+t97auMQJvynsamWlEobVXabtAvg3DvcHiulwmxk9knMA74dlDiRNrlFh+Qtt/b5oAW FibeinUv9+I/dfz+v81RURPaI1thsdrxyUST7oEV3AcES2WuDxisfahoGM/x+hgmNkX2Wk jGF+ylFLDPJHaEvjU0YrXSFQRAOU04xDlAW4vznR5q1YhIPuhGRSAiKPtlGjDdSrr48cP/ Ma/FDu6ZAhydh/E7jjq018VZTRFGeRSB/6SeZKLEWMhpK6Ei0EBVH68GpiTTjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHf5zjGzb38; Thu, 06 Nov 2025 23:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBwS3010624; Thu, 6 Nov 2025 23:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBwHi010621; Thu, 6 Nov 2025 23:11:58 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:58 GMT Message-Id: <202511062311.5A6NBwHi010621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 299dfb3cec6b - releng/15.0 - Makefile.incl1: .WAIT before distribute in etc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 299dfb3cec6b3953c7a4697efd57659a4ae4e3e0 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=299dfb3cec6b3953c7a4697efd57659a4ae4e3e0 commit 299dfb3cec6b3953c7a4697efd57659a4ae4e3e0 Author: Colin Percival AuthorDate: 2025-11-02 04:22:26 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:15 +0000 Makefile.incl1: .WAIT before distribute in etc In order to make sure that man pages are all installed before we run makewhatis to generate mandoc.db files, we have long placed etc at the end of the list of subdirectories being recursed into by the build. In order to support installworld -jN, a .WAIT was more recently added here. With the recent adoption by the release engineering team of parallel *release* builds (aka 'make release -jN') it is now also necessary to add the same .WAIT before recursing for the 'distribute' target, as we otherwise end up with distribution sets containing incomplete mandoc.db files. Approved by: re (cperciva) Reviewed by: bdrewery PR: 289683 MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53533 (cherry picked from commit dcb6706ba494f34e2a2ce97e5c5f2867b9e1f5ef) (cherry picked from commit 48dbf763337aea30e29971e751d3aa1044a555ef) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index dcd4fd23c087..3f93e1065622 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -466,7 +466,7 @@ SUBDIR+= ${_DIR} # by calling 'makedb' in share/man. This is only relevant for # install/distribute so they build the whatis file after every manpage is # installed. -.if make(installworld) || make(install) +.if make(installworld) || make(install) || make(distributeworld) || make(distribute) SUBDIR+=.WAIT .endif SUBDIR+=etc From nobody Thu Nov 6 23:11:57 2025 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 4d2dHf1wfjz6Ft2Y; Thu, 06 Nov 2025 23:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHd5rxSz3h57; Thu, 06 Nov 2025 23:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59fbGW9aiuKtzyU0COwc+dBeJzxxnLnitnrtlUtcM8o=; b=m1mRznl84cs0/fVj06aQQ3hB3udqBYxT/XK2keJjZ4Pne54wo6U1JJI/Jscv0ppD63xPUp dP6GMD/z5clqQGyo4ZPOTSMI94lBHO+0b4zrrhrDPem80e13yOhYMKgQffgQoNOT/ku+I4 psH63uDrwAK+Vm/hc1wH5d9w+usH/lb3DXOFgxOfEA5rsDL4p+Zk+okq4vdS1EJXa6xaS0 sCen41RSyDDK1AzDjHD9OuG7tcfo8vDjhZ0IevIRiRkQwWeNMs/1cGpPLmQ7ngGIeNbELI jM1KkZRNg4zcJgu8ZCt3YbhLc3oZyEew6FID4m//5Oc2h5AwZBZxPXX0ItnteA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59fbGW9aiuKtzyU0COwc+dBeJzxxnLnitnrtlUtcM8o=; b=Pvoyzf+CQbscDbHyG7E4Ni0mxn9L4yQSpr/tchnWt/3A9F/GxkpTgm8scb1gT0A3HVZkaH xIUp1VuoPK4UQgdsMB4b3TH6TbZR71HkDA0U3dipDKvpsDXd+bnFUiXKaPb+WeAiwfb19F WsutCpj50y+jQNyb0ijcHNagKX0E6E2aQlrZl7QdY2hXRq2DRUDpEncrH/SMqqe4GlCD/2 ybHWNo7CAE7c3WFx/fRTSHJVxYqMbDMzSH+TSM8vdMYTPD0nXqqq+tDwxDFSADawEh/jdf e/mWcCsbcvSdTmicR+4XPKaj7FmWooQWOKQ1kZsJiKbklxI629VgGbpo11bfeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470717; a=rsa-sha256; cv=none; b=tAljmqlM6eCi8XCGw/mK1JyFs/PmMQO/aGGne9D42CMt7UKxqPbcRuKuBNPegRKLpRXdf+ e6mvoEvFgOLc1K8xasV9R79s72uEI8mS6c0K6zEMyjt7w7+MdkpWgWFnIP9/A/k36ai7Vh 9gR82NJWBF22vh91fPELspvacpmbKaLTlyruZkBb2MXDyEsBhAuSqM79fqK68quRJi6YAu 3bexhaKtYv1en7w+/PyxZiXBY7kaHy4QrYPtZ0Rf0shMEI0gZTqQQ3Chk22UnLAnSY09p5 LJ+X4j4XOqvujwAXqEPu0JvNhKJ80yAEFArzev8biiyhF68tZ/r7N+U16cwnwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHd5LpLzZwc; Thu, 06 Nov 2025 23:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBv8b010590; Thu, 6 Nov 2025 23:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBvpp010587; Thu, 6 Nov 2025 23:11:57 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:57 GMT Message-Id: <202511062311.5A6NBvpp010587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0888e3266377 - releng/15.0 - release: Spell metalog_add_data conventionally List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0888e32663770bc7e1bc3264222b4dee2071082b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0888e32663770bc7e1bc3264222b4dee2071082b commit 0888e32663770bc7e1bc3264222b4dee2071082b Author: Colin Percival AuthorDate: 2025-11-02 00:16:35 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:13 +0000 release: Spell metalog_add_data conventionally Approved by: re (cperciva) Reviewed by: markj MFC after: 3 days Fixes: f1995d6fc13f ("release: Prepare GCE cloudware images for building as non-root") Differential Revision: https://reviews.freebsd.org/D53530 (cherry picked from commit c3a3af1346684eedf836fb62f874092ce602697e) (cherry picked from commit 6e47589eb067e5a22cce9f351ecf12bd2ffa9e4d) --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index a7ccfc27a75c..b0a65c2981e1 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -21,7 +21,7 @@ vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf echo 'nameserver 8.8.8.8' >> ${DESTDIR}/etc/resolv.conf - metalog_add ./etc/resolv.conf + metalog_add_data ./etc/resolv.conf } vm_extra_pre_umount() { From nobody Thu Nov 6 23:11:59 2025 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 4d2dHh1y6Sz6FtTS; Thu, 06 Nov 2025 23:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHh0Mr1z3h9l; Thu, 06 Nov 2025 23:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KysvDMmwOIEJpEDHGy/Nkc8C7m3RDtBy2W/bPkZI32c=; b=DCWgs6W1Zm/5yxdc/gWfvKZyyCGUMfsyAeRLPXR/fFx49WK1HOpHUyUFlL5j4gMVxeGsDA PRwecMlxQt7bapbGYy19CodS1kM2MQqxjrd0ihpxTC983Yx8dhCjPMASXfKGf/VsQsV6B5 xA2+UG2KFOReW0K0bEqh6ZnEdRg7ZjpzGTf1waIiSTpxlca22FJongKytNAhG+4sAV4EAv Lrsa13DidczYwd95Wdz10XUlXYLJZpPpucwfn+5EUzhstV3+L3RSk85UOIi/erPnV95rAJ aowMgCGVJk3zsJlD+kE6kDjJHQS7P8QPUFjRT8F4WVwjX5lAXKl8I5TGeW1f4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KysvDMmwOIEJpEDHGy/Nkc8C7m3RDtBy2W/bPkZI32c=; b=uZht5Nq0a5nQi4HCQq0sUe/3dgoQR9gfcA3nEuAd/5WuZRc7+qn96lCUPD6218wCVAF6dq nHB9vHKYzSmQTPFpoqSEOeysLOHykq6GEfx8+nrevp14tnEYzpaTJaqXIFiWKdaZsDS9kQ KICxowvApuBmO9h6Gi6mCGmqOTdGD10HA66OYEzWjTEqmvW4mIuUoM0oHvt0S6PYLRUkNt wovSk2MZkKbNYw5/olxyvGMDxCGlsbr6EYH/bRxpeTJCpmJ5bV+ylsynrVn/zgBj0rwvfF 55/fq8GgXHmrnVbhY2UP64DQ6Xpcbg/fTpUdWclGVhs4FKVv5EP9RzoO7B7KQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470720; a=rsa-sha256; cv=none; b=QO642QT3hpJV9z644Yz/cs3MFR34w+dWcsHbjq2FAUcmnWXjFZKGQD0gJlq8jnDhxl3B5U vFefE5oVahUWVWIhiUF7KP550so25EPvHssm7wAVYadg/H69HBZdVvx+HfT6YHoKlWiFfH BX0Rm+KTSQXnEVAQMAAqIMkuAnvrrO9tF67vbevb+NWFyPK9TMrgi+FFcPzmH0ci2hDC8T B7CTbdhVDY7odGZznJN/vSwH1g1RcjLs8nrB9DOUoV7/5RRbMdJVfb6/erPKVvdY/D7MGF RAwlyt1MQyqVrVcLTYXIKC7lJucdPoBLpRUZJdfCY+kIhh1YJ8PFUIDpihHIGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHg6V3YzZfg; Thu, 06 Nov 2025 23:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NBxnw011392; Thu, 6 Nov 2025 23:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBxPP011376; Thu, 6 Nov 2025 23:11:59 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:59 GMT Message-Id: <202511062311.5A6NBxPP011376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f438cf7428f0 - releng/15.0 - vmimage.subr: pkg autoremove after pkg install List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f438cf7428f0eff42e9a3acf687048275e7cc690 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f438cf7428f0eff42e9a3acf687048275e7cc690 commit f438cf7428f0eff42e9a3acf687048275e7cc690 Author: Colin Percival AuthorDate: 2025-11-03 01:16:19 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:18 +0000 vmimage.subr: pkg autoremove after pkg install A bug in pkg, which somehow only surfaced as a consequence of pkgbase, results in pkg install sometimes pulling in false dependencies. This problem might be limited to cases when the lib32 pkgbase packages are not installed. In the case of EC2 "small" images, installing the ebsnvme-id package results in binutils, gcc12-devel, gmp, indexinfo, liblz4, mpc, mpfr, and zstd packages being installed. These false dependencies are however not recorded as dependencies -- at some level pkg does understand that they're not needed -- so running pkg autoremove immediately after pkg install cleans them up. Note: This does not remove lines from METALOG corresponding to these packages, and makefs emits an error when it attempts to create the filesystem but cannot find the files listed in METALOG -- but makefs does seem to complete normally despite the error messages. This change should be reverted once the pkg issue has been located and fixed. Approved by: re (cperciva) Reviewed by: ivy MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53543 (cherry picked from commit 6a13aeac3c1f98db7cf156f24a4d6bc8d3c321f6) (cherry picked from commit a21cff76c57089cd357473128d42410d189ca149) --- release/tools/vmimage.subr | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3bfef585f613..8531e9b8f2d6 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -212,6 +212,13 @@ vm_extra_install_packages() { -r ${DESTDIR} \ install -y -r ${PKG_REPO_NAME} $pkg done + INSTALL_AS_USER=yes \ + ${PKG_CMD} \ + -o ABI=${PKG_ABI} \ + -o REPOS_DIR=${PKG_REPOS_DIR} \ + -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ + -r ${DESTDIR} \ + autoremove metalog_add_data ./var/db/pkg/local.sqlite else if [ -n "${WITHOUT_QEMU}" ]; then @@ -224,6 +231,8 @@ vm_extra_install_packages() { chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${p} done + chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg autoremove fi return 0 From nobody Thu Nov 6 23:12:00 2025 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 4d2dHj3LhZz6FtND; Thu, 06 Nov 2025 23:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHj0kmwz3hKf; Thu, 06 Nov 2025 23:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUzvTZzjMFpTaM22fIRVLgMVLEcZWiM/2Q/QuzJHCpw=; b=GGDW1e7Umcf4dgVOF71ZLvQAN+Sh7y8yzTRvzlxSP5zhiAJbRJGsFmO5wAI+gU/+ss3XOV sLdaJxtkCjo2pETKEyFhX72MrHqK6/sd1URY6WdUC1CTYGy2qkQX8MYwL3ouLvOIeUA0dv 6HDK73C+rJOFU28vLmDyCi/8kTXSMKAJRYKyQTdDYgU96A2pyZg8GRUhodLdwB3pAG3kmX JJq1xDFlPYAUDMFmXXIu+JrYfM5dX2qx2pFn3sBjO+vua+HX+t0ftBdRqneuGFKLKcsAuB Exe0g8cy/qboNvAfq40DE6lFpDDYkH3jYIhQJxWYLZeOe/GAdI26G1H8BTgy7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUzvTZzjMFpTaM22fIRVLgMVLEcZWiM/2Q/QuzJHCpw=; b=NTXUUrmTIgXjseSHjJBrSEF1Y38thlR+wEo+wh8Byeq0NxCQE0jTeAzgn+h2rdFPwM16az 7NpRE/A2whGf/p8DuyIZTgJdqBIF+OhfeyulIu3M7VAp/y9igwecWPLiKQf0DDK09w7t/X YEkEO6q3B1hyfRxtKU5Ljx5bDiF9X2o9Uz5TvOBDHcD5OhokZA+mSwvaVXgdMGNsEKPik1 QRYzzAtc+Eo0muWm9pQfqdJXySyMPv0x3OYQIsBL49LmbwFoEieso7sH2fxxEsWMP9gf02 +zweXqZzYAC2anUsPMDyV3TvUizHekXbqR6HCX7YELouhVDQUOxuuB9Ns+UBFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470721; a=rsa-sha256; cv=none; b=g4eIvD4y3cBHOZmwk2iRrX1MOGzPD0DP8QUIWvsc3TIyvI3w/dWQrGsDQeNXHfKVgaYPGC SJPheE4seKDj0Fh3PMbrhXc/3HSFAmmC/J9YoDsWnQoIC0igpQP3ue95EeP0OgU11F+ECM 4Fz13sfsEVNe0yWiXhRwdFboEXT+vd7AHumvxpO1ICzB+xSR+GRAe2ny7/2t3ZBEy5M+AQ tY29foSohM9IDoGwG/hr6MOgpH9AbSllOipfaN0f7SGVd3v4vyK/nOZDGRTT4LMr246tGD rqWCLEHQoDOr0tFyhEEAohZrWlnHiEzTsULoMYzHWxshBNXVxEIij7qBkiTEQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHj0Lj6zZln; Thu, 06 Nov 2025 23:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NC089011649; Thu, 6 Nov 2025 23:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NC0wZ011646; Thu, 6 Nov 2025 23:12:00 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:12:00 GMT Message-Id: <202511062312.5A6NC0wZ011646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f512ec40bbbd - releng/15.0 - release: GCE builds depend on ftp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f512ec40bbbd0263c3bad98283784f95fe5e1267 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f512ec40bbbd0263c3bad98283784f95fe5e1267 commit f512ec40bbbd0263c3bad98283784f95fe5e1267 Author: Colin Percival AuthorDate: 2025-11-03 21:41:14 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:23 +0000 release: GCE builds depend on ftp GCE images are required by Google to include their source code; we do this by extracting {src,ports}.txz into the images, from the (legacy) distribution sets. Make sure those distribution sets actually exist. Approved by: re (cperciva) Reviewed by: ivy MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53567 (cherry picked from commit 7f536b1c1146c4bc5cde336e1fe7a083f2874f11) (cherry picked from commit a1b00e368926198a163015bfe21171f2d582c703) --- release/Makefile.vm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index a04f779ebebb..142fd6e7bdf5 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -129,6 +129,13 @@ ${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE= ${_CW:tl}.${_FS}.${_FMT} cw-${_CW:tl}-${_FS}-${_FMT}: cw-ec2-base-${_FS}-${_FMT} .endif +# Special handling: GCE images ingest src.txz and ports.txz and expect them +# to be in the /ftp/ directory. Note: This will need to be reworked before +# distribution sets go away! +.if ${_CW} == GCE +cw-${_CW:tl}-${_FS}-${_FMT}: ftp +.endif + cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} ${PKGBASE_REPO_DIR} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ From nobody Thu Nov 6 23:12:02 2025 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 4d2dHk3hJvz6Ft48; Thu, 06 Nov 2025 23:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHk1bg1z3h5x; Thu, 06 Nov 2025 23:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h/o02mJnmgAjNNr188iKxTrj3+QdssLMneYWdZd1p/A=; b=juClZ+LTITG05GNNKY5Jct4vaQFdS29Z/fPPmTI3t/DDnE+EgbJ3pF+Exr0U8noto1E82G xlBRAQbeRkgZBF13l9hf3ULMSOjgxkKdy11TDtulHQ0WorkGFlYuwx47DoMZU/vs62uY3h nMg3gkf+lhnjlM+NqTx4IFRiCaCW7Qe72l9MXMvyrqcMJy/PRI3jpmt2yjJGPQ48Ovp/sy 9FIppjli+8BT9fwYG0nMmoG5hD63/tgXr/zRrE0dItmdsBhFtTfWfQOUNmT3tYqhmyjDfC qiv1NZhkDfCubSom+9RwrGnMOL7xncvThe+xcDLnYY4kAJRkZRjnENA5xkObuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h/o02mJnmgAjNNr188iKxTrj3+QdssLMneYWdZd1p/A=; b=RrGdBe5j8wljOW7GHMJ5qPb06vploheVAEwhtC5Va9qCWpnD11COrIsA+K2iPmC0AUJpbH +QdXCEo+A9KPhq5Yh6ftvrKQkSItmVqPb0ZOYB8s1Rjva/6IdO8jygW5wxJRFO/7D/kB+d Nv5Y25yb+w7UvCt3rh/KZ1O9agJr6h67zv93+r4qVbLJN2t/cn3HBSs9rZjNR6Z0hblR46 xqMnsPkSBnxwbuv4g7vU1uksedXBqBgCvgw4CNUCfJ2T1+mnUspLj8dsJPIf2Wj71GzyZR oYHw5zWX2JJma1gAatxEmsAl0P7jDVPA93jY7RDRfc7QL7vZOEEoyW59ZxExHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470722; a=rsa-sha256; cv=none; b=A4ereMLERrhd/DZKQpkxHXjNPl8EvxFe2D5gc5QKzRNNM3QL0ckjoRchmn0HAqMZgk4QOZ 1BY/NbllhmEFfxZsC+jRUT0M9qPV4K3iewsRytwMMkGKuBe2YgLNI0RMh5aHx+BMR7WCRk 8CTdtHy67Y79Jf86hP3oROIk+HIL6CnvVHHXCm6gdLL+iWXcHuMXHQpvSHwp5igG9PNtGC aCqhw5H8VAOJ0z9+/TNv8ZGVdILwD1/lDjaAIUSnxkLyVI86IVROjfhnD/9n/2dnXMdNqg EDqzdQTmwa0M2h2GZAUYSC7HeusOOSx0VJ6abRu6auIaJH0+2Kveir+fPk0DMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHk0xmgzbDk; Thu, 06 Nov 2025 23:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NC2xn011685; Thu, 6 Nov 2025 23:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NC2lk011682; Thu, 6 Nov 2025 23:12:02 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:12:02 GMT Message-Id: <202511062312.5A6NC2lk011682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: dab5efb726dc - releng/15.0 - release: Don't try to fetch distfiles for pkgbase List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: dab5efb726dc5df12651d3e84a69ff094143fb41 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dab5efb726dc5df12651d3e84a69ff094143fb41 commit dab5efb726dc5df12651d3e84a69ff094143fb41 Author: Colin Percival AuthorDate: 2025-11-03 21:42:56 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:26 +0000 release: Don't try to fetch distfiles for pkgbase In order to comply with the require that GCE images must include their source code, we fetch distfiles for all of the packages installed into GCE images. This fails for obvious reasons for packages with an origin of base/*; filter those out to generate the list to fetch. Approved by: re (cperciva) Reviewed by: ivy MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53568 (cherry picked from commit 05b3a45cd065c93cc1262d31675e3e102784400a) (cherry picked from commit 92ab9516c8a5d196b60ac8f6df777de745aaa219) --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index b0a65c2981e1..ef1cf7e8f985 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -100,7 +100,7 @@ EOF fi if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} - _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a) + _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a | grep -v ^base/) for PACKAGE in ${_INSTALLED_PACKAGES}; do make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \ DISTDIR=${DESTDIR}/usr/ports/distfiles From nobody Thu Nov 6 23:12:03 2025 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 4d2dHl4QK2z6FtPG; Thu, 06 Nov 2025 23:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHl34K5z3hPm; Thu, 06 Nov 2025 23:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NTbDVpnSI6AHXGqFWL0WCyObZzro3ZPHFCzrqZfiO6I=; b=qg6wg4D7FhQ07kp13pXPUJwcHXIzNJ1cW9HSL8YHtZd1AzTVlbLbw0EHJc0gUf224+Xo6t 8k+Ol/4/ujRGWActJfLYgZgPiMT68FdU5nOclJuk7EUuCRKPh723WP0MlUdvtdnxUqRPpt 6F5g5DBHh1FIsK2Nhf13pkhk+ZgpajVorp4HJJkXQIslRpOwc0bslzbUAhd2f9sm4DHmbj u9XaLntulV4vnCgQNF/F6I1B4+Wh7qDI94wfBMZztf/h4DuRi3pLws3on9G1SsW73w30sr 8KwQpShXPRdLr4jULsqLCfA9SnwwcpVLVCecDaK5ZmaB9jnXQl8eCdH2rl2EkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NTbDVpnSI6AHXGqFWL0WCyObZzro3ZPHFCzrqZfiO6I=; b=Zpo80827AzykjupNedgW0dKrPCUt4aVdSpHDmv224jlFmwmPR7WQgSVeTjj/UNKBjQ0683 bJttyJJR6cmgeQci4bHzsSFnlNUDLlZW+yLe4I8d81tJBGcChxEhnIY/IacUQI4I0BGCww HOXlyF8PvfuQMLYFezbjAeBtSucpAVOY+60yUOtYk45V0wrAkoUJvDItM3LdRiKv2v3wzL O5U6mp/ZERfjnTElyA1rBmcZProVLQx/6BHRXv6RwPZJ7f5NQvxwSSK6dortDjEjL+aeCg jAWa9CEKt1vsg0200XEYG+1Nz9dx8k9W424w9/AV0xmthXEFHj4Vb6jZDNpvSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470723; a=rsa-sha256; cv=none; b=wSXQLCct3V4aThL/DlBVsfWQWs3DIXs/58JYAhmygxA+C8ahotD2rXRACKazEtCuYse6WV iWx8xQIAaTBWGwlxmEWaGKYNuePq1Sia0/ypWTsLBNUBK3o+EO1WAksyOzN0TLWtrsgxiS 7aPiobjI34++V9Pqwfp8vy3AoNLEHBQFpBk6ThQiaMcbSvF05oHAH89yyGRP5Y8+xpSFR4 3J93Ak8c/JXD6TXq4a745WSTKrpnXSv6vRAB+bbTM8ErhF5RPWvVWuioWOqdUZdpfCtS6b dcSonNPKAljtdsHgS8wUz6FxbiVgBnYJ5Sh+8VihAVY12CjNngaD4bHiXVi2lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHl28qhzbDl; Thu, 06 Nov 2025 23:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NC3hc011719; Thu, 6 Nov 2025 23:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NC3fo011716; Thu, 6 Nov 2025 23:12:03 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:12:03 GMT Message-Id: <202511062312.5A6NC3fo011716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4291f032c45e - releng/15.0 - release: Make fetch happen in GCE images List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 4291f032c45ec7457b93a40f2f40561f6fa44384 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4291f032c45ec7457b93a40f2f40561f6fa44384 commit 4291f032c45ec7457b93a40f2f40561f6fa44384 Author: Colin Percival AuthorDate: 2025-11-03 21:44:46 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:28 +0000 release: Make fetch happen in GCE images We want to fetch distfiles, regardless of whether they contain known vulnerabilities or we're building images for a different version of FreeBSD. Approved by: re (cperciva) Reviewed by: ivy MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53569 (cherry picked from commit 8234c1899b305bcd23323a5870e459028b91bfe4) (cherry picked from commit 3b01c7da327853e9f3347ff0cae9d075460f5a27) --- release/tools/gce.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index ef1cf7e8f985..2fa23f6e54f4 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -103,8 +103,9 @@ EOF _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a | grep -v ^base/) for PACKAGE in ${_INSTALLED_PACKAGES}; do make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \ - DISTDIR=${DESTDIR}/usr/ports/distfiles - + DISTDIR=${DESTDIR}/usr/ports/distfiles \ + DISABLE_VULNERABILITIES=YES \ + I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES done fi From nobody Thu Nov 6 23:12:04 2025 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 4d2dHm53Knz6FtWt; Thu, 06 Nov 2025 23:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHm3ZN8z3hS1; Thu, 06 Nov 2025 23:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5HnY680oFdZMpf5lVlpF3Zfzi0Uj/gV6pgnDbLjNlw=; b=U4nC4bLd0OXkK7k5yX1w8rxpA5W9TYA0tx8NuekMR7Wrw8V+D609wbNPUihKCV23YXkkMI SoWS+OCkyL1anWuSwARmlYyZQGR1BC6MKqij7h8+FrHzyuxnkJGvpIaP0kYGV8CcFoBNjG 3k7eUpf+W9Cj1GKrlxOegtMRxlX62KkFMQW9JoNTwxmZKXdp93GrrF6tF8ruIY/q06QL7e 7SY0FToPGRZJn/axs2Vxz7puNieA5BzGWzX2T+PH64Vns6NbJvUnMB9Qzws3g/zqDO47cT 5wntPFdtFqKd+dZUdjpEX7rAjqT+0Gi3mC9RYeU1YNmx2qAYoBvwKlChbHFjIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5HnY680oFdZMpf5lVlpF3Zfzi0Uj/gV6pgnDbLjNlw=; b=knfYRmpRpEf8pssrrhsawNAjYJiucmIiFdQuEz362kyvMksIybHnSkNjhA10hGLHHA52RS gup9H3ze7l2KCKDxPq44AFuVyQ6DxT7OWri6ECKnSRj9Y7s+lT3JINOcd6FLAPFWdYTCJO 2AyFFUSvsb5EceaJ48Nesbt4YKDUaPpqo2bEVls5TYo7osNbIDO7YPyhj3R/ZvZSzC/T/O f90YBDM/pf56z6XXiTLIjvC3PvTzWHvnp2yd1L6wMEmAkAhof9562I6KGB/s9za0EjhDrp yLj15M13Oh9HB0hNaAliA3QYZ+7C0r6ixsMXR2edV5CXN4ciA1JaP8ra1Qn18g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470724; a=rsa-sha256; cv=none; b=HT20LN+1kki0lsf5TmumkjFloVFAAOC6Gk6VZ4ToJ6BGxUabTRJhmDtVGk1Twb4BEkRxky wOlGcUwXx+6Gi2nNkxaDJ01QZL006sF4FFWYkBCm0JwD7CxWCE/0/1YL/VkbUDpHeqPzbK ucxPq0HTUEzX8v/vJoDn4s3r/uQ6qMrnJiLtq6bMgQ2HoFZHrUczdEyUYD4RPMlsI10n8j MtziWmV0xem4a+wr7c/qkgoDqQub6j7BP2o6nEbbRPwkD+W9hObX+h2iYEyfhQ9PV2LsIB py2BLmU61jvXB8nPIv1GefSilnmPV95cJmSERYrmVMZfGsM/1SVJZ2OvhP9DNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2dHm33xZzZjM; Thu, 06 Nov 2025 23:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6NC4FJ011755; Thu, 6 Nov 2025 23:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NC4q3011752; Thu, 6 Nov 2025 23:12:04 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:12:04 GMT Message-Id: <202511062312.5A6NC4q3011752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 18602717de55 - releng/15.0 - etc/mtree/BSD.include.dist: Remove libipt-dev List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 18602717de55d1cf73898a22ec1c59c388c56983 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=18602717de55d1cf73898a22ec1c59c388c56983 commit 18602717de55d1cf73898a22ec1c59c388c56983 Author: Lexi Winter AuthorDate: 2025-11-06 10:19:22 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:31 +0000 etc/mtree/BSD.include.dist: Remove libipt-dev This package only exists on amd64, which means on other platforms we produce an empty package containing nothing but this directory, and without a base package (libipt) that package fails to install due to a missing dependency. For now, fix this by removing the libipt-dev package tag, which moves this directory to clibs. Approved by: re (cperciva) Fixes: 436618a427b4 ("etc/mtree: Add package tags for /usr/include") Reported by: cperciva MFC after: 3 seconds (cherry picked from commit 2a8a6179eb6cef8ba1a417a4c8a1f7063c704533) (cherry picked from commit ccd948829cc8e2456123fbafcb694261f0109d94) --- etc/mtree/BSD.include.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 97f2194a3fa1..56d3a823a8f2 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -278,7 +278,7 @@ .. lib9p tags=package=lib9p-dev .. - libipt tags=package=libipt-dev + libipt .. libmilter tags=package=libmilter-dev .. From nobody Fri Nov 7 00:07:44 2025 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 4d2fX029W3z6Fxvc; Fri, 07 Nov 2025 00:07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2fX01j6Zz3vPJ; Fri, 07 Nov 2025 00:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762474064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RrHm/VdIgbhS+Q8LzuFT88jjdL/1gQbAyVbpfagKDpQ=; b=nIRRjWFRIZHfxK4+91CR1RgaiuUzR9WKDss+rPwhxVVk3lz2Tij+N+c8Aq5BAGQRFv4WHR 4Q4ct84UP9p/l3R7SlW+BCwPWwkLLMr3OJ3CD8IrhqoUIUP4rRYkla6V4dCII6WEJA/lGe ZwtIrFhljIYm5WWZEbkFTY7xdKoabfBgquscZKi/eGhVd1/iC2izT4t2QNNQA2SAe5KRm9 kYVV5UkQgOezwX/GYxCwh6pt+zQ8/twph+XbcugOk1s1ZLZ0frmUzyVztsPJeZ5f1OvgL2 QSywFhp2xF/GBQOUlLomINSjlGpS9vJuXYnWX5urqYtwMamBRz2ag0NxJkDLkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762474064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RrHm/VdIgbhS+Q8LzuFT88jjdL/1gQbAyVbpfagKDpQ=; b=VmuWrrhqns/4KiSJwkR1j5yqfWwgo85eP2/DJmpDnk4wDyn/OydhxNVPKAZhf1k9o6+WDg TfYGA9DkCA81sRP33+SqS0qzGbqCILcwdBYPu64zy2Qvu8d+blX7vCAZGA4yDKkxHKGPkJ lnTVThAG7o99LEr//d2ojfpvG7CrQmjMdC6FgEMsJBT3Sjf5/GukLFJZ3H1jeNQlnSraaA kyy4FkUHf6ENFWdxGnN4BDq/If6dMoytBVC2tKS9vQuD5bd/kcQhS6SNXIhNIDYvTEGdEc N00KcquKRtM6ICccPk441se6yhk7EuPbIDtg0q0s0KZfLJSVlB7m0iFPm4TeAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762474064; a=rsa-sha256; cv=none; b=rSyID3uN7cvV8jKLYZ4f8auzpgI8MrXf1eU46+HFKHi/ZazSP0vJ5QW0s7caxdZ6sKxqhH j6e9+XoM1latma1fAQowk8knDBC/2USdt4IBZ8FtZwINvWAIB52+/Z+M+pvGFVh5u5I3yZ 3tRLvxkMU7A5t7z3ePwRnN6ncMAXiqMfdgiMIVeG51Gcsv/Do7aPZVJ+wS7Ngq2b21O4mV Ab/rwYOanvrXDTraUf8M2qZTO+mrBbnb1Ves85v+POFXe2nFPxRTv4ppXKj7bV8XExDIOM 9g9A93qApRQF2CjF7DFxWK26eHjneYxR9oU6XSp7DLC/TciO9xhWBa14YUUXeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2fX01HK5zcSh; Fri, 07 Nov 2025 00:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A707i5B010228; Fri, 7 Nov 2025 00:07:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A707irH010225; Fri, 7 Nov 2025 00:07:44 GMT (envelope-from git) Date: Fri, 7 Nov 2025 00:07:44 GMT Message-Id: <202511070007.5A707irH010225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: 3a9bcf8dee0c - stable/15 - random: fenestrasX: Add missing entropy sources List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3a9bcf8dee0c062eb7d4713868cda41702415892 Auto-Submitted: auto-generated The branch stable/15 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=3a9bcf8dee0c062eb7d4713868cda41702415892 commit 3a9bcf8dee0c062eb7d4713868cda41702415892 Author: David E. O'Brien AuthorDate: 2025-10-23 06:25:59 +0000 Commit: David E. O'Brien CommitDate: 2025-11-06 23:26:40 +0000 random: fenestrasX: Add missing entropy sources Reviewed by: cem Fixes: 1492c8c0d qcom_rnd: add initial qualcomm prng driver. Fixes: 9eecef052 Add an Armv8 rndr random number provider Fixes: b2f8b2dc8 sys: Add an SMCCC Random Number Generator driver Differential Revision: https://reviews.freebsd.org/D53292 (cherry picked from commit 93b02f69a6f6ffb833227c2fd56d48daac128156) --- sys/dev/random/fenestrasX/fx_pool.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 95c2d223e0de..858069035572 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -206,6 +206,15 @@ static const struct fxrng_ent_char { [RANDOM_PURE_VMGENID] = { .entc_cls = &fxrng_hi_push, }, + [RANDOM_PURE_QUALCOMM] = { + .entc_cls = &fxrng_hi_pull, + }, + [RANDOM_PURE_ARMV8] = { + .entc_cls = &fxrng_hi_pull, + }, + [RANDOM_PURE_ARM_TRNG] = { + .entc_cls = &fxrng_hi_pull, + }, }; /* Useful for single-bit-per-source state. */ From nobody Fri Nov 7 00:07:45 2025 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 4d2fX1534hz6FyD5; Fri, 07 Nov 2025 00:07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2fX132DLz3vKG; Fri, 07 Nov 2025 00:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762474065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SX3BPByaU9KkxMemotyZBtJNMOKU9AMHl7GtJ49Kur8=; b=kuwZp1Oe/GY4Uc8l2d5fXrEknWPOx1MMOdDc9HcysM5QfKzGbbwGFGhemq2nSaWuKvzDIT 8n+Mc3aLdmiJbeZFNSi4NmZpfPL0LCV6+vSXDMuyiNOerWDPce9ax1nOt8vYLyTg9oMUZY Z6iXn4k1D1ghGJaA/aLdu5tZXQnnMUv2weCGQQvdSuLkjwgS87OkCdfMlGMt9J4DnodpMV dpUvJ9cPh7jra9RVe3cOk9g6OV8LXqwFqkE6tv+pqWsouRBkifN765PjN5OtuPSt+D1h45 sEY8Rlp1Rl8AueO9lANlUHAWERssORZAw+kjqua58tzUbr0WUAdnWjdPIvY96g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762474065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SX3BPByaU9KkxMemotyZBtJNMOKU9AMHl7GtJ49Kur8=; b=jDCDRKIUM8rlxoR9sL+JGEgjJYLYLKipLGzb1KL6pqQkAu+vupe5qYF+gWeaDzo39ZxOFw 7ifmYlh81+yNe32jvhfdRLQmUsyOKG/l1mhoIXYNHGLA7woeE3qi5zpEosTk+CjmN95Saw Nr6pxhgzhjT2DV7dFBaphZwpnF7ayY3+ak29cYZXzrW67rlOTWzZ9a4cAulsSrONcdu+Ix bsLUFCEpCOzuLL9SNNpOdtxxoktbHNM/YTA7RYv9kV6m4cbR94qF+8/0EQC85Go0gH8rEo sgrwj4pejt8EHn1BWpeEV4gBwfO5SYhTqFTYdCe6Zc6z35U97iFOcppUpTQKoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762474065; a=rsa-sha256; cv=none; b=dHh3XDsLAA/OZiPFqR40kMj3PI6hgpDklhxy0GAU+rSV1dctl9mA/0nUc5D3jXTOVXb6rU etzeBlu82Tpo1Msp+Ktmsqme0WpdtJGZeLGWWsXBiTJ2A6L6MD0OrRfn23pumosNdTva3e pvoFLg7/AGf8uk8fJKIM+/uf+CBGqyek7dsQIZMQZFJCdOxui+OT7GEUTl5WxI+fW4smOK Sl1RoEhMLv0q25GHZwxoTTqrRuTeTjS845pYjOB+xDMPMjlQDX3z1Pi2nI6VEzm4UO9GTG p9AYBdoXa7rjn+dzaGhgfpJntNZJHdGWOYLKCRzOJOTyX6svV2jEhxmeP2XxnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2fX12TyGzbs6; Fri, 07 Nov 2025 00:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A707jit010264; Fri, 7 Nov 2025 00:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A707jO4010261; Fri, 7 Nov 2025 00:07:45 GMT (envelope-from git) Date: Fri, 7 Nov 2025 00:07:45 GMT Message-Id: <202511070007.5A707jO4010261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: d53618d58283 - stable/15 - random: CTASSERT check sizeof random_source_descr[] List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d53618d582832f101051195e3733dcfcef519982 Auto-Submitted: auto-generated The branch stable/15 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=d53618d582832f101051195e3733dcfcef519982 commit d53618d582832f101051195e3733dcfcef519982 Author: David E. O'Brien AuthorDate: 2025-10-22 07:19:20 +0000 Commit: David E. O'Brien CommitDate: 2025-11-06 23:26:44 +0000 random: CTASSERT check sizeof random_source_descr[] Ensure that the number of elements of random_source_descr[] and fxrng_ent_char[] matches that of enum random_entropy_source. Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D53255 (cherry picked from commit 8bd9a9e9e4cb3e293c1639319692ce201eb8fc53) --- sys/dev/random/fenestrasX/fx_pool.c | 3 ++- sys/dev/random/random_harvestq.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 858069035572..3aefe17a045a 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -127,7 +127,7 @@ static const struct fxrng_ent_cls fxrng_garbage = { */ static const struct fxrng_ent_char { const struct fxrng_ent_cls *entc_cls; -} fxrng_ent_char[ENTROPYSOURCE] = { +} fxrng_ent_char[/*ENTROPYSOURCE*/] = { [RANDOM_CACHED] = { .entc_cls = &fxrng_hi_push, }, @@ -216,6 +216,7 @@ static const struct fxrng_ent_char { .entc_cls = &fxrng_hi_pull, }, }; +CTASSERT(nitems(fxrng_ent_char) == ENTROPYSOURCE); /* Useful for single-bit-per-source state. */ BITSET_DEFINE(fxrng_bits, ENTROPYSOURCE); diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index e38fd38c310b..f2206044fe7d 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -88,7 +88,7 @@ static void random_sources_feed(void); static __read_mostly bool epoch_inited; static __read_mostly epoch_t rs_epoch; -static const char *random_source_descr[ENTROPYSOURCE]; +static const char *random_source_descr[]; /* * How many events to queue up. We create this many items in @@ -109,6 +109,7 @@ volatile int random_kthread_control; * Updates are synchronized by the harvest mutex. */ __read_frequently u_int hc_source_mask; +CTASSERT(ENTROPYSOURCE <= sizeof(hc_source_mask) * NBBY); struct random_sources { CK_LIST_ENTRY(random_sources) rrs_entries; @@ -647,7 +648,7 @@ SYSCTL_PROC(_kern_random_harvest, OID_AUTO, mask_bin, random_print_harvestmask, "A", "Entropy harvesting mask (printable)"); -static const char *random_source_descr[ENTROPYSOURCE] = { +static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_CACHED] = "CACHED", [RANDOM_ATTACH] = "ATTACH", [RANDOM_KEYBOARD] = "KEYBOARD", @@ -679,6 +680,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_PURE_ARM_TRNG] = "PURE_ARM_TRNG", /* "ENTROPYSOURCE" */ }; +CTASSERT(nitems(random_source_descr) == ENTROPYSOURCE); static int random_print_harvestmask_symbolic(SYSCTL_HANDLER_ARGS) From nobody Fri Nov 7 05:13:16 2025 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 4d2nJX35kLz652X8; Fri, 07 Nov 2025 05:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nJX1z5Gz3Q9m; Fri, 07 Nov 2025 05:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBH8SpKSZAr/Yy1pIK5sjWglCll2/LlDZQWcFPJASsM=; b=ktC+YyLp6FkRQAEFd1YYLReayyCEQxDy03hDDGCUzccb0pbZf9CWOewtRo+wvUqrbxb8OA pQr42OgDKrJxp3z99nD0LNVMzkh1PeqRmojpNXKNc2vrDzQ4ZyA71iFcPQ5FEWavkWo2M3 y/mAMQdzvuIYeMsgk93g+cAwWH18lxSUjoAgtNzSWyQgV8Fkm3X+eJ16JQZqgYaq/9/Fq2 UCssI/7oXD9fTV6IgoVNNpaQT+4vVxDChKBbvcWz0Yw6yDsgq3i9JxXUAs4hm6MmHA+M5B 9WwFGp0lVEYvOgr53XxnbMoljrU+g8ngn/UEslgibldQW0BVTMydPqthPYuhCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBH8SpKSZAr/Yy1pIK5sjWglCll2/LlDZQWcFPJASsM=; b=KPaz4gOz0+eq5ot5Lx4+ftwhj7qpjCUORQziilAimrWYeKTPxE14td3M1p/Ag5Nx5S+JRr OqGlkcMzLSOINanShBEIrC32WWpwe2f25PsVR0mSsLx1tKnMB2V9BpGNCjV00rEOsm9Ugw kXDbm+gjDE/RDqbifcNOMY4MaWQnKF998cxKijTQd85nEGhE7w1EaBlKhqoNSd8fZVpz7r XXhvTyQS4WCvdBzlXuCR53J1iOovPXfHyr+ADPPqHWGxsH7M7dB+A0WPX4bQrwYzlyRjgq FhK92VFje8c3tVNAMy+ecEqiJlmu/bDVaIADtCC6QOoDsiK2z67otuF54cX8BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492396; a=rsa-sha256; cv=none; b=i7mbOABbxAPtNPugvXqgzVKFcGb5pQshiKYX79/grGZ2zJUPgURTJnD6+Bx3bE2Gn/cZg0 7FFq2RBOUAkSSBtX8AkcSz6JoxUf5ty5bOtaUT1FbGOEl3YiSmesz+OWUhXeb+UixJS+s6 sI5kAoiE5YD8KKe4lmiLuNfsZ1mL2xXI269UU1uMFAa3qRn5yB0+74kIj2Msurm9TcYRNQ 9C0tv57nxpmgUEHVHogIsH7TrN8QbXNqbb19Dt3+Z/bDrvMLe7WEagI6VbUZxudapkr5I2 YvwaPHd2O0fKzsi9nGJh9y10s2yAqLEiSVeDjer5p1bI4rsWreJFNSgMKcyDkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nJX1T91zmJt; Fri, 07 Nov 2025 05:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75DGwM091004; Fri, 7 Nov 2025 05:13:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75DGis091002; Fri, 7 Nov 2025 05:13:16 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:13:16 GMT Message-Id: <202511070513.5A75DGis091002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 72617603a28f - stable/15 - release: Comply with Azure Marketplace requirements for aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 72617603a28fb19d45b1aac380f998c4551d5f72 Auto-Submitted: auto-generated The branch stable/15 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=72617603a28fb19d45b1aac380f998c4551d5f72 commit 72617603a28fb19d45b1aac380f998c4551d5f72 Author: Li-Wen Hsu AuthorDate: 2025-11-07 05:10:44 +0000 Commit: Li-Wen Hsu CommitDate: 2025-11-07 05:12:38 +0000 release: Comply with Azure Marketplace requirements for aarch64 Azure requires the first 1 MB (2,048 sectors) of the OS disk to remain empty for VM images: https://learn.microsoft.com/partner-center/marketplace-offers/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space Also append the BOOTPARTSOFFSET suffix for aarch64 images, which only has an ESP partition for booting. Co-authored-by: Brad Davis Approved by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53628 (cherry picked from commit 36095c942031f7f1613eec554f1c7615cbd891fd) --- release/tools/vmimage.subr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 8531e9b8f2d6..92f00f9cf7c3 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -449,7 +449,11 @@ vm_create_disk() { # Create an ESP espfilename=$(mktemp /tmp/efiboot.XXXXXX) make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi - BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}" + espsuffix="" + if [ -z "${BOOTPARTS}" ]; then + espsuffix="${BOOTPARTSOFFSET}" + fi + BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}${espsuffix}" # Add this to fstab mkdir -p ${DESTDIR}/boot/efi From nobody Fri Nov 7 05:16:39 2025 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 4d2nNS04MXz652wk; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNR6Nj1z3R0T; Fri, 07 Nov 2025 05:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+9xSmEU6zW6tkSjgNGlNpqMefzQk346BSR4MWdQIp8=; b=UnTRK4CO1n5CZTJw6r6+hAeDLi0/+p6PNiRMWlRRGgzo2OIq4ZVkmwKJho5L9cw+V6y9fP 2j/uZwHPvhfIbjZ/gUcBXIqFZtRB0X/MF+GldJ7BCnS/TAm9Vh13VLavJFWUQ9GNlAB/MY KMitACjU5e3Nlkkn+zCVz3loVrcITQT7dawULMDHH2dJ9ZqnVb8//z1EA5T4uSyuw3l1Cm WriBjYTu2rhy+WyzKPYuYvux5fiDhamyAVCJp9vIS2tq2G0HQYYBdwKSqUStAiBTxNverx kIU48FQFPZDxOjZOIM6mcVdzhnhXC2dUP66zcJsfXWFiaiqyehOHXJmVo7+EDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+9xSmEU6zW6tkSjgNGlNpqMefzQk346BSR4MWdQIp8=; b=kuj5XRmeca1Lnv6pVFUgP+iS5iCSaR4jm2iqAtKNuMMTTcG+W5PQq/gVoVIbScAwozmxKi ihmpx5l9UlNiL2y79XYrhkU+0LzFLAHtRiWF0zOkRkjJw6/4NWbNNf2S/Rvqjl+oZVqx9w 6+PDkMY6KnCOZnIKPkdP66zhRGIsaXMphifTXNJj3YWjlEsF27nSB4iXKqW4bKRu1/BNG+ rezfMwZEb5OrFQB2hlxEt8uoTy3/h36DMKjHK9cFVbJ88iGbVaht91TkZhEjRDtJLjy9aI Qpv2pHIQevcG0Heq9IDnfUDccRFZgWZLPPWM/yLD2qATwzPyHR7FoCEjOxqTfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492599; a=rsa-sha256; cv=none; b=IHqeWIyhbQGHgZUnY4ZU3mseVRZ7KEu666vAITL4OtM2Lmz80fbV/aKeE3uczPbdjVTmtQ gECg55Or/YMXa08oMJBbibZp46nMq8U10jDrujWcjRySKIyKxZDS1IOuT2XQohRPpDW+n9 N/0TLyJAkWKl5f6rDBgZOFaCqR50bMtdOoA5PqY6HszzXLoIwHoXJ9AvDxX52E4coxGzaj BqbppnSu4L43kGH68WFs1DUKxMy9jYUNAR+AUEGoXuONmigzleBa9xnq0dmi4Jf62KSg/W X85EwnCLhy13TazpHztAtZs10/poWF4te1rlnjmGGTeZHSF983e3uddwcOOIKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNR5yPxzlyH; Fri, 07 Nov 2025 05:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75GdHt092127; Fri, 7 Nov 2025 05:16:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75GdDH092124; Fri, 7 Nov 2025 05:16:39 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:39 GMT Message-Id: <202511070516.5A75GdDH092124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3d598826e191 - releng/15.0 - Add FENESTRASX to LINT to avoid breakage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 3d598826e191e776183babae7352c831b127e566 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3d598826e191e776183babae7352c831b127e566 commit 3d598826e191e776183babae7352c831b127e566 Author: David E. O'Brien AuthorDate: 2025-10-17 01:01:34 +0000 Commit: Colin Percival CommitDate: 2025-11-07 03:36:33 +0000 Add FENESTRASX to LINT to avoid breakage Approved by: re (cperciva) (cherry picked from commit c1e7e8f5cb0f948abc4679dab295f1447363604d) (cherry picked from commit a3fcb7bfeae30a10a93b7b9984ccc672a4f232ca) --- sys/conf/NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index ea9b2667607e..cdfdd09fc1a0 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2800,7 +2800,7 @@ options MAXFILES=999 # Random number generator # Alternative algorithm. -#options RANDOM_FENESTRASX +options RANDOM_FENESTRASX # Allow the CSPRNG algorithm to be loaded as a module. #options RANDOM_LOADABLE # Select this to allow high-rate but potentially expensive From nobody Fri Nov 7 05:16:40 2025 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 4d2nNT4Yy2z6534F; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNT0M0kz3R0b; Fri, 07 Nov 2025 05:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zUCwy29y6rPeFIP1dLEnaKD1VB4s5LAntxLmWQN6MhM=; b=J5O9AifO45rM8YyZZBb9T8VrPpCBdEtFa4wEzSuUm174gjGRIUEa9pYXv4I/avZf1bG2X3 wn0iWhAZgZPMN4LPo5w0qOLjhLrJbVBHOStzUd/BION8Z0hAyG/FNvhTp5ZM2tUlNns9T4 +I+N5KXQRHaP01Oph4pVm/OVNGoc1kSRwsVDzmj9HI1gD3zGjpIS9jVui9eoKuTXHgXqrC ecvp5cIdYVvA3mwfKXQbLH7gQ0H6DAkEQ/cYnH7ze6+KwgG7LaThrqYDFtvVbCcjybXjiR mcUqJkEVvO7swiuOKCJheE7lry+KD8MdTckMenexqZy7goMxv51+PyOuQ3jq0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zUCwy29y6rPeFIP1dLEnaKD1VB4s5LAntxLmWQN6MhM=; b=rGuC2fwPmy5uxtsRX8ieGebDruj9P4bpcvCaJ8srhTr9Tfknh74OxCRJBc4WI1EPIEM5A6 mr5Pt47Iq8m/9bLgNzbUxST1+iDTL6Tk2mMiapiR38YRm4WTZuscvKzpTDzvBgGne51Yzn Fn40nanxwEwfr/N7IqsEMRehkMYiit3bbg39+bFTMMwaAgaZKGMU3hFnmsOTnYUMMtskcM gP1Q2Pr+cmQoUo+phIGjGqOwWmMIs0/k1H0MR7P9u+JYqxgrT3hh+EqJd0ZjBrjXrCOX7N IkPzxuP7QsZhRuOyjokDy7OvIEuN3ymy4CiU3c/QuKMA3OZtUvDFJM42MMdrqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492601; a=rsa-sha256; cv=none; b=Me2qO8CIh1UP3tVPk70GJdQEtOMzSD5gSAi1SscrW5lC5rkDr/m3XEQHWbfIium/qfl7wW wBCpdbbDxK7tBpzDu9Ky19IWbk6OZai7V3bujIpcwjFDknP1GPY2MHvsnY1Bml+b9LsMLl njjcoYnm8LHvzotsTJV2V+P/OCBxcciJFsU4IL0Uk6A6lQnP3QreSOLKCI1+Fy6nsVrL6Q k+AE2p5y1q8c7deNNL99rONUIWDYAm9bcz5ocUHsuBFadYTqEfEUAGYDtTGNTitkww1mWX 9cUMM0WRiWGwVIuqUrKQ+JjHBGsIw/2693QoYk7K5QPrRXVWhORXxQhEs4FoAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNS6x5bzmTv; Fri, 07 Nov 2025 05:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75GexK092161; Fri, 7 Nov 2025 05:16:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75GeHD092158; Fri, 7 Nov 2025 05:16:40 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:40 GMT Message-Id: <202511070516.5A75GeHD092158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 08515bdecc19 - releng/15.0 - random: fenestrasX: Add missing entropy sources List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 08515bdecc195437d33a73a51bb81add03cbcf96 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=08515bdecc195437d33a73a51bb81add03cbcf96 commit 08515bdecc195437d33a73a51bb81add03cbcf96 Author: David E. O'Brien AuthorDate: 2025-10-23 06:25:59 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:11 +0000 random: fenestrasX: Add missing entropy sources Approved by: re (cperciva) Reviewed by: cem Fixes: 1492c8c0d qcom_rnd: add initial qualcomm prng driver. Fixes: 9eecef052 Add an Armv8 rndr random number provider Fixes: b2f8b2dc8 sys: Add an SMCCC Random Number Generator driver Differential Revision: https://reviews.freebsd.org/D53292 (cherry picked from commit 93b02f69a6f6ffb833227c2fd56d48daac128156) (cherry picked from commit 3a9bcf8dee0c062eb7d4713868cda41702415892) --- sys/dev/random/fenestrasX/fx_pool.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 95c2d223e0de..858069035572 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -206,6 +206,15 @@ static const struct fxrng_ent_char { [RANDOM_PURE_VMGENID] = { .entc_cls = &fxrng_hi_push, }, + [RANDOM_PURE_QUALCOMM] = { + .entc_cls = &fxrng_hi_pull, + }, + [RANDOM_PURE_ARMV8] = { + .entc_cls = &fxrng_hi_pull, + }, + [RANDOM_PURE_ARM_TRNG] = { + .entc_cls = &fxrng_hi_pull, + }, }; /* Useful for single-bit-per-source state. */ From nobody Fri Nov 7 05:16:41 2025 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 4d2nNV2tq3z652yn; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNV0stTz3R2q; Fri, 07 Nov 2025 05:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3e/ZCtT5Afd5R/dDn8MmUPaQLBf33vLMU+vmorTtkhk=; b=a9XoVGPS6F1re7f6ArG+RFYUiNcpVjALC9nHRff+C7tOERiFKl14ddZeOEro8ZeZBCjisg zA8Mith//z5dqmQS6SJ6B4KOE8nOFd/ah/ojSuYOVtrRDpO/ORnSXr9m8h+WFKKMc5heE1 XXRyjQCRD+u/0LxcXI1S12ZbJsRsLehEcmcInG6rnwXCbMlYa8olifko7cBJUAdIEx38m3 HTAwuI8Vyb4bHUkZkC7HbB1l7vtklKir0cawe4BiFRt2vK68J+0vRfCzVFcBj19Dpas483 sfycvJzqeno1tZvamgSOy71Ho+n8AkH6VcoFbmPUDOmpkcO4KbGub4Ya2M080w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3e/ZCtT5Afd5R/dDn8MmUPaQLBf33vLMU+vmorTtkhk=; b=j7Ar6QO23VsUB7gZVZPdak0wSn+v4SB7Ddo3IcQu4onnJHYK78o03yB6FSClmAB/AiPdut yGrUrRgsK24H8+ATwP2W0bMhp/4tvsotW3N16leRMfhenjhqVTexSOLRAW9ALggNvgDcCl NP6CXTzyjsXffVyhxVLCoy/ki+QRqFNQNDgiUTfcyWCM1ZnREFmIhRWTU94615/dT7owzR paKsbW/b0KA/zj19QLh+RqlwwhBKLEA+Xufa6pz0NC1EnbQshjdE8Kc1otGQspTKOEzBX2 MntLPR0muCVypJ2ZI5xIKW0j92BEo0cwRPJwI74rsrKx4yoA6UvAtj/rj36ElQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492602; a=rsa-sha256; cv=none; b=heTgs/qUd+hfpwKIcsY4tBZLdxGle5IcLE+V0IbDcS90ANvs5FniIBe0azQy/IOsrRr7/L FraNdSN38vd+8Aj9pNG0sXH4aAbyJp/tRIxCyOdXANl2ywtWDrVoGZVVP6Hc2lcat5i42X HjNZ+QLUEsG6eNdM3mZBcKgJCaWxQdRD0T4UAYVrRRrQNch7915LFxWIr0Hv9B4Yzpsr+1 G2g6drgih7LrwVx/DaVP25MC6xfa/ltYE3LzRAPfLsa0u76RjiecryhQh9evrQOl8bxw3P pVPJ0qIw9yNKvjIEXU2RqXrN7ST6MJC5c2M8L2l9n3P3AB1hv4aoMqELod6zHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNV0PBTzlyJ; Fri, 07 Nov 2025 05:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75Gf3U092201; Fri, 7 Nov 2025 05:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75Gfv9092198; Fri, 7 Nov 2025 05:16:41 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:41 GMT Message-Id: <202511070516.5A75Gfv9092198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7d106aaa9364 - releng/15.0 - random: CTASSERT check sizeof random_source_descr[] List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7d106aaa9364aa96e3a165b772cef747e50f3990 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7d106aaa9364aa96e3a165b772cef747e50f3990 commit 7d106aaa9364aa96e3a165b772cef747e50f3990 Author: David E. O'Brien AuthorDate: 2025-10-22 07:19:20 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:13 +0000 random: CTASSERT check sizeof random_source_descr[] Ensure that the number of elements of random_source_descr[] and fxrng_ent_char[] matches that of enum random_entropy_source. Approved by: re (cperciva) Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D53255 (cherry picked from commit 8bd9a9e9e4cb3e293c1639319692ce201eb8fc53) (cherry picked from commit d53618d582832f101051195e3733dcfcef519982) --- sys/dev/random/fenestrasX/fx_pool.c | 3 ++- sys/dev/random/random_harvestq.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 858069035572..3aefe17a045a 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -127,7 +127,7 @@ static const struct fxrng_ent_cls fxrng_garbage = { */ static const struct fxrng_ent_char { const struct fxrng_ent_cls *entc_cls; -} fxrng_ent_char[ENTROPYSOURCE] = { +} fxrng_ent_char[/*ENTROPYSOURCE*/] = { [RANDOM_CACHED] = { .entc_cls = &fxrng_hi_push, }, @@ -216,6 +216,7 @@ static const struct fxrng_ent_char { .entc_cls = &fxrng_hi_pull, }, }; +CTASSERT(nitems(fxrng_ent_char) == ENTROPYSOURCE); /* Useful for single-bit-per-source state. */ BITSET_DEFINE(fxrng_bits, ENTROPYSOURCE); diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index e38fd38c310b..f2206044fe7d 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -88,7 +88,7 @@ static void random_sources_feed(void); static __read_mostly bool epoch_inited; static __read_mostly epoch_t rs_epoch; -static const char *random_source_descr[ENTROPYSOURCE]; +static const char *random_source_descr[]; /* * How many events to queue up. We create this many items in @@ -109,6 +109,7 @@ volatile int random_kthread_control; * Updates are synchronized by the harvest mutex. */ __read_frequently u_int hc_source_mask; +CTASSERT(ENTROPYSOURCE <= sizeof(hc_source_mask) * NBBY); struct random_sources { CK_LIST_ENTRY(random_sources) rrs_entries; @@ -647,7 +648,7 @@ SYSCTL_PROC(_kern_random_harvest, OID_AUTO, mask_bin, random_print_harvestmask, "A", "Entropy harvesting mask (printable)"); -static const char *random_source_descr[ENTROPYSOURCE] = { +static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_CACHED] = "CACHED", [RANDOM_ATTACH] = "ATTACH", [RANDOM_KEYBOARD] = "KEYBOARD", @@ -679,6 +680,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_PURE_ARM_TRNG] = "PURE_ARM_TRNG", /* "ENTROPYSOURCE" */ }; +CTASSERT(nitems(random_source_descr) == ENTROPYSOURCE); static int random_print_harvestmask_symbolic(SYSCTL_HANDLER_ARGS) From nobody Fri Nov 7 05:16:43 2025 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 4d2nNW474Hz652tp; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNW1jcLz3R2s; Fri, 07 Nov 2025 05:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ykzfw67/SrVspV8NIWH+yJdJSQqnHfqW5t4okN+M0Xk=; b=dZJxqPDhrgVyrIOqbBEwnR7/SMXWarpDhhPmINX9unLzYdTffB8BYiNLI6hL53vRdZoi3k vtS6E3wxEIBgGH7bdqiXVNNb4NzlvtFvPl8ka7FFa0qwtpoD0s/N8epjH2M4uDhxfnfGHH +YTy7QwRvvpMiMzI5kO0oLFfwE5mbpdcOKz+dnqi1yophsXv62LUaOICENr1B41EcTSdJM rzV3uWQ9YBO/uHxkBozgG9exWtIMPZO3dAcMcszSKiIQMycgivoGfEqORR7vlcT4yp0mq5 CQ/BbhocLtoeTXoOtSYPJ8vK3Bw7wzcnY3KUjmjTmlD2FKt9f6naOdH2Wg+SaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ykzfw67/SrVspV8NIWH+yJdJSQqnHfqW5t4okN+M0Xk=; b=f6xIe3oEB9rTxiKnofFmb16tf6Ft08KjdAI4dcD4LVnqDyiHQtunIKXV3T2rjx1omwwQ2y JuHMPgvCtcWT5/QpS320yDI0yoW2p/J0NGHvUlheSa/XVOsWDMzF43pJwkVTDQs8yefFWv pIeIQ07uTNd4Lc89Nq83OBfATogoDINj/DmpXor4ifinumAZxAGRAszLXHI+o0UejLreik SMrpFGdhxCvBb6vqpcUkFoMUbj2h/DFKCh/JUkz3OnSW0nQf49WbGYKI5cz+cYrWc2+vCy Y6dS6WEf7vlT6SFCyHtRZn+RSeh9+qwsLl57sqVFXhNZdS6A7QbzLe7OEKbtSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492603; a=rsa-sha256; cv=none; b=U64kBGQIbbf/ROzfndtTFAVqgkeEuA97NnPQZx9L2p7aOQU6ZsV2K/Uz/jdXj69tznoguo Ey3QTLcw+BZTkU+634IbLZaoKgdqgAdtq5gwpJ9PEMTFXAEqAW1svzzd5sbhwxK35nXmNw myrBaQmzX85SPAi/dnYVYA+cGjh12Ea2kDbmqgpt2sO4VZ5kXY8UrezQJiTvHgHmgCMPzw zKZy3C0Cci2qJ4+gxVZJVwcajfeOHM0FwwG5t9octe7FpZV1PqIX/YO25VyPTfdAE7+rS6 IiT9lVftedarjWV3YHjvMD8swp3/Y5nqUaq1xRBAoFOKfR1KBZE/gXBRoF80jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNW1JRDzlyK; Fri, 07 Nov 2025 05:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75GhRQ092235; Fri, 7 Nov 2025 05:16:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75GheI092232; Fri, 7 Nov 2025 05:16:43 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:43 GMT Message-Id: <202511070516.5A75GheI092232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6efc9b0e6a67 - releng/15.0 - ifconfig.8: Mention max name length List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 6efc9b0e6a6745425098e68e0f0cf375f3d1cb8e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6efc9b0e6a6745425098e68e0f0cf375f3d1cb8e commit 6efc9b0e6a6745425098e68e0f0cf375f3d1cb8e Author: William Carrel AuthorDate: 2025-10-30 18:39:29 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:16 +0000 ifconfig.8: Mention max name length Approved by: re (cperciva) PR: 289113 MFC after: 3 days (cherry picked from commit 832cd05905980d0f6547bf02745b054c1f4af1eb) (cherry picked from commit e2a87c08171acd5c3a037c1dd74a5504ff9cc881) --- sbin/ifconfig/ifconfig.8 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index bf9a032d8c58..481181d3d5d2 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -630,6 +630,9 @@ This is useful for devices which have multiple physical layer interfaces .It Cm name Ar name Set the interface name to .Ar name . +The +.Ar name +may not be longer than 15 characters. .It Cm rxcsum , txcsum , rxcsum6 , txcsum6 If the driver supports user-configurable checksum offloading, enable receive (or transmit) checksum offloading on the interface. From nobody Fri Nov 7 05:16:44 2025 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 4d2nNX3rTkz652wr; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNX2PRWz3Qws; Fri, 07 Nov 2025 05:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v/qOadUT3mNG/mgZaOMAcP0lU7Sof4qjO8XK3utpG4U=; b=nILt4T/umIU8VPtjVgpkTGanhdtmwRKI9Uk0zxIUwewi/AhKkE199TjxkWNopTIVUA7OlM 63mOSQ866KZVXmpLqziR3iNrQ2SSWpJDQu0PGPPJKHjZzlsOdn8otP1sD6WfBRqZNFDK7E uSteujgSI41u+2QtlVBPK/BeY5X8pmTu5g0jROtFl520KlZt9VKcttzhvikPTVuLdupPhw joKoLoxQ5ZbSMszK8aOcD6O5XVZtaLlBTE40yXZW9s4ZUDT1VXPkVnNq1P3C312uuA3/3n rgtidUgNCs8ElwYe/XIP1jIud2naSEvbck8ajmwHjYExNSfKy6GB0BWpxBC3gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v/qOadUT3mNG/mgZaOMAcP0lU7Sof4qjO8XK3utpG4U=; b=ERvFqXX5r+zXFbOU8ac1Zh68Fn3YYliSf/gjRr4A1mojbEGlB4S0vZVMlAJyVRAuvk5sAW 8Vkov5eyKTFX7dg9bPqgSwpJsuXhWtaOBcnYDSMrb37IewORNWAVRVFPIQxsVdBbxohdrb rBLxyRXg/Zaq9/uAWy7OuZDhyXEKGFTv0Bt6/l0ot0p8/bBK5fWhEVZGEVWXh3kG7rcCaf YLmcMx0h11LkbJrKsy65EWWiYM3lpNICnpgXLrtBFFt9PN1gYHS7fsdUEjzQroiHVIUZjA fVo+Csj+LKTOlHI49Wh4ecO2qNy6oEmiZdJWtYmMzHWpzFCSFSL6RSTf5g777A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492604; a=rsa-sha256; cv=none; b=nvgexa1qE5mXzg/nY1UCZSTPM3cfa+82BIUm5XgvtJXekw/DuBsFrrE1/b5VDd1CLmy9ZA lIoKJxVJnG1iLwq2eB/x1vJA8lExoMeG7eskgR3G2ENs3i0S2JGo0E9wKXm6GbRGAJ00aF TZcUoPZptTGqiAhNPxmY/pV55fX/n8tIQR4BdB1suJyLOrlsskDyu84yu/PeUgN+Fou7F1 JmXSZoQTPCgK01H77qM4bGWMxQMVFI5TbkNlrjG5J+I9G4Dl1u9n/lKtAdLTrGpujDfFWZ 5F+KMfFw236yzCGu7L2CAl++upQ5dVLwHk2ilW8lMVOdAgdHgBYB0pGAufy7TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNX1ytszmS0; Fri, 07 Nov 2025 05:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75Giq0092268; Fri, 7 Nov 2025 05:16:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75Gimi092265; Fri, 7 Nov 2025 05:16:44 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:44 GMT Message-Id: <202511070516.5A75Gimi092265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 5f6d85cb1b53 - releng/15.0 - gshsec.8: Fix list alignment, 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 5f6d85cb1b53c99f0995a81a18fa9f9dc0e887bd Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5f6d85cb1b53c99f0995a81a18fa9f9dc0e887bd commit 5f6d85cb1b53c99f0995a81a18fa9f9dc0e887bd Author: Alexander Ziaee AuthorDate: 2025-10-30 15:49:31 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:18 +0000 gshsec.8: Fix list alignment, tag spdx Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 05d48584607221922539bb6917c9c118236d78d5) (cherry picked from commit 6d6132d8ca280649b6471f7c1045752828e3ebe5) --- lib/geom/shsec/gshsec.8 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/geom/shsec/gshsec.8 b/lib/geom/shsec/gshsec.8 index d4477de3a71e..f80ab9384fe3 100644 --- a/lib/geom/shsec/gshsec.8 +++ b/lib/geom/shsec/gshsec.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2005 Pawel Jakub Dawidek .\" All rights reserved. .\" @@ -64,7 +67,7 @@ the rest of them. The first argument to .Nm indicates an action to be performed: -.Bl -tag -width ".Cm destroy" +.Bl -tag -width indent .It Cm label Set up a shared secret device from the given components with the specified .Ar name . @@ -92,7 +95,7 @@ See .El .Pp Additional options: -.Bl -tag -width ".Fl f" +.Bl -tag -width indent .It Fl f Force the removal of the specified shared secret device. .It Fl h From nobody Fri Nov 7 05:16:45 2025 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 4d2nNY5GhGz6534J; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNY3chjz3R5G; Fri, 07 Nov 2025 05:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdf+JBck1hejEk9hvWVkisKpmrbd6byEaf+Lo/0z/oU=; b=MbiPoHc3JdvNSJV6K2ytwqM4XG4DY9vkijinZKFSnC4ChX/PPWoRYfAq4XFOE/+qY0jc5x Uw4vzBFqsaEnLP+KLVyUVR+q7PX2izk40klfQEGSjwjRor+NTBeb/TeaKhqvvExVRT3/7H WVibMDEJqLWRctDox91wcIKApv0m9YMDh9EWbzbydAjALIzFIzG4ZVRwf46PP4/p/xD1ue dRbeJgUlUu7Wo0/He1+GgxteKN+QdlqCLxbu1d1vIrrgozZG/lRx5djq9cr8z0udadbC1U XDBVgiMhhHgc4ic2bGumUbCWKW3R8DfYxyLlyxlUniLmoMg0vS7k84fHBOO6kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdf+JBck1hejEk9hvWVkisKpmrbd6byEaf+Lo/0z/oU=; b=uGwpA/iFU2qbdfzq1E81W0FnfbDEk6fW1v2j/4Lg14eNk8QWJxBVNeCro+AvHhF6PsuBZw 8eFk5eXHIwWmEsth1xrAu24mtyht+nIE7F1c4nsDXS/Iw+VlFNkL/hHDH6wad9DxPQb0rV Q9fbr7DwtYervAaJ65oQ6lO8vCfOQ+8TRuoU1gsY+5oJeN6Fp5ml+mkkXALsoIZGwzfOiy nH4HXQG+6EDLH6LAiZL+mkoFdHFtbI3hoA48QIq7AZSl8f1MsgccndeAlpLslZpngvNl4X XrFEznV4c0/J4jJrGcQDlge6uRP8Fngah2D1bJbjGlgutq7rJ33FlL4EGPPvSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492605; a=rsa-sha256; cv=none; b=biwah7D5V1oLv8bYVODlBL1OHMcYnVhILZ4CXQAl11gvDOsnl1qESEt/i47b6iMF5uae/c y7Tj4xmX1gC14YvZPrtcxQoHU0RRr0aRoysPmbY/Q7/E2KE3MH3TXvnzGzDFLUU0iAirV7 kEgL0EMEXtR03SEXLqoUnxiWHVS+veR2Y1aNui10g0auysGvuKEax7Gi+oxUauEnZ17wsG 7PmRzsP1ZXDS81P1j9eaeLAFQ3XpgI0Q9iEjbmd92FhU8+d0PVhpG1GUbwaLMphrqAtuIE uhDM+N3Pupk7nQO+GCv83RH+QG0NTUppeESPQ+EAWJV0rdClVdTgabXo+CE+8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNY2x4TzlRf; Fri, 07 Nov 2025 05:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75GjRQ092305; Fri, 7 Nov 2025 05:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75Gj2P092302; Fri, 7 Nov 2025 05:16:45 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:45 GMT Message-Id: <202511070516.5A75Gj2P092302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 02eabc44edf3 - releng/15.0 - bhyve.8: Correct description for -c flag, 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 02eabc44edf3f02491bddff7809aec7bf93ed5e8 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=02eabc44edf3f02491bddff7809aec7bf93ed5e8 commit 02eabc44edf3f02491bddff7809aec7bf93ed5e8 Author: Alexander Ziaee AuthorDate: 2025-10-30 15:06:30 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:21 +0000 bhyve.8: Correct description for -c flag, tag spdx The examples only show the usage of `-c `, as did the flag description, however the -c flag supports more complex cpu topology specifiers. These were documented correctly in SYNOPSIS, add them to the body of the DESCRIPTION as well. Someone could go further and do and example with using them. Approved by: re (cperciva) MFC after: 3 days (there was a merge conflict with the date) Event: OpenZFS Developer Summit '25 Reported by: Levi Worley (cherry picked from commit 205af037e302fbd50dabc485a89e2222cd063b9e) (cherry picked from commit 772837c632ec9f3cb3ded33830a60a8b310c2e22) --- usr.sbin/bhyve/bhyve.8 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index c902c265da9e..13f0d239ef40 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2013 Peter Grehan .\" All rights reserved. .\" @@ -22,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 21, 2024 +.Dd October 28, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -125,7 +128,7 @@ xAPIC mode is the default setting so this option is redundant. It will be deprecated in a future version. .It Fl C Include guest memory in core files. -.It Fl c Op Ar setting ... +.It Fl c Oo Oo Cm cpus= Oc Ns Ar numcpus Oc Ns Oo Cm ,sockets= Ns Ar n Oc Ns Oo Cm ,cores= Ns Ar n Oc Ns Oo Cm ,threads= Ns Ar n Oc Number of guest virtual CPUs and/or the CPU topology. The default value for each of From nobody Fri Nov 7 05:16:46 2025 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 4d2nNb0Hwhz652wx; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNZ41rWz3RBC; Fri, 07 Nov 2025 05:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PuN+xaKtENaoTCbDb8ynN/iL9QA3ZTxPH3xITiCMw0g=; b=AxRkA3KwjgYsATMLyBdJMDTTNj+cjDGVOnKybqlIEGwO0C86ua5SQfQdFj5QQhF9yFlzCZ cdkk1hEkUI4FZDl1i5g/LE+ZnJ9HG5cnZnbrrHdz7UcamNBXJw0UZBCud40gD3eDfe39BQ ze9taAlUMdGhtBK63DoCxlKIsJmsfXYvC5JIdkE7AvwannYMFPfda5CiH1S8V3hhPJOIEq SwxL52VU4MrwA02UPhCnjekJ95rIpuCMzguh8mUcTh4qTSWsOHG8CNSR7s6XQDc8TXPGdr H3d0PGkjwkyOxAFnglHK1soHi+H56MJpad62kU3fE9jp++Z2ILzQOzKuDJczDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PuN+xaKtENaoTCbDb8ynN/iL9QA3ZTxPH3xITiCMw0g=; b=a/PlfhLXLxEAOGBES/CYsMf0mFL8DeDfi9h/wsmspT4yABvDW+c+DvNQiJuosvzx+c0su1 xnV/o721E0KvD2gUn9l4KF6gLoE8gNylVK5imc4aImsSGMiMvhe1lw5YmhtgS69Ms/6kHL mKsQrUZSh4cHVoPLUjKimmnkcAcBvhJKhMXLvpDw9OblapWkDrgya2qPObxfZymrCR9Zyx 7PslRlxL+rJI8wXuZQL5sC+Ik95KbV8PerE9+EQxjVYY8O8pHLGTH1DJkn8+oVdigX2bDr eKR9K+02zKaEuHWIEB26SUk4dhr6ypEgBgiT9+54OI1uvgvG3+EHE52Z8uRZdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492606; a=rsa-sha256; cv=none; b=HLZwjy+h6WepLfuSIpvPCLfHfI66NdlmGtfAU3jOPzNkZmqU18+9XLgZVHuyhDQ0i2G2rJ BL3QoZKPt/2zqLUgUdqH++UiVLs/duBmsm1lFb75S5pb6fe2OYIzarX3Td+d30PcRry7+9 OIW31zJf/2Yi4NndBxtZLzp0pDJ1Zp8YOz15wXfYoJZPcGeac5BClxXzURbiHRTG3oZqhD nEigVPEgnwjg0y9bW8NnF6MUkX3rQ5vX44TqDmnYJnNpWOA9SC1iZ48y34iiQTdGgvrEoQ kk6i/L9j8BsMv+Zjz/6OaSk9ZywNYEIBXYLCGUfzXUDmucHWK7n1u/bBQO5xxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNZ3XDRzlyL; Fri, 07 Nov 2025 05:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75Gk8o092338; Fri, 7 Nov 2025 05:16:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75Gk6Y092335; Fri, 7 Nov 2025 05:16:46 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:46 GMT Message-Id: <202511070516.5A75Gk6Y092335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d1ee21dc55d7 - releng/15.0 - ice.4: Avoid first person language List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d1ee21dc55d7d8a18f5da00cff6df7a4ee81a552 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ee21dc55d7d8a18f5da00cff6df7a4ee81a552 commit d1ee21dc55d7d8a18f5da00cff6df7a4ee81a552 Author: Brad Davis AuthorDate: 2025-10-03 22:01:45 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:24 +0000 ice.4: Avoid first person language Approved by: re (cperciva) Approved by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52896 (cherry picked from commit 85531add28443e4202632fedcb3ae6038d4acb0c) (cherry picked from commit 0ee1546565d774639a19623d87ff3bcebac13724) --- share/man/man4/ice.4 | 92 +++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/share/man/man4/ice.4 b/share/man/man4/ice.4 index 172b5a197b64..c7675e627726 100644 --- a/share/man/man4/ice.4 +++ b/share/man/man4/ice.4 @@ -32,7 +32,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd March 28, 2025 +.Dd October 3, 2025 .Dt ICE 4 .Os .Sh NAME @@ -96,7 +96,7 @@ Intel\(rg Ethernet Connection E830\-XXV .El .Pp For questions related to hardware requirements, refer to the documentation -supplied with your adapter. +supplied with the adapter. .Pp Support for Jumbo Frames is provided via the interface MTU setting. Selecting an MTU larger than 1500 bytes with the @@ -144,17 +144,16 @@ See the .Dq Intel\(rg Ethernet Adapters and Devices User Guide for more details on DDP and Safe Mode. .Pp -If you encounter issues with the DDP package file, you may need to download -an updated driver or +If issues are encountered with the DDP package file, an updated driver or .Sy ice_ddp -module. +module may need to be downloaded. See the log messages for more information. .Pp -You cannot update the DDP package if any PF drivers are already loaded. +The DDP package cannot be updated if any PF drivers are already loaded. To overwrite a package, unload all PFs and then reload the driver with the new package. .Pp -You can only use one DDP package per driver, even if you have more than one +Only one DDP package can be used per driver, even if more than one device installed that uses the driver. .Pp Only the first loaded PF per device can download a package for that device. @@ -174,9 +173,9 @@ each jumbo packet. This should help to avoid buffer starvation issues when allocating receive packets. .Pp -Packet loss may have a greater impact on throughput when you use jumbo -frames. -If you observe a drop in performance after enabling jumbo frames, enabling +Packet loss may have a greater impact on throughput when jumbo frames are in +use. +If a drop in performance is observed after enabling jumbo frames, enabling flow control may mitigate the issue. .Ss Remote Direct Memory Access Remote Direct Memory Access, or RDMA, allows a network device to transfer data @@ -194,14 +193,14 @@ operating in multiport mode with more than 4 ports. For detailed installation and configuration information for RDMA, see .Xr irdma 4 . .Ss RDMA Monitoring -For debugging/testing purposes, you can use sysctl to set up a mirroring +For debugging/testing purposes, a sysctl can be used to set up a mirroring interface on a port. The interface can receive mirrored RDMA traffic for packet analysis tools like .Xr tcpdump 1 . This mirroring may impact performance. .Pp -To use RDMA monitoring, you may need to reserve more MSI\-X interrupts. +To use RDMA monitoring, more MSI\-X interrupts may need to be reserved. Before the .Nm driver loads, configure the following tunable provided by @@ -210,7 +209,7 @@ driver loads, configure the following tunable provided by dev.ice..iflib.use_extra_msix_vectors=4 .Ed .Pp -You may need to adjust the number of extra MSI\-X interrupt vectors. +The number of extra MSI\-X interrupt vectors may need to be adjusted. .Pp To create/delete the interface: .Bd -literal -offset indent @@ -286,7 +285,7 @@ To enable/disable priority flow control in software\-based DCBX mode: sysctl dev.ice..pfc=1 (or 0 to disable) .Ed .Pp -Enhanced Transmission Selection (ETS) allows you to assign bandwidth to certain +Enhanced Transmission Selection (ETS) allows bandwidth to be assigned to certain TCs, to help ensure traffic reliability. To view the assigned ETS configuration, use the following: .Bd -literal -offset indent @@ -320,7 +319,7 @@ Use the following sysctl to enable or disable L3 QoS: sysctl dev.ice..pfc_mode=1 (or 0 to disable) .Ed .Pp -If you disable L3 QoS mode, it returns to L2 QoS mode. +If the L3 QoS mode is disabled, it returns to L2 QoS mode. .Pp To map a DSCP value to a traffic class, separate the values by commas. For example, to map DSCPs 0\-3 and DSCP 8 to DCB TCs 0\-3 and 4, respectively: @@ -339,7 +338,7 @@ sysctl dev.ice..dscp2tc_map .Pp L3 QoS mode is not available when FW\-LLDP is enabled. .Pp -You also cannot enable FW\-LLDP if L3 QoS mode is active. +FW\-LLDP cannot be enabled if L3 QoS mode is active. .Pp Disable FW\-LLDP before switching to L3 QoS mode. .Pp @@ -365,11 +364,11 @@ To check the current LLDP setting: sysctl dev.ice..fw_lldp_agent .Ed .Pp -You must enable the UEFI HII LLDP Agent attribute for this setting +The UEFI HII LLDP Agent attribute must be enabled for this setting to take effect. If the .Dq LLDP AGENT -attribute is set to disabled, you cannot enable the FW\-LLDP Agent from the +attribute is set to disabled, the FW\-LLDP Agent cannot be enabled from the driver. .Ss Link\-Level Flow Control (LFC) Ethernet Flow Control (IEEE 802.3x) can be configured with sysctl to enable @@ -426,11 +425,11 @@ provide a stable link without FEC. .Pp For devices to benefit from this feature, link partners must have FEC enabled. .Pp -If you enable the sysctl -.Em allow_no_fec_modules_in_auto -Auto FEC negotiation will include +If the +.Va allow_no_fec_modules_in_auto +sysctl is enabled Auto FEC negotiation will include .Dq No FEC -in case your link partner does not have FEC enabled or is not FEC capable: +in case the link partner does not have FEC enabled or is not FEC capable: .Bd -literal -offset indent sysctl dev.ice..allow_no_fec_modules_in_auto=1 .Ed @@ -453,16 +452,16 @@ To see the valid FEC modes for the link: sysctl \-d dev.ice..requested_fec .Ed .Ss Speed and Duplex Configuration -You cannot set duplex or autonegotiation settings. +The speed and duplex settings cannot be hard set. .Pp -To have your device change the speeds it will use in auto-negotiation or +To have the device change the speeds it will use in auto-negotiation or force link with: .Bd -literal -offset indent sysctl dev.ice..advertise_speed= .Ed .Pp Supported speeds will vary by device. -Depending on the speeds your device supports, valid bits used in a speed mask +Depending on the speeds the device supports, valid bits used in a speed mask could include: .Bd -literal -offset indent 0x0 \- Auto @@ -503,13 +502,13 @@ At a high level, to capture a firmware log: .It Set the configuration for the firmware log. .It -Perform the necessary steps to generate the issue you are trying to debug. +Perform the necessary steps to reproduce the issue. .It Capture the firmware log. .It Stop capturing the firmware log. .It -Reset your firmware log settings as needed. +Reset the firmware log settings as needed. .It Work with Customer Support to debug the issue. .El @@ -593,8 +592,8 @@ PF Registration (Bit 30) Module Version (Bit 31) .El .Pp -You can change the verbosity level of the firmware logs. -You can set only one log level per module, and each level includes the +The verbosity level of the firmware logs can be modified. +It is possible to set only one log level per module, and each level includes the verbosity levels lower than it. For instance, setting the level to .Dq normal @@ -650,8 +649,8 @@ dmesg > log_output NOTE: Logging a large number of modules or too high of a verbosity level will add extraneous messages to dmesg and could hinder debug efforts. .Ss Debug Dump -Intel\(rg Ethernet 800 Series devices support debug dump, which allows you to -obtain runtime register values from the firmware for +Intel\(rg Ethernet 800 Series devices support debug dump, which allows +gathering of runtime register values from the firmware for .Dq clusters of events and then write the results to a single dump file, for debugging complicated issues in the field. @@ -664,7 +663,7 @@ stateless snapshot of the whole device. .Pp NOTE: Like with firmware logs, the contents of the debug dump are not human\-readable. -You must work with Customer Support to decode the file. +Work with Customer Support to decode the file. .Pp Debug dump is per device, not per PF. .Pp @@ -727,20 +726,19 @@ sysctl dev.ice.0.debug.dump.clusters=0 .Pp NOTE: Using 0 will skip Manageability Transactions data. .Pp -If you don't specify a cluster, the driver will dump all clusters to a +If a single cluster is not specified, the driver will dump all clusters to a single file. Issue the debug dump command, using the following: .Bd -literal -offset indent sysctl \-b dev.ice..debug.dump.dump=1 > dump.bin .Ed .Pp -NOTE: The driver will not receive the command if you do not write -.Dq 1 -to the sysctl. +NOTE: The driver will not receive the command if the sysctl is not set to +.Dq 1 . .Pp Replace .Dq dump.bin -above with the file name you want to use. +above with the preferred file name. .Pp To clear the .Va clusters @@ -754,7 +752,7 @@ The ice driver supports the ability to obtain the values of the PHY registers from Intel(R) Ethernet 810 Series devices in order to debug link and connection issues during runtime. .Pp -The driver allows you to obtain information about: +The driver provides information about: .Bl -bullet .It Rx and Tx Equalization parameters @@ -768,12 +766,12 @@ sysctl dev.ice..debug.phy_statistics .Ed .Pp NOTE: The contents of the registers are not human\-readable. -Like with firmware logs and debug dump, you must work with Customer Support +Like with firmware logs and debug dump, work with Customer Support to decode the file. .Ss Transmit Balancing -Some Intel(R) Ethernet 800 Series devices allow you to enable a transmit +Some Intel(R) Ethernet 800 Series devices allow for enabling a transmit balancing feature to improve transmit performance under certain conditions. -When the feature is enabled, you should experience more consistent transmit +When enabled, the feature should provide more consistent transmit performance across queues and/or PFs and VFs. .Pp By default, transmit balancing is disabled in the NVM. @@ -794,7 +792,7 @@ configures the device accordingly. .Pp NOTE: The user selection for transmit balancing in EPCT or HII is persistent across reboots. -You must reboot the system for the selected setting to take effect. +The system must be rebooted for the selected setting to take effect. .Pp This setting is device wide. .Pp @@ -811,7 +809,7 @@ sysctl dev.ice..temp may have a low number of network memory buffers (mbufs) by default. If the number of mbufs available is too low, it may cause the driver to fail to initialize and/or cause the system to become unresponsive. -You can check to see if the system is mbuf\-starved by running +Check to see if the system is mbuf\-starved by running .Ic netstat Fl m . Increase the number of mbufs by editing the lines below in .Pa /etc/sysctl.conf : @@ -823,7 +821,7 @@ kern.ipc.nmbjumbo16 kern.ipc.nmbufs .Ed .Pp -The amount of memory that you allocate is system specific, and may require some +The amount of memory that should be allocated is system specific, and may require some trial and error. Also, increasing the following in .Pa /etc/sysctl.conf @@ -918,8 +916,8 @@ link partner's switch ports. Some PCIe x8 slots are actually configured as x4 slots. These slots have insufficient bandwidth for full line rate with dual port and quad port devices. -In addition, if you put a PCIe v4.0 or v3.0\-capable adapter into a PCIe v2.x -slot, you cannot get full bandwidth. +In addition, if a PCIe v4.0 or v3.0\-capable adapter is placed into a PCIe v2.x +slot, full bandwidth will not be possible. .Pp The driver detects this situation and writes the following message in the system log: @@ -930,7 +928,7 @@ Please move the device to a different PCI\-e link with more lanes and/or higher transfer rate. .Ed .Pp -If this error occurs, moving your adapter to a true PCIe x8 or x16 slot will +If this error occurs, moving the adapter to a true PCIe x8 or x16 slot will resolve the issue. For best performance, install devices in the following PCI slots: .Bl -bullet From nobody Fri Nov 7 05:16:47 2025 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 4d2nNc1Hhrz6536Z; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNb5hB2z3RDV; Fri, 07 Nov 2025 05:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4Y8B9BN3l2+IQ/FaMQFZF9N8YKUCG4pqDaajxgQ8oo=; b=Itte8SERAXTlhZ62o0JmDV60jL/r/JSUT5xA/HwXF3Ug1pwrluFCKMIPV7SJNE6na1FnQU hVfgnb8TczfqeUJPWkwmOrHgPKNsgXMDqxjvtO1NAXbHAhsVUip3hdeDvpVldWtDlSbKnq piAtIYmGDhL4Dfan7qQoTFJMQFzx9pSPr4704UZmpKzNcp5tYZUDid2mYabniDrp0JeAcV YDX3IwD1DOZ61cRalbQ0pr4HyHxvfQ5qGNbaTNLzC4Ck7Ae8ANh6I9i0rbKdjBmBAn277Y iIgapGembNuNx3z+s6HmwJL1eDnzVV0tqvnzNJvl9685GQ2fZWzKBsoPYhNS8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4Y8B9BN3l2+IQ/FaMQFZF9N8YKUCG4pqDaajxgQ8oo=; b=Bvcby0J40Vk56f/PuWcOGKI3E2KkBimR28egtHFcvtlh3Jafiix7r8ejOOQkXYeM7CC2yf iKlAyb4PZO4pCCxJ1Bmo2M73PIdSagUXFJWuPU8QSLvMAcfjw/wI447I7x82pjglrQe3i6 ErLIGkmgtrNEpF4DjOuWDo6qSs2/nKuzcuB+VMYlWxwQuLkiiaVSHs20pVtM5IoLy9M2su nNe+3D3ZDCv5HVZJk9jfTQn3kJ9HOLiuf+h0JiDib6r/fuJ3Mr3rJqgKVezkNgRh0cjC1u RAarv/tJEu7VjsW8CNTwxpSynQTmGpIdpKGprJ3QgBfHPLJ/ijL/KrVCz1BC+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492607; a=rsa-sha256; cv=none; b=hXG6PnEgoGw0joPEvRmPbKE/TEQE3FeW5mAdI+VWAwXt/Z63dggrHD2k1FAAGpvB/C5qTB 0tPT1/igZwuPrNPUihKevzrVADSP151BgFqApUaS7eERcHRr8BTtn88Sf6vDsY+oUnP6k6 FqKZWI0wVVChIqKOXqhg0W+5SBSoq6j8wY82xTEG5Uc4jRlsOS7Jgtm1jiAGvaxd9rLuUv 3iG7e7xszk4gHBAZtpIopu87uWP2CglICXpVBo9BC6atRGBsKPJWU+DpVOkQ0+2I25LlqX XLKz9MyEfIZs+X0eGhHiqnqdFG82JEqG4jh9Gw2YfV+4t119/P9Cfy226dV6Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNb49dxzlyQ; Fri, 07 Nov 2025 05:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75Glsv092371; Fri, 7 Nov 2025 05:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75GlNi092368; Fri, 7 Nov 2025 05:16:47 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:47 GMT Message-Id: <202511070516.5A75GlNi092368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3a63ca9620f9 - releng/15.0 - ice.4: Add ToC and E835 and editorial 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 3a63ca9620f9dd5a9978d76d145f596d24cef9e7 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3a63ca9620f9dd5a9978d76d145f596d24cef9e7 commit 3a63ca9620f9dd5a9978d76d145f596d24cef9e7 Author: Alexander Ziaee AuthorDate: 2025-11-05 21:59:20 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:26 +0000 ice.4: Add ToC and E835 and editorial pass This manual is large enough and well structured enough that we can have a clickable table of contents. Use that to move some subsections which should not appear in Hardware Release Note to the description section. Adjust subsection names so this will work, preserving parentheticals for search by moving them to the bodies just below. Strip unnecessary copyright symbols and escaped hyphens. Copyright symbols never appear in the content of manual pages, including other Intel manual pages, and appear to break the Hardware Release Notes. Escaped hyphens were necessary decades ago for manual pages written in man(7), but this page is written in mdoc(7). Also misc touchups. Add the recently added E835 devices to the supported HARDWARE list. Add the speed ranges to description like the other ethernet drivers. Approved by: re (cperciva) PR: 290778 MFC after: 1 day Fixes: 09b48f811b4b (Add support for E835-XXV-4 adapter) Fixes: b202176dc76d (Add PCI IDs for E835 devices) Reviewed by: kgalazka (previous version) Reported by: kgalazka (additional hardware has been added) Reported by: bigsneaky@duck.com (HW Relnote is truncating) (cherry picked from commit f30335c5cb5e18a1ef08f5ba1d6fa6fc06f39348) (cherry picked from commit 71bd17b879a74f57573d41ad21a9a0e7f984ab11) --- share/man/man4/ice.4 | 372 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 224 insertions(+), 148 deletions(-) diff --git a/share/man/man4/ice.4 b/share/man/man4/ice.4 index c7675e627726..a54a6b3fd6f3 100644 --- a/share/man/man4/ice.4 +++ b/share/man/man4/ice.4 @@ -32,12 +32,12 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd October 3, 2025 +.Dd November 5, 2025 .Dt ICE 4 .Os .Sh NAME .Nm ice -.Nd Intel Ethernet 800 Series Driver +.Nd Intel Ethernet 800 Series 1GbE to 200GbE driver .Sh SYNOPSIS .Cd device iflib .Cd device ice @@ -62,42 +62,75 @@ or .Cd dev.ice.#.pba_number .Cd dev.ice.#.hw.mac.* .Sh DESCRIPTION -.Ss Features The .Nm driver provides support for any PCI Express adapter or LOM -(LAN On Motherboard) -in the Intel\(rg Ethernet 800 Series. -As of this writing, the series includes devices with these model numbers: +.Pq LAN On Motherboard +in the Intel Ethernet 800 Series. +.Pp +The following topics are covered in this manual: .Pp .Bl -bullet -compact .It -Intel\(rg Ethernet Controller E810\-C +.Sx Features +.It +.Sx Dynamic Device Personalization +.It +.Sx Jumbo Frames +.It +.Sx Remote Direct Memory Access +.It +.Sx RDMA Monitoring +.It +.Sx Data Center Bridging +.It +.Sx L3 QoS Mode +.It +.Sx Firmware Link Layer Discovery Protocol Agent +.It +.Sx Link-Level Flow Control +.It +.Sx Forward Error Correction +.It +.Sx Speed and Duplex Configuration +.It +.Sx Disabling physical link when the interface is brought down +.It +.Sx Firmware Logging +.It +.Sx Debug Dump +.It +.Sx Debugging PHY Statistics .It -Intel\(rg Ethernet Controller E810\-XXV +.Sx Transmit Balancing .It -Intel\(rg Ethernet Connection E822\-C +.Sx Thermal Monitoring .It -Intel\(rg Ethernet Connection E822\-L +.Sx Network Memory Buffer Allocation .It -Intel\(rg Ethernet Connection E823\-C +.Sx Additional Utilities .It -Intel\(rg Ethernet Connection E823\-L +.Sx Optics and auto-negotiation .It -Intel\(rg Ethernet Connection E825\-C +.Sx PCI-Express Slot Bandwidth .It -Intel\(rg Ethernet Connection E830\-C +.Sx HARDWARE .It -Intel\(rg Ethernet Connection E830\-CC +.Sx LOADER TUNABLES .It -Intel\(rg Ethernet Connection E830\-L +.Sx SYSCTL VARIABLES .It -Intel\(rg Ethernet Connection E830\-XXV +.Sx INTERRUPT STORMS +.It +.Sx IOVCTL OPTIONS +.It +.Sx SUPPORT +.It +.Sx SEE ALSO +.It +.Sx HISTORY .El -.Pp -For questions related to hardware requirements, refer to the documentation -supplied with the adapter. -.Pp +.Ss Features Support for Jumbo Frames is provided via the interface MTU setting. Selecting an MTU larger than 1500 bytes with the .Xr ifconfig 8 @@ -141,7 +174,7 @@ downloading a new driver or DDP package. Safe Mode only applies to the affected physical function and does not impact any other PFs. See the -.Dq Intel\(rg Ethernet Adapters and Devices User Guide +.Dq Intel Ethernet Adapters and Devices User Guide for more details on DDP and Safe Mode. .Pp If issues are encountered with the DDP package file, an updated driver or @@ -153,8 +186,8 @@ The DDP package cannot be updated if any PF drivers are already loaded. To overwrite a package, unload all PFs and then reload the driver with the new package. .Pp -Only one DDP package can be used per driver, even if more than one -device installed that uses the driver. +Only one DDP package can be used per driver, +even if more than one installed device uses the driver. .Pp Only the first loaded PF per device can download a package for that device. .Ss Jumbo Frames @@ -187,7 +220,7 @@ RoCEv2 (RDMA over Converged Ethernet) protocols. The major difference is that iWARP performs RDMA over TCP, while RoCEv2 uses UDP. .Pp -Devices based on the Intel\(rg Ethernet 800 Series do not support RDMA when +Devices based on the Intel Ethernet 800 Series do not support RDMA when operating in multiport mode with more than 4 ports. .Pp For detailed installation and configuration information for RDMA, see @@ -200,7 +233,7 @@ analysis tools like .Xr tcpdump 1 . This mirroring may impact performance. .Pp -To use RDMA monitoring, more MSI\-X interrupts may need to be reserved. +To use RDMA monitoring, more MSI-X interrupts may need to be reserved. Before the .Nm driver loads, configure the following tunable provided by @@ -209,7 +242,7 @@ driver loads, configure the following tunable provided by dev.ice..iflib.use_extra_msix_vectors=4 .Ed .Pp -The number of extra MSI\-X interrupt vectors may need to be adjusted. +The number of extra MSI-X interrupt vectors may need to be adjusted. .Pp To create/delete the interface: .Bd -literal -offset indent @@ -245,14 +278,15 @@ DCB is normally configured on the network using the DCBX protocol (802.1Qaz), a specialization of LLDP (802.1AB). The .Nm driver supports the following mutually exclusive variants of DCBX support: +.Pp .Bl -bullet -compact .It -Firmware\-based LLDP Agent +Firmware-based LLDP Agent .It -Software\-based LLDP Agent +Software-based LLDP Agent .El .Pp -In firmware\-based mode, firmware intercepts all LLDP traffic and handles DCBX +In firmware-based mode, firmware intercepts all LLDP traffic and handles DCBX negotiation transparently for the user. In this mode, the adapter operates in .Dq willing @@ -262,25 +296,25 @@ The local user can only query the negotiated DCB configuration. For information on configuring DCBX parameters on a switch, please consult the switch manufacturer'ss documentation. .Pp -In software\-based mode, LLDP traffic is forwarded to the network stack and user +In software-based mode, LLDP traffic is forwarded to the network stack and user space, where a software agent can handle it. In this mode, the adapter can operate in .Dq nonwilling DCBX mode and DCB configuration can be both queried and set locally. -This mode requires the FW\-based LLDP Agent to be disabled. +This mode requires the FW-based LLDP Agent to be disabled. .Pp -Firmware\-based mode and software\-based mode are controlled by the +Firmware-based mode and software-based mode are controlled by the .Dq fw_lldp_agent sysctl. Refer to the Firmware Link Layer Discovery Protocol Agent section for more information. .Pp -Link\-level flow control and priority flow control are mutually exclusive. +Link-level flow control and priority flow control are mutually exclusive. The ice driver will disable link flow control when priority flow control is enabled on any traffic class (TC). It will disable priority flow control when link flow control is enabled. .Pp -To enable/disable priority flow control in software\-based DCBX mode: +To enable/disable priority flow control in software-based DCBX mode: .Bd -literal -offset indent sysctl dev.ice..pfc=1 (or 0 to disable) .Ed @@ -307,10 +341,10 @@ For example, to map UP 0 and 1 to TC 0, UP 2 and 3 to TC 1, UP 4 and .Bd -literal -offset indent sysctl dev.ice..up2tc_map=0,0,1,1,2,2,3,3 .Ed -.Ss L3 QoS mode +.Ss L3 QoS Mode The .Nm -driver supports setting DSCP\-based Layer 3 Quality of Service (L3 QoS) +driver supports setting DSCP-based Layer 3 Quality of Service (L3 QoS) in the PF driver. The driver initializes in L2 QoS mode by default; L3 QoS is disabled by default. @@ -319,13 +353,13 @@ Use the following sysctl to enable or disable L3 QoS: sysctl dev.ice..pfc_mode=1 (or 0 to disable) .Ed .Pp -If the L3 QoS mode is disabled, it returns to L2 QoS mode. +If L3 QoS mode is disabled, it returns to L2 QoS mode. .Pp To map a DSCP value to a traffic class, separate the values by commas. -For example, to map DSCPs 0\-3 and DSCP 8 to DCB TCs 0\-3 and 4, respectively: +For example, to map DSCPs 0-3 and DSCP 8 to DCB TCs 0-3 and 4, respectively: .Bd -literal -offset indent -sysctl dev.ice..dscp2tc_map.0\-7=0,1,2,3,0,0,0,0 -sysctl dev.ice..dscp2tc_map.8\-15=4,0,0,0,0,0,0,0 +sysctl dev.ice..dscp2tc_map.0-7=0,1,2,3,0,0,0,0 +sysctl dev.ice..dscp2tc_map.8-15=4,0,0,0,0,0,0,0 .Ed .Pp To change the DSCP mapping back to the default traffic class, set all the @@ -336,25 +370,25 @@ To view the currently configured mappings, use the following: sysctl dev.ice..dscp2tc_map .Ed .Pp -L3 QoS mode is not available when FW\-LLDP is enabled. +L3 QoS mode is not available when FW-LLDP is enabled. .Pp -FW\-LLDP cannot be enabled if L3 QoS mode is active. +FW-LLDP cannot be enabled if L3 QoS mode is active. .Pp -Disable FW\-LLDP before switching to L3 QoS mode. +Disable FW-LLDP before switching to L3 QoS mode. .Pp Refer to the .Sx Firmware Link Layer Discovery Protocol Agent -section in this README for more information on disabling FW\-LLDP. +section in this README for more information on disabling FW-LLDP. .Ss Firmware Link Layer Discovery Protocol Agent -Use sysctl to change FW\-LLDP settings. -The FW\-LLDP setting is per port and persists across boots. +Use sysctl to change FW-LLDP settings. +The FW-LLDP setting is per port and persists across boots. .Pp -To enable the FW\-LLDP Agent: +To enable the FW-LLDP Agent: .Bd -literal -offset indent sysctl dev.ice..fw_lldp_agent=1 .Ed .Pp -To disable the FW\-LLDP Agebt: +To disable the FW-LLDP Agebt: .Bd -literal -offset indent sysctl dev.ice..fw_lldp_agent=0 .Ed @@ -368,11 +402,14 @@ The UEFI HII LLDP Agent attribute must be enabled for this setting to take effect. If the .Dq LLDP AGENT -attribute is set to disabled, the FW\-LLDP Agent cannot be enabled from the +attribute is set to disabled, the FW-LLDP Agent cannot be enabled from the driver. -.Ss Link\-Level Flow Control (LFC) -Ethernet Flow Control (IEEE 802.3x) can be configured with sysctl to enable -receiving and transmitting pause frames for +.Ss Link-Level Flow Control +Ethernet Flow Control +.Pq IEEE 802.3x or LFC +can be configured with +.Xr sysctl 8 +to enable receiving and transmitting pause frames for .Nm . When transmit is enabled, pause frames are generated when the receive packet buffer crosses a predefined threshold. @@ -434,7 +471,7 @@ in case the link partner does not have FEC enabled or is not FEC capable: sysctl dev.ice..allow_no_fec_modules_in_auto=1 .Ed .Pp -NOTE: This flag is currently not supported on the Intel\(rg Ethernet 830 +NOTE: This flag is currently not supported on the Intel Ethernet 830 Series. .Pp To show the current FEC settings that are negotiated on the link: @@ -449,7 +486,7 @@ sysctl dev.ice..requested_fec .Pp To see the valid FEC modes for the link: .Bd -literal -offset indent -sysctl \-d dev.ice..requested_fec +sysctl -d dev.ice..requested_fec .Ed .Ss Speed and Duplex Configuration The speed and duplex settings cannot be hard set. @@ -464,17 +501,17 @@ Supported speeds will vary by device. Depending on the speeds the device supports, valid bits used in a speed mask could include: .Bd -literal -offset indent -0x0 \- Auto -0x2 \- 100 Mbps -0x4 \- 1 Gbps -0x8 \- 2.5 Gbps -0x10 \- 5 Gbps -0x20 \- 10 Gbps -0x80 \- 25 Gbps -0x100 \- 40 Gbps -0x200 \- 50 Gbps -0x400 \- 100 Gbps -0x800 \- 200 Gbps +0x0 - Auto +0x2 - 100 Mbps +0x4 - 1 Gbps +0x8 - 2.5 Gbps +0x10 - 5 Gbps +0x20 - 10 Gbps +0x80 - 25 Gbps +0x100 - 40 Gbps +0x200 - 50 Gbps +0x400 - 100 Gbps +0x800 - 200 Gbps .Ed .Ss Disabling physical link when the interface is brought down When the @@ -494,7 +531,7 @@ The driver allows for the generation of firmware logs for supported categories of events, to help debug issues with Customer Support. Refer to the -.Dq Intel\(rg Ethernet Adapters and Devices User Guide +.Dq Intel Ethernet Adapters and Devices User Guide for an overview of this feature and additional tips. .Pp At a high level, to capture a firmware log: @@ -553,7 +590,7 @@ DCBx (Bit 11) .It Va dcb DCB (Bit 12) .It Va xlr -XLR (function\-level resets; Bit 13) +XLR (function-level resets; Bit 13) .It Va nvm NVM (Bit 14) .It Va auth @@ -561,7 +598,7 @@ Authentication (Bit 15) .It Va vpd Vital Product Data (Bit 16) .It Va iosf -Intel On\-Chip System Fabric (Bit 17) +Intel On-Chip System Fabric (Bit 17) .It Va parser Parser (Bit 18) .It Va sw @@ -649,8 +686,8 @@ dmesg > log_output NOTE: Logging a large number of modules or too high of a verbosity level will add extraneous messages to dmesg and could hinder debug efforts. .Ss Debug Dump -Intel\(rg Ethernet 800 Series devices support debug dump, which allows -gathering of runtime register values from the firmware for +Intel Ethernet 800 Series devices support debug dump, +which allows gathering of runtime register values from the firmware for .Dq clusters of events and then write the results to a single dump file, for debugging complicated issues in the field. @@ -662,7 +699,7 @@ Debug dump captures the current state of the specified cluster(s) and is a stateless snapshot of the whole device. .Pp NOTE: Like with firmware logs, the contents of the debug dump are not -human\-readable. +human-readable. Work with Customer Support to decode the file. .Pp Debug dump is per device, not per PF. @@ -685,7 +722,7 @@ pass the argument. For example: .Bd -literal -offset indent -sysctl \-d dev.ice.0.debug.dump.clusters +sysctl -d dev.ice.0.debug.dump.clusters .Ed .Pp Possible bitmask values for @@ -693,24 +730,24 @@ Possible bitmask values for are: .Bl -bullet -compact .It -0 \- Dump all clusters (only supported on Intel\(rg Ethernet E810 Series and -Intel\(rg Ethernet E830 Series) +0 - Dump all clusters (only supported on Intel Ethernet E810 Series and +Intel Ethernet E830 Series) .It -0x1 \- Switch +0x1 - Switch .It -0x2 \- ACL +0x2 - ACL .It -0x4 \- Tx Scheduler +0x4 - Tx Scheduler .It -0x8 \- Profile Configuration +0x8 - Profile Configuration .It -0x20 \- Link +0x20 - Link .It -0x80 \- DCB +0x80 - DCB .It -0x100 \- L2P +0x100 - L2P .It -0x400000 \- Manageability Transactions (only supported on Intel\(rg Ethernet +0x400000 - Manageability Transactions (only supported on Intel Ethernet E810 Series) .El .Pp @@ -726,11 +763,11 @@ sysctl dev.ice.0.debug.dump.clusters=0 .Pp NOTE: Using 0 will skip Manageability Transactions data. .Pp -If a single cluster is not specified, the driver will dump all clusters to a -single file. +If a single cluster is not specified, +the driver will dump all clusters to a single file. Issue the debug dump command, using the following: .Bd -literal -offset indent -sysctl \-b dev.ice..debug.dump.dump=1 > dump.bin +sysctl -b dev.ice..debug.dump.dump=1 > dump.bin .Ed .Pp NOTE: The driver will not receive the command if the sysctl is not set to @@ -765,13 +802,13 @@ Use the following sysctl to read the PHY registers: sysctl dev.ice..debug.phy_statistics .Ed .Pp -NOTE: The contents of the registers are not human\-readable. +NOTE: The contents of the registers are not human-readable. Like with firmware logs and debug dump, work with Customer Support to decode the file. .Ss Transmit Balancing Some Intel(R) Ethernet 800 Series devices allow for enabling a transmit balancing feature to improve transmit performance under certain conditions. -When enabled, the feature should provide more consistent transmit +When enabled, this feature should provide more consistent transmit performance across queues and/or PFs and VFs. .Pp By default, transmit balancing is disabled in the NVM. @@ -809,7 +846,7 @@ sysctl dev.ice..temp may have a low number of network memory buffers (mbufs) by default. If the number of mbufs available is too low, it may cause the driver to fail to initialize and/or cause the system to become unresponsive. -Check to see if the system is mbuf\-starved by running +Check to see if the system is mbuf-starved by running .Ic netstat Fl m . Increase the number of mbufs by editing the lines below in .Pa /etc/sysctl.conf : @@ -821,8 +858,8 @@ kern.ipc.nmbjumbo16 kern.ipc.nmbufs .Ed .Pp -The amount of memory that should be allocated is system specific, and may require some -trial and error. +The amount of memory that should be allocated is system specific, +and may require some trial and error. Also, increasing the following in .Pa /etc/sysctl.conf could help increase network performance: @@ -847,13 +884,91 @@ To change the behavior of the QSFP28 ports on E810-C adapters, use the Intel To update the firmware on an adapter, use the Intel .Sy Non-Volatile Memory (NVM) Update Utility for Intel Ethernet Network Adapters E810 series - FreeBSD .El +.Ss Optics and auto-negotiation +Modules based on 100GBASE-SR4, +active optical cable (AOC), and active copper cable (ACC) +do not support auto-negotiation per the IEEE specification. +To obtain link with these modules, +auto-negotiation must be turned off on the link partner's switch ports. +.Pp +Note that adapters also support +all passive and active limiting direct attach cables +that comply with SFF-8431 v4.1 and SFF-8472 v10.4 specifications. +.Ss PCI-Express Slot Bandwidth +Some PCIe x8 slots are actually configured as x4 slots. +These slots have insufficient bandwidth +for full line rate with dual port and quad port devices. +In addition, +if a PCIe v4.0 or v3.0-capable adapter is placed into into a PCIe v2.x +slot, full bandwidth will not be possible. +.Pp +The driver detects this situation and +writes the following message in the system log: +.Bd -ragged -offset indent +PCI-Express bandwidth available for this device +may be insufficient for optimal performance. +Please move the device to a different PCI-e link +with more lanes and/or higher transfer rate. +.Ed +.Pp +If this error occurs, +moving the adapter to a true PCIe x8 or x16 slot will resolve the issue. +For best performance, install devices in the following PCI slots: +.Bl -bullet +.It +Any 100Gbps-capable Intel(R) Ethernet 800 Series device: Install in a +PCIe v4.0 x8 or v3.0 x16 slot +.It +A 200Gbps-capable Intel(R) Ethernet 830 Series device: Install in a +PCIe v5.0 x8 or v4.0 x16 slot +.El +.Pp +For questions related to hardware requirements, +refer to the documentation supplied with the adapter. .Sh HARDWARE The .Nm -driver supports the Intel Ethernet 800 series. -Some adapters in this series with SFP28/QSFP28 cages -have firmware that requires that Intel qualified modules are used; these -qualified modules are listed below. +driver supports the following +Intel 800 series 1Gb to 200Gb Ethernet controllers: +.Pp +.Bl -bullet -compact +.It +Intel Ethernet Controller E810-C +.It +Intel Ethernet Controller E810-XXV +.It +Intel Ethernet Connection E822-C +.It +Intel Ethernet Connection E822-L +.It +Intel Ethernet Connection E823-C +.It +Intel Ethernet Connection E823-L +.It +Intel Ethernet Connection E825-C +.It +Intel Ethernet Connection E830-C +.It +Intel Ethernet Connection E830-CC +.It +Intel Ethernet Connection E830-L +.It +Intel Ethernet Connection E830-XXV +.It +Intel Ethernet Connection E835-C +.It +Intel Ethernet Connection E835-CC +.It +Intel Ethernet Connection E835-L +.It +Intel Ethernet Connection E835-XXV +.El +.Pp +The +.Nm +driver supports some adapters in this series with SFP28/QSFP28 cages +which have firmware that requires that Intel qualified modules are used; +these qualified modules are listed below. This qualification check cannot be disabled by the driver. .Pp The @@ -862,13 +977,13 @@ driver supports 100Gb Ethernet adapters with these QSFP28 modules: .Pp .Bl -bullet -compact .It -Intel\(rg 100G QSFP28 100GBASE-SR4 E100GQSFPSR28SRX +Intel 100G QSFP28 100GBASE-SR4 E100GQSFPSR28SRX .It -Intel\(rg 100G QSFP28 100GBASE-SR4 SPTMBP1PMCDF +Intel 100G QSFP28 100GBASE-SR4 SPTMBP1PMCDF .It -Intel\(rg 100G QSFP28 100GBASE-CWDM4 SPTSBP3CLCCO +Intel 100G QSFP28 100GBASE-CWDM4 SPTSBP3CLCCO .It -Intel\(rg 100G QSFP28 100GBASE-DR SPTSLP2SLCDF +Intel 100G QSFP28 100GBASE-DR SPTSLP2SLCDF .El .Pp The @@ -877,11 +992,11 @@ driver supports 25Gb and 10Gb Ethernet adapters with these SFP28 modules: .Pp .Bl -bullet -compact .It -Intel\(rg 10G/25G SFP28 25GBASE-SR E25GSFP28SR +Intel 10G/25G SFP28 25GBASE-SR E25GSFP28SR .It -Intel\(rg 25G SFP28 25GBASE-SR E25GSFP28SRX (Extended Temp) +Intel 25G SFP28 25GBASE-SR E25GSFP28SRX (Extended Temp) .It -Intel\(rg 25G SFP28 25GBASE-LR E25GSFP28LRX (Extended Temp) +Intel 25G SFP28 25GBASE-LR E25GSFP28LRX (Extended Temp) .El .Pp The @@ -890,54 +1005,15 @@ driver supports 10Gb and 1Gb Ethernet adapters with these SFP+ modules: .Pp .Bl -bullet -compact .It -Intel\(rg 1G/10G SFP+ 10GBASE-SR E10GSFPSR +Intel 1G/10G SFP+ 10GBASE-SR E10GSFPSR .It -Intel\(rg 1G/10G SFP+ 10GBASE-SR E10GSFPSRG1P5 +Intel 1G/10G SFP+ 10GBASE-SR E10GSFPSRG1P5 .It -Intel\(rg 1G/10G SFP+ 10GBASE-SR E10GSFPSRG2P5 +Intel 1G/10G SFP+ 10GBASE-SR E10GSFPSRG2P5 .It -Intel\(rg 10G SFP+ 10GBASE-SR E10GSFPSRX (Extended Temp) +Intel 10G SFP+ 10GBASE-SR E10GSFPSRX (Extended Temp) .It -Intel\(rg 1G/10G SFP+ 10GBASE-LR E10GSFPLR -.El -.Pp -Note that adapters also support all passive and active -limiting direct attach cables that comply with SFF-8431 v4.1 and -SFF-8472 v10.4 specifications. -.Pp -This is not an exhaustive list; please consult product documentation for an -up-to-date list of supported media. -.Ss Fiber optics and auto\-negotiation -Modules based on 100GBASE\-SR4, active optical cable (AOC), and active copper -cable (ACC) do not support auto\-negotiation per the IEEE specification. -To obtain link with these modules, auto\-negotiation must be turned off on the -link partner's switch ports. -.Ss PCI-Express Slot Bandwidth -Some PCIe x8 slots are actually configured as x4 slots. -These slots have insufficient bandwidth for full line rate with dual port and -quad port devices. -In addition, if a PCIe v4.0 or v3.0\-capable adapter is placed into a PCIe v2.x -slot, full bandwidth will not be possible. -.Pp -The driver detects this situation and writes the following message in the -system log: -.Bd -literal -offset indent -PCI\-Express bandwidth available for this device may be insufficient for -optimal performance. -Please move the device to a different PCI\-e link with more lanes and/or -higher transfer rate. -.Ed -.Pp -If this error occurs, moving the adapter to a true PCIe x8 or x16 slot will -resolve the issue. -For best performance, install devices in the following PCI slots: -.Bl -bullet -.It -Any 100Gbps\-capable Intel(R) Ethernet 800 Series device: Install in a -PCIe v4.0 x8 or v3.0 x16 slot -.It -A 200Gbps\-capable Intel(R) Ethernet 830 Series device: Install in a -PCIe v5.0 x8 or v4.0 x16 slot +Intel 1G/10G SFP+ 10GBASE-LR E10GSFPLR .El .Sh LOADER TUNABLES Tunables can be set at the @@ -1035,11 +1111,11 @@ on. Disabled by default. .It num-queues Pq uint16_t Specify the number of queues the VF will have. -By default, this is set to the number of MSI\-X vectors supported by the VF +By default, this is set to the number of MSI-X vectors supported by the VF minus one. .It mirror-src-vsi Pq uint16_t Specify which VSI the VF will mirror traffic from by setting this to a value -other than \-1. +other than -1. All traffic from that VSI will be mirrored to this VF. Can be used as an alternative method to mirror RDMA traffic to another interface than the method described in the From nobody Fri Nov 7 05:16:48 2025 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 4d2nNd0cySz6536d; Fri, 07 Nov 2025 05:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNc5nllz3QxX; Fri, 07 Nov 2025 05:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vDpaDgL2N1esqV+PxFcXFKQSW/x+i7I1+kI+BpGuNls=; b=Lq9mByfs75+cW9ep2xPmNcdqIJut3stsrF+pfOGScmS15EUCD19wXfMGDLAThQ1kbmN1ov YDEVJLiFhMPZbb6WL+8NKDBmZlJjs0fa9e4o9Sx5fpKOoGRYnxhoN44gcW1tBnB/vcxCYh h0vrECyTN9ZyJmyy/JGPoiGuZz3CYGqBvhQrl6D0ICJCfRFRMBfIBwtxQgJH3wIhB7GNdy 4KJbT3kINvq6U5AIXyP+uWiUhJfP2PFjuj3SkzAQCLImlVGEtiogN0l/fPSOphp50Llivz dmp2yQow/cjI6blnruWFykKSbVGAxYqbEzc8LSyZVWLQdXuoERBXiVbjTbVlSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vDpaDgL2N1esqV+PxFcXFKQSW/x+i7I1+kI+BpGuNls=; b=tS/eqkfjPCCvpJxVyXNmHiFh3b9i0/0DIm0qfd8I7ZWG2S4pBYWXqAcz9PjRj/8tUn8yzT SH88Qquf979t4Af6PR1T/v6fwqo3/1DZDqvWpp1p3TcswZDAhjmR3tHPOJJNxFpLHiGoDQ YkR79LfOvAm4WRA9/DSVz69N3bsdQTxmY+89ttpIsykWkYC4DMMEonYDGXOIRoCJOtl/ob 7ouloP8XXtiDC07db8KrAsJKfXCg3mH0gd0ssfjMyNsQvJV1o/VXbwsIFPF1aq+tD9Rdmr RxUTL5GP2VCxlMbUBBjg1qQ8L8JftlbDSyIXxtqDcmHjFgAU3X7iQ9+/uJ5Fsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492608; a=rsa-sha256; cv=none; b=wFNir13nDRNluwbxEHDE+FMuRj3oF3odm9d5DpvkXXaux+vzpef6/0/JlNdyTQtiN6CENz PrKU3koX6rEjZ9dIdfCcZT1KUv63iwk0GpJlDYRSdpIcwoj1H09FP0E34W6exgwc/7mYWg G4hardrcpXZrp+ch6od/UET57MfmstPBlONp7OfEVKu2k4S0NSI9aEpHgotB2Nkt79UexK HcsaaCxNOwbb78Vdy5yNTHgxsLKc/MQmoNfMesh4pGixb2yyYcrwFhqPQROd+Vvcff0SP5 kBudTll0LEss5xKl3hP3thqQ7bVYNhux6afhysxDUmgEKYkHoWeJqf45ziD3hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNc5BVzzlFn; Fri, 07 Nov 2025 05:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75GmWb092410; Fri, 7 Nov 2025 05:16:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75GmSr092407; Fri, 7 Nov 2025 05:16:48 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:48 GMT Message-Id: <202511070516.5A75GmSr092407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 776626f09e59 - releng/15.0 - dumpon(8): Add a SYSCTL VARIABLES 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 776626f09e594c2846de222e399f27b8a7c5601d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=776626f09e594c2846de222e399f27b8a7c5601d commit 776626f09e594c2846de222e399f27b8a7c5601d Author: Felix Johnson AuthorDate: 2025-11-06 16:32:42 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:30 +0000 dumpon(8): Add a SYSCTL VARIABLES section Document debug.minidump and machdep.dump_retry_count sysctl variables. Approved by: re (cperciva) PR: 259393 MFC after: 3 seconds Reviewed by: gbe (previous), markj, ziaee Differential Revision: https://reviews.freebsd.org/D32618 (cherry picked from commit 850841edf6c0867a170d2637f3dacfda33d5f3dd) (cherry picked from commit 2608020ac8c3fe583eeaa782e99061ef54b80a0c) --- sbin/dumpon/dumpon.8 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8 index a57dfef7096d..f2082a58851d 100644 --- a/sbin/dumpon/dumpon.8 +++ b/sbin/dumpon/dumpon.8 @@ -228,6 +228,20 @@ total amount of physical memory as reported by the .Va hw.physmem .Xr sysctl 8 variable. +.Sh SYSCTL VARIABLES +The following +.Xr sysctl 8 +variables can be used to modify or monitor the behavior of crash dumps: +.Bl -tag -width "machdep.dump_retry_count" +.It Va debug.minidump +Set the type of kernel crash dump. +Possible values are 0 for a full crash dump or 1 for a minidump. +The default is minidump. +.It Va machdep.dump_retry_count +The maximum number of times dump will retry before giving up. +The default value is 5. +This sysctl is only supported on PowerPC and AMD64. +.El .Sh IMPLEMENTATION NOTES Because the file system layer is already dead by the time a crash dump is taken, it is not possible to send crash dumps directly to a file. @@ -377,6 +391,7 @@ needed. .Xr loader 8 , .Xr rc 8 , .Xr savecore 8 , +.Xr sysctl 8 , .Xr swapon 8 , .Xr panic 9 .Sh HISTORY From nobody Fri Nov 7 05:16:50 2025 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 4d2nNg3MzJz65392; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNg0bRfz3RHm; Fri, 07 Nov 2025 05:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Kz/rynOZdN6jO0ZXCPuGOhi6qwe5AniNb0NHaLekW0=; b=yECbMuATl5pH5XFUxHGeeUNBeN7y3zMBQjZwLDghxD34KqOEA/OVHIk6m85haQpqES2lRg ypAWWhs0RgnaY6TdmJpiNOJyL0DqAkdKwPf1RpaiFsU8Pqq7RghPBYqoyd5CTIdsItpdT8 dO3FIsMadAP1cpe5ejneCuOJMTzkfI+7RGOAk+8i4R3SlpXqyafSm2+6avZ9wokgn35wHm HHq0e0N2H9CE0l+VC9sOWQ5SctkRH5MQgvaxLaMMNeoyDD5F/uZiMUGAhFbcY8lBblgo5U GHDH9mCyLi/JexKfiltPeZk0KfWS33Cdhu8HuwmJdOuQ6TdIpYKus70icelL9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Kz/rynOZdN6jO0ZXCPuGOhi6qwe5AniNb0NHaLekW0=; b=mYTzEcoeF2PLrBlnDSUBVyYxRApIHFftlKJBT0TiSkV1N23CNF172E4jpeEFmp5uLEHqxG 7NofRTI/9RRb1DPI25YDTikvETa9wfDQpjLJi4wG5qZ7Ea+Mzp5dj77mAic1WeNEmgxdc+ 3tYEhuxrU+UvY08OUf8lEem2GaAXAB79ctP3x7/6SLmsSLaXBp9iakhnQ0/yqrWVei+qTy XTVJWQA9mTyAoEAFpKElNgWSEnjM7sjlhgzVF5SaCE3Tim3e9ZW3ZxA+fBlbY3YlsDbf0S ZXzUuo7tRs9fGKoAxjetF0MEPzKK3LwmfQIsDHNyk+iyqFUur7wLjCyz7tQ4uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492611; a=rsa-sha256; cv=none; b=Ic2ZWb7hJnYfJFsgilyJUQ0q5DSqDIqajHMPFC4UJSkVSijy1uEP0TX4GF0ZEi02846yLW w4t7TsAyqfIiIIysAInO7XNc1FIFijzvd5XxADSsE46EsHMGFmuqOerQYziw76BpXNc7T0 WkKJRUpUzIeO0HXZpBR2q3zuJ5fZHZb9wAN4rRljETPFKDFSf4ybagoKM+apNUKIwBVIy2 YuI/83hsy4/oNgX8Lmd/wowgcWbZ4C4Pj+t25pYfIDYSQm0gX9tKO38lhjsV/w+ZPSfHtf lo/LRcTrthnshILmfR/m25RVE/eHW7ruAOdynRIPA0oNJp+hahx3GYdXX2ITSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNg085NzmTw; Fri, 07 Nov 2025 05:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75GoSg092481; Fri, 7 Nov 2025 05:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75GodX092478; Fri, 7 Nov 2025 05:16:50 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:50 GMT Message-Id: <202511070516.5A75GodX092478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 715cc30d2975 - releng/15.0 - sysrc.8: Rewrite examples for mdoc conformance List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 715cc30d29752d7df5d0e29eb47f857ec00c27f2 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=715cc30d29752d7df5d0e29eb47f857ec00c27f2 commit 715cc30d29752d7df5d0e29eb47f857ec00c27f2 Author: Alexander Ziaee AuthorDate: 2025-11-06 18:42:06 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:35 +0000 sysrc.8: Rewrite examples for mdoc conformance Tag SPDX while here. This is not a content change, so do not bump date. Approved by: re (cperciva) PR: 274164 MFC after: 3 seconds (cherry picked from commit 3f0dd7724658126dcfde488a994cf7698353a82c) (cherry picked from commit 9a6e6e9edc7eee4aeeb2f9f0e7be12eee656efaf) --- usr.sbin/sysrc/sysrc.8 | 89 +++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 48 deletions(-) diff --git a/usr.sbin/sysrc/sysrc.8 b/usr.sbin/sysrc/sysrc.8 index bdf3353c2cf9..cb32f72ea587 100644 --- a/usr.sbin/sysrc/sysrc.8 +++ b/usr.sbin/sysrc/sysrc.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2011-2016 Devin Teske .\" All rights reserved. .\" @@ -408,62 +411,52 @@ and .It Pa /usr/local/etc/rc.conf.d/name/* .El .Sh EXAMPLES -Below are some simple examples of how -.Nm -can be used to query certain values from the -.Xr rc.conf 5 -collection of system configuration files: -.Pp -.Nm -sshd_enable -.Dl returns the value of $sshd_enable, usually YES or NO . +.Ss Working with rc.conf files +Ask the value of +.Cm sshd_enable , +usually YES or NO: +.Dl sysrc sshd_enable .Pp -.Nm -defaultrouter -.Dl returns IP address of default router Pq if configured . -.Pp -Working on other files, such as +Return the IP address of default router +.Pq if configured : +.Dl sysrc defaultrouter +.Ss Working with other files +Return the value of the MAILTO setting, if configured, from .Xr crontab 5 : +.Dl sysrc -f /etc/crontab MAILTO .Pp -.Nm --f /etc/crontab MAILTO -.Dl returns the value of the MAILTO setting Pq if configured . -.Pp -Appending to existing values: -.Pp -.Nm -\&cloned_interfaces+=gif0 -.Dl appends Qo gif0 Qc to $cloned_interfaces Pq see APPENDING VALUES . -.Pp -.Nm -\&cloned_interfaces-=gif0 -.Dl removes Qo gif0 Qc from $cloned_interfaces Pq see SUBTRACTING VALUES . -.Pp -In addition to the above syntax, -.Nm -also supports inline -.Xr sh 1 -PARAMETER expansion for changing the way values are reported, shown below: +Append +.Dq gif0 +to $cloned_interfaces +.Pq see Sx APPENDING VALUES : +.Dl sysrc cloned_interfaces+=gif0 .Pp -.Nm -\&'hostname%%.*' -.Dl returns $hostname up to (but not including) first `.' . +Remove +.Dq gif0 +from $cloned_interfaces +.Pq see Sx SUBTRACTING VALUES : +.Dl sysrc cloned_interfaces-=gif0 +.Ss Inline shell parameter expansion +Return $hostname up to, but not including, first +.Ql \&. : +.Dl sysrc 'hostname%%.*' .Pp -.Nm -\&'network_interfaces%%[$IFS]*' -.Dl returns first word of $network_interfaces . +Return first word of $network_interfaces: +.Dl sysrc 'network_interfaces%%[$IFS]*' .Pp -.Nm -\&'ntpdate_flags##*[$IFS]' -.Dl returns last word of $ntpdate_flags (time server address) . +Return last word of $ntpdate_flags +.Pq time server address : +.Dl sysrc 'ntpdate_flags##*[$IFS]' .Pp -.Nm -usbd_flags-"default" -.Dl returns $usbd_flags or "default" if unset or NULL . +Return $usbd_flags or +.Dq default +if unset or NULL: +.Dl sysrc usbd_flags-"default" .Pp -.Nm -cloned_interfaces+"alternate" -.Dl returns "alternate" if $cloned_interfaces is set . +Return +.Dq alternate +if $cloned_interfaces is set: +.Dl sysrc cloned_interfaces+"alternate" .Sh SEE ALSO .Xr rc.conf 5 , .Xr jail 8 , From nobody Fri Nov 7 05:16:49 2025 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 4d2nNf3Rbzz652v9; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNd6v62z3RM9; Fri, 07 Nov 2025 05:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=huFhp/qtNwXMbjp4W8HDXnxXJkBKg6k1XzLbtD1BG8w=; b=USuzqU0WTFDj0vTsU3Muffzw9BQAoaY1cJX+V70RNB/gxsPxCWb2T/q3GZAQYMWkPDdE8m MQPxFIylmUCe7g/HnDCt6drFCvUNF+h9GTsL4Apa+60ec5v8S5nAhUZRuktmlvqC6/UffP oJVxoNJGuCFIGfbWrSEwwzexmme+XO7siv+8NPrpfvQ4rDOAaKCuE2zcOXfoQV6/HUlLxt zauOO5cBjuopCHjBLNrxQg/ICa6wJVXb0X5DM7vLQAQXiEV3d7J8fIvPiYdx4g40D2gRbF gljbpqa13FjHO/fmbB5H25NxAUW5I3vMF6ct6I3ZvBf81yJKvdRRE0j9MGrSMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=huFhp/qtNwXMbjp4W8HDXnxXJkBKg6k1XzLbtD1BG8w=; b=M6ICiSxMZVTjv/PamnZpgSXyi9hvkVTwrqPJqyoqkvI5A8iLuhDGLmpkQerZIXu7HAv6q7 ++ZC3fMOfCQbgRRjMLigaRbhYJeAs79k+aWIUWIZ/1/OpByNo7aCBDjhmW8O+YlBm3tS67 RmgEYitki3DmETWy/aVqwUg+y0DkG4poN86ugYC4w1m5KmBu21jO3g3AWQA/zzLU84aSdf HjrbEeh/LLMVSAXfzUs3cedGglFMp1cRlIEspkDYJ1N1QVBLxH+giesMThkYaNJ09T32Sk FJqQZjaW+t7f//036nUxCz1Si4joDpbu8+yxk0jt04vOmmasLwZOw/v/ohOSLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492610; a=rsa-sha256; cv=none; b=ZJRjRM3sIaD0lvmvoMjuwVNg30rdVOCdEPropNcwU9ftBP6EpLDJM7Uj4bYKO6f/Sw8Kvv fTHE59qvJYzCRQhT4u3fr4DyAS7b24eTgkw16tKXVEctzekxbLofPJ1EcT3m3n+SbKeDOZ twdvQmHAK4zvlvn9rgwtP2dvCCZc92L2A7kZD9BLkaZ4n/3qmAkXQDEHk9LaFssfVk7aQ7 InxKlWYnLBKompiKB78zZzfogiw9Seu3QWUZcXJMAXd+zMhs3/Vzxv/oPJm8FERXkNcpC3 NagARC78UoAXd+RuLbKVjqm9OyoePrKPT7R7YNDYKXtMFd+D+xt8WzxC3XewXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNd6DMJzm1L; Fri, 07 Nov 2025 05:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75GnfH092444; Fri, 7 Nov 2025 05:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75Gnlc092441; Fri, 7 Nov 2025 05:16:49 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:49 GMT Message-Id: <202511070516.5A75Gnlc092441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c66b97820593 - releng/15.0 - ciss.4: Add p440ar to HARDWARE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c66b97820593142a1e2d75898615fec69d245a0d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c66b97820593142a1e2d75898615fec69d245a0d commit c66b97820593142a1e2d75898615fec69d245a0d Author: Alexander Ziaee AuthorDate: 2025-11-06 16:51:13 +0000 Commit: Colin Percival CommitDate: 2025-11-07 04:19:33 +0000 ciss.4: Add p440ar to HARDWARE Approved by: re (cperciva) PR: 290425 MFC after: 3 seconds, this fixes the HW relnotes Reported by: jwb (cherry picked from commit a41ffaa330f5dbfc6b10f32ea2879755e07ba932) (cherry picked from commit 801f10b8c70490f95f95adc9e474f33619cd9901) --- share/man/man4/ciss.4 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index 28d6556ecd85..d731aaddad38 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -1,7 +1,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd January 26, 2012 +.Dd November 6, 2025 .Dt CISS 4 .Os .Sh NAME @@ -87,9 +87,10 @@ might be solved by updating the firmware and/or setting the .Va hw.ciss.nop_message_heartbeat tunable to non-zero at boot time. .Sh HARDWARE -Controllers supported by the +The .Nm -driver include: +driver supports controllers implementing +Common Interface for SCSI-3 Support Open Specification v1.04, including: .Pp .Bl -bullet -compact .It @@ -145,6 +146,8 @@ HP Smart Array P430i .It HP Smart Array P431 .It +HP Smart Array P440ar +.It HP Smart Array P530 .It HP Smart Array P531 From nobody Fri Nov 7 05:16:52 2025 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 4d2nNh44Dgz652xH; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNh1MYfz3RMZ; Fri, 07 Nov 2025 05:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8hnGlsE04LVZxRl5a2o4nS7PbZWMyhdNdHgbqJVqHs=; b=v6QTD1vtWznhiclfjt8/PQ20MK4yCSAkRPkGLBY9/RWyF2s0vvauHziuv5cx443YWFyaa/ 9MsNk8ndgGqc/7SEtOvuLPN567gvDwjTA5O4XIZRwTy/BjJsfJvGYM1KVEuPdvfeLLNn9I Xk2NK/ZrX/zgARIIrXVMN6JSXzRy7r+QBr+gwWwLowWh0lJ8ZAnk6yvo8heWnsOKu5J1oM b7I15m+ub7Lm/TS9awG0Xy2WYxoLvxZRs3bKFv9Pw+iWcJD16ImYB2+EXHKm/QuhPgTr5Q k3FYUiJLkR+D15HmL0xzFDxxaXYhD2m3OPd99tOdhbpomaus7BAfenFvU/CTkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8hnGlsE04LVZxRl5a2o4nS7PbZWMyhdNdHgbqJVqHs=; b=CNf7L/NarsiUr3eIBLvEwTFlghtPOg3Yo5Ila2UNhxLWWFyukcx7qj+OKkoyRKDMxLiQ2l Y4Qik5dWYeoDHuDk50NVIHBwPn5U7vMj2EA/7OQbblMD2ZwzLFAsd7V1MTncGEmDjwmDMT EgGinGsMjkbay5OL0rtHOy5l+//7HwBBPLuwpmin8Pm1r4XM6Qn5w+I1Xf/WT6Q+wFXuS9 DRsGTzG0DHCheVztYibVHgdP02RvjnYp4DGx14y7IjuAtdYy0JvFQKglbiDS7KkLMp+9eo hhS1JfZePgSx7TGJbpSDKH0L81Rhc8ZNs3Ljk7PxloEPQX9Y3J4lxds6xDkkWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492612; a=rsa-sha256; cv=none; b=QuqPmMTxlBh4m6Xi0u2nlPtRco8uaMvH07tUsobD1l1qSWFGswpjy2cJrecxguweAwfmKR YZ6TymuZjL5mjE9kDwzrBdo2Usy8ruUx/2z+fDU6auUBZK8Zrt1e3kaxcPn0KVe24YvblQ nuJgX1n6ELj2XJitRppuIWrAgBkDymEzfUIvgzVZO4hO5clkYBG90uiw1QpKC4P4BLvDAR Suni+n9RUfSV8sGf7x52G6DZLoyN0D9CAxCwmsRp+JetB/2tdy93OXvn3gM3MPhQ6PHK1j rZEjSzTLtaGC7+QJ8Tjl0Gcmk7lEZnzEEBppzXt0OBAjwqlnMsiF+1IYzrhzLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNh0xjhzmTx; Fri, 07 Nov 2025 05:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75Gqef092516; Fri, 7 Nov 2025 05:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75GqWY092513; Fri, 7 Nov 2025 05:16:52 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:52 GMT Message-Id: <202511070516.5A75GqWY092513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 58f208591b59 - releng/15.0 - release: Comply with Azure Marketplace requirements for aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 58f208591b59b57ec47cd6dcaeb88991d2a1cb29 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=58f208591b59b57ec47cd6dcaeb88991d2a1cb29 commit 58f208591b59b57ec47cd6dcaeb88991d2a1cb29 Author: Li-Wen Hsu AuthorDate: 2025-11-07 05:10:44 +0000 Commit: Colin Percival CommitDate: 2025-11-07 05:15:59 +0000 release: Comply with Azure Marketplace requirements for aarch64 Azure requires the first 1 MB (2,048 sectors) of the OS disk to remain empty for VM images: https://learn.microsoft.com/partner-center/marketplace-offers/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space Also append the BOOTPARTSOFFSET suffix for aarch64 images, which only has an ESP partition for booting. Co-authored-by: Brad Davis Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53628 (cherry picked from commit 36095c942031f7f1613eec554f1c7615cbd891fd) (cherry picked from commit 72617603a28fb19d45b1aac380f998c4551d5f72) --- release/tools/vmimage.subr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 8531e9b8f2d6..92f00f9cf7c3 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -449,7 +449,11 @@ vm_create_disk() { # Create an ESP espfilename=$(mktemp /tmp/efiboot.XXXXXX) make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi - BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}" + espsuffix="" + if [ -z "${BOOTPARTS}" ]; then + espsuffix="${BOOTPARTSOFFSET}" + fi + BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}${espsuffix}" # Add this to fstab mkdir -p ${DESTDIR}/boot/efi From nobody Fri Nov 7 05:16:53 2025 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 4d2nNj5z5Gz6530Q; Fri, 07 Nov 2025 05:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nNj2jZnz3RKP; Fri, 07 Nov 2025 05:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0uojOdI2w1ZEANs4OD3pe5RNPPPOhkZZ/5sltVtP/Q=; b=ZysHit/OXxbATEnxNv+FXomE5/IlvmfTZRd+sqH04fHCEFzT8VSIghXRa3rGdAPDV1W0My VbOM3kcBCbq3PTDOio49hXX2ukLR6TSK8d972l+CVidgiQec7DqzfNxoOo4kRaSdzC1r0y XwLgxw5rCNohsChx8PUTiM3RYMmVSwBb+zm9C2Vks/JCqkmdIhzhVhn6hGMaN99T/BMWTO fvWRIh7p5qj1JFg+rvbLw4HFYSHnwCWwF7ZB/0P3Ou8XOLxQyUjySDdx8TG5l+xw14svuC 8zNbsIdi59bohegD92fTJszmdYNJy8JSHWTMgaR28KYB3fm4senPGe2xrLJonA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0uojOdI2w1ZEANs4OD3pe5RNPPPOhkZZ/5sltVtP/Q=; b=v4TjH943QmqtL5kbkYKqJ0Qir0dyFo3h+uKZ4zr3H7p2w7elSd/4HHwFaBLY0Jgbcebvwf ukr1qbPgHaqR25BfLjsE6J8BOwdSV42Ol0uMSdRkFyUgjJjQf4fu7V+6uPVsni5JYl7FqN cU7jk6KxxtozwK9Q+eXA2Gxb1MU6S9QoSWLYxiqLOfekGX7954OZcfi568j3k7Y/vXxQV3 WPkn68QyaOeof64sCLz6fRfyf/oGqbbJenM0fTmQswKGPSDX4EokbkLIe/P7lVqzTUJlsb GTy+U8nkZsNeJfmfwGFyuXjwAUwEvenl2shqbkkeu0RFbV5iIVCx58ryil0Zcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492613; a=rsa-sha256; cv=none; b=wJwBKI+1c7Wvgb+IoKsZsUQydEobuYqvEIHMSAY2srrUIFaFkufZhf7rZ8k/9QRNJeb79X ftxF3B49WdN1KPD1NvUZpvbmBs6iPSQCQTC49f2S7u6+M50rd2+7cDFYhXndnFiAbIb6lY 9vWMeDwegWE54tNb1kHDRQz8oyvvukmWmjTQ4A8cYbrOLimmONeuxKa0JtdmYLyFEZAOQr 7V13uO0r8SphjmqhvXKgO8CkhNcuijTysOHj08HSpttAb3qPWBi7f+ffDf6JWiR9ygPdYV Wxfx58Ut8CY3vXlaMADqycmG8YRQsI1lufj3Y4txJdTr6EoyU03+e6tgIW+zjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nNj29DQzmJw; Fri, 07 Nov 2025 05:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75GrA2092551; Fri, 7 Nov 2025 05:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75Gr37092548; Fri, 7 Nov 2025 05:16:53 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:53 GMT Message-Id: <202511070516.5A75Gr37092548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: db99e6ce3ecd - releng/15.0 - 15.0: Update to BETA5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: db99e6ce3ecd02866435a786a37052d3ac8931a4 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=db99e6ce3ecd02866435a786a37052d3ac8931a4 commit db99e6ce3ecd02866435a786a37052d3ac8931a4 Author: Colin Percival AuthorDate: 2025-11-07 03:36:08 +0000 Commit: Colin Percival CommitDate: 2025-11-07 05:16:10 +0000 15.0: Update to BETA5 Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index ba34266b8384..15a571f63454 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.0" -BRANCH="BETA4" +BRANCH="BETA5" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Nov 7 05:25:24 2025 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 4d2nZX64VDz653tZ; Fri, 07 Nov 2025 05:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nZX3nlVz3XQ4; Fri, 07 Nov 2025 05:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762493124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5b//FMMVtjEvW/9EoaKyj2cskR1CwB/YKiIzo2UBCI=; b=ajrBZmd5/Z8GPoTUspBCiozteAXX1ytz1US+5l/JEpPofpxYQr+dgJBMzETRBZbLGZRlBy KzqcPQRg6EjhjDsPmqjs7LBSSdS5hSumrrPfikGWBPAwR+wgYvHx5ee4ehD37e009WDqNw pP9R+OADwACtpOHVuNEZp8JrksyCYzD9pNC5WxsbvsvOROiwd81eTpNykImcpDACVGVTIX Bgw+dzu/NEypX1UwYRnLsWJAh0VdwL/koFgXOFEtO+q+rW3OiG7gn3qmd9s66GFk8BfRbQ qMWw/6tvigTYtRgcjtFwys0Q5AyMXxmzCVk3q7AlmddwD65yjZkvCl4fNT27qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762493124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5b//FMMVtjEvW/9EoaKyj2cskR1CwB/YKiIzo2UBCI=; b=fEJZYx/gZ5BKxXbJ91oOOgshQi4iDFWLTEZzx3ab3yeME8zfyKEhF8bS0/6kLMZHPXzxRn rIp5KiCXkqFAuXTHBTV91pYC7DeLKKyiNVEaii+jYB8OIVC9toVMhG4AfKpLZ6FfRhQAld fGg8DbYZRZdvb4Hq36BaLtneogUGKNkAc0ETyIZhQbLlW2RChB+I36NRmtx+dtTf3EpnOD QXO2/MOBZ9XnKRCRexIG/2+P1GErNTjCWPxJE5FmqUxYiD9JVFsyFDFD5tO1OU1X4Brvmd 3OYJw5Ny06yXymeUZpe5NApBcc3IjHOicwQDJxlQ1lgLxZzr/mDCXtwuwVFIuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762493124; a=rsa-sha256; cv=none; b=rgngk3P1ecRE2MzU2DhtF1L2leEjAHIfzTS8e6Nw0nJwnZFT1yntGZTB5as8HY2RpfXpkz kjZrmuLBeP4ZxZXnksNcEEJ7jD8OA1/EV6C9OPdAUmX+p+SZECnQ/i7ipkRSMaj7M9pNsV 3M+T+ta+N0ZVk4HqVEtnwkaL7DzcWvxWAoFTRIDlH4D5OReJ/Og4HIyhDDswDKmTVct8Ju 0l4M6j0NMgV+8LlPxgSJt1gCPHtbV48WpzZqwE3aToTp6USfqGkpD4mIDu+zFLNKDPihJX gaBp+F//Ggpd69qLmwwZPfiVky9JFSbHHgSGxa58azV1lOzlIvajiqHi2mrE7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nZX33B9zmKt; Fri, 07 Nov 2025 05:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75POXg011913; Fri, 7 Nov 2025 05:25:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75POdu011910; Fri, 7 Nov 2025 05:25:24 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:25:24 GMT Message-Id: <202511070525.5A75POdu011910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: cdfa91397771 - stable/15 - atf: Move the tests back to the tests package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cdfa9139777189a16ea7a86c6457f169b76d7628 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=cdfa9139777189a16ea7a86c6457f169b76d7628 commit cdfa9139777189a16ea7a86c6457f169b76d7628 Author: Lexi Winter AuthorDate: 2025-11-05 21:16:32 +0000 Commit: Lexi Winter CommitDate: 2025-11-07 05:15:54 +0000 atf: Move the tests back to the tests package Commit 9065390ddc7b moved atf to its own package, but mistakenly moved the tests as well. Put the tests back into the test package. Fixes: 9065390ddc7b ("packages: Remove the tests-dev package") MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53594 (cherry picked from commit 4b342830abd39cdc20b67a215e15309293673e75) --- lib/atf/Makefile.inc | 2 +- lib/atf/libatf-c++/tests/Makefile | 2 ++ lib/atf/libatf-c++/tests/detail/Makefile | 2 ++ lib/atf/libatf-c/tests/Makefile | 2 ++ lib/atf/libatf-c/tests/detail/Makefile | 2 ++ lib/atf/tests/Makefile | 3 +++ libexec/atf/Makefile.inc | 2 +- libexec/atf/atf-check/tests/Makefile | 2 ++ libexec/atf/tests/Makefile | 3 +++ 9 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc index bebed0280596..af176036f136 100644 --- a/lib/atf/Makefile.inc +++ b/lib/atf/Makefile.inc @@ -24,7 +24,7 @@ # SUCH DAMAGE. # -PACKAGE= atf +PACKAGE?= atf LIB_PACKAGE= CFLAGS+= -DHAVE_CONFIG_H diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile index 839c6902d6b1..dc052c19df67 100644 --- a/lib/atf/libatf-c++/tests/Makefile +++ b/lib/atf/libatf-c++/tests/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTS_SUBDIRS= detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile index 4b95f8dbd663..55cefe524068 100644 --- a/lib/atf/libatf-c++/tests/detail/Makefile +++ b/lib/atf/libatf-c++/tests/detail/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index 5647e7b9fcbe..c81c18a91f00 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTS_SUBDIRS= detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index 5123f6f4d796..3fa2919b98b9 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index 500ff0f20c3b..2609bb593d57 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -1,4 +1,7 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests + KYUAFILE= yes SUBDIR= test-programs diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc index e40827fa0b69..5fd06c35cd09 100644 --- a/libexec/atf/Makefile.inc +++ b/libexec/atf/Makefile.inc @@ -24,7 +24,7 @@ # SUCH DAMAGE. # -PACKAGE= atf +PACKAGE?= atf LIB_PACKAGE= CFLAGS+= -DHAVE_CONFIG_H diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile index e98f82d941cd..6e21e4ede211 100644 --- a/libexec/atf/atf-check/tests/Makefile +++ b/libexec/atf/atf-check/tests/Makefile @@ -1,6 +1,8 @@ ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh +PACKAGE= tests + ATF_TESTS_SH= atf-check_test .include diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile index 29b1b564beca..ad9431e75a63 100644 --- a/libexec/atf/tests/Makefile +++ b/libexec/atf/tests/Makefile @@ -1,4 +1,7 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests + KYUAFILE= yes .include From nobody Fri Nov 7 05:25:25 2025 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 4d2nZY5NVWz653rP; Fri, 07 Nov 2025 05:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nZY3nnSz3XZm; Fri, 07 Nov 2025 05:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762493125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LKPwu4XIWng5vY/lOgPGods7w1duy0I7syxUZRn9vhU=; b=tVaXLR7UDUfpNEPBio3o1Kq3yKsx6yse6SZDGd2pwaN3LFCdXF42ST5D64mANwmMyu6fHm SxjXbHeVN5XKSpj1ZJRQZnb/qPqD88nviwhgUySFVZJYPsilldWItInDU3guo8pjlP15Fx OPIYo5n1RgFgbFup3WFEYl/8ea09FAs7hdCir/pW5BVRALCY9j6aJRLzYOqCExe93LIcWw LlYs1sl9y0Kc7GQX1hOxX2YJrcInaqcCJ3oG1dGXAui2321FjaJjPlnzcsaUBMVsdy0C4h ZLVl01fGZAz9DkbOd8S7jyCPjlXHBjMG60AA4j2MKuGsUs2tVkCX4fQr5qUeIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762493125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LKPwu4XIWng5vY/lOgPGods7w1duy0I7syxUZRn9vhU=; b=ubmjHtXBOlORZtPGQzGhHoHATzOmC4RjkJHifjWpbPcbsa7/ywlov5zLow0fLPSAFjhq3S c3VbfaaZ5SpPcBUKBPwho/cuTwDZdJV11d3XTadf+yLgSJKO9EZePmt/eI0iaMdjK3mzOJ vG6eLNjc/wYKpveZu1Ulo0PiXy41FhW0GWBNyFYWkFhKn0K3SlslO7ggKSwL/wHaiRUX2C aZ7zJrSmoHHWVOiKe76xNN0WbEvq6vPK+Nruv06H2yD5bmcoWdoD07Mu7nEU+hsa0NhDm7 Js57/WQiHCtGn8ETjkv/kA/dobOdQsp1R0pqHXQaEpLwl+w5GUMceYUDhPztWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762493125; a=rsa-sha256; cv=none; b=UXM1N21YLFOGHs0OaMAtepfc23Ju20gMn5KnZYHoNnCanu/q+AYzvDhBXhz4J90EyTze4S VZwImOOyZmUAh8jk6CjiPOn7VOCVEmbOWuyApJ1J6XEk8IEL/+Oy8p1xZts47DWrdGkYwW +SSqULzOrhfOtvikUCzlLu4pkx7DJb38kK60ouFV2WDUes5GZAenY94k9bLAWrQlapbLSN k0fqWSJbnPtooLecX21U3ruQ2V6wNYwIevG5P/z+O7MEEU4y8mXUOjUL+jE8eJBM+il+rk rDwxpx9ARWbtOrCUKykgGO39H6R3NJPR2SCvZxM0mhhKKEflAfIGK3uHimo/8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nZY3PcqzmXg; Fri, 07 Nov 2025 05:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75PPTh011946; Fri, 7 Nov 2025 05:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75PPC8011943; Fri, 7 Nov 2025 05:25:25 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:25:25 GMT Message-Id: <202511070525.5A75PPC8011943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 4e672f6ff005 - stable/15 - libcrypto: Install tests in the tests package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4e672f6ff005412365a0ef8b5fe0ca415e92146a Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4e672f6ff005412365a0ef8b5fe0ca415e92146a commit 4e672f6ff005412365a0ef8b5fe0ca415e92146a Author: Lexi Winter AuthorDate: 2025-11-05 21:17:31 +0000 Commit: Lexi Winter CommitDate: 2025-11-07 05:16:08 +0000 libcrypto: Install tests in the tests package libcrypto's Makefile.inc used PACKAGE=openssl, which overrides the PACKAGE=tests in libcrypto/tests/Makefile. Use PACKAGE?=openssl instead to avoid this. This puts the OpenSSL tests in the tests package where they belong. MFC after: 1 day Reviewed by: manu, ngie Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53595 (cherry picked from commit c3b853fe522ead976863af086557be8863327eb0) --- secure/lib/libcrypto/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 5b281166df61..73c650d590ff 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,6 +1,6 @@ .include -PACKAGE= openssl +PACKAGE?= openssl LIB_PACKAGE= LCRYPTO_SRC= ${SRCTOP}/crypto/openssl From nobody Fri Nov 7 05:47:05 2025 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 4d2p3Z1Zhhz6554n; Fri, 07 Nov 2025 05:47: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2p3Z07q5z3b9j; Fri, 07 Nov 2025 05:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762494426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xJ70K+vm3xuSZEiE7vLGUf4yAOUrBr3xR3eVDhvCjhM=; b=rVJfcjP67FQUR2RWoO7v8gAcX9CG+i0HgdVmrTvhZeHCisCsrSCC/PtF+jAT3bhQ5M2P5a 4V7EAHLXAmYFiMZSaMuusxpob3z9xB43Azmt4x2yXrlv4e475NYsE5pRfDuWIkwX5vDgGP tkwvwEmvOt/lFxatXHvShnyxHdQHDeYo545ok/+dQ2d7+jJpWwbe7bCCc2iJ+DgjBP08mW kX3/b4XCp+MvW2arYlTFqPqABQXU9Cmeeer5Xafk9vsyGkyNmVJr/Y4JccAmeihfDaWfkv 1ESZI1h7ATFRdEu3ilho9mstLK4EH3PjtC9F4rRdWs8sQtpArOw4caZLkZMtYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762494426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xJ70K+vm3xuSZEiE7vLGUf4yAOUrBr3xR3eVDhvCjhM=; b=RsJFUJ2qZxg1LCp/JZYsIRa3OmkFsrIQTF+X/G/Gaz/xtnPRIM+tgTJFo99Y4JvQMDCPBk f1yTytrzJs+QK9F8sBGiGHpjXAxU3adQI+RJ1F07GEDuh/IfqREI4Ufv9vscwfOxYSwxwj YXlKIWNRG1fWjo4ESXP0BaHSUpY4fkgUEsiE/H20gGLlFGMa6Xo4soZ0YP/02fZAOzlEXT 8Se3o6OrsfBCwqKHlsGrJLL8nU8s+leGj1+idgaxzo025cabT/oJrM7LZTXPT3oroQywN9 V52wA8resxyFDFlyPxmBw7YQx6s5YsWdYkJohygkCVCwAvxtsuB6v97k4/cDGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762494426; a=rsa-sha256; cv=none; b=ru7pK/l5fGIUgGaPggP4cMGdgueH4kcag2iU90gSTQ1lZg619aOju3CkmtrFd+QE8t18Uq GcrNCS7k6RBHiuLPN4N6E21RQzAX3JhuzyWXKkVu4zPUFnmIBAepuciLtRPTKYMwgQgitQ HTVme4lwsnad+6/6agKlL7TLPAST/4LyJoZl4Z3xvg+kG8tPpE7UcK6zWG7FuQsKyRqUBR zyHgKV7kXlgDy0mn9xM/1F6j1dmvxSAlHOFlM/7dY1VXURpLTNHJG6y9yPLrO1Eo3IYx3o lb4TZTa0GxQsC/iDMQYufuvmbo9hd17xeUigDqfbibjCbGJE/qKg8Y/ifaec9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2p3Y6b1Gzn2s; Fri, 07 Nov 2025 05:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75l55H049612; Fri, 7 Nov 2025 05:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75l5FU049609; Fri, 7 Nov 2025 05:47:05 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:47:05 GMT Message-Id: <202511070547.5A75l5FU049609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 5bee2fda67a5 - releng/15.0 - libcrypto: Install tests in the tests package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 5bee2fda67a58fc48529fd831834630290e6b0fc Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5bee2fda67a58fc48529fd831834630290e6b0fc commit 5bee2fda67a58fc48529fd831834630290e6b0fc Author: Lexi Winter AuthorDate: 2025-11-05 21:17:31 +0000 Commit: Colin Percival CommitDate: 2025-11-07 05:46:49 +0000 libcrypto: Install tests in the tests package libcrypto's Makefile.inc used PACKAGE=openssl, which overrides the PACKAGE=tests in libcrypto/tests/Makefile. Use PACKAGE?=openssl instead to avoid this. This puts the OpenSSL tests in the tests package where they belong. Approved by: re (cperciva) MFC after: 1 day Reviewed by: manu, ngie Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53595 (cherry picked from commit c3b853fe522ead976863af086557be8863327eb0) (cherry picked from commit 4e672f6ff005412365a0ef8b5fe0ca415e92146a) --- secure/lib/libcrypto/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 5b281166df61..73c650d590ff 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,6 +1,6 @@ .include -PACKAGE= openssl +PACKAGE?= openssl LIB_PACKAGE= LCRYPTO_SRC= ${SRCTOP}/crypto/openssl From nobody Fri Nov 7 05:47:06 2025 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 4d2p3b38rtz655SZ; Fri, 07 Nov 2025 05:47: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2p3b0SCTz3bJl; Fri, 07 Nov 2025 05:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762494427; h=from:from:reply-to:subject:subject: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+wnsdzlGZbyFd99wrFkU2BjPw5fJdMMtc5BBp5mccs=; b=XCQDKuqYYUkOWs0TGq5Fpr/OZtYjm2X5Y8tzTS644kjwEMOYaO/mYizOAW6nxMdWD3VlPc Y+gcSsrxPbT+3Vx8togjy3YdLw/ohoZFlJvFQmUe4OLhDFJ3E0sagy6Lttev7yKD5X63av ByYZNURNy1ocAFbR4hvbNCWsYRBoL8FzXU1ZxvyAqpB1r7i8sKqVpDN3Q3zw0M+a6wengQ mDMlkKfYaQXdj+QAwtVj/gqloV1VwVvemkDWJ2KhzEGS0KdwV5pZcrCuJkmt28ff3s6DC7 O1pfHjwqvypmaoXncyr9MU9VTR7vQPgWbNghsyyF0NVuhHr9ZsSnJVNOTKHnaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762494427; h=from:from:reply-to:subject:subject: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+wnsdzlGZbyFd99wrFkU2BjPw5fJdMMtc5BBp5mccs=; b=STZXpKGY3j19vjY2yeckSribVazwCW0Sqg8PhHFQdxfLyb3XatG2SN8KWtJ8WJJflu8yVg 3dIiz5iend6MRD2xBEtY2CUXQjO3t4BFXbWxDsCxFeRur8APmka59XvuH9b3Lnk4KQeHpV dyeYX1gKXA9QwiDMOVJh1UfwyMxtK0BavyKEfjtGIaZ47+Ea6kCZTqlPlInDSKNAyFAjYt JFnU48IKluMUeH4ICak2uR2J7Wgc1KrSsMpkGgm5uQptcY084pSZi+32RGbJkpBL65ePzP Drw98fpL0jG8faJarKwtFn4oVdF3l3my8tZqBeBfGXOkMQgF06DTMeV4p4rVBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762494427; a=rsa-sha256; cv=none; b=tO/0+b2dHuuVdDFqLpSUJYtNpmUhmn/afUygvvlCSfd0lQ3vves4pWebQvTaKhVXKJj0jI NUWT0+WNrXWrRzMSTs1yKkBRmDnA9gwjYI4zWKloEqJN6mTRrB2H4C7MQhMRv3jrrivJuF cPKCzCCnrb1EYA4WZBb3B+q0PAOiuvcjXqzvBkpA6i+28znUc4HAugPz2U5qCF/3+3Q/IE +XB6J0OBUOtmHnm2IaH5caEtpgn5OL1nAiNR89pzYzfFojNpaLvWCsFuLskwgsx1snNbu9 vs/ZfFtVYHLWVOoYpmftlC24tXIAP9/++YS9oVxiVDNw2yUSLVUCvVlvL2jCew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2p3b03dVzn2t; Fri, 07 Nov 2025 05:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75l6lJ049645; Fri, 7 Nov 2025 05:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75l6aZ049642; Fri, 7 Nov 2025 05:47:06 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:47:06 GMT Message-Id: <202511070547.5A75l6aZ049642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3447fc070cc2 - releng/15.0 - atf: Move the tests back to the tests package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 3447fc070cc205671ac33e1582c023033094de7f Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3447fc070cc205671ac33e1582c023033094de7f commit 3447fc070cc205671ac33e1582c023033094de7f Author: Lexi Winter AuthorDate: 2025-11-05 21:16:32 +0000 Commit: Colin Percival CommitDate: 2025-11-07 05:46:58 +0000 atf: Move the tests back to the tests package Commit 9065390ddc7b moved atf to its own package, but mistakenly moved the tests as well. Put the tests back into the test package. Approved by: re (cperciva) Fixes: 9065390ddc7b ("packages: Remove the tests-dev package") MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53594 (cherry picked from commit 4b342830abd39cdc20b67a215e15309293673e75) (cherry picked from commit cdfa9139777189a16ea7a86c6457f169b76d7628) --- lib/atf/Makefile.inc | 2 +- lib/atf/libatf-c++/tests/Makefile | 2 ++ lib/atf/libatf-c++/tests/detail/Makefile | 2 ++ lib/atf/libatf-c/tests/Makefile | 2 ++ lib/atf/libatf-c/tests/detail/Makefile | 2 ++ lib/atf/tests/Makefile | 3 +++ libexec/atf/Makefile.inc | 2 +- libexec/atf/atf-check/tests/Makefile | 2 ++ libexec/atf/tests/Makefile | 3 +++ 9 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc index bebed0280596..af176036f136 100644 --- a/lib/atf/Makefile.inc +++ b/lib/atf/Makefile.inc @@ -24,7 +24,7 @@ # SUCH DAMAGE. # -PACKAGE= atf +PACKAGE?= atf LIB_PACKAGE= CFLAGS+= -DHAVE_CONFIG_H diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile index 839c6902d6b1..dc052c19df67 100644 --- a/lib/atf/libatf-c++/tests/Makefile +++ b/lib/atf/libatf-c++/tests/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTS_SUBDIRS= detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile index 4b95f8dbd663..55cefe524068 100644 --- a/lib/atf/libatf-c++/tests/detail/Makefile +++ b/lib/atf/libatf-c++/tests/detail/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index 5647e7b9fcbe..c81c18a91f00 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTS_SUBDIRS= detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index 5123f6f4d796..3fa2919b98b9 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index 500ff0f20c3b..2609bb593d57 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -1,4 +1,7 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests + KYUAFILE= yes SUBDIR= test-programs diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc index e40827fa0b69..5fd06c35cd09 100644 --- a/libexec/atf/Makefile.inc +++ b/libexec/atf/Makefile.inc @@ -24,7 +24,7 @@ # SUCH DAMAGE. # -PACKAGE= atf +PACKAGE?= atf LIB_PACKAGE= CFLAGS+= -DHAVE_CONFIG_H diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile index e98f82d941cd..6e21e4ede211 100644 --- a/libexec/atf/atf-check/tests/Makefile +++ b/libexec/atf/atf-check/tests/Makefile @@ -1,6 +1,8 @@ ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh +PACKAGE= tests + ATF_TESTS_SH= atf-check_test .include diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile index 29b1b564beca..ad9431e75a63 100644 --- a/libexec/atf/tests/Makefile +++ b/libexec/atf/tests/Makefile @@ -1,4 +1,7 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests + KYUAFILE= yes .include From nobody Fri Nov 7 14:59:08 2025 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 4d32JY24t3z6G3Db; Fri, 07 Nov 2025 14:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d32JY1Wz7z3PFw; Fri, 07 Nov 2025 14:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762527549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=be/YIk+XP2mFcVHRT0EfepVm/ZLTbjvW2UmweQDqd/A=; b=JJlkaBW+a8NB+LcmVlTIkC2pv4pld7cEUON57X4ytvH4YlSEcGqDiXCNkzFxqLJ59xYGfO yGKE/VjmPafMHd+aMcCfDVcDZuKepBdUaGekMQcbIjaSGHA6eIssc89mmvL/ExmeLXdeN3 g4B6nly8cscaKeZKI68UYYyW107NWZb7i/UdYDZ5OcW8Wg0f9/HnIJqbV9Cz8oZiPOAcIp 9GkMrMHGI1b0s8FpJrTxm/LUR4aVUrK8FW2jbg8B/pZ3xN5WohT5GF7uWraIKGwxCReW2N XdlqEJSTfO7JahQqMRdp94UVy3VXbSRgQO06k0exjihhEBQOpQS/FQt0Nlrp9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762527549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=be/YIk+XP2mFcVHRT0EfepVm/ZLTbjvW2UmweQDqd/A=; b=taVMfaaKx5zyPCWBk2Sc7Fw35sv8eKRud8Ny7jm2cdfg+S4zDeH+fBnnGDD41RRF9KEEVi w9tRWF6Wlc8J9hQJ2Co2E/v/E/icsr5V8h9iM1ugUTPm+6L325yG9SiQ4xjJh7uyRROMeU FbWzhaRNno5PlwhgYAtfz/HYKF9y16UUh6JNQE5ufHLFIh/3Mz/tXiQHIDbm8C31CV05b/ JElS+eu/F5uEvUJ7zckF9J0b/UncTG/t9pFSI5Ky2FLKgvzxT7+Li7yEOZVeWPgDajZpdP fwg1dOXMOxg1lH3BAGAUgW+KmVaUAUepZkpMnztqD/xYIjmxImVw2CbkrTM+5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762527549; a=rsa-sha256; cv=none; b=lavdfnefplqKeQlhoaweHBYDOckztzLfvmU3VIj9LToyy27+20BqfWQ5Q/0JYY6Zypnia9 D2Q4g6qUcSc17HDts5L7Xff9EK9aJDefNKJVMH2moPMNUdAKZASsNZbn5rYNjKgxKsOg+y Xk5/Bn0BGMoiFdN+BHRvKY3zhoU7jkanRkdg5WdkzUwNhRn1VhomBCA0+xceX3O2T6Uz7m rjE4hBRuSjd2RH25kuKsT8yd+/1nsd3seTSjFjRw2cK9r1Hpr5xZckH1AdmkiENSx/s8fl qUdwJbRzx0O4VOkpC1HgKj7/25o2s/fn0PQPbVC3fLhY7HpFiplTgn8sV9Krmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d32JY0Zw6z14JB; Fri, 07 Nov 2025 14:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7Ex83T083914; Fri, 7 Nov 2025 14:59:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7Ex8gI083911; Fri, 7 Nov 2025 14:59:08 GMT (envelope-from git) Date: Fri, 7 Nov 2025 14:59:08 GMT Message-Id: <202511071459.5A7Ex8gI083911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 72c76047541a - stable/15 - virtio: Fix polling in virtqueue_dequeue() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 72c76047541ab6cc0e989a74e8de4d6e6a1a94b6 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=72c76047541ab6cc0e989a74e8de4d6e6a1a94b6 commit 72c76047541ab6cc0e989a74e8de4d6e6a1a94b6 Author: Mark Johnston AuthorDate: 2025-11-04 14:27:33 +0000 Commit: Mark Johnston CommitDate: 2025-11-07 14:10:04 +0000 virtio: Fix polling in virtqueue_dequeue() The access of vq->vq_ring.used->idx needs to be volatile-qualified, otherwise the compiler may optimize virtqueue_poll() into an infinite loop if there is no data available upon the first poll. Prior to commit ad17789a8569 this wasn't a problem since an external function call after each poll inhibited the optimization. PR: 289930 MFC after: 3 days Sponsored by: Klara, Inc. Fixes: ad17789a8569 ("virtio: Remove the unused poll method") (cherry picked from commit f999ffdce3813eb946f10999ccffb8275c324469) --- sys/dev/virtio/virtqueue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c index cc7a233d60ee..41e01549c8b2 100644 --- a/sys/dev/virtio/virtqueue.c +++ b/sys/dev/virtio/virtqueue.c @@ -580,7 +580,8 @@ virtqueue_dequeue(struct virtqueue *vq, uint32_t *len) void *cookie; uint16_t used_idx, desc_idx; - if (vq->vq_used_cons_idx == vq_htog16(vq, vq->vq_ring.used->idx)) + if (vq->vq_used_cons_idx == + vq_htog16(vq, atomic_load_16(&vq->vq_ring.used->idx))) return (NULL); used_idx = vq->vq_used_cons_idx++ & (vq->vq_nentries - 1); From nobody Fri Nov 7 14:59:10 2025 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 4d32JZ49zpz6G3GT; Fri, 07 Nov 2025 14:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d32JZ1Qm0z3P07; Fri, 07 Nov 2025 14:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762527550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZYfZstQFBvEln1IEVBHemQ/lpA+7H89ud14cndmwpzo=; b=Nu2GA7wNXa44cEIFwfGOs6ZTM0VBi6s4wb3N8FBn6Tt2VDYHumQhHI8kyLlmQ6DmtguhPr QMKMCE3L8dHL8Nh/4Vjfr4MVc2Jtga71y8ePSjoWi3Q8J/d4y4UQhB0T8ua5rcQ/EzSjU3 Uel50/p5lonf8mE+2Io9Y6DF5YF7zLyqaY7iKQkfR6WRlP20MsbBaXSwoK8ICsrqRFYo6y 8hEwKuQM16sFP+e+d85CunrFp4zQogV/UwmgRMHpo9zN2ITpssesZjLGhNiqiczd4DvKlE QF1m1xqTJgIHDpl0GWO5f8+68ClKUdBPMGPwigK1y3xKgyNNL3+J+t4FkWUAzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762527550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZYfZstQFBvEln1IEVBHemQ/lpA+7H89ud14cndmwpzo=; b=CxZJMtjb2b7QlftxAvdRdsh6rxUX2gGWq7Lmcpj1R7m595jprXHUaaTMxOeLwiYe2zRUwq 3GbRALImX08bwyaXLOBnFwaH7LUV1w03mI/VchE1KsZOAStvqgqx2kj6nuZQZuN3zB4nXn dKkYdwsnWGsvApOFEd0NkXHVx8saCPqk7A2s+lXRfybuiaYNhZr8kVQpYUDaoKyVvdndDx iaQkOsBOG+KBNfV34VJSgf6VIE4fVfHy05qW+Br508Ni+c5A4ZmCQZpceuWpyXSiO7hR0A u6axoegQDBVry+xrgNyo55/d9b3+eA63Yf0W4CE5b5wStmQnjd7l3YKZaDenww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762527550; a=rsa-sha256; cv=none; b=iVB8SnJGLjbqtpM3c3IJQMD4OvexuC8S5D8xrc/+e7yRoefL++xEWLf/QlR2wpaFD5rEM3 zlmlHnEPy+39olPJE0ghmLQKTEKZ1VcBJKXxZJlAxcl9uXAnQM5ag9eYXi66POoXSc8big ow3cfsJrOHz/T10h5HGO/GU6WS/cbGu+zmNEwf8PNu9ET3YLSPTBSyKD0hVT5Z4TmYBDFj pMw9WCxg/2/LEfQZgZ/yUh9LzvWXUZSStTftKJOHYY1HYVqgREir4BgWIQUu4QGqhfU07U ama5TlRlLM9Oz20XtyN+r9EOeZIPLrRf1hpoxTIifNEddLfyLgy+7Y2+c+KwYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d32JZ0x90z13kG; Fri, 07 Nov 2025 14:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7ExATT083946; Fri, 7 Nov 2025 14:59:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7ExAlZ083943; Fri, 7 Nov 2025 14:59:10 GMT (envelope-from git) Date: Fri, 7 Nov 2025 14:59:10 GMT Message-Id: <202511071459.5A7ExAlZ083943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 129cedd20bc6 - stable/15 - riscv/vmm: Remove a redundant maxcpu check in vm_alloc_vcpu() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 129cedd20bc61a4851d3699c8afeed321bb03ae1 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=129cedd20bc61a4851d3699c8afeed321bb03ae1 commit 129cedd20bc61a4851d3699c8afeed321bb03ae1 Author: Mark Johnston AuthorDate: 2025-10-31 14:08:45 +0000 Commit: Mark Johnston CommitDate: 2025-11-07 14:10:29 +0000 riscv/vmm: Remove a redundant maxcpu check in vm_alloc_vcpu() aplic_max_cpu_count() just returns the VM's max vCPU count, and vm_alloc_vcpu() already checks that. Just remove this check so that it's easier to merge vm_alloc_vcpu() into MI code. If the APLIC really does require us to lower the limit, we should instead adjust vm->maxcpu in vm_create(). No functional change intended. Reviewed by: br MFC after: 1 week Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53496 (cherry picked from commit 5baa83cfcbd87109dc8a61fbb2e183998cc2d5c5) --- sys/riscv/vmm/vmm.c | 4 ---- sys/riscv/vmm/vmm_aplic.c | 10 ---------- sys/riscv/vmm/vmm_aplic.h | 1 - 3 files changed, 15 deletions(-) diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index fda444d6461b..7944c3d7a214 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -319,10 +319,6 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm)) return (NULL); - /* Some interrupt controllers may have a CPU limit */ - if (vcpuid >= aplic_max_cpu_count(vm->cookie)) - return (NULL); - vcpu = (struct vcpu *) atomic_load_acq_ptr((uintptr_t *)&vm->vcpu[vcpuid]); if (__predict_true(vcpu != NULL)) diff --git a/sys/riscv/vmm/vmm_aplic.c b/sys/riscv/vmm/vmm_aplic.c index 4df41f2de1a5..74cb4fef4273 100644 --- a/sys/riscv/vmm/vmm_aplic.c +++ b/sys/riscv/vmm/vmm_aplic.c @@ -577,13 +577,3 @@ aplic_sync_hwstate(struct hypctx *hypctx) { } - -int -aplic_max_cpu_count(struct hyp *hyp) -{ - int16_t max_count; - - max_count = vm_get_maxcpus(hyp->vm); - - return (max_count); -} diff --git a/sys/riscv/vmm/vmm_aplic.h b/sys/riscv/vmm/vmm_aplic.h index 49510221b419..96018fe9adda 100644 --- a/sys/riscv/vmm/vmm_aplic.h +++ b/sys/riscv/vmm/vmm_aplic.h @@ -49,6 +49,5 @@ void aplic_cpuinit(struct hypctx *hypctx); void aplic_cpucleanup(struct hypctx *hypctx); void aplic_flush_hwstate(struct hypctx *hypctx); void aplic_sync_hwstate(struct hypctx *hypctx); -int aplic_max_cpu_count(struct hyp *hyp); #endif /* !_VMM_APLIC_H_ */ From nobody Fri Nov 7 14:59:11 2025 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 4d32Jb67cBz6G3Br; Fri, 07 Nov 2025 14:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d32Jb2SQLz3P41; Fri, 07 Nov 2025 14:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762527551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DGPdD9IPwf7AeaOBJFo2e/atB2Dj4Xpl9b/3pxrA8GU=; b=KY6MMTti7r8ZFwliBdWP4GXXedbXlRjW5JcD+DuxIpx2tUH6+WjPpoNjiI95rqSw2uZlHy HiX4mBpdD8+K8flYjWY2h76ewrxzI2D6kuj+7ybR4t3A+TnwW87AI9udl7KzfW5v+FkgA6 XbcQ/efvz/dveYnilHdTuyPSKQd895TSXld8Ly4RrxnWXnDUOAwxE4vhMTf6qyJqBnXvIP Y79RtOZOW8lWFZqjPh0CaIJtEFea2RuruMwHzhdHydpg1MGfLp3zCpwP2xUl/vLkClExoP DfB5EQttJacKGhQSunL9yLF44lFAECHw5iUNfmc80/jHxd7J1dBpCWx+4e8pgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762527551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DGPdD9IPwf7AeaOBJFo2e/atB2Dj4Xpl9b/3pxrA8GU=; b=JJWdG2yQJVNpGk0wdNOOiSE4tSBDL2IOMCQu10g/H0HhmJoso6czY2Kls5LlgtNNNCLpwG RN0+B9wW1FqnbJCfC3gUAiAbWTHuUgWmgHe4b4UqodcNq+KY6JMjUDb+hDfseZg5hnc2UC Vqj9slTGV6pU9zmRV/qPkhGI9ZmPyIv3Y74WUHazRhUGGjUEcWMUggGvGQ23Pm8dusUOcG /jIFg7fby2S+ejn9PpAgcTauu2z6MqzV/A6gXLR4PAsxATiMZgGj7yBAze6oEvv0KyyBnA IGOiykZ5XDkVPRg8ngpCmCuDP4OBgbxLihoIbRtn+HcNQvge9wpJvm+bJ8q+QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762527551; a=rsa-sha256; cv=none; b=q3EOF1z6ygBuE0qGDt3dp/3TymrA+8kT7bWzyNlJK+9K1jDPcNNz5CEGxF+KX3Ik7nz5Yg aVCT3jrPy0Xw9oL/ubmOp2mOqMJCVXQIBFJF0zVU+hgDPau9CaOloPVWtyTBoqPWcGytbn PIp3zxj3Kr5y3XoAjzWp6TYxC6CiyLnr7i6BeTOACgU8NP5cjGqesVNiJMWkaHgJeYPgR2 YoH02rnsLuHQqzOcN2Q8nbCGNlIq24cuC97PxvKdv4pLTrbxqnLBCr+NQKrrFhiYJBpLU1 rcTPGxYTmi7v67V5rEzMW+rLd8HAEPdJeFERjXMVxqr3UTDUfN+Sgl7iU5+cGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d32Jb1vndz13mm; Fri, 07 Nov 2025 14:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7ExB8Y083978; Fri, 7 Nov 2025 14:59:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7ExBJH083975; Fri, 7 Nov 2025 14:59:11 GMT (envelope-from git) Date: Fri, 7 Nov 2025 14:59:11 GMT Message-Id: <202511071459.5A7ExBJH083975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 300a8977bcfd - stable/15 - vmm: Fix a deadlock between vm_smp_rendezvous() and vcpu_lock_all() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 300a8977bcfd2f43bc6df81d9bdad6b79a740729 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=300a8977bcfd2f43bc6df81d9bdad6b79a740729 commit 300a8977bcfd2f43bc6df81d9bdad6b79a740729 Author: Mark Johnston AuthorDate: 2025-10-17 13:09:38 +0000 Commit: Mark Johnston CommitDate: 2025-11-07 14:10:36 +0000 vmm: Fix a deadlock between vm_smp_rendezvous() and vcpu_lock_all() vm_smp_rendezvous() invokes a callback on all vCPUs, blocking the initiator until all vCPUs have responded. vcpu_lock_all() blocks each vCPU by waiting for it to go idle and setting the vCPU state to frozen. These two operations can deadlock on each other, particularly when booting a Windows guest, when vcpu_lock_all() blocks waiting for a rendezvous initiator, and the initiator is blocked waiting for the vCPU thread which called vcpu_lock_all() to invoke the rendezvous callback. Implement vcpu_lock_all() in a way that avoids deadlocks with vm_smp_rendezvous(). In particular, when traversing vCPUs, invoke the rendezvous callback on the vCPU's behalf to help the initiator finish. We can only safely do so when the vCPU is IDLE or we have already locked it, otherwise we may be racing with the target vCPU thread. Thus: - Use an exclusive lock to serialize vcpu_lock_all() callers, which lets us lock vCPUs out of order without fear of deadlock with parallel vcpu_lock_all() callers. - If a rendezvous is pending, lock all idle vCPUs and invoke the callback on their behalf. If the vcpu_lock_all() caller is itself a vCPU thread, this will handle that thread. - Block waiting for all non-idle vCPUs to idle, or until one of them initiates a rendezvous, in which case we go back and invoke callbacks on behalf of already-locked vCPUs. Note that on !amd64 no changes are needed since there is no rendezvous mechanism, so there is a separate vcpu_set_state_all() for them based on the previous vcpu_lock_all(). These will be merged together once vcpu state handling is consolidated into sys/dev/vmm. Reviewed by: corvink (previous version) MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D52968 (cherry picked from commit f39768e52e513264da60add0ca2412bddda271ff) --- sys/amd64/include/vmm.h | 3 +- sys/amd64/vmm/vmm.c | 177 ++++++++++++++++++++++++++++++++++++++++-------- sys/arm64/include/vmm.h | 2 +- sys/arm64/vmm/vmm.c | 4 +- sys/dev/vmm/vmm_dev.c | 28 ++++++-- sys/riscv/include/vmm.h | 2 +- sys/riscv/vmm/vmm.c | 4 +- 7 files changed, 178 insertions(+), 42 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 66d8991d36e8..ad67510fecf3 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -237,7 +237,7 @@ extern u_int vm_maxcpu; /* maximum virtual cpus */ int vm_create(const char *name, struct vm **retvm); struct vcpu *vm_alloc_vcpu(struct vm *vm, int vcpuid); void vm_disable_vcpu_creation(struct vm *vm); -void vm_slock_vcpus(struct vm *vm); +void vm_lock_vcpus(struct vm *vm); void vm_unlock_vcpus(struct vm *vm); void vm_destroy(struct vm *vm); int vm_reinit(struct vm *vm); @@ -362,6 +362,7 @@ enum vcpu_state { }; int vcpu_set_state(struct vcpu *vcpu, enum vcpu_state state, bool from_idle); +int vcpu_set_state_all(struct vm *vm, enum vcpu_state state); enum vcpu_state vcpu_get_state(struct vcpu *vcpu, int *hostcpu); static int __inline diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 7254ebed6097..473887240b9b 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -562,9 +562,9 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) } void -vm_slock_vcpus(struct vm *vm) +vm_lock_vcpus(struct vm *vm) { - sx_slock(&vm->vcpus_init_lock); + sx_xlock(&vm->vcpus_init_lock); } void @@ -991,6 +991,54 @@ save_guest_fpustate(struct vcpu *vcpu) static VMM_STAT(VCPU_IDLE_TICKS, "number of ticks vcpu was idle"); +/* + * Invoke the rendezvous function on the specified vcpu if applicable. Return + * true if the rendezvous is finished, false otherwise. + */ +static bool +vm_rendezvous(struct vcpu *vcpu) +{ + struct vm *vm = vcpu->vm; + int vcpuid; + + mtx_assert(&vcpu->vm->rendezvous_mtx, MA_OWNED); + KASSERT(vcpu->vm->rendezvous_func != NULL, + ("vm_rendezvous: no rendezvous pending")); + + /* 'rendezvous_req_cpus' must be a subset of 'active_cpus' */ + CPU_AND(&vm->rendezvous_req_cpus, &vm->rendezvous_req_cpus, + &vm->active_cpus); + + vcpuid = vcpu->vcpuid; + if (CPU_ISSET(vcpuid, &vm->rendezvous_req_cpus) && + !CPU_ISSET(vcpuid, &vm->rendezvous_done_cpus)) { + VMM_CTR0(vcpu, "Calling rendezvous func"); + (*vm->rendezvous_func)(vcpu, vm->rendezvous_arg); + CPU_SET(vcpuid, &vm->rendezvous_done_cpus); + } + if (CPU_CMP(&vm->rendezvous_req_cpus, + &vm->rendezvous_done_cpus) == 0) { + VMM_CTR0(vcpu, "Rendezvous completed"); + CPU_ZERO(&vm->rendezvous_req_cpus); + vm->rendezvous_func = NULL; + wakeup(&vm->rendezvous_func); + return (true); + } + return (false); +} + +static void +vcpu_wait_idle(struct vcpu *vcpu) +{ + KASSERT(vcpu->state != VCPU_IDLE, ("vcpu already idle")); + + vcpu->reqidle = 1; + vcpu_notify_event_locked(vcpu, false); + VMM_CTR1(vcpu, "vcpu state change from %s to " + "idle requested", vcpu_state2str(vcpu->state)); + msleep_spin(&vcpu->state, &vcpu->mtx, "vmstat", hz); +} + static int vcpu_set_state_locked(struct vcpu *vcpu, enum vcpu_state newstate, bool from_idle) @@ -1005,13 +1053,8 @@ vcpu_set_state_locked(struct vcpu *vcpu, enum vcpu_state newstate, * ioctl() operating on a vcpu at any point. */ if (from_idle) { - while (vcpu->state != VCPU_IDLE) { - vcpu->reqidle = 1; - vcpu_notify_event_locked(vcpu, false); - VMM_CTR1(vcpu, "vcpu state change from %s to " - "idle requested", vcpu_state2str(vcpu->state)); - msleep_spin(&vcpu->state, &vcpu->mtx, "vmstat", hz); - } + while (vcpu->state != VCPU_IDLE) + vcpu_wait_idle(vcpu); } else { KASSERT(vcpu->state != VCPU_IDLE, ("invalid transition from " "vcpu idle state")); @@ -1063,6 +1106,95 @@ vcpu_set_state_locked(struct vcpu *vcpu, enum vcpu_state newstate, return (0); } +/* + * Try to lock all of the vCPUs in the VM while taking care to avoid deadlocks + * with vm_smp_rendezvous(). + * + * The complexity here suggests that the rendezvous mechanism needs a rethink. + */ +int +vcpu_set_state_all(struct vm *vm, enum vcpu_state newstate) +{ + cpuset_t locked; + struct vcpu *vcpu; + int error, i; + uint16_t maxcpus; + + KASSERT(newstate != VCPU_IDLE, + ("vcpu_set_state_all: invalid target state %d", newstate)); + + error = 0; + CPU_ZERO(&locked); + maxcpus = vm->maxcpus; + + mtx_lock(&vm->rendezvous_mtx); +restart: + if (vm->rendezvous_func != NULL) { + /* + * If we have a pending rendezvous, then the initiator may be + * blocked waiting for other vCPUs to execute the callback. The + * current thread may be a vCPU thread so we must not block + * waiting for the initiator, otherwise we get a deadlock. + * Thus, execute the callback on behalf of any idle vCPUs. + */ + for (i = 0; i < maxcpus; i++) { + vcpu = vm_vcpu(vm, i); + if (vcpu == NULL) + continue; + vcpu_lock(vcpu); + if (vcpu->state == VCPU_IDLE) { + (void)vcpu_set_state_locked(vcpu, VCPU_FROZEN, + true); + CPU_SET(i, &locked); + } + if (CPU_ISSET(i, &locked)) { + /* + * We can safely execute the callback on this + * vCPU's behalf. + */ + vcpu_unlock(vcpu); + (void)vm_rendezvous(vcpu); + vcpu_lock(vcpu); + } + vcpu_unlock(vcpu); + } + } + + /* + * Now wait for remaining vCPUs to become idle. This may include the + * initiator of a rendezvous that is currently blocked on the rendezvous + * mutex. + */ + CPU_FOREACH_ISCLR(i, &locked) { + if (i >= maxcpus) + break; + vcpu = vm_vcpu(vm, i); + if (vcpu == NULL) + continue; + vcpu_lock(vcpu); + while (vcpu->state != VCPU_IDLE) { + mtx_unlock(&vm->rendezvous_mtx); + vcpu_wait_idle(vcpu); + vcpu_unlock(vcpu); + mtx_lock(&vm->rendezvous_mtx); + if (vm->rendezvous_func != NULL) + goto restart; + vcpu_lock(vcpu); + } + error = vcpu_set_state_locked(vcpu, newstate, true); + vcpu_unlock(vcpu); + if (error != 0) { + /* Roll back state changes. */ + CPU_FOREACH_ISSET(i, &locked) + (void)vcpu_set_state(vcpu, VCPU_IDLE, false); + break; + } + CPU_SET(i, &locked); + } + mtx_unlock(&vm->rendezvous_mtx); + return (error); +} + static void vcpu_require_state(struct vcpu *vcpu, enum vcpu_state newstate) { @@ -1084,36 +1216,23 @@ vcpu_require_state_locked(struct vcpu *vcpu, enum vcpu_state newstate) static int vm_handle_rendezvous(struct vcpu *vcpu) { - struct vm *vm = vcpu->vm; + struct vm *vm; struct thread *td; - int error, vcpuid; - error = 0; - vcpuid = vcpu->vcpuid; td = curthread; + vm = vcpu->vm; + mtx_lock(&vm->rendezvous_mtx); while (vm->rendezvous_func != NULL) { - /* 'rendezvous_req_cpus' must be a subset of 'active_cpus' */ - CPU_AND(&vm->rendezvous_req_cpus, &vm->rendezvous_req_cpus, &vm->active_cpus); - - if (CPU_ISSET(vcpuid, &vm->rendezvous_req_cpus) && - !CPU_ISSET(vcpuid, &vm->rendezvous_done_cpus)) { - VMM_CTR0(vcpu, "Calling rendezvous func"); - (*vm->rendezvous_func)(vcpu, vm->rendezvous_arg); - CPU_SET(vcpuid, &vm->rendezvous_done_cpus); - } - if (CPU_CMP(&vm->rendezvous_req_cpus, - &vm->rendezvous_done_cpus) == 0) { - VMM_CTR0(vcpu, "Rendezvous completed"); - CPU_ZERO(&vm->rendezvous_req_cpus); - vm->rendezvous_func = NULL; - wakeup(&vm->rendezvous_func); + if (vm_rendezvous(vcpu)) break; - } + VMM_CTR0(vcpu, "Wait for rendezvous completion"); mtx_sleep(&vm->rendezvous_func, &vm->rendezvous_mtx, 0, "vmrndv", hz); if (td_ast_pending(td, TDA_SUSPEND)) { + int error; + mtx_unlock(&vm->rendezvous_mtx); error = thread_check_susp(td, true); if (error != 0) diff --git a/sys/arm64/include/vmm.h b/sys/arm64/include/vmm.h index 84b286a60b38..696a69669a2a 100644 --- a/sys/arm64/include/vmm.h +++ b/sys/arm64/include/vmm.h @@ -177,7 +177,7 @@ DECLARE_VMMOPS_FUNC(int, restore_tsc, (void *vcpui, uint64_t now)); int vm_create(const char *name, struct vm **retvm); struct vcpu *vm_alloc_vcpu(struct vm *vm, int vcpuid); void vm_disable_vcpu_creation(struct vm *vm); -void vm_slock_vcpus(struct vm *vm); +void vm_lock_vcpus(struct vm *vm); void vm_unlock_vcpus(struct vm *vm); void vm_destroy(struct vm *vm); int vm_reinit(struct vm *vm); diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 4f266de0cfb1..14ea26c3668c 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -469,9 +469,9 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) } void -vm_slock_vcpus(struct vm *vm) +vm_lock_vcpus(struct vm *vm) { - sx_slock(&vm->vcpus_init_lock); + sx_xlock(&vm->vcpus_init_lock); } void diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 5b857a171e94..ebbceb25b69e 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -121,18 +121,18 @@ vcpu_unlock_one(struct vcpu *vcpu) vcpu_set_state(vcpu, VCPU_IDLE, false); } +#ifndef __amd64__ static int -vcpu_lock_all(struct vmmdev_softc *sc) +vcpu_set_state_all(struct vm *vm, enum vcpu_state newstate) { struct vcpu *vcpu; int error; uint16_t i, j, maxcpus; error = 0; - vm_slock_vcpus(sc->vm); - maxcpus = vm_get_maxcpus(sc->vm); + maxcpus = vm_get_maxcpus(vm); for (i = 0; i < maxcpus; i++) { - vcpu = vm_vcpu(sc->vm, i); + vcpu = vm_vcpu(vm, i); if (vcpu == NULL) continue; error = vcpu_lock_one(vcpu); @@ -142,16 +142,32 @@ vcpu_lock_all(struct vmmdev_softc *sc) if (error) { for (j = 0; j < i; j++) { - vcpu = vm_vcpu(sc->vm, j); + vcpu = vm_vcpu(vm, j); if (vcpu == NULL) continue; vcpu_unlock_one(vcpu); } - vm_unlock_vcpus(sc->vm); } return (error); } +#endif + +static int +vcpu_lock_all(struct vmmdev_softc *sc) +{ + int error; + + /* + * Serialize vcpu_lock_all() callers. Individual vCPUs are not locked + * in a consistent order so we need to serialize to avoid deadlocks. + */ + vm_lock_vcpus(sc->vm); + error = vcpu_set_state_all(sc->vm, VCPU_FROZEN); + if (error != 0) + vm_unlock_vcpus(sc->vm); + return (error); +} static void vcpu_unlock_all(struct vmmdev_softc *sc) diff --git a/sys/riscv/include/vmm.h b/sys/riscv/include/vmm.h index bc00474ed0fd..e227dd825966 100644 --- a/sys/riscv/include/vmm.h +++ b/sys/riscv/include/vmm.h @@ -149,7 +149,7 @@ DECLARE_VMMOPS_FUNC(void, vmspace_free, (struct vmspace *vmspace)); int vm_create(const char *name, struct vm **retvm); struct vcpu *vm_alloc_vcpu(struct vm *vm, int vcpuid); void vm_disable_vcpu_creation(struct vm *vm); -void vm_slock_vcpus(struct vm *vm); +void vm_lock_vcpus(struct vm *vm); void vm_unlock_vcpus(struct vm *vm); void vm_destroy(struct vm *vm); int vm_reinit(struct vm *vm); diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index 7944c3d7a214..a9eb9d144336 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -342,9 +342,9 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) } void -vm_slock_vcpus(struct vm *vm) +vm_lock_vcpus(struct vm *vm) { - sx_slock(&vm->vcpus_init_lock); + sx_xlock(&vm->vcpus_init_lock); } void From nobody Fri Nov 7 19:00:40 2025 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 4d37gD61MHz650VG; Fri, 07 Nov 2025 19:00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d37gD3vJvz4KLl; Fri, 07 Nov 2025 19:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762542040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=78SPOiVmHEz8dH1mUihpsxXe2J1HwnX3kTlwP/WlK5Y=; b=rs+9StgYvKx+3y3D5LaA2ssox8nZ5cE0ITcKjyPm5pWjkdS65l9rnF8MFysm75j5jOaXuG WcKfH2GLstVOMcegLosTLcxqwDHhnQKcOCU9IpZZHW3bl/q3Xt2v+pDfxdqRtHPJaoBXGm aBpoIo8heBsMjTG28chIcyU+rsx6XjoFbZ88GTJPwbQ13TC1eDFqhfiUJtytdTpDDWXBsm pDMKu/Mt99pohomlfSAvrH2U+t1dI/MEXwdAISqvbGViGvzRD47MhIW0c7/HpoNESn5LoU inf4SsTIc4L8bgfYjbSi/2xTsoSYjHx2psSLslWxFgVAKPMFR2rTtoxijr6hGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762542040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=78SPOiVmHEz8dH1mUihpsxXe2J1HwnX3kTlwP/WlK5Y=; b=AbOhgpJHT3RzHzvN0f/MBQu0hmO5WL1Bdl1oQ/2RmoHZ6OuP2FLoZseldjr1wEgeuHDOvP 06kJ1OPComy0G8IAdcFeKkZuge48s5aJ9A27DHewLUrqntiGFrdXomf0XsxFMOGGTilLuW jtP/o9877X8KlTA/xiAejLAka97Npk9qE9H8IAk7rXn1+E3que4cZpwZSW3snhY8ARWIsT 6iFcQqZ2EBVPjzxtz/u54SQKlHD5vJqoAEQQfjJ1QGju67mRdypRVCdpVNoU0NiBmhgIYu qvX3P0cGlPEhRQ6EiiPc2fCfZEwR2v8ewnNI+FGScpPS36WNvgWIeb5l3NzMTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762542040; a=rsa-sha256; cv=none; b=hmH1eIb8LwwwXj7Wh6r3yihjmSx8e2QPpUD5wf07cVohn9rJGy0XVV3bAM7Qoj/jn7gVfU 9bUeczwhQ/rRjScweyKZRr1dELhLSp9cjwvm7qBJi/qkdgmAuEb8U1Ce5AfvLdmBTsJsLi TqZYhgYArqV+Nd2JGrH+9Rk17YTSsAEGV7AMeLNJ8wvdjMVn/F53BN/KsoyMUGPN8x/til foTc6/e5YWcoKgw1JkTZU4EQwSWgoQ7nA8+QRApf8bzcqPcqX0bUpw0UmhsCXVyNJbx2h4 A8KVNxmr1DPDfB1imug8gMwkFxUeudx47UFY6zKajwa1RWo7XYTUCu8QC0zCzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d37gD3Tzqz19Pf; Fri, 07 Nov 2025 19:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7J0eXh051744; Fri, 7 Nov 2025 19:00:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7J0e4c051741; Fri, 7 Nov 2025 19:00:40 GMT (envelope-from git) Date: Fri, 7 Nov 2025 19:00:40 GMT Message-Id: <202511071900.5A7J0e4c051741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: a432ffb091eb - stable/13 - if_vxlan: fix byteorder of source port List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/13 X-Git-Reftype: branch X-Git-Commit: a432ffb091ebf7b72227d7b57fb02490a870d645 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a432ffb091ebf7b72227d7b57fb02490a870d645 commit a432ffb091ebf7b72227d7b57fb02490a870d645 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-10-21 18:58:26 +0000 Commit: Kristof Provost CommitDate: 2025-11-07 08:57:49 +0000 if_vxlan: fix byteorder of source port Fix the htons byteorder of vxlan packets after `vxlan_pick_source_port` picks a source port during encapsulation. Reviewed by: zlei, kp, adrian Differential Revision: https://reviews.freebsd.org/D53022 (cherry picked from commit 1cc316727ebae157b3d035d9fb1ad38310a80698) --- sys/net/if_vxlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 737a2ae312ac..96616be49784 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2530,7 +2530,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = sc->vxl_src_addr.in4.sin_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = fvxlsa->in4.sin_addr; dstport = fvxlsa->in4.sin_port; @@ -2641,7 +2641,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = &sc->vxl_src_addr.in6.sin6_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = &fvxlsa->in6.sin6_addr; dstport = fvxlsa->in6.sin6_port; From nobody Fri Nov 7 19:00:41 2025 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 4d37gF47Lyz650tL; Fri, 07 Nov 2025 19:00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d37gF2QtRz4KDV; Fri, 07 Nov 2025 19:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762542041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkPRq4Auc03QA8aC80HK6kNDLpYVLFgjECAPxz05nDw=; b=gqL2tB7e+X2hdArrcBS6i/dsXQJqe3bpjPJI7tQSQeRs5Qg6eg2ydgsKiBez+/61VTqFHn KqEMXTx+Fv7AH0IH7VaFgIk8Yv4AW8gD9ZZmmzFnQt/cSQVZocP685ajrCtS8ZuGp1j7JV H8e5fzrz36Rs5hXRzhXlDbLwcNa6wBlIFCmloB8MXo3n4uq4g6pyWgSX7vEr4gmstF/2o0 IHi4gR/OuSib80t96IDfLZufmlnff4Xcn+C3ctftHlVZrMkqxlNG3wxiJOdl2fDb+VHhSL QcNltOP4RMEJt4JyD3mzU5sxTRtx4VDpKxI0Mpv2y1TzzYmdB8qU/lMCnDoRKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762542041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkPRq4Auc03QA8aC80HK6kNDLpYVLFgjECAPxz05nDw=; b=x1wAFAuLsm+NVQZfgOAKyUoV8BarRXwxRiClN4F/Jd8yCF5JSlJlewVgyZevKmyShhO+zY d0+ObMaAelVdXnUEWCoWuLt9Vf0IhqZIA7VUzPr/Tyd1MSOX+FSdUb6r3sXkcXbQnFWNLE G+58VHzL/aOLL3g7YuDgoa2naZcFaERLD7jzV4NZpKlPBrvI+lC0Gh2c/+VNW43Oa1h9Se 4zuo1UD4Z3PXXhxZH7j9E5F07AM9y1DrjuVGHm0XCGBjyU7knEcJwPvKDJ0VQkT/LTELrC yvOKy9smj7tOGTyCrk/c0Xv8L2hXwO+N4uZNYGNI2MW03C8V66Gp/suaPtqFMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762542041; a=rsa-sha256; cv=none; b=bGflHJFZGJE9fXW2vDdt+1AcSz+7HWjH9YYXwCXeNJiQAM2SlVVic4HZGf0amlOiNdZ1LQ JFTj/q9OwDkxmKyEdzoZr+dS8xkIShmUF6PF+Pc7UobwNKC6UXUBMu8tGHez4Ikjuc3u0x 1LOzXsVhu+7tfwRlWyGac17x2a1OEvUzqwZHfE2wXJ68Rxw6YtpTDxTb6h5N5HOwcyHcEu A5/AzEsgW2yRim8bF4KP9mlvF9raY401ffahC7rqWuJGfNQyYRkZMsagllzTitqm81Jplf tTNSOtMOztF4c+H1PKf8qAvK2idEKl3jQuly5mQOqcx38me2gCaHAEiIPu3PHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d37gF1lWZz1B27; Fri, 07 Nov 2025 19:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7J0flI051848; Fri, 7 Nov 2025 19:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7J0flR051841; Fri, 7 Nov 2025 19:00:41 GMT (envelope-from git) Date: Fri, 7 Nov 2025 19:00:41 GMT Message-Id: <202511071900.5A7J0flR051841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: a83a049d1c63 - stable/14 - if_vxlan: fix byteorder of source port List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: a83a049d1c63e33cacf1cd62d0bbb7c9d9bd73bd Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a83a049d1c63e33cacf1cd62d0bbb7c9d9bd73bd commit a83a049d1c63e33cacf1cd62d0bbb7c9d9bd73bd Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-10-21 18:58:26 +0000 Commit: Kristof Provost CommitDate: 2025-11-07 08:57:47 +0000 if_vxlan: fix byteorder of source port Fix the htons byteorder of vxlan packets after `vxlan_pick_source_port` picks a source port during encapsulation. Reviewed by: zlei, kp, adrian Differential Revision: https://reviews.freebsd.org/D53022 (cherry picked from commit 1cc316727ebae157b3d035d9fb1ad38310a80698) --- sys/net/if_vxlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 71d9223e366e..1f242d86ece5 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2534,7 +2534,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = sc->vxl_src_addr.in4.sin_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = fvxlsa->in4.sin_addr; dstport = fvxlsa->in4.sin_port; @@ -2645,7 +2645,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = &sc->vxl_src_addr.in6.sin6_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = &fvxlsa->in6.sin6_addr; dstport = fvxlsa->in6.sin6_port; From nobody Fri Nov 7 19:00:41 2025 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 4d37gF50bfz6510t; Fri, 07 Nov 2025 19:00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d37gF43yTz4KP7; Fri, 07 Nov 2025 19:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762542041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wu/0jTUQmEbFmGQr2D/QWvhBCxrQ8vmaBqWlKJq+0U=; b=YEiXoABctCZjKRadOLW+1jLX6lJWgAYelCVq1zs4xrVID6x8VHJoCJNLLPpO/zkmgC7TW9 ymEE31dcr5JHi/QGuuYuIvFbFbF++owgxIZymSLoYnJEvh69M6XfogmNe1fcTM2bUiTveL lL3thKSAWpxdqXRBffUKC9v9xluJ+JD7Bo6lfcN8HgHlZiMack7VcNoIxos7G+C9E5vP0i 9gKW05Ydm0BQYC40pGFinIbvenWIfbfBGnYIXEIsDCuPeA7KjNmJxR3csvn6j3174KmLun +IbgcLcc2l5//v+bZstYIEfUzNJTt1wmSe65XRTNkc4YOBaJtqpf+0W/sF6vuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762542041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wu/0jTUQmEbFmGQr2D/QWvhBCxrQ8vmaBqWlKJq+0U=; b=k71WnswVL74gKvhv0fvICv3GF0Cj8CkrpylfK2mRZB/dzv4oNngBuofvi1FkqL2iJLs/RE sz3V1POQE/XxWhnEUC4/BJadaUoR5OcXEnR+WVPcZw8BXmMyQ5l0iJXcP3NvE9rQUZmBf3 7r0eO3vwVXjbc8sBTAtim9kcwhPze84HVsne/B3YgALIVGG1k7Ni5zfvI7fehtwM2WQGzx RGKwsiYMeOsiQDGrkneogUnoRKeehzD2u0NbGtut3DLGREjp+K60a73xwLuhsv/WRfK5P0 jXHKqdgDLfvNTZqMBHnC0LMt6koGOqRBvULd3SXdk8LtZrkoMZxi2/xs2DJNIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762542041; a=rsa-sha256; cv=none; b=SF2/jQPHt4MeCtApFELf0133uOHBuJ2BXrzlT2IHg90RQG7pYMRC4ywRB+mb48FguZWA3c yJyrS+IP1YnpTF5ELGNfNgcf0Y4cXzMlRsf8abzhR+y/FF60mWuwFVGVZBbdj4FG9J3Ofc 59rBZBlEVLDlubrjYEzP++JYjP62RIoN2mNtRyEzM0GnLRINsK8fl0hCb/WXNQVsepVDMf M/qw2w+woPQeY2IbICGVcmO423vQu1Hm7yukx5QNeJGfFgs+ItrgKUSX0EOWYnDWw7qeXs h+3FmAtVmc1TwnGx4mrHI0VlWPejIe7FrgTLJjqiiomXzM5Mb7DRYn8fEWsP3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d37gF3Whwz19kk; Fri, 07 Nov 2025 19:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7J0fRx051927; Fri, 7 Nov 2025 19:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7J0fkq051922; Fri, 7 Nov 2025 19:00:41 GMT (envelope-from git) Date: Fri, 7 Nov 2025 19:00:41 GMT Message-Id: <202511071900.5A7J0fkq051922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9c90145e8c3b - stable/15 - if_vxlan: fix byteorder of source port List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 9c90145e8c3ba7140994e327ebbe097b4efbe0d3 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9c90145e8c3ba7140994e327ebbe097b4efbe0d3 commit 9c90145e8c3ba7140994e327ebbe097b4efbe0d3 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-10-21 18:58:26 +0000 Commit: Kristof Provost CommitDate: 2025-11-07 18:58:40 +0000 if_vxlan: fix byteorder of source port Fix the htons byteorder of vxlan packets after `vxlan_pick_source_port` picks a source port during encapsulation. Reviewed by: zlei, kp, adrian Differential Revision: https://reviews.freebsd.org/D53022 (cherry picked from commit 1cc316727ebae157b3d035d9fb1ad38310a80698) --- sys/net/if_vxlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 03184c1fb678..f3a8410a2258 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2533,7 +2533,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = sc->vxl_src_addr.in4.sin_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = fvxlsa->in4.sin_addr; dstport = fvxlsa->in4.sin_port; @@ -2644,7 +2644,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = &sc->vxl_src_addr.in6.sin6_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = &fvxlsa->in6.sin6_addr; dstport = fvxlsa->in6.sin6_port; From nobody Fri Nov 7 21:58:56 2025 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 4d3Ccx0cY6z6DgZX; Fri, 07 Nov 2025 21:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Ccx08GXz3RDZ; Fri, 07 Nov 2025 21:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762552737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oh2uUbkW03cgyuxvQRjDMET2K75h2hArLYuQrei7IGc=; b=O9oVDsd+8qACdwpf1qLCRebScs5Tz2quYTVWC3CXGMWeRuRFpCSAr/KrLad9AHNHHs5jhQ cHzJmtEYGtgrh5VmlLbnAbEyV9PJQ9UdDjCiC+TJWP+ly4ZoODPqlpuXU9C5Qp83Cgqwk/ 6cfRk2bC1FjaHabDaU0j46TLer0hTGVcWcVY9GElEk28yK39/QwpAPql1YPN15H9WJlR6m AHFDsffuoGLV2kOgYxw0Wzl9dU7eLT9OWCKQmb6p5pmplUk90sSc6c1INF1xlPTbdb7Gk5 pTyqM/SWTaIKi8swHUNUYUUhOGBnh9pjzwVtut1GnGtXWJLs1zTo59NBKMKTCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762552737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oh2uUbkW03cgyuxvQRjDMET2K75h2hArLYuQrei7IGc=; b=xFBdABYCmjVpHV6ey9dhM3FvN6v3PxZrXCgQBluLBQeF6u5AmYqTh89ntrofxcDvZZmpV+ lFWTe5HXfLETBSb+1bkObqPfqk4QNvAaDlVyvSshmeAizGaZvV0Dzi/gcvIsFRYMiZNhml PAmnzV61QYHccyjGRPNB0B3/qaXVXJj/zKdCEpH6FxqPTOh+sy6/LFC7+qUlbFwWfx20Py nTCXHfU1K6bNECt5TRl7IAg1krmPBvhPOswt9bWfR0YSCaV6pbWSc4AP+E4Q+g1v2/pYY0 HfJSCPD2wYsghvd2NZ0k89IS4lkV0gQfY+BFSKQFI4GRc3QVlrD42UFnLmUIcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762552737; a=rsa-sha256; cv=none; b=fU05fA6Xtmn1A9W/sSwye5oQno5DGzvkFDu7ZDO3rURKKjtrlijmt8VzmyugkoJXTkWKix ieMasuvfqP8IIRev9YDjwxCp7ZE0pvkBhPuQNfq2hm8sTN0WXBEmYaJ7n4pPaLc9ppuFGZ sR1Tfpqi0DJwxg1WboilM9RKjKM2ARX3bUjLMYthDLY+F/eT9mMhvN60nEpKlW95ZwI/sP oOO3W5iSyoTYg0OlzbOQlAICJdADGFd5y5oGZBuwIu+D19IrTeJGuEMXTOxld6ilLp6W/T QwTTczdo+YqK0sqXGvAn7QSnoFDggfZfIHo27JBpd6qRN45SD0J4cZRYyy94Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Ccw6pGyz2tt; Fri, 07 Nov 2025 21:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7LwudE081283; Fri, 7 Nov 2025 21:58:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7LwurD081280; Fri, 7 Nov 2025 21:58:56 GMT (envelope-from git) Date: Fri, 7 Nov 2025 21:58:56 GMT Message-Id: <202511072158.5A7LwurD081280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1772049a8ace - stable/13 - Revert "Merge commit e24f90190c77 from llvm git (by Brad Smith):" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1772049a8ace71b1263ac87839288786c6a07e60 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1772049a8ace71b1263ac87839288786c6a07e60 commit 1772049a8ace71b1263ac87839288786c6a07e60 Author: Dimitry Andric AuthorDate: 2025-10-31 15:48:31 +0000 Commit: Dimitry Andric CommitDate: 2025-11-07 21:58:49 +0000 Revert "Merge commit e24f90190c77 from llvm git (by Brad Smith):" [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) The compiler_rt helper functions have been built since 12.4, 13.1, 14 and anything newer. This reverts commit 51e8e8b0f36933814b1be08913857727876aece5. MFC after: immediately (cherry picked from commit bd27bd1f51d049538cc7a0053be9d99110a53ae1) --- contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h index 7d090ba682b3..7ab63905ed4f 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h @@ -78,11 +78,6 @@ public: void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; - bool IsAArch64OutlineAtomicsDefault( - const llvm::opt::ArgList &Args) const override { - return true; - } - UnwindTableLevel getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override; bool isPIEDefault(const llvm::opt::ArgList &Args) const override; From nobody Fri Nov 7 23:12:22 2025 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 4d3FFf39nlz6Dmlf; Fri, 07 Nov 2025 23:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3FFf1P6Tz3bXg; Fri, 07 Nov 2025 23:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762557142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7IYnIye3J7vy8OjkgYbN76eOv9M21O6zNiLguV5T20Q=; b=vx1Mjfg62MG7VvjW80BbGYBkYMomWWpakxepm4AlZ7pRNvzq3j6ze6dbi0gSL7sTVgX7e7 Ko9Jh7iQaESfYBiaKH8x1yjhKok8M4qhCjn8XHHcLIc6hVxB8fe8nOBF5WrVIxpuRP7Fe3 WbXqcGe2QTAmjvffAhkLa+9hwwmdvMnoi9+e39qua96beSVO5JrCQugkDBsGmkvsOo5C4m gB3Z3rCKphrKj9hNM+LvSQZio/Bpmysn9ym4Cjrx3t9JGchsT31/Jt/si1OepQvBty6ia+ oZn/53adbEYHffgYhyLieDX/l3oKUWBICSgvBiQA+apu1l9wtn4LpQVa9L82Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762557142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7IYnIye3J7vy8OjkgYbN76eOv9M21O6zNiLguV5T20Q=; b=EkxHPSRTpc0h6foyJUjj5SGWQIshSl0Mp5ZPpihrtS/iCXdXX99aSgHrqpRUam4RrsaQfS VpGRse5GRlVG2l6LPEz+ppP7YCR9lJ4+uiSIAFAvs5wOQhxN7Xr6OiJiLeyPGuWq9CM6vE OlOYjXP7E4ej9ParisuCVSA+UQgA1hjP42nG0xa1IJlpdD/DaPvUZ8dEmgR5bvWv97zZT4 rwZP56RTRXidZgL+/RcVZQoujaA4lIcTdUh4/21D9lPDfe4Ty+NVKqag1uOBLghFKCDX+4 R3tT4K3mzEi84z8aTBtOdiwP0NydEO4nUERND0AJT6IZJyL0kH5Nnaj4ydSizg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762557142; a=rsa-sha256; cv=none; b=WwwVKNE4CHLAHJPogL33TzBpyEVQSOgmk+90K76ZUMsB7SGI9U17s/4qdeteB4u8lCFEha nQLK++f7KI2OX+MtqQjhLnEyB6eR9OssLHML0tOX82wojx80xNAQWMtCMWm9PhGdKpgERG 4l2310f+Iw3lAp1F+eGI1SSPX1U+6zFF8K8PuUew6lE8wWH1iAsR9VJ8E9S2iy0923XOTJ 6Ml0+etwXCkrdhYFfBZZ/UJwQjK1pxkMwMyrPkgsOIRSgym1IvIfaVHAwTD+CoaH5DO/+z lYH1aBmQgZkErWdZKdz3pDh9G2QhDKfQ8y5koYkhc6k/pZHIWvh/FLn2MAXoLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3FFf0tXnz4Zc; Fri, 07 Nov 2025 23:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7NCMBO029515; Fri, 7 Nov 2025 23:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7NCMkM029512; Fri, 7 Nov 2025 23:12:22 GMT (envelope-from git) Date: Fri, 7 Nov 2025 23:12:22 GMT Message-Id: <202511072312.5A7NCMkM029512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 69c726c15077 - releng/15.0 - virtio: Fix polling in virtqueue_dequeue() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 69c726c150772c36854d38e51b6fd921a04caea5 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=69c726c150772c36854d38e51b6fd921a04caea5 commit 69c726c150772c36854d38e51b6fd921a04caea5 Author: Mark Johnston AuthorDate: 2025-11-04 14:27:33 +0000 Commit: Colin Percival CommitDate: 2025-11-07 23:12:02 +0000 virtio: Fix polling in virtqueue_dequeue() The access of vq->vq_ring.used->idx needs to be volatile-qualified, otherwise the compiler may optimize virtqueue_poll() into an infinite loop if there is no data available upon the first poll. Prior to commit ad17789a8569 this wasn't a problem since an external function call after each poll inhibited the optimization. Approved by: re (cperciva) PR: 289930 MFC after: 3 days Sponsored by: Klara, Inc. Fixes: ad17789a8569 ("virtio: Remove the unused poll method") (cherry picked from commit f999ffdce3813eb946f10999ccffb8275c324469) (cherry picked from commit 72c76047541ab6cc0e989a74e8de4d6e6a1a94b6) --- sys/dev/virtio/virtqueue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c index cc7a233d60ee..41e01549c8b2 100644 --- a/sys/dev/virtio/virtqueue.c +++ b/sys/dev/virtio/virtqueue.c @@ -580,7 +580,8 @@ virtqueue_dequeue(struct virtqueue *vq, uint32_t *len) void *cookie; uint16_t used_idx, desc_idx; - if (vq->vq_used_cons_idx == vq_htog16(vq, vq->vq_ring.used->idx)) + if (vq->vq_used_cons_idx == + vq_htog16(vq, atomic_load_16(&vq->vq_ring.used->idx))) return (NULL); used_idx = vq->vq_used_cons_idx++ & (vq->vq_nentries - 1); From nobody Fri Nov 7 23:25:57 2025 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 4d3FYK60Csz6Dp0v; Fri, 07 Nov 2025 23:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3FYK5Sqjz3cyY; Fri, 07 Nov 2025 23:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762557957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kej2OcxJ+MPvPmMSRMxDUBnptyv8gzqHj+N1OtEEvGY=; b=Cf8ZRqLUynIuMHcu2qHxlUvbykPDJsefEe8mK1YFY/NQof8h7Lu1ulwmv1IHdMqvbR6QrH wOYyGaZ3rqZx6TgY8Q+L4sduuXSHlK3BbwbuSnEojcHZwZgprpNzhxXiWv3ueHXCR554eb cnH63R7kICfyZ00ehZ8abZaN4ntzFLWRcaXFXMibo+mDDZfT9PToYaXtElyqvTEAgxCTut EOi1JHgFIbaio4r2v+RXEztKwv4Gs/RS00lWWE2DcimRkZLiPsLISVAu+pAEFBIlOJ8srC 4wbRw5P5VtCd/4nFXYeljhe9GZdY5u3CpO9ldYcv1iFHbKiDnE4z0PveNEl37Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762557957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kej2OcxJ+MPvPmMSRMxDUBnptyv8gzqHj+N1OtEEvGY=; b=KVgX5R3xXNzlQeXq5zeM/+gnDT64KRq/bAGpNcAFTRXkf27NFXX99+mE2CheU8YPMy5Y29 awP7ZYq10U/KdMOzXjD63nVqpNH/mv8LOteOaaITemclIsTRGI9kNFqxXuXQZDjnigGtLe iKIyQyJnHr9iS4EhzUHHfy4Q8/khSxZaVMYXWy+9E41rMxZTuE7uua0hqUBQCf0MsGbrMW czXNO3b5bzbMyFrvUR91ySF7B2tLWypxLqIZG8s35ENPIyKhqdLmiG/s01QgE0Q1yBSU0t i3b+QcEZr9Nd0DyElNPVuo3g5MyekKddY3nkQ9vuTqmlGqswD9NeihAUCuj1jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762557957; a=rsa-sha256; cv=none; b=fh8LUWOcxbgvFoEV/7qKeUEt6VOXRWYqEHxHc6OCfZ+McYva9wpAn4GBvovWEp3NHMNwzu z34OftwN+2HjZKBdHDbJk336k7w6XmtcAXdQcyxOMK6chOXXCDV0Rx7PcOPPtw29grGvt/ Rdhoj39TdHutND324jXztLnl8Aqoeia+Ld4gB01MOmtijl+cyP0i5Nxs2xaZkKZBAFoupu pP1jNowofJ1Tr8ZLjZQJALwRK9a5Q+NOWnvNjvZhzljjeK+6xGj2n4+RPCqmgHcmDwCMZ8 McNNnpPu0pW24wf7LH4u7xWzV6Tn1NDU0qHVml8VfLX31AuvKROPfMkOhDxMeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3FYK4yQNz4l8; Fri, 07 Nov 2025 23:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7NPvZT050940; Fri, 7 Nov 2025 23:25:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7NPvfZ050937; Fri, 7 Nov 2025 23:25:57 GMT (envelope-from git) Date: Fri, 7 Nov 2025 23:25:57 GMT Message-Id: <202511072325.5A7NPvfZ050937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 121e7ee5ca74 - stable/15 - Add support for Sierra Wireless EM7590 modem. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 121e7ee5ca7495518e4d4857b8dcfb8ccc7ea248 Auto-Submitted: auto-generated The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=121e7ee5ca7495518e4d4857b8dcfb8ccc7ea248 commit 121e7ee5ca7495518e4d4857b8dcfb8ccc7ea248 Author: Ari Suutari AuthorDate: 2025-10-22 09:59:09 +0000 Commit: Warner Losh CommitDate: 2025-11-07 23:17:28 +0000 Add support for Sierra Wireless EM7590 modem. PR: 290421 MFC After: 3 days (cherry picked from commit 00ebecd4a09db84fb6c5002b082400d8f8a97407) --- sys/dev/usb/serial/u3g.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index a549f93b2af1..608f08ee1176 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -600,6 +600,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(SIERRA, EM7455_2, 0), U3G_DEV(SIERRA, EM7565, 0), U3G_DEV(SIERRA, EM7565_2, 0), + U3G_DEV(SIERRA, EM7590, 0), U3G_DEV(SILABS, SAEL, U3GINIT_SAEL_M460), U3G_DEV(STELERA, C105, 0), U3G_DEV(STELERA, E1003, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 2318e6bd0017..6fda6940a04f 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4431,6 +4431,7 @@ product SIERRA EM7455 0x9078 Sierra Wireless EM7455 Qualcomm Snapdragon X7 LTE- product SIERRA EM7455_2 0x9079 Sierra Wireless EM7455 Qualcomm Snapdragon X7 LTE-A product SIERRA EM7565 0x9090 Sierra Wireless EM7565 Qualcomm Snapdragon X7 LTE-A product SIERRA EM7565_2 0x9091 Sierra Wireless EM7565 Qualcomm Snapdragon X7 LTE-A +product SIERRA EM7590 0xc081 Sierra Wireless EM7590 Qualcomm Snapdragon X7 LTE-A /* Sigmatel products */ product SIGMATEL WBT_3052 0x4200 WBT-3052 IrDA/USB Bridge From nobody Fri Nov 7 23:25:58 2025 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 4d3FYL6qWLz6DnTG; Fri, 07 Nov 2025 23: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3FYL6KYSz3cnG; Fri, 07 Nov 2025 23: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=1762557958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOZeQ3VCT7MnqpU4D9j9kOZVPqHR1huNNAIKVxnPd+I=; b=EiNmpqa4012fQIQGu6Iyv/qy2YnoL54dVrcKclmZfA+xxhYWzzTNz2ebHCK2IZ/H4K6v4b pQ9dC7b56sv0gONP0zzXGuDQjkY0ThBxk48g87xpaviaCCx9kXENF3sNjK3LXPqrFpj6yC RwyqmseHXjfTc0EeKiy8A3w4Lf+OsnsXhzOkHkyTuY2CA+3R0mq/uNGMICFqfR1pGTKv6S zV9bcXNW0WI4CnL7b4N+Ig/jW9+wF+ZjL8IPv3mbcA5RzL2T/JOo62j1FpT3MXQlCJ1GjX caA4kUhnTlwxKlbGVsDuOR43vn25MaE9+dI+8MKLnwL3nhQlvX7VB/OonKm/dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762557958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOZeQ3VCT7MnqpU4D9j9kOZVPqHR1huNNAIKVxnPd+I=; b=Z/hrrNxRLM6LtiY5EvqRbGERJdfnjzj4Lr6b9DN8huTK+80C8UMEnwKnyF0xkfDqU2jhpc rYPF1vwc0pHnqktRiyumEROKXHjbt/TpT6qywgoKZiOwEUkXOB17emmgULIdD4A4hlCc69 93eatNepr5AEAPc7dQh35r/clPQt31Qpizsid6bWimsL/W3TNV+B9vX5/m3VxaDeHib30n PxXW7nl9mzAgw8fUpOHZmQa4OtZgSTga595nfekD3DbRrp5MZjANAmRix3ICjtT9uW+YZX JezE8iuio0KSdAVyyHxgX26TkhpB8gTdXs+UQjoTQBmsUoEpqQfS0nYS+YUZIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762557958; a=rsa-sha256; cv=none; b=bdw+ubO92qVLmVq5UA6tX8ztgnnO39eGlMDQx28vugq4Q1huSlwlfGGOemv+aEp6rTcVzl WPwt9H/b/61qOG06JbF/o2iF2IB+GTny0UrDfyEb3rA9N8FJhSF4n5jn3UfS5Y6VAjY6fC OGcC16QQXeZOp77JpDNDqk+2bf9+nMeyEGxdqC8vES7IxJi/RoYKQBP5U+2Ov7s4kJncg/ n3jSReOHYY0Rk/RwW8A0Mu42mePBSJa6L3CwZRi+w4VC37JHrLT1u8cv7oQ2cTQvH+M5xk zNxr0xIu22niUS8IMdhFgMZDnzlNPV7IBFjkt6ZS77WnOGgAS516mXaX90VkPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3FYL5wf2z5KB; Fri, 07 Nov 2025 23:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7NPwqH050974; Fri, 7 Nov 2025 23:25:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7NPweP050971; Fri, 7 Nov 2025 23:25:58 GMT (envelope-from git) Date: Fri, 7 Nov 2025 23:25:58 GMT Message-Id: <202511072325.5A7NPweP050971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: db160ddf5338 - stable/15 - usb/u3g: add Quectel EM060K List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: db160ddf5338c01bd61a244e567b359a0fd561c2 Auto-Submitted: auto-generated The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=db160ddf5338c01bd61a244e567b359a0fd561c2 commit db160ddf5338c01bd61a244e567b359a0fd561c2 Author: Andre Albsmeier AuthorDate: 2025-10-31 16:50:01 +0000 Commit: Warner Losh CommitDate: 2025-11-07 23:17:29 +0000 usb/u3g: add Quectel EM060K PR: 290688 MFC After: 3 days (cherry picked from commit 6968897a8048aee2c72efdfbe23a7b64bdebcdbc) --- sys/dev/usb/serial/u3g.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 608f08ee1176..0fc774d83ee1 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -531,6 +531,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(QUECTEL, RG520, 0), U3G_DEV(QUECTEL, EC200, 0), U3G_DEV(QUECTEL, EC200S, 0), + U3G_DEV(QUECTEL, EM060K, 0), U3G_DEV(QUECTEL, EC200T, 0), U3G_DEV(QUECTEL, UC200, 0), U3G_DEV(SIERRA, AC402, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 6fda6940a04f..bb039f59ce19 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4070,6 +4070,7 @@ product QUECTEL RG500 0x0800 Quectel RG500/RM500/RG510/RM510 product QUECTEL RG520 0x0801 Quectel RG520/RM520/SG520 product QUECTEL EC200 0x6000 Quectel EC200/UC200 product QUECTEL EC200S 0x6002 Quectel EC200S +product QUECTEL EM060K 0x6008 Quectel EM060K product QUECTEL EC200T 0x6026 Quectel EC200T product QUECTEL UC200 0x6120 Quectel UC200 From nobody Fri Nov 7 23:29:40 2025 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 4d3Fdc2JNvz6Dp7f; Fri, 07 Nov 2025 23:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Fdc1pjZz3dgB; Fri, 07 Nov 2025 23:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762558180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0TtF6VNQsUJh9mONih6CLOtoqDS5oXj5L7cnxqY5qc=; b=nhQHDTPc6kLfzJkgbFQc5L6qWWLZVWcsKQMuy/aygWja8mzYgdQwM3em9zQhEG+4i6glhs RwM7pUbFLA16jpsw/BCSTCAHcKxBt4jlfZmkzIy1BxneYIvfrAzaWhaTHtg8qDYg23qpng +eGTZsNIPjAiice1E6AI4KkqNRohXm1CjcKpcZ/8Hh6+0UaSGzLfmxJEoP6bbg93XYSz1m wMNguT5IxXO9y0sqaLl1NSfOGxvlEPdUyC47mgApUZnzqJP7MourFj1waoRAQRh5u2y1Bd i8lkvT3/0Euf0Wvd5MEZwt8TEVPCP0VcVaPxX7lSCLKk/zkspBjccNeuT8izdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762558180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0TtF6VNQsUJh9mONih6CLOtoqDS5oXj5L7cnxqY5qc=; b=TtRHWgCunn7qo9w7yp5Al2un85Q6A0iI8X2yiTFGhxzGGS1WQvHI0atOmqcBV3LOZV/5IC eqz0vAp8Q/kNrzr4FFlL8y8DibSdUyy1Tb1RKKN8GO9wKeIep90tMIu0jorKslJ8etyJkW NOnVJ+QwOcC7Y6Gvt0vHT9DxY/mxdEQ1Cmf2CIXjOn5rwvTjfAPctPjHItyWdfKiFiUbzv LxoTISOsYutL95RxLnlXi3ur3o8F8EjEdMIWWzrs74Tihcu0mWNU0aoj0oXAy1I5tgL9tF dRyrNaygKRFOX7dQmtl+9YR4QI5sBLP6Fn0d1E6Hqbi6QtL3VH8volTIK3stbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762558180; a=rsa-sha256; cv=none; b=yb9I8LyC1lFV2hXicaXEm+BeGrkQUM+Aw8qumiJWuK2WaHf7l3xrubMGlFAzSv3+W3554F MrXGFWa3bXis3+/m3HFc5jk5nppLKEITyxLAueWAUTdMqzHcoPmPHprqJ6y5j0pw+JATMt G9cFBeng1oe0hVsyc1QfdwmFF1gSAbQuyeEpvUXirkc8njCnOhm6BefD/j7i13o1SUF5SE tHktCaikHi57qNPnbU80vDf5EZTGS+mP2e5ryWSH8i1LpKCXkKliw9l4q006U0ApFgOAaN S+1527JvDEUgrNCVFtJxmX7cgDbuQThfrEXEn2TruX2pyItARw8x+BQpbsey+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Fdc16BGz5KV; Fri, 07 Nov 2025 23:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7NTeYf052276; Fri, 7 Nov 2025 23:29:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7NTes5052273; Fri, 7 Nov 2025 23:29:40 GMT (envelope-from git) Date: Fri, 7 Nov 2025 23:29:40 GMT Message-Id: <202511072329.5A7NTes5052273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 911f2a5416f4 - stable/14 - Add support for Sierra Wireless EM7590 modem. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 911f2a5416f488f7bed1f97fcb3a84f23a47325d Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=911f2a5416f488f7bed1f97fcb3a84f23a47325d commit 911f2a5416f488f7bed1f97fcb3a84f23a47325d Author: Ari Suutari AuthorDate: 2025-10-22 09:59:09 +0000 Commit: Warner Losh CommitDate: 2025-11-07 23:29:31 +0000 Add support for Sierra Wireless EM7590 modem. PR: 290421 MFC After: 3 days (cherry picked from commit 00ebecd4a09db84fb6c5002b082400d8f8a97407) --- sys/dev/usb/serial/u3g.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 28a403a846bd..5154973cd9b3 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -600,6 +600,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(SIERRA, EM7455_2, 0), U3G_DEV(SIERRA, EM7565, 0), U3G_DEV(SIERRA, EM7565_2, 0), + U3G_DEV(SIERRA, EM7590, 0), U3G_DEV(SILABS, SAEL, U3GINIT_SAEL_M460), U3G_DEV(STELERA, C105, 0), U3G_DEV(STELERA, E1003, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 251d2f483a61..cefd0ac5df43 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4436,6 +4436,7 @@ product SIERRA EM7455 0x9078 Sierra Wireless EM7455 Qualcomm Snapdragon X7 LTE- product SIERRA EM7455_2 0x9079 Sierra Wireless EM7455 Qualcomm Snapdragon X7 LTE-A product SIERRA EM7565 0x9090 Sierra Wireless EM7565 Qualcomm Snapdragon X7 LTE-A product SIERRA EM7565_2 0x9091 Sierra Wireless EM7565 Qualcomm Snapdragon X7 LTE-A +product SIERRA EM7590 0xc081 Sierra Wireless EM7590 Qualcomm Snapdragon X7 LTE-A /* Sigmatel products */ product SIGMATEL WBT_3052 0x4200 WBT-3052 IrDA/USB Bridge From nobody Fri Nov 7 23:29:41 2025 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 4d3Fdd3t7dz6Dp9y; Fri, 07 Nov 2025 23:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Fdd2VlZz3dWr; Fri, 07 Nov 2025 23:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762558181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/tidpct2Gp6lMFlbI69NgeWA05IjQknmNC6kYEVxa0g=; b=MEA7v/x6R16Fx9N74zBEvp2oSu1AqNXlWLGe2qLxOUZGkdWvj22ZwraTSIr3S2aEjAY5IA ZokzjVz/hLpLeP+IAHZPNpay21+NQJ763qxOyq/ZmISSReo7T3yTGYe6XGLCD9KaxXuFT3 5G9kn8tqGYbUf4A0QJ+/29b46ayLt4PU6BcYJko0P1BcL4FClZb8iLUYr0ryVdaktZSB+P MLQaJQMzrIV1HEZJ2xqWf9/q7K3lIRWZoHloZdc2KUO4dQZ/O9yQy40+lqc88xa9Wh/6gk 0mKYoYTJRWcj6IqTEMUtmr6KdSxNiduw7tE24zlz0PMcP6gw2tR7Tnm1i6PPlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762558181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/tidpct2Gp6lMFlbI69NgeWA05IjQknmNC6kYEVxa0g=; b=pcTmY1rqU/zq2o3jZ0XPi8pW49VgTYu4hgjufgBWk/IaKqwwF6xUg5hyrw8R1yBgcpWf+4 yKs51Mt+zI1tDhGOYibPItqbWbWWa0OQrA+Lck2Ir2TO1DwJTcSF+HYVZP0OkkZaS0SHRU DQPpXVuKivT8ipG9rTJ7qPiN+kD2lWzD0Ug1xrNRUZlp99GCMD7bnBK5IpCmuaCatfyJeu fzR87w+Wy5vKCljg0tlsr+2dn0vkZt3M8oA/t20EJsZs/hjzV9zYXEPYdPKLJGMr1tpXu+ gfr3LDBZzzBuUGO4NyitFjVcLPjMoFnDdxwJdpfyGOVe3nunvYFbLvIl5lVleA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762558181; a=rsa-sha256; cv=none; b=FK+XuBI5/AdJIraIM0y9QB2VmeVdi9e1nKADABgHkZDlJEEHajoA3XHcpoBvIICHT7eAw7 01/1l3OtOw92Srzm9xB6VmUbQOukFsk7KSnBHY2B5jdVaIL96oLvmYtGqNI1m5AwNGuUBx ru9u3S5nDkqCOfndbxpJucNjQV/PgEFHLi56apUxcDrvLSIZK4FtGp+/XFvK7CZIuDfo7b rLOO2KmPaj9vJsRfcb1VjTzzxDFut75KEsDrGaIV+YDHrpn+EuqtxYyNF5pycx6PedaXby fNLIVZaIdnhbnwrz2jOZWIbwwLt+QvWGsEyIoScaE1CQgybFKwROKluJH2dFsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Fdd26Wfz4qJ; Fri, 07 Nov 2025 23:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7NTfAx052310; Fri, 7 Nov 2025 23:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7NTfAs052307; Fri, 7 Nov 2025 23:29:41 GMT (envelope-from git) Date: Fri, 7 Nov 2025 23:29:41 GMT Message-Id: <202511072329.5A7NTfAs052307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 81a5e32a6a72 - stable/14 - usb/u3g: add Quectel EM060K List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 81a5e32a6a72cd1e5c6fe9943542b324bace3790 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=81a5e32a6a72cd1e5c6fe9943542b324bace3790 commit 81a5e32a6a72cd1e5c6fe9943542b324bace3790 Author: Andre Albsmeier AuthorDate: 2025-10-31 16:50:01 +0000 Commit: Warner Losh CommitDate: 2025-11-07 23:29:31 +0000 usb/u3g: add Quectel EM060K PR: 290688 MFC After: 3 days (cherry picked from commit 6968897a8048aee2c72efdfbe23a7b64bdebcdbc) --- sys/dev/usb/serial/u3g.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 5154973cd9b3..fad352fc1f63 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -531,6 +531,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(QUECTEL, RG520, 0), U3G_DEV(QUECTEL, EC200, 0), U3G_DEV(QUECTEL, EC200S, 0), + U3G_DEV(QUECTEL, EM060K, 0), U3G_DEV(QUECTEL, EC200T, 0), U3G_DEV(QUECTEL, UC200, 0), U3G_DEV(SIERRA, AC402, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index cefd0ac5df43..fa201f448fd6 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4073,6 +4073,7 @@ product QUECTEL RG500 0x0800 Quectel RG500/RM500/RG510/RM510 product QUECTEL RG520 0x0801 Quectel RG520/RM520/SG520 product QUECTEL EC200 0x6000 Quectel EC200/UC200 product QUECTEL EC200S 0x6002 Quectel EC200S +product QUECTEL EM060K 0x6008 Quectel EM060K product QUECTEL EC200T 0x6026 Quectel EC200T product QUECTEL UC200 0x6120 Quectel UC200 From nobody Sat Nov 8 01:16:56 2025 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 4d3J1N1vHMz6FCxv; Sat, 08 Nov 2025 01:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3J1N1Mmbz3qC4; Sat, 08 Nov 2025 01:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762564616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J3cxgOks2Mhm6Q083xkmMjpJNyKKvSTxKy4fOvS41Lw=; b=s+XJmXT11vUAtf1AuyduGTdKoqCT9TVntJSIHN1hftH3iEiaOClr+5KPMmRmed2fDtmZp8 w1EtcR284eKNOIKHiyNrIQpfqfV/J4lTJgFg4AApLJqyO/4+lVaOnpnZalLJIsYNOQHsfG nSL3MCClK97ExAFFuGHgeNUjH1G2PDeUtfE9xsSMPTNN598GkA5PmLT4/SdGTcXDav6F9h Wodudu1PmvTchm3ECNuNxAP/9PxVjLitpq7WfstKLnFK3VUZgSrimztxTTXsqsp334qiGu jo9t7RXO1Ky6aJK4Um9QNETskoirng7USJheuF5tKCuGF0uieDy87jv2hAsx9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762564616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J3cxgOks2Mhm6Q083xkmMjpJNyKKvSTxKy4fOvS41Lw=; b=hk0xdmbFw0s/Z+QRBq0DZcULsiqVGVkGrUANJ0ALchVyCeufVotXinmhHmr06IeqJFgVAy Ub5zuTEhhTKWW3cwoLtxhgMfZ9MXSxgrf2+xRGVwlSSVU3ijWu66XxTcRR1itV6l6KakP9 POSZof6NRxW2j2fQwcO51a7MEXfJtxFqIlsXCNKOPZ1mVfqkV8DVkVNmUhaxxMLe0OWPgU wkimgld0M4TjSs3J+JV0fWEdzy3LLfKsG6N5MQsuxlG1Kex33ZSyOIbdIxJ8tEuT7Tz3lW geXhIxI89IuZ59GLVbIUwnWKYJS/qQ6Rymx6rTiwOiV3G3vfLcfwJFM4jLRYUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762564616; a=rsa-sha256; cv=none; b=b43gI+TrmRbOVYWKfUVB+eahaTzzx4Tqm7Hff/T1JrglJUSeVMFLbIl5GUV75MZEqomKWl 7opHqCM0F9l6Sj7D36rvPm1gjxk0tnbNQ+tYimuk3oMLAKjNy+zNg+cIq7/wXTpci3Th/1 9z/Acf6GvFQq5qnIpM+BpdQOCgxfT5dj9ErrQAefPlyiM7gJ5j6BCh6QXrU/zmdtQpGwy7 kTYTIP+cItph7BrzVeZdOM34es4S1qptBFth4S3dQqay82EHHcVBa49eLO7ngzUvXZThdc u/s5N98Enw321LIygwq7qbXRirdxIisY/yGRn4XnA3r1u9tJ/6N5Bm8CSHvZ5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3J1N0pfbz8Gb; Sat, 08 Nov 2025 01:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A81Gur1058068; Sat, 8 Nov 2025 01:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A81GuuD058065; Sat, 8 Nov 2025 01:16:56 GMT (envelope-from git) Date: Sat, 8 Nov 2025 01:16:56 GMT Message-Id: <202511080116.5A81GuuD058065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: fdd30e0670d1 - stable/15 - pathconf: Define a new name called _PC_CASE_INSENSITIVE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: fdd30e0670d1e7f329042a312aa01d6623f68567 Auto-Submitted: auto-generated The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=fdd30e0670d1e7f329042a312aa01d6623f68567 commit fdd30e0670d1e7f329042a312aa01d6623f68567 Author: Rick Macklem AuthorDate: 2025-10-25 20:37:35 +0000 Commit: Rick Macklem CommitDate: 2025-11-08 02:13:49 +0000 pathconf: Define a new name called _PC_CASE_INSENSITIVE Some FreeBSD file systems (msdosfs and optionally ZFS) handle case insensitive file name lookup. NFS (v3 and 4) provide an attribute to indicate this capability, but without this patch, the NFS server does not know if the file system does support this. This patch adds the pathconf name_PC_CASE_INSENSITIVE that can be used by the NFS server or user programs to check for this feature. (cherry picked from commit d6864221d88425a079f76ca106f30812c671ca9a) --- sys/fs/msdosfs/msdosfs_vnops.c | 3 +++ sys/kern/vfs_default.c | 1 + sys/sys/unistd.h | 1 + 3 files changed, 5 insertions(+) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 33e0d94954d7..6dfac1b4ebd2 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1944,6 +1944,9 @@ msdosfs_pathconf(struct vop_pathconf_args *ap) case _PC_HAS_HIDDENSYSTEM: *ap->a_retval = 1; return (0); + case _PC_CASE_INSENSITIVE: + *ap->a_retval = 1; + return (0); default: return (vop_stdpathconf(ap)); } diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 85f67731e1cc..71fe0e62d076 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -458,6 +458,7 @@ vop_stdpathconf(struct vop_pathconf_args *ap) case _PC_HAS_NAMEDATTR: case _PC_HAS_HIDDENSYSTEM: case _PC_CLONE_BLKSIZE: + case _PC_CASE_INSENSITIVE: *ap->a_retval = 0; return (0); default: diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 5743dc1c8033..29adf6b59425 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -160,6 +160,7 @@ #define _PC_XATTR_EXISTS _PC_HAS_NAMEDATTR /* Solaris Compatible */ #define _PC_HAS_HIDDENSYSTEM 68 #define _PC_CLONE_BLKSIZE 69 +#define _PC_CASE_INSENSITIVE 70 #endif /* From OpenSolaris, used by SEEK_DATA/SEEK_HOLE. */ From nobody Sat Nov 8 02:55:53 2025 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 4d3LCZ13n0z6FM3m; Sat, 08 Nov 2025 02:55: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3LCZ0Kshz3wjx; Sat, 08 Nov 2025 02:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762570554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BANCTWTGlx46ws1A3ZsNm2j9oD0sZGyqjR8IEPfYb6o=; b=AQOKK5S3eAz2VOUgH+Ugtg0RUCEi7Pzi6Ff8Ek6bGEjypw7VjRZU9UzsBghsy2B/Cz/HN2 vl9Vug5pfEBSwqyIbExIDFk7h+p/tHKSBZwF9dM+spOiY5Bvjkrz6qr7CIl+aOEnHS/LDr cS/p5vn2g62WEYmSTLHVBYfqxR+LtJoGX/WgR/cxMk3aAP50ue9OeMqw4KBsq7u+cdrwnt 2qRx/86vFQuhbZeNjzTqdm6itt8YGQsXoLmdpV+XbmC7TvqwA6QVHWTkL8musAqEE8UF0/ GSSYQvycKB9PXh1vPuNXYUSX8gBvzkohY9prlZM89mcmMND7zDcY7JrPUl5gBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762570554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BANCTWTGlx46ws1A3ZsNm2j9oD0sZGyqjR8IEPfYb6o=; b=RCX84d2uG26fZJcQrvCRixvCIg1EZajtYAp0tYf35jHc7Wrvhr201b4KIZjEkmHfpjMncS Eo0Yudym9CwBbrQ8cNJmfj0xRZbo9KQaEoxDIWUA4OEPOs98zrSyJ9KbNCGdZh2VIa+A77 xLcIElHFmkTPkanHNuDWH2ZVuwH6qVkbtyh6qKf9bSxxFu/sa9WuHfJgclPW8/0FfFF7oc N8xccXNh8aHpxLcEaWzlPlejpbIFTIc0OpA3FG0wb1a6lXmLeZJNwWONpTj7SBId9H57Fl Z7FdVqsI1Hf14RI3QovlX1qz4wkG/2ZmmLS7yB+U/h66KaE+SfICi/7dIbszxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762570554; a=rsa-sha256; cv=none; b=SyGbpBC0yNREnTLcVcDSZF9VvBY1hfrLjKHpTSfKqEssSpL6kn2UuJrf20w0G6e7Ym3uWJ 5zd92tstmB6Dv/Xc9e2XGLtINQBoVKyvH5sK5xOx8BjMoHGPXkoJJLOVbYMTMEKg3pqsqg GRjdA+kCIc0djuAgv0qnerBEybmc5yvj/RhSHJB2JCPfs0HIzgLQ4GJhEPmuyqzYJHO7rU EYWqTzAeOcCVLwto+HFj+rTYUgi5fM14qVQeB8BCjw/oDMSteBV/W8et/8H+psRXpQt07g ravNcSOG4euiGBkEr4luRCmfoZ8djwQO/nGGeq+0O1nWIjszRs1h+TYa77SKCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3LCY6gWXzBvF; Sat, 08 Nov 2025 02:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A82trKe043621; Sat, 8 Nov 2025 02:55:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A82trdO043618; Sat, 8 Nov 2025 02:55:53 GMT (envelope-from git) Date: Sat, 8 Nov 2025 02:55:53 GMT Message-Id: <202511080255.5A82trdO043618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: e224f2c1b98b - stable/15 - random: Have RANDOM_PURE_START be a cross-platform source List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e224f2c1b98ba065942c83d322cdb8e3987d0c81 Auto-Submitted: auto-generated The branch stable/15 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=e224f2c1b98ba065942c83d322cdb8e3987d0c81 commit e224f2c1b98ba065942c83d322cdb8e3987d0c81 Author: David E. O'Brien AuthorDate: 2025-11-08 02:18:13 +0000 Commit: David E. O'Brien CommitDate: 2025-11-08 02:19:13 +0000 random: Have RANDOM_PURE_START be a cross-platform source and one that will be with us in the long-term future. (this helps reduce diffs in the future and for down-stream users that trim entropy sources). Also, move deprecated (removed in 16.0) sources to the bottom of the list to reduce changes to 15.x. Reviewed by: glebius Obtained from: Juniper Networks Differential Revision: https://reviews.freebsd.org/D53311 (cherry picked from commit 9f3886347c1750cf80a82314470fc7186088eb9a) --- sys/dev/random/fenestrasX/fx_pool.c | 20 ++++++++++---------- sys/dev/random/random_harvestq.c | 8 ++++---- sys/sys/random.h | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 3aefe17a045a..35d06c2a9df1 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -167,13 +167,7 @@ static const struct fxrng_ent_char { [RANDOM_RANDOMDEV] = { .entc_cls = &fxrng_lo_push, }, - [RANDOM_PURE_SAFE] = { - .entc_cls = &fxrng_hi_push, - }, - [RANDOM_PURE_GLXSB] = { - .entc_cls = &fxrng_hi_push, - }, - [RANDOM_PURE_HIFN] = { + [RANDOM_PURE_TPM] = { .entc_cls = &fxrng_hi_push, }, [RANDOM_PURE_RDRAND] = { @@ -200,9 +194,6 @@ static const struct fxrng_ent_char { [RANDOM_PURE_DARN] = { .entc_cls = &fxrng_hi_pull, }, - [RANDOM_PURE_TPM] = { - .entc_cls = &fxrng_hi_push, - }, [RANDOM_PURE_VMGENID] = { .entc_cls = &fxrng_hi_push, }, @@ -215,6 +206,15 @@ static const struct fxrng_ent_char { [RANDOM_PURE_ARM_TRNG] = { .entc_cls = &fxrng_hi_pull, }, + [RANDOM_PURE_SAFE] = { + .entc_cls = &fxrng_hi_push, + }, + [RANDOM_PURE_GLXSB] = { + .entc_cls = &fxrng_hi_push, + }, + [RANDOM_PURE_HIFN] = { + .entc_cls = &fxrng_hi_push, + }, }; CTASSERT(nitems(fxrng_ent_char) == ENTROPYSOURCE); diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index f2206044fe7d..0e90b4d6ef9b 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -662,9 +662,7 @@ static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_UMA] = "UMA", [RANDOM_CALLOUT] = "CALLOUT", [RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */ - [RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */ - [RANDOM_PURE_GLXSB] = "PURE_GLXSB", - [RANDOM_PURE_HIFN] = "PURE_HIFN", + [RANDOM_PURE_TPM] = "PURE_TPM", /* PURE_START */ [RANDOM_PURE_RDRAND] = "PURE_RDRAND", [RANDOM_PURE_RDSEED] = "PURE_RDSEED", [RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH", @@ -673,11 +671,13 @@ static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_PURE_BROADCOM] = "PURE_BROADCOM", [RANDOM_PURE_CCP] = "PURE_CCP", [RANDOM_PURE_DARN] = "PURE_DARN", - [RANDOM_PURE_TPM] = "PURE_TPM", [RANDOM_PURE_VMGENID] = "PURE_VMGENID", [RANDOM_PURE_QUALCOMM] = "PURE_QUALCOMM", [RANDOM_PURE_ARMV8] = "PURE_ARMV8", [RANDOM_PURE_ARM_TRNG] = "PURE_ARM_TRNG", + [RANDOM_PURE_SAFE] = "PURE_SAFE", + [RANDOM_PURE_GLXSB] = "PURE_GLXSB", + [RANDOM_PURE_HIFN] = "PURE_HIFN", /* "ENTROPYSOURCE" */ }; CTASSERT(nitems(random_source_descr) == ENTROPYSOURCE); diff --git a/sys/sys/random.h b/sys/sys/random.h index af6b1e117423..64f2a1e1b40c 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -89,9 +89,7 @@ enum random_entropy_source { RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV, /* Fast hardware random-number sources from here on. */ RANDOM_PURE_START, - RANDOM_PURE_SAFE = RANDOM_PURE_START, - RANDOM_PURE_GLXSB, - RANDOM_PURE_HIFN, + RANDOM_PURE_TPM = RANDOM_PURE_START, RANDOM_PURE_RDRAND, RANDOM_PURE_RDSEED, RANDOM_PURE_NEHEMIAH, @@ -100,11 +98,13 @@ enum random_entropy_source { RANDOM_PURE_BROADCOM, RANDOM_PURE_CCP, RANDOM_PURE_DARN, - RANDOM_PURE_TPM, RANDOM_PURE_VMGENID, RANDOM_PURE_QUALCOMM, RANDOM_PURE_ARMV8, RANDOM_PURE_ARM_TRNG, + RANDOM_PURE_SAFE, + RANDOM_PURE_GLXSB, + RANDOM_PURE_HIFN, ENTROPYSOURCE }; _Static_assert(ENTROPYSOURCE <= 32, From nobody Sat Nov 8 05:45:24 2025 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 4d3Pz84YZGz6FqsY; Sat, 08 Nov 2025 05:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Pz83r1wz3DGw; Sat, 08 Nov 2025 05:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762580724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=why1Tw/tmwbiNZ2xWfy3PUIt4XJZJM5h7DJ8qgZIdM4=; b=Zk0TViibcsTeG+Cmwosfk5t7yuv5hz6zIDBCYXdJKpshe1OclD0cHIdwpoHAbBwfRJKGIh tTkZinyyJQz9YgMeVPVDnvvABfhnMP9xdNplzgILSQaT+GQodhV+uoOt0SxjX9su/fi1mF NuNsEfEAzTFVbl816PVo1rwmSuPW+zuWujeZ6SXA5rhNGAayYyYILWBClLr8TGATfPSkrj PqLpOivR2oaNWll3bITLOayJyExpOjt9Rko1e/VzhynM+wXIC+zmryslRfCR9kxAv7KoFt AV+TbcMpHWLhJjBqXgY/3ZDaT53d3sZNIuQrBZVYjvAk/MFUUIo7uVKe6kgPQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762580724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=why1Tw/tmwbiNZ2xWfy3PUIt4XJZJM5h7DJ8qgZIdM4=; b=gtAXON4GOJA82eq/7ZZQS+LZOIQPVGzs/KDNo1Ij8lCMV5MIblUP3YsTMcl7Sa+YfmXBBO DY2Y5TuNgYjISu/BArfWuPBYzhmh7gP14YaXfpEx0uek0Houo+7q108UoMkIRABGJXUbpZ KnN+XNfXpxMuPwfxkc9liypnTriOSdQRCXdJf0Ho0DTTQ7Ye4JxOI7CyWKP8n586G0Wqel 7VWZIzR1XhJTYhoaIDutZMTthbXqO+W+HCuCdrDCKncH61pn/3Pv/fZNkTlsg0+C8JHt9s pcWzG5dbD96FdYRBXrvqFk/gLgyORXU45PUJweRizFN1Ll0u5d8goI3C+5Y0QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762580724; a=rsa-sha256; cv=none; b=VEhJ6NtR1Dr2iAwvZrqiPL7NGF6we/yE/Nayy+JiNK6OZy6z12Ewg6wVeVz2zALYB/zHZV JPAnmnk5JhJcuR0dPyf8TLpsIwWw8DqREjP31yC22bzov6M8vwLMd5wwXwb7B7dOuaglwt A3zT00WMNysUWDuOZFbrDqBADnaX+nLVybHRifyhu0CtOoJdibpszNz+L7orb4Php3Vrfl rTPmskZ4csYNzKYc0gIgbePr7SGxxulwI11p86iGUetO0w53lxciOZMtYIDCeP+qlz1G+M 7/TE0pLdNkFuDYoDwGoHqVZ9KtYmTnVvLvmYY/JpBN6uIUgFkw45k3aPXuBkXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Pz8383xzZ3T; Sat, 08 Nov 2025 05:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A85jOZB065063; Sat, 8 Nov 2025 05:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A85jOpx065060; Sat, 8 Nov 2025 05:45:24 GMT (envelope-from git) Date: Sat, 8 Nov 2025 05:45:24 GMT Message-Id: <202511080545.5A85jOpx065060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: 0ef2ecd0ced4 - stable/15 - safe(4): add gone_in 16.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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0ef2ecd0ced44223659bf9f3506359d167cf38dc Auto-Submitted: auto-generated The branch stable/15 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=0ef2ecd0ced44223659bf9f3506359d167cf38dc commit 0ef2ecd0ced44223659bf9f3506359d167cf38dc Author: David E. O'Brien AuthorDate: 2025-10-29 01:11:48 +0000 Commit: David E. O'Brien CommitDate: 2025-11-08 03:07:43 +0000 safe(4): add gone_in 16.0 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53426 (cherry picked from commit 9b7d2cee03e5d0b0723718047d4bc388d0745591) --- share/man/man4/safe.4 | 16 +++++++++++++++- sys/dev/safe/safe.c | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/share/man/man4/safe.4 b/share/man/man4/safe.4 index 89375d058bf7..914b2dd0dd1c 100644 --- a/share/man/man4/safe.4 +++ b/share/man/man4/safe.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 22, 2024 +.Dd October 31, 2025 .Dt SAFE 4 .Os .Sh NAME @@ -57,6 +57,11 @@ In .Cd hw.safe.rngbufsize .Cd hw.safe.rngmaxalarm .Ed +.Sh DEPRECATION NOTICE +The +.Nm +driver is deprecated and is scheduled for removal in +.Fx 16.0 . .Sh DESCRIPTION The .Nm @@ -128,5 +133,14 @@ packet processing. .Xr random 4 , .Xr crypto 7 , .Xr crypto 9 +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 5.2 . +It is deprecated in +.Fx 15.0 +and removed in +.Fx 16.0 . .Sh BUGS Public key support is not implemented. diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index c512f3fc62c0..21824ba8de8d 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -424,6 +424,8 @@ safe_attach(device_t dev) #ifdef SAFE_DEBUG safec = sc; /* for use by hw.safe.dump */ #endif + gone_in(16, "%s(4) is deprecated in 15.0 and removed in 16.0\n", + safe_driver.name); return (0); bad4: crypto_unregister_all(sc->sc_cid); From nobody Sat Nov 8 05:45:25 2025 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 4d3Pz95TJYz6FqlJ; Sat, 08 Nov 2025 05:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Pz93rJ3z3DH0; Sat, 08 Nov 2025 05:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762580725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/+tUaRJYeTQUiAG9t9WdE3haHMOJpzWllxNNYCe3d8=; b=aZD5cr1drUkLcSKgwMo83tNCLhUfA/e6sMUBM62/M6oqaYoTpGnoqSZ1BbfR0S4nl2ApAj /olhvgpzEishyfW3ufVcj1qBC77kMEMg7HMXyZ6oRI5XLJ8tY7VW3ckvv2I8lRV39FB7oX bzlRqE/UqCSu3FWiektdHXSsXHkS4ODlQydrFuxqYrQVe9w8TWjz7/lWZ7Et3+YPZ49Swc PCRQUZkCS2cjqk7YkDP3pnK4cv3Qp5E2mVai2244VDpcVe57jdHCrHZI7TgQE3e35wzY8U 5PBL+3VCtiR2lJ01HUeM7NV/KIey32jyrOIZ+/yVEZFjHjp3ASKaCLKrs8PyjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762580725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/+tUaRJYeTQUiAG9t9WdE3haHMOJpzWllxNNYCe3d8=; b=Aj2Z6fKQDAPsxRKJ8YQm4W5GW1RFlFxY8af7uWpuY4i4bHKOKVpo4AiKWvH1vaVQTp4EOc EeRm9twpJ/wQjiaXZaot5Z5joXi80QWA/aC1leZBopjB4oRN01TXdM8PkfvfjTKlc97ukh A3l3zJLQSKF26Dtj3qOB7qoPKsSsNk8Wstm7pZIEeCcQGjqgQb0xeJkDKqyX59vsbJe2Be tf3hPPk3YFq/T3kHbvh3Kr+yKC1PYanE+2D8v0TGZ255yndvrJ1UOrNI+Hoq8lGheUk3SY D9kGl9avm77IRzymRlsoNZFbviRvuDs0gVjR9OhSmNGtCGFmI/tI86Ma7/9jlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762580725; a=rsa-sha256; cv=none; b=CQGeHkC9795r7EBvR779GOX5SzEDE9gt5kpx4gl4gnl9g2LbBYK/AcfB0bBH/R8BGgamcP GGcIGLOQjcs1Ag6Dd/rqC4Z0M7yDiTvctWeZ+oXHdxhMrkcNO72dKpqvNayZ5LwgK0LcOB lookGjg1CAnsoqWg0ub/R4UnKP0LxDqp5fVRm6f0dmDOdDqDysWIFkGEA6Zs+qRoimXXjB DWs8y4cCP1YmX/M7etDpyNZyJrmqqAf4mIm1t5AqUB1dTfAGDOxZYPhU9GnFg5WPVwUFJz 46iBQ7/4FPBlcqSTtElB77pNMlfQ+lQrMDN2mJ9/pUTf57ixmX0R87v2+rzLrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Pz93KBkzZ3V; Sat, 08 Nov 2025 05:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A85jPl4065099; Sat, 8 Nov 2025 05:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A85jPMn065096; Sat, 8 Nov 2025 05:45:25 GMT (envelope-from git) Date: Sat, 8 Nov 2025 05:45:25 GMT Message-Id: <202511080545.5A85jPMn065096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: ba6c676ef3ac - stable/15 - hifn(4): add gone_in 16.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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ba6c676ef3ac28e55188f57eb694da19431e38c9 Auto-Submitted: auto-generated The branch stable/15 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=ba6c676ef3ac28e55188f57eb694da19431e38c9 commit ba6c676ef3ac28e55188f57eb694da19431e38c9 Author: David E. O'Brien AuthorDate: 2025-11-08 05:44:52 +0000 Commit: David E. O'Brien CommitDate: 2025-11-08 05:44:52 +0000 hifn(4): add gone_in 16.0 --- share/man/man4/hifn.4 | 7 ++++++- sys/dev/hifn/hifn7751.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4 index 22494fcb6c6d..f145d61282fc 100644 --- a/share/man/man4/hifn.4 +++ b/share/man/man4/hifn.4 @@ -24,7 +24,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 29, 2020 +.Dd October 31, 2025 .Dt HIFN 4 .Os .Sh NAME @@ -46,6 +46,11 @@ module at boot time, place the following line in .Bd -literal -offset indent hifn_load="YES" .Ed +.Sh DEPRECATION NOTICE +The +.Nm +driver is deprecated and is scheduled for removal in +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c index 2e7545779b09..7452c00d0b21 100644 --- a/sys/dev/hifn/hifn7751.c +++ b/sys/dev/hifn/hifn7751.c @@ -586,6 +586,9 @@ hifn_attach(device_t dev) callout_init(&sc->sc_tickto, 1); callout_reset(&sc->sc_tickto, hz, hifn_tick, sc); + gone_in(16, "%s(4) is deprecated in 15.0 and removed in 16.0\n", + hifn_driver.name); + return (0); fail_intr: From nobody Sat Nov 8 08:57:51 2025 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 4d3VFC2NlGz6G5fG; Sat, 08 Nov 2025 08:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3VFC1WHVz3XYf; Sat, 08 Nov 2025 08:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762592271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObjQ0Bhvv/PAqwrLFCBrH5S8vNlr4R2NOpow3lR6DHQ=; b=JtlOZNw/NAh8ItqLrP/v7nhEm1SkzmcBgjgF2qCo+z5C9+Fi+p+dODbSGHU83DfLg1wsXw vyBbQvhVCtHKYfxvB2ystH8uVDXLYWCll378U4AWJ9129K/PGhySeyiehZ/Z3C9LVv/lHo CZwNHRKHIzHcVyl6csTKcKxcUfa9Ydxc0+ISizhKUJQxwGmNbhFAUi+Y2ArERn+l6mmjIx OrfH2a3FzuTm8PFIW7fezMGwi1WM/GfC5MJW5ILzupO78jsfLALmXWaBzelxU7K3YF4zdE l0yPAPgHPdSfFP/uORWhb6e84iR0bqtx2oNlwyPpGwvWkMLxcqE0uqGmBKwYbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762592271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObjQ0Bhvv/PAqwrLFCBrH5S8vNlr4R2NOpow3lR6DHQ=; b=Vqk7l9kYSSnHf8UnLHsyJtw4eGdNlM7jaV99j51kALyblqwFpDkmpHnjNlIk8Q9YDnovx8 pN6qNVeHca7DQGDlirXmGRL0JWcbC3C7gdvna5Tt+XN0CFMgv85y6KjCx2yDSc3GJbN+RR UfJG71eROhdkcKJ7KlDF0lJhO3/xxif0DECCgmgmiAPMqiqiMUN+RW7Bhb0eLnQrc+HWqH PJS5cinxoKC/Or5uuOa8WFE3SXGpgtMRxxyW/G69h8Krqd6laszxZtgcLLZ5w35H+2eSQ5 oKaXBFXu7UFZYy8qU9amnQOBzaeHo5gk618CFU8rw6vndPmX05NW8V5txShM2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762592271; a=rsa-sha256; cv=none; b=NS+25TSzpIazSJEHH2OpeSHOAdWSnG8wLN5yUwkNlDaIdwzQ+rnt39Yn5Q9ZJLiSKi/xlB Z5HkbFQFZhvYs2DP4SQMOe3cl6q55yhOcYbj9C8ty7MmyKTrTZkOC027Kd/eDBuxizEdW3 MCZUrX7IHEoqnoh+EWWzOAQEJaKQq4teJv201vcbE9sBQc1BKg/vi2+tLKJYHd92TI+sWb 3a1QrkqZgXDiIpl9TsmrihmtxyLK8FMH4usucG+BD7Y+hNTOBj66HwF3KDkHGOMyBNmZJg 5Th1tTPn+pw5yAnRk/CeA7wB01NDVMzTvO2uE3nkpg8tFBh5oFrIFeLqe5YZ2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3VFC16QqzfQ3; Sat, 08 Nov 2025 08:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A88vp7V022066; Sat, 8 Nov 2025 08:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A88vpCi022063; Sat, 8 Nov 2025 08:57:51 GMT (envelope-from git) Date: Sat, 8 Nov 2025 08:57:51 GMT Message-Id: <202511080857.5A88vpCi022063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: d1076b2e1805 - stable/15 - UPDATING: mention pf's nat64 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 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: d1076b2e1805ae49cbff645bf4b4bf68f429a977 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d1076b2e1805ae49cbff645bf4b4bf68f429a977 commit d1076b2e1805ae49cbff645bf4b4bf68f429a977 Author: Kristof Provost AuthorDate: 2025-11-05 09:59:43 +0000 Commit: Kristof Provost CommitDate: 2025-11-08 08:57:35 +0000 UPDATING: mention pf's nat64 support MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit f939619a2f989656e1ecdfd7a2759e3ba44d4ec7) --- UPDATING | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UPDATING b/UPDATING index f1a30f612402..faba80dc9a0e 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251105: + pf(4) now supports nat64 via the af-to keyword. + 20251030: flua(1) has moved to the new FreeBSD-flua package. If you use flua, you may want to install this package if it's not otherwise installed From nobody Sat Nov 8 10:55:16 2025 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 4d3Xrh731Tz657Vq; Sat, 08 Nov 2025 10:55: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Xrh6XBzz3mtQ; Sat, 08 Nov 2025 10:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gcPzl1sFvZiEIpmvxZoLeqM57SU0qET7+LED2nqBpbs=; b=CWB8W8Eu2kGrLTlFXmOHqtNpOXIYb9R9JuCgGP134LTpgI48rJtNx5TJ0+bBddPwPkxU2M tMV+adNdtYg8PbEsl9xJVubi1JCRyG7LYuInwpaA7AB1Sb5jvQKsqs3ZKzz8ywfqlxnijA 9qEJTna+Sg1c8YOk/hNbhb31Up9LL2Gi87NR+OG3m0BT3Y06M75Wkyw228NNmz+LwMIDDH Ps7r/D3cbr38nkmzU2Lq2LjEYxfQqvhYeSYdkSRALO/uOvXTOUU0SXziJFV8rHyVHeyCXE amudI2tsKQ35MiaODqZw0/md7dnX/bF4U5QaTy0QjBw0MxQxl22zJIDhyaCAVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gcPzl1sFvZiEIpmvxZoLeqM57SU0qET7+LED2nqBpbs=; b=QADA8d57I+jLjdrKZ9gdW3AXAz8m0sVj9pG04OtDxcIsD+iNLWDFJEv5ecM7qH5E4k8Dgr 8OuKZWKafOI07eOZqgBo2CjNvsU8XW+XgMt30axE7NUcdIbOIzKNVa9UPkUQqTaTgLl/82 HSaTtz714o2s0C3cryrz+mx+V008XKPpdLPRw+rgfJYI4tQzGc+98WaUuoBralwBBmkbEm KfOeWLYUHtbBVd1VWNNbmZQaKcUDDc3lZvhFn/dHezEk6ABvB2wIzfPq+BtTTIph++EIHI oBh1jEa1zg01jjaeEtqPtuVW9EDPj44bNabB8Pc6qT0NQdrmcKq12SAO799Oqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762599316; a=rsa-sha256; cv=none; b=gvuKhZ70v9+6dZhCwJzypYUfw3KBoeIdaBNu1mfe/UfihiiEFGKfDjAC5e096dE2vf2xTB M9lhFngPxy7w0VFtYyuPc9d8/b+CugEYjsxyj47HhFZZRzFQBHKhEt38h2qVQ6oxjcPK5Z TFTSIxQtGUkuAVBGBS6ClUabgwBtwnfxeJrbj7NS97HKSJOThNs8dJ63jOrfkG1CoAG1KP uDdoexbx7pdF+bFwLbH8GPfHtW/TtvPr0G0BrIZSDlVRBjLVIxTI0+tkNI/uurAIIH4nkV MNgJHRV/MWrGFIxPbPr2CZJKXLf55Pb8UU+eFdQf9VOw3HOMyKL7FUdR7ki1+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Xrh5xvZzjkH; Sat, 08 Nov 2025 10:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8AtG2R049693; Sat, 8 Nov 2025 10:55:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8AtGvm049690; Sat, 8 Nov 2025 10:55:16 GMT (envelope-from git) Date: Sat, 8 Nov 2025 10:55:16 GMT Message-Id: <202511081055.5A8AtGvm049690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f1424dfe45b8 - stable/15 - buf.9: Sprinkle with mdoc 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f1424dfe45b8b0f05d5fda20c155bc8937d308fb Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=f1424dfe45b8b0f05d5fda20c155bc8937d308fb commit f1424dfe45b8b0f05d5fda20c155bc8937d308fb Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:04:43 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 10:55:13 +0000 buf.9: Sprinkle with mdoc macros I did not bump the date here as the manual page looks more like a draft and I'm not sure if it is actually up-to-date considering that it's current Dd dates back to 1998. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52770 (cherry picked from commit fc7f5452c6ff1a9d01a9d8d0638da593ae4f080c) --- share/man/man9/buf.9 | 97 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 25 deletions(-) diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9 index ecd4a1487735..ff9a1d0d46e0 100644 --- a/share/man/man9/buf.9 +++ b/share/man/man9/buf.9 @@ -36,44 +36,70 @@ The kernel implements a KVM abstraction of the buffer cache which allows it to map potentially disparate vm_page's into contiguous KVM for use by (mainly file system) devices and device I/O. This abstraction supports -block sizes from DEV_BSIZE (usually 512) to upwards of several pages or more. +block sizes from +.Dv DEV_BSIZE +(usually 512) to upwards of several pages or more. It also supports a relatively primitive byte-granular valid range and dirty range currently hardcoded for use by NFS. The code implementing the VM Buffer abstraction is mostly concentrated in -.Pa /usr/src/sys/kern/vfs_bio.c . +.Pa sys/kern/vfs_bio.c +in the +.Fx +source tree. .Pp One of the most important things to remember when dealing with buffer pointers -(struct buf) is that the underlying pages are mapped directly from the buffer +.Pq Vt struct buf +is that the underlying pages are mapped directly from the buffer cache. No data copying occurs in the scheme proper, though some file systems such as UFS do have to copy a little when dealing with file fragments. The second most important thing to remember is that due to the underlying page -mapping, the b_data base pointer in a buf is always *page* aligned, not -*block* aligned. -When you have a VM buffer representing some b_offset and -b_size, the actual start of the buffer is (b_data + (b_offset & PAGE_MASK)) -and not just b_data. +mapping, the +.Va b_data +base pointer in a buf is always +.Em page Ns -aligned , +not +.Em block Ns -aligned . +When you have a VM buffer representing some +.Va b_offset +and +.Va b_size , +the actual start of the buffer is +.Ql b_data + (b_offset & PAGE_MASK) +and not just +.Ql b_data . Finally, the VM system's core buffer cache supports -valid and dirty bits (m->valid, m->dirty) for pages in DEV_BSIZE chunks. +valid and dirty bits +.Pq Va m->valid , m->dirty +for pages in +.Dv DEV_BSIZE +chunks. Thus a platform with a hardware page size of 4096 bytes has 8 valid and 8 dirty bits. These bits are generally set and cleared in groups based on the device block size of the device backing the page. Complete page's worth are often -referred to using the VM_PAGE_BITS_ALL bitmask (i.e., 0xFF if the hardware page +referred to using the +.Dv VM_PAGE_BITS_ALL +bitmask (i.e., 0xFF if the hardware page size is 4096). .Pp VM buffers also keep track of a byte-granular dirty range and valid range. This feature is normally only used by the NFS subsystem. I am not sure why it -is used at all, actually, since we have DEV_BSIZE valid/dirty granularity +is used at all, actually, since we have +.Dv DEV_BSIZE +valid/dirty granularity within the VM buffer. -If a buffer dirty operation creates a 'hole', +If a buffer dirty operation creates a +.Dq hole , the dirty range will extend to cover the hole. If a buffer validation -operation creates a 'hole' the byte-granular valid range is left alone and +operation creates a +.Dq hole +the byte-granular valid range is left alone and will not take into account the new extension. Thus the whole byte-granular abstraction is considered a bad hack and it would be nice if we could get rid @@ -81,16 +107,24 @@ of it completely. .Pp A VM buffer is capable of mapping the underlying VM cache pages into KVM in order to allow the kernel to directly manipulate the data associated with -the (vnode,b_offset,b_size). +the +.Pq Va vnode , b_offset , b_size . The kernel typically unmaps VM buffers the moment -they are no longer needed but often keeps the 'struct buf' structure -instantiated and even bp->b_pages array instantiated despite having unmapped +they are no longer needed but often keeps the +.Vt struct buf +structure +instantiated and even +.Va bp->b_pages +array instantiated despite having unmapped them from KVM. If a page making up a VM buffer is about to undergo I/O, the -system typically unmaps it from KVM and replaces the page in the b_pages[] +system typically unmaps it from KVM and replaces the page in the +.Va b_pages[] array with a place-marker called bogus_page. The place-marker forces any kernel -subsystems referencing the associated struct buf to re-lookup the associated +subsystems referencing the associated +.Vt struct buf +to re-lookup the associated page. I believe the place-marker hack is used to allow sophisticated devices such as file system devices to remap underlying pages in order to deal with, @@ -107,18 +141,29 @@ you wind up with pages marked clean that are actually still dirty. If not treated carefully, these pages could be thrown away! Indeed, a number of -serious bugs related to this hack were not fixed until the 2.2.8/3.0 release. -The kernel uses an instantiated VM buffer (i.e., struct buf) to place-mark pages +serious bugs related to this hack were not fixed until the +.Fx 2.2.8 / +.Fx 3.0 +release. +The kernel uses an instantiated VM buffer (i.e., +.Vt struct buf ) +to place-mark pages in this special state. -The buffer is typically flagged B_DELWRI. +The buffer is typically flagged +.Dv B_DELWRI . When a -device no longer needs a buffer it typically flags it as B_RELBUF. +device no longer needs a buffer it typically flags it as +.Dv B_RELBUF . Due to -the underlying pages being marked clean, the B_DELWRI|B_RELBUF combination must +the underlying pages being marked clean, the +.Ql B_DELWRI|B_RELBUF +combination must be interpreted to mean that the buffer is still actually dirty and must be written to its backing store before it can actually be released. In the case -where B_DELWRI is not set, the underlying dirty pages are still properly +where +.Dv B_DELWRI +is not set, the underlying dirty pages are still properly marked as dirty and the buffer can be completely freed without losing that clean/dirty state information. (XXX do we have to check other flags in @@ -128,7 +173,9 @@ The kernel reserves a portion of its KVM space to hold VM Buffer's data maps. Even though this is virtual space (since the buffers are mapped from the buffer cache), we cannot make it arbitrarily large because -instantiated VM Buffers (struct buf's) prevent their underlying pages in the +instantiated VM Buffers +.Pq Vt struct buf Ap s +prevent their underlying pages in the buffer cache from being freed. This can complicate the life of the paging system. From nobody Sat Nov 8 10:55:33 2025 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 4d3Xs15NBYz657DR; Sat, 08 Nov 2025 10:55: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Xs14p8vz3myb; Sat, 08 Nov 2025 10:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxBizBy3mP4RaRvaSG4yI/2H8z7EAtGmH/SzFADgYlw=; b=xz29b9vLuVP+yXeDyKDPCtR0/PotW0WfW8eSBgCEDOXfiS734GfnIh8yOjV57nU5FZZsEL Qdxj+C1P8NGbG1Xj6rCTcUnLuQhu7K4LvpcbxdZEa1IqcYslTMro/ZuMUlHsA91sLtmTbS 8MZg+Co4u1K5OZ90N7C/82f6QtAwvNMONkhCI5GviaVeV/AT8Q4Wz2bfTZgOfnxHvtfieo Hat8pOc3NrLvkXEcbd7/CuPe1OpzsKT92KXdEDOmkF40iceBYfHRR0pGTBY3O0VBtKNRyR FiQcyBVr83Xav7gYE3VmiQRTAeJDdB4PW2HFBkaS88mhGjY7fPkR44vSnN6HKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxBizBy3mP4RaRvaSG4yI/2H8z7EAtGmH/SzFADgYlw=; b=gytfbJlMXP9JEguh0thxEY9Mp+Ys+dL6UTnM9BLpo0g5IWGItOWM5zdwvoPQN0fQzdOI2Z 36WLl85HVYsqocKujnQfq3n0fnw6S1RqLsavwExkamyjMvm/1JQLjct1U3ao1x992TegDt xoiEOeHNsUWWkzV4NekhRLZmjWlhjFrqDbacOGfpYiZZAIH2LKV3yhewwSU/3+QRKHFrxb +ZiS3XP1hiqdt+rU1D2mVgbLb4P8pXuoNVT3ABS4TFWACseLyK1cValLVoAfCXm/HWq/Z9 tQ9w/nPlkGFecgRHm6S/b3NjwAWVH/W6bPkK834n/8S+Jfj3rO350X1s/Afpyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762599333; a=rsa-sha256; cv=none; b=cnBlgez7aZYfKlWZ608J7+BVTQNEjODd7LuJh2O4/cHLR4s4hCqb/5CWMZ/Bwri291CHB3 n/p5njdCygy5lbQTRf+yQ+pEV79/Pb9PtoB7Q9YXbjQPbOXjG9amfzGjO/pZdYYzJ+aohE ZW+HIUk5Wt+aHLD1dRWeSkc/IBK+bYARLVKMpwb+tHmD3Xd66t4wAX4cLhn6aDxDSjd/u5 WKXTRSuN80x4VZgFfR6hFKzD5/nVnnoK0uOlds/J/D0altCus+Cs2rpchVPpkKObLnPGJR Dcdt7OMRx9RUdAPtykihIoFlSKkwB0dLr42j2irZzy9GYcE1dGwDvYGPbTnNlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Xs13fBSzjNC; Sat, 08 Nov 2025 10:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8AtXT5049896; Sat, 8 Nov 2025 10:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8AtX7v049894; Sat, 8 Nov 2025 10:55:33 GMT (envelope-from git) Date: Sat, 8 Nov 2025 10:55:33 GMT Message-Id: <202511081055.5A8AtX7v049894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: fd0893974db1 - stable/14 - buf.9: Sprinkle with mdoc 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fd0893974db1a83b25685fe36d4b74719314b55d Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd0893974db1a83b25685fe36d4b74719314b55d commit fd0893974db1a83b25685fe36d4b74719314b55d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:04:43 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 10:55:29 +0000 buf.9: Sprinkle with mdoc macros I did not bump the date here as the manual page looks more like a draft and I'm not sure if it is actually up-to-date considering that it's current Dd dates back to 1998. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52770 (cherry picked from commit fc7f5452c6ff1a9d01a9d8d0638da593ae4f080c) --- share/man/man9/buf.9 | 97 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 25 deletions(-) diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9 index 975a1bf2074f..baf3d06db1b4 100644 --- a/share/man/man9/buf.9 +++ b/share/man/man9/buf.9 @@ -36,44 +36,70 @@ The kernel implements a KVM abstraction of the buffer cache which allows it to map potentially disparate vm_page's into contiguous KVM for use by (mainly file system) devices and device I/O. This abstraction supports -block sizes from DEV_BSIZE (usually 512) to upwards of several pages or more. +block sizes from +.Dv DEV_BSIZE +(usually 512) to upwards of several pages or more. It also supports a relatively primitive byte-granular valid range and dirty range currently hardcoded for use by NFS. The code implementing the VM Buffer abstraction is mostly concentrated in -.Pa /usr/src/sys/kern/vfs_bio.c . +.Pa sys/kern/vfs_bio.c +in the +.Fx +source tree. .Pp One of the most important things to remember when dealing with buffer pointers -(struct buf) is that the underlying pages are mapped directly from the buffer +.Pq Vt struct buf +is that the underlying pages are mapped directly from the buffer cache. No data copying occurs in the scheme proper, though some file systems such as UFS do have to copy a little when dealing with file fragments. The second most important thing to remember is that due to the underlying page -mapping, the b_data base pointer in a buf is always *page* aligned, not -*block* aligned. -When you have a VM buffer representing some b_offset and -b_size, the actual start of the buffer is (b_data + (b_offset & PAGE_MASK)) -and not just b_data. +mapping, the +.Va b_data +base pointer in a buf is always +.Em page Ns -aligned , +not +.Em block Ns -aligned . +When you have a VM buffer representing some +.Va b_offset +and +.Va b_size , +the actual start of the buffer is +.Ql b_data + (b_offset & PAGE_MASK) +and not just +.Ql b_data . Finally, the VM system's core buffer cache supports -valid and dirty bits (m->valid, m->dirty) for pages in DEV_BSIZE chunks. +valid and dirty bits +.Pq Va m->valid , m->dirty +for pages in +.Dv DEV_BSIZE +chunks. Thus a platform with a hardware page size of 4096 bytes has 8 valid and 8 dirty bits. These bits are generally set and cleared in groups based on the device block size of the device backing the page. Complete page's worth are often -referred to using the VM_PAGE_BITS_ALL bitmask (i.e., 0xFF if the hardware page +referred to using the +.Dv VM_PAGE_BITS_ALL +bitmask (i.e., 0xFF if the hardware page size is 4096). .Pp VM buffers also keep track of a byte-granular dirty range and valid range. This feature is normally only used by the NFS subsystem. I am not sure why it -is used at all, actually, since we have DEV_BSIZE valid/dirty granularity +is used at all, actually, since we have +.Dv DEV_BSIZE +valid/dirty granularity within the VM buffer. -If a buffer dirty operation creates a 'hole', +If a buffer dirty operation creates a +.Dq hole , the dirty range will extend to cover the hole. If a buffer validation -operation creates a 'hole' the byte-granular valid range is left alone and +operation creates a +.Dq hole +the byte-granular valid range is left alone and will not take into account the new extension. Thus the whole byte-granular abstraction is considered a bad hack and it would be nice if we could get rid @@ -81,16 +107,24 @@ of it completely. .Pp A VM buffer is capable of mapping the underlying VM cache pages into KVM in order to allow the kernel to directly manipulate the data associated with -the (vnode,b_offset,b_size). +the +.Pq Va vnode , b_offset , b_size . The kernel typically unmaps VM buffers the moment -they are no longer needed but often keeps the 'struct buf' structure -instantiated and even bp->b_pages array instantiated despite having unmapped +they are no longer needed but often keeps the +.Vt struct buf +structure +instantiated and even +.Va bp->b_pages +array instantiated despite having unmapped them from KVM. If a page making up a VM buffer is about to undergo I/O, the -system typically unmaps it from KVM and replaces the page in the b_pages[] +system typically unmaps it from KVM and replaces the page in the +.Va b_pages[] array with a place-marker called bogus_page. The place-marker forces any kernel -subsystems referencing the associated struct buf to re-lookup the associated +subsystems referencing the associated +.Vt struct buf +to re-lookup the associated page. I believe the place-marker hack is used to allow sophisticated devices such as file system devices to remap underlying pages in order to deal with, @@ -107,18 +141,29 @@ you wind up with pages marked clean that are actually still dirty. If not treated carefully, these pages could be thrown away! Indeed, a number of -serious bugs related to this hack were not fixed until the 2.2.8/3.0 release. -The kernel uses an instantiated VM buffer (i.e., struct buf) to place-mark pages +serious bugs related to this hack were not fixed until the +.Fx 2.2.8 / +.Fx 3.0 +release. +The kernel uses an instantiated VM buffer (i.e., +.Vt struct buf ) +to place-mark pages in this special state. -The buffer is typically flagged B_DELWRI. +The buffer is typically flagged +.Dv B_DELWRI . When a -device no longer needs a buffer it typically flags it as B_RELBUF. +device no longer needs a buffer it typically flags it as +.Dv B_RELBUF . Due to -the underlying pages being marked clean, the B_DELWRI|B_RELBUF combination must +the underlying pages being marked clean, the +.Ql B_DELWRI|B_RELBUF +combination must be interpreted to mean that the buffer is still actually dirty and must be written to its backing store before it can actually be released. In the case -where B_DELWRI is not set, the underlying dirty pages are still properly +where +.Dv B_DELWRI +is not set, the underlying dirty pages are still properly marked as dirty and the buffer can be completely freed without losing that clean/dirty state information. (XXX do we have to check other flags in @@ -128,7 +173,9 @@ The kernel reserves a portion of its KVM space to hold VM Buffer's data maps. Even though this is virtual space (since the buffers are mapped from the buffer cache), we cannot make it arbitrarily large because -instantiated VM Buffers (struct buf's) prevent their underlying pages in the +instantiated VM Buffers +.Pq Vt struct buf Ap s +prevent their underlying pages in the buffer cache from being freed. This can complicate the life of the paging system. From nobody Sat Nov 8 10:55:51 2025 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 4d3XsM3H4Lz657Wb; Sat, 08 Nov 2025 10:55: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3XsM2b2gz3nCm; Sat, 08 Nov 2025 10:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KYiGwbY1AULm1XcFy5w31rIFUFBZFVmHuXmDlTZ8/N8=; b=AjcWTdRHb0DXqZB5rU9jxl0CKky5EZBH/Bj+YDyOd+qwNhsA666I4DqJXw/Y7kjyfdZT3J IvwJhLhoU6Y9RwnMCjn93TXzREH1Jp54N+my3XY9RqsI37mll+PheZQRGZqbMyto+mvd35 7tTIRRJsd8HT7JdXEBRNUnwmpSIfcPaFRa3k57/d83R2ony5FiLUm6qTNtYldUjXet+mLd AILegRQyaQT6lkdmSwNdyvY5JaHnycOOk9gtJMN6mV+tTUHjkx0Ugq6BoX111+yMeFlgXa gcTByxMNLf57P9QZlmPqHpEvREBxEoQbcDroTR6/T3U1b0r7E2G53paQRniO8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KYiGwbY1AULm1XcFy5w31rIFUFBZFVmHuXmDlTZ8/N8=; b=BHgq9R74Qc9rnwJkTWfw8MpoUsDnZpuEv2lXigcr8MvQOGYlUeM6jDPap2Q8Hs2CfhG0gk CzAuEcP9zTtm9FvXgGH0xw2lWDpOw4hnXIXZNDsybgADxZ8NzMOXz5qRT26brB/tHv76Su 3/5cHHate4AxoNhkuGkcLqSCwDyb4EVYivTcdo/XZhRIjqJtQDU8KHEKrERMzp1RL3Do81 iaWfaYovjCXYWQ7Xvj6rJGrO8Y+E9IMGCn9MGwwVnB3W3CF8z9R42JCze4Fs6fvx06KnH9 jlrxmGKpt3unXqKpOcT8v35xchV5Y3rF4lFrYba5fxTXgU9umRgbpyLxNGmznA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762599351; a=rsa-sha256; cv=none; b=ThCuHAVpmsitIUWynS3orFnaC3Aw9D3ekWIUPWOb3nscG5RFyDNtMtbgRRDF8SweYN1VKQ 6MBLPgpJIZSCAapEPadsSeEdaXu6gwFejlWLiWBP1Sb1y/WAHhKPjskpBqDUXCIXIdBzb1 qF6cRiNmfpjjvaYeiZ6hoqKUr40U1mc7GUH0vsGdSltleJRwg4khqtlHGG1NGUBZAUc7pa sGBONGpFhD852Z8wHas9JZJcnTDXgMksZPGgNTfi33URsgEQ0syPohSNc0+0688w2VASuU jBRP/2v6EsR6YIPrGGsP337+7Et4Yx3+YscdgAs7wtGf87URSX+uiT11I3SH/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3XsM1r87zjSR; Sat, 08 Nov 2025 10:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8Atpdi050118; Sat, 8 Nov 2025 10:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8Atp54050113; Sat, 8 Nov 2025 10:55:51 GMT (envelope-from git) Date: Sat, 8 Nov 2025 10:55:51 GMT Message-Id: <202511081055.5A8Atp54050113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 53912e303f83 - stable/13 - buf.9: Sprinkle with mdoc 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 53912e303f833b61ba6aa83c1836a87fffcb94ad Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=53912e303f833b61ba6aa83c1836a87fffcb94ad commit 53912e303f833b61ba6aa83c1836a87fffcb94ad Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:04:43 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 10:55:47 +0000 buf.9: Sprinkle with mdoc macros I did not bump the date here as the manual page looks more like a draft and I'm not sure if it is actually up-to-date considering that it's current Dd dates back to 1998. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52770 (cherry picked from commit fc7f5452c6ff1a9d01a9d8d0638da593ae4f080c) --- share/man/man9/buf.9 | 97 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 25 deletions(-) diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9 index 975a1bf2074f..baf3d06db1b4 100644 --- a/share/man/man9/buf.9 +++ b/share/man/man9/buf.9 @@ -36,44 +36,70 @@ The kernel implements a KVM abstraction of the buffer cache which allows it to map potentially disparate vm_page's into contiguous KVM for use by (mainly file system) devices and device I/O. This abstraction supports -block sizes from DEV_BSIZE (usually 512) to upwards of several pages or more. +block sizes from +.Dv DEV_BSIZE +(usually 512) to upwards of several pages or more. It also supports a relatively primitive byte-granular valid range and dirty range currently hardcoded for use by NFS. The code implementing the VM Buffer abstraction is mostly concentrated in -.Pa /usr/src/sys/kern/vfs_bio.c . +.Pa sys/kern/vfs_bio.c +in the +.Fx +source tree. .Pp One of the most important things to remember when dealing with buffer pointers -(struct buf) is that the underlying pages are mapped directly from the buffer +.Pq Vt struct buf +is that the underlying pages are mapped directly from the buffer cache. No data copying occurs in the scheme proper, though some file systems such as UFS do have to copy a little when dealing with file fragments. The second most important thing to remember is that due to the underlying page -mapping, the b_data base pointer in a buf is always *page* aligned, not -*block* aligned. -When you have a VM buffer representing some b_offset and -b_size, the actual start of the buffer is (b_data + (b_offset & PAGE_MASK)) -and not just b_data. +mapping, the +.Va b_data +base pointer in a buf is always +.Em page Ns -aligned , +not +.Em block Ns -aligned . +When you have a VM buffer representing some +.Va b_offset +and +.Va b_size , +the actual start of the buffer is +.Ql b_data + (b_offset & PAGE_MASK) +and not just +.Ql b_data . Finally, the VM system's core buffer cache supports -valid and dirty bits (m->valid, m->dirty) for pages in DEV_BSIZE chunks. +valid and dirty bits +.Pq Va m->valid , m->dirty +for pages in +.Dv DEV_BSIZE +chunks. Thus a platform with a hardware page size of 4096 bytes has 8 valid and 8 dirty bits. These bits are generally set and cleared in groups based on the device block size of the device backing the page. Complete page's worth are often -referred to using the VM_PAGE_BITS_ALL bitmask (i.e., 0xFF if the hardware page +referred to using the +.Dv VM_PAGE_BITS_ALL +bitmask (i.e., 0xFF if the hardware page size is 4096). .Pp VM buffers also keep track of a byte-granular dirty range and valid range. This feature is normally only used by the NFS subsystem. I am not sure why it -is used at all, actually, since we have DEV_BSIZE valid/dirty granularity +is used at all, actually, since we have +.Dv DEV_BSIZE +valid/dirty granularity within the VM buffer. -If a buffer dirty operation creates a 'hole', +If a buffer dirty operation creates a +.Dq hole , the dirty range will extend to cover the hole. If a buffer validation -operation creates a 'hole' the byte-granular valid range is left alone and +operation creates a +.Dq hole +the byte-granular valid range is left alone and will not take into account the new extension. Thus the whole byte-granular abstraction is considered a bad hack and it would be nice if we could get rid @@ -81,16 +107,24 @@ of it completely. .Pp A VM buffer is capable of mapping the underlying VM cache pages into KVM in order to allow the kernel to directly manipulate the data associated with -the (vnode,b_offset,b_size). +the +.Pq Va vnode , b_offset , b_size . The kernel typically unmaps VM buffers the moment -they are no longer needed but often keeps the 'struct buf' structure -instantiated and even bp->b_pages array instantiated despite having unmapped +they are no longer needed but often keeps the +.Vt struct buf +structure +instantiated and even +.Va bp->b_pages +array instantiated despite having unmapped them from KVM. If a page making up a VM buffer is about to undergo I/O, the -system typically unmaps it from KVM and replaces the page in the b_pages[] +system typically unmaps it from KVM and replaces the page in the +.Va b_pages[] array with a place-marker called bogus_page. The place-marker forces any kernel -subsystems referencing the associated struct buf to re-lookup the associated +subsystems referencing the associated +.Vt struct buf +to re-lookup the associated page. I believe the place-marker hack is used to allow sophisticated devices such as file system devices to remap underlying pages in order to deal with, @@ -107,18 +141,29 @@ you wind up with pages marked clean that are actually still dirty. If not treated carefully, these pages could be thrown away! Indeed, a number of -serious bugs related to this hack were not fixed until the 2.2.8/3.0 release. -The kernel uses an instantiated VM buffer (i.e., struct buf) to place-mark pages +serious bugs related to this hack were not fixed until the +.Fx 2.2.8 / +.Fx 3.0 +release. +The kernel uses an instantiated VM buffer (i.e., +.Vt struct buf ) +to place-mark pages in this special state. -The buffer is typically flagged B_DELWRI. +The buffer is typically flagged +.Dv B_DELWRI . When a -device no longer needs a buffer it typically flags it as B_RELBUF. +device no longer needs a buffer it typically flags it as +.Dv B_RELBUF . Due to -the underlying pages being marked clean, the B_DELWRI|B_RELBUF combination must +the underlying pages being marked clean, the +.Ql B_DELWRI|B_RELBUF +combination must be interpreted to mean that the buffer is still actually dirty and must be written to its backing store before it can actually be released. In the case -where B_DELWRI is not set, the underlying dirty pages are still properly +where +.Dv B_DELWRI +is not set, the underlying dirty pages are still properly marked as dirty and the buffer can be completely freed without losing that clean/dirty state information. (XXX do we have to check other flags in @@ -128,7 +173,9 @@ The kernel reserves a portion of its KVM space to hold VM Buffer's data maps. Even though this is virtual space (since the buffers are mapped from the buffer cache), we cannot make it arbitrarily large because -instantiated VM Buffers (struct buf's) prevent their underlying pages in the +instantiated VM Buffers +.Pq Vt struct buf Ap s +prevent their underlying pages in the buffer cache from being freed. This can complicate the life of the paging system. From nobody Sat Nov 8 11:04:32 2025 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 4d3Y3P0dmdz6580j; Sat, 08 Nov 2025 11:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Y3N6ptyz3pQZ; Sat, 08 Nov 2025 11:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gn2C8rrSnQd90H0AozZlqhPIiAlIt/H0Ref5qk2SaMw=; b=LTC1sR/LxAUgJjYuJi38tFLg16sZvQp+0X5UMRgVyLxkD5xI4YrUasodMemnjhncgmacYj KqBX3bp4LUmoMhBlgV4zYwMhXJUndxTSGMa8olEhamFDSqVCbPbgEDe0eS24G4K6GrCjIl pbJaCgY9Vh86XWEHJrK5s0rGz9BXGmE1CCevvzmNF29liz4stww96NxKugVtpaJ4bXMqA7 OlW1qaY44Ku5ImkvBv14YhgEc5CZU2cUTCyTB1V+5TzuMKzhfVeFKju+1K/Y8OACAVxyyn YMAQ1hfrQQTZLw5RHqOwOuyh9ppWs6zxbRDV7aW4k48oZjkTTp/IG/RapvCGwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gn2C8rrSnQd90H0AozZlqhPIiAlIt/H0Ref5qk2SaMw=; b=A+uL6eSM06fW3pKwIsU69L53t1ffcR+LGQy9wgnLIonKBN5wGxXyqX4IW3O12EG+Gm7cY/ OJj4kSGFeRP2iuprgcIaTWeAujvcMWluJ+kbB/YtvON57f47kfiKT44UocR7ssUCLJ8K5P CHGqDpKjqh4wsx6KkZTzLyla1EBH0gkZyfmuHGJIXzof+nfUqGBI6ETb+W+5Md6+f2Vx3+ JC58Q/NSaASaCY/rikXsLr3Ubp6A2oRQVGhUbfFcN69J8+LFIS1t+aHHRWjbP3gWBXTdyn H/6zXfHyXXGnMHp2ZLva/Eel8KqouX2bVkgpWlus7lPfQ2oCLnNep/RS9LsWfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762599873; a=rsa-sha256; cv=none; b=miZ/j6rYkutNtR267CtFSwxQwTPG7bHTygXlsOqRw5Vvu3tSFnp/x85m8HFKHy7+4p0Kn5 g6DSZk5Tb2ffc7CkKSmo7Vo4LSFK4ICq4+vpO41HCmT26DJfKMaTOjrsPoBKMxuiXASUjH D+t8SpVfl/JnWEB7265rXmz3cb56xhiKmh9YdUF9/f9c8HayBg6dgOJ2fuygMDEqpc8KLk LVmsCRq/CX7g6kilom1xOWJOElOAD4xUzgg7xbpOVGlCm/yLpT2DcFinKIOff/jS/xU/r6 xkUXq0q8mNbMoGkRu06pmE1YkZuVOuNx9zQJRMG1vZPO8RhST3jFTrx2UwSgkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Y3N6D85zjWC; Sat, 08 Nov 2025 11:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8B4WDm069260; Sat, 8 Nov 2025 11:04:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8B4WY9069257; Sat, 8 Nov 2025 11:04:32 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:04:32 GMT Message-Id: <202511081104.5A8B4WY9069257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d8097cf79cfa - stable/15 - deadfs.9: Document List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d8097cf79cfa1d74a3b38ca28f88f68d2e13f710 Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d8097cf79cfa1d74a3b38ca28f88f68d2e13f710 commit d8097cf79cfa1d74a3b38ca28f88f68d2e13f710 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 18:08:31 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:04:20 +0000 deadfs.9: Document Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53334 (cherry picked from commit daa6660f899309f832bba0c7ac72dada125cfed5) --- share/man/man9/Makefile | 1 + share/man/man9/deadfs.9 | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index a4d4a58c350d..4cea099b6c07 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -90,6 +90,7 @@ MAN= accept_filter.9 \ DECLARE_MODULE.9 \ DEFINE_IFUNC.9 \ DELAY.9 \ + deadfs.9 \ devclass.9 \ devclass_find.9 \ devclass_get_device.9 \ diff --git a/share/man/man9/deadfs.9 b/share/man/man9/deadfs.9 new file mode 100644 index 000000000000..360451266625 --- /dev/null +++ b/share/man/man9/deadfs.9 @@ -0,0 +1,36 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd October 24, 2025 +.Dt DEADFS 9 +.Os +.Sh NAME +.Nm deadfs +.Nd pseudo-filesystem to own reclaimed vnodes +.Sh DESCRIPTION +The +.Nm +file system implements operations that do not modify any data +and instead return indications of invalid IO. +Its role is to provide a fallback vnode operations vector for reclaimed +.Xr vnode 9 Ap s . +.Pp +It is a kernel-only pseudo-file system and so cannot be mounted from userspace. +.Sh SEE ALSO +.Xr insmntque 9 , +.Xr vnode 9 , +.Xr VOP_RECLAIM 9 +.Sh HISTORY +UNIX System Manager's Manual (SMM) for +.Bx 4.4 +described +.Nm +as a file system +.Dq where rejected vnods go to die . +.Sh AUTHORS +The +.Nm +manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . From nobody Sat Nov 8 11:04:49 2025 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 4d3Y3j5QTYz657xQ; Sat, 08 Nov 2025 11:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Y3j4h3Yz3pjl; Sat, 08 Nov 2025 11:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SkKQiZ1L1xGk4hH5Kiy7WZWIxpxB3OPzUCWO+wfp0JA=; b=KJzbrxNi9HUyh6RqdepOIFtTrUx7CahnUHKO+a55BAuk8hihJIgitdnHAyA+K7jxoZWuC0 FdnuHxpMdbVgomfnHzQvCaY8Wwl9h2JoxG8mbi5BQdGs3oDxZtJmYJVfD+QKMzGsZ20RWa vGaKoOjEJpU4EApkg48p9bHq4rQVdfJMZuuPWllYxI2mucQlKmB5QQM3tJ/GF+MAzXIksn +IVbxxaIn66JUlf4tqq6f8PPkqFXAgpL1fGcprQTYpEumltCPvcxHCqaeLnwwye8j9aUpM 5x/6c0rXx6l+azfblgDTSP3gDvgLqA6OGBNm8jb8HkmS2Pz7BSyfSY6taTCyqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SkKQiZ1L1xGk4hH5Kiy7WZWIxpxB3OPzUCWO+wfp0JA=; b=NSe5G1nMHSQ4JV7kAGPZAxKcAPwMaRXmvVHCryB5oIrfmNHHRplrwLBwWjXG2V21MTO96o avbScERipS53dB+C/cGyTKavWT1NQq6xgyj0Yv2ZH1dKKGP5uZhhHY3MNO6mzl+YJnVQLC 7qmkG9kSQpwJRD4MyfszrPbnhiHIjC4fkB+JMsHDGsa5ePAiDA7yZru2KeNvq6tmdEbI9L jC+zNths/F8ZJxYcEpRfF3HW8fupRHmgiVodlCA2PJaBqjjdFS9IW3RMGk9sDZLgKG7PEx rEDpz0LPw9z3B3Jqtjzqv39eA9Pcgz1vLP68uum5Q98UfAgx9sR3H6BivWYUoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762599889; a=rsa-sha256; cv=none; b=BHW2CNO+oF6gPkJZ68BaQIX/P3fVIo2SaGOTdAs6Lhdpev7ye9Rgr8JJuzK1Ws+R5YBuI5 qO4XYPqeIBlFRRSsecU7S/nZKO53ZOmqmaAQwWgkxBQJy9LdE3Vc90pXNpU0/4+0RJwz/f 0dRLQe5dDn5OBG2z1pR81OxmKfS7sbDZxbu71TTiaxCeO6fFKMMGwmvE2Cs0NitATZS2tj Sda9f/b8iwffJ1VTk+h6WTIaw4uNWCNGGTLZfkIhGWLGL2npdgBB+q/2wnkiPAXzD8+DvT nbQ+L6I6H53p8dMnJoJLl+LUiUK7UCTX2N3lGwWCsyNGEMetKxMh3YCUrZ+zIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Y3j43FXzk2V; Sat, 08 Nov 2025 11:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8B4nv4069472; Sat, 8 Nov 2025 11:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8B4nqU069469; Sat, 8 Nov 2025 11:04:49 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:04:49 GMT Message-Id: <202511081104.5A8B4nqU069469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 4d5583b9021f - stable/14 - deadfs.9: Document List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d5583b9021fd227cbed25dc6d25c1d158e1dcf3 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=4d5583b9021fd227cbed25dc6d25c1d158e1dcf3 commit 4d5583b9021fd227cbed25dc6d25c1d158e1dcf3 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 18:08:31 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:04:37 +0000 deadfs.9: Document Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53334 (cherry picked from commit daa6660f899309f832bba0c7ac72dada125cfed5) --- share/man/man9/Makefile | 1 + share/man/man9/deadfs.9 | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 211c1150c909..148470e0934f 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -87,6 +87,7 @@ MAN= accept_filter.9 \ DECLARE_MODULE.9 \ DEFINE_IFUNC.9 \ DELAY.9 \ + deadfs.9 \ devclass.9 \ devclass_find.9 \ devclass_get_device.9 \ diff --git a/share/man/man9/deadfs.9 b/share/man/man9/deadfs.9 new file mode 100644 index 000000000000..360451266625 --- /dev/null +++ b/share/man/man9/deadfs.9 @@ -0,0 +1,36 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd October 24, 2025 +.Dt DEADFS 9 +.Os +.Sh NAME +.Nm deadfs +.Nd pseudo-filesystem to own reclaimed vnodes +.Sh DESCRIPTION +The +.Nm +file system implements operations that do not modify any data +and instead return indications of invalid IO. +Its role is to provide a fallback vnode operations vector for reclaimed +.Xr vnode 9 Ap s . +.Pp +It is a kernel-only pseudo-file system and so cannot be mounted from userspace. +.Sh SEE ALSO +.Xr insmntque 9 , +.Xr vnode 9 , +.Xr VOP_RECLAIM 9 +.Sh HISTORY +UNIX System Manager's Manual (SMM) for +.Bx 4.4 +described +.Nm +as a file system +.Dq where rejected vnods go to die . +.Sh AUTHORS +The +.Nm +manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . From nobody Sat Nov 8 11:05:03 2025 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 4d3Y400BL6z658D4; Sat, 08 Nov 2025 11:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Y3z1VtTz3q1W; Sat, 08 Nov 2025 11:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uzRrDWt8UDZz5VANm9WnNGjDUmN7bgs4mE+hyHAMUQw=; b=DxIVCCECSQ6CUgnGEe3uOG8OHf9JFJUYqk41kjUCMUZTddaDOumNOMv/+5fcBalg+Jca85 Z9da7WqgHpf743HqGmWmjhCithuvLqPChPAaQAjt94TVgics5JnuhjzipCINKmkP2o8cu9 vyOVsi2zimSs5WeipO85uX72z8x3LEMWLWk/Qt/y/2IWD8d6FAKMSBbwUkvtkdiTBHSex4 FWRkrt61zZ/85lb4R/l8FEwEuvJ23metxn59+YDbUB1DrG1Ckg6Ak1tR5RHvzRBEOKNSOB ufyhPacffsq4g8EYCqwLUuBUhwUtVaA/iMbzMQ4Dh53/dEVuNq0fqdauqwfHxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uzRrDWt8UDZz5VANm9WnNGjDUmN7bgs4mE+hyHAMUQw=; b=cGvMmKq0okCdISUtpAzdSjYfJoCyBBl8BuLNVhizQQoaV1AYN3OducH7xh1dlYtwenV+sd NtBHTxlpBjEnS7AuVe4VZ9JPg+CdRUt2/HQSO375iX2/qsVlOZoYnIRnJATiTyGX/knk+4 MJE/4KmgUIxJ3Jzv4XiY8BmIJZGocavDTtVW5LgEkERPHelwJzuz5RedFXltUrODL+FXCe 7Ge8tgw/0CKAAwg/pGFSNHVyL2NcduJDWcOg5r7icpMuRGwginXe9VZykKYzR5JdE0iWhE WB8E0M7TLnmfhJp5wpzhivzCmugCXJ7g8F7cnYJbpF4btqcnFgx1zMXSqmaf3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762599903; a=rsa-sha256; cv=none; b=ITnEtKr0YpRYO6kANEyVES/qe2CQ2aMBNqYjvqnHOkWaFjzDytkjbklChabPU/j4FMttO9 n/gc0Dry0ELlsG/O5QukyHfzI+azlwQEMNQ67N4eNwpeIigDxqnbaRJrSxtyoPiXNXPhiA Lk91FMrPadi3lRMcaQA/NiEviyg9ndTtDVI0ucGORpAx/NtK39/a8mdmlXH1Kb79ZF5jHt y1RxdYQtJ3gbUo1nfRKbTrhlrDwHfu6OVaVo5hujPufk2qALc30Ky5S71oWkLsHcQ2OUoN NvqtlRSebOgc0sujSYAv0KkewNElrTfBXP5p5dCiwhpTaoC1q+b9BoTM7XNnmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Y3z0tKszk9g; Sat, 08 Nov 2025 11:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8B53kG069698; Sat, 8 Nov 2025 11:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8B53cc069695; Sat, 8 Nov 2025 11:05:03 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:05:03 GMT Message-Id: <202511081105.5A8B53cc069695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: cd77df4c057e - stable/13 - deadfs.9: Document List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cd77df4c057e51d3a36368d40019b23f9c8a8296 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd77df4c057e51d3a36368d40019b23f9c8a8296 commit cd77df4c057e51d3a36368d40019b23f9c8a8296 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 18:08:31 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:04:54 +0000 deadfs.9: Document Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53334 (cherry picked from commit daa6660f899309f832bba0c7ac72dada125cfed5) --- share/man/man9/Makefile | 1 + share/man/man9/deadfs.9 | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index ca17497fc490..99fa72fabc64 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -84,6 +84,7 @@ MAN= accept_filter.9 \ DECLARE_MODULE.9 \ DEFINE_IFUNC.9 \ DELAY.9 \ + deadfs.9 \ devclass.9 \ devclass_find.9 \ devclass_get_device.9 \ diff --git a/share/man/man9/deadfs.9 b/share/man/man9/deadfs.9 new file mode 100644 index 000000000000..360451266625 --- /dev/null +++ b/share/man/man9/deadfs.9 @@ -0,0 +1,36 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd October 24, 2025 +.Dt DEADFS 9 +.Os +.Sh NAME +.Nm deadfs +.Nd pseudo-filesystem to own reclaimed vnodes +.Sh DESCRIPTION +The +.Nm +file system implements operations that do not modify any data +and instead return indications of invalid IO. +Its role is to provide a fallback vnode operations vector for reclaimed +.Xr vnode 9 Ap s . +.Pp +It is a kernel-only pseudo-file system and so cannot be mounted from userspace. +.Sh SEE ALSO +.Xr insmntque 9 , +.Xr vnode 9 , +.Xr VOP_RECLAIM 9 +.Sh HISTORY +UNIX System Manager's Manual (SMM) for +.Bx 4.4 +described +.Nm +as a file system +.Dq where rejected vnods go to die . +.Sh AUTHORS +The +.Nm +manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . From nobody Sat Nov 8 11:06:00 2025 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 4d3Y551DVqz6581q; Sat, 08 Nov 2025 11:06: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Y550jFSz3qb3; Sat, 08 Nov 2025 11:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cTYXeOEgxNeAh+186bNALydVxCzY6c1Qu+7sF2udg14=; b=kdTQ+7ZULJRkVMfq1BTdmLeolkTZ6uEk6xGFlcJTwpvRnYQQfOTM2rixSOq5jZd375tk2d 5S1iyrSiGuRZp2olXPrS+Ky7Xzpv1mFco411Hvhl/TrsMKTxZFXswK5lY65cZkyFBfByFJ 79c9G5tVbKi+p3ObRFKSYNsFkZ0UJawg1i3oczWlYuRdwzFvVjPhcy7MuS6FdG4JMUFBzs 43TCp0wVEDN5IQjSYJcFEE9k4rYa+eNkPDRM/lb4als1wskiUhT6yPcOnphVouCDz7DlyW g9nyseuRVbzjry1W6flA9wiOFZNvhM8VV7rH2dFqP5W1eIHFZdDC4/lSgblj5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762599961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cTYXeOEgxNeAh+186bNALydVxCzY6c1Qu+7sF2udg14=; b=LzlMwUXjwCwtVq70940VXD6CAtNJaHmOrqRqVaACKSYSPYjckSfcwpi2c2sIWOE31rzYHI nLzIsdkbmihBTojAPkrF94L2k/NJK91+0tWmlZr91QjYYKEX5oBuCbPFBnfaLMBXbNhEVh b647SUJBYItD/fDzL+HaIBAvSKvEjViXkWR2DYEB/PRHFdflcKNQ+pZJU+R6/XjQXrlxNi TFZslxUh7n+WSbSZfsFNE5/rogH8W0g8Nt05UBtERgS3Iga5X3PKo26FtkEfJUm9TA5BgM UA86NM6NIsAXVVKs3Mi5L/af6B/W5ryq0eY0hRHl7PseyyQnBzl5F6d1BREZOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762599961; a=rsa-sha256; cv=none; b=h0jWZX3Sm3otHvt21VWpRRvzmYa7pI57TNUM5t9mtv9Jasw4hPIf3wujb90bQFXt7GZ01u mIsnngBnsFncxDHwKYxCFX0IQi1+6CGQaInfFjqzunEU9HWaB6wGmTIFolOuXp5jEiYayE MLqBAG17UThyGGT1nkAi3TXuX2Iq+xBxYF3O1fvWNJfScktGaBBGC2SzNI0NNgEMUpy6oW EQSemn1xp1jKWsalCbuiH7yEysaes+RtCGu4DaN5uRxmJcBZCU9yn8lQczQ+BEf3yB06YT PRN4oZThI+TW+w1TKjfTJrMqpW0jI7J4TpcZfGUuWXP5NszDER5tuETgpSPnUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Y55075wzjTH; Sat, 08 Nov 2025 11:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8B60wN070231; Sat, 8 Nov 2025 11:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8B60Xk070228; Sat, 8 Nov 2025 11:06:00 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:06:00 GMT Message-Id: <202511081106.5A8B60Xk070228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 163ff684af2e - stable/15 - gpart.8: Document one of gpart destroy diagnostic 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 163ff684af2ea70c689da2371b1232a04d266f4e Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=163ff684af2ea70c689da2371b1232a04d266f4e commit 163ff684af2ea70c689da2371b1232a04d266f4e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 14:51:07 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:05:50 +0000 gpart.8: Document one of gpart destroy diagnostic message Reviewed by: ziaee MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52992 (cherry picked from commit a08b38dfcea3c61718dfa40b003518fa3d9adac4) --- lib/geom/part/gpart.8 | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index f76c1d9d5d6c..2e11417f8494 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 11, 2025 +.Dd October 24, 2025 .Dt GPART 8 .Os .Sh NAME @@ -1497,6 +1497,26 @@ and .Bd -literal -offset indent /sbin/gpart backup ada0 | /sbin/gpart restore -F ada1 ada2 .Ed +.Sh DIAGNOSTICS +.Bl -diag +.It gpart: arg0 '%s': Invalid argument +The provided +.Ar geom +argument +is not a GEOM provider. +Not every device in +.Xr devfs 4 +is a GEOM provider. +For example, a +.Xr zfs 4 +zvol will show up as a GEOM provider only if its +.Sy volmode +is set properly +.Po refer to +.Xr zfsprops 8 +for details +.Pc . +.El .Sh SEE ALSO .Xr geom 4 , .Xr boot0cfg 8 , From nobody Sat Nov 8 11:09:03 2025 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 4d3Y8c1y4Rz658HV; Sat, 08 Nov 2025 11:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Y8c0LlWz3r2F; Sat, 08 Nov 2025 11:09:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ngzIR+0/YnKUDv4CJC6AWw0nbFeLWUCroLCk3gKSkT8=; b=GixVvX3j/jq9khkDIklCvRSbhtnG8eWsVS15kMsiihG8orqqeg7Wph5oMMTUIgLhLbOMIK Ku9cjy36oAeW8FSYN+VD1D0BJ7gunnhSyuUNSlB1QSFahW2fEp+YtrdQepRKqOAIprxdYV 8deI3yiYB1ZWO8Y+3fxX1XZ9AuPXBEIJL76/Iuxy0enS/go7q6kx0YJhyfe9PPZX1wyQWU JzueBowzLI5njVC8150B/4d/SEYju/6vr7t18WX6U8vuTSr0KyAlP1QJto8o1zHyhKPqVQ 5HACTF3odo7rsZMzWTZmVZ1rncha4bdVkAZzBTC/+QFzvkrOwBzq8aAOu0jxKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ngzIR+0/YnKUDv4CJC6AWw0nbFeLWUCroLCk3gKSkT8=; b=Pg8FPy6vHoFBaz5FRE58kAD1dQeK5xCM6Iui2/PvsJhJGu3WLzrrktY2Tf5B/q137jTiQz 91Pfl9470XNToVSMD/BV/BRyMs9zkqE1pbLP6ajuhHiRLrRN+w2ynrx5kgr+HJwvBB+VXC zdJQbDuaeSF4UmORPyYtLC7F6URZbnpu85/AGC1mLbSA/T/RyqIGJWjHd6O/BGSd4wbDF2 V3O2nCaBKZjxWlRbOUsickDBfHWWOYf/T2mpZbHYQX/9CmgGcFLDQ2YTym5vOh/v+FNv09 eHIdBNBYsZ//NodFyjgPMJaVcZFGVpyuN4dEAUR6qWRBagZUKUd7hTa6lfE8yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762600144; a=rsa-sha256; cv=none; b=csMTLKAeXuPyZOBkPvXkwsduvSq8zR9FzjG2hqf0HQ1XWRE3cbEnkKqSDGmiB1orAjOV4Z 96vyDyk7kcMWS0uEUmUkYnQLU65DM/mPNycG4rAw58Aah4aPIghqOk68mci0oQU0FIhhLT h84F4kRuUMyqy0m1Q7pJRwMrOqHWmfgzk6SvM9Aa9kaj4C4EfZU1YJ46YETggbAznQEP5n bED6LL9NM5kKRyPF5oM37sPnZyERL6hS6+NvfNHR06C4N01J+SnXyRdeAMgFoFTH8gJww+ ObJXWJxRJ7F6KOuBMxHB2tEP5p7LflQplkOL4Jro4RIMy2Bb2XIF/C/3/v/F9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Y8b6fhqzjkp; Sat, 08 Nov 2025 11:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8B93dD071232; Sat, 8 Nov 2025 11:09:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8B93j4071229; Sat, 8 Nov 2025 11:09:03 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:09:03 GMT Message-Id: <202511081109.5A8B93j4071229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5fd09ddf790b - stable/14 - gpart.8: Document one of gpart destroy diagnostic 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5fd09ddf790b47ac80223e9c82b1ec38bc110d9c Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=5fd09ddf790b47ac80223e9c82b1ec38bc110d9c commit 5fd09ddf790b47ac80223e9c82b1ec38bc110d9c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 14:51:07 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:08:45 +0000 gpart.8: Document one of gpart destroy diagnostic message Reviewed by: ziaee MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52992 (cherry picked from commit a08b38dfcea3c61718dfa40b003518fa3d9adac4) --- lib/geom/part/gpart.8 | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index fa0b247c6174..c424ba1157d9 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 26, 2023 +.Dd October 24, 2025 .Dt GPART 8 .Os .Sh NAME @@ -1501,6 +1501,26 @@ and .Bd -literal -offset indent /sbin/gpart backup ada0 | /sbin/gpart restore -F ada1 ada2 .Ed +.Sh DIAGNOSTICS +.Bl -diag +.It gpart: arg0 '%s': Invalid argument +The provided +.Ar geom +argument +is not a GEOM provider. +Not every device in +.Xr devfs 4 +is a GEOM provider. +For example, a +.Xr zfs 4 +zvol will show up as a GEOM provider only if its +.Sy volmode +is set properly +.Po refer to +.Xr zfsprops 8 +for details +.Pc . +.El .Sh SEE ALSO .Xr geom 4 , .Xr boot0cfg 8 , From nobody Sat Nov 8 11:12:52 2025 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 4d3YF06C54z658dW; Sat, 08 Nov 2025 11:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3YF05glWz3rLw; Sat, 08 Nov 2025 11:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EX3gOYOFNvoOjjlvqXDiiBWmOAx+21zzF5Q0As1hjCk=; b=KcraY8hSadI3DcwcqPWV3eHumjXaS7wlSgGPRmVrYXlHw0MOsQkcSOco62KLVf5bPq3BlV skQsgDnFPSmPaqbgwHHw/VnBpC9tLkVOdK3elQm6ViRmlPXmtgXNIWWc1y8BNoX7dSLFVs jS8g3mJg83HGbH9ai/aEO5QiztiH8qQbzVNYk1FpDbq1JFymvpqizIhryMp2tbUmNYUvzT 18ucL4mNlJZZD6rMoVu0J+cP/rMgs0pcqegMp1MAxA9tKYAtS5ChedohQqL3ol9g6sB6CV quvf3kHTqggHwOg57jQ4S6/KsUPyJnK31NgcesFGo+LgsjP/1mu8RXtpnUfwRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EX3gOYOFNvoOjjlvqXDiiBWmOAx+21zzF5Q0As1hjCk=; b=XKWlV5Lpy7d9fk1KMqQfdjUbjq7oM3OLz7VSSqWnhgLeMTKlNmqi3ueXIGKwo9HxyBlvHA hcJAjNJio/G1ho8rtk+MWzZJ82INiOtB9VgQAMieLdyKhsFY2rYI0rm/CIJqDokuy0FkIm DD/icmSWn35gRtmHtD7JtDhVskCJ8fUW9IuqVI2SdCmwPgYjgddHm++3SUjeh4ssowWPoh tAMny5KCrqGvlA8XOxBg2RlhN7qLpxd2GUnp1g9ntx1luachr9oI7pRp6oSYZD89u+G8Ym wj+HNVxft3NZv+xoom3nKxcrrFoKIFEobpd4sRSSO5SUZdnorrQk6AKCLguu4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762600372; a=rsa-sha256; cv=none; b=vOcUkIsX15E7ujgtL0hi8A4KeYHHSOFn8mUEA8KW4NewxgU/r9QtrYv4Jo4QAnzX+q0esW vFFmsB1rZtmnthfuZOxfhMveOdq7rYfxw3ilR3hd7MI9pGoIbI0UpxGPyKPvnjfaY7+bb5 I3uISzGsuYKUCc6+N2tqYs0yA/1RHRUbuEXcpjThrbRXLUSE0CzqwPa/43YOVqawW+bLKD t0H3lAss4C5kCY6hvmRjMKgfn3bQmbrBfVqqZ2pA7JKUivoBIPTSYH825qfllspyShg1qM SMQzLn1mfhjCisOuC1xVvoq/I+Cy1V4YZ1K6IEAp+ib1FArx+93L4LMjxmJT0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3YF0569TzkBp; Sat, 08 Nov 2025 11:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8BCq60088869; Sat, 8 Nov 2025 11:12:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8BCqUf088866; Sat, 8 Nov 2025 11:12:52 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:12:52 GMT Message-Id: <202511081112.5A8BCqUf088866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 23f613c69740 - stable/14 - md(4): Stop symlinking vn.4 to md.4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23f613c6974069270a3e14c1d6b7ac793489fc51 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=23f613c6974069270a3e14c1d6b7ac793489fc51 commit 23f613c6974069270a3e14c1d6b7ac793489fc51 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-16 11:44:01 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:12:21 +0000 md(4): Stop symlinking vn.4 to md.4 We've done the same in the past to the vnconfig.8->mdconfig.8 link in: eb5f4569819 Remove ancient vnconfig symlink Reviewed by: bcr, markj, ziaee Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D27122 (cherry picked from commit 56eb7566c41902a14d4392f8a01c045dbde6de7e) --- ObsoleteFiles.inc | 3 +++ share/man/man4/Makefile | 1 - share/man/man4/md.4 | 4 ++-- sys/dev/md/md.c | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index de25b6608fe6..ce39d8eee2e4 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -66,6 +66,9 @@ OLD_FILES+=usr/tests/usr.bin/xargs/regress.n2147483647.out # 20250728: Machine versions of 'runq.h' do not exist anymore OLD_FILES+=usr/include/machine/runq.h +# 20250716: Remove an old manual page, vn(4) was removed in FreeBSD 5.0 +OLD_FILES+=usr/share/man/man4/vn.4.gz + # 20250708: replace yaml.lua with lyaml OLD_FILES+=usr/share/flua/yaml.lua diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index f5eca038e800..e677e42c22d1 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -723,7 +723,6 @@ MLINKS+=lge.4 if_lge.4 MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 -MLINKS+=md.4 vn.4 MLINKS+=mem.4 kmem.4 MLINKS+=mfi.4 mfi_linux.4 \ mfi.4 mfip.4 diff --git a/share/man/man4/md.4 b/share/man/man4/md.4 index acd52aecb675..7d14279f6623 100644 --- a/share/man/man4/md.4 +++ b/share/man/man4/md.4 @@ -5,7 +5,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.Dd January 8, 2020 +.Dd July 16, 2025 .Dt MD 4 .Os .Sh NAME @@ -158,7 +158,7 @@ installation process. The .Nm driver did a hostile takeover of the -.Xr vn 4 +.Sy vn driver in .Fx 5.0 . .Sh AUTHORS diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 1b434eda19a5..3057060d7adb 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -11,9 +11,9 @@ */ /*- - * The following functions are based on the vn(4) driver: mdstart_swap(), - * mdstart_vnode(), mdcreate_swap(), mdcreate_vnode() and mddestroy(), - * and as such under the following copyright: + * The following functions are based on the historical vn(4) driver: + * mdstart_swap(), mdstart_vnode(), mdcreate_swap(), mdcreate_vnode() + * and mddestroy(), and as such under the following copyright: * * Copyright (c) 1988 University of Utah. * Copyright (c) 1990, 1993 From nobody Sat Nov 8 11:13:26 2025 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 4d3YFg0fh1z658s7; Sat, 08 Nov 2025 11:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3YFf5jh3z3rks; Sat, 08 Nov 2025 11:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600406; h=from:from:reply-to:subject:subject: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/BS2IHOmL/E06n99KVXiYeCQcbSBd42K2R3OJEgkcI=; b=bsXPBV8sSwqv+9POqhsTAtJ34piXVq+1RuheQiZt+hzQtPgvf9zm58r6ddB5q8xkEWfUfV ruaf9nPvfqEJdOz4eEBhEXOFxlwqjYC6A6Xptc0xOCZO249gO1qbP6o+wae8wPM+o2tizp /n2W7V9Hobfrlin/ZnA3VB0E3CUXj7pTn1KSPPU0tFskOM0p7/8oL29UvMcHbR9g9xlIJM /TKx6oRUuvJiFJV/UWjzvPreAGNfoNcaSQXkuBxCcp72oC1DltzjNCklQY1ZrjhJ+26B7S 37yXgkyf2JHfF90VHOThUasLm0ZMXNzzM2/iMjJsHH9vIMz6LpGIa4fhhyZaEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600406; h=from:from:reply-to:subject:subject: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/BS2IHOmL/E06n99KVXiYeCQcbSBd42K2R3OJEgkcI=; b=jRp+fwhIXYe3W4MTLX6B/zsgFExTpXJkMdO+6OtCoyk3rWMxR8kHiVLuN2HnDVLyHRyv3m 5zFm3ICGFmNY6keHkIwPhqAxRHfr5QeDEqHzLRfyL/a/MBVjqZejEwbPyli0ZGsvAN97t4 2tTbtjBbHdtJ2lulmqScF1Gdw2IynDrBVXGsOse8bHv1du9SmiKUrdoTyQ8HV/mw+9ad1R 2caC85Zl7VKjvRRA8HiVTd839pfBa5jvZo0GT7n9u12ypQEch6YFFCmxysxRKZO7JqWFHo RPa31N/3WHTCCrC3zufsMxf0LNgCbnrmQ8pjhXfOm+JCFFgYW3iTqS5KU7MzGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762600406; a=rsa-sha256; cv=none; b=fR5h5BeJ9mWRxNcsDEp5geaeqy2TCn1VXM6uo8eNW/jzORRSXs8/m+KHe+M1H44dUgB3nl +6lqdrWBtuf/IzvDJOdZ5tdDytSdQp00oAfa4ccpn0nyJoDKifFu1YnMHcAmzyuGKZws8s xntPGBR8h/yNu0BfCPnuPpBS/onr4z3WWTsFDnbohTmOC7KM9plTgBQOG/eK1iEARxMENe 13fLhd4CixPp+twmTtyIqWWvoPuM472ts36FPAfUv7VoqgdB5683/s5Cs4/gqtDHn7NQsp bRwlDkkFEolaMCCftJ6b1ik3HNTC7/IimC18J1SqhWtBr1cr5S6tBpuBUYejyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3YFf51FMzkNX; Sat, 08 Nov 2025 11:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8BDQ4K089137; Sat, 8 Nov 2025 11:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8BDQNa089134; Sat, 8 Nov 2025 11:13:26 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:13:26 GMT Message-Id: <202511081113.5A8BDQNa089134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e001b4907475 - stable/14 - vnode.9: Fix a typo in sys/tools/vnode_if.awk path name List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e001b49074758ac649ec7f6f03e90892bc3a4a3c Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=e001b49074758ac649ec7f6f03e90892bc3a4a3c commit e001b49074758ac649ec7f6f03e90892bc3a4a3c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-14 23:40:50 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:13:19 +0000 vnode.9: Fix a typo in sys/tools/vnode_if.awk path name Fixes: e01826567938 vnode.9: Document vnode_if.awk and vnode_if.src MFC after: 1 week (cherry picked from commit 0abee387e1dfd0bf09becadb39b9bc9fef240d95) --- share/man/man9/vnode.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9 index 5dd087725e92..d17492668298 100644 --- a/share/man/man9/vnode.9 +++ b/share/man/man9/vnode.9 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 9, 2024 +.Dd July 15, 2025 .Dt VNODE 9 .Os .Sh NAME @@ -113,7 +113,7 @@ The function declarations and definitions are generated from .Pa sys/kern/vnode_if.src by the -.Pa sys/tools/vndoe_if.awk +.Pa sys/tools/vnode_if.awk script. The interfaces are documented in their respective manual pages like .Xr VOP_READ 9 From nobody Sat Nov 8 11:13:38 2025 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 4d3YFv0BGVz658dr; Sat, 08 Nov 2025 11:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3YFt6WcKz3rvF; Sat, 08 Nov 2025 11:13:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJ5P2rVn02SDxUCq5RkyASco8x+8g8JbC8hvjPcQc2o=; b=wbd6f69x2RWntigtLC+hOIci2YmlfK35WkqO/3Doj/H0v3YqXwxFfaLP1xzuVi/zCCwynS 4SWJTeKuQzIFnFCn/y9f1hJIYJgR5cf4Cm1uzFqmvbwm7YW+cPk1FHTzVWy2dcBWFCOQIF 7QWbnEuAsmJwWTGF9cCdYtLKEqgrjM1qZjfWFu+2VRaNOHnTET5lvkTzAMqqD+KvN83kR8 FEKMp7++i9OAVf0MjRtM33Osk6U015ExDzR5wqGDsSyJppBSi8uWTZ4ggLmiIc0Z+WfNIG of90Zdesl864d/CoNcKmABHBR2q/MMaTMNeXXvMfP8Dt01/CFSfi47Q4FnQubA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJ5P2rVn02SDxUCq5RkyASco8x+8g8JbC8hvjPcQc2o=; b=Zv7z5a4JWjA0ijp6nxquUN2ZqLoNEII98y846bJs6rPZYQVIAsVlH79kWv6s4oNdxavEFV GguT5sg8Q/mqWwPkbHp0xCVuNnT+i+35dVqYHGlD9JCtKVCAjvyL3vV0SJTc2VAaNf9kQQ +GG0rFBHlBNExNgkrXYGKWNK48VEaEHVzquplDtWvCdWfEUZQV34/5tN6PjOePPPRIO9+2 5pgEH4naT7zIuCb5BYrviTlB9G6sTMilBSuV2UIXrIsuyo7Sfsd3DS+R183n8QwwhCJ1US 6pCG64SfLkqVMmHjNFm9TG1qyPYkg/HW4z8JRoEqrm0bqWilAu7lisq+zs6DVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762600418; a=rsa-sha256; cv=none; b=s7/FsNn7uDZlM6wJlr/cLngy/i1TDK7mW4YdnnRNT+GEvnuGGJOsTTv60GiQEx2Y5w22x/ trejhmsX6Tz490qsyzOnle+Ws/SaXJgxpxKC+v3r0CeNbvU6jshQqo2jQ3nCQNCM/C/qK/ 3uvQdoIuJ7ENz2kRCdmcD1vDiiOnHZMI/uQLU2Mm0tuHsomthzjq4OnYHAoEl4EBLFjwJP WeQhfb4ty+JsH+kB3ge7yX8wdF6PPhZRt+H2fzybChA3fts+fqshh5Ove99NgYVff7Ns8v QlycL4Tt7cSacQckpl4ZvgJgl+WTlAMScaGvqpfiVMZwhDewbqAPPsVBWsc3Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3YFt63bpzk5Z; Sat, 08 Nov 2025 11:13:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8BDcFi089321; Sat, 8 Nov 2025 11:13:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8BDcQQ089318; Sat, 8 Nov 2025 11:13:38 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:13:38 GMT Message-Id: <202511081113.5A8BDcQQ089318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 4735f556b9c9 - stable/13 - vnode.9: Fix a typo in sys/tools/vnode_if.awk path name List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4735f556b9c949799a49770f850a8fc873ef64dd Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=4735f556b9c949799a49770f850a8fc873ef64dd commit 4735f556b9c949799a49770f850a8fc873ef64dd Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-14 23:40:50 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:13:33 +0000 vnode.9: Fix a typo in sys/tools/vnode_if.awk path name Fixes: e01826567938 vnode.9: Document vnode_if.awk and vnode_if.src MFC after: 1 week (cherry picked from commit 0abee387e1dfd0bf09becadb39b9bc9fef240d95) --- share/man/man9/vnode.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9 index c4bfab5f849f..90d622753106 100644 --- a/share/man/man9/vnode.9 +++ b/share/man/man9/vnode.9 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 9, 2024 +.Dd July 15, 2025 .Dt VNODE 9 .Os .Sh NAME @@ -113,7 +113,7 @@ The function declarations and definitions are generated from .Pa sys/kern/vnode_if.src by the -.Pa sys/tools/vndoe_if.awk +.Pa sys/tools/vnode_if.awk script. The interfaces are documented in their respective manual pages like .Xr VOP_READ 9 From nobody Sat Nov 8 11:14:39 2025 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 4d3YH36MdWz658S1; Sat, 08 Nov 2025 11:14: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3YH35V7fz3sSk; Sat, 08 Nov 2025 11:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+zOpe9YPbzd1denvjeORsDyBhgV799IqsFXTWMC4fg=; b=vQ00OhPN7UpruWSca8rlvo4puASlPqYZgG7cKJDIvP7NYoAS/IrcIZAk7FXSEUl1iUmaPs aUDsmUBy37q9u+h8/M8hergBaPk5MHm4bELfMSxoxqXEmpNyJ6BVe6lNV7eddJKnp6pqVj OBCvUhyLVXt+022oX6Ka1cqPiocehzDROXS8Qq53muafni+2Q8zUyDd73K7S3j9u+/yqT/ AEA8rxD1GGU+lMP1FVLowUyCa5Drz2ZAwmhgbFetDuBVtL/brfS/HqbuOjC3N00vk7yVUH Pe4ahbtJKQx+xT5D8gx33yVsfstbVrnSpz6jLqx+cfoxoAdSDTht8S8lM5vgbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+zOpe9YPbzd1denvjeORsDyBhgV799IqsFXTWMC4fg=; b=cyqbYC+edMYY5nZ176Y0CZl37N+qvI9soE9TdGfcP6QlBxrczRJk8D5ywJBYPrfB0OuiTT dL+X+Y/u8M42nF/IbzBSUHajydgT2D94hZarSkkHb2CMF+qnoxPz6asJjzk5LRbphSvBqZ rz5/SNO9ERWb09iRZEfAZqvRNEKASz81ELr5/wM3qLpi0nEv1jTyG8ykiVaTVAmQAegYSD LYXb5CyHSUlF7SjJeKzyqc1+Wx/izRb1xrh2s7TkIxMHakafW4rMM1F2lZkxYkW/2bglO8 46XvIwbvLSY/6Zi/nui0eiVJ4LKT0C6iOat8az7GFyt+syiN69L/jeBU/XlGLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762600479; a=rsa-sha256; cv=none; b=wjAuLHsFvpJ5NkmUFfIoJK6oN2Dly93unV6FTAkPswAl2qc2Ppa99+AoL9KiuHvtrOkR9O zNDi9Fpx3+Y+ThXmmruxpPkefsNpUeNivrZ9WMUsLRrxx1lQj/BWSkuw7Ltiag4d+fwPX/ Pa13noVC38RaptjNw0GRLY5rrQx0SSH0y8Mled4yOGpDIFA4XBGW8dNYOnhx6qN6CHYmok 9Fc/+pBxKPxhRXmpdtBMOmcdVtq9jw6v3W7L+q5nsn2OnFXlwG2xiO4ON9LE8/ylJ31fO7 9mVb9ld5Wiw0z+U0OY8OHm9L9I2BzvWXEYWDt9QonIbZSvXp49sh/rDAlm8Ltw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3YH354dQzk7l; Sat, 08 Nov 2025 11:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8BEdAt089719; Sat, 8 Nov 2025 11:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8BEdUD089716; Sat, 8 Nov 2025 11:14:39 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:14:39 GMT Message-Id: <202511081114.5A8BEdUD089716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 036a6955db6a - stable/14 - dtrace.1: Document evaltime List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 036a6955db6aa75afa3fea15e8d974eed2f28ca2 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=036a6955db6aa75afa3fea15e8d974eed2f28ca2 commit 036a6955db6aa75afa3fea15e8d974eed2f28ca2 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-14 14:51:37 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:14:10 +0000 dtrace.1: Document evaltime Reviewed by: christos, ziaee MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51301 (cherry picked from commit 1fe7af0635810a96a292638d11d25ddbe95bd581) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index eafc25f187d5..0ae8bf0d2bcb 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -628,6 +628,52 @@ Same as the flag. .It Sy dynvarsize Ns = Ns Ar size Size of the dynamic variable space. +.Sm off +.It Sy evaltime = Cm exec | preinit | postinit | main +.Sm on +Process create mode. +When using +.Fl c Ar cmd +to start a command, +.Nm +will first stop the newly started +.Ar cmd , +evaluate the +.Xr d 7 +program, +and then resume the +.Ar cmd . +The +.Cm evaltime +option controls the exact moment when this happens. +.Pp +The following table describes supported modes. +.Bl -column -offset indent "postinit" "D Program Evaluation Time" +.It Sy Mode Ta Sy D Program Evaluation Time +.It Cm exec Ta +Right at the first instruction of the command +.Ar cmd +execution. +.It Cm preinit Ta +Before +.Xr elf 5 Ap s +.Dq .init +sections. +.It Cm postinit Ta +After +.Xr elf 5 Ap s +.Dq .init +sections. +Default on +.Fx . +.It Cm main Ta +Before the first instruction of the +.Fn main +function. +.El +.Pp +Usually, there is no reason to change the default mode, +but it might be handy in situations such as shared library tracing. .It Sy flowindent Turn on flow indentation. Same as the From nobody Sat Nov 8 11:15:13 2025 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 4d3YHj5vxcz6596k; Sat, 08 Nov 2025 11:15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3YHj59Rqz3sZV; Sat, 08 Nov 2025 11:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z8jO8ejny9xgYtQbqzv1HqQSILXr5yUxRf6GNVE1+ec=; b=d5vm9elIRut+oiG45+XEVMpUquFHGZIVfbSG8T30DyN0NbJofcCkyOZtnCbmqg9ZAMkDSb jSND3Wk8m7M87FvnEhUh61gV47V+eaav+c75UhVOembp4nKhD72POL9ak6ycgwaV7KhY9o 3niN8C7jL7ui9obIotsSs0nulfhHZzEQrCNv8cFvXt199tTA9Jk+2P6F+UR6hEDYegWqze zDri/33zGaefWjEylN+xI5iwMrOzfpmFILndtJhaok70A030mKxmHIMNSgmE298x9UGW3c kczcNLoEu6lwxIogPF12rij+IyH2R6uPX/kp4amo5wPi8ypCp+Lldx9DVOD8Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z8jO8ejny9xgYtQbqzv1HqQSILXr5yUxRf6GNVE1+ec=; b=t1VW3P8bHMty6DlUdfOc9wqyQ7hFt9aRICYk+lGdaLe05ezxbGxIk51lxkcQ5fMHKQcBdu VLTDVB0sPlE/P9dZEWJh2Z97ntroynm4AUuC2ov1dg2uIQbdDFL/wDDNzLhK86RYTwjo8L p+bpmXM0GWQU5bUzl7lUloWQ89br+l4AABb7yvBBLdzrEWF8zqwsatTJ5kBPNrjvgSw8GS 8xHNRMB1O+LLLU/N9uQH84YAJGk0B4WPpYwWO5Zf8a7geY/xlDcNDMqyx4Ye1FNIKO0jrm C9CNfzpzElEWlayoRh72K3tJXoM7KRS/mH7WKOstAVvvzd8UvW1G0sMRfqIBwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762600513; a=rsa-sha256; cv=none; b=xlK5mk2RcuYzoHEASEDp9XYlkul/8VaDHXLQuWF/VQoGWdDKRmaOEENtlM8WeS5EfxLNP9 HxoiU7QIL8m+t0BcbiMiHg8Q3ZHvhlaSo0BAEQEDrCQH8Jy37zxmNLZBanvX2aRFEvH+YI d+N44VOgPdWONYFGXSD0UOybR4dhsfN2QTEGMAmH9oqoFhBzkg1Cowjl7CKPnxdVrZmpt0 orKUynS9yxgLSqPXOQfQIkP0ry46o6Fa7ExbfpTpnQzh3mmNyh8aHn4HBrqjaOzuzKmV2u xgrl8L1F8IVGfaskkm8c99QzogVUlUtorhkVQWUS9i9BySaCXzAVlF7n6qxM2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3YHj4gk4zjWf; Sat, 08 Nov 2025 11:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8BFDik090007; Sat, 8 Nov 2025 11:15:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8BFDwB090004; Sat, 8 Nov 2025 11:15:13 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:15:13 GMT Message-Id: <202511081115.5A8BFDwB090004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3b7358bebd30 - stable/13 - dtrace.1: Document evaltime List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b7358bebd30cc7dea34c329cbc3e7e14264c2bb Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3b7358bebd30cc7dea34c329cbc3e7e14264c2bb commit 3b7358bebd30cc7dea34c329cbc3e7e14264c2bb Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-14 14:51:37 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:15:05 +0000 dtrace.1: Document evaltime Reviewed by: christos, ziaee MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51301 (cherry picked from commit 1fe7af0635810a96a292638d11d25ddbe95bd581) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index a98d851b9998..34c36920ac97 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -608,6 +608,52 @@ Same as the flag. .It Sy dynvarsize Ns = Ns Ar size Size of the dynamic variable space. +.Sm off +.It Sy evaltime = Cm exec | preinit | postinit | main +.Sm on +Process create mode. +When using +.Fl c Ar cmd +to start a command, +.Nm +will first stop the newly started +.Ar cmd , +evaluate the +.Xr d 7 +program, +and then resume the +.Ar cmd . +The +.Cm evaltime +option controls the exact moment when this happens. +.Pp +The following table describes supported modes. +.Bl -column -offset indent "postinit" "D Program Evaluation Time" +.It Sy Mode Ta Sy D Program Evaluation Time +.It Cm exec Ta +Right at the first instruction of the command +.Ar cmd +execution. +.It Cm preinit Ta +Before +.Xr elf 5 Ap s +.Dq .init +sections. +.It Cm postinit Ta +After +.Xr elf 5 Ap s +.Dq .init +sections. +Default on +.Fx . +.It Cm main Ta +Before the first instruction of the +.Fn main +function. +.El +.Pp +Usually, there is no reason to change the default mode, +but it might be handy in situations such as shared library tracing. .It Sy flowindent Turn on flow indentation. Same as the From nobody Sat Nov 8 11:19:07 2025 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 4d3YNC5Ld3z658rT; Sat, 08 Nov 2025 11:19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3YNC4prTz3t2J; Sat, 08 Nov 2025 11:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BL+9F+8YWdMoTlWOds7jG7reEXiekVMfrtpKpmI9x1g=; b=cJH71MY+qBNl/5W/Vyb9hJ9RY8StrbU0PdsOOHWZ9dva0KkJrDEDL+MABWwnJXhVMbo6lf tHqmITyBC4OB5FQJAkQpqgSljZrfidAxnTH4l65sVx8krYU7cKnvuAfM1QicbMps8JF9DJ mcJwQ6oukgO3Ear5t+E4TlSZaFhLMY6xBDh4++lOfQNtKOgf+pTxOiLHQrkR89flMl3Pjk 2t0ZBWIz5Eajd5N8zIBJdBbX9LQOWmEgynNpDJUlAfNbV5BcMFvBw/GzzJpKFNYEGjeqr3 v8VwHXYi3KZhVCfUT4CsIvQLHLCZVE753URbY7GNLkokvqS2O5LQrCCgtCENsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762600747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BL+9F+8YWdMoTlWOds7jG7reEXiekVMfrtpKpmI9x1g=; b=WFGOtHMxepqYBkSTNCJjf2tX5+A7KvSXYR5cLuFQuaHGOWHurNCE5TeSDWjFS6uAQ8e2JA AH9prfhibc8jrqqtiaKBm0J3gka0U8ePVUVSVcxa0L6rM20sGvPs8G3oj89a6hxHBkt/YB Jf7UAgLhlsytS4JkeEiO2P44B3iVeBQjyP/RzDVp0B5JjRpk0u8WFPEZqeTlHPJN1VbxPL bY0uaKoGCw6bgeeZv7nLyHByDkDnHcFJc14TUtLib3OoZ0Boif1I9EjQlZ/O8/7JMMjLIt 8s01hyvVYxZXNqh/qyvQ9eLnNsAT/LC3+NcXb7yJ5rl09qArwM3ZPoPzrjaiGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762600747; a=rsa-sha256; cv=none; b=Wfx6/dGA12YdAmhLAVW208cImXX3Y02vFw7QUGJayQ+vh+jFs3jPdR09t8zDwNf4JqX1VN WLVHXuNxKt+S+1qQ6yu0FfWm7eq4yV0ktZe0XQ1/ig6P/YXfYMHBEePhGuLp5zLxYPNhoz c3ulqOMjl5oOD9USMh+V9lz2ZZ1a/VHv63etwwsdrlXGN5HfFt0eEeOq5U4TLNoRMigBj2 r4aYeHT6xJasH4CS+M414oj78wfFz8kBlyyxG5tmLlMuKVBLPVj/5A+jbTB2hmjb/rJVDw NZ99xO02UjAi8HZ3nYTz4juEUPn2CS+5JDWdpASVtxf3o3pNtEwSvXfBeH1vzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3YNC4PBFzk7m; Sat, 08 Nov 2025 11:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8BJ7eo091244; Sat, 8 Nov 2025 11:19:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8BJ746091241; Sat, 8 Nov 2025 11:19:07 GMT (envelope-from git) Date: Sat, 8 Nov 2025 11:19:07 GMT Message-Id: <202511081119.5A8BJ746091241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5cf8a3cbd9dc - stable/13 - truss.1: Reference sysdecode(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5cf8a3cbd9dc824811f639ed0c38bac8b42de888 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=5cf8a3cbd9dc824811f639ed0c38bac8b42de888 commit 5cf8a3cbd9dc824811f639ed0c38bac8b42de888 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-06-18 17:40:27 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-08 11:18:57 +0000 truss.1: Reference sysdecode(3) MFC after: 1 week (cherry picked from commit fa9ac741d03342c33a0e8f85114949625ba4901f) --- usr.bin/truss/truss.1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1 index a0cd90b229aa..debb3af11b5d 100644 --- a/usr.bin/truss/truss.1 +++ b/usr.bin/truss/truss.1 @@ -1,5 +1,5 @@ .\" -.Dd July 24, 2017 +.Dd June 18, 2025 .Dt TRUSS 1 .Os .Sh NAME @@ -104,7 +104,8 @@ Follow an already-running process: .Xr kdump 1 , .Xr ktrace 1 , .Xr ptrace 2 , -.Xr utrace 2 +.Xr utrace 2 , +.Xr sysdecode 3 .Sh HISTORY The .Nm From nobody Sat Nov 8 17:25:34 2025 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 4d3jW30sw9z6GJc4; Sat, 08 Nov 2025 17:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3jW26wh3z3f7b; Sat, 08 Nov 2025 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=1762622735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJbwB7uNrMT2YTcHAyAGjxbnxahunTzdtyNag0DeSgE=; b=Wj2hA6IFod5E6F7LUso2KRa+E2QHZW7m/xodnuKQteHs2gIIXcpHDWayp4JilpcoP5/NqK x0kvwpjaqfx1+JKrgoWc3AsGnjkDydN8b8SQuIwSrd5CFLYw7JBKXqHkRERFHEo4yiVgkH u/5jxICY2/tMf2PzVzjYoHns0VP4KG1VwHLgXBujNqg90lFZ4OKTGrMVkKEErCXKn7jUO+ dpB+pBochrnEaUe8Z+v1dR53yO+sRtCJvoXe+fboBgD2wUM0gCpYGmOv1X1ELmKT61QB2p HLJy24zQJaVjj4FAkM5XPP5PW5tE2ifQA/DiZr+l4dxhxBhIBnG0VcR6pWEL0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762622735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJbwB7uNrMT2YTcHAyAGjxbnxahunTzdtyNag0DeSgE=; b=ckD3m8dfI3ZsBKbHGMcUm5kVLZLHyC5E/fy/DlvCxXxfWj+aDiQ3OBMLuyBAoHPUciYVqz CkrLwCccTI1KeNmsuzshtVhFHiZ9Dlrib6zbLlmnoCoStaYr1dcCLh+koeHExpwN+APaLB zENYjXBO76O9VXf88f3iVCsIE2D+l8SwQqqOMo2LM/o8+BdoiZ1AF8BTroHJlk2M6QiJ21 QrBiQRVn5CGK3l9TSPNHirKT3B8M9X6GE6kfIXw1cxPNH39HbGv9VobIxgHtD1j9Q5P2zU 4C3kPqZDzOvDzMgf1//WejG8pSCi/X2KjdxmB1F4yHhj77wwTz7Uc94zHIsj0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762622735; a=rsa-sha256; cv=none; b=W9Hfsqus93uLqUHoU6y8UmGVe4ptTnkEZexIHopXA0GARXsCEEONhrMSQHcra7u7mS3jtw d56mdre2V9DBqRyI5x6Ggb5lxWpSZXSdYRJN3xfnVqzAMj8CPxP1unQFImZp3BE8ocPjIZ rEUgcQLiM9tIIkm0vWxAN/Js7RADY6q08hR/F2JC+NsedekHtPK7fqWzA4LIdrrTMLyn+v qq1tjz6MYnAy17/1tge1Fl8Wi3esULnBuo98RQYh/ZuoHWyXfP1kco/X1dE0Uwcmzh7ZCK P3LqdGkK1PDpTIGXmR50QWkxiER2JYAOUK51zjhIp2t6R1tQ2P2/J6PQwgG3ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3jW26HWJzvvk; Sat, 08 Nov 2025 17:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8HPYFb085811; Sat, 8 Nov 2025 17:25:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8HPYRF085808; Sat, 8 Nov 2025 17:25:34 GMT (envelope-from git) Date: Sat, 8 Nov 2025 17:25:34 GMT Message-Id: <202511081725.5A8HPYRF085808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: fc5a01f8e9ea - stable/14 - release: Comply with Azure Marketplace requirements for aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc5a01f8e9eace6a6fa7a0c98a70f878f4e196ea Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=fc5a01f8e9eace6a6fa7a0c98a70f878f4e196ea commit fc5a01f8e9eace6a6fa7a0c98a70f878f4e196ea Author: Li-Wen Hsu AuthorDate: 2025-11-07 05:10:44 +0000 Commit: Li-Wen Hsu CommitDate: 2025-11-08 17:25:00 +0000 release: Comply with Azure Marketplace requirements for aarch64 Azure requires the first 1 MB (2,048 sectors) of the OS disk to remain empty for VM images: https://learn.microsoft.com/partner-center/marketplace-offers/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space Also append the BOOTPARTSOFFSET suffix for aarch64 images, which only has an ESP partition for booting. Co-authored-by: Brad Davis Approved by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53628 (cherry picked from commit 36095c942031f7f1613eec554f1c7615cbd891fd) --- release/tools/vmimage.subr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 04c0d5bb2bb5..7a078e357adf 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -304,7 +304,11 @@ vm_create_disk() { # Create an ESP espfilename=$(mktemp /tmp/efiboot.XXXXXX) make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi - BOOTPARTS="${BOOTPARTS} -p efi/efiesp:=${espfilename}" + espsuffix="" + if [ -z "${BOOTPARTS}" ]; then + espsuffix="${BOOTPARTSOFFSET}" + fi + BOOTPARTS="${BOOTPARTS} -p efi/efiesp:=${espfilename}${espsuffix}" # Add this to fstab mkdir -p ${DESTDIR}/boot/efi From nobody Sat Nov 8 18:58:35 2025 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 4d3lZM3H3Zz6GQKj; Sat, 08 Nov 2025 18:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lZM2n48z3v8F; Sat, 08 Nov 2025 18:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hODu8ZM+fMn7BwD/9RhKr4Pf6zNVrIa/oiiOYe6Np9o=; b=f3uZ8KH7wj9OWgBhTcGaK9giYfkmEmZn6T3HoPr7qP1bc9Fs2qKxgvz4PnndIXnEZ0gZPT vwR5RTpqikhRst98b2zrGDKOFi2Ur6CIApWEpgKRv4jGIKhSZCNawCStR6qwFkKF+r3/l3 x7+9Ln/OKYu0/X5Qqp9dxmkMedEAY/JCByps1qnelWfVdGaYa1ITgOHP4C7g4Kv/05n34Y +CYEUQXRmJye81bt/xiotBHgFSbvr9DOyMcOqO1NSboAJiax9KBk4V9giYxtCT0Kiq29K1 A9UKYmsC0GeSzJYpz84kLUtyc1dqjtJiA7ILLMb6IRnN53cIieL2HKUUPU0wxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hODu8ZM+fMn7BwD/9RhKr4Pf6zNVrIa/oiiOYe6Np9o=; b=FZokLQ61YAh76ROKq209YzxFmfanit5GEDs30KUBgFTyn48RTsU8yGnfEM6Ag00xFVk6q+ nkaHALFZ5QvTojkTqF4nBC6pcCj/iAUXM+2gCOP2sX+RELRhTulQaX07aEAsPfx1dfUJ0P No8EZoaTbpwEkcYvu1FhRyakM0CprXXxq89v45XTWcCAY/2CzeX5zaZwiWQfw3MnvraLIk 1atJdjU9UAu17sjRU6RliL0cCd75sa47h9cn7bz4d8daxqo9fXhH7NCCAaF60tbBB2cjZU itO/u1htC6Wcr/uaXwoDzLJFdOxOFtdO5JJxvZKfv6dGXYFrafs37hm6QvZVYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628315; a=rsa-sha256; cv=none; b=RUzcS7vHvXRI/815+UVI9RE5O4YE12Pe6chOYVX2Hhhm1cZ0ZPKwIsCgu40SvJSFSNeo8Y 2geav+DXPqwRA2h7sJO6Clnoi8TnyOALt29inyROrmusbMmHY6GPkX2T6GW4WBA/SabEuq ThP/6InMBFWmDramQaQjQopz0fc/dIFqbC/GSyMpHXNewonVYkWjz9ZnFCmIf0aHZM13pA wxUOVwdcTD+sZVSxewRB+SfxXfdgK7gJkgBswuBXwnG8lLvHg43BhlQTS1Vqt+MOu+q8U+ /XhyfJMwJbXlCjU+q6Z3fcTCbWWZ4NpypQBUrwa5BWZJb1YMtpuQx0xsUktsEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lZM2Fmvzxd2; Sat, 08 Nov 2025 18:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8IwZqq055216; Sat, 8 Nov 2025 18:58:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8IwZ7k055214; Sat, 8 Nov 2025 18:58:35 GMT (envelope-from git) Date: Sat, 8 Nov 2025 18:58:35 GMT Message-Id: <202511081858.5A8IwZ7k055214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 720108d86d87 - stable/15 - mfi(4): Fix a typo in a KASSERT 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 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: 720108d86d872b224fa7e8bba5d3b6a57dee0c05 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=720108d86d872b224fa7e8bba5d3b6a57dee0c05 commit 720108d86d872b224fa7e8bba5d3b6a57dee0c05 Author: Gordon Bergling AuthorDate: 2025-10-29 15:38:59 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 18:58:16 +0000 mfi(4): Fix a typo in a KASSERT message - s/dissappeared/disappeared/ (cherry picked from commit a25172844edaaa7e18c1dcecb6df8b8832456334) --- sys/dev/mfi/mfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 13e5dfc84fd1..a7d98f06aea3 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -2829,7 +2829,7 @@ mfi_check_command_post(struct mfi_softc *sc, struct mfi_command *cm) if (ld->ld_id == cm->cm_frame->dcmd.mbox[0]) break; } - KASSERT(ld != NULL, ("volume dissappeared")); + KASSERT(ld != NULL, ("volume disappeared")); if (cm->cm_frame->header.cmd_status == MFI_STAT_OK) { mtx_unlock(&sc->mfi_io_lock); bus_topo_lock(); From nobody Sat Nov 8 18:58:59 2025 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 4d3lZq38dBz6GQXk; Sat, 08 Nov 2025 18:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lZq2FFbz3vct; Sat, 08 Nov 2025 18:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1cJlLO3JdwSow+OAHJDX0zeBjs/1ppGKQUdzmud1oSs=; b=S9YYbAU3Yy4ESEz9VGuVGJEkg3zQYvBqU8oxMsPlNUPfjRJqBqgph0ArnX56dpBWBS+KIQ 8xFgZZB4XtwZ2v823jhRUykUfM4A2oQI+4YVijx1MIMxDRg7heFifDDVuW7vyfBxHcs/rR rR90d0ReX4RyQPs1Qz2ywS0NqAtnny7KluyFEkXU665iTQUuPSfim2POH4LOG+Ryz8eCuZ u2rkCFwH6pEHd7hjfxfg2nl3gOyV6rIIRnJarOEoglEF2ec9aOoxeSoDGOIIcloTWRkks6 uSTwhkgRumvlbDKinUx1jD/oNP8SIEATEYEJNJhiuhanIpn2cjugz39RDgUJnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1cJlLO3JdwSow+OAHJDX0zeBjs/1ppGKQUdzmud1oSs=; b=H8Yhd9I9h2SjdF+6oadN6Eei2v7cx13dc70ZK6jXyMnhnHvdV8CBbvFqUucBxA2/6CeKKE lcj/C8YutLUTSK1fVhWvS2lGkfsgRl7EN/OiFS7B+CfUyinPD81BS8+26mBjtkblbdji8S R6OFbgwgAAK3p6o7FaavhFuj3CyhIWt3xjXwhXBFe8yJtSJfCRLZ7rzB/sNlSYLAXYdvti npw2IXckn7xEfmFx5EHKcn4nYsZWTiTBIjZ0J0cvWCHid3TrOiJERdRKmfWMWbH5rNq8Sv CVDErlGHHhXYFZQuHlJyh4pp8XNXQj9dgExOZEef5TGcl524M3bSD4qj21Tu9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628339; a=rsa-sha256; cv=none; b=JBSK5YzZWo/d39+is5Telgr/4LiDoDhyNMUY5KVpKdxeV/GMsMMVuifJefFSKAgaG+HNV0 Bo/g/mtDQTQO8Rwc3ZEgBqm0M9D9tXZ3Om+Pmp2FuzgJQW+BRJSjwAfJDSnxwkcPZg6kVD irp6X1OLX0Mc8shvYI+bLaAXTddn+D7bQnkmzKDODnsiLVKsHDdDpFBse/E4Ht1r4H+CUb jGjbYdv2sSKG5JaC85FE8nlAkt3ay8t2Xk9v6lNOb4+oecYAKVJ3Q6vlH87Pbc64uPaF2c QvItiws2ztAowumC+2tgsKDpUjyKpdgZ1uCFNvjKV1s9qZnFhCDmrLNz7YkU9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lZq1mWmzy0Y; Sat, 08 Nov 2025 18:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8Iwx81055460; Sat, 8 Nov 2025 18:58:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8Iwxcm055457; Sat, 8 Nov 2025 18:58:59 GMT (envelope-from git) Date: Sat, 8 Nov 2025 18:58:59 GMT Message-Id: <202511081858.5A8Iwxcm055457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7cbb953d171b - stable/15 - ciss(4): Fix a typo in a debug messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 7cbb953d171bed9b53889ec97676b76e662a1990 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7cbb953d171bed9b53889ec97676b76e662a1990 commit 7cbb953d171bed9b53889ec97676b76e662a1990 Author: Gordon Bergling AuthorDate: 2025-10-29 15:36:50 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 18:58:49 +0000 ciss(4): Fix a typo in a debug messsage - s/unspported/unsupported/ (cherry picked from commit 84d75bb018e1800d610760191ff64c3eebcb46d7) --- sys/dev/ciss/ciss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index d4ede91f6b35..dd3df631119a 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -3140,7 +3140,7 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb) } default: /* we can't do this */ - debug(1, "unspported func_code = 0x%x", ccb->ccb_h.func_code); + debug(1, "unsupported func_code = 0x%x", ccb->ccb_h.func_code); ccb->ccb_h.status = CAM_REQ_INVALID; break; } From nobody Sat Nov 8 18:59:28 2025 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 4d3lbP0Ljvz6GQSn; Sat, 08 Nov 2025 18:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lbN6lD9z3vpv; Sat, 08 Nov 2025 18:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vx/Kf+2UExyhJR1ap5qfEsyksmw/z8tKZUO2nmVzS5w=; b=qohQIjY94mcQE+fgfsz8EuxF60hoEUzs0oqraYYd0CSHvmtpuixFGAMlE7Ce6sOyiToNSS Kc9OGrTEFOZYDKrT6UMJtnmz7FYJEqtx/49dRYV9EHDcpzF7RQ+qXfIyB0lY6UnPBI2Oer RCMVlgVkqb5siwhs2XMt4tzmtNRXnKueuuXnXXqkpTZ81o6UzH0BaUHAwB9PBzfbjw77PK eMQ31OIUZ6zwkRBmsrQNKn4ATsRlS37xgrTs4VnIdmjJUkoXD38KbWPdYrmW3GppE0CllZ pfyX1IgvxHB69DlltWfd7K1FKIdjAfcIzRInlVu48Nt71OmjrQdedP9WKKMSyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vx/Kf+2UExyhJR1ap5qfEsyksmw/z8tKZUO2nmVzS5w=; b=C37A+SvJEoKDinolcHYHJ+erclHLA3uhjuvqZmGC1WaOuce+93r0ONEs/7pMpk0GQ+XVa3 6GYd+xIMlb7fyxgLmj9vzr3li/C+XUZxgVYh4gwqLekas0S4hW8rgzABOkmLTCzpNpI/tM EYgqtCUlSwzn9b7zHJQZq+ePtMYxpySMyP3MDrU6lPp4WtriOlMel/vs8MJWTNY8AwpDc3 RgSRsB/eKA0sO8F5wqPnb8PwZSbe2+Vp8W7eCfQ6F+4SSG7MY18z4oQ2nVZyrpgrvVJZQf 61OqsKQ9/5/0eF3U7G6z4G/T4yPnau2M3A1rBVXXlMdNcVgZQHhaTzs4ubrsmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628369; a=rsa-sha256; cv=none; b=qiEfNCRGlHors5UW+aKOhKhh/rjo1OfKBfGo0pl/Zw1xxjJUKhrVF6Nfv/XVoUJJbhQzTL Z+ZHb+2QF9tAwBaZPjXosGenUEow4pphrJVIssnv/n1LpG0wgkwGRI3pShrmU1/CuPFXEn CdkLyrm9tFeDlfg26Pl4bymbMd5yyt9BmDn9wWanwi9rcqhbIxZwG8K/nyv1MGDAN4d3gz cQLjja5A1WWfhYdRwS9w5MfB5X2CNXzL4nLW4fAaOjgCv/tqgWcrB3gRY3SCGKx75qn0Vv x1QNQUmHEyDRt4b9ELrNWK136zR7F2vdWdYrUX/yGeb0NOhEdEC9UuszQI+9hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lbN6DtFzxWX; Sat, 08 Nov 2025 18:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8IxS0B055700; Sat, 8 Nov 2025 18:59:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8IxSrA055697; Sat, 8 Nov 2025 18:59:28 GMT (envelope-from git) Date: Sat, 8 Nov 2025 18:59:28 GMT Message-Id: <202511081859.5A8IxSrA055697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a4e5b9af6bc4 - stable/15 - bwi(4): Fix a typo in a panic messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: a4e5b9af6bc4cef98ba88fe58c66b0576b2a4ddd Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a4e5b9af6bc4cef98ba88fe58c66b0576b2a4ddd commit a4e5b9af6bc4cef98ba88fe58c66b0576b2a4ddd Author: Gordon Bergling AuthorDate: 2025-10-29 15:28:06 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 18:59:18 +0000 bwi(4): Fix a typo in a panic messsage - s/unsupport/unsupported/ (cherry picked from commit 404af374b10ca56c6f82510a5bb23232a9f25c34) --- sys/dev/bwi/if_bwi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c index 1087ca813d65..517d4dac38b5 100644 --- a/sys/dev/bwi/if_bwi.c +++ b/sys/dev/bwi/if_bwi.c @@ -2896,7 +2896,7 @@ bwi_plcp_header(const struct ieee80211_rate_table *rt, else if (modtype == IEEE80211_T_DS) bwi_ds_plcp_header(plcp, pkt_len, rate); else - panic("unsupport modulation type %u\n", modtype); + panic("unsupported modulation type %u\n", modtype); } static int From nobody Sat Nov 8 18:59:56 2025 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 4d3lbw1xZcz6GQMZ; Sat, 08 Nov 2025 18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lbw1H7Lz3vlr; Sat, 08 Nov 2025 18: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=1762628396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=orFRDfq5NdLFvlJFcjV/mwt3aWPv7eQg1B+VfB2RXlA=; b=Wk7PabZUlQ+4qTgDyDwn5c8UavI0Egc2Fi6dccJvkzcMjqCwK5tx2Qs+JtEyNYD4yit0j/ /rVdE5k75c2V3YvsZuptwF4Ho4hUQs1Y51B9+SUi9GMalv9nb0zNf/1eUxJUAk0pu7loKY xYXRzDpYyy3I7+ydRDI7pD+60utjwglhonAVb3T2e5Egv0ZZUrJ2xYFctXtQhInh+pz/q+ FDwiLpg/Q0iwmzRQG8o0shmSETLYcenNSGb7zoUAjD2/6weQbFGq8JFVHr+hKnXK4zULiH 4hMpIxPWWZDbMaQjK1RqO/K910wIeLUnq2nSfOYb1JFO3N//NHJXrzzV6+pevg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=orFRDfq5NdLFvlJFcjV/mwt3aWPv7eQg1B+VfB2RXlA=; b=hJK00A+ukDDtuoGBYr0pR9UCzWNt522YFE2soMjY2d/1FO/LTu2UxCcYEDy0BO1ECaop72 MBE2yJltwr1RHFMuS1kzBzdb/I0gorjRTQnsFvClVVJ8W3KpSUgbSCoWJnO8wJwTYcOSiZ NdqZlnfKVfAL7hUdDxwrDVDk0jHHSvmie2whZ4zEKqWgIxH9f2KGoVs3DjzBqxlAQBzSiV 26oHJgzFPQBgUHlY+T+HwPFCbm+ktPOhZOEWBnh5GTGrC+glGNDvZMlD7Pt74Qhy+x8rHd fsHF95V+O2DQsDK4tr5xZakgD+mxXDSRfNq6Q+qgAizoGZxLEQvj5oou32QPNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628396; a=rsa-sha256; cv=none; b=D9B3mfjriCL1yRYVYU2KuGd2hpjCfl1Wm9/MZpcJ6gyEOQJxzR+0qXJ7v4Nei8EeqK1aUI wXln7qHo5s4j1mj1cNj6qQuffWqsoFehO5MnMaSWEHbanMh+/GB4HNcMmu3jZej3Rw63cH LRsb6SeQHPojMqY9GiXAE294YFEUe4GhnrIW3RYUwLTBeEdwbD9A8XuXwfRgIPxt4QaAOl PhRzjv9WYV5vrtjzoOOQ6E23hLylulBV4QP4kHs/2ZVN1grk+HLxXh1Tb/ZAz0RXcZoV8p TpiAD5jz8jo0e2faoRO7hIFs88bpi7cdyu50DtImhwLKWe5k7YXpKnoBG8r3+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lbw0nQyzxx3; Sat, 08 Nov 2025 18:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8Ixui3055959; Sat, 8 Nov 2025 18:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8Ixui2055956; Sat, 8 Nov 2025 18:59:56 GMT (envelope-from git) Date: Sat, 8 Nov 2025 18:59:56 GMT Message-Id: <202511081859.5A8Ixui2055956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f859e43fb4d6 - stable/15 - cesa: Fix a typo in a device messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: f859e43fb4d6e4975442436f895f5503710e0ecf Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f859e43fb4d6e4975442436f895f5503710e0ecf commit f859e43fb4d6e4975442436f895f5503710e0ecf Author: Gordon Bergling AuthorDate: 2025-10-29 15:35:35 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 18:59:46 +0000 cesa: Fix a typo in a device messsage - s/exhaused/exhausted/ (cherry picked from commit 081aa26778f3facdd836c28b2e3fed5de2f8b7b4) --- sys/dev/cesa/cesa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c index 405b619d6e5b..7439dcdbc1ee 100644 --- a/sys/dev/cesa/cesa.c +++ b/sys/dev/cesa/cesa.c @@ -286,7 +286,7 @@ cesa_alloc_tdesc(struct cesa_softc *sc) CESA_GENERIC_ALLOC_LOCKED(sc, ctd, tdesc); if (!ctd) - device_printf(sc->sc_dev, "TDMA descriptors pool exhaused. " + device_printf(sc->sc_dev, "TDMA descriptors pool exhausted. " "Consider increasing CESA_TDMA_DESCRIPTORS.\n"); return (ctd); @@ -299,7 +299,7 @@ cesa_alloc_sdesc(struct cesa_softc *sc, struct cesa_request *cr) CESA_GENERIC_ALLOC_LOCKED(sc, csd, sdesc); if (!csd) { - device_printf(sc->sc_dev, "SA descriptors pool exhaused. " + device_printf(sc->sc_dev, "SA descriptors pool exhausted. " "Consider increasing CESA_SA_DESCRIPTORS.\n"); return (NULL); } From nobody Sat Nov 8 19:00:32 2025 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 4d3lcd0RSzz6GQhc; Sat, 08 Nov 2025 19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lcc5GH0z3wS4; Sat, 08 Nov 2025 19:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IaGkj2/M8CjZ2etb0JwLfmVUiGUa/cUAdemH3xIvyao=; b=QRP2fnt4mz9D8vxAoL5csGcmtvBnLdWb4c0V3vomo0AUScJr3yRjpnksImkv7pX2c+Llms d85vqDpLSGc9T0N+mVwRusj7a90qdKMENTdZ9wtWsQMQnNLluGCmMzQERSDrPtWm5In6AM 5tflD4gS/Yf6gIdCTffxfY9ykTHfMx7hOw4sIpssMYeWdiYYUVsqELxKdkcyZ38JTOS5+k M7C1H63EG6jY2XhGD3CxmL7OmIICtvQCz4/zt+5PDLmDIaFxA1V0Dr+m1BEmNgqd6BIqXl n3rFmE2iU+U6HHBtsALgy1fOP/TRkNGJJlUjdYXv2X0im6g25TvTyiwNEVzi2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IaGkj2/M8CjZ2etb0JwLfmVUiGUa/cUAdemH3xIvyao=; b=jSNS5iuJKWNnZky+Gm1lnWD/3F/VbfjlfzJ2dHKqUkvc2iQMx++9bGRpWgStGRPRnlwbgT qyVyehVR8WKX0kP7LjIYg0Ywj4Q87rcb4u/3vgpdRxiqXiroxcfsQbdnHqCGfi78RmZ5mw kuBNoMLLI0vu+Iyzz/vQLH/rpgfOf+5IhjjH+q9ZxHBtrvyGbkUYcKMEwFrdXOqtR2W7tR VoIF+A7fA8sasspH6J1/lg7fu5HSScDRKe7L5a0kSAOvDWpXVoQgD5UhlTSLLZT7Tq7Xok osebbZ2gplFiXAEze3xWKUttz2OBTtGxHVNpYi/hUBSlhnz8tj4OTpv2xbjBaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628432; a=rsa-sha256; cv=none; b=F/xwdBJn9VK4uvdz3iW6AOOYB27taoN1CfHvSq/2BFi7JbHnw37IZMRkHM9i+ogHNNyLUA dSk6m/a9Q+aUbSRH+qgIFDLE6Hi51tErZNrR/TAaf6IzGXJKTiTPZi6EZJwWZipUN0Bg0m f6cJ0Z4udx13N7DogrnTOTBGfZ4KTRGIoj/DTT4yYqeEHdinJKTaBEQnRx+yiHCDxT0E9U whNXFlICOlVYTLWE3fU1bthx1/5ndBpTiMfXhzFkvoS2ZuD4tMp5U0muIr8kG4CuWLiNor XYpiKw/y/S7amE2OTWtR21ds5W4o0rDr5LJ5AAVyRqKd0APhJImxglqPmPtzEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lcc4XDhzxx5; Sat, 08 Nov 2025 19:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J0W8h066045; Sat, 8 Nov 2025 19:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J0WFK066042; Sat, 8 Nov 2025 19:00:32 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:00:32 GMT Message-Id: <202511081900.5A8J0WFK066042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3276add25d3e - stable/15 - isci(4): Fix two typos in a log messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 3276add25d3eeacf2f54b1891f91df7a36ce1eb2 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3276add25d3eeacf2f54b1891f91df7a36ce1eb2 commit 3276add25d3eeacf2f54b1891f91df7a36ce1eb2 Author: Gordon Bergling AuthorDate: 2025-10-29 15:41:06 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:00:22 +0000 isci(4): Fix two typos in a log messages - s/suspeneded/suspended/ (cherry picked from commit 7b11940d4a66589069c21534dd0b969f79ae79df) --- sys/dev/isci/scil/scic_sds_remote_node_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/isci/scil/scic_sds_remote_node_context.c b/sys/dev/isci/scil/scic_sds_remote_node_context.c index aa1e8d840282..42dd81aa1874 100644 --- a/sys/dev/isci/scil/scic_sds_remote_node_context.c +++ b/sys/dev/isci/scil/scic_sds_remote_node_context.c @@ -663,7 +663,7 @@ SCI_STATUS scic_sds_remote_node_context_invalidating_state_event_handler( SCIC_LOG_OBJECT_SSP_REMOTE_TARGET | SCIC_LOG_OBJECT_SMP_REMOTE_TARGET | SCIC_LOG_OBJECT_STP_REMOTE_TARGET, - "SCIC Remote Node Context 0x%x was suspeneded by hardware while being invalidated.\n", + "SCIC Remote Node Context 0x%x was suspended by hardware while being invalidated.\n", this_rnc )); status = SCI_SUCCESS; @@ -718,7 +718,7 @@ SCI_STATUS scic_sds_remote_node_context_resuming_state_event_handler( SCIC_LOG_OBJECT_SSP_REMOTE_TARGET | SCIC_LOG_OBJECT_SMP_REMOTE_TARGET | SCIC_LOG_OBJECT_STP_REMOTE_TARGET, - "SCIC Remote Node Context 0x%x was suspeneded by hardware while being resumed.\n", + "SCIC Remote Node Context 0x%x was suspended by hardware while being resumed.\n", this_rnc )); status = SCI_SUCCESS; From nobody Sat Nov 8 19:00:58 2025 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 4d3ld66dKxz6GQNl; Sat, 08 Nov 2025 19:00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3ld62CWPz3xPY; Sat, 08 Nov 2025 19:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LpdW1CFDL88AkRUoUkbxYVT9DHzoxY9yOA6IOY1wdjE=; b=tM4H85um5dKbwmKW/N+QCddoyiWkOfcban3IfTrsuK+NJkSd9+BU9u5xl7YTh6iglNeKMI c2E/BfDAXvv7p70Ug3zJUKM4Z6jioqg7VzlqPf3KVoQCEszyhVVYAaAnt6r0tF7wFaLFEd hud0nMjHa1SoNJ8VcVVDDN0buLV8y9XKC6cM7PONTYi9toxcef797jFupRn8OYyvxzr8kS AIRUTpoeD1RZwwQ+4YfiQl6bYbC3ZOz2j6DbmeuYy1tNqlVHT96JmncIRiEg9j91wI3X10 KDKOqq/qtWHWdrr9I8TsVuHCtzAdIETwPSK5rpEAdy5Q0iAdlakVZ6ZnTvKVbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LpdW1CFDL88AkRUoUkbxYVT9DHzoxY9yOA6IOY1wdjE=; b=TNc59KGgZvWx96WFFBdJCCzNdJmM817o1CMkgv54Mke+0DJ3lDZmI3+/VkgfJeVymZfLQi hsYeBSZYA9Uf/ZNq3uMLiDXe7gfTaGl8AySUGsKaCWQXWODEKj4Ua6GtFyiWBv13NBu0IR Il+XqYdH4sRS4b0C1LT9gzSI/9eTid5VM6eMGaXwlcrp/XiJW1lnpnu1xhafbnRv1MLB9e pZy0iXLR6fL75kd4fesOZrjy7DTkWT7eBv66xKnZZhUDj1imOOfFdzlefcD8Q+s4ztkp3u JLqrWxExi/DNj1xAd9HD0NK2M/mEXMRoKrpyG0C5lSu0lDEPL9kdxue7KSyezA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628458; a=rsa-sha256; cv=none; b=C8OPtmPWD5/UN1qi1c3kKqUsB1aIb8NaZ8mXxm1uSn5KMuzZxJcDcrSB4n9pHgwLoSENeL exquO/6m2RciA9ZYg+t9+RPf5uKRGOaFqQO5c8Tzz6SuOs8Y1yQ8Cf+ZwbYHU5eDuIrKpR 6hTMu3nH6ehhT9C/Hg6SvZrycewKwGig+GDHSVTDRq0wP5KbWfKaN0LURYW8C3XuJg4cfA zLby9Qd2Mf5WtlVxFtOa4D2WGQnwyJyTyM3Dbw9z2rPSEwN1O8SNfF8NbJbtXp8IfFvq79 mjj9Wa1LJrw1WzEEpT2tt8ChZKZlN5Ql0kc594YxO3ztPAeG5uEp1956LIsAGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3ld61hZhzy39; Sat, 08 Nov 2025 19:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J0wI5067357; Sat, 8 Nov 2025 19:00:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J0w4H067354; Sat, 8 Nov 2025 19:00:58 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:00:58 GMT Message-Id: <202511081900.5A8J0w4H067354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 89ac43c10e79 - stable/15 - oce(4): Fix a couple of typos in a sysctl 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 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: 89ac43c10e797c70edcf1f754be492f1f1cc84c8 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=89ac43c10e797c70edcf1f754be492f1f1cc84c8 commit 89ac43c10e797c70edcf1f754be492f1f1cc84c8 Author: Gordon Bergling AuthorDate: 2025-10-29 15:24:00 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:00:47 +0000 oce(4): Fix a couple of typos in a sysctl descriptions - s/Fragements/Fragments/ - s/Recived/Received/ - s/Alignmnet/Alignment/ (cherry picked from commit 542f5985a8c2e7cccc9beb9801ec166082bb7e68) --- sys/dev/oce/oce_sysctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/oce/oce_sysctl.c b/sys/dev/oce/oce_sysctl.c index 1b903d8d027a..544bec9438c4 100644 --- a/sys/dev/oce/oce_sysctl.c +++ b/sys/dev/oce/oce_sysctl.c @@ -716,7 +716,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "Total Received Bytes"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_frags", CTLFLAG_RD, &stats->rx.t_rx_frags, 0, - "Total Received Fragements"); + "Total Received Fragments"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_mcast_pkts", CTLFLAG_RD, &stats->rx.t_rx_mcast_pkts, 0, "Total Received Multicast Packets"); @@ -748,7 +748,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "Receive Packets"); SYSCTL_ADD_QUAD(ctx, queue_stats_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_bytes, - "Recived Bytes"); + "Received Bytes"); SYSCTL_ADD_UINT(ctx, queue_stats_list, OID_AUTO, "rx_frags", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_frags, 0, "Received Fragments"); @@ -786,7 +786,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "ERX Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "alignment_errors", CTLFLAG_RD, &stats->u0.be.rx_drops_too_many_frags, 0, - "RX Alignmnet Errors"); + "RX Alignment Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors", CTLFLAG_RD, &stats->u0.be.rx_in_range_errors, 0, "In Range Errors"); @@ -932,7 +932,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "Total Received Bytes"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_frags", CTLFLAG_RD, &stats->rx.t_rx_frags, 0, - "Total Received Fragements"); + "Total Received Fragments"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_mcast_pkts", CTLFLAG_RD, &stats->rx.t_rx_mcast_pkts, 0, "Total Received Multicast Packets"); @@ -961,7 +961,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "Receive Packets"); SYSCTL_ADD_QUAD(ctx, queue_stats_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_bytes, - "Recived Bytes"); + "Received Bytes"); SYSCTL_ADD_UINT(ctx, queue_stats_list, OID_AUTO, "rx_frags", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_frags, 0, "Received Fragments"); @@ -989,7 +989,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "CRC Errors"); SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "alignment_errors", CTLFLAG_RD, &stats->u0.xe201.rx_alignment_errors, - "RX Alignmnet Errors"); + "RX Alignment Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors", CTLFLAG_RD, &stats->u0.xe201.rx_in_range_errors, 0, "In Range Errors"); From nobody Sat Nov 8 19:01:27 2025 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 4d3ldh2RQsz6GQk1; Sat, 08 Nov 2025 19:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3ldg5lxDz3yDl; Sat, 08 Nov 2025 19:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQFRZnMZfFLFUlDcg5xcwYKArpB6mMmhCrfSLu03YAQ=; b=gFgxWc3lrT91x+0X8TjlWVm5C6ulD+WsKFok1k5HJkCjhIcKDqwBuOYz/0+qp/nJ4auXUg oRpwyL8WdOC3SjI5zAoG4571reKPv0cCF6SJf1eu2FH1AXTyDYAoX74BJyDiUurQDk/Bh5 xG4QHEo8OkhGClUSkfHjnj9QxEF6YfiGLO9btDrgEC6n9W6cvJFbp8Q388rS1oRYVOcZCD 5gnQU8BxCcDTICQbFvZSE5usIjvfbMPzAfFDUpJoUhrcujQfbE9pF8owD8g33ylel8RGPP DRE3g+iI3e5n1WpSs1sJyqtvWNspx5vimfY9zv30+0tC3KPicTRkyVegwr9Img== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQFRZnMZfFLFUlDcg5xcwYKArpB6mMmhCrfSLu03YAQ=; b=g/nrfRC9CJ+HtSkIAqDqc03a13WpCOeJWt7CiKJkgp/XvRYxNB2P6LcAp89p3kXer6wheo G00ujgh93eLFJadcoqdTdOpOx5fhdYF+ff0EcnlRMYFLUtW8xKJ9Vlqd6OS8q6fJPfNov7 goIAWyI5yFOQ9MAtRpB6UEi602JWcuQ9xTntkMksQaOL/VpjD6LTPZ5+3Imm8PVbVnjyWX eb8Qj7n8af0oo1MoCMOXOw0bgkL+TqlBJCdfkTP05EuVPLen+Plr3xkfCuus0MaRo7ea+3 86d67q3xSxDl3T6P+D5v7rESIoGt8JeC7D6poMKQsniSV3ZyQgcFFKgWHsTkkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628487; a=rsa-sha256; cv=none; b=otjI7MiLiy1sAGZa9+rxzmsP9QWVs9iQvJMxRa4RxWnggU2AHOz313cXUFDhKS5ppnYIWW zD7EOThDHn0NrnQBr6My7LEjsuru3fQdkhzKzKY6WDqV1H8LcxDyESa/OAwn6W69oZRDOe FBQAMFgqPdiMvcYsjr3OkH90e02bK8A8LZ7ULPRW+vK/TrZOMc9rh7LZK1rDfWjzdd0LkC HKSQoyl/IZXhelkaGtYcHLp8SLEQPnpefryd/ZPVUTkcouTLRJpOi+Pqy5m2urTXYc8HNe GmdC9jd+HyA/mIvlxvMllMMemrShrE7oBAuHIoAUp05e8B/02cmQY6y4SDktSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3ldg4qQCzy3J; Sat, 08 Nov 2025 19:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J1RHS068475; Sat, 8 Nov 2025 19:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J1Rdo068472; Sat, 8 Nov 2025 19:01:27 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:01:27 GMT Message-Id: <202511081901.5A8J1Rdo068472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 95379de3616a - stable/15 - ath(4): Fix a typo in a device messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 95379de3616a1424e4fddb0b5743a5f789803b9d Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=95379de3616a1424e4fddb0b5743a5f789803b9d commit 95379de3616a1424e4fddb0b5743a5f789803b9d Author: Gordon Bergling AuthorDate: 2025-10-29 15:26:59 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:01:17 +0000 ath(4): Fix a typo in a device messsage - s/Orignal/Original/ (cherry picked from commit 3eaa2a852b475c7f063bbf677fa536e76514d309) --- sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c index a0c27828bbc1..50d7cc0aa7a8 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c @@ -76,7 +76,7 @@ ar5416IQCalibration(struct ath_hal *ah, uint8_t numChains) HALDEBUG(ah, HAL_DEBUG_PERCAL, "Start IQ Cal and Correction for Chain %d\n", i); HALDEBUG(ah, HAL_DEBUG_PERCAL, - "Orignal: iq_corr_meas = 0x%08x\n", iqCorrMeas); + "Original: iq_corr_meas = 0x%08x\n", iqCorrMeas); iqCorrNeg = 0; /* iqCorrMeas is always negative. */ From nobody Sat Nov 8 19:01:53 2025 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 4d3lf94fFXz6GR1Q; Sat, 08 Nov 2025 19:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lf93XrKz40Kc; Sat, 08 Nov 2025 19:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ya9BMb3HKDxq4lTK699aqd1/sVUzsmHUlBR6zpP2BE=; b=YczVPJwTod7R9zOPVOf1A6DzgcKKMcTnsx8d1gDIbFK5SY5eV9CY1dz/XG4T3uW4S2KwZY h9S5omatDKsPiRIlVNkBr+vQiSbKEYGEgw7hU0u4fYeahlRGWLOz2NnctxLfjIaU/Ma364 hGhTiK4c8++x2804tbpBzUW84L+sh3dwvuJv9+eZzczuNTG8FVNM/pCDm+youfVwJsk2PE 5MBd/AgpzCcp4y/WORfbQwpuA4cxiLtDM2JIwpfMnip6/nqt0xLhTCoHYIADyg/AiMXdqw ITAf/lx6sze387QCW8h1k/pMZuqbi0GDBFSx3hewTpn2EiIJiWQ/74fkFEw5eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ya9BMb3HKDxq4lTK699aqd1/sVUzsmHUlBR6zpP2BE=; b=KCopDzWinfXNcP9I8y96sVZVx0lmdk4aIs9/BHLi8GHRqpGgDLLN2Vc3wnk6xga401+hMr kB3SbzRZIVBiVf7zv+cYY19teCdP7yejp0zYX1HaApLErRv9TDXlETfGCT8LQqri1uBPOd wcPOG7KQO/05SSxsauUv2EnOzfTH6UOZ5YoWryjEk3bdcheeaflUQ9RYCdyMoxIlROpEaf BLi0pDyYAbNPLHjVw4q9KgmLYNv9ksM8d3aqV/M+W4z4Uv6XQEQsrcL0BT9i1nq+lYDI9d rISgx+ytT+QxRU2ECiL5iQm4nxXBiwo8s4tAw4X9Z962qoE3BBw56uygCgjDLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628513; a=rsa-sha256; cv=none; b=NmPe5LoJnjKzpJDgKtP3mbKl0XyBUYrphG2pqH7vBYO0LeGyFvPwrQVGS7vVCcfi4DVdS1 y+PYO9wKLr7USFS0qWgDpCVg+K9xzSlr7kCmLv7UjBv/Di0oZRs+5uHZUfyBDgE221mewy qOuDTS0baKSDAHMc2hOZV1nw1AVQKUxiRfUhVDBEENGe5ZAPUC+eX/x8M7EbEB7AvmeS/C +AyPVjAvOmkNsl3yy7V8OMZPvD2XeaE6VQBkVBAfhT5fJ8fg9wriU8lHZ3PQ38X0WBVZFu rOgnXXhtJ7G/VwaPhAcuKYGHooA+TIhg973yVQqoWMppApkLVyrhws5D236q0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lf92zH3zy0v; Sat, 08 Nov 2025 19:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J1rMb070610; Sat, 8 Nov 2025 19:01:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J1rO8070607; Sat, 8 Nov 2025 19:01:53 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:01:53 GMT Message-Id: <202511081901.5A8J1rO8070607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f56d1a1d6137 - stable/15 - igc(4): Fix a typo in a sysctl 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 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: f56d1a1d613781b63a70849f520f1fc9ba9e8b7c Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f56d1a1d613781b63a70849f520f1fc9ba9e8b7c commit f56d1a1d613781b63a70849f520f1fc9ba9e8b7c Author: Gordon Bergling AuthorDate: 2025-10-29 15:38:03 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:01:43 +0000 igc(4): Fix a typo in a sysctl description - s/Recevied/Received/ (cherry picked from commit defe77554d134964d7c197a2f3ca552778e8b41a) --- sys/dev/igc/if_igc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index a1ae35c7aa43..8c9ec0566a38 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2816,7 +2816,7 @@ igc_add_hw_stats(struct igc_softc *sc) "Oversized Packets Received"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_jabber", CTLFLAG_RD, &sc->stats.rjc, - "Recevied Jabber"); + "Received Jabber"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_errs", CTLFLAG_RD, &sc->stats.rxerrc, "Receive Errors"); From nobody Sat Nov 8 19:02:29 2025 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 4d3lfs3ZBZz6GQq3; Sat, 08 Nov 2025 19:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lfs2B48z40d1; Sat, 08 Nov 2025 19:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBoff5+T/nb19osYNrUV6iBnHWVakx1DFX6KDYVSqQM=; b=PcnShYes/Xahkpw1R5DZafbf2zo+g4/C9UoYvwPIk14N1pqStJBFBje58fW5ZseJZPfVq6 wCeWoTPdJ6vqZ30SnNMaf6b21PWyZdVLkwzWfxUY5vbuJghyblve5dlrleUipAGdcpZDT1 9skah6IuqF/q4VC87XeAp85medaHfS2+73EQqaAREI1EZJO9rY1+x723WNNKgBKzeZ3qB9 bEqi7ssd2iDyaL4jHE2f+ki1bsDlSwHJVyGUK3Ao4kG/jjB1W/IsVxi9ztXRZkiInu1W0J daUKXYimcKF0PCdyZAxV3Qvrq68UGA6ES/Mv52M1uEeRtdQMthmmWJqmGJ65gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBoff5+T/nb19osYNrUV6iBnHWVakx1DFX6KDYVSqQM=; b=HF9xg8HMioryy0vAyG74ere/k72bDHNsZR2gPVdzhcV78JoE9rsYCVOEOeoek8J2Fv9kvl Lau/xwrkpp7ecaiMApiavmvs6f9qA49OQAxKgFxUrYLA+6E42sgKsHX1g10pqDzQSnh4PN VzgVHH8jwMaG5GvEmNbw90bAXwMYX7SyslagobemRoNme4xJaTd/iUJv1NTD1XUxzhQqoc D8p+Sxp9Vo+scTTtAqU0attxEPSZtXEKgnKxYbjYS/WOj4oatZeXgTW+1WiOpg44hhTVnf tkWfQ0RX+ZKGL7BtiDpg3Rs09kEJHOJ6yP0VLbxy2VWMsmXaZfAz7crOYMwvHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628549; a=rsa-sha256; cv=none; b=GxALdIyGfbMwxDlq5ttfmrpZxuypx+j3qiKy1sinXMGgN/nzn+xOyPSurzI3KQLju7X3LQ d0D1VNhRdDC/zSj1cAU2RtwgtcUNvthAWoPahu4usGLMFu31+4rz/4920/3souCMNDvaWx yeF3KB0MBWT44rCQKSdrztzdIhMBQXFeOiKg6q1iHGdPTN5K3Oi8va8Mo5cTl1sfMcw+77 4FGCdlslzqUDIpthi+G1vVS8vwFlf9YwdEmgazPCcATasxIIHBYCt+nLY+2YoIouC5N1PH tF4oGH1BNhTtYAE+n+q7k3PDWbQFNMOECsshL3yWyaqHDgx4eb8Z2ilVUjvWfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lfs1nTNzyNm; Sat, 08 Nov 2025 19:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J2TZi072653; Sat, 8 Nov 2025 19:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J2TVY072621; Sat, 8 Nov 2025 19:02:29 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:02:29 GMT Message-Id: <202511081902.5A8J2TVY072621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f7e8178ce193 - stable/15 - cam: Fix three typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: f7e8178ce193813e8ff23e02b75864abc888d81b Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f7e8178ce193813e8ff23e02b75864abc888d81b commit f7e8178ce193813e8ff23e02b75864abc888d81b Author: Gordon Bergling AuthorDate: 2025-10-29 08:23:51 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:02:18 +0000 cam: Fix three typos in kernel messages - s/maximun/maximum/ - s/queing/queueing/ - s/exhausing/exhausting/ (cherry picked from commit adfe14dcc2747a20dff961044d6817c507087327) --- sys/cam/ctl/ctl.c | 2 +- sys/cam/scsi/scsi_enc.c | 2 +- sys/cam/scsi/scsi_enc_ses.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index e110281f7c85..442ef1d30542 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -2123,7 +2123,7 @@ ctl_remove_initiator(struct ctl_port *port, int iid) mtx_assert(&softc->ctl_lock, MA_NOTOWNED); if (iid > CTL_MAX_INIT_PER_PORT) { - printf("%s: initiator ID %u > maximun %u!\n", + printf("%s: initiator ID %u > maximum %u!\n", __func__, iid, CTL_MAX_INIT_PER_PORT); return (-1); } diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index 9705a0b890b4..65df32ead371 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -732,7 +732,7 @@ enc_update_request(enc_softc_t *enc, uint32_t action) { if ((enc->pending_actions & (0x1 << action)) == 0) { enc->pending_actions |= (0x1 << action); - ENC_DLOG(enc, "%s: queing requested action %d\n", + ENC_DLOG(enc, "%s: queueing requested action %d\n", __func__, action); if (enc->current_action == ENC_UPDATE_NONE) wakeup(enc->enc_daemon); diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 435874a9874a..57eb2b1155b7 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -1623,7 +1623,7 @@ ses_process_status(enc_softc_t *enc, struct enc_fsm_state *state, } else { if (cur_stat <= last_stat) ENC_VLOG(enc, "Status page, exhausted objects before " - "exhausing page\n"); + "exhausting page\n"); enc_update_request(enc, SES_PUBLISH_CACHE); err = 0; } From nobody Sat Nov 8 19:03:03 2025 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 4d3lgW6dBTz6GR1g; Sat, 08 Nov 2025 19:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lgW5t7rz411n; Sat, 08 Nov 2025 19:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t+foBrd/JEPnzIkOeydlSlYOF4Mt76yUbFs4c/gcfJ4=; b=LU+2M+FNh/jQoOvZQoogaxji4ZBQ5e6ABXYt2qror4MJkmAyl9+3Z2H6KRrBm7DjQNqrxP 4Cpx3HLFmNkKgG+yDIF2SlXqeSU93qtB3i4Aphbm4JSrhj/oKsnzIpb7ORks9C/lHX/IFt gkizN0MKLdVAZNl8ZnIbFMkXxIn/uEYsYeOym19xhw935x6VX/M1qoK/uPxlTQiNSBGCHt I4KUXSt5+mZyxGV/U2cqggFzUAPQx7hnFj+Ai15VcEod95cPuYRfukVPY2LiYzXjmSxLsq pDw2i9G62YPb9lqDDviuOPxu2OJKqjYWpvN623M78MJrwOefV8MffCfQangVtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t+foBrd/JEPnzIkOeydlSlYOF4Mt76yUbFs4c/gcfJ4=; b=vbLDvdjziodZdqm5aSRoasLShvwRa3wWpgitKrfrJ7HVMZGjNnqes/EdyoaYDmxpWySfZ2 soNrGwDFMDpapORz3/qmkbkXD4FbCcE4GKhEQsYO9o+oCt+tuCFpgd6vC1Xjvkbs/5xQ+1 dzGOq0Ws6rG/xDPoVemuJzvpKhoJw0NOe7Wgf9YDVZiFJWkn6z9R5C+b+H9XP0wMLcNRJY GiZ8JtZw46XHplNum7hlXqUgqpYc3BFSP3qeqOjMtyb/2SPfJF0eB2mAGRQeAl50RygoAC vjt2162o1LWRQZvVfyg/mMUCP8MY0mQ1ooN+K+Ce3cacFBHqn11PrculjRXDWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628583; a=rsa-sha256; cv=none; b=fk8RvGfr2+FXzkyaMRQZZZSXg5pCVxFawGXmPGj7bXx/Q5bqbv/v91QbLYYuKhe0nV/T0R Y7+/IlKAPTZbObMdZufVhdz4S7fFzMD40wmyN/4U/Hv6TJh3atjIleZ6sVR3iZh2Uhayjf tDrSkpFp3jYLMJ1i8svlCOLBop65dmIUzQtBXqnSlniq9GE/0TCVGn10KghwvN37Arr1Bc 9NwUCohi02HvbD+naOLse/icNBbxmD/Zpek1tXaNamInmtqrOMfZRCw1/sDbmtO4W2b/kX TtlwiwuIPTLXeEITLsaQNjXr7aAgGEwivFKN75QX2uWExRFvOcDWvA0v+jTAMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lgW51kKzyRC; Sat, 08 Nov 2025 19:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J33AT074489; Sat, 8 Nov 2025 19:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J330V074486; Sat, 8 Nov 2025 19:03:03 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:03:03 GMT Message-Id: <202511081903.5A8J330V074486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3861268596ce - stable/15 - aic7xxx: Fix a couple of typos in device messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 3861268596cecb97b267bbc699df532ceccbb6af Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3861268596cecb97b267bbc699df532ceccbb6af commit 3861268596cecb97b267bbc699df532ceccbb6af Author: Gordon Bergling AuthorDate: 2025-10-29 08:29:08 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:02:51 +0000 aic7xxx: Fix a couple of typos in device messages - s/Reseting/Resetting/ - s/staus/status/ - s/referrenced/referenced/ (cherry picked from commit d1e39f3d6e5fce1a30a5713d522f87d83654c4bd) --- sys/dev/aic7xxx/aic79xx.c | 6 +++--- sys/dev/aic7xxx/aic7xxx.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 2b5015b20e41..c5656177862f 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -2015,7 +2015,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1) ahd_outb(ahd, CLRINT, CLRSCSIINT); ahd_unpause(ahd); } else { - printf("Reseting Channel for LQI Phase error\n"); + printf("Resetting Channel for LQI Phase error\n"); AHD_CORRECTABLE_ERROR(ahd); ahd_dump_card_state(ahd); ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE); @@ -8179,7 +8179,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb) AHD_UNCORRECTABLE_ERROR(ahd); break; case SIU_PFC_TMF_NOT_SUPPORTED: - printf("TMF not supportd\n"); + printf("TMF not supported\n"); AHD_UNCORRECTABLE_ERROR(ahd); break; case SIU_PFC_TMF_FAILED: @@ -8313,7 +8313,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb) break; } case SCSI_STATUS_OK: - printf("%s: Interrupted for staus of 0???\n", + printf("%s: Interrupted for status of 0???\n", ahd_name(ahd)); /* FALLTHROUGH */ default: diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index c09876e9f589..31b07d61e9f4 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -78,7 +78,7 @@ struct ahc_hard_error_entry { static struct ahc_hard_error_entry ahc_hard_errors[] = { { ILLHADDR, "Illegal Host Access" }, - { ILLSADDR, "Illegal Sequencer Address referrenced" }, + { ILLSADDR, "Illegal Sequencer Address referenced" }, { ILLOPCODE, "Illegal Opcode in sequencer program" }, { SQPARERR, "Sequencer Parity Error" }, { DPARERR, "Data-path Parity Error" }, @@ -476,7 +476,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat) aic_set_scsi_status(scb, hscb->shared_data.status.scsi_status); switch (hscb->shared_data.status.scsi_status) { case SCSI_STATUS_OK: - printf("%s: Interrupted for staus of 0???\n", + printf("%s: Interrupted for status of 0???\n", ahc_name(ahc)); break; case SCSI_STATUS_CMD_TERMINATED: From nobody Sat Nov 8 19:03:31 2025 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 4d3lh36F70z6GQym; Sat, 08 Nov 2025 19:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lh35bvWz41Pv; Sat, 08 Nov 2025 19:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j1SSn5rscvVE+PXZ64+q7myzspCsw1D9TxZ+uOWNJ/M=; b=n/7Ws2Sg7jTZ+CsmwpARiPFDwt1yGwsRu6kO1ezN0bkMX6Wb/8YRSLxrcsjDZ0Qkfvhv/I pW9U9iM3PLKT0PPTg3I0wbmoGRzcUTBkEETuxib6SXVtvxANThJN3cZTXwbVJrMpzkC9p2 erB5G8247FuDhJJLuX0Yx7AIC5PPGHJeGqNgFGilCvDpkJQAllJ4955rWOMvaJwb0Y3lRa tn0jy0kY7c9284lJQRUrvmE/ocnbOWToaUVw8PVeQt7uqHS5IhmAvs5gbtEF4MiBkwTPmX HQBWmHSDFbmQOKXYEMA3Cn3EQyRYsLLDVjrpyv1xPndfI8ArSWIvTGAbkcuw7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j1SSn5rscvVE+PXZ64+q7myzspCsw1D9TxZ+uOWNJ/M=; b=urPBG9pmgo3nE9KzwfsWADzbVnlXDGx1gzcdVK8d4d6MA5SJOy9uLmMe8EWJYyxUi7Q+im rLAkirF/yDJMqZ43yiMAVsgJ2cH8QUHif0XeZCWeSuIl9JKxBvAyE2jejuZ1r4kSYkafCb Q0dJryB0drOQZ7+HADFPm34geRnS+Bu1r7d3uBnrGyI3VfaONAnJO81q3qXBMNgL6alT4W DW06bf3Ls/xGVihlEJ/+qwwQ5orcAIle20w8G/tFhSktV5HbhogfQxibu00cTjjI03dr7u D5JvSkpR/DsxeUopQDyLLIjEmWKdaD4P/KFKWf2exjo8GoQtQP+nY6WaVf1mpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628611; a=rsa-sha256; cv=none; b=xk/atZ3NzLP5SJwLZugFtAua1pwzcib0cou6HQqDlsCmrusx//sXGyV8upHDw2npjySm7R hiifGQqMuSah6lVem53qyvQ3ZViAF+SoxJ+/Ulrwght1TilYDIKbbHe2K3HYwNLwlFbZH+ RYvV80qAazbwf/QvqiLW66P1UIUfiabYALzxQYm8k5An+T3+ZE8r7j6Af5b44QUGXf4F4g 3FNCgv1ss4uHtaZOdAhZWqvsHT24fd6SP/c0HbCtksCstlOUQD/OIdoyV/8wluAH+5zmra QtcdoFXJXKMvUTvZLu35UO4Wdkht1T+ABzf66ODEUfnKbbwF9HjwiaiyHFyq+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lh356tzzy3s; Sat, 08 Nov 2025 19:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J3Vgr074715; Sat, 8 Nov 2025 19:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J3Vec074713; Sat, 8 Nov 2025 19:03:31 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:03:31 GMT Message-Id: <202511081903.5A8J3Vec074713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7e114269124e - stable/15 - amdtemp(4): Fix typo in a sysctl 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 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: 7e114269124ebb266b0d7788271e8f46dbcbfa2f Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7e114269124ebb266b0d7788271e8f46dbcbfa2f commit 7e114269124ebb266b0d7788271e8f46dbcbfa2f Author: Gordon Bergling AuthorDate: 2025-10-29 15:21:25 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:03:20 +0000 amdtemp(4): Fix typo in a sysctl description - s/temparature/temperature/ (cherry picked from commit 85d6c86f4b53e6ac2a9b163c553b48466638f394) --- sys/dev/amdtemp/amdtemp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index 79ccdc8c79fb..b1ecb014a2b0 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -642,7 +642,7 @@ amdtemp_intrhook(void *arg) OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, sensor, amdtemp_sysctl, "IK", - "Current temparature"); + "Current temperature"); } } if (sc->sc_ich.ich_arg != NULL) From nobody Sat Nov 8 19:04:04 2025 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 4d3lhh5B6Vz6GQyv; Sat, 08 Nov 2025 19:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lhh4gxJz41nD; Sat, 08 Nov 2025 19:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9dehWXsdSx4MKOqFY+5W+PzS0GoNGGBKHooFWLnao0E=; b=RnpFf/sP1QzRObQvDMGttHlNgwrv9qO2CDu+1z/sdZbvcWeB0h/iRp6AhfA+RQ3r0Im83Q Wf5dpfNNPVF1IvbH8/tdylkarLeGc2X19jGkFdHwlcbXevCIOuQooUnhidGF4QfZYT5yRm NXL302JNW1TJfFcNneK91nhUhRWHYaTwg+d9AysyiiI99gFnQmL+jkhbiUDNtGuGcDP2A0 NJJXkk75X5aGFHKShwxgo2tDk4dHn9bIWJiP3aYzRqbX+kMrV1r+wVABpg84702msSS6Ho TWPihZeXzEItPZMsrId5/EYSPvYDgD4QLRdWYg6ttaOHcugaS3BKVGV1hmWgxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9dehWXsdSx4MKOqFY+5W+PzS0GoNGGBKHooFWLnao0E=; b=yB0GEP+npkB/jkqatn5AYRPt9U6q/sER8steLLF9AjDXFgLSrGG9mmyBByW9+LfqpmXof8 YsgCkII7Te8D0+00gCGZG8HwrfaTmhi7Ve21BUaDTN4BXKYKzMjuqIGRxqkaZVxdTE9LIh 79nCkrOM4XMFukIOTgSy81Xf0VDOemtNllmbhg/TCD3euQHZfN51aek19VXcHPWI/7ZGU3 8bfJ2R9eucEnrxmGJRj5dV1Tz2hHWhWJfnfOZpYWjDZGsgcmqsR7nf8t/HmgMJZ19/rskG zjjoJR8T2sEsulurwnR3EKnHWyy5iJKOxTI1B05QihgZ8NkA2PNl27Vwb5UKbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628644; a=rsa-sha256; cv=none; b=Um/3/1Z4sCNCi6mSs2Gjm6xXsBhnjJZcISxx6UrwI48qeK6ubs70D4NZ3dXHAfiH6I2HB8 5zhTcnZwl9cKq+B0/duJBT98lCtCRXF0DjRGui25BUTqwdf4O04C48OpfVuzlT34Rv+SXy 3vxa8ZUZ21jxVOXF3T1PZCyPfiU0o7Xx+yYK810dmK9aGCR13N+glDrbgJp3MkzDkIFZdx po+EMs/16ip+uzSvW7Ueqa2d1B+ns1lFGcT1nNUKWZA6i7E2K55TmfBne+CMsFUT8P8NiB xhV78rNKgjuuu1P21dYUU9TZ0+Bo+61g3Sg5+uLxDixw/ld2dhJpPK0z+FVJ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lhh3xmVzyRD; Sat, 08 Nov 2025 19:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J44WW075018; Sat, 8 Nov 2025 19:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J44Ma075015; Sat, 8 Nov 2025 19:04:04 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:04:04 GMT Message-Id: <202511081904.5A8J44Ma075015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9c5c257d843f - stable/15 - nfsclient: Fix a typo in a panic 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 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: 9c5c257d843f3fb96bdd22b9fe48ae9061dfb640 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9c5c257d843f3fb96bdd22b9fe48ae9061dfb640 commit 9c5c257d843f3fb96bdd22b9fe48ae9061dfb640 Author: Gordon Bergling AuthorDate: 2025-10-29 08:26:23 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:03:51 +0000 nfsclient: Fix a typo in a panic message - s/eroneous/erroneous/ (cherry picked from commit 08a6620093dc2786051bf6ae6f40ae048027021b) --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index bad3e69ca5cf..9ee1fb7d72d8 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -9760,7 +9760,7 @@ nfsm_split(struct mbuf *mp, uint64_t xfer) pgno++; } while (pgno < m->m_epg_npgs); if (pgno == m->m_epg_npgs) - panic("nfsm_split: eroneous ext_pgs mbuf"); + panic("nfsm_split: erroneous ext_pgs mbuf"); m2 = mb_alloc_ext_pgs(M_WAITOK, mb_free_mext_pgs, 0); m2->m_epg_flags |= EPG_FLAG_ANON; From nobody Sat Nov 8 19:04:34 2025 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 4d3ljG4Nt2z6GQdW; Sat, 08 Nov 2025 19:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3ljG3VPDz41y6; Sat, 08 Nov 2025 19:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9jPQZYgtkqXzkAobyp7tCSfGwjjo1dPPAtqXVKcrr4=; b=CSgNmo8V8raZRAPBgNIvM5vvjCMba6LTFws2LwTZrPucF1m/1LvG+SN4A3QMJ0GZ+ENTh1 IdbtTGuTcOT9r903phoypUHOGa2rmwDo2vMuGg9bNT/N5Pq/r7U1HZ1u8rDiJb5rESOQXC A6zT4ihP6i/jXWM8pgG+7K2vjv07DVRcF9JxOFQT5JQYlmfxXHLawvPN8ireJX5vbPqlgW 7gu6nftTauVJGrNBAvcmVUfijrEyML4RiyjuCpVIcUlGGTKtBbjY3ea8BhBuJNOzZ2TmDs zAG/dVUALCJD7gfbdm2VMobubLJfF+SRi8xO8N3j5skNdUq+6rVNROzF2pXCYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9jPQZYgtkqXzkAobyp7tCSfGwjjo1dPPAtqXVKcrr4=; b=DePHwwwNscVe2R6EWcjcTi0iYL+PJ+5EFjK9S+iNX2yH7c6XhEdQWz+PyrMGXEUw7AP7A+ jNXlkhigNoimlW/tQuaTNj5BgZQCJ+y9OnTNYOs1dJqhoAQCUwsmWXeUHvKCyXCZqdFUE8 r2tbrV/MkBQt9wqAhcScRe6pgG8ROzIgkKF7wDmXY7/CV3GJVGnvhKVIumzEiLAh74WOo/ xf/gcY3w/W79QdxXxY3HMjjMN6NfdRVOMzNMSIDFmGF15P6wlYWnrE8RcZ/rmmltrTXE+1 4FwJ3H4uMkcv0KFyDdj1xZ730xj+UGBWfi/LVfrmwRiuZYsUuKJ6A1sufwovtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628674; a=rsa-sha256; cv=none; b=dsJ7a4YXYBHqV6hFWvEIahkLho3IFSCxX8KMKB8UFijbQPOww0MVy8IFQp97AD++fsyxtt fu3y9PzvVFbNfDA+4iTXVLjKxM28W0cVLX7SmdJ/87cPtP3mIap08h1LeNYNiZO/n1tR/g bXVAp3cN2mhQGNKbCq/3QFU0QwOu+xmryWcJm7GO3BU9LOonbI+CefKaJpTXqcmushqy6L 1SxIcgtzHn6gycs8nyUpvWyJjjByfkzHqPAGd/WUPDMVSpAMz65q0LPsM5dCWHojKZxcJK 198EQ+JxE14dI5Zsv3pYo+7x3GVRhhhXLJ7gfC0662cMgoQ7sgv+ZV+l6weExA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3ljG2zF3zy3t; Sat, 08 Nov 2025 19:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8J4Y27075264; Sat, 8 Nov 2025 19:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J4Ybg075261; Sat, 8 Nov 2025 19:04:34 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:04:34 GMT Message-Id: <202511081904.5A8J4Ybg075261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2bc7e0001034 - stable/15 - vnic: Fix a typo in a device messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 2bc7e00010349e1fbac268eb73ad0be6a48a1ecd Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2bc7e00010349e1fbac268eb73ad0be6a48a1ecd commit 2bc7e00010349e1fbac268eb73ad0be6a48a1ecd Author: Gordon Bergling AuthorDate: 2025-10-29 15:25:33 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:04:19 +0000 vnic: Fix a typo in a device messsage - s/interrups/interrupts/ (cherry picked from commit 74a44a0bc8ab965d28d1ce804d3f0aead035faf0) --- sys/dev/vnic/nicvf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/nicvf_main.c b/sys/dev/vnic/nicvf_main.c index dd44e420c78f..59f7abeacdd5 100644 --- a/sys/dev/vnic/nicvf_main.c +++ b/sys/dev/vnic/nicvf_main.c @@ -1402,7 +1402,7 @@ nicvf_allocate_net_interrupts(struct nicvf *nic) /* MSI-X must be configured by now */ if (!nic->msix_enabled) { - device_printf(nic->dev, "Cannot alloacte queue interrups. " + device_printf(nic->dev, "Cannot alloacte queue interrupts. " "MSI-X interrupts disabled.\n"); return (ENXIO); } From nobody Sat Nov 8 19:13:53 2025 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 4d3lw14VHSz6GRGc; Sat, 08 Nov 2025 19:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3lw13pPLz42bM; Sat, 08 Nov 2025 19:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762629233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sCmsCLYZfibpNH8cvFg96FSuSYDMd1TbhD7vIMqOtdE=; b=nWRAVC+OgTaVix++Yvlv0QU34zi96sEnokxJYVNAuyAc9bMqwcezZydpgF4enJ3uYYS8+1 UARWTbTdStP1aI1bA/c8juoQ6hbK32tpUZrxXpm1fZnTzt3KSTp4jIM2+sVKShcuFzrm95 kMZ5uLVv+LgHLVs0DmZTEbLNmM4oCe5I4UQC2vodQ9TveqmGsDi+n10b2aJtO9m6yon0LC d/XujLANON3bHjHV5ZcS38eDyHnnMTv6dSprlCo5WpV5PkQNKwGc4TW529TMr231cUCYbn 4ZP9z80djMDrK5DCk7XksWU6+jj5kij6Z/+nH3k4JnyEn5CzxRlj+h0IomEJRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762629233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sCmsCLYZfibpNH8cvFg96FSuSYDMd1TbhD7vIMqOtdE=; b=jp+lyHqHh3EYpMtpVK+7XXn8HcQ5YKf1XjI7YZQI3N3/GRs8vPzkQdVPd7BLYltraDEvsA PmjN6bLfhzH/cvZ4dfzzrS2A7WntP42ZmnfhwDdJ/0M4WHIezQkqVwfsPHT7jJ9k8nscW4 xYcyjOFJgH7CqR0/9UfZNsdTdjoSaBEmhxahmpoQnApnEjdbgVn29ZKbIt6k7VZcV/LEPD E6oIzz54GtuF9MMLN+StkvBTQikmanqqs6S1c7o8sXO+Uda1pqj2gEcffzrnCzdx6EPvoF K4wSAOtC8YZ259NG02V8PU9CVZEkiI+j91z/Xlh59tK0JaSuLvlDZO/6s+0BGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762629233; a=rsa-sha256; cv=none; b=jiBa+vQDVQysKZAb+OV9St/8/CfGiUdlqtpU9e+FqEd2+NqKW1EV0wQI5nYG8KVu4JnKhO 6O2Z0nWvCu7TFEDzFYt5iZXylBb6mYUIbNFnS9wIy7x3OapjaogmOoJR78Driw0MIhc9IL wDj4UjFTPw5ZFm72RxxCxPkRIy+AuRsOAse6+HZyuhWmp5f+yWqM1ZueOtEnhkdRakSKxc nBKUVPG6w68RlUWqI/xn6v/DXUyi+3t+ZVZ9E6A2dxkAa1ApAquR/KwNHRl1N6fzaQ9Cj8 aEJ/ObENyZQ9FyyVrz3JtLvvoj2JZIUlvVXwxHju1j/Y/eiK/ajrSlNgdjp1eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3lw138WczyTj; Sat, 08 Nov 2025 19:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8JDrsQ093306; Sat, 8 Nov 2025 19:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8JDrSc093303; Sat, 8 Nov 2025 19:13:53 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:13:53 GMT Message-Id: <202511081913.5A8JDrSc093303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: addc0556ce54 - stable/15 - freebsd-update: Swap pkg(8) flags in check_pkgbase() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: addc0556ce547425f9810fe081b46e8472340333 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=addc0556ce547425f9810fe081b46e8472340333 commit addc0556ce547425f9810fe081b46e8472340333 Author: Mark Johnston AuthorDate: 2025-11-06 16:06:12 +0000 Commit: Mark Johnston CommitDate: 2025-11-08 19:10:18 +0000 freebsd-update: Swap pkg(8) flags in check_pkgbase() Unbootstrapped pkg will ignore -N if -r is specified first. Flip the order. Prior to commit 66c75fa63aff this worked by accident. PR: 290393 Reported by: olgeni MFC after: 3 days Fixes: 66c75fa63aff ("freebsd-update: Fix the pkgbase check") (cherry picked from commit 645352316be6901077dc1a3ce26f41934136f412) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 7815502dba39..23f1106e3bde 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1103,7 +1103,7 @@ IDS_check_params () { check_pkgbase() { # Packaged base requires that pkg is bootstrapped. - if ! pkg -r ${BASEDIR} -N >/dev/null 2>/dev/null; then + if ! pkg -N -r ${BASEDIR} >/dev/null 2>/dev/null; then return 1 fi # uname(1) is used by pkg to determine ABI, so it should exist. From nobody Sat Nov 8 20:09:26 2025 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 4d3n8646Cvz6GVkc; Sat, 08 Nov 2025 20:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3n863YWsz47B0; Sat, 08 Nov 2025 20:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90YysOWGpg1psM9xa3snR4B1wox+FGyzfMzDYBNg6BA=; b=L0KtM/gIcaBuX7BveOj8bBZlh1eNpwpq2wJ7c1aJXpKDbu2BDv2wXtqa4yrEamK5WJ8ie2 XaLKH7tevJ7c+ewK6fvXlbOPfqq6xXiEzqpDg3rcxXtjb37p5ij5EvWWX/goc/9UtFVhXa /WJEBcSSZrUBkfYnGiXEcn+PaieGI/4HVsf9ji8c+GN46E1WCkanUA2JPxTGSpAZRGcMMg Qn3eymyIUtFqxXWUheKz/0fOt9KM1aTtNuNs6otNt3yBFiNA29aaCQ2mYHtni5TbUjVy41 2yUxbJx6ZBed2/+3+H+I6RDFE42hUm16WpODPqDqTcXE9mP7ngA1fUIxTovSfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90YysOWGpg1psM9xa3snR4B1wox+FGyzfMzDYBNg6BA=; b=Mv4aEMWOu4FbZ9gAI50399bZ3Ghjg3n//2aYuTwEupjrdysXYaFN7FNlW8yRbX6U13KBGE Y8oUaZk/Up56l65cVQm5RHqdz/A/nX6aw/xhVJBmBcF5f5vq9Wtu520jML89UMhM71jXtV gVEhRn76v0Z61TVSzXHJyrk1GFuLMp3qcixra6NAVrGvkL4aZBW1z9N6+wDhlz3agVqYjO K7Q5MRKwbitc+spvl1+RGCbkaNUytM1HVNU88z6yllszS6WNSJP4SV5rv4tTXJw+okzOBY LM09cCX4HeAYswD2xr3cSqnIvyNW0i1B1Qw5YSJeIbkAhPraayHntQJlHLeqBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632566; a=rsa-sha256; cv=none; b=oIDdwFeNiv3g5ij17T82xW+A1sYnGcAV/BTtU3ktKYgrnv5lUr15/U8gtYIZBWNV03BQfI 8p8sxkA+kiq2QTCB613kDlm0ENT6BEjijrCue4ATz/ZIlTY4EM8e0/CLdCm+AL+7pliqna P41cP/upbIbspZuQC3ejQHu2A0yCoy67r20hZDxhi+ljUq+e1TNSJHCsor4svk0C2lfzgj fb8zgYrqnoaDgLKSwsMzuDZqXpkvZCbbOWUG4O5powsVTETS3dVJ4bp9e7I23tJuJ7qyCA fxwFiVRXsfz6JKYcn+mBt8lmTiJzBdvblfhEYeCrij2acZZThP4FB8AYO+fBJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3n862ztVz10xY; Sat, 08 Nov 2025 20:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8K9QhV090432; Sat, 8 Nov 2025 20:09:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8K9QRr090429; Sat, 8 Nov 2025 20:09:26 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:09:26 GMT Message-Id: <202511082009.5A8K9QRr090429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1025df34faee - stable/15 - arm/nvidia/tegra: Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 1025df34faeef0f7243ab7c4ca6020a16196e0c7 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1025df34faeef0f7243ab7c4ca6020a16196e0c7 commit 1025df34faeef0f7243ab7c4ca6020a16196e0c7 Author: Gordon Bergling AuthorDate: 2025-10-28 08:04:33 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:09:10 +0000 arm/nvidia/tegra: Fix a couple of typos in kernel messages - s/intialization/initialization/ - s/Cannott/Cannot/ - s/ivalid/invalid/ - s/wating/waiting/ (cherry picked from commit b87836e824ea40793317d551eb13a8e2814f83f9) --- sys/arm/nvidia/tegra_ahci.c | 2 +- sys/arm/nvidia/tegra_lic.c | 4 ++-- sys/arm/nvidia/tegra_mc.c | 2 +- sys/arm/nvidia/tegra_xhci.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c index 30e28dd33235..efbad6ae618c 100644 --- a/sys/arm/nvidia/tegra_ahci.c +++ b/sys/arm/nvidia/tegra_ahci.c @@ -526,7 +526,7 @@ tegra_ahci_ctrl_init(struct tegra_ahci_sc *sc) rv = sc->soc->init(sc); if (rv != 0) { device_printf(sc->dev, - "SOC specific intialization failed: %d\n", rv); + "SOC specific initialization failed: %d\n", rv); return (rv); } } diff --git a/sys/arm/nvidia/tegra_lic.c b/sys/arm/nvidia/tegra_lic.c index e1d641635351..6956dc0ca849 100644 --- a/sys/arm/nvidia/tegra_lic.c +++ b/sys/arm/nvidia/tegra_lic.c @@ -213,12 +213,12 @@ tegra_lic_attach(device_t dev) } sc->parent = OF_device_from_xref(parent_xref); if (sc->parent == NULL) { - device_printf(dev, "Cannott find parent controller\n"); + device_printf(dev, "Cannot find parent controller\n"); goto fail; } if (bus_alloc_resources(dev, lic_spec, sc->mem_res)) { - device_printf(dev, "Cannott allocate resources\n"); + device_printf(dev, "Cannot allocate resources\n"); goto fail; } diff --git a/sys/arm/nvidia/tegra_mc.c b/sys/arm/nvidia/tegra_mc.c index 2568ff8324af..5703d768e505 100644 --- a/sys/arm/nvidia/tegra_mc.c +++ b/sys/arm/nvidia/tegra_mc.c @@ -157,7 +157,7 @@ tegra_mc_intr(void *arg) if (stat & MC_INT_DECERR_VPR) printf(" - VPR requirements violated\n"); if (stat & MC_INT_INVALID_APB_ASID_UPDATE) - printf(" - ivalid APB ASID update\n"); + printf(" - invalid APB ASID update\n"); if (stat & MC_INT_INVALID_SMMU_PAGE) printf(" - SMMU address translation error\n"); if (stat & MC_INT_ARBITRATION_EMEM) diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c index 474e31981770..b9dac91cccd8 100644 --- a/sys/arm/nvidia/tegra_xhci.c +++ b/sys/arm/nvidia/tegra_xhci.c @@ -818,7 +818,7 @@ load_fw(struct tegra_xhci_softc *sc) DELAY(100); } if (i <= 0) { - device_printf(sc->dev, "Timedout while wating for DMA, " + device_printf(sc->dev, "Timedout while waiting for DMA, " "state: 0x%08X\n", CSB_RD4(sc, XUSB_CSB_MEMPOOL_L2IMEMOP_RESULT)); return (ETIMEDOUT); @@ -835,7 +835,7 @@ load_fw(struct tegra_xhci_softc *sc) DELAY(100); } if (i <= 0) { - device_printf(sc->dev, "Timedout while wating for FALCON cpu, " + device_printf(sc->dev, "Timedout while waiting for FALCON cpu, " "state: 0x%08X\n", CSB_RD4(sc, XUSB_FALCON_CPUCTL)); return (ETIMEDOUT); } From nobody Sat Nov 8 20:10:03 2025 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 4d3n8r2RTJz6GVVs; Sat, 08 Nov 2025 20:10: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3n8r0sXPz47P4; Sat, 08 Nov 2025 20:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSXTCv+8ygOf6YaoQOQirp0GRtm5aW2CpHJDSIqq8Gw=; b=O6goDQUR4WKh1Tw+sVpbxu/Ik/8BixqS2rijQNVx3I+8sF2bN/HnEE3FYfQEun2Ien18zz ui7SqB8nN0IK62fZvrFeL/aHrgRw2gJErKVzGZ3+hkCYUOxZYeSd584joenlVNXq0PoKtS RYJqvqpCB7C7pZ7jyaqHpMOppEpCVYhAm4DU6ELt0+vv1EVsQ/ZIWNfBXENjGj3Y+/Xx0i td7MJeDHSrJ+f2OShzFLmZJAf0yMLGpRuw/mKy/n1pQ9n2zHV980hm6aUMuOa2/er2OGfM DPrM+yhgJ/sOyN1CSbdx7rPCLcOWxhdM4VUmv8Z4Rrwr7mqH6bbYzIENQW2tYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSXTCv+8ygOf6YaoQOQirp0GRtm5aW2CpHJDSIqq8Gw=; b=qO+3SsAvBtgXWn0TlYJLlaxxzxvLZ+BbcbGIaCfLI9cn2L2Epbl4NhYCeqlYxAkJf24w+C sPsYkAUv/h1InmOw9waoLy2dXLDrmppghuU7NzzqQCT5xmRS5ElBG8aHgHdZFrq+AgjVb8 8j4aoLG0bwAOkfhoD2AX/b1BF1vhkPvhXrJT7gPtrXRjxt3gh2zXZolUvtMLlMCS504rO0 7xp1FNFFifckLqWrib7k9Yn1hkWdPsCDwvxD9QJBIbSK0jjsZSWWElcfwSaED29S1AKg6R fVbNqav+jbb3gJVTSzAR4n8wXH5ONmDxKVEHts4DtXrF0wmMYVZKT/MC742qOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632604; a=rsa-sha256; cv=none; b=q2iug6HLOJxN1Srs+EWTR5p7T+BB/56rlBdlgVCYyyZpe1M4CIXfMPY4wFuXqrY7OEdk+7 Dj57/au8/O9J942GM+RQMQSq8klF6N5WxgMsxjmn9Fj7y+kgNForMBdUZED+Jv3KlK9HKg 52OEwpynk2E3+23EQJkM9kmhrQOlcAXJCIWnaD2VBrTPadH02pVLTzayDZrx2garoD6iI6 ZslIRsrDrVMP6eXl/ly2tlblpj0Tf0Mc6BAIPLoDk3SE9sCTLcnkQJC16JtZ/PelwNGdqH 6QVmn9NlG6LxMUmrMzEDalDDvL4/jaouuGGc64FH2gP/mTwYkc0OlZSkFHlcEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3n8r0FQ4z110v; Sat, 08 Nov 2025 20:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KA3nA093202; Sat, 8 Nov 2025 20:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KA3Ec093198; Sat, 8 Nov 2025 20:10:03 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:10:03 GMT Message-Id: <202511082010.5A8KA3Ec093198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ea1dea713bae - stable/15 - fusefs(5): Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: ea1dea713bae0ade698e3c54456b8ae1926b9d00 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ea1dea713bae0ade698e3c54456b8ae1926b9d00 commit ea1dea713bae0ade698e3c54456b8ae1926b9d00 Author: Gordon Bergling AuthorDate: 2025-10-28 08:16:35 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:09:52 +0000 fusefs(5): Fix a couple of typos in kernel messages - s/intalled/installed/ - s/attributess/attributes/ (cherry picked from commit b57198f620bcbf899a32c3de9526bd525ab8a39e) --- sys/fs/fuse/fuse_ipc.c | 2 +- sys/fs/fuse/fuse_vnops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c index 7f754ab7f1d4..bc36f0070d7d 100644 --- a/sys/fs/fuse/fuse_ipc.c +++ b/sys/fs/fuse/fuse_ipc.c @@ -694,7 +694,7 @@ fuse_body_audit(struct fuse_ticket *ftick, size_t blen) break; case FUSE_FORGET: - panic("FUSE: a handler has been intalled for FUSE_FORGET"); + panic("FUSE: a handler has been installed for FUSE_FORGET"); break; case FUSE_GETATTR: diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 00ad11108ee0..19e98e40f6ef 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2756,7 +2756,7 @@ fuse_vnop_setextattr(struct vop_setextattr_args *ap) */ if (fsess_not_impl(mp, FUSE_REMOVEXATTR)) return (EXTERROR(EOPNOTSUPP, "This server does not " - "implement removing extended attributess")); + "implement removing extended attributes")); else return (EXTERROR(EINVAL, "DELETEEXTATTR should be used " "to remove extattrs")); From nobody Sat Nov 8 20:10:42 2025 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 4d3n9Z63FPz6GVwV; Sat, 08 Nov 2025 20:10: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3n9Z2DJ6z47l4; Sat, 08 Nov 2025 20:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8BBmraLSwoOIqq3Fl/6q+SvopvtVuEtqG7uuSIW+2c=; b=kqrxrctn6NX9B5py3nVTlew6dPKACH4HXH2Sk6Z0bkXh8Nd1Pdxp8PYliAu9r2DUeHCgsv /yMRaVmClX2TuPKcU5p0ibaodBt9en452RA+mDi7VWS9rG9845la2JuDcT5b7QGQrOZhBy 5Nd840p5sNZ1W/EguwVylzKX9PraoraoU4V/2j/iRIJgQKCD44NjciDjtMS9bIoULwNzfS 7+MpDsE3xvjLjSz8dSXPsTV+MnFTvQ4Scd1WHSwIvJmnz2DUya3Y7vmiNVR1Ck3up43G6B wB6ph/1A6h2k6YzVx8xz1B8/Anu2A0HKdMc5/wrZ9+4juoMi9fs1GyzY1h9bpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8BBmraLSwoOIqq3Fl/6q+SvopvtVuEtqG7uuSIW+2c=; b=riwrAasst023oIoILAK11zxyPE0o8TbqklPH6qzaguaUVixBrRZAihyCHtrwp0X9nc1bdX ie3fF39Zf5HKttReSOgLGLNp7dlk9TRaxUf+E7KOS451YVOd46NXoPOkYjk/9Rcy2Hg4Sz n+CM93gpeywNVFJIDsyGFvltrP21ufpXhvGdIX41nF/losX/hBz1YyrMig0iyZrePgo27U sTI8OQ2L4FTl0WK0L8gczYkZ87kifW+rhVfRdx77jxWnlvjhKTkPiux80lTy9RT+iXL+RF z5xZqFqleh8KtuH/W+iCU8+tURnt0r+JBj1woSe+pgcqT5b4b063RROsIyoAHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632642; a=rsa-sha256; cv=none; b=SkDEaqFOYmEqk++OJvAzs1j37tign1q7B46ExmjdM3A4ZXB+/hEr/ybQUmHFt3K6W+ITrq 8n6EgYVGCNOYB8PdTp+QhXPrfA9kV6AT+8LKzrcOUbRJ+1GmkU0YWUGNWAwZrMll9K/To1 cngI30P0hZaSgUFVa/NG+8Lio/DguLkx+OjoboWtcB61B9g8YP+LFF1jzeJZZzCV4djDVK 1zKSksniVdpzb9TigSK+0xjIBV8YlJctYlVeUHn5x1cSITB/W3kn3NA7JGsXIA8Er+F1t+ FJUvqnxSx9U5zjvnPi1almTB1yMtzU9vYNQFHoCCIRf/S97jjPqjwKuwjGb58g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3n9Z1q9Rz10v9; Sat, 08 Nov 2025 20:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KAgOX099818; Sat, 8 Nov 2025 20:10:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KAgmM099815; Sat, 8 Nov 2025 20:10:42 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:10:42 GMT Message-Id: <202511082010.5A8KAgmM099815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d0585afbbf73 - stable/15 - hyper-v: Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: d0585afbbf739e7c08652ff0a2abe01f5c325c09 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d0585afbbf739e7c08652ff0a2abe01f5c325c09 commit d0585afbbf739e7c08652ff0a2abe01f5c325c09 Author: Gordon Bergling AuthorDate: 2025-10-28 08:07:28 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:10:30 +0000 hyper-v: Fix a couple of typos in kernel messages - s/tranparent/transparent/ - s/Unknow/Unknown/ - s/qury/query/ (cherry picked from commit 1ef6fef9d5c82a106ba8e42c1e087f9b5d1dfec6) --- sys/dev/hyperv/netvsc/if_hn.c | 6 +++--- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 2 +- sys/dev/hyperv/utilities/hv_kvp.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index ab7671025107..b23c0d76115d 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3574,7 +3574,7 @@ hn_rxpkt(struct hn_rx_ring *rxr) } /* - * If VF is activated (tranparent/non-transparent mode does not + * If VF is activated (transparent/non-transparent mode does not * matter here). * * - Disable LRO @@ -3591,7 +3591,7 @@ hn_rxpkt(struct hn_rx_ring *rxr) do_lro = 0; /* - * If VF is activated (tranparent/non-transparent mode does not + * If VF is activated (transparent/non-transparent mode does not * matter here), do _not_ mess with unsupported hash types or * functions. */ @@ -7600,7 +7600,7 @@ hn_sysinit(void *arg __unused) */ if (hn_xpnt_vf && hn_use_if_start) { hn_use_if_start = 0; - printf("hn: tranparent VF mode, if_transmit will be used, " + printf("hn: transparent VF mode, if_transmit will be used, " "instead of if_start\n"); } #endif diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index 29a88e76a579..63ac93a8773c 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -2088,7 +2088,7 @@ create_storvsc_request(union ccb *ccb, struct hv_storvsc_request *reqp) break; } default: - printf("Unknow flags: %d\n", ccb->ccb_h.flags); + printf("Unknown flags: %d\n", ccb->ccb_h.flags); return(EINVAL); } diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c index 60bade869b49..d8ab583d69fa 100644 --- a/sys/dev/hyperv/utilities/hv_kvp.c +++ b/sys/dev/hyperv/utilities/hv_kvp.c @@ -621,7 +621,7 @@ hv_kvp_process_request(void *context, int pending) } else { if (!sc->daemon_busy) { - hv_kvp_log_info("%s: issuing qury to daemon\n", __func__); + hv_kvp_log_info("%s: issuing query to daemon\n", __func__); mtx_lock(&sc->pending_mutex); sc->req_timed_out = false; sc->daemon_busy = true; From nobody Sat Nov 8 20:11:22 2025 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 4d3nBL72Smz6GVvG; Sat, 08 Nov 2025 20:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nBL31HZz49KJ; Sat, 08 Nov 2025 20:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=up4m7QXambkAPvjy2OGS/PaPKrUh/JCvlvpMQv5wY44=; b=OXj121VPQasCMFpnC2IRYd9HahxP+FvglJPm/2GrXYTK4NdzIpK2oaGhuBMGah7Euxoax6 exiuInQWr8HQsbwZhuK5jMu8KtL+e3jGiJK4gTN0CYgp4CY3KEUvUWqwlyD6gCA/JdnSNZ YxtyxgJrOgtL2rLSY0MLeOUkKKVVotwmdjgmegcRLR7vwHPJ9/2qPpQtY1aojHxzLE9ZyC YzXV+G77bbgMjsF48lM8/ghmMRskTaV94IRV/1Vep0CEvejFpFngF3gaGwznXeB4WNtjxE zEz/HYT92S4TWl+zxtazGHTnI4KHqie8KFoNPoaNOQTAezeYPeFvHVSBZ0xQTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=up4m7QXambkAPvjy2OGS/PaPKrUh/JCvlvpMQv5wY44=; b=IctuhjPF8Birj72qjZS15y7HcxTOnbgOuszsxIw4PjSJN6706Wo+a1ounTjEZ+bcqxUii4 rffD2DFj88sxCWne2jh73or8Mk+lHesw/OJiJXuGc67hkifQy+h+Xdo8QZ5m9uxfcy/37k xYTPFtF8yhXRs29UbHN6scP4wt+LMaag7LtBJkYDOYoUaY+/yTKybakMv6Paxo9TsdhZ7F h0LMUj5k2JjaydRC3Pbmsp1JyfOLSozwL9/9UXYiPMIj+kLYsn42hBpXR06Ews2+LXid0z iXn+Zb/BuPwE1bohXDKbueF33q2/tiRwqmSEWOwD/U3kJv7yYFvX69/lDEiobQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632682; a=rsa-sha256; cv=none; b=hw88J0+BMhQsQL6eIFRrdc3r5mSvc7nyDXHICnqIqiBAz+4jwjKxLRAiNLIBD2lQP6PJKp vjKqgrSEZYLFUExCuK8I6LHQu5Cjxqz2HGHVWYgWRAZovvNXLvgd6fnRD2VrjnponlNpMH 3cJHWK7q1zNyU6/dSanwfQ5A8j5bxV6wj+5RY6RR1MWZ3yCwiAD4YT88Un0yQVSshJ/rfE PwThvlY64UcAeaQ+NIdv1KyFxWU1cM+w5bjEB/uEs4ey9kWQwkJvQwQimPu44tpcdObEUw W/2hiJafziS0ViNlEWkJx+4L9A2wXReyG5CvGljzgXxN5FK1qCBUmOz0PRqgrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nBL2Xx1z10FL; Sat, 08 Nov 2025 20:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KBMr7003483; Sat, 8 Nov 2025 20:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KBMmG003480; Sat, 8 Nov 2025 20:11:22 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:11:22 GMT Message-Id: <202511082011.5A8KBMmG003480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 38b3f633036e - stable/15 - ocs_fc(4): Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 38b3f633036e69fe326b359eb8246853ac29af1f Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=38b3f633036e69fe326b359eb8246853ac29af1f commit 38b3f633036e69fe326b359eb8246853ac29af1f Author: Gordon Bergling AuthorDate: 2025-10-28 08:11:11 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:11:09 +0000 ocs_fc(4): Fix a couple of typos in kernel messages - s/unexpectd/unexpected/ - s/Unexected/Unexpected/ - s/niether/neither/ - s/sucessfully/successfully/ - s/Inavlid/Invalid/ - s/toplogy/topology/ (cherry picked from commit aa0cd9e5b4d21b11097e1c21a3c0eb23525c15c3) --- sys/dev/ocs_fc/ocs_device.c | 2 +- sys/dev/ocs_fc/ocs_els.c | 4 ++-- sys/dev/ocs_fc/ocs_gendump.c | 4 ++-- sys/dev/ocs_fc/ocs_ioctl.c | 2 +- sys/dev/ocs_fc/ocs_scsi.c | 2 +- sys/dev/ocs_fc/ocs_xport.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_device.c b/sys/dev/ocs_fc/ocs_device.c index 7f0c5526b1c3..d9c283541d3c 100644 --- a/sys/dev/ocs_fc/ocs_device.c +++ b/sys/dev/ocs_fc/ocs_device.c @@ -825,7 +825,7 @@ __ocs_d_init(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg) ocs_node_transition(node, __ocs_d_wait_topology_notify, NULL); break; default: - node_printf(node, "received PLOGI, with unexpectd topology %d\n", + node_printf(node, "received PLOGI, with unexpected topology %d\n", node->sport->topology); ocs_assert(FALSE, NULL); break; diff --git a/sys/dev/ocs_fc/ocs_els.c b/sys/dev/ocs_fc/ocs_els.c index c62f71d4eb4f..cf4f01477f69 100644 --- a/sys/dev/ocs_fc/ocs_els.c +++ b/sys/dev/ocs_fc/ocs_els.c @@ -314,7 +314,7 @@ _ocs_els_io_free(void *arg) ocs_list_remove(&node->els_io_pend_list, els); els->els_pend = 0; } else { - ocs_log_err(ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(ocs, "assertion failed: neither els->els_pend nor els->active set\n"); ocs_unlock(&node->active_ios_lock); return; } @@ -363,7 +363,7 @@ ocs_els_make_active(ocs_io_t *els) } else { /* must be retrying; make sure it's already active */ if (!els->els_active) { - ocs_log_err(node->ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(node->ocs, "assertion failed: neither els->els_pend nor els->active set\n"); } } ocs_unlock(&node->active_ios_lock); diff --git a/sys/dev/ocs_fc/ocs_gendump.c b/sys/dev/ocs_fc/ocs_gendump.c index 83155d90c3a3..6a1abfefadfc 100644 --- a/sys/dev/ocs_fc/ocs_gendump.c +++ b/sys/dev/ocs_fc/ocs_gendump.c @@ -153,7 +153,7 @@ ocs_gen_dump(ocs_t *ocs) ocs_log_test(ocs, "Failed to see dump after 30 secs\n"); rc = -1; } else { - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } /* now reset port */ @@ -219,7 +219,7 @@ ocs_fdb_dump(ocs_t *ocs) return -1; } - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } else { ocs_log_err(ocs, "dump request to hw failed\n"); diff --git a/sys/dev/ocs_fc/ocs_ioctl.c b/sys/dev/ocs_fc/ocs_ioctl.c index 71ba17d5f72a..d3cea434b2be 100644 --- a/sys/dev/ocs_fc/ocs_ioctl.c +++ b/sys/dev/ocs_fc/ocs_ioctl.c @@ -796,7 +796,7 @@ ocs_sys_fwupgrade(SYSCTL_HANDLER_ARGS) break; default: ocs_log_warn(ocs, - "Unexected value change_status: %d\n", + "Unexpected value change_status: %d\n", fw_change_status); break; } diff --git a/sys/dev/ocs_fc/ocs_scsi.c b/sys/dev/ocs_fc/ocs_scsi.c index af9fc798b01c..1bbf60b9014b 100644 --- a/sys/dev/ocs_fc/ocs_scsi.c +++ b/sys/dev/ocs_fc/ocs_scsi.c @@ -720,7 +720,7 @@ ocs_scsi_build_sgls(ocs_hw_t *hw, ocs_hw_io_t *hio, ocs_hw_dif_info_t *hw_dif, o case OCS_HW_DIF_BK_SIZE_520: blocksize = 520; break; case OCS_HW_DIF_BK_SIZE_4104: blocksize = 4104; break; default: - ocs_log_test(hw->os, "Inavlid hw_dif blocksize %d\n", hw_dif->blk_size); + ocs_log_test(hw->os, "Invalid hw_dif blocksize %d\n", hw_dif->blk_size); return -1; } for (i = 0; i < sgl_count; i++) { diff --git a/sys/dev/ocs_fc/ocs_xport.c b/sys/dev/ocs_fc/ocs_xport.c index d997ea245132..9e69bf0ed98f 100644 --- a/sys/dev/ocs_fc/ocs_xport.c +++ b/sys/dev/ocs_fc/ocs_xport.c @@ -482,12 +482,12 @@ ocs_xport_initialize(ocs_xport_t *xport) /* Setup persistent topology based on topology mod-param value */ rc = ocs_topology_setup(ocs); if (rc) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } if (ocs_hw_set(&ocs->hw, OCS_HW_TOPOLOGY, ocs->topology) != OCS_HW_RTN_SUCCESS) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } ocs_hw_set(&ocs->hw, OCS_HW_RQ_DEFAULT_BUFFER_SIZE, OCS_FC_RQ_SIZE_DEFAULT); From nobody Sat Nov 8 20:11:54 2025 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 4d3nBy70X7z6GW1Z; Sat, 08 Nov 2025 20:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nBy6LM1z49VH; Sat, 08 Nov 2025 20:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CLvFhinpR/4Ut34sPvjMsjlF1hUvnUZsCk5CfYOA1Xk=; b=qtlUBwF/zi0INVbeKiX97TH3iJ47is8Eq3kPlf02zUyNLcBkVNBZ9/B+152ThcxkQ4yHUw 38qV8CINx421oX7u7Bwg9ACxfpr1ss/ZUx1dYLH2ORTF0FeIjqT0Rj26/iFA8eQT3yvvgV xEEqPbk1FhKUbJvuq8i8w6YrmbrSQoOOfMwSa0asEmrww3yipQt2zBWOX0ATV/JTppZUUx hm2x/+F3zTFh1EU9q+65b0vgESPoaZHpEFOhJBVpM2/gOIIaUFs87tMSkxD4vULcaxn7wH ci8eyuord1Qen4oymdPaahZ+yHbXiBHgloweqSca4VU6nFn5FMTz8pLpLs/iXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CLvFhinpR/4Ut34sPvjMsjlF1hUvnUZsCk5CfYOA1Xk=; b=wh+STCUWqPnbN/GojqELYbkTL5H7bDUJQR3RyeBWYxfPLcQ0FIo9VexAlWOaiGe4VZsOK+ PjPABblqD+lGNumriN2LvJG6JqVmiNSv4TqZIpFaOQFzEyS3VC2XBAdeBJ3C9sZ9pdR0Lk saRpUIwZkfpY+vRPzqv7N+xKlpXX6bYV88BK9+zx+fEFz0uZife4tQOmP8N57wwH9USHQ2 2q9WOm/jiKLWSWJ276tHDj1/d+hfm86oxENZVjWag7kqjNaFYg9M18L5oihUZd5uj7YR93 RWXIunRBh/TxnkWCkx1pCV8pRWltZUYQaUjD4EDapNi2hQoWTLXoX8LPx1/P6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632714; a=rsa-sha256; cv=none; b=NT8foUtAyPyhKER/FH8d9cq4xYSyXewD95W4DrQkUrZmhrRJ7ZbQb6DHzZ6vRK4U0FEWNn vRhePSiuTO8zOrkk0Sdh7stTjmQCIUsHJqsMouSCOs/F2f2Q1jepElS02/AyEqzGMLu+1k Pgt3vSY0pzf386gM44T2wxn7VBbwhoHb/F3iimLXfXV89zmkG5CNLDfSvZS56H4hN1mM1j e9vtJhB9DWSFH/BiSWyfcEUhfwcWFr0JTItYmJYcDAY0AeZEWmbVQhRMRqduFIbIkVNPFN 8ueASoUv5MH0kihMOFTk6Ss7Mjrj7gVQuFv+LQILdnNn4acNVUyv4Xrk+tENOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nBy5vx5z119k; Sat, 08 Nov 2025 20:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KBsg1004709; Sat, 8 Nov 2025 20:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KBsqm004706; Sat, 8 Nov 2025 20:11:54 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:11:54 GMT Message-Id: <202511082011.5A8KBsqm004706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bf20456cc379 - stable/15 - virtio(4): Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: bf20456cc379b4bc0fd59f485a908cd01822967b Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bf20456cc379b4bc0fd59f485a908cd01822967b commit bf20456cc379b4bc0fd59f485a908cd01822967b Author: Gordon Bergling AuthorDate: 2025-10-28 08:14:43 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:11:42 +0000 virtio(4): Fix a couple of typos in kernel messages - s/reponse/response/ - s/Cannnot/Cannot/ (cherry picked from commit e9058e1444d8e5831a237934ca2316e22fc55f36) --- sys/dev/virtio/gpu/virtio_gpu.c | 10 +++++----- sys/dev/virtio/scmi/virtio_scmi.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c index 6f786a450900..668eb170304a 100644 --- a/sys/dev/virtio/gpu/virtio_gpu.c +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -547,7 +547,7 @@ vtgpu_create_2d(struct vtgpu_softc *sc) return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } @@ -586,7 +586,7 @@ vtgpu_attach_backing(struct vtgpu_softc *sc) return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } @@ -624,7 +624,7 @@ vtgpu_set_scanout(struct vtgpu_softc *sc, uint32_t x, uint32_t y, return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } @@ -663,7 +663,7 @@ vtgpu_transfer_to_host_2d(struct vtgpu_softc *sc, uint32_t x, uint32_t y, return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } @@ -700,7 +700,7 @@ vtgpu_resource_flush(struct vtgpu_softc *sc, uint32_t x, uint32_t y, return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } diff --git a/sys/dev/virtio/scmi/virtio_scmi.c b/sys/dev/virtio/scmi/virtio_scmi.c index f5427756e971..436711dc0ae2 100644 --- a/sys/dev/virtio/scmi/virtio_scmi.c +++ b/sys/dev/virtio/scmi/virtio_scmi.c @@ -386,7 +386,7 @@ virtio_scmi_pdu_get(struct vtscmi_queue *q, void *buf, unsigned int tx_len, mtx_unlock_spin(&q->p_mtx); if (pdu == NULL) { - device_printf(q->dev, "Cannnot allocate PDU.\n"); + device_printf(q->dev, "Cannot allocate PDU.\n"); return (NULL); } From nobody Sat Nov 8 20:12:31 2025 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 4d3nCh5sk2z6GWNY; Sat, 08 Nov 2025 20:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nCh31d8z4BrC; Sat, 08 Nov 2025 20:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyGp+97isg2VhN0NurxarDM5h4dUrjEBzA+nGBd/Iwk=; b=k4wVgvPUeDzWpKF1VOxSFUI45rF6cajp710hnsOyJ6BTyMt+aBBI2KVBCHHLtlTx0+F6RO 6Rrq+OS3uNaZ9NqmoCwE5BFAOc4VBIKiDOrgtyP0L5iaDSGZBqWRHM3x/PxHskephmCjcW t/CTUAKb7lMpxqj4rTx31j1udAKEOMm4qO6LghlZ8pZXXM1hiqfF00Z39Qf3pOcnEe3Vm8 9QEii4LTDm2/uEV61aL2t3N9g+Ry+fKlalUG2oLioZQhb7x46v+zf0zyggY81Qun6X8Mz0 sty+zJjgfJlabe0E2ZCyH7j9LBJ1qJOIBbxB1k4PYjWEvn7DdlbvP53/XoYpIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyGp+97isg2VhN0NurxarDM5h4dUrjEBzA+nGBd/Iwk=; b=ZwWWAXdSc2r2X+7wOix0ydhYqm/Xh24Cf5Rtppky/38ld3uAkM5EO5wShXAN8LbD1nipYh jtK1NoHKIfQVQdMw8q3R4+adg7gq5waFdOrDLhooPjp378g0m4L/Ks74CiROCVfbv0k6VM HQIHmphi+wHJNTdceg0s26KF1lRt9SOqSX50kYAFxSDp2a9oknokd9XVNB8MlTSyegdNZJ 7VtpIzsaoMPaHPT/p75CbcMIyCiQvPcuX9B1uM74xiIUiv8ZZrMhGQrag1zLW6+3mwJD+q H9pYXLWCg2mJFRakZlB35euCnYCEV1ABchQiC9NTriNSv3TJJoKBXBTPo4HZmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632752; a=rsa-sha256; cv=none; b=VkNvP51am3JfqQdfEzAcGzwWmAgLS6tulrgAWhW57Wj5UhwGtEF1I+CypXs2UWnP77tjuo xfldCMYeMpVSf2cLexKGQi4kxzVTGZ6uYScAXsmniVCODRcBS6bzMtHWmcZubuBoB8Kiir Y65XNeWIlna6QZVL+sARTg68K/T217xaQ1xz8v+pHsggmFIhzbw1yew4946o7nwfIT9Oao Dim/PoYaL1YsTk6dz3Gdz9713SlRX6nQT/NI6n7shMcLvbgv9peTeSzcIeArlKQLh9bEPs eFswsKbGwVBn45iRzmEQZZ0Odsf5ZYd2YnOE21PxRVRbRmnzqju0YVyD+cWlTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nCh0gpYz10hQ; Sat, 08 Nov 2025 20:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KCVg0008639; Sat, 8 Nov 2025 20:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KCVU4008636; Sat, 8 Nov 2025 20:12:31 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:12:31 GMT Message-Id: <202511082012.5A8KCVU4008636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fae53664dbbc - stable/15 - arm/mv: Fix typo in a kernel error 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 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: fae53664dbbc170bde337747393cb7a002e70ffc Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fae53664dbbc170bde337747393cb7a002e70ffc commit fae53664dbbc170bde337747393cb7a002e70ffc Author: Gordon Bergling AuthorDate: 2025-10-29 15:12:52 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:12:20 +0000 arm/mv: Fix typo in a kernel error message - s/Unkown/Unknown/ (cherry picked from commit b074d146969d3097c1e144623360b36083d74927) --- sys/arm/mv/mv_cp110_icu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c index 25ec19bee575..d30f337f56fc 100644 --- a/sys/arm/mv/mv_cp110_icu.c +++ b/sys/arm/mv/mv_cp110_icu.c @@ -257,7 +257,7 @@ mv_cp110_icu_init(struct mv_cp110_icu_softc *sc, uint64_t addr) WR4(sc, ICU_SETSPI_SEI_AH, (addr >> 32) & UINT32_MAX); break; default: - panic("Unkown ICU type."); + panic("Unknown ICU type."); } sc->initialized = true; From nobody Sat Nov 8 20:13:08 2025 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 4d3nDP1DZjz6GWcL; Sat, 08 Nov 2025 20:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nDN44NBz4DDQ; Sat, 08 Nov 2025 20:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jGRkKO03dbCcOqiLJcEIDJJgHq8JQ18CJgwQXyeHrKs=; b=oFJxYCyyNZGkEmG8zYFYhIZR58JC408ykr5mtU8KHHAwhSom6Ycx4bk7YoWFGzoG42h/ro ss9YmVNu7zb3W2cc8HdX+nkbq7/acCjkQ+9pURMpmVDQxNFXxTwPgphngBWMDGjltDk6lq z005+QBaQRaQcT8P/9xLwBQfD5fbZtBQHvoYOyfSV3a0pcn4PwbUS73dIkNGJsMgBH8kYJ VLB2RFTDZ6zPPbUgs5m7MVR6VyHE/UGN6ZENzjNSh1uBS9O8lPjlyFI2XxM5UIUvOEa9EX OpqZwr1bsawHghuQl478oJ796Vj7slvkFvfcTPzUtMiAPv4/x/sUepzyYcynaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jGRkKO03dbCcOqiLJcEIDJJgHq8JQ18CJgwQXyeHrKs=; b=xroMlHsu1zOujHt9H6vCSnPxGwdyxcR79Hr+svvBTvsWbU6p+AynH27w7nQBEAf5eIX5lp 5FZL2/lW1vR+tINX1JZ5DXjAZI7EwZezKyfN31vtz8z9IJA6Pn0WuJ8XUQgEaBvpgbnbjh roP3Mkggy7cUtLN8p6sC/84Qr94KzWAyhvVZD7DxTVe6KGm7m+8HQbw+5wJLSAI2xpuKSl iuoSB0przIL7BvfklHzjQUwHeAqU1rT9qofe9ix64wWoYXkZJbeqTpvtAW8+oTPSsVAyiy WjEn2sbajVNxrplQJgnSH2NE1oUqC81gQ0VmIeZOmR8JKuZ50VKM/qWfwXQVyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632788; a=rsa-sha256; cv=none; b=qV7lbYZT7CGPDIKKWs4DiPLQuhiHL4jMX9JyCtVHLmNPaMkzbqylTCuNyNTAMEetw52yop RfatpDlLTof1Y/Llm2dIdNHBk6CiLPfd7g1gg+DGl+ZUcmVb+bPy8LbFuI+C5RnHrmSSf4 Qi9eJs13EuYNV1V66Xw12YVMYuNG49ts0fpETsNwm+4aKZWTOJfHBK/Nur9km94D0OfB6A yuLGXTjO4sLIlH4zACrBF8gUeM8lcCNmSeb5FRu7wZ2N6BLtUfecV28Nkdml57p4AH68rN Hi5JXTaFoPixNIxACYL0eB39sztH5IW/BFqqzrAw4D5VZI1mzucwQSowRmfZIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nDN3XYHz119x; Sat, 08 Nov 2025 20:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KD8LZ008953; Sat, 8 Nov 2025 20:13:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KD8QK008950; Sat, 8 Nov 2025 20:13:08 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:13:08 GMT Message-Id: <202511082013.5A8KD8QK008950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: afb9a1f8ceb3 - stable/15 - audit(4): Fix a typo in an kernel error 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 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: afb9a1f8ceb364748b238fe9c243f2026a3011da Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=afb9a1f8ceb364748b238fe9c243f2026a3011da commit afb9a1f8ceb364748b238fe9c243f2026a3011da Author: Gordon Bergling AuthorDate: 2025-10-29 15:05:43 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:12:56 +0000 audit(4): Fix a typo in an kernel error message - s/Authenticateion/Authentication/ (cherry picked from commit 63af953e09ccd11f2f5b4d83b10cc231f691de46) --- sys/security/audit/bsm_errno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/security/audit/bsm_errno.c b/sys/security/audit/bsm_errno.c index 6bc110cf0237..1f3b12735b84 100644 --- a/sys/security/audit/bsm_errno.c +++ b/sys/security/audit/bsm_errno.c @@ -514,7 +514,7 @@ static const struct bsm_errno bsm_errnos[] = { #else ERRNO_NO_LOCAL_MAPPING, #endif - ES("Authenticateion error") }, + ES("Authentication error") }, { BSM_ERRNO_ENEEDAUTH, #ifdef ENEEDAUTH ENEEDAUTH, From nobody Sat Nov 8 20:13:36 2025 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 4d3nDw61Zjz6GWZ2; Sat, 08 Nov 2025 20:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nDw5RDHz4DPc; Sat, 08 Nov 2025 20:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xm6Zuqi8HqqxYQWhDeEfGjsD+m9CZetOj+zS+Vn4W/w=; b=DJfJxAsvZzks4xPG7JWKV42ByAY9lfeka5zNw6rjhGBpYZ2YcMZpiqyabjANt+MMYOqFY1 udXFMDw1IS7A++Z+oztTtgUZwqgGAIYt+/BPikv8imdow3DMM7uO1TL4jlKraHpbW9ggLM zWnrQ1RtxWu1mHJFm3vYnA6AkBuNGOX49Gi8vcbiSsGDZzIDx6HFm/kCJZdRQENvRXxvwU oiJyJnMndb05rGCJr4vZB6ubFxRojvSNGE0tqfYujtl1gR70+SAbkv/8R+/9p1mN5O9aU4 aW1V7J48SVUlQkYiCsedG6HuY89OA9kuWOTtb6R9GoRS/U3UWkxoA+eT5dQF8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xm6Zuqi8HqqxYQWhDeEfGjsD+m9CZetOj+zS+Vn4W/w=; b=HVDeZCX6ViCnwhEDhcM98+u/UEi4TlPvP6H0BijSD+TqFYFiFjRk6gioGKpGHuL0OHw432 ZX9Fs0vaOgUJn71olMwvqpP7YJBUvGV63RGJihIvTokvu9p8OxaxHL0RVtsSz7P4M+ZnhY PMtmObiXd6aS5N7JgsdGE5TKbMFOdMsEzMvRCwe+Sw7kbpwYC31wMW/F3GgkZdLuLOCFMl tJrLbpW3EzQCPbVoFEjRgGZehYuCgIqc8abGx9sJ9QPBVmcCLZj+3Mriel6pYZ1KF8MWH2 S3wvjnEMFrEwDOPHBs45TeIoWwh7vD2ESZ9cSJ4VhEEXS/62EgKDL1sRLDCAaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632816; a=rsa-sha256; cv=none; b=Kw/zZeBipmZ+OIBtfjeVCHRx49ftZAX7x9NcJiGtwLb2O1DBFnifDRhrg3/thTwJxPXFL2 uDEdBqxD/uPULXbkQwSoU9Acyu3kgJXzjVWUdby/3dqxwEvLC5Rkye6CHfKpAfwDVdsw/z NryJCtFsBaIVMu/a4qYqu3r4mc09w2fIYnUBrcrD/e0WBfu/WNc5ZzH9DKJyBclomxBdVS YjifC9GfWb1DAbdgaZaXFUwLcGhZZqWTj6AgdKfuLg4kuKEpKAlI0P830NHywDz1Rh5ymF 3yUq2r5XwWVW26w40w0eLiDKu/tu6YoaTyOvfTtCWO9Nh/rofffycm9a7jp1Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nDw50jmz10yK; Sat, 08 Nov 2025 20:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KDarc009186; Sat, 8 Nov 2025 20:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KDaYw009183; Sat, 8 Nov 2025 20:13:36 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:13:36 GMT Message-Id: <202511082013.5A8KDaYw009183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7e6e3e6f9be4 - stable/15 - acpi(4): Fix typo in a panic 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 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: 7e6e3e6f9be4e3644f14ae5d62417187e364a916 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7e6e3e6f9be4e3644f14ae5d62417187e364a916 commit 7e6e3e6f9be4e3644f14ae5d62417187e364a916 Author: Gordon Bergling AuthorDate: 2025-10-29 15:17:32 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:13:25 +0000 acpi(4): Fix typo in a panic message - s/depenedent/dependent/ (cherry picked from commit f51fb91d616d49e91f3c2c706263a38b98176911) --- sys/dev/acpica/acpi_pcib_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 3913ec612f79..2fadd6cd32ee 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -179,7 +179,7 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) switch (res->Type) { case ACPI_RESOURCE_TYPE_START_DEPENDENT: case ACPI_RESOURCE_TYPE_END_DEPENDENT: - panic("host bridge has depenedent resources"); + panic("host bridge has dependent resources"); case ACPI_RESOURCE_TYPE_ADDRESS16: case ACPI_RESOURCE_TYPE_ADDRESS32: case ACPI_RESOURCE_TYPE_ADDRESS64: From nobody Sat Nov 8 20:14:05 2025 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 4d3nFV21hYz6GWWW; Sat, 08 Nov 2025 20:14: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nFV0wS0z4Dt4; Sat, 08 Nov 2025 20:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0rLQOUwPQJeJ6LcpRa5kOAyRaYAo9FdCcFtrL9CWGQ=; b=U4HiagMuu54GEMJf84q1xx5ZzT9n5w8ZrKhLHXRgDaY/ssxu+qdXpm00Js9eT4KEYn5nWo 5r/vX9oFzuRpm0OLkwVHgnTwmRM1FYqizFLT+lBBzMjQEYZlh9UMlLgF9d29jW7/fp5fx9 LNIwdvEp5dzbhpHATAOG/Cs9YDG6yOzvpoS+DS6dESqFZS2iYp7q9d3l/86eQERr7eQPkw OCje/nz+dDkFtqDklzcwOWJ3yQJyWzGpT2BkB/UON0dSIA683dqCh/w1ivzxG+uhMfNTpx J6Nh9HO/sTuMUIyJtx/OqIC7PhFaN05a5iNssXTWWBIhEWmqlSBsiwWVjRU8Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0rLQOUwPQJeJ6LcpRa5kOAyRaYAo9FdCcFtrL9CWGQ=; b=Twfw81+DgZ8T+ooE1GaBOprLZpuonsOoa+dXxViaClk9rFpayYp9OiGEirEyPR1F9Q2VPO gMRNGRxxmeVbKi1O3yjLfbL2JNWPWkauYXjCZx8dZ3ecQ2weYxrt6k1HojUI8SKzU8H/H+ A1+Ups8FfHaVeCurcSMDwpHFkqiQt2IN2Llzx72b7jLztgS8P5lBvLeo2BUJtWEVLvKeq/ DUYMeaDa5Z+TRRy8b87SmF8v87IBuAUIHXsscL0uapTVOFx5lDItCYwrgtzqX088LP0zxE tfu4vNdxRc7e+LBUeiQjbgo33dMZh5QoBAj0iVNtKVcD+uo4H5d6Unu/ei97fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632846; a=rsa-sha256; cv=none; b=TGux5Qd/FWcRCLeag82JAbvd4/MzpAXzMl1z78z75P4cKuPY0i4UdpgjAGkYI/xH/wcAO2 CUct7AECCpt5zev3Fhx6nBWKqpxbKRXBbbw1sPinDBxzrjklvB1TfVxP4VmerGgv0m/jam ePDWaQ62tvnc8l+LB9pLzLZ83vKmvPX6sFJAshH7OVnpJFNjJ3klqoRrUYKqa5IFqCi4bZ Rx7Abrdd554mxhArUAZ3O+JhdAqY1svEqVuF7bjJRZv9sDVm12mw7jZtEmBYUI7QAA8aag LdeJnHJ2hBWtRenJMGUCyMS/mSXL9Ztv1KxxQitKe/h8fWP0wLl5lPA5UrJA1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nFV0NBYz10hR; Sat, 08 Nov 2025 20:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KE5Am009468; Sat, 8 Nov 2025 20:14:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KE5Ai009465; Sat, 8 Nov 2025 20:14:05 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:14:05 GMT Message-Id: <202511082014.5A8KE5Ai009465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f6a74b49b188 - stable/15 - tegra210: Fix typo in a kernel 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 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: f6a74b49b188e568f5869074bbf47787fd7ae5bf Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f6a74b49b188e568f5869074bbf47787fd7ae5bf commit f6a74b49b188e568f5869074bbf47787fd7ae5bf Author: Gordon Bergling AuthorDate: 2025-10-29 15:16:41 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:13:53 +0000 tegra210: Fix typo in a kernel message - s/volatge/voltage/ (cherry picked from commit 6a02851a0e346cbff074dab87807c9ee9d1e8d94) --- sys/arm64/nvidia/tegra210/max77620_regulators.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/nvidia/tegra210/max77620_regulators.c b/sys/arm64/nvidia/tegra210/max77620_regulators.c index af1a5af20ec3..d52aeaef1287 100644 --- a/sys/arm64/nvidia/tegra210/max77620_regulators.c +++ b/sys/arm64/nvidia/tegra210/max77620_regulators.c @@ -364,7 +364,7 @@ max77620_get_sel(struct max77620_reg_sc *sc, uint8_t *sel) rv = RD1(sc->base_sc, sc->def->volt_reg, sel); if (rv != 0) { - printf("%s: cannot read volatge selector: %d\n", + printf("%s: cannot read voltage selector: %d\n", regnode_get_name(sc->regnode), rv); return (rv); } @@ -384,7 +384,7 @@ max77620_set_sel(struct max77620_reg_sc *sc, uint8_t sel) rv = RM1(sc->base_sc, sc->def->volt_reg, sc->def->volt_vsel_mask, sel); if (rv != 0) { - printf("%s: cannot set volatge selector: %d\n", + printf("%s: cannot set voltage selector: %d\n", regnode_get_name(sc->regnode), rv); return (rv); } From nobody Sat Nov 8 20:14:34 2025 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 4d3nG24jLTz6GWWZ; Sat, 08 Nov 2025 20:14: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nG242TDz4F9T; Sat, 08 Nov 2025 20:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3NbEwOIC3wMDdMhxkNeLNFX0DoBtMREGFloaMbJ+cg4=; b=D7e3QXUvmPXCbshSDLApJ/RL+fjh76FbPUVYIZ8lM+acBUsthH0nUJjP7+6Ltp5yn+IYX0 iuOnOjYxyZUtB/saExD6/dlrFCsTgHTPO7tHiYJFiqWzOwYS/dYjTFK/+AniC+SrWzZ5tr +/2axkI0GRr1+DLBmCIg77RE3+uJO30/52oTmeaSRiXJCQZGHKt2krfO57Y8UgoGMZeqFM DCA171zHehUZIq+MCzMrBsOzcmp412TTkfC9diLuhLdAI40jLjgZIiqow8KSCrsphzbeCx agRP3lrtm7GmnnzEy8KGXZtZQsa3JemBstAJ/W7kHuHcTrUJmN2xe97D6bgPGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3NbEwOIC3wMDdMhxkNeLNFX0DoBtMREGFloaMbJ+cg4=; b=J26CyVXniXIdQs+OG7zwpSqYTnjjR2l+FyWI3GEA8B9MO6Bc1BUzlMrRhA+W2Oo8TLerey kxpTg8Y7rH/b8qGto5BQwoeMpAPovcJDoPRIsMO7HdPTHkG9wjgMMatZN8lAt8+uOgjE9e RXo2atdS0P6IpM1ZFwKM2NzEOxoqN37eDJ878/rsyxnfYpR7XPtG8rsfm0G+U51rY8I63W Rspaq9KLhwkfn2hrbnFrT8/aWSZXnqx7X0pCuPCLJj9ZftOd6bCBSg0yu6YxCKSr8m5MCC Q9GHNCd+O+dNMccLXjRI+t3IFai/IMDhIzs55nQhgx1iq0I2dWfoZUqX/88G1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632874; a=rsa-sha256; cv=none; b=Z4kcIdELxdkFaLMX0qEpx2JDQaATaBhFiQFRjgykqHH5YfW4tVWDRhUAW5aAa/DeU+1dSI vEJd4dGvtt2kAjL2cL8rFdEseT5eugzcaopC0pYt7+ZQ+oyBmi2F7RqoVox2zb1CyHB+8t dm12wVB0LQKL8KXDu2M0HsST5dkQxmTLJ7kp4BiCyvAL7qpwWr0avcMwi7d9+0M5VAuSCL Mqtm+2QW/7XxtsB9QEThMtJ9lgHgiKSRXDMVwJE13ZkDMWeIlqimtSNFTt5gU7DXkQOU9y vB4KlxuqfN/i6wdXuoIpKZqepf97SSPHb/iPBmKD7VxkJaNScgjehXiY0p9U8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nG23NR1z10w5; Sat, 08 Nov 2025 20:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KEYnX009696; Sat, 8 Nov 2025 20:14:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KEY0i009693; Sat, 8 Nov 2025 20:14:34 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:14:34 GMT Message-Id: <202511082014.5A8KEY0i009693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e4cbe5ae49c0 - stable/15 - ale(4): Fix typo in a kernel 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 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: e4cbe5ae49c0a9f4ca8908d9015d7922723c7347 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e4cbe5ae49c0a9f4ca8908d9015d7922723c7347 commit e4cbe5ae49c0a9f4ca8908d9015d7922723c7347 Author: Gordon Bergling AuthorDate: 2025-10-29 15:18:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:14:20 +0000 ale(4): Fix typo in a kernel message - s/sequnce/sequence/ (cherry picked from commit a675f3bb63774a63f668749c6c3c8dfbb6be1cd6) --- sys/dev/ale/if_ale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index fa2306f1525e..09e0820d2c74 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -813,7 +813,7 @@ ale_sysctl_node(struct ale_softc *sc) /* Misc statistics. */ ALE_SYSCTL_STAT_ADD32(ctx, child, "reset_brk_seq", &stats->reset_brk_seq, - "Controller resets due to broken Rx sequnce number"); + "Controller resets due to broken Rx sequence number"); tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "ATE statistics"); From nobody Sat Nov 8 20:15:01 2025 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 4d3nGZ2b46z6GWQv; Sat, 08 Nov 2025 20:15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nGZ0Cvwz4FQ6; Sat, 08 Nov 2025 20:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gP4r4qTJREe40Y4yPwMGGetQuj98N547GEUjh3WMw54=; b=H4g9883m1KpmALUSW8MyhZENeaNio+sKhhDJbvXO9yUCslVhdRv/aCm3uQs303MUUB0ZeI 7xjDmN3kg3Vm7ilj+qRa78XZEhnZZVb+22vwSInmHopFHwPPi/Up4Wi/fzrysIZFoqXRMd zFas9FQVZd6K1VFtwtEpAHmqwW8r+i6emALV2PqEZEZvHxyK8kC7vI48KEvlJemQZWJgiH G0+FaJp+JCmLTy2cZMDZswA54OxZB1LsK2DSivd2LNJlzEfz2A/hP1jSa9JjSBdyHhhkP1 jMldPVZpMsLpiqaZFVGmchE7XMVZ7DY/mPexIsOG/Ms76OcxsZMSbscKdbtkUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gP4r4qTJREe40Y4yPwMGGetQuj98N547GEUjh3WMw54=; b=FW83r7jQx4dEOoZxYQ7VPSQ5TAMqyGLqJJo730dhV6/EY8FDavBN82S/KFNPvmmodGYFZS LuU0PeJCOomBep9CHkwtuD8kLQQT+ceCshZISvQuvH7HJCLlhIMQdRxW/J9KDqC+eHcKDh KOg9G784sgO972OHJGtTmsYs3OfFjQHLqoOLjLdzukIL7rwrkD8mYHEkSsb7nWNRfEnvie rA4W72Mmump4yi+BR5oxS/mB0nzwUDk7ZY4brSYWUnMxm/Pj7OZIoMRivFTz6ZW4EWa9UA oFid4zyzc/Goh88ZaCk057romi3T19cfbo7MPyhvHZ5oDOLj4yEo341gG/ji/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632902; a=rsa-sha256; cv=none; b=grlMo82kkKYCYZA9oABD1yRsQzW+3uRc0lU8YUNxj+FuSBtwruVwuG/aP5yHzX4HqU3ICc 7Pqc50JTy82ETcuxfr1e0MYZ91FCzLGO+FtX7tItnwgUE8hFI5jb8Aa4x71zw2A3A07ONF C3uc247stnqXfJNvd3f0LMBOHHhNI4828TkRTsvCZon/PuKndzVvFBYiY7hS/jXQgiQxf/ 4Nt4gqSYLiE9JBf4tjlmmrPGTp6ZFeQItona9/4g7h1OaA1R86i+AojiQpSD6eirWibRiY VOhbKzNmwblSPVvQPuQlAjKLX/UIZLy8r36iURikodwil1Tj8EhEQd9WFQ0ahA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nGY4lVHz10yL; Sat, 08 Nov 2025 20:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KF1EC009971; Sat, 8 Nov 2025 20:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KF17X009968; Sat, 8 Nov 2025 20:15:01 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:15:01 GMT Message-Id: <202511082015.5A8KF17X009968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7751fc7bc733 - stable/15 - usb(4): Fix typos in upgt(4) and zyd(4) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 7751fc7bc733dc2776b0ab0a54f0d96429c8d387 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7751fc7bc733dc2776b0ab0a54f0d96429c8d387 commit 7751fc7bc733dc2776b0ab0a54f0d96429c8d387 Author: Gordon Bergling AuthorDate: 2025-10-29 15:08:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:14:49 +0000 usb(4): Fix typos in upgt(4) and zyd(4) - s/frequence/frequency/ - s/finsihed/finished/ (cherry picked from commit 679976d8162004f879a1a0d5ca0c5d2ade5fa1bd) --- sys/dev/usb/wlan/if_upgt.c | 6 +++--- sys/dev/usb/wlan/if_zyd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index 642631ae34b7..cf87d4ed09ed 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -1172,7 +1172,7 @@ upgt_eeprom_parse_freq3(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq3[channel] = freq3[i]; - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(sc->sc_eeprom_freq3[channel].freq), channel); } } @@ -1214,7 +1214,7 @@ upgt_eeprom_parse_freq4(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq4[channel][j].pad = 0; } - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(freq4_1[i].freq), channel); } } @@ -1242,7 +1242,7 @@ upgt_eeprom_parse_freq6(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq6[channel] = freq6[i]; - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(sc->sc_eeprom_freq6[channel].freq), channel); } } diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 1a698caef3c5..8c5d6f370260 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -825,7 +825,7 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen, if (error) device_printf(sc->sc_dev, "command timeout\n"); STAILQ_REMOVE(&sc->sc_rqh, &rq, zyd_rq, rq); - DPRINTF(sc, ZYD_DEBUG_CMD, "finsihed cmd %p, error = %d \n", + DPRINTF(sc, ZYD_DEBUG_CMD, "finished cmd %p, error = %d \n", &rq, error); return (error); From nobody Sat Nov 8 20:15:34 2025 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 4d3nHB5MZrz6GWR3; Sat, 08 Nov 2025 20:15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nHB4l92z4FV6; Sat, 08 Nov 2025 20:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sj+AWxAIWEbcwR2+//DrUA+Z3REzPz5pbzcr6DvJ3Eo=; b=ERGG/E/MxvNfpNAh8+m5JIPDsHJgbNbuVJXd+LJvU2a4Cvd9Gt3+FU2d2o+T5BTSbrUYw5 YkNEpEnPhsT6Zu6xIICAIsVyFUbe1sY/NfN8yVOSGqFMAq2vwj6LWGbvyLHoWKGPRdZ0OJ 6sxL9TcrUWLojcA6+0yC8BQ7F0u3UJ8SQ8PyEQFXCXclo3Dk3CpjDZNhsoQsA3dopp7691 5Norm+jkIxbW+Rga7/T9Y74ELLxjf1kWaDM4gPa8NfwpuBf7gRMk46CZ30tn608pE3rJH9 ISB5fw9oxxAZPsp3L/kOJDFsHHIqIm8dHjZKwIguYFAOBCPy2bcCso5Fs7c52g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sj+AWxAIWEbcwR2+//DrUA+Z3REzPz5pbzcr6DvJ3Eo=; b=ipfXBncd5TshicW7cT4JuD99urtUAHXRON9ZgkDN26nkFGpWdjELhADz7l3+lY+LTMtyOY W7AlhslTNNGTpAAWhOMNWeQFNU2K20gwsH6tRG2UVW1Fn3+hdxW5yny7VhSlseE1IUKxk6 /9UT6pzXeqBPkgHGAj0F9eNacMaQdyoaZipAd1KB19iRiAInbqQco5FHQ7wPInEL0kvIOM TujnkIAzmNka444zZmD2dL2LLpwdNBn0tJgiEq858ne4K1dLzV9WuRdh5DxeIj+qWZfME0 h9X2jUdGTNwQwy95DlIVVKp0uXY3CD5ADAETTd+BztM9DRP4LisoltnsLkz/Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632934; a=rsa-sha256; cv=none; b=p1/6EiSqP0c+ZqGeKpfR32OwRK025ETDiSIanfLBYJ9JafcWVf02FneSj471OIzjXttZKJ hOXYrU68aiqZx1qmlLRIuJDZeyxDzjQsKR2te7m1OsUghiwQakw64RcZWg2ewFVb+384kk CYMLqPzrBM3zQYgs9Tyi/QcXjKO+QOYUNsqUE1ustX9nySTLU/KCyEV8J8CEETm9WsCar0 dpR7puQ65U2iWlh7HsUWtZKxp0xriKQhn8AjKUHIxX3Fy+tgoYobBWYH15eOw94xyP2CXO 59/r4dbqAl6LNn62FnFhpbwYWJADo3V8yo5VkoJH3vhB/+McWnieHbDv/ygAWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nHB4JzTz119y; Sat, 08 Nov 2025 20:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KFYsM010234; Sat, 8 Nov 2025 20:15:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KFYg4010231; Sat, 8 Nov 2025 20:15:34 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:15:34 GMT Message-Id: <202511082015.5A8KFYg4010231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ebcc90abcada - stable/15 - geom(4): Fix typo in a kernel 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 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: ebcc90abcadaf1779032c4c6a027d487ee0eeefa Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ebcc90abcadaf1779032c4c6a027d487ee0eeefa commit ebcc90abcadaf1779032c4c6a027d487ee0eeefa Author: Gordon Bergling AuthorDate: 2025-10-29 15:10:09 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:15:23 +0000 geom(4): Fix typo in a kernel message - s/supressing/suppressing/ (cherry picked from commit 57b78a557b3ce07b1589c9c21debe97d45599391) --- sys/geom/geom_vfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c index d9e9a6c82da1..9b5e5a84191f 100644 --- a/sys/geom/geom_vfs.c +++ b/sys/geom/geom_vfs.c @@ -153,7 +153,7 @@ g_vfs_done(struct bio *bip) g_print_bio("g_vfs_done():", bip, "error = %d%s", bip->bio_error, bip->bio_error != ENXIO ? "" : - " supressing further ENXIO"); + " suppressing further ENXIO"); } } bp->b_error = bip->bio_error; From nobody Sat Nov 8 20:16:07 2025 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 4d3nHr1JMKz6GWn2; Sat, 08 Nov 2025 20:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nHr0fTDz4G8X; Sat, 08 Nov 2025 20:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8bmEoIwTo/2XhAD98wV6KUKY6ErZpf35RgB1DfSYd4=; b=JkXzT0bDABPOQiusZYxJ9rt52s7t02VZqacfhEk8jVLYZG7r30bckHwtWHwaMdOjzYB765 yuiUlAggXpgb/CUOBb6OAWKJBdns+y+dpRnyok/5BhnelkBPwAvBbL+aNLhRkU3g2j4WIr zRSA71Mdw+wabHOAsJpG1y3DV5KDGa9Lf/8g/kX5YLpo54zjHvgm1Jo6WsQupjBUS1YEE6 shBWCgsb4OQB64MqlaWc/LoxAff8a8mpAla3tVzEQ9x68UxHr+jbIXgnJxMP/V9kWteNsd ONCAM/dwzH4CL2FinNc9Z/TDmH7TAtM4L1QkQEu0PARp8zipa2Sid1f3rJCYHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8bmEoIwTo/2XhAD98wV6KUKY6ErZpf35RgB1DfSYd4=; b=szS0yItjRa7IM0+C5YrtTVIePM5lCX7OvW+bcE2waqTllKoS2sWe0ieyC+na+8iu7+rTOg KS0ntPjOAd2lGhRhnNS0z+YjhEPGomWBdho6FrWZMU3Af+WIn9Sp8fIVLwdjpcVJLgoeVA 2+EDRyTKGk9LzAFeRkfvzx67z8gIhw4Rs6gHX5r7XMr7It0px1tyuFNfSKA0WItKMwOSfq 7seje6Hem9WIS7de6gZsb/hJfqEp0h+uJWTxNYyh1eXJd3/QwOCE4hEq4GSKTHH+HK3rHi zSEmMQI23bSQs0laXzN7Ilye25t7od2LiAG4CLVKrSW5sWcjXcM5975qu1v1LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632968; a=rsa-sha256; cv=none; b=tPzHeEFflXyhfbw1HNQX/11pnPH1kFi5dLawHW+K6nveIivNewmI3KwMn/mk/CeJ0JuQ82 FvexI796BGjICdc79/3Xpq5JeSZn8RPcLHx5nR1q7DSKE1ndrNHb/3yZ7DsAhXb1xqy7wV vPG1vZcXl1t/3bdLix6sdUsLtPUqVcPZzxnfy4J2acv0Qi073M+YNI1X0wBiqp8o8PwLLW QYE8p6vsxLSuNNtWxdiNh3MMYzRhoo4gA/4dzsq72NMwVwu5ux/LTLWi7zyJSu4I6S9tLR enU+BRetlLzHihB9zeFoWI2udxpvAiJEq02qLKcVxeyYQv+Xk0GNlLmx2MrlgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nHr068mz11Fj; Sat, 08 Nov 2025 20:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KG7H0010532; Sat, 8 Nov 2025 20:16:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KG7d8010529; Sat, 8 Nov 2025 20:16:07 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:16:07 GMT Message-Id: <202511082016.5A8KG7d8010529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 03d13410ea78 - stable/15 - arm/ti: Fix typo in a KASSERT 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 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: 03d13410ea7877c935704b864fcc51aceb69b808 Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=03d13410ea7877c935704b864fcc51aceb69b808 commit 03d13410ea7877c935704b864fcc51aceb69b808 Author: Gordon Bergling AuthorDate: 2025-10-29 15:14:23 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:15:57 +0000 arm/ti: Fix typo in a KASSERT message - s/patcket/packet/ (cherry picked from commit 862024c00f3126220ac425f9ec1f3d4286064688) --- sys/arm/ti/cpsw/if_cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index dc3d8b1f9023..e2cc9ee0d7b2 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -1646,7 +1646,7 @@ cpsw_rx_dequeue(struct cpsw_softc *sc) port = (bd.flags & CPDMA_BD_PORT_MASK) - 1; KASSERT(port >= 0 && port <= 1, - ("patcket received with invalid port: %d", port)); + ("packet received with invalid port: %d", port)); psc = device_get_softc(sc->port[port].dev); /* Set up mbuf */ From nobody Sun Nov 9 00:36:21 2025 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 4d3v453tNdz6Ft5d; Sun, 09 Nov 2025 00:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v452rhvz3RJD; Sun, 09 Nov 2025 00:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=unmlv1RR+QuMprSTzAhdR3Y6ocJt+G+gvR8yhfk7fjY=; b=nqxEp1vabx7aFppHkplzV7N8TZE2EiP+ALfmM4LCB4EWhmev6e6SfPMlkAIg0KZSBDZVbL rKFe4iD2j5uvfHGsr60iJY6X7ll2uiCxJjSQLgcOnZZ7d4sqQN+hXyOwM8OL84v4MLHjAH 324Jti6/fY70KZvWEnV8/TvNMWCuK7ZCXzHvvEvTz9lMfcCBvrd2YHdDy8do9dh8j4ndeE J0qMDntwRnBUjuOJ+oO8J1EMq4oQqIqVe35fjuMuK3yXoP8QJvHSiUaZU1Bwz5s2lJDXkQ ViD24qukVFaFpdTwepwddhTYJXv+ZrG2Evqq4Se0GGu1uWUPIDIxsoqrGNdh7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=unmlv1RR+QuMprSTzAhdR3Y6ocJt+G+gvR8yhfk7fjY=; b=k0FsvYGxDEGm5RHs2OFNNDlSTTH1j9Vq5oWSQ+jMj30fFRDloYs7ABJL6JoSkj+qu6NZYN FULib7VW6tyS6afMaKGV/fHXQl57T8v7QMycgXGM/h7fhVKf9pipD8FvgY6kIOWmdAZBaN gLQeXJE7SnyhC2+iyGDFJcPtmEcdHEAJcChZs2OuBOxrGhTv+Pg9dsmt45xQ4C13rZUJ/O mEuJmNgZPi0Qce8A1ss0/KwOIIcYb6VEbjCZH18Gzz0LRn9MFdt6U0V0uTkEjeQ1DdOn1b XebxXM77JkhQ0v3QLCs+52J22UaMbCSdol3JeWzPVzKKYi0L23H9tjrsy6VIgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648581; a=rsa-sha256; cv=none; b=mZx5Wlyzyp+6YIvR/hNdh5pb7whM6F8TnMnwah6pFf4NShu4mzbmKuGSxojmddGxCpvvVn IpbTHIA0kW1gH1LRIGwLvQTz4nh6q1PbWl0preZNHQlcuHsRJADGqkbckPQqmTM1nOsa5T C/Oa5YUWOX+qKk8ItR0auCd0XbDQ0TMCCK9rhswCpLesFo9qmNZxHaQTq7NOESjMkzQkFh 7Ez7kAVt4QglcWvrG4M+mEGwU1rDCDRYNPFrMzL+IAO25E7rIJGFIP3+wvSwaBgleAAaw2 dnFJx0GVGUJtou4DPMv1DUre0T96MaRt8tI25rLEtsB/1+Msvb/wzyIAPd4qCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3v45279Pz16wc; Sun, 09 Nov 2025 00:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A90aLMA096855; Sun, 9 Nov 2025 00:36:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90aLn3096852; Sun, 9 Nov 2025 00:36:21 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:36:21 GMT Message-Id: <202511090036.5A90aLn3096852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e02ff3003bf6 - stable/15 - ipsec_offload: do not leak drv_spi unr List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: e02ff3003bf631340b4a5c793fbbe020bfc1b703 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e02ff3003bf631340b4a5c793fbbe020bfc1b703 commit e02ff3003bf631340b4a5c793fbbe020bfc1b703 Author: Konstantin Belousov AuthorDate: 2025-10-30 14:50:22 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:35:52 +0000 ipsec_offload: do not leak drv_spi unr (cherry picked from commit 4accefc998e731581549163cf1a582948b2ad0de) --- sys/netipsec/ipsec_offload.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 59a107881676..3583fc50f51b 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -289,19 +289,18 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) be32toh(tq->sav->spi), tq->sav->flags, tq->sav->seq); priv = NULL; drv_spi = alloc_unr(drv_spi_unr); - if (tq->sav->accel_ifname != NULL && - strcmp(tq->sav->accel_ifname, if_name(ifp)) != 0) { - error = ipsec_accel_handle_sav(tq->sav, - ifp, drv_spi, priv, IFP_HS_REJECTED, NULL); - goto out; - } if (drv_spi == -1) { - /* XXXKIB */ dprintf("ipsec_accel_sa_install_newkey: cannot alloc " "drv_spi if %s spi %#x\n", if_name(ifp), be32toh(tq->sav->spi)); return (0); } + if (tq->sav->accel_ifname != NULL && + strcmp(tq->sav->accel_ifname, if_name(ifp)) != 0) { + error = ipsec_accel_handle_sav(tq->sav, + ifp, drv_spi, priv, IFP_HS_REJECTED, NULL); + goto out; + } error = ifp->if_ipsec_accel_m->if_sa_newkey(ifp, tq->sav, drv_spi, &priv); if (error != 0) { From nobody Sun Nov 9 00:36:22 2025 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 4d3v464dDGz6Ft26; Sun, 09 Nov 2025 00:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v463hnVz3RFg; Sun, 09 Nov 2025 00:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L5+l+QWNX9vrWTtw+7k3GG7JJ3oWwzBXoU1C/LNORRY=; b=xqSclE/bQEwnN4TMwJ+qCte96xVnG5NeUZp/VrQ9pQD4oDUL0iZcsh8QiC67/CaAtBc0k3 OCzKybIYnXcq1pSVYpBbxG2avRLCa/u5XlparJ0+c6vtIHjJY4UNAjF0S9loa5MEHP4pUH f7HpzA2Gv1fACL9cH/DV0O3qR38z2Yq5x9HiDjMTF4NsrKv7ke0TXKwrUGmnYCdmo0u/gT +F5kNFxXHJj1rosK/7w/TtpzUa1B/t6jG56HD19TbkLCCPZka6jwuN14CU+CUl7MjaSHdn 5bm6NVqfufXUd3n0zQAR95kP/81bNIg4bAp8S/mrGzqHemEvhRsBkIhdsBkEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L5+l+QWNX9vrWTtw+7k3GG7JJ3oWwzBXoU1C/LNORRY=; b=fyciJsftw3BD3Rtg4N43E+Ms7BZHn7u75oeWWwhCG+JAtPP7PRy7B47Fc9wUUDCZbO5wFN oDLvl6asT5sd9QsujACir7hoV14Wm/Vck3EPOy/DDrXnfPHQXiYSyPM+L0uPTGHRnXDSuC 9uE4C2o5Jea++EaA9ERX9nTamJFmEIG3Nx7EChMkEVwNLxPqv/2223jgsI1yH4LqV0jQxa XJahJNZSDv2qEmnn8NMZMk7dRdaVZ2dYntOxscrWL5LnjgJCtEug3UvrHhBPtXNhaZDOCo 9l8z36D0+cCNSBR0c4sTcisauPu8b/XOLArYalylRcFL32qwsbFiSP7Ukz5QiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648582; a=rsa-sha256; cv=none; b=wIROx5o+iyBL9Rn4ug6DxvjgDUB6vp8Q+2GgUyE8CUYfk2lHlnU5Xc/VzxSjYobhuVK0Ft OSmiFwUxUwdy1EOCnN5pfwJTDZYpuEl9PgMt/0uU4sRxLpv5c8Rf45fpTauXTmjdlNjn2t uso4QgJcUoV/cpuq4LciAS7xO/kKDcQFWKqmMzBxm1MF26CMqGjJjgudD+OOT8bdV0c2ck 4J7kWMS83Ts/Sp+jWvOeeq9p9NuWRXGb/V1jiuqHKlR/5NeL0j/mN6QjzH65U+XFHcaL9Y HfdB7Har9S3sQIjoH+28lycA3qO9siU0cmU8wImzOZfcqQgLM2c0BMLmJrhrYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3v4634rbz17T1; Sun, 09 Nov 2025 00:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A90aMVG096888; Sun, 9 Nov 2025 00:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90aMd5096885; Sun, 9 Nov 2025 00:36:22 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:36:22 GMT Message-Id: <202511090036.5A90aMd5096885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7a9378856ae0 - stable/15 - kern_jail_set(): do not double-free opts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 7a9378856ae0b20e4d7330ab67cf02880db69afe Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a9378856ae0b20e4d7330ab67cf02880db69afe commit 7a9378856ae0b20e4d7330ab67cf02880db69afe Author: Konstantin Belousov AuthorDate: 2025-11-06 05:50:42 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:35:52 +0000 kern_jail_set(): do not double-free opts (cherry picked from commit 3f5f52216f7e583aeb5580b13ba0f87e29d1ee43) --- sys/kern/kern_jail.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 523b7e314a10..26a994ef0c32 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1065,8 +1065,10 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * than duplicate it under a different name. */ error = vfs_buildopts(optuio, &opts); - if (error) + if (error) { + opts = NULL; goto done_free; + } cuflags = flags & (JAIL_CREATE | JAIL_UPDATE); if (!cuflags) { @@ -2331,7 +2333,8 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) (void)kern_close(td, jfd_out); if (g_path != NULL) free(g_path, M_TEMP); - vfs_freeopts(opts); + if (opts != NULL) + vfs_freeopts(opts); prison_free(mypr); return (error); } From nobody Sun Nov 9 00:36:23 2025 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 4d3v480LnFz6FsdQ; Sun, 09 Nov 2025 00:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v474KtHz3RG1; Sun, 09 Nov 2025 00:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z0Ank0679jPkmqdQeWxlrcTaeNTxWeqDl4k0J6q7yVc=; b=LsS6MKqZUl76hS200mVoHAdICGevnuMolZo/GC7SnIMH4ivJkRVLJbwJwzID8g+llvuJ3u a9VE5taqkFFYDPreu3w0Gb1zS42EOXqjyza25U8Eh8Clz7motOTCSkp6CUFCf7OZ05N51a au78ADReZcwXYt6FEbBZmLoy2h5fKnWPL4UWCYCOXIV0rmLrKjh3wf8oyLRxzfkNQ3eAcb nyBdsriQ/EPHFv9dKXqY14slXsnyEIc18weUNQ3gVIbYDTtoqebraiDV0Nl7vpiw8yH+PN DbdNblkOFIdxhO83LokPrXAt6XlIeO25GUiCvm/M+m6+9knKqtHiQiwNk2CElQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z0Ank0679jPkmqdQeWxlrcTaeNTxWeqDl4k0J6q7yVc=; b=NwM/Pklkl6nkuCBCzILpugNYVt+tq0vEOITuVG+vt/VislXa8BYTBTfuvZRRqiqzzFHH96 hEFHRhX0aS6K8HwAQAY+G58FqpI7uyh253+EQrGBXNo+/zLUlO0rCcRn6Fk+aIWM9Aq7tl htQXFT0xgF/TNJ7dFRMS6UbSb4U04NC/zs9Xdo9u6MEqEWq9LdwGBjzzE7cjJI16fioDXX RU3IvDX2zftXU4QA6xue+mV7iiu4DvNMettE6pLmL0EnDjotJ3CuJGgG0LiBAu/MEC0Bu2 +Dvx6IV6Z50j/km0+rL1Gqk988Q+/Z8jbuVeBKTVnCHToJOydpAJBq0DaL35SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648583; a=rsa-sha256; cv=none; b=jOV8u1fO1Wrke2kISHbs6m+qvzvnyMYFv/Ttd7Ptaz8YKU0g9DMAaJPA2Lz9go6PU7spR/ 1RobG43YB1yjoH1i1V1Wqbkeg/onVww9giVFCKauTfG1ZDJivgchAxtYwwF/I5lwQKd/Nt PSra68S33eATfi2+3grFtH5iMmcSMNslQxns8CZfBOHVm+UEPRgOahPi3B3PMsJ88uLBIR Kxo2uDCAdihTBeZFu33wqpA4RFFs60VXj/ty1ZOXAb1jA8Z775DYDJZ71mCjrsEKNqMgNd EZd40vtFcFNq1WFfz0Gp0sB80kX53lA5ALPPxAtgnHb6WMhay6PWdOwAhUnHEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3v473fs3z17wt; Sun, 09 Nov 2025 00:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A90aNr1096921; Sun, 9 Nov 2025 00:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90aNUN096918; Sun, 9 Nov 2025 00:36:23 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:36:23 GMT Message-Id: <202511090036.5A90aNUN096918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 21b0a62ebcdc - stable/15 - atomic.9: fix description of acquire and release List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 21b0a62ebcdcb5453a4d3ff824c8a827e1413e78 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21b0a62ebcdcb5453a4d3ff824c8a827e1413e78 commit 21b0a62ebcdcb5453a4d3ff824c8a827e1413e78 Author: Konstantin Belousov AuthorDate: 2025-10-05 08:39:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:35:52 +0000 atomic.9: fix description of acquire and release (cherry picked from commit f26382dd72dfc710a8cc7159364a8166e22a4254) --- share/man/man9/atomic.9 | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index c9133c6311a5..674959648330 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -182,35 +182,42 @@ This variant is the default. The second variant has acquire semantics, and the third variant has release semantics. .Pp -When an atomic operation has acquire semantics, the operation must have +An atomic operation can only have +.Em acquire +semantics if it performs a load +from memory. +When an atomic operation has acquire semantics, a load performed as +part of the operation must have completed before any subsequent load or store (by program order) is performed. Conversely, acquire semantics do not require that prior loads or stores have -completed before the atomic operation is performed. -An atomic operation can only have acquire semantics if it performs a load -from memory. +completed before a load from the atomic operation is performed. To denote acquire semantics, the suffix .Dq Li _acq is inserted into the function name immediately prior to the .Dq Li _ Ns Aq Fa type suffix. -For example, to subtract two integers ensuring that the subtraction is +For example, to subtract two integers ensuring that the load of +the value from memory is completed before any subsequent loads and stores are performed, use .Fn atomic_subtract_acq_int . .Pp +An atomic operation can only have +.Em release +semantics if it performs a store to memory. When an atomic operation has release semantics, all prior loads or stores -(by program order) must have completed before the operation is performed. -Conversely, release semantics do not require that the atomic operation must +(by program order) must have completed before a store executed as part of +the operation that is performed. +Conversely, release semantics do not require that a store from the atomic +operation must have completed before any subsequent load or store is performed. -An atomic operation can only have release semantics if it performs a store -to memory. To denote release semantics, the suffix .Dq Li _rel is inserted into the function name immediately prior to the .Dq Li _ Ns Aq Fa type suffix. For example, to add two long integers ensuring that all prior loads and -stores are completed before the addition is performed, use +stores are completed before the store of the result is performed, use .Fn atomic_add_rel_long . .Pp When a release operation by one thread From nobody Sun Nov 9 00:36:24 2025 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 4d3v492FGHz6Ft28; Sun, 09 Nov 2025 00:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v485ywqz3RLy; Sun, 09 Nov 2025 00:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIDM0PZhIxJkdDFzppU3gs1c2f+Ess4gGVEVVNXBwyg=; b=B7zK/zwjnTntxIYvMrggOTizSazDG6IgOVRbVNByU21lLb0fo6S6B5eZDSz2WN9A7GSgtv WasuHD8849ePufcQ8kgEAfTXsgutjhmN5vnObd/T9g0n4o17YRF/0VeC6ZrYJxTIQg4Lbc wq7BUgbvglEX84PgxNtsyNyw6T6k7lGIdkAEACJz62nPAt4F1W4WenlG2DNEGtP8b2XN3B VTa48ZNZ+VKgcxPGne0iCS88fiCR40EefqAHhABfNr+Pf8nnnU7NBFm2+22VWp8DDbHFeF QEebnnfclpbxFlWPClHMXfcIqx9M1UKGFeHIVOSaK+1Y6qSoUqIO2l5ZVlReOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIDM0PZhIxJkdDFzppU3gs1c2f+Ess4gGVEVVNXBwyg=; b=qdZYGw8iyFJinqmdPiCA3Y94tkJG1VkhcFVJQEAk7wNWcxzXIoCa40bfW2yvK2wAvKoSvg Ho9FpAM3nL2iEad3g4tGNmzYgolnRcsJbRxnczvTICv4VJ3lfQSg2KN9WOTz3xTtMg7RS2 YyWn+tS4A4xeQuYk8tVVhuLTdCg+C9JxAFWjYw4TfpZXwtFGazP9xIGH0R3Rytn6GSzrMR XuGKPAsqcSVk76/6s2pFTcQiehgjb65GMemrfiLuoBMU6SLQatSiJIS1Q8KVbZL5gvNEEc 5wbL8FeN88O5mY+snoe8q5TY4ijcz0Q9UPx9zUgac2SIIhtlNJ2T/qDvvVLY4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648584; a=rsa-sha256; cv=none; b=T0Vn8htx7mucICLH9xbiRxlLHSMjK92xESBr5P+afGNkZrFpDIJVndGe4msAy5nIy/LTp1 +jOFvfRIjOoPQBDp/SwMxF9HPvZx2eJb+Uux//a1AkckhX2Eiu40oitnjffCUiJ7z6+b0j in5Po7Hv0cgyuZh5zjj3K8p/kO95sFoWkqkf7hY7EF/ywaIwMjrM+NhMObKfWprCNLqMjy 0c8S6N0j6hDVQUiKUF5bp3xc7Gr4tXbV7cQbgc8gZNVqm0Fq0wNFQmePpNFk1hN3RoeEwM 8zvLBsxnutoT0tqGpB+yMW/Wug4Ex0+iba2B28K7eSUY6GjqfWMoNifhtrod2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3v484t37z17RJ; Sun, 09 Nov 2025 00:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A90aO2W096954; Sun, 9 Nov 2025 00:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90aOpg096951; Sun, 9 Nov 2025 00:36:24 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:36:24 GMT Message-Id: <202511090036.5A90aOpg096951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 074fc34c842c - stable/15 - atomic.9: provide fine details about CAS memory model MD semantic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 074fc34c842c00d31f6c4edc13cea66110652062 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=074fc34c842c00d31f6c4edc13cea66110652062 commit 074fc34c842c00d31f6c4edc13cea66110652062 Author: Konstantin Belousov AuthorDate: 2025-09-26 06:58:36 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:35:53 +0000 atomic.9: provide fine details about CAS memory model MD semantic (cherry picked from commit 269b1c238806c7fb8835a0510b224c466ca3efa0) --- share/man/man9/atomic.9 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index 674959648330..b027a0ff0bca 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -242,6 +242,33 @@ section. However, they will not prevent the compiler or processor from moving loads or stores into the critical section, which does not violate the semantics of a mutex. +.Ss Architecture-dependent caveats for compare-and-swap +The +.Fn atomic_[f]cmpset_ +operations, specifically those without explicitly specified memory +ordering, are defined as relaxed. +Consequently, a thread's accesses to memory locations different from +that of the atomic operation can be reordered in relation to the +atomic operation. +.Pp +However, the implementation on the +.Sy amd64 +and +.Sy i386 +architectures provide sequentially consistent semantics. +In particular, the reordering mentioned above cannot occur. +.Pp +On the +.Sy arm64/aarch64 +architecture, the operation may include either acquire +semantics on the constituent load or release semantics +on the constituent store. +This means that accesses to other locations in program order +before the atomic, might be observed as executed after the load +that is the part of the atomic operation (but not after the store +from the operation due to release). +Similarly, accesses after the atomic might be observed as executed +before the store. .Ss Thread Fence Operations Alternatively, a programmer can use atomic thread fence operations to constrain the reordering of accesses. From nobody Sun Nov 9 00:38:18 2025 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 4d3v6M0zv9z6FtHX; Sun, 09 Nov 2025 00:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v6M0Sl2z3SrG; Sun, 09 Nov 2025 00:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=weoxs7bztg5JvcWyTJZZigcc3XL5DPIq8Xmw8d2g/Sc=; b=vX1Z09zFJdtXuyFBKBfEwQdBqUSPZZdFHRp2VZEuL4D1ZqQgkvtNF0DlB62mJd1gNPg1Bt jAr46a3jr2nij/tyxeXab/DJSqsmFFSQreoEndO1XKd4JqXNccsd7R/hViM8KZAhFT4MbX 4JB1z/5mzqY5dlDgrz/Aoq5hUUZRgotbUDElP9fMILWwP9/AnqiMCq2vbH0qW1u0lJXZ8F L2UDm0iYZF0MycA8FYXc8pgd2kcmxpHzcaHs6Xa5uTJISFM8JuTUkWf3w8Pl/CGk/xQH2O rzzPyZmR19a5GnmD5oA4yref3r45TiFv58q3bKNGyFXWsBnL7IIvUKsOv16Nlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=weoxs7bztg5JvcWyTJZZigcc3XL5DPIq8Xmw8d2g/Sc=; b=cSsk6YTlJPzrTXGoab5VrPvAnNeBZxL9S5EQ5d40I8LJVMzvaKx0PnzSkalKxR3mEOCUqD /qjU3HUGU8GVqXZZXiLkUywiP+J1A84+a2wFGlvq/BxDaeQpkDSBJGVivWXTIc1S4MXr3v ECICcKCwyl3jso+us5oW51b+pUkm5XkuWItzhSziAj02+HD/AME09gyhDfLQgbgN9MVbpc d3ZLMSbyXhV0xnO361Q1vAEAZBVB9yj5If9/DYdZzG8c06KUKEQN2wnlaeBaNH/Lm8VJOd 77cKbWoH5aAbDn3VaStZumK5yLpeoTxnmogr3IROXbfW9XGaeoySEVj+laLJDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648699; a=rsa-sha256; cv=none; b=hNl8LSyzhRXIbUcPIMrx+e4L24H6k6g91rlMOhEvwwv1os8gC1z0Gu+mYFv9rFjyk7y59V 5JO0+PkUjvtgM9uvGWVMtIbgzr3fHTkGgLQVvnJ2W1Ex3YVsVIe5aE7PIT+vjpeKd89KPD EzI1iIvdUgchYYJnGf4U5BTyLVzc2sO7WyfL5/Kl1edzh6VxMj+5tUl13YmOnFWFh1Y/pb GRjg6T5SYK+8Ly4YrZSa+/jyOC89mCcUUMq6PhjdeuPdB7d0PIopQEUwSksZQPo99RR/Zc N9LWRXgn7eVVZG70s/fj/JUzLZWuq7t1R9StW2eHDys36OHNjG9tNp6aHOuPmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3v6L6wwGz17Dg; Sun, 09 Nov 2025 00:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A90cIid097676; Sun, 9 Nov 2025 00:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90cIiF097673; Sun, 9 Nov 2025 00:38:18 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:38:18 GMT Message-Id: <202511090038.5A90cIiF097673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ed278aabc26c - stable/14 - atomic.9: fix description of acquire and release List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: ed278aabc26c218d842837b86a7ab332c95a9e95 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed278aabc26c218d842837b86a7ab332c95a9e95 commit ed278aabc26c218d842837b86a7ab332c95a9e95 Author: Konstantin Belousov AuthorDate: 2025-10-05 08:39:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:37:05 +0000 atomic.9: fix description of acquire and release (cherry picked from commit f26382dd72dfc710a8cc7159364a8166e22a4254) --- share/man/man9/atomic.9 | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index df24cd4a4d2b..19ab7e0fbdbd 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -182,35 +182,42 @@ This variant is the default. The second variant has acquire semantics, and the third variant has release semantics. .Pp -When an atomic operation has acquire semantics, the operation must have +An atomic operation can only have +.Em acquire +semantics if it performs a load +from memory. +When an atomic operation has acquire semantics, a load performed as +part of the operation must have completed before any subsequent load or store (by program order) is performed. Conversely, acquire semantics do not require that prior loads or stores have -completed before the atomic operation is performed. -An atomic operation can only have acquire semantics if it performs a load -from memory. +completed before a load from the atomic operation is performed. To denote acquire semantics, the suffix .Dq Li _acq is inserted into the function name immediately prior to the .Dq Li _ Ns Aq Fa type suffix. -For example, to subtract two integers ensuring that the subtraction is +For example, to subtract two integers ensuring that the load of +the value from memory is completed before any subsequent loads and stores are performed, use .Fn atomic_subtract_acq_int . .Pp +An atomic operation can only have +.Em release +semantics if it performs a store to memory. When an atomic operation has release semantics, all prior loads or stores -(by program order) must have completed before the operation is performed. -Conversely, release semantics do not require that the atomic operation must +(by program order) must have completed before a store executed as part of +the operation that is performed. +Conversely, release semantics do not require that a store from the atomic +operation must have completed before any subsequent load or store is performed. -An atomic operation can only have release semantics if it performs a store -to memory. To denote release semantics, the suffix .Dq Li _rel is inserted into the function name immediately prior to the .Dq Li _ Ns Aq Fa type suffix. For example, to add two long integers ensuring that all prior loads and -stores are completed before the addition is performed, use +stores are completed before the store of the result is performed, use .Fn atomic_add_rel_long . .Pp When a release operation by one thread From nobody Sun Nov 9 00:38:20 2025 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 4d3v6N32j9z6FtCQ; Sun, 09 Nov 2025 00:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v6N184hz3Snn; Sun, 09 Nov 2025 00:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2C3XnQe4OEghHtaiXiJ5ynNCQD25ZHUKpxV9WBY+84=; b=XemDrAiiXtwcqnTiXLai4XZHpYmOzLyn1xX8WI88l1aNpwJF+pOMBu46OWlQOAOWtootoI akeR/k6TUMqSKdhJOzs12Sb8skhnbKdlrzpO/6+KpuQ2VUO3ho9QTc2vJLVvf4lxQOK+Jm v5rk7EZHMrQPr/xiW2cFAKrmrkSq+S3fb19RrUFhZUFf753dz4hU0YnHaQCdaifaf0JCNJ ewRpFn0VGQPa+0XUxC3RCSuLbNI+tlpMQ9UkEqx/KWOE2hcPXZrrYPrjRmNAeWFLe13zF3 vO31qP88qTv1BqXmoj0H1ERhyO+cz0sIF962xAeGsILSnCc7IRwDJJY4uMoupg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2C3XnQe4OEghHtaiXiJ5ynNCQD25ZHUKpxV9WBY+84=; b=S1R86cBgAKzU/MOyJiFiPo9HFI+yYLvX1znF2KZ8XsAkgGJPwPh618fBoKX9+N5dcGNxDF 3GQxfn3DkFv2NVnAmHpQIwJfS0eiIGE18pClGLn97T5FzCfxXB0qgj+Gz4cVQzggVP8m+0 TZ6ie8/r3SvpNxg6FwXoe2rL9oU225qTX98QCe9yqBZfGSruWbLFMTzuHDnwgHc/gVux2i b2q6kia/xo7bFytcC8Jn3z+MSl98WNQ0kjY3w8Y5iDecgNEIxmtJVTDQHINNGrLwFFQlkJ ZXhfU4jcFBH1FpblpYB3taob0QHyl7/bCocc2EM4E62rGV0MxMB0LNekJgzDrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648700; a=rsa-sha256; cv=none; b=MUva3TauLBLEog7WLEir3+adFWiY+193V7CkFyxB5a5gGfnsZV3xA0qUjvX0okTlVoK/Zp 6Wl19+AjlVlfAtL5vdut7f+IV6FvFcE0uh6jbGEwMD3EsgagZm9uupauJ7Q4VCz3N/z1fK nX+tCzOZWmcKWOEHdAbB0LfOk2nEThhnU418/8vWjxCzZSYmWRq0N0/ESrkKdpxDyfszGL rIwZW9ft+R/WoGhfsdG1O10Mjz6Wx2E+eOWO3QrjN8tdljbW9ZHxYAud+ptdYf3Ja8+tj7 M3FS9gqa9hLOVhAcVOQ0dEOjxsA2rj0hjXFJgVZZrQ6Mw6ZWV2tplJ/eHyB+tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3v6N0jjbz17Dh; Sun, 09 Nov 2025 00:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A90cKRB097709; Sun, 9 Nov 2025 00:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90cKBd097706; Sun, 9 Nov 2025 00:38:20 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:38:20 GMT Message-Id: <202511090038.5A90cKBd097706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fe5f45696edd - stable/14 - atomic.9: provide fine details about CAS memory model MD semantic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: fe5f45696edd6e00657b339e8f2cf554a5f8ede1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fe5f45696edd6e00657b339e8f2cf554a5f8ede1 commit fe5f45696edd6e00657b339e8f2cf554a5f8ede1 Author: Konstantin Belousov AuthorDate: 2025-09-26 06:58:36 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:37:06 +0000 atomic.9: provide fine details about CAS memory model MD semantic (cherry picked from commit 269b1c238806c7fb8835a0510b224c466ca3efa0) --- share/man/man9/atomic.9 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index 19ab7e0fbdbd..af94b5773f0e 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -242,6 +242,33 @@ section. However, they will not prevent the compiler or processor from moving loads or stores into the critical section, which does not violate the semantics of a mutex. +.Ss Architecture-dependent caveats for compare-and-swap +The +.Fn atomic_[f]cmpset_ +operations, specifically those without explicitly specified memory +ordering, are defined as relaxed. +Consequently, a thread's accesses to memory locations different from +that of the atomic operation can be reordered in relation to the +atomic operation. +.Pp +However, the implementation on the +.Sy amd64 +and +.Sy i386 +architectures provide sequentially consistent semantics. +In particular, the reordering mentioned above cannot occur. +.Pp +On the +.Sy arm64/aarch64 +architecture, the operation may include either acquire +semantics on the constituent load or release semantics +on the constituent store. +This means that accesses to other locations in program order +before the atomic, might be observed as executed after the load +that is the part of the atomic operation (but not after the store +from the operation due to release). +Similarly, accesses after the atomic might be observed as executed +before the store. .Ss Thread Fence Operations Alternatively, a programmer can use atomic thread fence operations to constrain the reordering of accesses. From nobody Sun Nov 9 00:38:21 2025 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 4d3v6P37jzz6Ft6M; Sun, 09 Nov 2025 00:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v6P2Q0pz3Sgh; Sun, 09 Nov 2025 00:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+9Qde4QGTnSnz/d+G+iktd2iFNSxzgPEttpDW+4E7So=; b=tB0k2PMx/VrXci/BviAlJMjssMRkIrNOSI2njb80JkdmULbvfc+2tMaOcYm1UQc7E96rX6 RiPmaYYQqEAA3MK7bxZeTmIv1kxyWYfg8dkn2ki7UcjUJB9rzJv/DptKu5TlJ3PAWnGNdG Lu/6x0cMuoWt4FaSr+BqO/b29lVxyj1JxeWq9cSybTBCwq9Xtat5Se6fSJ13WAM7E85n+v yn0GtPfrddLjkaepXYogf4hdckP+zJGaWprXQlqEf7BDoWZ1z5abEU6NIsNuc65mpeXDax 0UFMD8vUQeA4B7i2TsPvLbDNpwjcuePtjNtdSNaDkB53me3DH0YlBVYU6NnGcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+9Qde4QGTnSnz/d+G+iktd2iFNSxzgPEttpDW+4E7So=; b=mufmXbcpr2oP+pMcyd1R5Mv7nsyx10bJ4MzwXFaCqS+nc240m5EQj65flCyRcINWQEyGLl i0/CUPQi2SsZtJvEhBqOm8McjdWVf4wL8rX7zyOzLEPIHDZdOW/wZyKlOD3nXDUP5Mo5s7 SVBidgbQkUs1XfaFdxqZ8WD1aG7oDCUv5SOl4w4fbe23erN7fRfLf/l7NRodgQi2+PwR3i FZp7rwuH5LmXQ3ET+eS1kaoiVuiV6EY5bN74HpiipaGnxMHpWthKdX1+7zBTAkraHr3SXR az3l7nPXeg6erElcJ/3z43FUSyGllylp7PM7Ja23JumBB8E8dxVeP9ywPnYV/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648701; a=rsa-sha256; cv=none; b=J6PKrFFJ67CY+kmwOxN3EZyaBcPukKbuJvo7uGFBJEjq2zxzsKWfB1Nvj9CHc/p6fLbRRT j8lffCArFlRiC3IFNciy/9AGnJdHwd1BitDXA4cxxBTmluHvM7VnAk91WO2FIW675MwSwi nYHlBUHmpEjZ9aToSzSBSEY0CeoRzH+PjrCY2cUavDLdH0FKq8hd6Yc8fzoQpNzjdXihSM InfSFW5G0d4aQ4HOsc0josqi2k6gV+tFqe7aPYKuUht2xo+DEm1HRvi6fSTzFQ2XJSGL/N dbRbDEDvUuiJYaMAkGNcFWSOWWqzoQX03D9XHPhtr8tG1wEKtwXJe0UHwGUsvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3v6P1yTqz17tP; Sun, 09 Nov 2025 00:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A90cL1Z097742; Sun, 9 Nov 2025 00:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90cLAP097739; Sun, 9 Nov 2025 00:38:21 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:38:21 GMT Message-Id: <202511090038.5A90cLAP097739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ef75e3c9b5e1 - stable/14 - kern/subr_syscalls.c: declare 'traced' local variables boolean List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: ef75e3c9b5e147cd06e81942e0fdcc1c36c48ca5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ef75e3c9b5e147cd06e81942e0fdcc1c36c48ca5 commit ef75e3c9b5e147cd06e81942e0fdcc1c36c48ca5 Author: Konstantin Belousov AuthorDate: 2025-10-30 18:35:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:37:06 +0000 kern/subr_syscalls.c: declare 'traced' local variables boolean (cherry picked from commit a6a9d97708ec18bf307b01141d84aabd01289159) --- sys/kern/subr_syscall.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index 25843eec3754..139a4df57f13 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -57,8 +57,8 @@ syscallenter(struct thread *td) struct proc *p; struct syscall_args *sa; struct sysent *se; - int error, traced; - bool sy_thr_static; + int error; + bool sy_thr_static, traced; VM_CNT_INC(v_syscall); p = td->td_proc; @@ -217,7 +217,7 @@ syscallret(struct thread *td) struct proc *p; struct syscall_args *sa; ksiginfo_t ksi; - int traced; + bool traced; KASSERT(td->td_errno != ERELOOKUP, ("ERELOOKUP not consumed syscall %d", td->td_sa.code)); @@ -248,9 +248,9 @@ syscallret(struct thread *td) } #endif - traced = 0; + traced = false; if (__predict_false(p->p_flag & P_TRACED)) { - traced = 1; + traced = true; PROC_LOCK(p); td->td_dbgflags |= TDB_SCX; PROC_UNLOCK(p); From nobody Sun Nov 9 15:28:39 2025 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 4d4Gsh1XsSz655RM; Sun, 09 Nov 2025 15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4Gsh0zHrz47wt; Sun, 09 Nov 2025 15: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=1762702120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EJMpw/oYLWjPuILE45FBMbQhuWs9hJ9dglWW/PHuxoM=; b=vS3jh1u6zWqiWy+EJ57r4p91cR+vIqIEEma5btc4a7+o3QrVvvqWETzjkFt+RLij5qawW6 EtybF02sbQbjSmEc/CQCPQ4+836OpTi1bXWclKGF2r4ysBk041WNzf+fc2h4a2KbK1bToU jY4dzQ+yHL5mwEYWJuCzQn4eiP/TWew3q5kdW1Ri8Mn+rVFJujxScFIX5X++RrH/DL/Mis dH7UDTb7ZI2weI8OAbecneBVUo8+SWvInjSWqb1j09ruQrK+WBA1Ll6C+pUNwqbS126K7Q 6VYMRx5408hx+uizbZf84+LpaR6e/dABRZ4w4v2TlxOafTXsInByWQ6TLgA9UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EJMpw/oYLWjPuILE45FBMbQhuWs9hJ9dglWW/PHuxoM=; b=hDaiKRwmNyWmnW85FyBZ2cNje531LbBqjXfY0nxjM07GBy2ObmZ2/Ns82IjxjBRbS/8pHk KpQbvDEWtiUljMq4Cw0CS5eN/M6kBT9MrDT+aGYOFpIGimFPv6vibEkQZQNEN+zD40XJuU BtXUtK9vcsuylG+9rG0gFp1Jye6rCMnev+b4SzJK9rZ0kRJ5fJb8kYxbcYQsvEC7qx8b7F fvPKPN4+eWiGAOSZ3QCsRPI4U03ekfydDvffiG+1gfxiQjBFu3GeZMVp1N3WzAEsff4efU p6Nz/jJBu8bLoYIaCcnm1VI1LZAFZ0BTlW3BR7x8Cz0iSjUhoc6y//M3PeY9Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762702120; a=rsa-sha256; cv=none; b=iAPRHDzS3yPoBeJxDFQT+Kv3sgJ3vhWra3cy/Jk1HAY9E12Aqs+AxluxkORIoX9hMcPVFv 4SX0Ao80PMox7Uq22A01Qn6NEyAopX/AWaFLygYg4S/dGQYk7eoNntflWrT1ohARglA2Xw BbT6rgGOZATCiiJ4njpFkKNZJf67FeVRVTHkoN1lesGkcbErCrjjUk/oP0PXowIyZFF+13 C0B6hgMpipRGc0fcaoZjBunEk/8lpqOQChyf2prXd+eu/etfBir8eWay66el5YFcVUPX3J lo4IyA9Oclf1w5n90f8Ur6bo1dshk3nHDeO7/yI+J55GJCb7vJNKKV2RYeQkRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4Gsh0VllzclF; Sun, 09 Nov 2025 15:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A9FSdw7071971; Sun, 9 Nov 2025 15:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A9FSdh1071968; Sun, 9 Nov 2025 15:28:39 GMT (envelope-from git) Date: Sun, 9 Nov 2025 15:28:39 GMT Message-Id: <202511091528.5A9FSdh1071968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 9033af83197a - stable/15 - ports.7: Add /var/db/ports to FILES List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9033af83197a0a58390866118d8c5699863c51fe Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=9033af83197a0a58390866118d8c5699863c51fe commit 9033af83197a0a58390866118d8c5699863c51fe Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 22:11:22 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-09 15:28:31 +0000 ports.7: Add /var/db/ports to FILES PR: 272426 MFC after: 3 days Co-authored-by: Piotr Smyrak (cherry picked from commit b8ff8a11c0d1d1f1b3bd1e60fae9c05ada7b28c5) --- share/man/man7/ports.7 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 75070ce852fe..24c1eb4b7f51 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 10, 2025 +.Dd November 6, 2025 .Dt PORTS 7 .Os .Sh NAME @@ -597,6 +597,10 @@ data. The default ports directory. .It Pa /usr/ports/Mk/bsd.port.mk The big Kahuna. +.It Pa /var/db/ports +The directory where the results of configuring +.Va OPTIONS +are stored. .El .Sh EXAMPLES .Bl -tag -width 0n From nobody Sun Nov 9 15:29:10 2025 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 4d4GtG5LKSz655m3; Sun, 09 Nov 2025 15:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4GtG4nzqz48px; Sun, 09 Nov 2025 15:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cKRcuMLDdDSWy8+4KBrQYb84v3yM65sDG08mcVM6rOg=; b=fdKyRRMnMCk1ltLpNSIWFCyRuViWEinddAR/UMRWmEc6QNZJY8tGtg+z9ZqiJDhKv4cXCG pfji1D8L+AojL+ej/gMAV3scnAScF6zanfOPsMLzhCVcrBJTogqvxyUY30ihvTQi2Sk0n4 raP8UeClGNFF+pNVftcR7Y1GoX9O0+oQXH50sNVF0oYmAPso91zidBGWIN/DUHdp5UjE9d wPBvgQw+exFQY53tadeneall8HxvpyyXDBXqEnoJoUrmqjbA4bJf97AAXx5CtZwtEhCg89 YH3H6IcqWuHi4RdbM244nTbCyZ3TOyJbmgk0uPC/y6b7xis+oMuXVynBRcWLJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cKRcuMLDdDSWy8+4KBrQYb84v3yM65sDG08mcVM6rOg=; b=iyqLLfZOBX2v06HbOsKuAMW3MQMrNr6n3LWG8jFb4+ZlZ0v+eB9b6rO+mITOZsd5CUkNhe uXlIYsWa4bf0P/nzNaLwN2bjK4WiijaspC+aBWy8Fw1QEuH/V8fMGrBJ/vH8U6kgpAuhV6 qlw+KRJTiKvwqXw34+Q9sYITRZIL9L/hkMXEmPgv4G+bpfax1JQfERz60x9hY0kAw/AlQ/ RHEVzyE3lRR2R6dJa7Evft4L98mMrh5BxivNP0g+5Knu3oaqA3SJ0rESdcduOXo7VPwoVB 6dHG6WW+cGfULr0t1AldEqZ7rb0PAlgNYrKyxeGQQ66ivbeKQldOE289yQ68KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762702150; a=rsa-sha256; cv=none; b=pBmgtxhzzt187+6dRN4jRALk1lT9/XlLur6iTS0JIjOCFsU91ebPZ1HIb+ukoJI8x9zmYP Xd9Z1vx4mHifW4IJr2Dedb2cMuYMiAn0bebt/EWs02hhKYIL+T/WTomo0066sW0vHkRV5z ByQZIAYbi0pTZAjFL5r8IQP7+qwNVOzYBafUQKLzFZvs+Cm6P2kfc1uHUxzYe4bsw7liAb ykKVN8OSVOV/D4zlpxYrIraqL4sKRgkV1gC01NaTcEWJDTHkuYav6V79lYsnZGHScrPkkJ dYas/0kKf98xE90fS0E2AKxQaw+51vsdqpYHcNVmyKDuZBgBkZ1BIahF9oa7+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4GtG4NMVzdkp; Sun, 09 Nov 2025 15:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A9FTAfn072279; Sun, 9 Nov 2025 15:29:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A9FTAIr072276; Sun, 9 Nov 2025 15:29:10 GMT (envelope-from git) Date: Sun, 9 Nov 2025 15:29:10 GMT Message-Id: <202511091529.5A9FTAIr072276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 773f6ce92eb0 - stable/14 - ports.7: Add /var/db/ports to FILES List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 773f6ce92eb0b5f0f17eb80f0a07840ae37e1f1d Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=773f6ce92eb0b5f0f17eb80f0a07840ae37e1f1d commit 773f6ce92eb0b5f0f17eb80f0a07840ae37e1f1d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 22:11:22 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-09 15:29:01 +0000 ports.7: Add /var/db/ports to FILES PR: 272426 MFC after: 3 days Co-authored-by: Piotr Smyrak (cherry picked from commit b8ff8a11c0d1d1f1b3bd1e60fae9c05ada7b28c5) --- share/man/man7/ports.7 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 2b6f17965fce..092489acb795 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 10, 2025 +.Dd November 6, 2025 .Dt PORTS 7 .Os .Sh NAME @@ -597,6 +597,10 @@ data. The default ports directory. .It Pa /usr/ports/Mk/bsd.port.mk The big Kahuna. +.It Pa /var/db/ports +The directory where the results of configuring +.Va OPTIONS +are stored. .El .Sh EXAMPLES .Bl -tag -width 0n From nobody Sun Nov 9 15:29:20 2025 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 4d4GtS6LTwz655K7; Sun, 09 Nov 2025 15:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4GtS545nz49LY; Sun, 09 Nov 2025 15:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G/v9TO62ExrvDfD9p5p5W7g80A811vVJqIHZ/G/5BtU=; b=QMyRG3D985BGfMP8cVE1j8f4NNV+uZ6bHNm5puPZEDCRPlMTRAdxFu634wtXZbFAMCZh8n QrXr9EwGhh10CrjEjsEv9xTRYW3mga+ioblEWqvAM7B2z1weYqfOn2ZtyFnxgcd5hxCjmb jTnIeNbj+cH5fwQ4v7ypUC2ut/L4f7qezWCRRq9/VYqwr076c+2wXJHzhMaZmry6LfQl4D oKlelsFVT9nIyd6jqB+A5aUrzu5+bq2d08wR+Ba6032EMfsRfTZ1vJSsUv1qnN2bBOG1eR 83KiQ+wiZNgvmpZzGN9joRtmMCmZBSpLBnToy5zHsm8fd1F0iNgoannT43pGhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G/v9TO62ExrvDfD9p5p5W7g80A811vVJqIHZ/G/5BtU=; b=khk1WeRYxS9mAZnUQVak1I3m+l0DHP7sBflBoqAuU7oPZ2i1bGJ1YktwndB7k1H6LaxeZS AUwgTiLd9KUAuknUyJSYAzUq7lNAx482PP6W8gKizPkANxS1//Diib0fnjJDRO+9ZAYJyk PD4U18EhVa7hnIYOay5i0KaWgb5rKownBLlu3O1jmI5A/Zgc9pbU9D8F3ly1ItFmMMlrnU gFr02UyrAhvoMI+ly07lqbzYeU2IuhudeNLBC3Ot7lMbC9gSkqWks8F2nQhqwJoDPDMd7t drh5GkItRWIRMZR9YK5dKV5CDz4awccmGMUeEO/DeEYcqazfqhMkFE+nhvM7hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762702160; a=rsa-sha256; cv=none; b=PzSruC+JwI+8l/eAVTHK2NSJaD0/quYGIzrngbRre3zfjd2X0+5lS7Id3pInBfnhHM/KK9 A4jQStdwJ3ZOLsw+YmXZTfuU3xIlr7tiw8RA3luhPkloCrH8FdCe35mC3TgGISEgdcPxqJ 5j3GlM9GaWPfRP6ZPQmcU4YL+ynLuEK9sQ2RPSe9RbNMe7dGlRgeVxFQfOB2HqN03MDJCX /IYYr9f0RoNmmK1rPpgOcPkqDM2J7Jx18xaraRljwPU0Xn+W0OHgQnWmz2ARi1hjNes0n8 vNLbSBd3+ginoTHYCEuJmokD55in9c95Ecd9UeKsE87OM/jVosPdpee+Al9lBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4GtS4WnczclG; Sun, 09 Nov 2025 15:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A9FTK4P072450; Sun, 9 Nov 2025 15:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A9FTKro072447; Sun, 9 Nov 2025 15:29:20 GMT (envelope-from git) Date: Sun, 9 Nov 2025 15:29:20 GMT Message-Id: <202511091529.5A9FTKro072447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 956938cd28b2 - stable/13 - ports.7: Add /var/db/ports to FILES List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 956938cd28b27403a0e3b6279ad3266d2cf665f0 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=956938cd28b27403a0e3b6279ad3266d2cf665f0 commit 956938cd28b27403a0e3b6279ad3266d2cf665f0 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 22:11:22 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-09 15:28:54 +0000 ports.7: Add /var/db/ports to FILES PR: 272426 MFC after: 3 days Co-authored-by: Piotr Smyrak (cherry picked from commit b8ff8a11c0d1d1f1b3bd1e60fae9c05ada7b28c5) --- share/man/man7/ports.7 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 05ed6d29603b..648302668578 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 10, 2025 +.Dd November 6, 2025 .Dt PORTS 7 .Os .Sh NAME @@ -581,6 +581,10 @@ data. The default ports directory. .It Pa /usr/ports/Mk/bsd.port.mk The big Kahuna. +.It Pa /var/db/ports +The directory where the results of configuring +.Va OPTIONS +are stored. .El .Sh EXAMPLES .Bl -tag -width 0n From nobody Sun Nov 9 15:29:49 2025 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 4d4Gv16wjHz655WL; Sun, 09 Nov 2025 15:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4Gv16Cw2z49dT; Sun, 09 Nov 2025 15:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E3ihXJMSOPQH5lPnyBGKANX2PHljAVNQh8Hxa7BOFnc=; b=phFhFRBXybZjQ+cpZBJ5djhHK61T2uL5swjxHuYKXgJw4Ta7DIqWZoYRQ+gGYA0k4Yq51i zshnQ/KpLRkAW3tAnkyjMhj+POBM+X9bEUTXlyTmfZX/XJCD18LgiBXNvZ7lFz4s2bkDf6 g6+UB4VYD9/xBWE+v0OIwk85s7+AKoBafwFi/sTFT573yzOIg7yiopgKjV5N2rq8mARsjM k2l+M6bNhOIHxdXsYF3mzG4AXrY7KHoMSDzKkXXCWjQTMFaLNMWRxElnSBj0unOet0fxw9 RdzR4efv3wro6kuXoE0KwjtOyA1vyatIUVDwr/zC6GJsENt0x+bmgGCKn5+kgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E3ihXJMSOPQH5lPnyBGKANX2PHljAVNQh8Hxa7BOFnc=; b=ok7oqd3u4DIUsghpDmpvUtt8qsn9iIQpRhWJ+aUY6gfyPApG4pAa2TOc4PDNpN6QT0w2il NrmJJuWBtvlB8ebRxQ/FVXc2T7BJEdqbw3gtaL+llWEuHyuMS9RujAnA0X730SoGxhWkc8 MnmQFxZAQE4QJ2+E3RJoAX6x/5FLjVUV4Dw3PIXtxN4Dv/mqMkAQ5eD1O4a4ynw9jbBC67 1BVDIo+sR7zYPySlHMQaOzeouNx7R+Hg/2YQ5k4gsa7V9nDWB7krfJBtovpqGjO/RxT/RQ oSNtq36hfPSlr47vFp0XI3RmixoKlg7+khlPMgAKwnI/j5J+/hvGsn+CX4zAwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762702189; a=rsa-sha256; cv=none; b=SHl/FfSzCgo8mgNlrsbliuVLK+DGq+QvznLO/HhzjxmoZFdfGwtR5yTo7+c898XAz4FOU6 hQhW320Su6kcoh3Uvyco33aI57ouSdO4f9jRVTG0PRDD93mPwuj0h+wwm+shAUGrj2UiV4 rOGOV6LUXxPu48mkCezu5c6L93U7BP1FrP2fMCP4VOV6C1ZPoWiZYkOZXfv0EwLkN5UA+4 NZas2iU3oHAVoNy3W2f+tgxw+f8hHlipI7n6EVwfr4Pfd4FKtorGMJVSM+dOFjA3oVaSX4 yoWBxSOqnmfbwuEMj+/7QC7TVqOBBtzEg0vFACLTmqsv7/znF9GivdE2+znwUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4Gv15mXlzdHW; Sun, 09 Nov 2025 15:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A9FTnfO072732; Sun, 9 Nov 2025 15:29:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A9FTnF3072729; Sun, 9 Nov 2025 15:29:49 GMT (envelope-from git) Date: Sun, 9 Nov 2025 15:29:49 GMT Message-Id: <202511091529.5A9FTnF3072729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 92a91c9898ad - stable/15 - dtrace.1: Fix mdoc macros around -x List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 92a91c9898ad7ed0ba378e18783caeb9efddbcc1 Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=92a91c9898ad7ed0ba378e18783caeb9efddbcc1 commit 92a91c9898ad7ed0ba378e18783caeb9efddbcc1 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 23:04:01 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-09 15:29:15 +0000 dtrace.1: Fix mdoc macros around -x There should be no space between -x's "arg" and "=value". MFC after: 3 days (cherry picked from commit 753cef701dbea03627c1fe11dd5556e74df415b2) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index e263b936700d..25f86306bd71 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -548,7 +548,7 @@ to disallow the possibility of enabling destructive actions system-wide at any p Any attempts to enable destructive actions will cause .Nm to exit with a runtime error. -.It Fl x Ar arg Op Ns = Ns value +.It Fl x Ar arg Ns Op = Ns Ar value Enable or modify a DTrace runtime option or D compiler option. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and value with an From nobody Sun Nov 9 15:30:01 2025 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 4d4GvF6kypz655y0; Sun, 09 Nov 2025 15:30: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4GvF5dQNz4B78; Sun, 09 Nov 2025 15:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A/6HmPpI5/AkcEzSht/pQkTjoRcZeSzs2rld0mHpcgQ=; b=QZF8Il0LR90H0+SEv0Sm8L9GZ+x/hpc92ynOYaTcie/0/YRfAbOt7DY2lis68aFTPZ7XZx O9TMEEd4kG6PUza/sopQiZ2fARDGpJV9RmAkZk3r/psKTbQWV2FFpzOfZsXwUVPWOaM4CP gaTxxUTMyMRZy9+Trd1wSEcRXydRLltW0M9jftb9Sq/qRywOpdGfoRQbUFV0Odw+Swq9NW SN8ckzagm9Q8EUVuUs2sA5y+GW5fp/OKwE9XM9ks1VgCr15xgxuLjECMEfdstZ+M6UL6ga BgyN/JnQ53IDLzlMBbHuAOnAzFvcNlPBOAE9u+xOPrYrxqa7CpPix4oLzn7eDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A/6HmPpI5/AkcEzSht/pQkTjoRcZeSzs2rld0mHpcgQ=; b=lqM3qEQo1OBmGOqn6l3rMqlJUzjurpqS4IE0oCyDLhglKbaG6CuCS0yxxfIeX+Q8VSRz50 x1vNBiKAR32/76fgbBOD9bIZ29YgmFOexNuVsxPG9z+VOaUCbm1pOaSqX/QNeX5M2re9Am NiCjvE99D58cUJmyRzOTTSf1j5X2uAJcM8TdPCUz8CVdvisgNrg/99fKwh/RIblsLAPg6j JgUxZKz8qpy0GTG4NjJBAvhl1+CjouhAUs67Bidb9eb6WczWq1eV3PvcSipRnaS0wuRC+z +EN8zHRkxi5FVZQbr5v0AibuapTP+hdgFIdlmKSKQDOFgHhxYEGD/YBekvG5Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762702201; a=rsa-sha256; cv=none; b=jqUZduf+pYMoqEpkNQPKaqW7giGIansmUyZNpzyXO7l5JWq9hYzDsxPYv9lQpQCKjWbkQU 1l056sf10oAuqNjCPHGD2ec5O/SxnniDimV14v3894vLp+NeGia6Ky3DAeyURg12tBTcjO xdIPshHi/N82YSn0FuQhMOtEVo5B0WBe8wJNn80NdXepJmWGszLaGs1Q0MVBO6xqxWLgHs /WvOwPGQGByJHxGPGCy/MhW45Jpt1WobdolN8aAtLux/5y7zjbRn3F4FKN7iCfuiQbxdyI 3TXfSaKhhnU32cUoGkKJrsX3YwC+iX63yI4ZaB3hthwS/oGSQ2ZcWV7km+E5zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4GvF59lfzdKS; Sun, 09 Nov 2025 15:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A9FU1Aj074882; Sun, 9 Nov 2025 15:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A9FU1fl074877; Sun, 9 Nov 2025 15:30:01 GMT (envelope-from git) Date: Sun, 9 Nov 2025 15:30:01 GMT Message-Id: <202511091530.5A9FU1fl074877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6fad1ff85250 - stable/14 - dtrace.1: Fix mdoc macros around -x List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6fad1ff852506ec36ff5ef3d188a8a68b2ef26de Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6fad1ff852506ec36ff5ef3d188a8a68b2ef26de commit 6fad1ff852506ec36ff5ef3d188a8a68b2ef26de Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 23:04:01 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-09 15:29:25 +0000 dtrace.1: Fix mdoc macros around -x There should be no space between -x's "arg" and "=value". MFC after: 3 days (cherry picked from commit 753cef701dbea03627c1fe11dd5556e74df415b2) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 0ae8bf0d2bcb..842505a5746f 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -548,7 +548,7 @@ to disallow the possibility of enabling destructive actions system-wide at any p Any attempts to enable destructive actions will cause .Nm to exit with a runtime error. -.It Fl x Ar arg Op Ns = Ns value +.It Fl x Ar arg Ns Op = Ns Ar value Enable or modify a DTrace runtime option or D compiler option. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and value with an From nobody Sun Nov 9 15:30:14 2025 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 4d4GvV5vWpz655vg; Sun, 09 Nov 2025 15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4GvV4v79z3CGX; Sun, 09 Nov 2025 15: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=1762702214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=huVJMPlYyVlptHHP7yN1N6Bj6G4qFIz9YmG+XFFWQX4=; b=vCr7FByTzIvIQ2aGRY8Q6UUDe31OoxV2ErFjgPoxdGqk7frIfivzpIlmTNdfXbCUFt3geI Aei2xRDeGSVpfVUnikwZjjU7YNDrsJg7UT6Hxv7AGRgzIQo1Xl39nzm7/uVkUvAZ8J25az 1QTRnrN6sSVc+mTQ6gOVTJ4fUstQ0iZFxSSo7vjRJPHBEI4LmKS5g1xJH8xIRrhgmWnwpV ZYDCPOMPpGU3w3OZ4IZIEqQtzxM5NbtmdPUbaLQQux3AVlPPOzRTo4dwU10in1D0fFv3Dd T5O3PEHuE0WJ4H1XthWYDgQMzkUNwJE3utW6HVvE1Cg80ZpbqLp5tmRZh7sY7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762702214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=huVJMPlYyVlptHHP7yN1N6Bj6G4qFIz9YmG+XFFWQX4=; b=XALo5DGjutg5RXev3ioFLU6ACOHX2hOuePmLdSahPkMUFtwYvxrgPL9FNe0wL8W6/Eqj1K 1ICIA3Npi/RjGNV0okkK7gqYW4CzI7mFrcg7o+nU8b5CzKLW3rspTw7A09sVkA6+fdpXAf XAqipZHgCbQjZ4BZSflzAeACPq6T9Ac6LPHrFLZhTHYC9YYgxFwz/ovUK0ISq+NbcSo3mZ uhiOClOv9y9oC9OAs95/LzlQE2IZEC0TB604f6qaj5PhZwuxP0jPOK69oIMy0fX9v6h0t2 S0e+76iJvgVcWKuTC32XzGEkt6HSOem2vmEv5iTVE0kx+tW/4ekjTQ9TaD/4KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762702214; a=rsa-sha256; cv=none; b=Hkc6u4btOpYDuWIUJa4bHoDAnbf49RNd76KJFP+SfjEyuMzYWXQWLuGioK0xO4KpzZhtxw t/XfKI3PrL1YdXaoKFJQTwEJD92hivONAUQ/NP8XjnqVRq3usUQleAOuLMoUMW3HhzSfMP oMjgxSVoEFCwGTRlt7rODnVQwXURFYveD542w0FWoEdvZ/OzLGi0nkZ8zXTMgn03UHe/ZY j1O3j+GhZAyhQKktMLX46P3E7A7IVTbUCiNZMjgFMUzi3vbBO2of1o0nA9mRMAu2nPMEHo S7fagTHVifD6VcWhJQSfId0HtgQ46MovoexObWi40+ynluiJ6+w7px4SB+csLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4GvV4NvGzdKV; Sun, 09 Nov 2025 15:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A9FUE9e079804; Sun, 9 Nov 2025 15:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A9FUEZS079799; Sun, 9 Nov 2025 15:30:14 GMT (envelope-from git) Date: Sun, 9 Nov 2025 15:30:14 GMT Message-Id: <202511091530.5A9FUEZS079799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 8febbb2a7d32 - stable/13 - dtrace.1: Fix mdoc macros around -x List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8febbb2a7d321e62b49e2dae4d26619c0d8cfe8d Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=8febbb2a7d321e62b49e2dae4d26619c0d8cfe8d commit 8febbb2a7d321e62b49e2dae4d26619c0d8cfe8d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 23:04:01 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-09 15:29:33 +0000 dtrace.1: Fix mdoc macros around -x There should be no space between -x's "arg" and "=value". MFC after: 3 days (cherry picked from commit 753cef701dbea03627c1fe11dd5556e74df415b2) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 34c36920ac97..7b80435c03e0 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -528,7 +528,7 @@ to disallow the possibility of enabling destructive actions system-wide at any p Any attempts to enable destructive actions will cause .Nm to exit with a runtime error. -.It Fl x Ar arg Op Ns = Ns value +.It Fl x Ar arg Ns Op = Ns Ar value Enable or modify a DTrace runtime option or D compiler option. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and value with an