From nobody Mon Apr 6 06:54:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SQ0sdzz6YsrC for ; Mon, 06 Apr 2026 06:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq0SP5L1Bz3fwr for ; Mon, 06 Apr 2026 06:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kvTgW6fTazAFk2srD4fvmYxhNQDcHgZ/gF5NnRpvWUc=; b=NQRXdu+mAiWDGeYNOgRf/wbLF6+kG4xd8qODLGdC+VefdZCQ+YTkKlZ27SltulpU5XdVYN J6YZg5GrCEv3dwmqL82nH63r2/8r8uDzr4mhiSvZNuqFIePSQQ79b0EcNbRVu3Ikm7wfJb kjGAO0FSNcZVZS6GXbTrP1ES6TrhzJ0u/a/fH6BvSuxzia1snLhqQNaVpBdrBpyjxj0gTz 7LTwDv2eUBc4enSJbwhjRsUs6UzpPXZx5ClFh38b+4gGtJlE3qeWr98b7sZtwLsMIOL/lx XhIhSmlZfhRemCQ3Jx4Tku218f9dYBS0toY3DIsSAgAoHm/HGtjfaAEjuiJogA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775458485; a=rsa-sha256; cv=none; b=kSDQ/MrUdW+GB0Cld6/gLkQ3zBijjqrwa0Qu3q/9QmqAmjKLZWNn6/QiLpZCDnf6qVzPCl CZubGYN35EacZAkV9S0jVpKKO2za/yOZROi2OMNLnPRBh3zYlY/5wzDd/XaBzyHzEOLbJV xxlqlfh4Iuo/0idG7j6CsymWgxHpUh3w+eeiK1tbaAkNjT8euVNRwqYt9SebwbMSCMG30O S2kdL7ScJKOwTjMb2KaBkLs4q+kgZeWRpUBI40HDzSOoVytEU0ptvrEWC8xonASgG/Z8Mo aojg2lNJQwc0PQOwMqnfQ2qNxyeZiDayTRsHyNo0xvVbC+eT8tSeu5XtonESXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kvTgW6fTazAFk2srD4fvmYxhNQDcHgZ/gF5NnRpvWUc=; b=OVJPGBFWgv76MV6afcQOzCLODPwRi00eorr0Ddq1M2EygWx9UOqoGF0iL1akTa7h7Y9X6a zpxqm3GtDejYACfeA7uJ8za64NedAswWa3HiTtRvpjLEDsjUkay8I9GGiTgqUa7GXoxUlZ N3CtvLH70jFESxb92Op3o+bGQYIsE1EQPHuP6ezK/Mfmf/iq1PdZPlaOlW2/ET77K3NZAl dIHrAR3PwOYcJo/XdSCCO47A56VhFQs6SmsZKMaE67obSZfOc3CWwTIM/+okdYxwqlk//3 iKUVVVlIvMNhaGTzzpSyQ/NhK6k88v69jy/eSMN1i4LJmU64fjghWinqF8jIcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SP4vXTzjnx for ; Mon, 06 Apr 2026 06:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35fc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 06:54:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9687de5aac95 - stable/15 - fenv.h: stop declaring feclearexcept() extern inline List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 9687de5aac951f3f89cca349346fbbe372c7af1b Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 06:54:45 +0000 Message-Id: <69d358b5.35fc8.4cefac26@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9687de5aac951f3f89cca349346fbbe372c7af1b commit 9687de5aac951f3f89cca349346fbbe372c7af1b Author: Konstantin Belousov AuthorDate: 2026-03-19 17:19:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-05 07:47:10 +0000 fenv.h: stop declaring feclearexcept() extern inline PR: 277958 (cherry picked from commit f39754d51b7dc65c4cf9f8b41b6fc1fc135554e7) --- lib/msun/aarch64/fenv.c | 7 ++++++- lib/msun/aarch64/fenv.h | 7 +++++-- lib/msun/amd64/fenv.c | 7 ++++++- lib/msun/arm/fenv.c | 7 ++++++- lib/msun/arm/fenv.h | 5 ++++- lib/msun/i387/fenv.c | 7 ++++++- lib/msun/powerpc/fenv.c | 7 ++++++- lib/msun/powerpc/fenv.h | 5 ++++- lib/msun/riscv/fenv.c | 7 ++++++- lib/msun/riscv/fenv.h | 5 ++++- lib/msun/x86/fenv.h | 7 +++++-- 11 files changed, 58 insertions(+), 13 deletions(-) diff --git a/lib/msun/aarch64/fenv.c b/lib/msun/aarch64/fenv.c index cce9f33e4f30..4c54656be7d3 100644 --- a/lib/msun/aarch64/fenv.c +++ b/lib/msun/aarch64/fenv.c @@ -38,7 +38,12 @@ const fenv_t __fe_dfl_env = 0; #error "This file must be compiled with C99 'inline' semantics" #endif -extern inline int feclearexcept(int __excepts); +int +(feclearexcept)(int excepts) +{ + return (__feclearexcept_int(excepts)); +} + extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); extern inline int feraiseexcept(int __excepts); diff --git a/lib/msun/aarch64/fenv.h b/lib/msun/aarch64/fenv.h index a435a9de5223..d125978b887b 100644 --- a/lib/msun/aarch64/fenv.h +++ b/lib/msun/aarch64/fenv.h @@ -81,8 +81,11 @@ extern const fenv_t __fe_dfl_env; #define __mrs_fpsr(__r) __asm __volatile("mrs %0, fpsr" : "=r" (__r)) #define __msr_fpsr(__r) __asm __volatile("msr fpsr, %0" : : "r" (__r)) -__fenv_static __inline int -feclearexcept(int __excepts) +int feclearexcept(int); +#define feclearexcept(a) __feclearexcept_int(a) + +__fenv_static inline int +__feclearexcept_int(int __excepts) { fexcept_t __r; diff --git a/lib/msun/amd64/fenv.c b/lib/msun/amd64/fenv.c index 4d271f8d456a..cd3b83d11585 100644 --- a/lib/msun/amd64/fenv.c +++ b/lib/msun/amd64/fenv.c @@ -46,7 +46,12 @@ const fenv_t __fe_dfl_env = { __INITIAL_MXCSR__ }; -extern inline int feclearexcept(int __excepts); +int +(feclearexcept)(int excepts) +{ + return (__feclearexcept_int(excepts)); +} + extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); int diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c index 05b3adb05f81..c8edf3fef037 100644 --- a/lib/msun/arm/fenv.c +++ b/lib/msun/arm/fenv.c @@ -70,7 +70,12 @@ const fenv_t __fe_dfl_env = 0; #error "This file must be compiled with C99 'inline' semantics" #endif -extern inline int feclearexcept(int __excepts); +int +(feclearexcept)(int excepts) +{ + return (__feclearexcept_int(excepts)); +} + extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); extern inline int feraiseexcept(int __excepts); diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h index e8a30fcf496f..14638dd33aa7 100644 --- a/lib/msun/arm/fenv.h +++ b/lib/msun/arm/fenv.h @@ -111,8 +111,11 @@ int fegetexcept(void); #define _FPU_MASK_SHIFT 8 +int feclearexcept(int); +#define feclearexcept(a) __feclearexcept_int(a) + __fenv_static inline int -feclearexcept(int __excepts) +__feclearexcept_int(int __excepts) { fexcept_t __fpsr; diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c index ebb4111a5fa6..e0485a3597f6 100644 --- a/lib/msun/i387/fenv.c +++ b/lib/msun/i387/fenv.c @@ -88,7 +88,12 @@ __test_sse(void) return (0); } -extern inline int feclearexcept(int __excepts); +int +(feclearexcept)(int excepts) +{ + return (__feclearexcept_int(excepts)); +} + extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); int diff --git a/lib/msun/powerpc/fenv.c b/lib/msun/powerpc/fenv.c index da11d27a649f..b0f32c67b667 100644 --- a/lib/msun/powerpc/fenv.c +++ b/lib/msun/powerpc/fenv.c @@ -43,7 +43,12 @@ const fenv_t __fe_dfl_env = SPEFSCR_DFLT; const fenv_t __fe_dfl_env = 0x00000000; #endif -extern inline int feclearexcept(int __excepts); +int +(feclearexcept)(int excepts) +{ + return (__feclearexcept_int(excepts)); +} + extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); #ifndef __SPE__ diff --git a/lib/msun/powerpc/fenv.h b/lib/msun/powerpc/fenv.h index 49fffb196206..2af5cda5f9ea 100644 --- a/lib/msun/powerpc/fenv.h +++ b/lib/msun/powerpc/fenv.h @@ -130,8 +130,11 @@ union __fpscr { } __bits; }; +int feclearexcept(int); +#define feclearexcept(a) __feclearexcept_int(a) + __fenv_static inline int -feclearexcept(int __excepts) +__feclearexcept_int(int __excepts) { union __fpscr __r; diff --git a/lib/msun/riscv/fenv.c b/lib/msun/riscv/fenv.c index a4dde02a6ddc..4d1b2cb2f611 100644 --- a/lib/msun/riscv/fenv.c +++ b/lib/msun/riscv/fenv.c @@ -37,7 +37,12 @@ */ const fenv_t __fe_dfl_env = 0; -extern inline int feclearexcept(int __excepts); +int +(feclearexcept)(int excepts) +{ + return (__feclearexcept_int(excepts)); +} + extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); extern inline int feraiseexcept(int __excepts); diff --git a/lib/msun/riscv/fenv.h b/lib/msun/riscv/fenv.h index fd50463d479e..4e8f81aa04c1 100644 --- a/lib/msun/riscv/fenv.h +++ b/lib/msun/riscv/fenv.h @@ -79,8 +79,11 @@ extern const fenv_t __fe_dfl_env; #define __rfs(__fcsr) __asm __volatile("csrr %0, fcsr" : "=r" (__fcsr)) #define __wfs(__fcsr) __asm __volatile("csrw fcsr, %0" :: "r" (__fcsr)) +int feclearexcept(int); +#define feclearexcept(a) __feclearexcept_int(a) + __fenv_static inline int -feclearexcept(int __excepts) +__feclearexcept_int(int __excepts) { __asm __volatile("csrc fflags, %0" :: "r"(__excepts)); diff --git a/lib/msun/x86/fenv.h b/lib/msun/x86/fenv.h index e558d0372368..b806222e5ef6 100644 --- a/lib/msun/x86/fenv.h +++ b/lib/msun/x86/fenv.h @@ -143,6 +143,9 @@ fegetexcept(void) #endif /* __BSD_VISIBLE */ +int feclearexcept(int); +#define feclearexcept(a) __feclearexcept_int(a) + #ifdef __i386__ /* After testing for SSE support once, we cache the result in __has_sse. */ @@ -164,7 +167,7 @@ int __test_sse(void); } while (0) __fenv_static inline int -feclearexcept(int __excepts) +__feclearexcept_int(int __excepts) { fenv_t __env; __uint32_t __mxcsr; @@ -262,7 +265,7 @@ fesetenv(const fenv_t *__envp) #else /* __amd64__ */ __fenv_static inline int -feclearexcept(int __excepts) +__feclearexcept_int(int __excepts) { fenv_t __env; From nobody Mon Apr 6 06:54:46 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SR1vbYz6Ysfj for ; Mon, 06 Apr 2026 06:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq0SQ695Fz3fts for ; Mon, 06 Apr 2026 06:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+vRBPfMKUVfo2tPABkJ9PGNcvliOBtGt70uebVlPBJI=; b=r6vL765b5sIn/KCkRmESpigABbsC87zhcDB+ESm5nQtXcz8OqwWEySt+NPSEj7XKeD/z1x Qtgd7aBMlw54iNkphy4LTPmO6Hus8MHNT/Lk2ot9NMqBW2ZX9h2qL4ryocvZ+SLInhGfeM YE3Ms4BLWPGISGnVVM0O4asEs0/+BZnhBOvHfCRjKSlNjpDlvp+l/j0OSp2UgKB3CqEftP 8YE1+gt5krpi/jymipo47hqQlsq249qDLzpZ83se+wwgJWnz1XaCdjDejzoC78A0VKUE7k VUmzlgyXrNagps4SMwGoPcEgBRAgmmPsjoHAYtratSD2pYLIevNiqHnlV6W7Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775458486; a=rsa-sha256; cv=none; b=X3dw7b7F74GAgs/V9HRmXUtptqW1E35zyrprqNyrm4mPHvaBewDU59/09viyLTEfa0gpmj tk9GcbrVHTfWRZ/OHivROgdoUDPoHVjUdmCe1oGTTMBOU/x3LNdGXJZqaDglU4vSJZixS6 0MEmVFXq8NqM3BwMCqHfpOMce3xLSuGvuJGsD7gkH/7qZyl85ofvrTAR+clJf1qwhFFOXD HqYSiIoSks3Alxmf89QlFN5FEGmew2u0m4Pma1EOyZCSKjKDad0Xp5+aH7+J3BShXhJ+NQ QB0cG6QN+6mc29QmwvxrKzU11QpHq42d1mRxLWrZJIciqBwLSQSIVS5Eet1iig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+vRBPfMKUVfo2tPABkJ9PGNcvliOBtGt70uebVlPBJI=; b=VmOELhulW02A2lfXbf9ePRImWuGcAAYe1atZS9DuPiiIcAP486gK3upGJQ87m0T1RJsoIl 8j09Ww6OB9G8fzohgyTPTSowJ+hQy1L4SAn4ts+NMewHmsBePyZxP404g7pAnelFwbSNz5 5ZSCdu7F87Lqgm/N4/lWl/pWLPrHbcJmrogWjscjzeaYiMgwxxxdplU0e80sG/StqW0PZf uxPNcls4OqnLtj4r4iVkQBtJgt5HfG/Q7X0GscGc11O7Suhtokw859ikLDttZFelVYzsSN gY2xZ0vkNRBhpCj23YoMBPQQpL42sw0GDI7JgtKFsOxr4vWWrzl+1HRUmA8/GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SQ5n2pzjny for ; Mon, 06 Apr 2026 06:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 337d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 06:54:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 60b5183a76a1 - stable/15 - msun/x86: convert rest of the extern inline fenv functions to proper linkage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 60b5183a76a16fcfa5004228ca1c860e237476c1 Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 06:54:46 +0000 Message-Id: <69d358b6.337d9.35018186@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=60b5183a76a16fcfa5004228ca1c860e237476c1 commit 60b5183a76a16fcfa5004228ca1c860e237476c1 Author: Konstantin Belousov AuthorDate: 2026-03-28 22:36:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-05 07:47:10 +0000 msun/x86: convert rest of the extern inline fenv functions to proper linkage PR: 277958 (cherry picked from commit 5bc64b7d417dd1f105755e093f8e807bcdc2a666) --- lib/msun/amd64/fenv.c | 32 +++++++++++++++++++++++++++----- lib/msun/i387/fenv.c | 32 +++++++++++++++++++++++++++----- lib/msun/x86/fenv.h | 29 ++++++++++++++++++++--------- 3 files changed, 74 insertions(+), 19 deletions(-) diff --git a/lib/msun/amd64/fenv.c b/lib/msun/amd64/fenv.c index cd3b83d11585..5dd122cf457c 100644 --- a/lib/msun/amd64/fenv.c +++ b/lib/msun/amd64/fenv.c @@ -52,7 +52,11 @@ int return (__feclearexcept_int(excepts)); } -extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); +int +(fegetexceptflag)(fexcept_t *flagp, int excepts) +{ + return (__fegetexceptflag_int(flagp, excepts)); +} int fesetexceptflag(const fexcept_t *flagp, int excepts) @@ -82,9 +86,23 @@ feraiseexcept(int excepts) return (0); } -extern inline int fetestexcept(int __excepts); -extern inline int fegetround(void); -extern inline int fesetround(int __round); +int +(fetestexcept)(int excepts) +{ + return (__fetestexcept_int(excepts)); +} + +int +(fegetround)(void) +{ + return (__fegetround_int()); +} + +int +(fesetround)(int round) +{ + return (__fesetround_int(round)); +} int fegetenv(fenv_t *envp) @@ -115,7 +133,11 @@ feholdexcept(fenv_t *envp) return (0); } -extern inline int fesetenv(const fenv_t *__envp); +int +(fesetenv)(const fenv_t *envp) +{ + return (__fesetenv_int(envp)); +} int feupdateenv(const fenv_t *envp) diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c index e0485a3597f6..d3cdc2e1cafb 100644 --- a/lib/msun/i387/fenv.c +++ b/lib/msun/i387/fenv.c @@ -94,7 +94,11 @@ int return (__feclearexcept_int(excepts)); } -extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); +int +(fegetexceptflag)(fexcept_t *flagp, int excepts) +{ + return (__fegetexceptflag_int(flagp, excepts)); +} int fesetexceptflag(const fexcept_t *flagp, int excepts) @@ -127,9 +131,23 @@ feraiseexcept(int excepts) return (0); } -extern inline int fetestexcept(int __excepts); -extern inline int fegetround(void); -extern inline int fesetround(int __round); +int +(fetestexcept)(int excepts) +{ + return (__fetestexcept_int(excepts)); +} + +int +(fegetround)(void) +{ + return (__fegetround_int()); +} + +int +(fesetround)(int round) +{ + return (__fesetround_int(round)); +} int fegetenv(fenv_t *envp) @@ -166,7 +184,11 @@ feholdexcept(fenv_t *envp) return (0); } -extern inline int fesetenv(const fenv_t *__envp); +int +(fesetenv)(const fenv_t *envp) +{ + return (__fesetenv_int(envp)); +} int feupdateenv(const fenv_t *envp) diff --git a/lib/msun/x86/fenv.h b/lib/msun/x86/fenv.h index b806222e5ef6..b5da37902083 100644 --- a/lib/msun/x86/fenv.h +++ b/lib/msun/x86/fenv.h @@ -108,7 +108,7 @@ int feraiseexcept(int __excepts); int feupdateenv(const fenv_t *__envp); __fenv_static inline int -fegetround(void) +__fegetround_int(void) { __uint16_t __control; @@ -144,7 +144,18 @@ fegetexcept(void) #endif /* __BSD_VISIBLE */ int feclearexcept(int); +int fegetexceptflag(fexcept_t *, int); +int fetestexcept(int); +int fesetround(int); +int fegetround(void); +int fesetenv(const fenv_t *); + #define feclearexcept(a) __feclearexcept_int(a) +#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) +#define fetestexcept(a) __fetestexcept_int(a) +#define fesetround(a) __fesetround_int(a) +#define fegetround() __fegetround_int() +#define fesetenv(a) __fesetenv_int(a) #ifdef __i386__ @@ -188,7 +199,7 @@ __feclearexcept_int(int __excepts) } __fenv_static inline int -fegetexceptflag(fexcept_t *__flagp, int __excepts) +__fegetexceptflag_int(fexcept_t *__flagp, int __excepts) { __uint32_t __mxcsr; __uint16_t __status; @@ -203,7 +214,7 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts) } __fenv_static inline int -fetestexcept(int __excepts) +__fetestexcept_int(int __excepts) { __uint32_t __mxcsr; __uint16_t __status; @@ -217,7 +228,7 @@ fetestexcept(int __excepts) } __fenv_static inline int -fesetround(int __round) +__fesetround_int(int __round) { __uint32_t __mxcsr; __uint16_t __control; @@ -241,7 +252,7 @@ fesetround(int __round) } __fenv_static inline int -fesetenv(const fenv_t *__envp) +__fesetenv_int(const fenv_t *__envp) { fenv_t __env = *__envp; __uint32_t __mxcsr; @@ -283,7 +294,7 @@ __feclearexcept_int(int __excepts) } __fenv_static inline int -fegetexceptflag(fexcept_t *__flagp, int __excepts) +__fegetexceptflag_int(fexcept_t *__flagp, int __excepts) { __uint32_t __mxcsr; __uint16_t __status; @@ -295,7 +306,7 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts) } __fenv_static inline int -fetestexcept(int __excepts) +__fetestexcept_int(int __excepts) { __uint32_t __mxcsr; __uint16_t __status; @@ -306,7 +317,7 @@ fetestexcept(int __excepts) } __fenv_static inline int -fesetround(int __round) +__fesetround_int(int __round) { __uint32_t __mxcsr; __uint16_t __control; @@ -328,7 +339,7 @@ fesetround(int __round) } __fenv_static inline int -fesetenv(const fenv_t *__envp) +__fesetenv_int(const fenv_t *__envp) { /* From nobody Mon Apr 6 06:54:47 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SS3H49z6YslS for ; Mon, 06 Apr 2026 06:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq0SS087jz3fx5 for ; Mon, 06 Apr 2026 06:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRPo28hzLiVjz2iyI5qmPEcoNHLVSY3d7OF/4QEIA+E=; b=jBpKmbpNnr2CJT43/FTHgjWqGYWArQm9Q+fhKN21h0pviuVNot0rcdA8CkChrmWl0zjNeQ LUCmmGMTUi/G+7Hm1oKxzfFsfTRuwJJNuLir8VKafMaishWdaBDb87Koj5ss15D5NFgOKG zoJuJMU6vOn22nVR1Qkp+nJEo+jJWfMqIItrF4ZIDquWEVMncp1kMzT4S72SY3hfmeCYhq g+TtH8KkkZ9TvKqxp31JwEeDP2/04bw02xvrcmgutxGuFLqwvEOOwIASjcF2/6XrN6sKlh 6uludFVzXtTX95A4FCLb4ldivdu1uTlPr7zLwZsJiuecpj6O5+ZQtsQOjvya0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775458488; a=rsa-sha256; cv=none; b=Omhwz69g0kHbuRe2+AEEv3KP2BMj45ZC8+fAevs+Y6n9LPoGH8VZl/kJmTn4twrmahV9vb LYWbP7u2QjJ2ggfeunGjc2B4uGAnU/k9Ausx3ocLD3P5GLu3rB4A+wyAncrfbxRrCim6mg r29/z6Zp5HUF792VMl4tVaSt8g7RC6D7B66B9WKnjvWMlwRW40AmaOq5m1+vNn8IC5NLsz cg+8F+XVImDDmDUmJLdzY3n4FjKr6IfR7GqRy0uR3HCTYBTsUrcaUvMAfcYY4MR0/HCs+c jjpNhZNyOqf9D7RZNW981Jab8GrROc+qVHBzG+oQjWLi26RFCGl2mtP9eaFZ6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRPo28hzLiVjz2iyI5qmPEcoNHLVSY3d7OF/4QEIA+E=; b=g2BZu+vta32ae7acMekTgC+/MavbiGRbej/S6kd7IpQkgyN6Mg3STE+yB6NKZfsHMS/h3+ uun2CTOzT5lleldmDqdSXEo3lvfL0NN0r2vtPFkOTWX/h6KSZ509Aqwqd/27bNw94609rI tIkib4a5WAtKZy63HUR8QolrSqWnO1OkjvZAb9LGXK0ak6gLyed9MllDTvOieRiRlzrISo 6yr/9B5FZ4KcWS8mcik8Gdb2m9Op1zYNAueMIcweEuRfZXfmCI7zwAKLatXHMQKtLlJfq8 DjcmO8EqLZiN3IQ1dap4G/qrd1qY0Uk06NsTXlrL23lbDXZ46RxEV9mZSOS83Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SR6YrdzjMq for ; Mon, 06 Apr 2026 06:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34036 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 06:54:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 492843d5269f - stable/15 - msun/aarch64: convert fenv functions to proper linkage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 492843d5269f22592d7694111e92200bf577633c Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 06:54:47 +0000 Message-Id: <69d358b7.34036.1eb65367@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=492843d5269f22592d7694111e92200bf577633c commit 492843d5269f22592d7694111e92200bf577633c Author: Konstantin Belousov AuthorDate: 2026-03-28 23:13:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-05 07:47:10 +0000 msun/aarch64: convert fenv functions to proper linkage PR: 277958 (cherry picked from commit 3a01e1e1a50cb9a9594aac2148dc920a6b295428) --- lib/msun/aarch64/fenv.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- lib/msun/aarch64/fenv.h | 41 +++++++++++++++++++++------- 2 files changed, 90 insertions(+), 23 deletions(-) diff --git a/lib/msun/aarch64/fenv.c b/lib/msun/aarch64/fenv.c index 4c54656be7d3..5d626f66516f 100644 --- a/lib/msun/aarch64/fenv.c +++ b/lib/msun/aarch64/fenv.c @@ -44,16 +44,62 @@ int return (__feclearexcept_int(excepts)); } -extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); -extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); -extern inline int feraiseexcept(int __excepts); -extern inline int fetestexcept(int __excepts); -extern inline int fegetround(void); -extern inline int fesetround(int __round); -extern inline int fegetenv(fenv_t *__envp); -extern inline int feholdexcept(fenv_t *__envp); -extern inline int fesetenv(const fenv_t *__envp); -extern inline int feupdateenv(const fenv_t *__envp); -extern inline int feenableexcept(int __mask); -extern inline int fedisableexcept(int __mask); -extern inline int fegetexcept(void); +int +(fegetexceptflag)(fexcept_t *flagp, int excepts) +{ + return (__fegetexceptflag_int(flagp, excepts)); +} + +int +(fesetexceptflag)(const fexcept_t *flagp, int excepts) +{ + return (__fesetexceptflag_int(flagp, excepts)); +} + +int +(feraiseexcept)(int excepts) +{ + return (__feraiseexcept_int(excepts)); +} + +int +(fetestexcept)(int excepts) +{ + return (__fetestexcept_int(excepts)); +} + +int +(fegetround)(void) +{ + return (__fegetround_int()); +} + +int +(fesetround)(int round) +{ + return (__fesetround_int(round)); +} + +int +(fegetenv)(fenv_t *envp) +{ + return (__fegetenv_int(envp)); +} + +int +(feholdexcept)(fenv_t *envp) +{ + return (__feholdexcept_int(envp)); +} + +int +(fesetenv)(const fenv_t *envp) +{ + return (__fesetenv_int(envp)); +} + +int +(feupdateenv)(const fenv_t *envp) +{ + return (__feupdateenv_int(envp)); +} diff --git a/lib/msun/aarch64/fenv.h b/lib/msun/aarch64/fenv.h index d125978b887b..32a03ee1eb49 100644 --- a/lib/msun/aarch64/fenv.h +++ b/lib/msun/aarch64/fenv.h @@ -82,7 +82,28 @@ extern const fenv_t __fe_dfl_env; #define __msr_fpsr(__r) __asm __volatile("msr fpsr, %0" : : "r" (__r)) int feclearexcept(int); +int fegetexceptflag(fexcept_t *, int); +int fesetexceptflag(const fexcept_t *, int); +int feraiseexcept(int); +int fetestexcept(int); +int fegetround(void); +int fesetround(int); +int fegetenv(fenv_t *); +int feholdexcept(fenv_t *); +int fesetenv(const fenv_t *); +int feupdateenv(const fenv_t *); + #define feclearexcept(a) __feclearexcept_int(a) +#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) +#define fesetexceptflag(e, a) __fesetexceptflag_int(e, a) +#define feraiseexcept(a) __feraiseexcept_int(a) +#define fetestexcept(a) __fetestexcept_int(a) +#define fegetround() __fegetround_int() +#define fesetround(a) __fesetround_int(a) +#define fegetenv(e) __fegetenv_int(e) +#define feholdexcept(e) __feholdexcept_int(e) +#define fesetenv(e) __fesetenv_int(e) +#define feupdateenv(e) __feupdateenv_int(e) __fenv_static inline int __feclearexcept_int(int __excepts) @@ -96,7 +117,7 @@ __feclearexcept_int(int __excepts) } __fenv_static inline int -fegetexceptflag(fexcept_t *__flagp, int __excepts) +__fegetexceptflag_int(fexcept_t *__flagp, int __excepts) { fexcept_t __r; @@ -106,7 +127,7 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts) } __fenv_static inline int -fesetexceptflag(const fexcept_t *__flagp, int __excepts) +__fesetexceptflag_int(const fexcept_t *__flagp, int __excepts) { fexcept_t __r; @@ -118,7 +139,7 @@ fesetexceptflag(const fexcept_t *__flagp, int __excepts) } __fenv_static inline int -feraiseexcept(int __excepts) +__feraiseexcept_int(int __excepts) { fexcept_t __r; @@ -129,7 +150,7 @@ feraiseexcept(int __excepts) } __fenv_static inline int -fetestexcept(int __excepts) +__fetestexcept_int(int __excepts) { fexcept_t __r; @@ -138,7 +159,7 @@ fetestexcept(int __excepts) } __fenv_static inline int -fegetround(void) +__fegetround_int(void) { fenv_t __r; @@ -147,7 +168,7 @@ fegetround(void) } __fenv_static inline int -fesetround(int __round) +__fesetround_int(int __round) { fenv_t __r; @@ -161,7 +182,7 @@ fesetround(int __round) } __fenv_static inline int -fegetenv(fenv_t *__envp) +__fegetenv_int(fenv_t *__envp) { __uint64_t fpcr; __uint64_t fpsr; @@ -174,7 +195,7 @@ fegetenv(fenv_t *__envp) } __fenv_static inline int -feholdexcept(fenv_t *__envp) +__feholdexcept_int(fenv_t *__envp) { fenv_t __r; @@ -191,7 +212,7 @@ feholdexcept(fenv_t *__envp) } __fenv_static inline int -fesetenv(const fenv_t *__envp) +__fesetenv_int(const fenv_t *__envp) { __msr_fpcr((*__envp) >> 32); @@ -200,7 +221,7 @@ fesetenv(const fenv_t *__envp) } __fenv_static inline int -feupdateenv(const fenv_t *__envp) +__feupdateenv_int(const fenv_t *__envp) { fexcept_t __r; From nobody Mon Apr 6 06:54:49 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SV0C84z6Ysxx for ; Mon, 06 Apr 2026 06:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq0ST12Tkz3fpg for ; Mon, 06 Apr 2026 06:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bY2PNtED4l3JP9uYGh0dqtxIbzLtRqoF/yspwOoHJuw=; b=g0vvzW1o8cBQtBcyTXdNQ7u08IUosKjZHGksPfj2brhP0/Lriy61K6JP0r+3IuvdF9xR1E So7PivYzCEh/N/hJpSbLBDai+aoawgJM5vaV8YttSG94gbSUC1WfJCW02u9hwvsWJgSL3G BLxY9PTtlTsbFMGIx/p/x2RfXztSzYbAi2Kghl2XV+4pZB0wEE2F2TlzkmOfVQf8gxqT5m chW8FH9lhQhPirj/CQdh6QAERNUNjhRbdRBKq6WphMVQc98S7fJGyKdsjUmMtu8jgupuPO NwUzAme1BPPe59Sm4wsay+09n2YbMKekPJa7TzQtkbeCr1aLS7l8eOUcDFL7GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775458489; a=rsa-sha256; cv=none; b=qtIEPp7QNEN62ohvMBwqqeMnJLxeUbmzPvNOaV0Rl2GlIb8Oo2oAP5Rp4lZzamlGpeYeYS EcdBjBlsrdceTFTFvpPCR/wh6ChffrMNciYegAR9yBgmC8vtWBSsgVf+UXhybK7A2pZ1Bv dJeyDlmDwVHmzo4zDEAK4POaMDyOd75T6VhbxVqx5n4dujLQXhWwOdAmROcxI2aZsS7wii 91pwWW/XQbNAKCQpfTCQSW+UplcUhe+8nwU5VwZIRSI+dqgTCMxyb4XaknwAh0fFnYC2On m7WrDrz3A+IQ3OKCqmUb+a10T1PrOoCad46cnomyBp8JvNdavvPePzAoQzrw4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bY2PNtED4l3JP9uYGh0dqtxIbzLtRqoF/yspwOoHJuw=; b=qFDAQYfiiw+W6Yos4izgz7FXiW+8Mc4ncf02ceyen4PfZYlOHJBNJ3m2CG0plA8SsHx+zQ 8/1kI4EDOIQLUnG7iXRD/wO52Us06RZPYzQXVnEzN+vWSVCjVvzswE/0Ve2aFTIwgyVB4x I7fzTD9H8TYVLtucqlmIyw+74akbQigaTBxKhb3rDkk4WQacu46/V79sU7rANs0uzgb537 OMex+QLzWayu9oR676hT1MuERieDnj50VvjM78VdvirfKGMHicoO/In3uG4HGzxqQlVfYl vf+oBIJ0eGI83U1Q3YPprqOd4y9AfZ3B/GSdTTVvbeEkuKlNVAE8nzhkn4Q+ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq0ST0G1Xzjgv for ; Mon, 06 Apr 2026 06:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 340a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 06:54:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f13155c57c1f - stable/15 - msun/riscv: convert fenv functions to proper linkage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: f13155c57c1f2e6ad7b3a84f630daf1c31a4ae7f Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 06:54:49 +0000 Message-Id: <69d358b9.340a7.7689186c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f13155c57c1f2e6ad7b3a84f630daf1c31a4ae7f commit f13155c57c1f2e6ad7b3a84f630daf1c31a4ae7f Author: Konstantin Belousov AuthorDate: 2026-03-29 01:27:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-05 07:47:10 +0000 msun/riscv: convert fenv functions to proper linkage PR: 277958 (cherry picked from commit 6b89f5360f8441ffd1a3e8db7375ed3ccdba7d2a) --- lib/msun/riscv/fenv.c | 84 +++++++++++++++++++++++++++++++++++++++++++-------- lib/msun/riscv/fenv.h | 51 +++++++++++++++++++++++-------- 2 files changed, 110 insertions(+), 25 deletions(-) diff --git a/lib/msun/riscv/fenv.c b/lib/msun/riscv/fenv.c index 4d1b2cb2f611..1f1f8eddc2d6 100644 --- a/lib/msun/riscv/fenv.c +++ b/lib/msun/riscv/fenv.c @@ -43,16 +43,74 @@ int return (__feclearexcept_int(excepts)); } -extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); -extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); -extern inline int feraiseexcept(int __excepts); -extern inline int fetestexcept(int __excepts); -extern inline int fegetround(void); -extern inline int fesetround(int __round); -extern inline int fegetenv(fenv_t *__envp); -extern inline int feholdexcept(fenv_t *__envp); -extern inline int fesetenv(const fenv_t *__envp); -extern inline int feupdateenv(const fenv_t *__envp); -extern inline int feenableexcept(int __mask); -extern inline int fedisableexcept(int __mask); -extern inline int fegetexcept(void); +int +(fegetexceptflag)(fexcept_t *flagp, int excepts) +{ + return (__fegetexceptflag_int(flagp, excepts)); +} + +int +(fesetexceptflag)(const fexcept_t *flagp, int excepts) +{ + return (__fesetexceptflag_int(flagp, excepts)); +} + +int +(feraiseexcept)(int excepts) +{ + return (__feraiseexcept_int(excepts)); +} + +int +(fetestexcept)(int excepts) +{ + return (__fetestexcept_int(excepts)); +} + +int +(fegetround)(void) +{ + return (__fegetround_int()); +} + +int +(fesetround)(int round) +{ + return (__fesetround_int(round)); +} + +int +(fegetenv)(fenv_t *envp) +{ + return (__fegetenv_int(envp)); +} + +int +(feholdexcept)(fenv_t *envp) +{ + return (__feholdexcept_int(envp)); +} + +int +(fesetenv)(const fenv_t *envp) +{ + return (__fesetenv_int(envp)); +} + +int +(feupdateenv)(const fenv_t *envp) +{ + return (__feupdateenv_int(envp)); +} + +int +(feenableexcept)(int mask) +{ + return (__feenableexcept_int(mask)); +} + +int +(fedisableexcept)(int mask) +{ + return (__fedisableexcept_int(mask)); +} diff --git a/lib/msun/riscv/fenv.h b/lib/msun/riscv/fenv.h index 4e8f81aa04c1..1059744941f3 100644 --- a/lib/msun/riscv/fenv.h +++ b/lib/msun/riscv/fenv.h @@ -80,7 +80,28 @@ extern const fenv_t __fe_dfl_env; #define __wfs(__fcsr) __asm __volatile("csrw fcsr, %0" :: "r" (__fcsr)) int feclearexcept(int); +int fegetexceptflag(fexcept_t *, int); +int fesetexceptflag(const fexcept_t *, int); +int feraiseexcept(int); +int fetestexcept(int); +int fegetround(void); +int fesetround(int); +int fegetenv(fenv_t *); +int feholdexcept(fenv_t *); +int fesetenv(const fenv_t *); +int feupdateenv(const fenv_t *); + #define feclearexcept(a) __feclearexcept_int(a) +#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) +#define fesetexceptflag(e, a) __fesetexceptflag_int(e, a) +#define feraiseexcept(a) __feraiseexcept_int(a) +#define fetestexcept(a) __fetestexcept_int(a) +#define fegetround() __fegetround_int() +#define fesetround(a) __fesetround_int(a) +#define fegetenv(e) __fegetenv_int(e) +#define feholdexcept(e) __feholdexcept_int(e) +#define fesetenv(e) __fesetenv_int(e) +#define feupdateenv(e) __feupdateenv_int(e) __fenv_static inline int __feclearexcept_int(int __excepts) @@ -92,7 +113,7 @@ __feclearexcept_int(int __excepts) } __fenv_static inline int -fegetexceptflag(fexcept_t *__flagp, int __excepts) +__fegetexceptflag_int(fexcept_t *__flagp, int __excepts) { fexcept_t __fcsr; @@ -103,7 +124,7 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts) } __fenv_static inline int -fesetexceptflag(const fexcept_t *__flagp, int __excepts) +__fesetexceptflag_int(const fexcept_t *__flagp, int __excepts) { fexcept_t __fcsr; @@ -115,7 +136,7 @@ fesetexceptflag(const fexcept_t *__flagp, int __excepts) } __fenv_static inline int -feraiseexcept(int __excepts) +__feraiseexcept_int(int __excepts) { __asm __volatile("csrs fflags, %0" :: "r"(__excepts)); @@ -124,7 +145,7 @@ feraiseexcept(int __excepts) } __fenv_static inline int -fetestexcept(int __excepts) +__fetestexcept_int(int __excepts) { fexcept_t __fcsr; @@ -134,7 +155,7 @@ fetestexcept(int __excepts) } __fenv_static inline int -fegetround(void) +__fegetround_int(void) { fexcept_t __fcsr; @@ -144,7 +165,7 @@ fegetround(void) } __fenv_static inline int -fesetround(int __round) +__fesetround_int(int __round) { fexcept_t __fcsr; @@ -160,7 +181,7 @@ fesetround(int __round) } __fenv_static inline int -fegetenv(fenv_t *__envp) +__fegetenv_int(fenv_t *__envp) { __rfs(*__envp); @@ -169,7 +190,7 @@ fegetenv(fenv_t *__envp) } __fenv_static inline int -feholdexcept(fenv_t *__envp __unused) +__feholdexcept_int(fenv_t *__envp __unused) { /* No exception traps. */ @@ -178,7 +199,7 @@ feholdexcept(fenv_t *__envp __unused) } __fenv_static inline int -fesetenv(const fenv_t *__envp) +__fesetenv_int(const fenv_t *__envp) { __wfs(*__envp); @@ -187,7 +208,7 @@ fesetenv(const fenv_t *__envp) } __fenv_static inline int -feupdateenv(const fenv_t *__envp) +__feupdateenv_int(const fenv_t *__envp) { fexcept_t __fcsr; @@ -200,8 +221,14 @@ feupdateenv(const fenv_t *__envp) #if __BSD_VISIBLE +int feenableexcept(int); +int fedisableexcept(int); + +#define feenableexcept(a) __feenableexcept_int(a) +#define fedisableexcept(a) __fedisableexcept_int(a) + __fenv_static inline int -feenableexcept(int __mask __unused) +__feenableexcept_int(int __mask __unused) { /* No exception traps. */ @@ -210,7 +237,7 @@ feenableexcept(int __mask __unused) } __fenv_static inline int -fedisableexcept(int __mask __unused) +__fedisableexcept_int(int __mask __unused) { /* No exception traps. */ From nobody Mon Apr 6 06:54:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SV4VPYz6Yscg for ; Mon, 06 Apr 2026 06:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq0SV29Ksz3fs3 for ; Mon, 06 Apr 2026 06:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VtqtU4llYrpXkWKmsJ7568swAHgKfXB9K9lIeb0E8Bg=; b=XvlzsDGbR1pU3dpuFr+GViqIuv/WTXQQsgvJLu1NG4LRxKrIsN0Y6QTiEQ16QpEYdi28M3 S3WW50tYOyPP65qWQ/esZwp1mMvuTpTUHQydndthKLZ3aWl+8B3KghVShqq6HNLH8jq3m/ Jbv4E/UnTUwMPDWkcxyC5+WUK5q7jfJTI/cHdijkNAyGGfAlQ09wGaWvwyjy7Lw2bU0VDY 8iV9iRqS6xB/hJMr+S55fbC+tek0OUSqcJKHMShVtt3mwzHgIsNvw7VQOClURxS6PDxbMf wD1csPPKclaBKDKXXXpwoVQPP3NSf2whDMIUsGqaGiuigQAUSwLg/df9giPAbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775458490; a=rsa-sha256; cv=none; b=b980rGsuXbLxNmZSXHk1ufHO1BVC3qHC5M0DOzU8opBrex4cYq0VumV0eHmMMLA9O9p2yA 38JVXQwlGYxU8lVRKzaGu8WeM4FbC12pVAWMhtSIISTT8ZkF6YViui4ncnPI2u55grdPyW Oq2ZZzrjkT7IQDgr6YDdrOj73kHzlYTDqyuKFyi/RWuWWYKDVl66REKwJWaAw4kIArgJXK oUCVccXrWlNjZHZLmZhXe+ysl7rnurkwTnqIHSGgDb22Z3uYUAebZKHrL6xwMFraucwBw9 pcELIlyCN4iJ2bj2u4nucRaMV/0GvEeMQpgl2Ryncm8m9ecIjF1K6uUEpRiiog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VtqtU4llYrpXkWKmsJ7568swAHgKfXB9K9lIeb0E8Bg=; b=Un4bDd37o9vV/Jez0f+Fomapt2f1USqBYWGc0SvU0igXN2cx7ImTcMTsV05yUyA3DwBQE5 ATk/eQO63qRE3P6Ud1OtF936hnZrE6dr+eo8va8ElT83jJoJBkEU3kYJAgcwyL4W7MA+2p DU0nSb3ImrHohyjjRFQensftiS84x/4xARLcP624jZWMSkEqU9Ir1G9Gykb5OzwYATIZdY PRiIFPVQN/9qT13GE4C068Sl/UxQ/3LAyMRJwn5FdNsgRDgVoibups3Ntu1gOSO4YwcxcH HlqWxjorEQUJzxGv9PUs489s62rbVva62mi3TzoZeAqn/p7mZfddK/AFSuBT5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SV159qzjVt for ; Mon, 06 Apr 2026 06:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3421b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 06:54:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2d81a953ca54 - stable/15 - msun/powerpc: convert fenv functions to proper linkage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2d81a953ca54309235e136f5ea6766f08e48a6ca Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 06:54:50 +0000 Message-Id: <69d358ba.3421b.17d89d7a@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2d81a953ca54309235e136f5ea6766f08e48a6ca commit 2d81a953ca54309235e136f5ea6766f08e48a6ca Author: Konstantin Belousov AuthorDate: 2026-03-29 02:06:02 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-05 07:47:10 +0000 msun/powerpc: convert fenv functions to proper linkage PR: 277958 (cherry picked from commit e4505a58a77f6f4f2df60d26ea99710af6c6b3cf) --- lib/msun/powerpc/fenv.c | 89 ++++++++++++++++++++++++++++++++++++++++--------- lib/msun/powerpc/fenv.h | 51 +++++++++++++++++++++------- 2 files changed, 112 insertions(+), 28 deletions(-) diff --git a/lib/msun/powerpc/fenv.c b/lib/msun/powerpc/fenv.c index b0f32c67b667..d13600ae8d6c 100644 --- a/lib/msun/powerpc/fenv.c +++ b/lib/msun/powerpc/fenv.c @@ -49,25 +49,10 @@ int return (__feclearexcept_int(excepts)); } -extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); -extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); -#ifndef __SPE__ -extern inline int feraiseexcept(int __excepts); -#endif -extern inline int fetestexcept(int __excepts); -extern inline int fegetround(void); -extern inline int fesetround(int __round); -extern inline int fegetenv(fenv_t *__envp); -extern inline int feholdexcept(fenv_t *__envp); -extern inline int fesetenv(const fenv_t *__envp); -extern inline int feupdateenv(const fenv_t *__envp); -extern inline int feenableexcept(int __mask); -extern inline int fedisableexcept(int __mask); - #ifdef __SPE__ #define PMAX 0x7f7fffff #define PMIN 0x00800000 -int feraiseexcept(int __excepts) +int (feraiseexcept)(int __excepts) { uint32_t spefscr; @@ -87,3 +72,75 @@ int feraiseexcept(int __excepts) return (0); } #endif + +int +(fegetexceptflag)(fexcept_t *flagp, int excepts) +{ + return (__fegetexceptflag_int(flagp, excepts)); +} + +int +(fesetexceptflag)(const fexcept_t *flagp, int excepts) +{ + return (__fesetexceptflag_int(flagp, excepts)); +} + +int +(feraiseexcept)(int excepts) +{ + return (__feraiseexcept_int(excepts)); +} + +int +(fetestexcept)(int excepts) +{ + return (__fetestexcept_int(excepts)); +} + +int +(fegetround)(void) +{ + return (__fegetround_int()); +} + +int +(fesetround)(int round) +{ + return (__fesetround_int(round)); +} + +int +(fegetenv)(fenv_t *envp) +{ + return (__fegetenv_int(envp)); +} + +int +(feholdexcept)(fenv_t *envp) +{ + return (__feholdexcept_int(envp)); +} + +int +(fesetenv)(const fenv_t *envp) +{ + return (__fesetenv_int(envp)); +} + +int +(feupdateenv)(const fenv_t *envp) +{ + return (__feupdateenv_int(envp)); +} + +int +(feenableexcept)(int mask) +{ + return (__feenableexcept_int(mask)); +} + +int +(fedisableexcept)(int mask) +{ + return (__fedisableexcept_int(mask)); +} diff --git a/lib/msun/powerpc/fenv.h b/lib/msun/powerpc/fenv.h index 2af5cda5f9ea..21a99e0fbb5f 100644 --- a/lib/msun/powerpc/fenv.h +++ b/lib/msun/powerpc/fenv.h @@ -131,7 +131,28 @@ union __fpscr { }; int feclearexcept(int); +int fegetexceptflag(fexcept_t *, int); +int fesetexceptflag(const fexcept_t *, int); +int feraiseexcept(int); +int fetestexcept(int); +int fegetround(void); +int fesetround(int); +int fegetenv(fenv_t *); +int feholdexcept(fenv_t *); +int fesetenv(const fenv_t *); +int feupdateenv(const fenv_t *); + #define feclearexcept(a) __feclearexcept_int(a) +#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) +#define fesetexceptflag(e, a) __fesetexceptflag_int(e, a) +#define feraiseexcept(a) __feraiseexcept_int(a) +#define fetestexcept(a) __fetestexcept_int(a) +#define fegetround() __fegetround_int() +#define fesetround(a) __fesetround_int(a) +#define fegetenv(e) __fegetenv_int(e) +#define feholdexcept(e) __feholdexcept_int(e) +#define fesetenv(e) __fesetenv_int(e) +#define feupdateenv(e) __feupdateenv_int(e) __fenv_static inline int __feclearexcept_int(int __excepts) @@ -147,7 +168,7 @@ __feclearexcept_int(int __excepts) } __fenv_static inline int -fegetexceptflag(fexcept_t *__flagp, int __excepts) +__fegetexceptflag_int(fexcept_t *__flagp, int __excepts) { union __fpscr __r; @@ -157,7 +178,7 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts) } __fenv_static inline int -fesetexceptflag(const fexcept_t *__flagp, int __excepts) +__fesetexceptflag_int(const fexcept_t *__flagp, int __excepts) { union __fpscr __r; @@ -174,7 +195,7 @@ fesetexceptflag(const fexcept_t *__flagp, int __excepts) extern int feraiseexcept(int __excepts); #else __fenv_static inline int -feraiseexcept(int __excepts) +__feraiseexcept_int(int __excepts) { union __fpscr __r; @@ -188,7 +209,7 @@ feraiseexcept(int __excepts) #endif __fenv_static inline int -fetestexcept(int __excepts) +__fetestexcept_int(int __excepts) { union __fpscr __r; @@ -197,7 +218,7 @@ fetestexcept(int __excepts) } __fenv_static inline int -fegetround(void) +__fegetround_int(void) { union __fpscr __r; @@ -206,7 +227,7 @@ fegetround(void) } __fenv_static inline int -fesetround(int __round) +__fesetround_int(int __round) { union __fpscr __r; @@ -220,7 +241,7 @@ fesetround(int __round) } __fenv_static inline int -fegetenv(fenv_t *__envp) +__fegetenv_int(fenv_t *__envp) { union __fpscr __r; @@ -230,7 +251,7 @@ fegetenv(fenv_t *__envp) } __fenv_static inline int -feholdexcept(fenv_t *__envp) +__feholdexcept_int(fenv_t *__envp) { union __fpscr __r; @@ -242,7 +263,7 @@ feholdexcept(fenv_t *__envp) } __fenv_static inline int -fesetenv(const fenv_t *__envp) +__fesetenv_int(const fenv_t *__envp) { union __fpscr __r; @@ -252,7 +273,7 @@ fesetenv(const fenv_t *__envp) } __fenv_static inline int -feupdateenv(const fenv_t *__envp) +__feupdateenv_int(const fenv_t *__envp) { union __fpscr __r; @@ -265,8 +286,14 @@ feupdateenv(const fenv_t *__envp) #if __BSD_VISIBLE +int feenableexcept(int); +int fedisableexcept(int); + +#define feenableexcept(a) __feenableexcept_int(a) +#define fedisableexcept(a) __fedisableexcept_int(a) + __fenv_static inline int -feenableexcept(int __mask) +__feenableexcept_int(int __mask) { union __fpscr __r; fenv_t __oldmask; @@ -279,7 +306,7 @@ feenableexcept(int __mask) } __fenv_static inline int -fedisableexcept(int __mask) +__fedisableexcept_int(int __mask) { union __fpscr __r; fenv_t __oldmask; From nobody Mon Apr 6 06:54:51 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SW5hNfz6Ysy0 for ; Mon, 06 Apr 2026 06:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq0SW2YLnz3fvj for ; Mon, 06 Apr 2026 06:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rwlafs7qb45upbBAGbq9/YUsYncTyHwSTwasSuV/uCA=; b=wJo9n7o/W30KiPvMBohmzGRYFPiAWFPEltnqbJqfvm1uV1QX6BNydD06gMSpF/sIPRKLnO s1oX/e5dBgqMIoaoTKke5aYNf0mT6g4mKfJi86AgYMuFWR4UtDlzVgvjqdB7ml57Rx3KOF Zd+qkrTpxdepT0yKfRiH+Gy3ntuVTf0XfHWaHQ9jHxWkf7FrqMzMRwGS9Wh0W3ApSweoQy V6CJkDZpUvdz3vVQaNK1LqR4NPP/WT7HA04SC/zruqDMzTediqkEn1gFMZMmigXoc0MoKc LgifecCfZ6X5aGvdMihgHijbqbw66/yV+m25PPa7itkFUEhJATuzbqE978EcnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775458491; a=rsa-sha256; cv=none; b=Q7/piSxaiU2tEeQkv5YcxLLIR2ASN79aPq8kcYJxRcZYA3YLnS4PmnmClxrfwPtBtZaNpe OuKvOKuKgpXV5rD4XFf1r7SJaC3uLo64nS0CQgpA9D5NWEvRzlVF2nkzwogGU4wA7x2TSh VoeAsec7F16Gkp2up0G0XyXOqgQm1w2JUr/NeLxQCpvAaLlg8j7oOb/nNRHwTYOaW74Vu7 5eXqRqy/TR3NN21lmYxovvqA5WBam5n5Lni0atUObFMIEq54ctpFx1OJl5VLTZdQJYKoGx BJCPOAca+iypxqAoFG+zZYppYuPOXN9ExHIHfN4M/dUcN67NmQ1JrVefANSHCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rwlafs7qb45upbBAGbq9/YUsYncTyHwSTwasSuV/uCA=; b=KCGPVK96j0JuCRss94segsOtFNW2MCg9d/HFP4Ikb2gF4vlfWm/aywEu8fvjC6aeiDgZeP eJHQtP8mRo5TL0bR9f9lITRBdWqVIqZAc34Nqw76a240wUVq7CMrtWt68oV80NODI355iY 8MDbEIXCl82POhoAVufu+zjSIB9YBRlGZUZG4pP6ZhcykI8LNMcyAf4nG2yIa3P/7kyHM7 Ke9k5jA+1NuoIKnKzIg33obx+PMx1XdXQ18oyHIy6aQnhQiMYkXqERAa4M/gCnABwsZzRI jGtzT+IXXIiTjxzAUa82qQtpbGlFX/oiKt0/vbz860ttCibMSqS2AJDMNpHPSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SW1vxxzjp3 for ; Mon, 06 Apr 2026 06:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34335 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 06:54:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: faca80fb6688 - stable/15 - msun/arm: convert fenv functions to proper linkage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: faca80fb6688f0203544f6bf854092f0383cf436 Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 06:54:51 +0000 Message-Id: <69d358bb.34335.5eb11414@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=faca80fb6688f0203544f6bf854092f0383cf436 commit faca80fb6688f0203544f6bf854092f0383cf436 Author: Konstantin Belousov AuthorDate: 2026-03-29 03:10:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-05 07:47:10 +0000 msun/arm: convert fenv functions to proper linkage PR: 277958 (cherry picked from commit 70674434e2424d61262322702d0415e54d8cc1a2) --- lib/msun/arm/fenv.c | 133 +++++++++++++++++++++++++++++++++++++++++----------- lib/msun/arm/fenv.h | 58 ++++++++++++++++++----- 2 files changed, 150 insertions(+), 41 deletions(-) diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c index c8edf3fef037..620a05d51b90 100644 --- a/lib/msun/arm/fenv.c +++ b/lib/msun/arm/fenv.c @@ -76,19 +76,83 @@ int return (__feclearexcept_int(excepts)); } -extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); -extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); -extern inline int feraiseexcept(int __excepts); -extern inline int fetestexcept(int __excepts); -extern inline int fegetround(void); -extern inline int fesetround(int __round); -extern inline int fegetenv(fenv_t *__envp); -extern inline int feholdexcept(fenv_t *__envp); -extern inline int fesetenv(const fenv_t *__envp); -extern inline int feupdateenv(const fenv_t *__envp); -extern inline int feenableexcept(int __mask); -extern inline int fedisableexcept(int __mask); -extern inline int fegetexcept(void); +int +(fegetexceptflag)(fexcept_t *flagp, int excepts) +{ + return (__fegetexceptflag_int(flagp, excepts)); +} + +int +(fesetexceptflag)(const fexcept_t *flagp, int excepts) +{ + return (__fesetexceptflag_int(flagp, excepts)); +} + +int +(feraiseexcept)(int excepts) +{ + return (__feraiseexcept_int(excepts)); +} + +int +(fetestexcept)(int excepts) +{ + return (__fetestexcept_int(excepts)); +} + +int +(fegetround)(void) +{ + return (__fegetround_int()); +} + +int +(fesetround)(int round) +{ + return (__fesetround_int(round)); +} + +int +(fegetenv)(fenv_t *envp) +{ + return (__fegetenv_int(envp)); +} + +int +(feholdexcept)(fenv_t *envp) +{ + return (__feholdexcept_int(envp)); +} + +int +(fesetenv)(const fenv_t *envp) +{ + return (__fesetenv_int(envp)); +} + +int +(feupdateenv)(const fenv_t *envp) +{ + return (__feupdateenv_int(envp)); +} + +int +(feenableexcept)(int mask) +{ + return (__feenableexcept_int(mask)); +} + +int +(fedisableexcept)(int mask) +{ + return (__fedisableexcept_int(mask)); +} + +int +(fegetexcept)(void) +{ + return (__fegetexcept_int()); +} #else /* !FENV_MANGLE && SOFTFP_ABI */ /* Set by libc when the VFP unit is enabled */ @@ -158,7 +222,8 @@ __softfp_round_from_vfp(int round) } } -int feclearexcept(int __excepts) +int +(feclearexcept)(int __excepts) { if (_libc_arm_fpu_present) @@ -168,7 +233,8 @@ int feclearexcept(int __excepts) return (0); } -int fegetexceptflag(fexcept_t *__flagp, int __excepts) +int +(fegetexceptflag)(fexcept_t *__flagp, int __excepts) { fexcept_t __vfp_flagp; @@ -182,7 +248,8 @@ int fegetexceptflag(fexcept_t *__flagp, int __excepts) return (0); } -int fesetexceptflag(const fexcept_t *__flagp, int __excepts) +int +(fesetexceptflag)(const fexcept_t *__flagp, int __excepts) { if (_libc_arm_fpu_present) @@ -192,7 +259,8 @@ int fesetexceptflag(const fexcept_t *__flagp, int __excepts) return (0); } -int feraiseexcept(int __excepts) +int +(feraiseexcept)(int __excepts) { if (_libc_arm_fpu_present) @@ -202,7 +270,8 @@ int feraiseexcept(int __excepts) return (0); } -int fetestexcept(int __excepts) +int +(fetestexcept)(int __excepts) { int __got_excepts; @@ -214,7 +283,8 @@ int fetestexcept(int __excepts) return (__got_excepts); } -int fegetround(void) +int +(fegetround)(void) { if (_libc_arm_fpu_present) @@ -222,7 +292,8 @@ int fegetround(void) return __softfp_fegetround(); } -int fesetround(int __round) +int +(fesetround)(int __round) { if (_libc_arm_fpu_present) @@ -232,7 +303,8 @@ int fesetround(int __round) return (0); } -int fegetenv(fenv_t *__envp) +int +(fegetenv)(fenv_t *__envp) { fenv_t __vfp_envp; @@ -245,7 +317,8 @@ int fegetenv(fenv_t *__envp) return (0); } -int feholdexcept(fenv_t *__envp) +int +(feholdexcept)(fenv_t *__envp) { fenv_t __vfp_envp; @@ -258,7 +331,8 @@ int feholdexcept(fenv_t *__envp) return (0); } -int fesetenv(const fenv_t *__envp) +int +(fesetenv)(const fenv_t *__envp) { if (_libc_arm_fpu_present) @@ -268,7 +342,8 @@ int fesetenv(const fenv_t *__envp) return (0); } -int feupdateenv(const fenv_t *__envp) +int +(feupdateenv)(const fenv_t *__envp) { if (_libc_arm_fpu_present) @@ -278,7 +353,8 @@ int feupdateenv(const fenv_t *__envp) return (0); } -int feenableexcept(int __mask) +int +(feenableexcept)(int __mask) { int __unmasked; @@ -290,7 +366,8 @@ int feenableexcept(int __mask) return (__unmasked); } -int fedisableexcept(int __mask) +int +(fedisableexcept)(int __mask) { int __unmasked; @@ -302,7 +379,8 @@ int fedisableexcept(int __mask) return (__unmasked); } -int fegetexcept(void) +int +(fegetexcept)(void) { int __unmasked; @@ -315,4 +393,3 @@ int fegetexcept(void) } #endif - diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h index 14638dd33aa7..78ca9ef0f589 100644 --- a/lib/msun/arm/fenv.h +++ b/lib/msun/arm/fenv.h @@ -112,7 +112,39 @@ int fegetexcept(void); #define _FPU_MASK_SHIFT 8 int feclearexcept(int); +int fegetexceptflag(fexcept_t *, int); +int fesetexceptflag(const fexcept_t *, int); +int feraiseexcept(int); +int fetestexcept(int); +int fegetround(void); +int fesetround(int); +int fegetenv(fenv_t *); +int feholdexcept(fenv_t *); +int fesetenv(const fenv_t *); +int feupdateenv(const fenv_t *); +int fegetexcept(void); +#if __BSD_VISIBLE +int feenableexcept(int); +int fedisableexcept(int); +int fegetexcept(void); +#endif + #define feclearexcept(a) __feclearexcept_int(a) +#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) +#define fesetexceptflag(e, a) __fesetexceptflag_int(e, a) +#define feraiseexcept(a) __feraiseexcept_int(a) +#define fetestexcept(a) __fetestexcept_int(a) +#define fegetround() __fegetround_int() +#define fesetround(a) __fesetround_int(a) +#define fegetenv(e) __fegetenv_int(e) +#define feholdexcept(e) __feholdexcept_int(e) +#define fesetenv(e) __fesetenv_int(e) +#define feupdateenv(e) __feupdateenv_int(e) +#if __BSD_VISIBLE +#define feenableexcept(a) __feenableexcept_int(a) +#define fedisableexcept(a) __fedisableexcept_int(a) +#define fegetexcept() __fegetexcept_int() +#endif __fenv_static inline int __feclearexcept_int(int __excepts) @@ -126,7 +158,7 @@ __feclearexcept_int(int __excepts) } __fenv_static inline int -fegetexceptflag(fexcept_t *__flagp, int __excepts) +__fegetexceptflag_int(fexcept_t *__flagp, int __excepts) { fexcept_t __fpsr; @@ -136,7 +168,7 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts) } __fenv_static inline int -fesetexceptflag(const fexcept_t *__flagp, int __excepts) +__fesetexceptflag_int(const fexcept_t *__flagp, int __excepts) { fexcept_t __fpsr; @@ -148,7 +180,7 @@ fesetexceptflag(const fexcept_t *__flagp, int __excepts) } __fenv_static inline int -feraiseexcept(int __excepts) +__feraiseexcept_int(int __excepts) { fexcept_t __ex = __excepts; @@ -157,7 +189,7 @@ feraiseexcept(int __excepts) } __fenv_static inline int -fetestexcept(int __excepts) +__fetestexcept_int(int __excepts) { fexcept_t __fpsr; @@ -166,7 +198,7 @@ fetestexcept(int __excepts) } __fenv_static inline int -fegetround(void) +__fegetround_int(void) { fenv_t __fpsr; @@ -175,7 +207,7 @@ fegetround(void) } __fenv_static inline int -fesetround(int __round) +__fesetround_int(int __round) { fenv_t __fpsr; @@ -187,7 +219,7 @@ fesetround(int __round) } __fenv_static inline int -fegetenv(fenv_t *__envp) +__fegetenv_int(fenv_t *__envp) { vmrs_fpscr(*__envp); @@ -195,7 +227,7 @@ fegetenv(fenv_t *__envp) } __fenv_static inline int -feholdexcept(fenv_t *__envp) +__feholdexcept_int(fenv_t *__envp) { fenv_t __env; @@ -207,7 +239,7 @@ feholdexcept(fenv_t *__envp) } __fenv_static inline int -fesetenv(const fenv_t *__envp) +__fesetenv_int(const fenv_t *__envp) { vmsr_fpscr(*__envp); @@ -215,7 +247,7 @@ fesetenv(const fenv_t *__envp) } __fenv_static inline int -feupdateenv(const fenv_t *__envp) +__feupdateenv_int(const fenv_t *__envp) { fexcept_t __fpsr; @@ -230,7 +262,7 @@ feupdateenv(const fenv_t *__envp) /* We currently provide no external definitions of the functions below. */ __fenv_static inline int -feenableexcept(int __mask) +__feenableexcept_int(int __mask) { fenv_t __old_fpsr, __new_fpsr; @@ -242,7 +274,7 @@ feenableexcept(int __mask) } __fenv_static inline int -fedisableexcept(int __mask) +__fedisableexcept_int(int __mask) { fenv_t __old_fpsr, __new_fpsr; @@ -254,7 +286,7 @@ fedisableexcept(int __mask) } __fenv_static inline int -fegetexcept(void) +__fegetexcept_int(void) { fenv_t __fpsr; From nobody Mon Apr 6 06:54:52 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SY0MGzz6Yt2p for ; Mon, 06 Apr 2026 06:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq0SX37PGz3g3p for ; Mon, 06 Apr 2026 06:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0Pk7ce9vFeFR9mIsQEpf+NqLRyjZPBii1U3CqMwiII=; b=FLAeGv5rRJSgYwGLFeNNANPYxGzLBQS5R3G8dstRB1POY1LZAmMgTEz3RF6WkmZtjuGngj qAPXOzWXhko3UVc3TSt1Gqab9UX+BDEdEhYIAqW4/BJYd082ShxvCiR4YZ81FNlhMZmpM9 uyUuZLiOjqIleRGILDU40IEDuVkMdjyIn/gpSomDBHUvCjbhRQANbUE2d5oK3KMK84Qy0Q KIRJMoYQimgELAwv6OsoUvRG0PQR6T0t07QO2AykVdWBKOQT0T2pvEkqjaoG723Cg9qrox 3IhR/rO9iEuqjakEcrbHUkIWEMGxnm6eK2NVTDDAA29E+ZVB5jMJ4cp3DFM3lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775458492; a=rsa-sha256; cv=none; b=arYLN5VaDCeeIMq674l77QgiAKrC9YfpEn7zQO1sSQeYuytpxE9equL91f67BSP6puuLMU VLTMm9GmUdfSuMQCqfupz+3bwep/cxOdqRZHAj9gpDkXX7nwQVLTzTjCc52XgLj5WJb7EI Wg6j0zHQ3sCf3hQz/kkx7qqJ0CNT6zH8/CcBkYyN8FVz2W1lSp5RGaNAtylcJzS8HBARmq 5QIpKgpueZnlk6oaMOfZsqa65BB0AOYygrsRwSDIl+RcHt5n81BV+wFoRHD3zHsu1qANU+ IzOHh/D9eUqW3CjZJv48RJ7xUCsL7ufNkKizIKTqgndeNToX9b16o7VzLBRDOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0Pk7ce9vFeFR9mIsQEpf+NqLRyjZPBii1U3CqMwiII=; b=YcyPR8d1S9JXglVUzTs2OXJe7O28ZWpma/UyFMVPNb40ftut9YFLDvFcRefMc8vAkm84ty DmXrXIKLvSDUlInWZW5nCcqrEoTllBlDQ6brGz1V7f+YgG3SXPu7ZyhmiShxTj3knyS9Ft 8kb1sJAM1J+OxTZKaWpRuZzQJQGYk3AizcCwb6FQ1ILdi84mXZ6GkeoQJ3ltaj7SMCDIY+ I+AaniKw8i7ViQNs5uwZqWsTnuE2hwA55c3DpLPdfiWiKdnNPVZyq4jqQmqJHPyqsdU5g5 vjT70eohVcedhCnhgqE7jwUCAcTi1EQtcbHSj99e7LlUi33kDlrYQJIDYl4FMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SX2hFKzjlx for ; Mon, 06 Apr 2026 06:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34295 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 06:54:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 081f52a44191 - stable/15 - msun: remove requirement to have C99 inline 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: 081f52a441918da51c4f5891dcb125bf8293ff2e Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 06:54:52 +0000 Message-Id: <69d358bc.34295.6a22b8e0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=081f52a441918da51c4f5891dcb125bf8293ff2e commit 081f52a441918da51c4f5891dcb125bf8293ff2e Author: Konstantin Belousov AuthorDate: 2026-03-29 01:30:03 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-05 07:47:10 +0000 msun: remove requirement to have C99 inline semantic PR: 277958 (cherry picked from commit d15733065c4221dcd5bb3622d225760f271f6fc9) --- lib/msun/aarch64/fenv.c | 5 ----- lib/msun/amd64/fenv.c | 5 ----- lib/msun/arm/fenv.c | 5 ----- lib/msun/i387/fenv.c | 5 ----- lib/msun/powerpc/fenv.c | 5 ----- lib/msun/riscv/fenv.c | 5 ----- 6 files changed, 30 deletions(-) diff --git a/lib/msun/aarch64/fenv.c b/lib/msun/aarch64/fenv.c index 5d626f66516f..a428a9d8a271 100644 --- a/lib/msun/aarch64/fenv.c +++ b/lib/msun/aarch64/fenv.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#define __fenv_static #include "fenv.h" /* @@ -34,10 +33,6 @@ */ const fenv_t __fe_dfl_env = 0; -#ifdef __GNUC_GNU_INLINE__ -#error "This file must be compiled with C99 'inline' semantics" -#endif - int (feclearexcept)(int excepts) { diff --git a/lib/msun/amd64/fenv.c b/lib/msun/amd64/fenv.c index 5dd122cf457c..fe9ecfff3b83 100644 --- a/lib/msun/amd64/fenv.c +++ b/lib/msun/amd64/fenv.c @@ -29,13 +29,8 @@ #include #include -#define __fenv_static #include "fenv.h" -#ifdef __GNUC_GNU_INLINE__ -#error "This file must be compiled with C99 'inline' semantics" -#endif - const fenv_t __fe_dfl_env = { { 0xffff0000 | __INITIAL_FPUCW__, 0xffff0000, diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c index 620a05d51b90..2cf5bbdea28f 100644 --- a/lib/msun/arm/fenv.c +++ b/lib/msun/arm/fenv.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#define __fenv_static #include "fenv.h" #include @@ -66,10 +65,6 @@ const fenv_t __fe_dfl_env = 0; #include "fenv-softfloat.h" #endif -#ifdef __GNUC_GNU_INLINE__ -#error "This file must be compiled with C99 'inline' semantics" -#endif - int (feclearexcept)(int excepts) { diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c index d3cdc2e1cafb..bae8de2fb969 100644 --- a/lib/msun/i387/fenv.c +++ b/lib/msun/i387/fenv.c @@ -29,13 +29,8 @@ #include #include -#define __fenv_static #include "fenv.h" -#ifdef __GNUC_GNU_INLINE__ -#error "This file must be compiled with C99 'inline' semantics" -#endif - const fenv_t __fe_dfl_env = { __INITIAL_NPXCW__, 0x0000, diff --git a/lib/msun/powerpc/fenv.c b/lib/msun/powerpc/fenv.c index d13600ae8d6c..ec673832286a 100644 --- a/lib/msun/powerpc/fenv.c +++ b/lib/msun/powerpc/fenv.c @@ -26,17 +26,12 @@ * SUCH DAMAGE. */ -#define __fenv_static #include "fenv.h" #ifdef __SPE__ #include #include #endif -#ifdef __GNUC_GNU_INLINE__ -#error "This file must be compiled with C99 'inline' semantics" -#endif - #ifdef __SPE__ const fenv_t __fe_dfl_env = SPEFSCR_DFLT; #else diff --git a/lib/msun/riscv/fenv.c b/lib/msun/riscv/fenv.c index 1f1f8eddc2d6..7fdedca1f09c 100644 --- a/lib/msun/riscv/fenv.c +++ b/lib/msun/riscv/fenv.c @@ -24,13 +24,8 @@ * SUCH DAMAGE. */ -#define __fenv_static #include "fenv.h" -#ifdef __GNUC_GNU_INLINE__ -#error "This file must be compiled with C99 'inline' semantics" -#endif - /* * Hopefully the system ID byte is immutable, so it's valid to use * this as a default environment. From nobody Mon Apr 6 06:54:53 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SZ1RJQz6Yt4r for ; Mon, 06 Apr 2026 06:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq0SY461vz3g7V for ; Mon, 06 Apr 2026 06:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=730uOoKb2oaIQrHRY2aPXvnQLGszYxTkpUJH/ucLXxY=; b=nPFNZWI7idu3N8SDMMvMYcsPBEsMN3DW/5vFbFqexWO+V8gM2FCADCJnWD4bF4ccJdmR0i ciO0MfksjqooxgkwLl1sSy7DNELuQqxwx8PZfX0dM/E7SVZ8gmRLgWCbryW6cd4VuH7720 0+FzTPblNWIclPNAwoqsAC3bBNJ7Pm3m7is2mucW1uck6CMVx02BkY1/T7m9bAD1T0C1SL EXq3U5B0vBFNV0Nv5DRSHK1X+4rhgfwfM7amDHwD7H3STJCCiZCYCs62w6ONH6+pgMxdJ1 GsU17m63LyXIirEXsY0mSGEdBazfLpSEqjKK6WFW/2EXOgqt+kyBq+Hw14gQZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775458493; a=rsa-sha256; cv=none; b=xI+04fXt8u0OHBiWgJDcqfZEgWLU32vuCWR/Ubb8Yj+rssnItX4NmurA1StH77ap3tQrxZ yzlxgpUUw6ZkZJoMb1FKua/1iKATWLL81nKCkOIehW7Nug3Ztk5CMegFZNhUMKJHnSIBtC gNutmvBxiz6J8Iq7QZehnsUNlZlBnTuMkwHK140PsYuPUSxwqDGCcljHDD39cJmyurT4/o JVZN7wc236nCKm0CL0MupJLI8flTAFRltGFtFwRwjtyU5IuVBocZ1+IKbHQYqCaJ+hf7Ck nqSOhBUtFluWKEefg3ggb5tcNoPa3M0d9hvuDaV16f2tsgtHt1a/TP7tEMYsig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775458493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=730uOoKb2oaIQrHRY2aPXvnQLGszYxTkpUJH/ucLXxY=; b=RaN8akkM20H1sUar84Oj7kWEaycZxoJz1z/E4/dzRMrvCGQ+Orxu1Jg5XJPV7QODQC5iR+ VB5cqa8pDfaPv5XPgZp/6tu0bNn+quRBE7+zMGUmd5MbSJA5jprTsSHH8Eqs0dyTjIyXqQ Y0ybA+6+kQyvCEkgVzKsuiI8//tNlK5JvgJpXFdS7nQzeEY24cyccNox656J9RZ/XRuB4k wUJjY9RoXbG4jBHes6HCaQX8Xy0YnxSgbZqbx/ttdSuHUoXf40mEsPQqwz+sL+FRzxPUwo TInoSN8UxEUqWBmnVRRcCF3ygRT3sbCszW3/zvfvU/PW+NxOksrjHvLhbKhziA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq0SY3XQ5zjJh for ; Mon, 06 Apr 2026 06:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35fcc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 06:54:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 77e5da38bf45 - stable/15 - posix_spawn_file_action_addopen.3: ignoring close failure is now approved List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 77e5da38bf456d7c01d7606f7b9f913ba4a6ecfc Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 06:54:53 +0000 Message-Id: <69d358bd.35fcc.7b4ce1d6@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=77e5da38bf456d7c01d7606f7b9f913ba4a6ecfc commit 77e5da38bf456d7c01d7606f7b9f913ba4a6ecfc Author: Konstantin Belousov AuthorDate: 2026-04-02 08:06:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-06 06:54:17 +0000 posix_spawn_file_action_addopen.3: ignoring close failure is now approved (cherry picked from commit b7b485efac8c1b601b9c0ada39921bad0e342970) --- lib/libc/gen/posix_spawn.3 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3 index 9fa370a7960f..f9dc95330a8c 100644 --- a/lib/libc/gen/posix_spawn.3 +++ b/lib/libc/gen/posix_spawn.3 @@ -481,8 +481,10 @@ functions conform to .St -p1003.1-2001 , except that they ignore all errors from .Fn close . -A future update of the Standard is expected to require that these functions -not fail because a file descriptor to be closed (via +The +.St -p1003.1-2024 , +version of the Standard no longer requires that these functions +fail because a file descriptor to be closed (via .Fn posix_spawn_file_actions_addclose ) is not open. .Sh HISTORY From nobody Mon Apr 6 09:19:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fq3fx2wvjz6Z5RG for ; Mon, 06 Apr 2026 09:19: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq3fx2Qnjz3F8X for ; Mon, 06 Apr 2026 09:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775467145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4FVt84l06x9/nWVvYxbvwpOTXaGpNXs58cykMSw2Uvc=; b=eja01JNgFfMf20YaJ7DDcW5Df6DcnxHCOBb2F8T5sRQSX1UWCRO411qAwoqYzHynN4wZNS 6zUmPOiHLOAU+2IwSlBhetiuXKDhDjkF96o8JoOb581w6R3a2y6uFMFmpu6rMplH4maIn3 U7ZPudqzGtzlW2IyTyCfQrBgHNyr3Y/nCd//YiiSPPmjvbc2vv5V+Uz8ExBiC+uIfhVjQZ sm2mlSzG+bTxzKrZnzVSngtHZ44yYn6vWb+AlM2glIDtHFSvChghKJ43Du8ZHqj7TU7K0m IzPDwZVDLqRl/o++60Endu85Veu1rBgVDhF3++U9RVpUpxZlixDIg1J8BAhjYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775467145; a=rsa-sha256; cv=none; b=lhIC8rXQ7BDq3mXFxsD8luD5ES6QV1Gp/PnB/aVh/uYVLBMEtyVcYJCHXP83MK3wpXfs57 rbmWQlJy2aiXfgsSQUqHtd+8V9thGbIa9HKnI8yD1ZjguR9WWSynI3xrahQGyNKp5GYbUU DK7X71VTwlpyGKIpKVfFqDuz8UwARpDQ3EJAui1PVakU6r74E9woVpdkU7MLeU1w+PedHe 499o1Ol4nZmqXI8jzY3kxKi6YQg6Y1n8Mj64SerrMLI+6xc785hWCY7WNT/2a6ANsmAL+V 4GmCkvnid4bz1MxJeA4QTTHWsAu0oC62+KLGx5Fm5yQeRNLxaKRpUis2hjeEoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775467145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4FVt84l06x9/nWVvYxbvwpOTXaGpNXs58cykMSw2Uvc=; b=eL8L1WkWH5D1cC/cMtJY4eFKONSLSiXj16F/IIvFzIswrWwuGr4BVVnFF2ydV6dN4HWZGw W7qo0VIj/E3w8fzAjTtu28A7IF6A6dVDq9GfGnfampQsTuq/M7+kOMj9HXR25NFoP+chmo Nqm6xymumm5aBWnWRnwIqIwovVrk5J0o7TN3SMZFnKPuVTUCSxT9UF2h5Lj53BJOUxSD7q 6nbmhu27SYtMjZLMljQuSCjJL2uRcCPFMle313ddbiDn5NxnG9/kISrKSo5BUqzGXmf1rP cBGg/FgZxYTYvCWMuyP/m0kVxpdk/NJGSG893WaLBnOyTSZlaQmeiYkpnNoJSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq3fx1R1qzmQr for ; Mon, 06 Apr 2026 09:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42e8d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 09:19:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5c36d1b5c99a - stable/15 - snd_uaudio: Retire sndcard_func usage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5c36d1b5c99accb632ee7fb0339e495aabfb5706 Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 09:19:05 +0000 Message-Id: <69d37a89.42e8d.2f5c9719@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5c36d1b5c99accb632ee7fb0339e495aabfb5706 commit 5c36d1b5c99accb632ee7fb0339e495aabfb5706 Author: Christos Margiolis AuthorDate: 2026-03-30 14:13:16 +0000 Commit: Christos Margiolis CommitDate: 2026-04-06 09:18:59 +0000 snd_uaudio: Retire sndcard_func usage This is effectively a no-op, as it does not make use of the sndcard_func->varinfo field, so eventually ua_probe() always succeeds. Also change ua_probe()'s value to 0. There is no need to return BUS_PROBE_DEFAULT, because snd_uaudio() attaches the sound(4)'s children with bus_attach_children(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56160 (cherry picked from commit 0efd33382504d3172734fa21325fcabef9c7f063) --- sys/dev/sound/usb/uaudio.c | 5 ----- sys/dev/sound/usb/uaudio_pcm.c | 13 +------------ 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index dd8aa8c9fafe..65976ced8a75 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -367,7 +367,6 @@ struct uaudio_softc_child { }; struct uaudio_softc { - struct sndcard_func sc_sndcard_func; struct uaudio_chan sc_rec_chan[UAUDIO_MAX_CHILD]; struct uaudio_chan sc_play_chan[UAUDIO_MAX_CHILD]; struct umidi_chan sc_midi_chan; @@ -1112,8 +1111,6 @@ uaudio_attach(device_t dev) /* attach the children */ - sc->sc_sndcard_func.func = SCF_PCM; - /* * Only attach a PCM device if we have a playback, recording * or mixer device present: @@ -1130,8 +1127,6 @@ uaudio_attach(device_t dev) DPRINTF("out of memory\n"); goto detach; } - device_set_ivars(sc->sc_child[i].pcm_device, - &sc->sc_sndcard_func); } bus_attach_children(dev); diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index 0b3da9b20440..c24c111f983c 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -190,18 +190,7 @@ MIXER_DECLARE(ua_mixer); static int ua_probe(device_t dev) { - struct sndcard_func *func; - - /* the parent device has already been probed */ - - func = device_get_ivars(dev); - - if ((func == NULL) || - (func->func != SCF_PCM)) { - return (ENXIO); - } - - return (BUS_PROBE_DEFAULT); + return (0); } static int From nobody Mon Apr 6 16:52:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjv1R2Zz6YLVC for ; Mon, 06 Apr 2026 16:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqFjt5bTPz43nn for ; Mon, 06 Apr 2026 16:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HxOl2+6EbRKWXq4doNEZPoGoVioYwA3A+2Fd0NqzPiU=; b=DOBs4mfF1LVJZ0/Wnk/SUmPidqfJL3ZrLMKXZHxR3yxKKfX28EvQi4vj3gXEOqH2brfweO TLYPecesS+1AA7mFTOoU1y57CoQ5xnco/HDZ0vd1EVO5D5IuUTO8sxfsdLNSKDWD/RACM4 y46qLVy+X8uEsMsBuNkUGIXLpcTYiViafyctNruI45MMjnBLCKWP3vbW/o1xwoUARnjRQr ry5PPrlMg0r5lmyGQSTRIlND1A77ErIJkty/G3Om396XrxaHzVwUK6qn4/xstIUtuORaCA DKPuh5OOfATmJJGJDEKBiEfGBPTrdZGqY8vLUPs+jXhDF4NZngaSl9y1H8+2sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494338; a=rsa-sha256; cv=none; b=RW9u/pfTpSdvv+NGRctXSuwW+sacs8QTg0xVx2Qf6B5YvNFNK4QHRVKaKiGGszn69VyggW ziWqA91KesFUgLm/iPVA6Ry+qs2FzJzagqCoVN0r8dL9/VSt1dsDB6AIbkhjwYvjtFeyC0 N2JlPgvnRg5CcQNOtzb8OpfTh8J6sj30QxYpUKqFY0vBEaQAZ+vvfHyBJElQ2NqxjuULRy wrYpkAuqwNEVTRdx4e/Daznlhr/zQBt1PPlPfEst3hfyNRxsV7qyfS98scioSQjv6fe/6a EUv6Mw4Hzs0MV36fsY04oPRdR5F+VDl2NbEFxkDmCoZHe4Nk+HzzIxg2N3ZrTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HxOl2+6EbRKWXq4doNEZPoGoVioYwA3A+2Fd0NqzPiU=; b=QvsYUSjJTNpuevjpUBcKH6rNmLLzHH4DYzB68svq+JLCV+TmiXK8WHtD1+4fDp7Zq4wPTg iGbuae4FQhH1f9BVvnaEYNiGE9eS8QLJZGzx2SeHSi92JaYxq3mIU7wD74zkvPkpKD0CLQ dY5B8oQVGIp0bF8ul8peaz85C50G2W4PE5377lCvszJuBriFibwdJhyS1KLs7ImKot01fw 8ID/CCw/3gutFlqON+HCLdgI69tZ3hcsduqlmQd8kEssW/OwaEowK0WgH+hJkA6LjVZwYH /RqKehcGtWYj5PN4W6+v/formUnOzkomrAJ/B+SVYN+626x2YUmr0DDPO2ZBZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjt4k2rz11N6 for ; Mon, 06 Apr 2026 16:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 210f4d82757b - stable/15 - diff3: prefer posix_spawn over pdfork/execlp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 210f4d82757b0a0ed273987ee2c2ef69ef23a398 Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:18 +0000 Message-Id: <69d3e4c2.1be1e.42e73456@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=210f4d82757b0a0ed273987ee2c2ef69ef23a398 commit 210f4d82757b0a0ed273987ee2c2ef69ef23a398 Author: Baptiste Daroussin AuthorDate: 2026-03-25 10:08:58 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:45 +0000 diff3: prefer posix_spawn over pdfork/execlp MFC After: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56075 (cherry picked from commit 5f7f0efe8e13247fc80a2a739e757f73a5d7ebda) --- usr.bin/diff3/diff3.c | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index d85a5da94b10..75e8c6297855 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -73,14 +73,17 @@ #include #include #include +#include #include #include #include +#include #include #include #include #include +extern char **environ; /* * "from" is first in range of changed lines; "to" is last+1 * from=to=line after point of insertion for added lines. @@ -301,23 +304,30 @@ readin(int fd, struct diff **dd) } static int -diffexec(const char *diffprog, char **diffargv, int fd[]) +diffexec(char **diffargv, int fd[]) { - int pd; - - switch (pdfork(&pd, PD_CLOEXEC)) { - case 0: - close(fd[0]); - if (dup2(fd[1], STDOUT_FILENO) == -1) - err(2, "child could not duplicate descriptor"); - close(fd[1]); - execvp(diffprog, diffargv); - err(2, "could not execute diff: %s", diffprog); - break; - case -1: - err(2, "could not fork"); - break; - } + posix_spawnattr_t sa; + posix_spawn_file_actions_t fa; + pid_t pid; + int pd, error; + + if ((error = posix_spawnattr_init(&sa)) != 0) + errc(2, error, "posix_spawnattr_init"); + if ((error = posix_spawn_file_actions_init(&fa)) != 0) + errc(2, error, "posix_spawn_file_actions_init"); + + posix_spawnattr_setprocdescp_np(&sa, &pd, 0); + + posix_spawn_file_actions_addclose(&fa, fd[0]); + posix_spawn_file_actions_adddup2(&fa, fd[1], STDOUT_FILENO); + posix_spawn_file_actions_addclose(&fa, fd[1]); + + error = posix_spawn(&pid, diffargv[0], &fa, &sa, diffargv, environ); + if (error != 0) + errc(2, error, "could not spawn diff"); + + posix_spawn_file_actions_destroy(&fa); + posix_spawnattr_destroy(&sa); close(fd[1]); return (pd); } @@ -1004,7 +1014,7 @@ main(int argc, char **argv) eflag = EFLAG_OVERLAP; break; case DIFFPROG_OPT: - diffprog = optarg; + diffargv[0] = optarg; break; case STRIPCR_OPT: strip_cr = 1; @@ -1079,13 +1089,14 @@ main(int argc, char **argv) if (pipe(fd23)) err(2, "pipe"); + diffargv[diffargc] = file1; diffargv[diffargc + 1] = file3; diffargv[diffargc + 2] = NULL; - pd13 = diffexec(diffprog, diffargv, fd13); + pd13 = diffexec(diffargv, fd13); diffargv[diffargc] = file2; - pd23 = diffexec(diffprog, diffargv, fd23); + pd23 = diffexec(diffargv, fd23); caph_cache_catpages(); if (caph_enter() < 0) From nobody Mon Apr 6 16:52:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjw0lfBz6YLKF for ; Mon, 06 Apr 2026 16:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqFjv5y74z445J for ; Mon, 06 Apr 2026 16:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a4xyDRc+erKSHvek/qncgl7B5IZV4RBvhRPqvtp/SJc=; b=S/TW3OrzgUYcEgwVNdpcQ4gKNJqY9IA2JrlUwqrN6Fdyg+yfhGZfEskn6Vbg7FtrTlExoh dMezSa3pHLHBmPSXVYVuYgrfkVu8OnGKyoqASUXSkvxBWN4KGdx/1GhnD+RN3I925hzv5u PuSmcDi2tNQb+qvlK8+DkCqkuGlhJGGWqqRuQfb5Nuqqs7ePb9jE0p9OaP005EossyyK+J QUL2O62c5e5F1DaNkU+ZxY88ntfMJCAjXJbqaNCCewWbzQABc146krhX+z/IA2DZz11Oss tLi6HX730SmlP/4XPIR5dtNOGtHOy1D7MvupLSAKc5c19QNnWKzolPi7GNfklA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494339; a=rsa-sha256; cv=none; b=GA7UJ52Y0JzqDUZASq44W35XVNtWBQ54gksKoctpVxxtsNp1oU9o0OxhpPKsfgWP1JV/PS kFtG2AxkaYlEIYbLdVarlh8//cS1VErB4jc2uvuCrX2t168PDF6/3uI4vaPWH1RAF8o5iE OhReepHZ6LMCC+JAZ7DUYpySrqsPNBgvzU5wI0BwaJ+QhMv1VYyVQflz8IMYIp8HHIY+Sp odBrjRbDJwMjn/ZA6A+AfYT/cBwPEnAnWDjtV4COZQwqUeCdQWPrMrVNvjn3ctI1h+qtfF FwCCqSUKKLVT5lHH9Ub86m8+miHUayRSW/BFykarPFQW0vSa3+Mcluq7eIZZng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a4xyDRc+erKSHvek/qncgl7B5IZV4RBvhRPqvtp/SJc=; b=b48gKLA1/2ChzKgB46NcKeAgUw9J8OaxkacBH4GCWBQHAiSSjKz6NcTvNDpzFxmhkYwZeW +SUUWRDcbPhjRSk5bDOGjwuHLnoH2m8DEAHZjw/xQxU8lAhsn298UTuu7NYvhaDBJZ6BIF QYwTIha56ds7KIwrJkzNrXNAJ2KaOTIH/NliRrJt8yashiEBFhVSjpnuVJaVO5ap9QQL9u ugzNlM5BF1EYxVhjQ5qM5SJefDwqfvVZk5luM3J56CRFkTEasnX8DC0/cdfc28Gg1ccVan YFzvkNcJdU4vcyEv1pGKweMTdCIKHRLy8qgaxPZTxzUOj6bRgvlXXUogFOmefQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjv5W23z11N8 for ; Mon, 06 Apr 2026 16:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19c44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8cc85a87510a - stable/15 - diff: prefer posix_spawn over pdfork/execl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8cc85a87510a56afee49a3f5d153ab0328b676d7 Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:19 +0000 Message-Id: <69d3e4c3.19c44.118041d6@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8cc85a87510a56afee49a3f5d153ab0328b676d7 commit 8cc85a87510a56afee49a3f5d153ab0328b676d7 Author: Baptiste Daroussin AuthorDate: 2026-03-25 10:22:02 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff: prefer posix_spawn over pdfork/execl MFC After: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56076 (cherry picked from commit 6d8b2ac449f34423be9d56492022421db61d920e) --- usr.bin/diff/pr.c | 62 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index 189e6b34649e..51cf2c765283 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -29,8 +29,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -41,6 +43,8 @@ #define _PATH_PR "/usr/bin/pr" +extern char **environ; + struct pr * start_pr(char *file1, char *file2) { @@ -48,6 +52,9 @@ start_pr(char *file1, char *file2) pid_t pid; char *header; struct pr *pr; + posix_spawn_file_actions_t fa; + posix_spawnattr_t sa; + int error; pr = xcalloc(1, sizeof(*pr)); @@ -56,32 +63,41 @@ start_pr(char *file1, char *file2) fflush(stdout); if (pipe(pfd) == -1) err(2, "pipe"); - switch ((pid = pdfork(&pr->procd, PD_CLOEXEC))) { - case -1: - err(2, "No more processes"); - case 0: - /* child */ - if (pfd[0] != STDIN_FILENO) { - dup2(pfd[0], STDIN_FILENO); - close(pfd[0]); + + if ((error = posix_spawnattr_init(&sa)) != 0) + errc(2, error, "posix_spawnattr_init"); + if ((error = posix_spawn_file_actions_init(&fa)) != 0) + errc(2, error, "posix_spawn_file_actions_init"); + + posix_spawnattr_setprocdescp_np(&sa, &pr->procd, 0); + + if (pfd[0] != STDIN_FILENO) { + posix_spawn_file_actions_adddup2(&fa, pfd[0], STDIN_FILENO); + posix_spawn_file_actions_addclose(&fa, pfd[0]); + } + posix_spawn_file_actions_addclose(&fa, pfd[1]); + + char *argv[] = { __DECONST(char *, _PATH_PR), + __DECONST(char *, "-h"), header, NULL }; + error = posix_spawn(&pid, _PATH_PR, &fa, &sa, argv, environ); + if (error != 0) + errc(2, error, "could not spawn pr"); + + posix_spawn_file_actions_destroy(&fa); + posix_spawnattr_destroy(&sa); + + /* parent */ + if (pfd[1] == STDOUT_FILENO) { + pr->ostdout = STDOUT_FILENO; + } else { + if ((pr->ostdout = dup(STDOUT_FILENO)) < 0 || + dup2(pfd[1], STDOUT_FILENO) < 0) { + err(2, "stdout"); } close(pfd[1]); - execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); - _exit(127); - default: - /* parent */ - if (pfd[1] == STDOUT_FILENO) { - pr->ostdout = STDOUT_FILENO; - } else { - if ((pr->ostdout = dup(STDOUT_FILENO)) < 0 || - dup2(pfd[1], STDOUT_FILENO) < 0) { - err(2, "stdout"); - } - close(pfd[1]); - } - close(pfd[0]); - free(header); } + close(pfd[0]); + free(header); return (pr); } From nobody Mon Apr 6 16:52:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjx1wftz6YLBr for ; Mon, 06 Apr 2026 16:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqFjw6QMJz44KP for ; Mon, 06 Apr 2026 16:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SfFPS1d3uq4bmQV8UhrbH8bS3ETYNRz+9O40Kxlt3so=; b=ZFjiZHfDB2kVFdqYkOpVP8O6Q7ASq2YU43XXdbMGUphKjS/WBOwbyFjFTGIh2jty7D2mSh /ioNv4R8pwmEG0HTK/OFa49YdqClXtMjDFO9+OY/drcTYnNNFbWEPCNXLq6def/0jSfeDE a7NWVjfUhsbOU1x0s4evC0XHI3AUjFX9RtlRjS4CLrkJhVxvc6Ett7vk+OunDfmowGSSIw Aw3eEwuz4+a63u5vFYIwD1eCjvf//J16SY4pp4MNJSgjZn/nW3xM+TznGY0QQuOW+jmb7H 7YKBHY5BHdmnrImRaQQm5pphbHE5DZC9FPaTMVyjYonIvnEghu7OtbVRCeqDyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494340; a=rsa-sha256; cv=none; b=tV8K+tkNOA8Y+niaqw2BZQndtOibloU3fjinx1cRT31na+XZTm7i2ADeTVezE15K/h87K/ M5+w4atBC3KuF+lWc20hjW67zKSQAPHdYL4Esf7Y9ROJEQ7AD7QweCmwEUQYJGBypN5CLH AUA2Y7KXAy5pAILqylQ9twB40B5zsbPxqVnqQhqBacMbvOq6rVC3mxWXySXfIz8EFQe3+h 96o97IrYF4ViX/x+5SqYnTxUO1d5yjCOt8nZ0PSO51zcXCRw5wTEZq1ZdO7E3kxWMFWf0s AbllPrf96TPP0saGMRoTcnFjFZf9BMxDQ7MCl8MNd51SEeCtc5kAib3qThyDsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SfFPS1d3uq4bmQV8UhrbH8bS3ETYNRz+9O40Kxlt3so=; b=MpzBOqXsFD49bqOByr1Q32Piw3+oaGa9R3PU01KeC1VFBk6nzMD1uhQNsqXhRQo0fUKLIC CN0YYTSN1hG4xu8en5gs7Ek4Oc6uvWn2Ce1mXiFm8thG12FqZDS9RGewrjLq0+RxUMXUOc Jqhvl8xlAXIIb6hNXjj6vRYH7WynIQqNDoQVPGSZ038MNBJBmuKwurYFB/oMwDn9FxhNOx GSW9fx7P3ZuvHDsOwSxtCCm+gUdzVtxJHVgPXmeQaDgubuTrkvX6aS3MSQcLQhaY6h6+ni koXXbJra4NRzFCGFbqoCucnObFkuJOMUojihQxYvE9bym35RMGTCSLzAnDuQKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjw5qbjz11N9 for ; Mon, 06 Apr 2026 16:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a13e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2abaf8acd51c - stable/15 - diff3: plug fd leak List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2abaf8acd51cf12a8a2e68b28ec24b9d37cbceaa Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:20 +0000 Message-Id: <69d3e4c4.1a13e.46a747e3@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2abaf8acd51cf12a8a2e68b28ec24b9d37cbceaa commit 2abaf8acd51cf12a8a2e68b28ec24b9d37cbceaa Author: Baptiste Daroussin AuthorDate: 2026-03-26 07:40:29 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff3: plug fd leak MFC After: 1 week Reported by: kib (cherry picked from commit 33424fd50ee0333bc6f70b5b14a270b85e5b5de1) --- usr.bin/diff3/diff3.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 75e8c6297855..8212b51e15a2 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -947,6 +947,7 @@ wait_and_check(int pd) if (errno != EINTR) err(2, "pdwait"); } + close(pd); if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) errx(2, "diff exited abnormally"); From nobody Mon Apr 6 16:52:21 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjy5ZPNz6YLKL for ; Mon, 06 Apr 2026 16:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqFjy16Xqz440P for ; Mon, 06 Apr 2026 16:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vaW4G4rT+2jwk674hvLqwE3MopWHIDBxFNE/NtJADjU=; b=dQl3kJ1efVBX/ewqAzqc92xy0Mh1ecSOl5DYxSq+DjBLWQI39cWShTYT5pmKskBlHLqigM Qyhos+NDz3Zk5VJA4ZF7xOS5DRjO8DzASzksynv2zrJjyzPfvslmiryIKu7e64BDHs7dj2 Up/zKNIN7VfvVt++0dcRcCBciLpd9yW+K8IFiDrivxA7PUvhEHMOvhUowNT06+qpegLv9j OsHwC1T8+hm8mvgEPqhzrMn5UlX+IsH/lzkj1DcBhm1Hg5msD3VNdKvm1gaM63V5L9Vzpw NQ853mtRHr+W0duD8IP+oz6JIpGjbCcV8Ojx3Q4nUTD7od8RI90iPQzhGGl0Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494342; a=rsa-sha256; cv=none; b=adv2vzgfm5epmJxQfUkHx6eSZhyy/I0/+pDAGOiUClTzSctzuWZHC2zKEJBHho3n8+08f7 ln7l0DkgvWLJVza8znyxXgwjaBgs///jr0PZJCvbkuvKxTS/EA+4x4vSGmcAlaOMkj0NBi EYcV8yOjtoihL2rL2Jt23lwV/HNBSmHytryd33OYMrb0IHXORmS2NZ/YFAen9IlMftqVGH mqtD4uCqy6gnYgnFS+ELgEx413fFrdkCMawIVox0W8KNbcpUNIK5OSwvHREUC7EbUe6gF3 T8qsFcwxb2OFG3VjQfAc/logEYNlv1uTbymIPJI51Yn2Lr/cpFPfJm4p3rl0VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vaW4G4rT+2jwk674hvLqwE3MopWHIDBxFNE/NtJADjU=; b=hXqoocwT7fs17aYQcZErydFYRwN62J7c6PRW3DjG+ug3SEem8dvLQiV4aoiZSDCkuT9vpt ziXZsPMREm/ns3ioaN5WGQLpX+v7iaMRorxRLTYNAKKHLorKnf8yZa/bsIKBNrWRH4VKEu P/4KOTrkTYP5tKlBE1eKdqGcGEn4SEkXMnbAX4ay+c3iqBdTPXz2VqZovX491Ua+HrUcrw Fr5fjAjo3Neqkvo/rOm/mi4maHgjc2q0kKgQJtl6Top8nKPMQL3uw/zRYwuuRVkDIiZBLy mLBaMLwU1x7xtgIRsUNvIJpGCt1Syignw8i0liOSaZaMaSb76jtvMimwCVTqaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjx6bJJz11ZR for ; Mon, 06 Apr 2026 16:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0c0e08be01a7 - stable/15 - diff: handle read(2) 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0c0e08be01a755061eff1f85e7f8bed966fbe0bf Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:21 +0000 Message-Id: <69d3e4c5.1a5dc.21858103@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0c0e08be01a755061eff1f85e7f8bed966fbe0bf commit 0c0e08be01a755061eff1f85e7f8bed966fbe0bf Author: Baptiste Daroussin AuthorDate: 2026-03-26 09:25:21 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff: handle read(2) failures MFC After: 1 week (cherry picked from commit 9b98c4b053917cad42e26596b37df72efab6dc39) --- usr.bin/diff/diffreg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 8dcf55a7190b..5c1147bf2730 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -542,6 +542,11 @@ opentemp(const char *f) return (NULL); } } + if (nread == -1) { + close(ifd); + close(ofd); + return (NULL); + } close(ifd); lseek(ofd, (off_t)0, SEEK_SET); return (fdopen(ofd, "r")); From nobody Mon Apr 6 16:52:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqFk02j0Fz6YLBx for ; Mon, 06 Apr 2026 16:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqFjz15w6z44RW for ; Mon, 06 Apr 2026 16:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nv2sGzvwdToEkbUva20WB7Dc/pe2CHRCR7EvUuFKtz8=; b=V4Btq3uBt5T2kMVMKDcVSTNjaycwarb6uzKkqtCYvqWc2hFjBhW1arnO6PQdKGLISAlHHy dcn6rPPoTT+zIoS+Fbv0wtAr9v96uzv9uDhrAFfeLkCDjQmJ8RivArARBDQ+3yY/Alfx8e bYiQVOmsIHdL0NbaP0wy0uSedynfux3DFDbJeJyNeLcpyzvBjaimq4C8g76DqcexqGHI4s LeSJK+k0BSUi7cpTNQU2zTioArMVdbhgkJ4sfEtfpPeQvtf7oETF7M3Y98oP7Jvd9/F3Mp LaQzuDcP0Jxdi4/iNcJkYrjQEu7vv37FaF8YkNkg2OGT/x6u7uaDFHVcApNv7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494343; a=rsa-sha256; cv=none; b=uZeMeNGhJjqvKTZSMMr4Ab8j3AdfOVAgA0AHaYdK7SP9qUA8q0DSaSP0Q+bhaKIu4pBTIb Masnw2a/bi+Bo+Z8b2HfX16k7ZOChAp5v5HnALLRZ7w2H0ig8lJHW5F9iU5dVACPXl2m4D U33Ri3d9CY4niXWKtN8rMVSg3AvA+Lgd3sPaV2feY2gpj7oaq8czQnRdnrCkoceW9PMXrd iYrxnDrw2GfRYDnS6mgr/BydetrTAGvgndEeRwbMnz8rqmBsnPPK2c5wQU7gTIKpOb5kYn P4LglOpAyUymq6LalsUTVc2YLhITT+FV8EHfz184Ddu+a59bKBK0mJiHGYQvdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nv2sGzvwdToEkbUva20WB7Dc/pe2CHRCR7EvUuFKtz8=; b=yiUaH3W4QErkSbCPkn/81V1pnsjCroqZyGaoefktVLse7xtxcAM9i7ZmrloCihPLcwzPeM nUvp5Gavh1E//0mLTcGVkZn9+BTtzc+TPv84irEfcI6FaSfm/re4bqIrt7K/SDTZAF4036 V3xK8Kw5AjDmG9UCESx5ug1wai1EmwBLTPkrTYq6MzEu1fNNJWDpLmO9c8uVk5BtTxBJyr 1d76vnZlUzbqLmNi+WTaGd0OlPzdSGJhP7YP/dpzxJSXmiiVnyumvDGnnjc1CiQ9wNOgoK ySQySkbvcKwKbkOfQk+Agi/sRSe+2Nlkp3wHM3G4iwo4nnDHwO3GucGLjgAzaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjz0G9Sz12Hf for ; Mon, 06 Apr 2026 16:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19b49 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8fade076dd25 - stable/15 - diff3: set O_CLOEXEC on pipes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8fade076dd257b4aea6eb31c389450cccf6888bf Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:23 +0000 Message-Id: <69d3e4c7.19b49.72e4f942@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8fade076dd257b4aea6eb31c389450cccf6888bf commit 8fade076dd257b4aea6eb31c389450cccf6888bf Author: Baptiste Daroussin AuthorDate: 2026-03-28 08:41:47 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff3: set O_CLOEXEC on pipes This avoid leaking pipe fd in children and simplifies the code MFC After: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56120 (cherry picked from commit 945e60e018c287f8097f3ee4a30ccf4921845aa1) --- usr.bin/diff3/diff3.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 8212b51e15a2..bbef1f0d21a5 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -317,10 +317,7 @@ diffexec(char **diffargv, int fd[]) errc(2, error, "posix_spawn_file_actions_init"); posix_spawnattr_setprocdescp_np(&sa, &pd, 0); - - posix_spawn_file_actions_addclose(&fa, fd[0]); posix_spawn_file_actions_adddup2(&fa, fd[1], STDOUT_FILENO); - posix_spawn_file_actions_addclose(&fa, fd[1]); error = posix_spawn(&pid, diffargv[0], &fa, &sa, diffargv, environ); if (error != 0) @@ -1085,12 +1082,11 @@ main(int argc, char **argv) if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file3); - if (pipe(fd13)) + if (pipe2(fd13, O_CLOEXEC)) err(2, "pipe"); - if (pipe(fd23)) + if (pipe2(fd23, O_CLOEXEC)) err(2, "pipe"); - diffargv[diffargc] = file1; diffargv[diffargc + 1] = file3; diffargv[diffargc + 2] = NULL; From nobody Mon Apr 6 16:52:24 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqFk33YQ1z6YL46 for ; Mon, 06 Apr 2026 16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqFk01wsrz445s for ; Mon, 06 Apr 2026 16:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBb+uN3+Pe3hEp8GeoI70bQ6guPZl9/u3YnSSihUq5M=; b=fSPbJlHG0+1tTKpH1lNUyFnRlN/PaZdlDHZB/rMYkqmjDxKvJn53eEdt0bARMLbcZcL+iD DB0C3qEzeYRodSb9+2dZ/oc/G0TVep9I3LMSaLtb+h2WK24xYc8XDti44CVK8tVsDJdlrw xta+p/LtlfCtjhLy9vVjChkfdVl7M7vAJsPYa8y9qsuf6wP7IAFsDI/m8Tke+QIN/nWJMI Ma/b8RF42Ze8cB7ah2cxtMJubqdGV+bc2iPz3GH2Fve3vKm4WSN54dIrFFGsDwm8gS6Zm7 CWg+fNvInNanh+QJJmRzuBqGnbKQqdbnI+9B1P+UpmSByshpWIYj8K6eGAskjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494344; a=rsa-sha256; cv=none; b=iwEnRB6YLQuApzBx5FAowMrfk9MHI36gT26EAplr82hvkZ+N+ptxHeVMfUaBsRkK8HDyk2 upmdTEJuIk9NXThPugBro7IvK3hNOaExga6AEKtqUV7W0JGTvgtGOnih4hoJez84qS8fmD BuzUWD5J6xW+sybu1H1y1n8vo4EpnXPmU0uczv8gtS1Ej+oUzbYx5cES77Q+j8Qsludl8v 62nfuf6QWirJszaK3qoO/LuEaNLfd7zIjFotNwm3mRF60MM0smBzJrm1846TVILtS5GUde 7jhMoThzhgPsk/V0dMW/dKERUEt5/mPOGn3R6DxExlMuKwszJwJojcbyG9cq/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBb+uN3+Pe3hEp8GeoI70bQ6guPZl9/u3YnSSihUq5M=; b=ZRJfRiGsM4PYfR+TMIiNvc66U1qLeHIsor4W51Hk5JnJYm6c9mfmotJQY3bfCi1YYFvT7W fvpAJE0lys+hk2+q19VnCkW/oOk6un6dI1Ve3q0oQN8Wg1NeTB8x6RkvxtV94uvaN1PXLs 0ZAC22TZJi9wxFFh1p+pAnSuBshIHNEKiSDUP3CTqUwCWJNjcihkka/M6B52t5cUc8x9XO Z3RAMG4uQ/sxvKZwklpvbflTKberHJMfFiz6wiQ9C6IZezrwh4sXcq/okQF+rz4Frcoo3f EpuXNpqhy/qG+f5ezyDukW0Bg21uIMbiI217uwEn5sr1wHNQcNVmzUZRR7Gtig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFk0103Tz125q for ; Mon, 06 Apr 2026 16:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bf96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f5d3d35273ea - stable/15 - diff: use O_CLOEXEC on pipes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f5d3d35273ea58b120ea80d1222205c3d4f969ee Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:24 +0000 Message-Id: <69d3e4c8.1bf96.7681e967@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f5d3d35273ea58b120ea80d1222205c3d4f969ee commit f5d3d35273ea58b120ea80d1222205c3d4f969ee Author: Baptiste Daroussin AuthorDate: 2026-03-28 08:55:24 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff: use O_CLOEXEC on pipes This only simplifies the code, no functional changes expected MFC After: 1 week (cherry picked from commit c8d40bf8ecc60cc15e3904410db62065ea681fdc) --- usr.bin/diff/pr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index 51cf2c765283..e8a4162d8b18 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -61,7 +61,7 @@ start_pr(char *file1, char *file2) xasprintf(&header, "%s %s %s", diffargs, file1, file2); signal(SIGPIPE, SIG_IGN); fflush(stdout); - if (pipe(pfd) == -1) + if (pipe2(pfd, O_CLOEXEC) == -1) err(2, "pipe"); if ((error = posix_spawnattr_init(&sa)) != 0) @@ -71,11 +71,8 @@ start_pr(char *file1, char *file2) posix_spawnattr_setprocdescp_np(&sa, &pr->procd, 0); - if (pfd[0] != STDIN_FILENO) { + if (pfd[0] != STDIN_FILENO) posix_spawn_file_actions_adddup2(&fa, pfd[0], STDIN_FILENO); - posix_spawn_file_actions_addclose(&fa, pfd[0]); - } - posix_spawn_file_actions_addclose(&fa, pfd[1]); char *argv[] = { __DECONST(char *, _PATH_PR), __DECONST(char *, "-h"), header, NULL }; From nobody Mon Apr 6 21:03:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqMJ63Mmwz6Y0jt for ; Mon, 06 Apr 2026 21:03: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqMJ61S58z3nP1 for ; Mon, 06 Apr 2026 21:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775509430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=quDKDL7+EN8ClQxS3KXRui7RQW9ybOKpr9sNthaMlgw=; b=cAzPb7UWFmAUC3d58YWmFxTOIKaI5r1QECm84LUS9zJHhWFAA+TBfs+PXCaKTbwIDEPWEE zXYACz9jBEqYutjIxY3SKJ48dpCMGug1n2WrH8R9TDefFcfURdK7Rk64vnQB49d7UPyPD/ FK1HQ2c9nflbWxmkrw77ngwnWn+hvdwXx2ngI7JoGjXQuzHYjdpbr9gid7z+izDDrqL5ZV Tt7RyGd+TcGOq6JJK0pVOoqpiTi8qD8lV9URSlLbIwNt/xUjOHdCb6pgQLZ8SoQtoEN9JY 48Je2BcTwAu26M0m/JUPWNChWCZjVCRuwTGADbFGV+Gu12TRrU0LXqVby5E+1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775509430; a=rsa-sha256; cv=none; b=Al7lxYDjSKvh8gYl3VZNSxYm/I9reeajn21VF97V6XobzWllMF9aTLKu465hT81OmT0ete +4pUisWHUNXFWZCDDY6o/irV7SvB2t9jdWmYyEwkaCTY5gdaqaTzwo/b0Jk8O+RmivyxMW Z4tUpmZCQGei0i2HAODqAKx87uO1uD65MuuuO3cyG/O4FZqs2hcsY1fKreD9gGBMIm0A64 ggr8Jvigq4a6cqaF3XHQZ+6xfksuHiVavZtk8DF7Q6eeYC0NgwHhKwgIth+tXBqpotM1Rf bWJzlyqb7RceBHc5BhtpnHrExXEzCmHeYr6vw7Lvro3qI02kPp+B+oIkI+juBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775509430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=quDKDL7+EN8ClQxS3KXRui7RQW9ybOKpr9sNthaMlgw=; b=FNvdUhsI72uQV3wz02Xtz5X2SAtLU5nsI3YFQvz0iMEU2F8ui33yoJJeMvUbJ+T4d3xFXF Btoegt12Y3GRTJoBWHlVYBlx1GQDDhzCYkjEV1HA+hibM3TY/ZFAat8klOTijia+FEO2D2 24NYAzAz5naVvXJc3MXtOnKQV1z0TEyIZXHTgUOFX+MeDHS1LNHKczDB58FKIZ+U4dc8vp wd6nPS406jSEecLtZxI98BLm/Y45th+cvRMHXu7ErnkBWWX8/Z2i1wyA590r5H4nrGScSe QslDuYiHOsb622RhQeDtgm0LvEi+zEiTD3ENQ5nLNaiXWwaKaOQZKSVasyBfZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqMJ6139xz18q6 for ; Mon, 06 Apr 2026 21:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e33d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 21:03:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: e0ae00f43186 - stable/15 - libpcap: Update to 1.10.6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e0ae00f43186a518444e0f750b66d998085239df Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 21:03:50 +0000 Message-Id: <69d41fb6.3e33d.629ba3a3@gitrepo.freebsd.org> The branch stable/15 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=e0ae00f43186a518444e0f750b66d998085239df commit e0ae00f43186a518444e0f750b66d998085239df Author: Joseph Mingrone AuthorDate: 2026-03-15 01:42:55 +0000 Commit: Joseph Mingrone CommitDate: 2026-04-06 19:41:40 +0000 libpcap: Update to 1.10.6 Changes: https://raw.githubusercontent.com/the-tcpdump-group/libpcap/89e982c37c36ad0bf9f10b7ded421cb42422effa/CHANGES Reviewed by: bms, emaste Obtained from: https://www.tcpdump.org/release/libpcap-1.10.6.tar.gz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55545 Differential Revision: https://reviews.freebsd.org/D55858 (cherry picked from commit 16cef5f7a65588def71db4fdfa961f959847e3b6) --- contrib/libpcap/CHANGES | 107 ++ contrib/libpcap/CMakeLists.txt | 55 +- contrib/libpcap/CREDITS | 13 + contrib/libpcap/INSTALL.md | 4 + contrib/libpcap/Makefile.in | 12 +- contrib/libpcap/VERSION | 2 +- contrib/libpcap/aclocal.m4 | 11 +- contrib/libpcap/autogen.sh | 41 +- contrib/libpcap/cmake/Modules/FindPacket.cmake | 49 +- contrib/libpcap/cmakeconfig.h.in | 12 +- contrib/libpcap/config.h.in | 8 +- contrib/libpcap/configure | 1097 ++++++++++---------- contrib/libpcap/configure.ac | 37 +- contrib/libpcap/dlpisubs.c | 124 +++ contrib/libpcap/dlpisubs.h | 1 + contrib/libpcap/doc/README.haiku.md | 40 +- contrib/libpcap/doc/README.solaris.md | 24 +- contrib/libpcap/doc/README.windows.md | 175 +++- contrib/libpcap/fad-getad.c | 13 +- contrib/libpcap/fmtutils.c | 2 +- contrib/libpcap/gencode.c | 346 ++++-- contrib/libpcap/grammar.y.in | 13 - contrib/libpcap/ieee80211.h | 6 +- contrib/libpcap/instrument-functions.c | 250 +++++ contrib/libpcap/nametoaddr.c | 452 +++++++- contrib/libpcap/nametoaddr.h | 1 + contrib/libpcap/optimize.c | 2 +- contrib/libpcap/pcap-bpf.c | 40 +- contrib/libpcap/pcap-common.c | 92 +- contrib/libpcap/pcap-dag.c | 5 +- contrib/libpcap/pcap-dbus.c | 4 + contrib/libpcap/pcap-dlpi.c | 348 ++++--- contrib/libpcap/pcap-dpdk.c | 5 +- contrib/libpcap/pcap-haiku.c | 8 +- contrib/libpcap/pcap-int.h | 33 +- contrib/libpcap/pcap-libdlpi.c | 33 +- contrib/libpcap/pcap-linux.c | 636 ++++++++++-- contrib/libpcap/pcap-new.c | 54 +- contrib/libpcap/pcap-npf.c | 100 +- contrib/libpcap/pcap-rpcap.c | 2 +- contrib/libpcap/pcap-savefile.manfile.in | 29 +- contrib/libpcap/pcap-septel.c | 3 +- contrib/libpcap/pcap-snf.c | 5 +- contrib/libpcap/pcap.c | 73 +- contrib/libpcap/pcap/bpf.h | 2 - contrib/libpcap/pcap/dlt.h | 102 +- contrib/libpcap/pcap_close.3pcap | 14 +- contrib/libpcap/pcap_dump_close.3pcap | 11 +- contrib/libpcap/pcap_dump_flush.3pcap | 2 +- contrib/libpcap/pcap_file.3pcap | 2 +- contrib/libpcap/pcap_loop.3pcap | 2 +- contrib/libpcap/pcap_next_ex.3pcap | 2 +- contrib/libpcap/pcap_open_offline.3pcap.in | 8 +- contrib/libpcap/pflog.h | 4 + contrib/libpcap/rpcapd/CMakeLists.txt | 28 +- contrib/libpcap/rpcapd/rpcapd.c | 14 +- contrib/libpcap/scanner.l | 22 - contrib/libpcap/sf-pcap.c | 15 +- contrib/libpcap/testprogs/CMakeLists.txt | 9 +- contrib/libpcap/testprogs/Makefile.in | 5 + contrib/libpcap/testprogs/filtertest.c | 3 + contrib/libpcap/testprogs/fuzz/CMakeLists.txt | 43 - contrib/libpcap/testprogs/fuzz/fuzz_both.c | 101 -- contrib/libpcap/testprogs/fuzz/fuzz_both.options | 2 - contrib/libpcap/testprogs/fuzz/fuzz_filter.c | 43 - contrib/libpcap/testprogs/fuzz/fuzz_filter.options | 2 - contrib/libpcap/testprogs/fuzz/fuzz_pcap.c | 80 -- contrib/libpcap/testprogs/fuzz/fuzz_pcap.options | 2 - contrib/libpcap/testprogs/fuzz/onefile.c | 54 - contrib/libpcap/testprogs/versiontest.c | 29 + lib/libpcap/Makefile | 1 - lib/libpcap/config.h | 261 ++++- sys/net/dlt.h | 177 +++- 73 files changed, 3740 insertions(+), 1667 deletions(-) diff --git a/contrib/libpcap/CHANGES b/contrib/libpcap/CHANGES index bf8701c829a0..cb603f8feac4 100644 --- a/contrib/libpcap/CHANGES +++ b/contrib/libpcap/CHANGES @@ -1,3 +1,110 @@ +Tuesday, December 30, 2025 / The Tcpdump Group + Summary for 1.10.6 libpcap release + General: + Fix "tcpdump -i " for something-only libpcap builds. + gencode: Fix an undefined behavior in gen_mcode(). + gencode: Add a missing free() in gen_scode(). + Remove "DLT_" from the descriptions of two dlt_choices[] entries. + Report the size of time_t in the version string. + Validate remote capture source strings better. + CVE-2025-11961: Fix OOBR and OOBW in pcap_ether_aton(). + Source code: + Remove some unneeded includes. + pcapint_find_function() changed to return "void *" to avoid + warnings. + Clean up code that computes the length of a netmask. + Mind netmap support in pcap_lib_version(). + Link-layer types: + Add LINKTYPE_ETW/DLT_ETW. + Add LINKTYPE_NETANALYZER_NG/DLT_NETANALYZER_NG (pull request + #1008). + Add LINKTYPE_ZBOSS_NCP/DLT_ZBOSS_NCP. + Add LINKTYPE_USB_2_0_LOW_SPEED/DLT_USB_2_0_LOW_SPEED, + LINKTYPE_USB_2_0_FULL_SPEED/DLT_USB_2_0_FULL_SPEED, + LINKTYPE_USB_2_0_HIGH_SPEED/DLT_USB_2_0_HIGH_SPEED + Add LINKTYPE_AUERSWALD_LOG/DLT_AUERSWALD_LOG. + Add LINKTYPE_ZWAVE_TAP/DLT_ZWAVE_TAP. + Add LINKTYPE_SILABS_DEBUG_CHANNEL/DLT_SILABS_DEBUG_CHANNEL. + Add LINKTYPE_FIRA_UCI/DLT_FIRA_UCI. + Rename LINKTYPE_IPMB_LINUX/DLT_IPMB_LINUX to + LINKTYPE_I2C_LINUX/DLT_I2C_LINUX, as it's really just an + encapsulation of I2C, and is also being used for HDMI DDC. + Keep DLT_IPMB_LINUX around as a #define for backwards + compatibility. + Add LINKTYPE_MDB/DLT_MDB. + Add LINKTYPE_DECT_NR/DLT_DECT_NR. + Add LINKTYPE_EDK2_MM/DLT_EDK2_MM. + Add LINKTYPE_DEBUG_ONLY/DLT_DEBUG_ONLY. + Packet filtering: + Make the chunk allocator's alignment more general and + platform-independent. + IEEE 802.11: Fix three undefined behaviors in grammar.y. + Fix IPv4 multicast filtering to only include 224.0.0.0/4. + Fix "(arp|rarp) host NAME" to ignore IPv6 quietly. + Fix ARCnet address parsing. + Linux: + Fix check for mac80211 phydev. + Don't create monitor-mode interface if we're capturing on one. + Expand the table of DSA tag types to include all current types. + Fix an error message when deleting a monN interface. + Fix returning PCAP_ERROR_RFMON_NOTSUP with libnl. + Fix the error message when capure permission is denied. + Fix the error message if PF_PACKET sockets aren't supported. + Fix a file descriptor leak in an error case (pull request #1537). + Handle errors better when checking for a DSA-tagged interface. + Use DLT_DEBUG_ONLY for DSA tags that do not [yet] have a better support. + FreeBSD: + Fix detection and enabling of zero-copy support. + Fix errors in the zero-copy code. + Solaris: + Fix not to ignore logical interfaces in fad-gifc.c and + fad-glifc.c. + Fix attempts to open all-numeric device names with DLPI to + return "no such device". + Fix error returns and messages when an interface has no DLPI + device. + Return all interfaces in pcap_findalldevs() even if they can't be + opened. + HP-UX: + Fix attempts to open all-numeric device names to return + "no such device". + Fix error message if there's no /dev/dlpi device. + Return all interfaces in pcap_findalldevs() even if they can't be + opened. + Windows: + Fix filtering for VLAN-tagged frames. + Add support for Npcap's nanosecond-resolution time stamps in + captures. + CVE-2025-11964: Fix a bug in error message character encoding mapping + from UTF-16 to UTF-8. + Check at create time whether the NPF driver supports nanosecond + precision. + D-Bus: + Fix message leak. + Capture file writing: + Don't close the output stream if it's stdout, just flush it. + Documentation: + Explicitly document that closing a pcap_t for a savefile opened + with pcap_fopen_offline() will close the standard I/O stream. + Building and testing: + Makefile.in: Include instrument-functions.c in the release tarball. + CMake: Fix libnl usage with pkg-config. + CMake: Fix build with CMake 3.31. + CI: Report CMake version in builds. + CI: Visual Studio 2022 builds added, including ARM64 builds; + Visual Studio 2015 builds dropped. + Don't build with sslutils.c if we don't have a TLS library. + Build on Windows with a newer version of OpenSSL. + CMake: generalize handling of non-x86 Windows architectures. + CI: use the -A flag for all Visual Studio generators. + Remove the fuzzing props from the release tarball. + Autoconf: Use AC_SYS_YEAR2038_RECOMMENDED when possible if the + environment variable BUILD_YEAR2038 = yes (via autogen.sh) + DPDK: don't enable it by default. + Update Npcap SDK to 1.15. + autogen.sh: Allow to configure Autoconf warnings. + autogen.sh: Delete all trailing blank lines at end of configure. + Friday, August 30, 2024 / The Tcpdump Group Summary for 1.10.5 libpcap release Source code: diff --git a/contrib/libpcap/CMakeLists.txt b/contrib/libpcap/CMakeLists.txt index 9012ef41769f..8a27687ac355 100644 --- a/contrib/libpcap/CMakeLists.txt +++ b/contrib/libpcap/CMakeLists.txt @@ -13,14 +13,21 @@ else(WIN32) # on a "long-term support" version # of some OS and that # version supplies an older version of CMake; # - # otherwise, require 3.5, so we don't get messages warning - # that support for versions of CMake lower than 3.5 is + # otherwise, if it's a version less than 3.10, require only + # 3.5, just in case somebody is configuring with CMake + # on a "long-term support" version # of some OS and that + # version supplies an older version of CMake; + # + # otherwise, require 3.10, so we don't get messages warning + # that support for versions of CMake lower than 3.10 is # deprecated. # if(CMAKE_VERSION VERSION_LESS "3.5") cmake_minimum_required(VERSION 2.8.12) - else() + elseif(CMAKE_VERSION VERSION_LESS "3.10") cmake_minimum_required(VERSION 3.5) + else() + cmake_minimum_required(VERSION 3.10) endif() endif(WIN32) @@ -506,7 +513,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() option(DISABLE_BLUETOOTH "Disable Bluetooth sniffing support" OFF) option(DISABLE_NETMAP "Disable netmap support" OFF) -option(DISABLE_DPDK "Disable DPDK support" OFF) + +# +# Require that DPDK support be explicitly enabled, as the code is +# immensely hard to keep compiling for every random API change +# the DPDK folks make. +# +set(DISABLE_DPDK ON) # # We don't support D-Bus sniffing on macOS; see @@ -578,6 +591,7 @@ include_directories( include(CheckFunctionExists) include(CMakePushCheckState) include(CheckSymbolExists) +include(CheckIncludeFile) if(WIN32) @@ -595,8 +609,11 @@ if(WIN32) # cmake_push_check_state() set(CMAKE_REQUIRED_LIBRARIES ${Packet_LIBRARIES}) + set(CMAKE_REQUIRED_INCLUDES ${Packet_INCLUDE_DIRS}) check_function_exists(PacketIsLoopbackAdapter HAVE_PACKET_IS_LOOPBACK_ADAPTER) check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES) + check_function_exists(PacketGetInfo HAVE_PACKET_GET_INFO) + check_include_file(npcap-bpf.h HAVE_NPCAP_BPF_H) cmake_pop_check_state() endif(Packet_FOUND) @@ -634,7 +651,6 @@ endif(USE_STATIC_RT) # Detect available platform features ################################################################### -include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckStructHasMember) include(CheckTypeSize) @@ -1244,6 +1260,19 @@ if(NOT WIN32) endif() endif() +# +# Find and print the size of time_t. +# +cmake_push_check_state() +set(CMAKE_EXTRA_INCLUDE_FILES time.h) +check_type_size("time_t" SIZEOF_TIME_T) +if(SIZEOF_TIME_T EQUAL 4) + message(STATUS "32-bit time_t") +elseif(SIZEOF_TIME_T EQUAL 8) + message(STATUS "64-bit time_t") +endif() +cmake_pop_check_state() + if(INET6) message(STATUS "Support IPv6") endif(INET6) @@ -1984,6 +2013,7 @@ else(WIN32) # check_include_file(sys/bufmod.h HAVE_SYS_BUFMOD_H) check_include_file(sys/dlpi_ext.h HAVE_SYS_DLPI_EXT_H) + check_include_file(zone.h HAVE_ZONE_H) # # Checks to see if Solaris has the public libdlpi(3LIB) library. @@ -2025,12 +2055,6 @@ else(WIN32) check_type_size(dl_passive_req_t DL_PASSIVE_REQ_T) cmake_pop_check_state() elseif(PCAP_TYPE STREQUAL "linux") - # - # Do we have the wireless extensions? - # linux/wireless.h requires sys/socket.h. - # - check_include_files("sys/socket.h;linux/wireless.h" HAVE_LINUX_WIRELESS_H) - # # Do we have libnl? # We only want version 3. Version 2 was, apparently, @@ -2043,6 +2067,8 @@ else(WIN32) if(BUILD_WITH_LIBNL) pkg_check_modules(LIBNL libnl-genl-3.0) if(LIBNL_FOUND) + set(HAVE_LIBNL TRUE) + include_directories(${LIBNL_INCLUDE_DIRS}) set(PCAP_LINK_LIBRARIES ${LIBNL_LIBRARIES} ${PCAP_LINK_LIBRARIES}) # @@ -2698,7 +2724,10 @@ if(ENABLE_REMOTE) check_struct_has_member("struct msghdr" msg_flags "ftmacros.h;sys/socket.h" HAVE_STRUCT_MSGHDR_MSG_FLAGS) cmake_pop_check_state() set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} - pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c sslutils.c) + pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c) + if(OPENSSL_FOUND) + set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} sslutils.c) + endif() endif(ENABLE_REMOTE) ################################################################### @@ -2917,7 +2946,6 @@ endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/scanner.c ${CMAKE_CURRENT_BINARY_DIR}/scanner.h - SOURCE ${pcap_SOURCE_DIR}/scanner.l COMMAND ${LEX_EXECUTABLE} -P pcap_ --header-file=scanner.h --nounput -o${CMAKE_CURRENT_BINARY_DIR}/scanner.c ${pcap_SOURCE_DIR}/scanner.l DEPENDS ${pcap_SOURCE_DIR}/scanner.l ) @@ -2992,7 +3020,6 @@ message(STATUS "Parser generator: ${YACC_EXECUTABLE}") # add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/grammar.c ${CMAKE_CURRENT_BINARY_DIR}/grammar.h - SOURCE ${pcap_BINARY_DIR}/grammar.y COMMAND ${YACC_EXECUTABLE} -p pcap_ -o ${CMAKE_CURRENT_BINARY_DIR}/grammar.c -d ${pcap_BINARY_DIR}/grammar.y DEPENDS ${pcap_BINARY_DIR}/grammar.y ) diff --git a/contrib/libpcap/CREDITS b/contrib/libpcap/CREDITS index 78ce6a102cf1..809bcec710de 100644 --- a/contrib/libpcap/CREDITS +++ b/contrib/libpcap/CREDITS @@ -14,6 +14,7 @@ Additional people who have contributed patches (in alphabetical order): Alexander Galanin Alexander 'Leo' Bergolth Alexey Kuznetsov + Alexey Vishnyakov Alex Smith <44322503+MadAlexUK at users dot noreply dot github dot com> Alfredo Alvarez Fernandez Ali Abdulkadir @@ -34,6 +35,7 @@ Additional people who have contributed patches (in alphabetical order): Assar Westerlund Atzm Watanabe Baptiste Peugnez + Barnabás Pőcze Baruch Siach Bill Parker Biswapriyo Nath @@ -78,6 +80,7 @@ Additional people who have contributed patches (in alphabetical order): Eli Schwartz Eric Anderson Erik de Castro Lopo + Eugene Exarevsky Fedor Sakharov Felix Janda Felix Obenhuber @@ -85,6 +88,7 @@ Additional people who have contributed patches (in alphabetical order): Florent Drouin Florian Fainelli François Revol + Frank Gorgas-Waller Franz Schaefer frederich Fulko Hew @@ -95,6 +99,7 @@ Additional people who have contributed patches (in alphabetical order): George Neville-Neil Gerald Combs Gerard Garcia + Gerd Hoffmann Gianluca Varenni Gilbert Hoyek Gisle Vanem @@ -106,14 +111,17 @@ Additional people who have contributed patches (in alphabetical order): Gustavo Zacarias Hagen Paul Pfeifer headshog + Henri Chataing Henri Doreau Hiroaki KAWAI hopper-vul Hyung Sik Yoon + Ido Yariv Igor Khristophorov Jakub Sitnicki Jakub Zawadzki James Ko + Jan Adam Jan-Philip Velders Jason R. Thorpe Javier Achirica @@ -124,6 +132,7 @@ Additional people who have contributed patches (in alphabetical order): Jesper Dangaard Brouer Jesper Peterson Jesse Gross + Jessica Clarke JHA jingyu yang Jiri Slaby @@ -131,6 +140,7 @@ Additional people who have contributed patches (in alphabetical order): Joel <82591719+joelg989 at users dot noreply dot github dot com> Joerg Mayer John Bankier + John Thacker Jon Lindgren Jon Smirl Jorge Boncompte [DTI2] @@ -165,6 +175,7 @@ Additional people who have contributed patches (in alphabetical order): Mark Pizzolato Markus Mayer Martin Husemann + Martin Kaiser Márton Németh Matias Karhumaa Matt Eaton @@ -183,6 +194,7 @@ Additional people who have contributed patches (in alphabetical order): Milosz Kaniewski Miroslav Lichvar Monroe Williams + mooon04 Myricom Help Nan Xiao nic-kaczinsky <68271784+nic-kaczinsky at users dot noreply dot github dot com> @@ -240,6 +252,7 @@ Additional people who have contributed patches (in alphabetical order): Stefan Hudson Stephen Donnelly Steve Karg + Stig Bjørlykke stubbfel Takashi Yamamoto Tanaka Shin-ya diff --git a/contrib/libpcap/INSTALL.md b/contrib/libpcap/INSTALL.md index 2787580767fc..a8350607c45f 100644 --- a/contrib/libpcap/INSTALL.md +++ b/contrib/libpcap/INSTALL.md @@ -8,6 +8,10 @@ To build libpcap with the configure script and `make`: run `./autogen.sh` (a shell script). The autogen.sh script will build the `configure` and `config.h.in` files. +* If you build on a Linux 32-bit system, with Autoconf version >= 2.72 +and GNU C Library version >= 2.34, run `export BUILD_YEAR2038=yes` +before running `./autogen.sh` to build with 64-bit time_t (Y2038-safe). + On some system, you may need to set the `AUTORECONF` variable, like: `AUTORECONF=autoreconf-2.69 ./autogen.sh` to select the `autoreconf` version you want to use. diff --git a/contrib/libpcap/Makefile.in b/contrib/libpcap/Makefile.in index 207ad8c0db90..fe32c40cf62f 100644 --- a/contrib/libpcap/Makefile.in +++ b/contrib/libpcap/Makefile.in @@ -291,6 +291,7 @@ EXTRA_DIST = \ fad-glifc.c \ grammar.y.in \ install-sh \ + instrument-functions.c \ lbl/os-aix4.h \ lbl/os-aix7.h \ lbl/os-hpux11.h \ @@ -402,14 +403,6 @@ EXTRA_DIST = \ testprogs/filtertest.c \ testprogs/findalldevstest.c \ testprogs/findalldevstest-perf.c \ - testprogs/fuzz/CMakeLists.txt \ - testprogs/fuzz/fuzz_both.c \ - testprogs/fuzz/fuzz_both.options \ - testprogs/fuzz/fuzz_filter.c \ - testprogs/fuzz/fuzz_filter.options \ - testprogs/fuzz/fuzz_pcap.c \ - testprogs/fuzz/fuzz_pcap.options \ - testprogs/fuzz/onefile.c \ testprogs/nonblocktest.c \ testprogs/opentest.c \ testprogs/reactivatetest.c \ @@ -417,6 +410,7 @@ EXTRA_DIST = \ testprogs/threadsignaltest.c \ testprogs/unix.h \ testprogs/valgrindtest.c \ + testprogs/versiontest.c \ testprogs/visopts.py \ testprogs/writecaptest.c @@ -858,7 +852,7 @@ releasetar: tar xf -) && \ echo "No $$TAG tag. Archive build from HEAD."; \ fi && \ - (cd "$$TAG" && "$${AUTORECONF:-autoreconf}" && rm -rf autom4te.cache) && \ + (cd "$$TAG" && ./autogen.sh && rm -rf autom4te.cache) && \ tar cf "$$DIR/$$TAG".tar "$$TAG" && \ rm -f "$$DIR/$$TAG".tar.gz && \ gzip --best "$$DIR/$$TAG".tar && \ diff --git a/contrib/libpcap/VERSION b/contrib/libpcap/VERSION index db77e0ee9760..7b4d9a4ff9bc 100644 --- a/contrib/libpcap/VERSION +++ b/contrib/libpcap/VERSION @@ -1 +1 @@ -1.10.5 +1.10.6 diff --git a/contrib/libpcap/aclocal.m4 b/contrib/libpcap/aclocal.m4 index 374a68db2e7d..1ad668080bd6 100644 --- a/contrib/libpcap/aclocal.m4 +++ b/contrib/libpcap/aclocal.m4 @@ -825,6 +825,11 @@ dnl os-proto.h (symlinked) dnl AC_DEFUN(AC_LBL_DEVEL, [rm -f os-proto.h + # + # MKDEP defaults to no-op (":") if we don't test whether the compiler + # supports generating dependencies + # + MKDEP=: if test "${LBL_CFLAGS+set}" = set; then $1="$$1 ${LBL_CFLAGS}" fi @@ -901,14 +906,16 @@ testme(unsigned short a) # .devel file; why should the ABI for which we produce code # depend on .devel? # + AC_MSG_CHECKING([whether to use an os-proto.h header]) os=`echo $host_os | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]].*$/\1/'` name="lbl/os-$os.h" if test -f $name ; then + AC_MSG_RESULT([yes, at "$name"]) ln -s $name os-proto.h AC_DEFINE(HAVE_OS_PROTO_H, 1, - [if there's an os_proto.h for this platform, to use additional prototypes]) + [if there's an os-proto.h for this platform, to use additional prototypes]) else - AC_MSG_WARN(can't find $name) + AC_MSG_RESULT([no]) fi fi]) diff --git a/contrib/libpcap/autogen.sh b/contrib/libpcap/autogen.sh index c84a6b5c5dd2..ee72627ffe23 100755 --- a/contrib/libpcap/autogen.sh +++ b/contrib/libpcap/autogen.sh @@ -1,6 +1,7 @@ #!/bin/sh -e : "${AUTORECONF:=autoreconf}" +: "${BUILD_YEAR2038:=no}" AUTORECONFVERSION=`$AUTORECONF --version 2>&1 | grep "^autoreconf" | sed 's/.*) *//'` @@ -21,5 +22,43 @@ if [ "$maj" = "" ] || [ "$min" = "" ] || \ exit 1 fi +# On Linux, if Autoconf version >= 2.72 and GNU C Library version >= 2.34, +# s/AC_SYS_LARGEFILE/AC_SYS_YEAR2038_RECOMMENDED/ to ensure time_t +# is Y2038-safe. +if [ "$BUILD_YEAR2038" = yes ] && [ "`uname -s`" = Linux ]; then + if [ "$maj" -gt 2 ] || { [ "$maj" -eq 2 ] && [ "$min" -ge 72 ]; }; then + GLIBC_VERSION=`ldd --version|head -1|grep GLIBC|sed 's/.* //'` + maj_glibc=`echo "$GLIBC_VERSION" | cut -d. -f1` + min_glibc=`echo "$GLIBC_VERSION" | cut -d. -f2` + echo "GNU C Library identification: $GLIBC_VERSION" + if [ "$maj_glibc" -gt 2 ] || { [ "$maj_glibc" -eq 2 ] && \ + [ "$min_glibc" -ge 34 ]; }; then + CONFIGURE_AC_NEW="configure.ac.new$$" + sed 's/^AC_SYS_LARGEFILE/AC_SYS_YEAR2038_RECOMMENDED/' \ + "$CONFIGURE_AC_NEW" + cmp -s configure.ac "$CONFIGURE_AC_NEW" || \ + cat "$CONFIGURE_AC_NEW" >configure.ac + rm -f "$CONFIGURE_AC_NEW" + echo 'Setup to ensure time_t is Y2038-safe.' + fi + fi +fi + echo "$AUTORECONF identification: $AUTORECONFVERSION" -"$AUTORECONF" -f + +# configure.ac is an Autoconf 2.69 file, but it works as expected even with +# Autoconf 2.72. However, in Autoconf versions 2.70 and later obsolete +# construct warnings are enabled by default, which adds varying (depending on +# the branch) amount of noise to the build matrix output, so provide a means +# to silence that. +env ${AUTOCONF_WARNINGS:+WARNINGS="$AUTOCONF_WARNINGS"} "$AUTORECONF" -f + +# Autoconf 2.71 adds a blank line after the final "exit 0" on Linux, but not +# on OpenBSD. Remove this difference to make it easier to compare the result +# of "make releasetar" across different platforms. From sed one-liners: +# "delete all trailing blank lines at end of file (works on all seds)". Don't +# use mktemp(1) because AIX does not have it. +CONFIGURE_NEW="configure.new$$" +sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' "$CONFIGURE_NEW" +cmp -s configure "$CONFIGURE_NEW" || cat "$CONFIGURE_NEW" >configure +rm -f "$CONFIGURE_NEW" diff --git a/contrib/libpcap/cmake/Modules/FindPacket.cmake b/contrib/libpcap/cmake/Modules/FindPacket.cmake index 8224cd3f3e5c..3d31cba83299 100644 --- a/contrib/libpcap/cmake/Modules/FindPacket.cmake +++ b/contrib/libpcap/cmake/Modules/FindPacket.cmake @@ -47,42 +47,27 @@ # (e.g cmake -DPacket_ROOT=C:\path\to\packet [...]) # -# The 64-bit Packet.lib is located under /x64 -if(CMAKE_SIZEOF_VOID_P EQUAL 8) +if(CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") # - # For the WinPcap and Npcap SDKs, the Lib subdirectory of the top-level - # directory contains 32-bit libraries; the 64-bit libraries are in the - # Lib/x64 directory. + # 32-bit x86; no need to look in subdirectories of the SDK's + # Lib directory for the libraries, as the libraries are in + # the Lib directory # - # The only way to *FORCE* CMake to look in the Lib/x64 directory - # without searching in the Lib directory first appears to be to set - # CMAKE_LIBRARY_ARCHITECTURE to "x64". +else() # - # In newer versions of CMake, CMAKE_LIBRARY_ARCHITECTURE is set according to - # the language, e.g., CMAKE__LIBRARY_ARCHITECTURE. So, set the new - # variable, CMAKE_C_LIBRARY_ARCHITECTURE, so that CMAKE_LIBRARY_ARCHITECTURE - # inherits the correct value. + # Platform other than 32-bit x86. # - set(archdetect_c_code " - #ifndef _M_ARM64 - #error Not ARM64 - #endif - int main() { return 0; } - ") - - file(WRITE "${CMAKE_BINARY_DIR}/archdetect.c" "${archdetect_c_code}") - try_compile( - IsArm64 - "${CMAKE_BINARY_DIR}/archdetect" - "${CMAKE_BINARY_DIR}/archdetect.c" - ) - if(IsArm64) - set(CMAKE_C_LIBRARY_ARCHITECTURE "ARM64") - set(CMAKE_LIBRARY_ARCHITECTURE "ARM64") - else() - set(CMAKE_C_LIBRARY_ARCHITECTURE "x64") - set(CMAKE_LIBRARY_ARCHITECTURE "x64") - endif() + # For the WinPcap and Npcap SDKs, the Lib subdirectory of the top-level + # directory contains 32-bit x86 libraries; the libraries for other + # platforms are in subdirectories of the Lib directory whose names + # are the names of the supported platforms. + # + # The only way to *FORCE* CMake to look in the appropriate + # subdirectory of Lib for libraries without searching in the + # Lib directory first appears to be to set + # CMAKE_LIBRARY_ARCHITECTURE to the name of the subdirectory. + # + set(CMAKE_LIBRARY_ARCHITECTURE "${CMAKE_GENERATOR_PLATFORM}") endif() # Find the header diff --git a/contrib/libpcap/cmakeconfig.h.in b/contrib/libpcap/cmakeconfig.h.in index ae7cf5252de8..b7b20fc4da92 100644 --- a/contrib/libpcap/cmakeconfig.h.in +++ b/contrib/libpcap/cmakeconfig.h.in @@ -93,9 +93,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_LINUX_USBDEVICE_FS_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LINUX_WIRELESS_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MEMORY_H 1 @@ -129,6 +126,9 @@ /* Define to 1 if Packet32 API (Npcap driver) is available */ #cmakedefine HAVE_PACKET32 1 +/* Define to 1 if Npcap BPF extension definitions are available */ +#cmakedefine HAVE_NPCAP_BPF_H 1 + /* Define to 1 if NPcap's version.h is available */ #cmakedefine HAVE_VERSION_H 1 @@ -265,6 +265,9 @@ /* Define to 1 if you have the `PacketIsLoopbackAdapter' function. */ #cmakedefine HAVE_PACKET_IS_LOOPBACK_ADAPTER 1 +/* Define to 1 if you have the `PacketGetInfo' function. */ +#cmakedefine HAVE_PACKET_GET_INFO 1 + /* IPv6 */ #cmakedefine INET6 1 @@ -325,6 +328,9 @@ /* target host supports RDMA sniffing */ #cmakedefine PCAP_SUPPORT_RDMASNIFF 1 +/* The size of `time_t', as computed by sizeof. */ +#cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@ + /* Define to 1 if you have the ANSI C header files. */ #cmakedefine STDC_HEADERS 1 diff --git a/contrib/libpcap/config.h.in b/contrib/libpcap/config.h.in index fbc49c1d151a..e3cad6190843 100644 --- a/contrib/libpcap/config.h.in +++ b/contrib/libpcap/config.h.in @@ -102,9 +102,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_USBDEVICE_FS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_WIRELESS_H - /* Define to 1 if you have the header file. */ #undef HAVE_NETPACKET_PACKET_H @@ -138,7 +135,7 @@ /* Use OpenSSL */ #undef HAVE_OPENSSL -/* if there's an os_proto.h for this platform, to use additional prototypes */ +/* if there's an os-proto.h for this platform, to use additional prototypes */ #undef HAVE_OS_PROTO_H /* Define to 1 if you have a POSIX-style `strerror_r' function. */ @@ -256,6 +253,9 @@ /* Define to 1 if you have the `vsyslog' function. */ #undef HAVE_VSYSLOG +/* Define to 1 if you have the header file. */ +#undef HAVE_ZONE_H + /* Define to 1 if you have the `_wcserror_s' function. */ #undef HAVE__WCSERROR_S diff --git a/contrib/libpcap/configure b/contrib/libpcap/configure index 61fcd037a07a..4512c34d1293 100755 --- a/contrib/libpcap/configure +++ b/contrib/libpcap/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for pcap 1.10.5. +# Generated by GNU Autoconf 2.71 for pcap 1.10.6. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pcap' PACKAGE_TARNAME='pcap' -PACKAGE_VERSION='1.10.5' -PACKAGE_STRING='pcap 1.10.5' +PACKAGE_VERSION='1.10.6' +PACKAGE_STRING='pcap 1.10.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1380,7 +1380,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pcap 1.10.5 to adapt to many kinds of systems. +\`configure' configures pcap 1.10.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1447,7 +1447,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pcap 1.10.5:";; + short | recursive ) echo "Configuration of pcap 1.10.6:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ Optional Packages: directory DIR, if supplied). [default=yes, if present] --with-dpdk[=DIR] include DPDK support (located in directory DIR, if - supplied). [default=yes, if present] + supplied). [default=no] Some influential environment variables: CC C compiler command @@ -1611,7 +1611,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pcap configure 1.10.5 +pcap configure 1.10.6 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1664,6 +1664,53 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + # ac_fn_c_try_run LINENO # ---------------------- # Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that @@ -2183,7 +2230,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pcap $as_me 1.10.5, which was +It was created by pcap $as_me 1.10.6, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4221,132 +4268,409 @@ if test "$ac_cv_prog_cc_c99" = "no"; then fi # -# Get the size of a void *, to determine whether this is a 32-bit -# or 64-bit build. +# Try to arrange for large file support. # -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +# Check whether --enable-largefile was given. +if test ${enable_largefile+y} then : + enableval=$enable_largefile; +fi -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h +if test "$enable_largefile" != no; then -fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -printf %s "checking size of void *... " >&6; } -if test ${ac_cv_sizeof_void_p+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} then : printf %s "(cached) " >&6 else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default" -then : + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ -else $as_nop - if test "$ac_cv_type_void_p" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (void *) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_void_p=0 - fi + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO" +then : + break fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_largefile_CC=' -n32'; break fi *** 7153 LINES SKIPPED *** From nobody Mon Apr 6 21:03:51 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqMJ72vYPz6Y0Yq for ; Mon, 06 Apr 2026 21:03: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqMJ71xN8z3nLW for ; Mon, 06 Apr 2026 21:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775509431; h=from:from:reply-to:subject:subject: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/ZmRF0Q9+hoaBgOt5DIswPZuyiUjWG9dozpsjbwK5w=; b=NUXmZWkQYUl1jBALM2xhc9GIsbJebP7FpzgiThpsDzEZWFyZHRXqPfIm+QuCQepp1sDNVN Rcs+BABAr2YLDwwBhV94whrm0Nz3/cNEtQybdnv3GHDrNdIXOG1r/osYSi5r2f9W4s8FRq DAs6z4sffk9J+UUiR6XVrcEmv8K80yBSeWI2IUt3QBqhmVHxMrsGeNx0jwL+y56eIDDWNe 0rcMxFQrp4eI1vxfLzbMb0OPYWMnT2jvSgg73bedtG5ckT/q7ltWoo2OZ/NobEDXLEhZD3 AZ2XaKNpPt+YndtrSPbZFrepJpfnzbFFRHeGclu8jDXQS0XzJbU5OONMcNJ4ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775509431; a=rsa-sha256; cv=none; b=soHp/enrrzNdyAGEhmPcDe/uG49PXrik/yPPAy1yEUZ2YNvFMoPmR403w4kPpykLlfxGlA 2eC0baD7imeXlNnswOET/nGj3mYGqOV87IwpMByJ3g47paSDw7PqOgynNgYwrYcNmLei1L hOlR81UZUwiHWMS31+TmD5v0el0cnQoTUNR4IvobEokGzP5U6rW6UPRW8uuCxQILdh9W41 0285Nea4wZ4g3WCk1it0VlR8r8JOqKP+M4Zmkckl8PSz/J1Y0/GiCoSHAZb/y8A+z2Ubpx yDBO+qeFRci465IyiJcer47ztuJDVePJ2QWvGGV7c4/bK2WV/JiAZ1Zbw95Yfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775509431; h=from:from:reply-to:subject:subject: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/ZmRF0Q9+hoaBgOt5DIswPZuyiUjWG9dozpsjbwK5w=; b=PmPWCH/0metGTyLzUmCtK5EmOQJBKfYrqghJLQG6L0vUATSzuj661HVMzmSK2v7SpjsVsX XbFT9zfHoXc7Vmq4SvS7ulJbNza1/AS0M1tdvbjsFoB6bWDApEpce76gjo+WRasaqw/MDE 2cfPb93j0zXSyI5WbgJOdRxsqUQgjaKFvwhB4AUutuC4490eQsNcNTMh0QJQmofa/q2yH3 4EuNEcuTPWC1Z6PE2VfnbH7h8Maj+6BKNoFZE987CsPrCYwKx5Asy+HCufeh4fdcIReui5 /cyCUZgOiPSNYLkg6aRFe0GpbaUc55+hjsecdkH3+Ro0OZp5LFOjYq+Z2x+ZlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqMJ71XpTz18SD for ; Mon, 06 Apr 2026 21:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e596 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 21:03:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: cd87e82499e8 - stable/15 - ipfwpcap: Fix build after libpcap 1.10.6 update List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd87e82499e853a3de76580ce3981b011d0ebbcf Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 21:03:51 +0000 Message-Id: <69d41fb7.3e596.6e7f634b@gitrepo.freebsd.org> The branch stable/15 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=cd87e82499e853a3de76580ce3981b011d0ebbcf commit cd87e82499e853a3de76580ce3981b011d0ebbcf Author: Joseph Mingrone AuthorDate: 2026-03-15 05:32:01 +0000 Commit: Joseph Mingrone CommitDate: 2026-04-06 19:42:28 +0000 ipfwpcap: Fix build after libpcap 1.10.6 update pcap-int.h now references SIZEOF_TIME_T from libpcap's config.h, which is not available to consumers of the internal header outside of the libpcap build. Switch to the public header and replace the direct FILE* casts and ferror()/fflush() calls with pcap_dump_flush(3), which is the correct public API for flushing a pcap dump file. Sponsored by: The FreeBSD Foundation (cherry picked from commit a0b3ef1952603ebf0307ca723b03e5a71598dd5a) --- usr.sbin/ipfwpcap/ipfwpcap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ipfwpcap/ipfwpcap.c b/usr.sbin/ipfwpcap/ipfwpcap.c index a9cead99bd07..2032387aaa0b 100644 --- a/usr.sbin/ipfwpcap/ipfwpcap.c +++ b/usr.sbin/ipfwpcap/ipfwpcap.c @@ -41,11 +41,7 @@ #include -/* XXX normally defined in config.h */ -#define HAVE_STRLCPY 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 -#include /* see pcap(3) and /usr/src/contrib/libpcap/. */ +#include #ifdef IP_MAXPACKET #define BUFMAX IP_MAXPACKET @@ -295,8 +291,7 @@ if (debug) fprintf(stderr, " sendto(%d) = %d\n", sd, r); (void) gettimeofday(&(phd.ts), NULL); phd.caplen = phd.len = nr; pcap_dump((u_char *)dp, &phd, buf); - if (ferror((FILE *)dp)) { perror(dumpf); quit(14); } - (void) fflush((FILE *)dp); + if (pcap_dump_flush(dp) == -1) { pcap_perror(p, dumpf); quit(14); } } quit(0); From nobody Mon Apr 6 21:03:52 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqMJ85lDXz6Y0nq for ; Mon, 06 Apr 2026 21:03: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqMJ83QHMz3nP3 for ; Mon, 06 Apr 2026 21:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775509432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQsAKBX6IG4mVmPq8O6D7vgj7XhGFVGiAc9fn8hdWOA=; b=Y+O3wDq0GoRJ5D2Qz/XTP5EUoGOAMwN40MqmtIXPboSg59mEe80AtO2eYADHraJZ9kHCTm OMsgmcz3/Bzra2XBy/b41+h7eRLjNwqUJfB3DkIVFa+Y6LLBYtjsfRJG23ynqBr/BaGs7M +UymWRoPhPKmR48ot+oZqfPr5qosIIZ71lhLtbcqN9lbocUtk3GxdJxCN49fe4jbN8MnUP qiZdgslB80OfJytBRP6lYQjpZ2HPQQEnQXznUxaI4FM/FZOqLcHRUe0NQw7EmEUHyYwCBy uk7P2Rp3e3+nfCjT6fXFQH1u9OAx8HI4mk1fYPrzTtizA66DqDEfaQRZ9QpwCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775509432; a=rsa-sha256; cv=none; b=oLXDfPekZwPSpI2jsprjkmELMT3jtuxNwPJ38hCRs042PDLO6BT908o99+YZh4tGwWm55t BncH58pvICDUsaNPccnlE0ixDBX697yTkDKw+rdo8Ua17ccfuSOQxjMllfMjM67lqQVDqC iZJVojEvb6R4Kx2/AnPgvY9mj8kYvMLwSdVRnxxKR3dmyUiGvJaKg7jil66LsSyc0iGZL7 l+scpjGhW/A4OMoF47x7QR7+dftW4IkzXoEIl8f3pn7eUn3xs1Y6Yc1f648N1yvg7ZbH3A 70yeb7F47FtGD3gRBisaup8eI1L7W8AZuJKIkZQND9eJaxB7Fwu6IxJma7xcEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775509432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQsAKBX6IG4mVmPq8O6D7vgj7XhGFVGiAc9fn8hdWOA=; b=iq4ySFGfMFLXJX22n0U6b7VEzE0XlPMlEsj9dLfHvtFSZQbZTT2N+KiHqVUa1bBOBV1rt4 XWtNaBJDxfIaMzITHNZ0x4UJAUFIDpxJEHo81o6HhNSSxWErFy0d7uqurmf64h00My7id9 /H57RRSDqgFtigu9fP0F5SeMTsi6gsddCp66ctumt5TpkVq2ehs8/18mSfgWbX6lDjd1MH AVBb1DwLK1RGMuRDK/2sl9UF3Ns5OieVKyR2e+M+ZFv+TfMzcCX8qW1psfk3BAlUDA2VI4 oPS23Xjvml8ZYOda5hbSuPOr9WMvVNp2I1c2RxZ/ld/HAvl8UodtQkmj+7fgNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqMJ82vNVz18q7 for ; Mon, 06 Apr 2026 21:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d8f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 21:03:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 6af32a9d37ad - stable/15 - tcpdump: Update to 4.99.6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6af32a9d37ad689a9a72c45bfeaa6f7e52a33a4f Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 21:03:52 +0000 Message-Id: <69d41fb8.3d8f6.64dc11f0@gitrepo.freebsd.org> The branch stable/15 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=6af32a9d37ad689a9a72c45bfeaa6f7e52a33a4f commit 6af32a9d37ad689a9a72c45bfeaa6f7e52a33a4f Author: Joseph Mingrone AuthorDate: 2026-03-16 02:22:18 +0000 Commit: Joseph Mingrone CommitDate: 2026-04-06 19:42:59 +0000 tcpdump: Update to 4.99.6 Changes: https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99/CHANGES Obtained from: https://www.tcpdump.org/release/tcpdump-4.99.6.tar.xz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55578 Differential Revision: https://reviews.freebsd.org/D55871 (cherry picked from commit e6083790f217ba7f89cd2957922bd45e35466359) --- contrib/tcpdump/CHANGES | 78 +++- contrib/tcpdump/CMakeLists.txt | 186 ++++++---- contrib/tcpdump/CONTRIBUTING.md | 2 +- contrib/tcpdump/INSTALL.md | 4 + contrib/tcpdump/Makefile.in | 28 +- contrib/tcpdump/README.md | 2 +- contrib/tcpdump/VERSION | 2 +- contrib/tcpdump/addrtostr.c | 8 +- contrib/tcpdump/autogen.sh | 41 ++- contrib/tcpdump/checksum.c | 24 +- contrib/tcpdump/cmake/Modules/FindPCAP.cmake | 36 ++ contrib/tcpdump/cmakeconfig.h.in | 5 + contrib/tcpdump/config.h.in | 11 +- contrib/tcpdump/configure | 136 +++++-- contrib/tcpdump/configure.ac | 50 ++- contrib/tcpdump/diag-control.h | 30 +- contrib/tcpdump/doc/README.NetBSD.md | 22 -- contrib/tcpdump/doc/README.aix.md | 17 - contrib/tcpdump/doc/README.haiku.md | 33 -- contrib/tcpdump/doc/README.solaris.md | 46 --- contrib/tcpdump/extract.h | 6 +- contrib/tcpdump/ipproto.c | 3 +- contrib/tcpdump/ipproto.h | 2 +- contrib/tcpdump/missing/getopt_long.h | 2 +- contrib/tcpdump/missing/snprintf.c | 508 --------------------------- contrib/tcpdump/netdissect-stdinc.h | 15 - contrib/tcpdump/netdissect.c | 2 +- contrib/tcpdump/netdissect.h | 24 +- contrib/tcpdump/nfs.h | 2 +- contrib/tcpdump/ntp.c | 26 +- contrib/tcpdump/ntp.h | 2 + contrib/tcpdump/parsenfsfh.c | 17 +- contrib/tcpdump/print-802_11.c | 2 +- contrib/tcpdump/print-arista.c | 19 +- contrib/tcpdump/print-ascii.c | 20 +- contrib/tcpdump/print-bootp.c | 117 +++--- contrib/tcpdump/print-domain.c | 10 +- contrib/tcpdump/print-egp.c | 186 +++++----- contrib/tcpdump/print-frag6.c | 3 + contrib/tcpdump/print-icmp6.c | 187 +++++----- contrib/tcpdump/print-ip.c | 22 +- contrib/tcpdump/print-ip6.c | 8 +- contrib/tcpdump/print-ip6opts.c | 129 +++---- contrib/tcpdump/print-isakmp.c | 8 +- contrib/tcpdump/print-isoclns.c | 82 ++--- contrib/tcpdump/print-juniper.c | 4 +- contrib/tcpdump/print-lspping.c | 5 +- contrib/tcpdump/print-lwapp.c | 86 ++--- contrib/tcpdump/print-mobility.c | 138 +++----- contrib/tcpdump/print-msdp.c | 51 ++- contrib/tcpdump/print-ntp.c | 4 +- contrib/tcpdump/print-otv.c | 74 ---- contrib/tcpdump/print-pflog.c | 2 +- contrib/tcpdump/print-ppp.c | 2 - contrib/tcpdump/print-ptp.c | 80 +++-- contrib/tcpdump/print-raw.c | 2 +- contrib/tcpdump/print-sunrpc.c | 2 +- contrib/tcpdump/print-tcp.c | 60 ++-- contrib/tcpdump/print-udp.c | 4 +- contrib/tcpdump/print-zep.c | 42 +-- contrib/tcpdump/rpc_auth.h | 2 +- contrib/tcpdump/rpc_msg.h | 2 +- contrib/tcpdump/tcpdump.1.in | 68 +++- contrib/tcpdump/tcpdump.c | 358 ++++++++++++++++--- contrib/tcpdump/timeval-operations.h | 2 + contrib/tcpdump/udp.h | 4 +- contrib/tcpdump/util-print.c | 63 ++-- usr.sbin/tcpdump/tcpdump/Makefile | 1 - usr.sbin/tcpdump/tcpdump/config.h | 42 +-- 69 files changed, 1592 insertions(+), 1669 deletions(-) diff --git a/contrib/tcpdump/CHANGES b/contrib/tcpdump/CHANGES index b63d1eb658d3..72496fde7a43 100644 --- a/contrib/tcpdump/CHANGES +++ b/contrib/tcpdump/CHANGES @@ -1,3 +1,76 @@ +Tuesday, December 30, 2025 / The Tcpdump Group + Summary for 4.99.6 tcpdump release + Remove protocol decoding for: + OTV (draft-hasmit-otv-04, this Internet-Draft is no longer active). + Refine protocol decoding for: + DNS: Use ND_TCHECK_LEN() instead of a custom bounds check. + IPv6: Add a missing comma and remove a colon in the output. + TCP: Note if the Urgent Pointer is non-zero while URG flag not set, + if the verbose level is > 1 (option -vv and more). + TCP: Note if the Acknowledgment Number is non-zero while ACK flag not set, + if the verbose level is > 1 (option -vv and more). + TCP: Fix Reset segment processing. + IP, IPv6: Fix setting the snapshot length for the payload. + IP: Use ND_TTEST_LEN() instead of a custom bounds check. + frag6: Add a bounds check in non-verbose mode. + PTP: Remove spaces before colons in output. + PTP: Fix management packet fields. + ISO: Avoid undefined behavior and integer overflow in the Fletcher + checksum calculation. + NFS: Delete dead code. + BOOTP: Use an uint16_t variable to get the result of a GET_BE_U_2(). + ZEP: use the existing NTP time formatting code. + NTP: Fix p_ntp_time_fmt() using epoch 1/epoch 2 convention (RFC 4330). + NTP: Update a field name with the RFC 5905 name (Origin Timestamp). + IPv6 mobility: Modernize packet parsing and make fixes. + IP6OPTS: Modernize packet parsing and make fixes. + VXLAN: Add UDP port 8472 used by Linux as the default port. + EGP: Replace custom code with tok2str(); Modernize packet parsing and + fix printing with -v option. + User interface: + Add optional unit suffix on -C file size. + Improve the handling of size suffixes for -C. + Print errors for options -A, -x[x] and -X[X] (mutually exclusive). + Print errors about -C, -G and -z options usage. + For PCAP_ERROR_CAPTURE_NOTSUP, show the error message provided + by libpcap for that error if it's non-empty. + Update the -z option processing. Print "invalid option -- z" when it is. + Add the -g option, causing IPv4 output in verbose mode to be on one line. + Other: + Avoid race condition when receiving signal during shutdown. + Always show the interface name in error messages when the + interface can't be opened. + Clean up the message shown if a -i flag is specified with an + interface index that's too large. + Source code: + Fix '-tt' option printing when time > 2106-02-07T06:28:15Z. + Add sub-second packet timestamp checks for invalid micro/nano. + Remove unused missing/snprintf.c. + Fix incompatible pointer types with time functions calls on Windows. + Use C99 macros to define 64-bit constants and maximum 64-bit values. + Windows: + Fixed to find wpcap.dll if WinPcap isn't installed and Npcap was + installed without the WinPcap API compatibility option. (GitHub + issue #1226). + Building and testing: + Makefile.in: Use a local libpcap in the releasecheck target. + CMake: Fix build with CMake 3.31. + autotools, CMake: don't separately test whether snprintf(3) is + available and whether it's suitable - the test for whether it's + suitable also fails if it's unavailable. + CMake: Skip snprintf(3) tests when cross-compiling. + autotools, CMake: fix issues with snprintf test and sanitizers. + CMake: check whether check_c_source_runs() works, treat the build + as a cross-compile if it doesn't work. + Autoconf: Use AC_SYS_YEAR2038_RECOMMENDED when possible if the + environment variable BUILD_YEAR2038 = yes (via autogen.sh). + Autoconf: Avoid incorrectly include the libpcap's config.h. + Autoconf: Refine reporting of os-proto.h. + Require config.h to be from the tcpdump build. + AppVeyor: Update Npcap SDK to 1.15. + autogen.sh: Allow to configure Autoconf warnings. + autogen.sh: Delete all trailing blank lines at end of configure. + Friday, August 30, 2024 / The Tcpdump Group Summary for 4.99.5 tcpdump release Refine protocol decoding for: @@ -38,7 +111,7 @@ Friday, August 30, 2024 / The Tcpdump Group OSPF: Pad TLVs in LS_OPAQUE_TYPE_RI to multiples of 4 bytes. OSPF: Update LS-Ack printing not to run off the end of the packet. OSPF6: Fix an undefined behavior. - pflog: use nd_ types in struct pfloghdr. + pflog: Use nd_ types in struct pfloghdr. PPP: Check if there is some data to hexdump. PPP: Remove an extra colon before LCP Callback Operation. Use the buffer stack for de-escaping PPP; fixes CVE-2024-2397; @@ -122,6 +195,7 @@ Friday, August 30, 2024 / The Tcpdump Group Make various improvements to the man page. Add initial README file for Haiku. Make various improvements to CONTRIBUTING.md. + man: Clarify the "any" pseudo-interface further. Friday, April 7, 2023 / The Tcpdump Group Summary for 4.99.4 tcpdump release @@ -179,7 +253,7 @@ Saturday, December 31, 2022 / The Tcpdump Group 802.11: Fetch the CF and TIM IEs a field at a time. 802.15.4, BGP, LISP: fix some length checks, compiler warnings, and undefined behavior warnings. - PFLOG: handle LINKTYPE_PFLOG/DLT_PFLOG files from all OSes on all + PFLOG: Handle LINKTYPE_PFLOG/DLT_PFLOG files from all OSes on all OSes. RRCP: support more Realtek protocols than just RRCP. MPLS: show the EXP field as TC, as per RFC 5462. diff --git a/contrib/tcpdump/CMakeLists.txt b/contrib/tcpdump/CMakeLists.txt index f9071295eff1..6b8647201038 100644 --- a/contrib/tcpdump/CMakeLists.txt +++ b/contrib/tcpdump/CMakeLists.txt @@ -13,14 +13,21 @@ else(WIN32) # on a "long-term support" version # of some OS and that # version supplies an older version of CMake; # - # otherwise, require 3.5, so we don't get messages warning - # that support for versions of CMake lower than 3.5 is + # otherwise, if it's a version less than 3.10, require only + # 3.5, just in case somebody is configuring with CMake + # on a "long-term support" version # of some OS and that + # version supplies an older version of CMake; + # + # otherwise, require 3.10, so we don't get messages warning + # that support for versions of CMake lower than 3.10 is # deprecated. # if(CMAKE_VERSION VERSION_LESS "3.5") cmake_minimum_required(VERSION 2.8.12) - else() + elseif(CMAKE_VERSION VERSION_LESS "3.10") cmake_minimum_required(VERSION 3.5) + else() + cmake_minimum_required(VERSION 3.10) endif() endif(WIN32) @@ -392,6 +399,35 @@ if(MSVC) endif (USE_STATIC_RT) endif(MSVC) +# +# CMake's definition of "cross-compiling" appears to be "compiling +# for an *operating system* other than the one on which the build +# is being done*. +# +# This is an inadequate definition, as people build for the same +# operating system but a different instruction set, e.g. building +# on an IA-32 or x86-64 Linux box for an Arm embedded Linux box, +# or building Arm code on an IA-32 or x86-64 Windows box. +# +# So just test whether check_c_source_runs() on a trivial program +# works; if not, it's probably because the generated code won't +# run on the platform on which we're running. +# +include(CheckCSourceRuns) +if (NOT CMAKE_CROSSCOMPILING) + check_c_source_runs(" + int main() + { + return 0; + } + " + CHECK_C_SOURCE_RUNS_WORKS + ) + if (NOT CHECK_C_SOURCE_RUNS_WORKS) + set(CMAKE_CROSSCOMPILING TRUE) + endif() +endif() + ################################################################### # Detect available platform features ################################################################### @@ -407,11 +443,16 @@ include(CheckVariableExists) include(CheckTypeSize) # -# Get the size of a time_t, to know whether it's 32-bit or 64-bit. +# Get the size of a time_t, to know whether it's 32-bit or 64-bit. Print it. # cmake_push_check_state() set(CMAKE_EXTRA_INCLUDE_FILES time.h) check_type_size("time_t" SIZEOF_TIME_T) +if(SIZEOF_TIME_T EQUAL 4) + message(STATUS "32-bit time_t") +elseif(SIZEOF_TIME_T EQUAL 8) + message(STATUS "64-bit time_t") +endif() cmake_pop_check_state() # @@ -493,67 +534,77 @@ else(STDLIBS_HAVE_GETSERVENT) endif(STDLIBS_HAVE_GETSERVENT) cmake_pop_check_state() -# -# Make sure we have snprintf(); we require it. -# We use check_symbol_exists(), as it isn't necessarily an external -# function - in Visual Studio, for example, it is an inline function -# calling an external function. -# -check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF) -if(NOT HAVE_SNPRINTF) - message(FATAL_ERROR "snprintf() is required but wasn't found") -endif() - -# -# Require a proof of suitable snprintf(3), same as in Autoconf. -# -include(CheckCSourceRuns) -check_c_source_runs(" -#include -#include -#include -#include - -int main() -{ - char buf[100]; - uint64_t t = (uint64_t)1 << 32; - - snprintf(buf, sizeof(buf), \"%zu\", sizeof(buf)); - if (strncmp(buf, \"100\", sizeof(buf))) - return 1; - - snprintf(buf, sizeof(buf), \"%zd\", -sizeof(buf)); - if (strncmp(buf, \"-100\", sizeof(buf))) - return 2; - - snprintf(buf, sizeof(buf), \"%\" PRId64, -t); - if (strncmp(buf, \"-4294967296\", sizeof(buf))) - return 3; - - snprintf(buf, sizeof(buf), \"0o%\" PRIo64, t); - if (strncmp(buf, \"0o40000000000\", sizeof(buf))) - return 4; - - snprintf(buf, sizeof(buf), \"0x%\" PRIx64, t); - if (strncmp(buf, \"0x100000000\", sizeof(buf))) - return 5; - - snprintf(buf, sizeof(buf), \"%\" PRIu64, t); - if (strncmp(buf, \"4294967296\", sizeof(buf))) - return 6; - - return 0; -} - -" - SUITABLE_SNPRINTF -) -if(NOT SUITABLE_SNPRINTF) - message(FATAL_ERROR +if (NOT CMAKE_CROSSCOMPILING) + # + # Require a proof of suitable snprintf(3), same as in Autoconf. + # + check_c_source_runs(" + #include + #include + #include + #include + + #if defined(_WIN32) && !defined(_SSIZE_T_DEFINED) + /* + * On UN*Xes, this is a signed integer type of the same size as size_t. + * + * It's not defined by Visual Studio; we assume that ptrdiff_t will + * be a type that is a signed integer type of the same size as size_t. + */ + typedef ptrdiff_t ssize_t; + #endif + + /* + * Avoid trying to cast negative values to unsigned types, or doing + * shifts of signed types, in order not to have the test program fail + * if we're building with undefined-behavior sanitizers enabled. + */ + int main() + { + char buf[100]; + unsigned int ui = sizeof(buf); + int i = sizeof(buf); + int64_t i64 = INT64_C(0x100000000); + uint64_t ui64 = UINT64_C(0x100000000); + + snprintf(buf, sizeof(buf), \"%zu\", (size_t)ui); + if (strncmp(buf, \"100\", sizeof(buf))) + return 1; + + snprintf(buf, sizeof(buf), \"%zd\", (ssize_t)(-i)); + if (strncmp(buf, \"-100\", sizeof(buf))) + return 2; + + snprintf(buf, sizeof(buf), \"%\" PRId64, -i64); + if (strncmp(buf, \"-4294967296\", sizeof(buf))) + return 3; + + snprintf(buf, sizeof(buf), \"0o%\" PRIo64, ui64); + if (strncmp(buf, \"0o40000000000\", sizeof(buf))) + return 4; + + snprintf(buf, sizeof(buf), \"0x%\" PRIx64, ui64); + if (strncmp(buf, \"0x100000000\", sizeof(buf))) + return 5; + + snprintf(buf, sizeof(buf), \"%\" PRIu64, ui64); + if (strncmp(buf, \"4294967296\", sizeof(buf))) + return 6; + + return 0; + } + + " + SUITABLE_SNPRINTF + ) + if(NOT SUITABLE_SNPRINTF) + message(FATAL_ERROR "The snprintf(3) implementation in this libc is not suitable, tcpdump would not work correctly even if it managed to compile." - ) + ) + endif() +else() + message(STATUS "Skipped SUITABLE_SNPRINTF because cross-compiling.") endif() check_function_exists(getopt_long HAVE_GETOPT_LONG) @@ -908,7 +959,7 @@ check_function_exists(pcap_dump_ftell64 HAVE_PCAP_DUMP_FTELL64) # we should check for it, so that we can use it if it's present. # # So we check for pcap_open() and pcap_findalldevs_ex() if 1) this isn't -# macOS or 2) the the libpcap we found is not a system library, meaning +# macOS or 2) the libpcap we found is not a system library, meaning # that its path begins neither with /usr/lib (meaning it's a system # dylib) nor /Application/Xcode.app (meaning it's a file in # the Xcode SDK). @@ -1160,6 +1211,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.devel OR EXISTS ${CMAKE_BINARY_DIR}/.devel) check_and_add_compiler_option(-Wall) check_and_add_compiler_option(-Wassign-enum) check_and_add_compiler_option(-Wcast-qual) + check_and_add_compiler_option(-Wcomma) check_and_add_compiler_option(-Wmissing-prototypes) check_and_add_compiler_option(-Wmissing-variable-declarations) check_and_add_compiler_option(-Wold-style-definition) @@ -1331,7 +1383,6 @@ set(NETDISSECT_SOURCE_LIST_C print-openflow.c print-ospf.c print-ospf6.c - print-otv.c print-pflog.c print-pgm.c print-pim.c @@ -1496,6 +1547,9 @@ add_executable(tcpdump ${TCPDUMP_SOURCE_LIST_C}) if(NOT C_ADDITIONAL_FLAGS STREQUAL "") set_target_properties(tcpdump PROPERTIES COMPILE_FLAGS ${C_ADDITIONAL_FLAGS}) endif() +if(NOT "${PCAP_LINK_FLAGS}" STREQUAL "") + set_target_properties(tcpdump PROPERTIES LINK_FLAGS ${PCAP_LINK_FLAGS}) +endif() target_link_libraries(tcpdump netdissect ${TCPDUMP_LINK_LIBRARIES}) ###################################### @@ -1551,7 +1605,7 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) # -# Tcpdump tests +# tcpdump tests # We try to find the Perl interpreter and, if we do, we have the check # rule run tests/TESTrun with it, because just trying to run the TESTrun # script as a command won't work on Windows. diff --git a/contrib/tcpdump/CONTRIBUTING.md b/contrib/tcpdump/CONTRIBUTING.md index 215e4c6831c4..fdad452b47b8 100644 --- a/contrib/tcpdump/CONTRIBUTING.md +++ b/contrib/tcpdump/CONTRIBUTING.md @@ -39,7 +39,7 @@ and ask! 1) Check that there isn't a pull request already opened for the changes you intend to make. -2) [Fork](https://help.github.com/articles/fork-a-repo/) the Tcpdump +2) [Fork](https://help.github.com/articles/fork-a-repo/) the tcpdump [repository](https://github.com/the-tcpdump-group/tcpdump). 3) The easiest way to test your changes on multiple operating systems and diff --git a/contrib/tcpdump/INSTALL.md b/contrib/tcpdump/INSTALL.md index 08fc31b682d0..15b8270ccced 100644 --- a/contrib/tcpdump/INSTALL.md +++ b/contrib/tcpdump/INSTALL.md @@ -18,6 +18,10 @@ directory), do the following steps: run `./autogen.sh` (a shell script). The autogen.sh script will build the `configure` and `config.h.in` files. +* If you build on a Linux 32-bit system, with Autoconf version >= 2.72 +and GNU C Library version >= 2.34, run `export BUILD_YEAR2038=yes` +before running `./autogen.sh` to build with 64-bit time_t (Y2038-safe). + On some system, you may need to set the `AUTORECONF` variable, like: `AUTORECONF=autoreconf-2.69 ./autogen.sh` to select the `autoreconf` version you want to use. diff --git a/contrib/tcpdump/Makefile.in b/contrib/tcpdump/Makefile.in index e991cce2da0f..72dd01d6e3c0 100644 --- a/contrib/tcpdump/Makefile.in +++ b/contrib/tcpdump/Makefile.in @@ -49,7 +49,7 @@ DEFS = @DEFS@ @CPPFLAGS@ @V_DEFS@ # Standard CFLAGS CFLAGS = @CFLAGS@ -FULL_CFLAGS = $(CCOPT) $(DEFS) $(INCLS) $(CFLAGS) +FULL_CFLAGS = $(INCLS) $(CCOPT) $(DEFS) $(CFLAGS) # Standard LDFLAGS LDFLAGS = @LDFLAGS@ @@ -192,7 +192,6 @@ LIBNETDISSECT_SRC=\ print-openflow.c \ print-ospf.c \ print-ospf6.c \ - print-otv.c \ print-pflog.c \ print-pgm.c \ print-pim.c \ @@ -373,7 +372,6 @@ EXTRA_DIST = \ missing/getopt_long.h \ missing/getservent.c \ missing/pcap_dump_ftell.c \ - missing/snprintf.c \ missing/strdup.c \ missing/strlcat.c \ missing/strlcpy.c \ @@ -409,8 +407,6 @@ getservent.o: $(srcdir)/missing/getservent.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getservent.c getopt_long.o: $(srcdir)/missing/getopt_long.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getopt_long.c -snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c strdup.o: $(srcdir)/missing/strdup.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strdup.c strlcat.o: $(srcdir)/missing/strlcat.c @@ -504,7 +500,7 @@ releasetar: tar xf -) && \ echo "No $$TAG tag. Archive build from HEAD."; \ fi && \ - (cd "$$TAG" && "$${AUTORECONF:-autoreconf}" && rm -rf autom4te.cache) && \ + (cd "$$TAG" && ./autogen.sh && rm -rf autom4te.cache) && \ tar cf "$$DIR/$$TAG".tar "$$TAG" && \ rm -f "$$DIR/$$TAG".tar.gz && \ gzip --best "$$DIR/$$TAG".tar && \ @@ -516,6 +512,22 @@ releasecheck: releasetar INSTALL_DIR=/tmp/install_"$$TAG"_$$$$ && \ DIR=`pwd` && \ cd /tmp && \ + rm -rf libpcap && \ + rm -rf install_libpcap && \ + echo "[$@] $$ git clone [...] libpcap.git" && \ + git clone --depth 3 --quiet https://github.com/the-tcpdump-group/libpcap.git && \ + echo "[$@] $$ cd libpcap" && \ + cd libpcap && \ + echo "[$@] $$ ./autogen.sh" && \ + ./autogen.sh && \ + echo "[$@] $$ ./configure --quiet --prefix=/tmp/install_libpcap" && \ + ./configure --quiet --prefix=/tmp/install_libpcap && \ + echo "[$@] $$ make -s " && \ + make -s && \ + echo "[$@] $$ make -s install" && \ + make -s install && \ + echo "[$@] $$ cd .." && \ + cd .. && \ rm -rf "$$TAG" && \ rm -rf "$$INSTALL_DIR" && \ tar xf "$$DIR"/"$$TAG".tar.gz && \ @@ -537,6 +549,8 @@ releasecheck: releasetar touch .devel && \ mkdir build && \ cd build && \ + echo "[$@] $$ export PKG_CONFIG_PATH=/tmp/install_libpcap/lib/pkgconfig" && \ + export PKG_CONFIG_PATH=/tmp/install_libpcap/lib/pkgconfig && \ echo '[$@] $$ cmake -DENABLE_SMB=yes [...] ..' && \ cmake -DENABLE_SMB=yes \ -DCMAKE_INSTALL_PREFIX="$$INSTALL_DIR" \ @@ -551,6 +565,8 @@ releasecheck: releasetar cd ../.. && \ rm -rf "$$TAG" && \ rm -rf "$$INSTALL_DIR" && \ + rm -rf install_libpcap && \ + rm -rf libpcap && \ echo '[$@] Done.' whitespacecheck: diff --git a/contrib/tcpdump/README.md b/contrib/tcpdump/README.md index 566b7b7a874f..a227e126d00c 100644 --- a/contrib/tcpdump/README.md +++ b/contrib/tcpdump/README.md @@ -40,7 +40,7 @@ tcpdump compiles and works on at least the following platforms: * Windows (requires WinPcap or Npcap, and Visual Studio with CMake) ### Dependency on libpcap -Tcpdump uses libpcap, a system-independent interface for user-level +tcpdump uses libpcap, a system-independent interface for user-level packet capture. Before building tcpdump, you must first retrieve and build libpcap. diff --git a/contrib/tcpdump/VERSION b/contrib/tcpdump/VERSION index 33640cd1b928..aeec4132fdd6 100644 --- a/contrib/tcpdump/VERSION +++ b/contrib/tcpdump/VERSION @@ -1 +1 @@ -4.99.5 +4.99.6 diff --git a/contrib/tcpdump/addrtostr.c b/contrib/tcpdump/addrtostr.c index 1fd2cf0908bf..2c4133b5be72 100644 --- a/contrib/tcpdump/addrtostr.c +++ b/contrib/tcpdump/addrtostr.c @@ -127,9 +127,11 @@ addrtostr6 (const void *src, char *dst, size_t size) cur.base = -1; for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { if (words[i] == 0) { - if (cur.base == -1) - cur.base = i, cur.len = 1; - else cur.len++; + if (cur.base == -1) { + cur.base = i; + cur.len = 1; + } else + cur.len++; } else if (cur.base != -1) { if (best.base == -1 || cur.len > best.len) best = cur; diff --git a/contrib/tcpdump/autogen.sh b/contrib/tcpdump/autogen.sh index c84a6b5c5dd2..95c0233c80de 100755 --- a/contrib/tcpdump/autogen.sh +++ b/contrib/tcpdump/autogen.sh @@ -1,6 +1,7 @@ #!/bin/sh -e : "${AUTORECONF:=autoreconf}" +: "${BUILD_YEAR2038:=no}" AUTORECONFVERSION=`$AUTORECONF --version 2>&1 | grep "^autoreconf" | sed 's/.*) *//'` @@ -21,5 +22,43 @@ if [ "$maj" = "" ] || [ "$min" = "" ] || \ exit 1 fi +# On Linux, if Autoconf version >= 2.72 and GNU C Library version >= 2.34, +# s/AC_SYS_LARGEFILE/AC_SYS_YEAR2038_RECOMMENDED/ to ensure time_t +# is Y2038-safe. +if [ "$BUILD_YEAR2038" = yes ] && [ "`uname -s`" = Linux ]; then + if [ "$maj" -gt 2 ] || { [ "$maj" -eq 2 ] && [ "$min" -ge 72 ]; }; then + GLIBC_VERSION=`ldd --version|head -1|grep GLIBC|sed 's/.* //'` + maj_glibc=`echo "$GLIBC_VERSION" | cut -d. -f1` + min_glibc=`echo "$GLIBC_VERSION" | cut -d. -f2` + echo "GNU C Library identification: $GLIBC_VERSION" + if [ "$maj_glibc" -gt 2 ] || { [ "$maj_glibc" -eq 2 ] && \ + [ "$min_glibc" -ge 34 ]; }; then + CONFIGURE_AC_NEW="configure.ac.new$$" + sed 's/^# \(AC_SYS_YEAR2038_RECOMMENDED\)/\1/' \ + "$CONFIGURE_AC_NEW" + cmp -s configure.ac "$CONFIGURE_AC_NEW" || \ + cat "$CONFIGURE_AC_NEW" >configure.ac + rm -f "$CONFIGURE_AC_NEW" + echo 'Setup to ensure time_t is Y2038-safe.' + fi + fi +fi + echo "$AUTORECONF identification: $AUTORECONFVERSION" -"$AUTORECONF" -f + +# configure.ac is an Autoconf 2.69 file, but it works as expected even with +# Autoconf 2.72. However, in Autoconf versions 2.70 and later obsolete +# construct warnings are enabled by default, which adds varying (depending on +# the branch) amount of noise to the build matrix output, so provide a means +# to silence that. +env ${AUTOCONF_WARNINGS:+WARNINGS="$AUTOCONF_WARNINGS"} "$AUTORECONF" -f + +# Autoconf 2.71 adds a blank line after the final "exit 0" on Linux, but not +# on OpenBSD. Remove this difference to make it easier to compare the result +# of "make releasetar" across different platforms. From sed one-liners: +# "delete all trailing blank lines at end of file (works on all seds)". Don't +# use mktemp(1) because AIX does not have it. +CONFIGURE_NEW="configure.new$$" +sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' "$CONFIGURE_NEW" +cmp -s configure "$CONFIGURE_NEW" || cat "$CONFIGURE_NEW" >configure +rm -f "$CONFIGURE_NEW" diff --git a/contrib/tcpdump/checksum.c b/contrib/tcpdump/checksum.c index 4bb97f1e33f4..bb07664dcec7 100644 --- a/contrib/tcpdump/checksum.c +++ b/contrib/tcpdump/checksum.c @@ -106,9 +106,9 @@ create_osi_cksum (const uint8_t *pptr, int checksum_offset, int length) int x; int y; - uint32_t mul; + int32_t mul; uint32_t c0; - uint32_t c1; + uint64_t c1; uint16_t checksum; int idx; @@ -134,21 +134,23 @@ create_osi_cksum (const uint8_t *pptr, int checksum_offset, int length) mul = (length - checksum_offset)*(c0); - x = mul - c0 - c1; - y = c1 - mul - 1; - - if ( y >= 0 ) y++; - if ( x < 0 ) x--; + /* + * Casting c0 and c1 here is guaranteed to be safe, because we know + * they have values between 0 and 254 inclusive. These casts are + * done to ensure that all of the arithmetic operations are + * well-defined (i.e., not mixing signed and unsigned integers). + */ + x = mul - (int)c0 - (int)c1; + y = (int)c1 - mul; x %= 255; y %= 255; - - if (x == 0) x = 255; - if (y == 0) y = 255; + if (x <= 0) x += 255; + if (y <= 0) y += 255; y &= 0x00FF; - checksum = ((x << 8) | y); + checksum = (uint16_t)((x << 8) | y); return checksum; } diff --git a/contrib/tcpdump/cmake/Modules/FindPCAP.cmake b/contrib/tcpdump/cmake/Modules/FindPCAP.cmake index 11074655f457..e27709256f72 100644 --- a/contrib/tcpdump/cmake/Modules/FindPCAP.cmake +++ b/contrib/tcpdump/cmake/Modules/FindPCAP.cmake @@ -61,6 +61,42 @@ if(WIN32) if(PCAP_FOUND) set(PCAP_LIBRARIES ${PCAP_LIBRARY}) set(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR}) + + # + # We need to look for wpcap.dll in \Windows\System32\Npcap first, + # as either: + # + # 1) WinPcap isn't installed and Npcap isn't installed in "WinPcap + # API-compatible Mode", so there's no wpcap.dll in + # \Windows\System32, only in \Windows\System32\Npcap; + # + # 2) WinPcap is installed and Npcap isn't installed in "WinPcap + # API-compatible Mode", so the wpcap.dll in \Windows\System32 + # is a WinPcap DLL, but we'd prefer an Npcap DLL (we should + # work with either one if we're configured against WinPcap, + # and we'll probably require Npcap if we're configured against + # it), and that's in \Windows\System32\Npcap; + # + # 3) Npcap is installed in "WinPcap API-compatible Mode", so both + # \Windows\System32 and \Windows\System32\Npcap have an Npcap + # wpcap.dll. + # + # Unfortunately, Windows has no notion of an rpath, so we can't + # set the rpath to include \Windows\System32\Npcap at link time; + # what we need to do is to link wpcap as a delay-load DLL and + # add \Windows\System32\Npcap to the DLL search path early in + # main() with a call to SetDllDirectory(). + # + # We add /delayload:wpcap.dll to the linker options here. + # + # See https://npcap.com/guide/npcap-devguide.html#npcap-feature-native-dll-implicitly + # + set(PCAP_LINK_FLAGS /delayload:wpcap.dll) + + # + # Delay-loading libraries means we need to link with delayimp.lib. + # + set(PCAP_LIBRARIES ${PCAP_LIBRARIES} delayimp.lib) endif() else(WIN32) # diff --git a/contrib/tcpdump/cmakeconfig.h.in b/contrib/tcpdump/cmakeconfig.h.in index 0bd1e96e165a..244bcb818a6a 100644 --- a/contrib/tcpdump/cmakeconfig.h.in +++ b/contrib/tcpdump/cmakeconfig.h.in @@ -1,5 +1,8 @@ /* cmakeconfig.h.in */ +#ifndef TCPDUMP_CONFIG_H_ +#define TCPDUMP_CONFIG_H_ + /* Define to 1 if arpa/inet.h declares `ether_ntohost' */ #cmakedefine ARPA_INET_H_DECLARES_ETHER_NTOHOST 1 @@ -288,3 +291,5 @@ /* Define to the type of an unsigned integer type wide enough to hold a pointer, if such a type exists, and if the system does not define it. */ #cmakedefine uintptr_t 1 + +#endif // TCPDUMP_CONFIG_H_ diff --git a/contrib/tcpdump/config.h.in b/contrib/tcpdump/config.h.in index c1bc5f7d9de8..da600e885fde 100644 --- a/contrib/tcpdump/config.h.in +++ b/contrib/tcpdump/config.h.in @@ -1,5 +1,10 @@ /* config.h.in. Generated from configure.ac by autoheader. */ + +#ifndef TCPDUMP_CONFIG_H_ +#define TCPDUMP_CONFIG_H_ + + /* Define to 1 if arpa/inet.h declares `ether_ntohost' */ #undef ARPA_INET_H_DECLARES_ETHER_NTOHOST @@ -75,7 +80,7 @@ /* define if the OS provides AF_INET6 and struct in6_addr */ #undef HAVE_OS_IPV6_SUPPORT -/* if there's an os_proto.h for this platform, to use additional prototypes */ +/* if there's an os-proto.h for this platform, to use additional prototypes */ #undef HAVE_OS_PROTO_H /* Define to 1 if you have the `pcap_breakloop' function. */ @@ -287,3 +292,7 @@ /* Define to the type of an unsigned integer type wide enough to hold a pointer, if such a type exists, and if the system does not define it. */ #undef uintptr_t + + +#endif // TCPDUMP_CONFIG_H_ + diff --git a/contrib/tcpdump/configure b/contrib/tcpdump/configure index 9400d62bc838..222d8a513fd0 100755 --- a/contrib/tcpdump/configure +++ b/contrib/tcpdump/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for tcpdump 4.99.5. +# Generated by GNU Autoconf 2.71 for tcpdump 4.99.6. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tcpdump' PACKAGE_TARNAME='tcpdump' -PACKAGE_VERSION='4.99.5' -PACKAGE_STRING='tcpdump 4.99.5' +PACKAGE_VERSION='4.99.6' +PACKAGE_STRING='tcpdump 4.99.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1306,7 +1306,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tcpdump 4.99.5 to adapt to many kinds of systems. +\`configure' configures tcpdump 4.99.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1372,7 +1372,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tcpdump 4.99.5:";; + short | recursive ) echo "Configuration of tcpdump 4.99.6:";; esac cat <<\_ACEOF @@ -1489,7 +1489,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tcpdump configure 4.99.5 +tcpdump configure 4.99.6 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2086,7 +2086,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tcpdump $as_me 4.99.5, which was +It was created by tcpdump $as_me 4.99.6, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4248,6 +4248,11 @@ then : fi + +# On Linux, if Autoconf version >= 2.72 and GNU C Library version >= 2.34, +# uncomment AC_SYS_YEAR2038_RECOMMENDED to ensure time_t is Y2038-safe. +# (Can be done by autogen.sh) +# AC_SYS_YEAR2038_RECOMMENDED # # Get the size of a void *, to know whether this is a 32-bit or 64-bit build. # @@ -5838,18 +5843,6 @@ then : fi -# -# Make sure we have snprintf(); we require it. -# -ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" -if test "x$ac_cv_func_snprintf" = xyes -then : - -else $as_nop - as_fn_error $? "snprintf() is required but wasn't found" "$LINENO" 5 -fi - - # # It became apparent at some point that using a suitable C99 compiler does not # automatically mean snprintf(3) implementation in the libc supports all the @@ -5883,32 +5876,50 @@ else $as_nop #include #include +#if defined(_WIN32) && !defined(_SSIZE_T_DEFINED) +/* + * On UN*Xes, this is a signed integer type of the same size as size_t. + * + * It's not defined by Visual Studio; we assume that ptrdiff_t will + * be a type that is a signed integer type of the same size as size_t. + */ +typedef ptrdiff_t ssize_t; +#endif + +/* + * Avoid trying to cast negative values to unsigned types, or doing + * shifts of signed types, in order not to have the test program fail + * if we're building with undefined-behavior sanitizers enabled. + */ int main() { char buf[100]; - uint64_t t = (uint64_t)1 << 32; + unsigned int ui = sizeof(buf); + int i = sizeof(buf); + int64_t i64 = INT64_C(0x100000000); + uint64_t ui64 = UINT64_C(0x100000000); - snprintf(buf, sizeof(buf), "%zu", sizeof(buf)); + snprintf(buf, sizeof(buf), "%zu", (size_t)ui); if (strncmp(buf, "100", sizeof(buf))) return 1; - snprintf(buf, sizeof(buf), "%zd", -sizeof(buf)); + snprintf(buf, sizeof(buf), "%zd", (ssize_t)(-i)); if (strncmp(buf, "-100", sizeof(buf))) return 2; - snprintf(buf, sizeof(buf), "%" PRId64, -t); + snprintf(buf, sizeof(buf), "%" PRId64, -i64); if (strncmp(buf, "-4294967296", sizeof(buf))) return 3; - snprintf(buf, sizeof(buf), "0o%" PRIo64, t); + snprintf(buf, sizeof(buf), "0o%" PRIo64, ui64); if (strncmp(buf, "0o40000000000", sizeof(buf))) return 4; - snprintf(buf, sizeof(buf), "0x%" PRIx64, t); + snprintf(buf, sizeof(buf), "0x%" PRIx64, ui64); if (strncmp(buf, "0x100000000", sizeof(buf))) return 5; - snprintf(buf, sizeof(buf), "%" PRIu64, t); + snprintf(buf, sizeof(buf), "%" PRIu64, ui64); if (strncmp(buf, "4294967296", sizeof(buf))) return 6; @@ -7845,6 +7856,11 @@ fi rm -f os-proto.h + # + # MKDEP defaults to no-op (":") if we don't test whether the compiler + # supports generating dependencies + # + MKDEP=: if test "${LBL_CFLAGS+set}" = set; then V_CCOPT="$V_CCOPT ${LBL_CFLAGS}" fi @@ -8066,6 +8082,59 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag="$save_ac_c_werror_flag" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wcomma option" >&5 +printf %s "checking whether the compiler supports the -Wcomma option... " >&6; } *** 5391 LINES SKIPPED *** From nobody Tue Apr 7 11:26:55 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqkRz2MQjz6Y42Q for ; Tue, 07 Apr 2026 11:26: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkRz1k61z4Mf8 for ; Tue, 07 Apr 2026 11:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mWaIctj7Z1zoM/1P67Gu5fpD8KlVZc3LhSYobl+Qem4=; b=Xz0IyjipMDe0qVza1onGWVtzZ8Fv1RY2tVFSHvzSySBmCgPUh34AENQdnU784T0t72WcG+ 5J7lWDQQJZgMOtJg8eECtAELSI6kFQe2LnVex6d/QwCbNk6nxAROdl77+JWy6GH+/WBxUz glBgstQ1uhje0XQkkkn/U3annhsSyQN0qvJBpIIKavx449y5ViGAO0kQMv6yxiHuVPnsBk axFNq/x6NasXVa1jIJEYWNaw8HgXtRTR23f9XcSY6cIWTzmzd7chlXiP2D0jhHIPTiWQsV 9Ylr8xuSYwb8urjkOXNEePDaj/9zMkeuMIKu8hj/rQ0bs3oIRQbyCnJy8Mn9bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561215; a=rsa-sha256; cv=none; b=Rkzgje1f4v4EvrHLkpb4Y4ctTaerZeLKH8GaE+J6Wa+DfErmmX+21K2x006BzjQvLimldY bZy3OmS/UVLpNJ/LSHktKxyiZPLzZ+VluKfpPzTK8XJEM86G25LVpW3/31EeIkyYsmYxFO Bbqsb7k1V5odF2eSBTvXrhsNlJilM49T1NnTpMdiNbtGuPnHMrhSCrdWnXBl4ns/l8iWfI gk32I52FDdakxPFVCSO5AHEuk3F7IwlwZZv07Z7pXIfNjpWmOP2+8OSEYvW1SZGiDWyEDc oET3OTOjWXi96UMwzYHUyUbJrA3EJl5MUoSVBRhJAipA3d3HKYdblp5N8wPJDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mWaIctj7Z1zoM/1P67Gu5fpD8KlVZc3LhSYobl+Qem4=; b=ekauKCLOw8KIneLgQefZSqHYyGJLwQ+Ks3CuK/u4RblWQyoz8KME86CMduOeU73MUyqn6E LiJSfmpk4+kjnCWQPuwenebb3O17kkxvw2xmmI64KyM7DwfPO99ZVS2lWC/ysOTpAktam1 SBXJ6MjjTlTLXYFPx6P12EoY1bDIAOYf+Ng12wEmY+nnzvKA1S6sbp0Jlim90GnfNgywnK FUrKTdNt4Nq6gWbMFdl/wzcpqjzQMKdJtlNLwK1ElivvJG7JE9bHku+RmKtIs855fUFUbq ynS2PecTXGc5+HK8Ibc/WxPtXBj8fadghCqkHv+NmhSSrPR+wcQRKYeUJQA1MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkRz13G3zf2n for ; Tue, 07 Apr 2026 11:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22187 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:26:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: bace6cd1b350 - stable/15 - packages: Remove stale ftpd-all.ucl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: bace6cd1b35036e04012af099713359222a3f270 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:26:55 +0000 Message-Id: <69d4e9ff.22187.5ee00ee0@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=bace6cd1b35036e04012af099713359222a3f270 commit bace6cd1b35036e04012af099713359222a3f270 Author: Lexi Winter AuthorDate: 2026-03-25 10:36:03 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:47:30 +0000 packages: Remove stale ftpd-all.ucl This file was missed when ftpd(8) was removed. Fixes: 614c8750ce11 ("Remove ftpd(8)") MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D55820 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit ea25f494b315180c4b48fcdc4d2b2a111c84912c) --- release/packages/ucl/ftpd-all.ucl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/release/packages/ucl/ftpd-all.ucl b/release/packages/ucl/ftpd-all.ucl deleted file mode 100644 index cbaa078123d5..000000000000 --- a/release/packages/ucl/ftpd-all.ucl +++ /dev/null @@ -1,4 +0,0 @@ -comment = "FTP Daemon" -desc = <; Tue, 07 Apr 2026 11:26: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS01rY7z4MNt for ; Tue, 07 Apr 2026 11:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XrWZBRjixkP0YsQEnL3UbE+BYhcI8pV8kll2z4sKRmo=; b=gVU30ldy+DsNuQsty8WfJqQV+8UIsbC3idE77vFQez7aM842i9OdoLH5wZgP06ONMvTXb+ UwCZDcMs9QZyWvkzYH9UJDaBi2IqUXaqN62qshRs4n9aZiODyC2hV39QUb5DD+5Z4MdfOp 4f1D5zX1/tashbSSY4Y2R99q4GSSxOy4TM0BUXx37xZJaQgRNIPSvNoF93vXlaEvGzwO/7 CrMTY26jMpsvozMNWBXMp884NvAtOtcSh1TNPoxBIncDJx90a1GPTBA2wv0J5wCSHUhYaj Q4yx9il1Poh+QHKYobsqqzMri6cG0wo1Zq4201wK3SRld/wmhTsN5bmNPX4f1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561216; a=rsa-sha256; cv=none; b=TW9XQXL5XC+g2ztM7QSK6tA/EwBLVeE9XpRwvgSyh2YWSly4XLhBVLJzPD0Dpa9jOFUdsM khTsihQ4e4Ljmr9Zkz0yrbRklToGVWAOPY7EphxCq3vmFJ2vikyyHqyEPnRwNu7lbny+z2 ojfCdqk6ZjwyP9GHbhUem4hs60NaH72ZCkYhVF5UoB7kWOS2XX5/M10Sz6QeOEKoERWpU5 sy7AByUKGkdqOOxv+CDu4lwWl2SqY2splINydy8mLDe4C4kDH0oNAhC9koZH2xlBwCd+ee TITAXQBv3CSonNSychQJvaw7nDR1kbGPPUZE0ZE1jUjNJkYwuJQ6rb2NUz8ETQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XrWZBRjixkP0YsQEnL3UbE+BYhcI8pV8kll2z4sKRmo=; b=B9oG8NJOXYnx0DUlCyo/FcCGqd7qlaKq9cRJfs+rPgsXy2LMdJ9GmSdLNnr+4g42YhIf/9 +yEfyvMG6nBG1XKXUjz8z+VrJk8JzK0E26eyHFGiAHB+1Cn998H7sAp15tWfvIAqynprVY ih7v412qAoGkq6ibG/ySeWFhv/wDEcrveG2Jhi+vmLzgUwLnuzHSFTX753mXU9UXu5SrwQ DXK3NkZyiHETlljo00xB6D3Ixa1VnQHQJKuHCWuziRb0RD5RnEkuijnrfhMlpOIQn0v+k6 /WIEyw42MdUP7VswMyEMapLKYBdGfFHWpnbjJLRt4qJk/cooSswWlSoMiMkrtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS00sDhzdQc for ; Tue, 07 Apr 2026 11:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 208d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:26:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 2d571264dac3 - stable/15 - packages: Remove stale libsdp-all.ucl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2d571264dac343d681f95c63bd4ef95f49e04657 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:26:56 +0000 Message-Id: <69d4ea00.208d5.26e10af7@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2d571264dac343d681f95c63bd4ef95f49e04657 commit 2d571264dac343d681f95c63bd4ef95f49e04657 Author: Lexi Winter AuthorDate: 2026-03-25 10:36:31 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:47:50 +0000 packages: Remove stale libsdp-all.ucl This package no longer exists since it was merged into bluetooth. Fixes: 41ee4321cc52 ("libsdp: Move to bluetooth-lib package") MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D55822 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit 6900d8b5c3874814be4fed7ef2f6d124ebc9a920) --- release/packages/ucl/libsdp-all.ucl | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/release/packages/ucl/libsdp-all.ucl b/release/packages/ucl/libsdp-all.ucl deleted file mode 100644 index e4f848c3281c..000000000000 --- a/release/packages/ucl/libsdp-all.ucl +++ /dev/null @@ -1,28 +0,0 @@ -/* - * SPDX-License-Identifier: ISC - * - * Copyright (c) 2025 Lexi Winter - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -comment = "Bluetooth Service Discovery Protocol library" - -desc = <; Tue, 07 Apr 2026 11:26: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS12Bkgz4MLM for ; Tue, 07 Apr 2026 11:26:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tKuHPhVgqO7btVNrOxnCGXFjz08+dhbvRYhbFik3k9Q=; b=dKKhlJxOtkBzTXUIqwa8osojB2b5j4DVJmLZHIgw/1A7ZICF/BfJ4LO9N0Cx+mE43BIIqx pNmsg07kA6k5V3OTp0FaapAHMwxYTP2q54iYXJiWWGJdCNeFszEKLtQPHYtoicv+m9AzIC dV24awZyMhAa1U6tMQ1EJCH6Wef1YVYi42HKSLZiMP9+Bh/7ZG2HwYRPF0SM2B0YYavdp4 eDSyGG/jPxWym9p1pdwQEHllVhlXHR7vwCXhaZDq2Tly/M1NqVAzkerTHRD4P3+mr4GPjj jFqwkHAgTySMkWCcbfQsmTDt2OrAV0uKr/B7fzOrGsyGgTsuRrkCnU+gaMUNNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561217; a=rsa-sha256; cv=none; b=r6KOE4gqOfgxyOr1Ct9u1jriwBXOHMgMpFGTTOCbLt4K86U0a8MDQZUrp69bG0QMvt79rf U3qUxGVIGRCDjaSxE+rv5N9YUYgAs8HGKh5WI5/JqzIc4jlZnFA46jiejSh6X1GK+E/+sh phI9K27VjytZTjW7XeReX1Vixn+uWORID/gun8lQDbwp4/UXqzRZygAjKw+W16CVq6QG3k IKQmw2rhFbVrF5edH/O8BkzfzEH15JgYsuq8HRkF4rzUMmONHU1TZuIS+7ZAqfAEaRsDiO jyQMDKVUW2PxdBO6+N+mow7IhD6aEHchFkeOpL8JxwH6f/F2ptXAeW03HENDlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tKuHPhVgqO7btVNrOxnCGXFjz08+dhbvRYhbFik3k9Q=; b=MxALUJJmMkBbb3MCCInTuO4oQkOly7tEqm1JOAEKm1+81i0fUV//+RJkeTR51gR8eCUCw2 UGWxJzZf8TuFwKN5f0NhDpx1YAVSgeLc9ibHgUeu/XQj6QIQRxEoHIoAtG5/2jk4+TClsT HzkIUTL3rKS22UO6+SB+Kt1FK9Z1NJxb3x+3CwZhyERiNrKOoztgtebv/Ny1UX904Mczm6 7JxVmt6dR0AF4E14DFJgEQqo7Cvztfj5cNQAPUOvxn/qXG4BFmsbWcjLh4EtqE52L694q+ C8qiWSn0Va8wPLbvrxe9B7ZDdjutT12kFHTkfm1s1IIoQBm/1wSrU5Ai7qNoPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS11f0Vzdg0 for ; Tue, 07 Apr 2026 11:26:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20caf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:26:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: ef10d460922b - stable/15 - etc/mtree: Restore removed package tags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: ef10d460922b9a1252c5221bb088cb4359cac123 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:26:57 +0000 Message-Id: <69d4ea01.20caf.6b077870@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ef10d460922b9a1252c5221bb088cb4359cac123 commit ef10d460922b9a1252c5221bb088cb4359cac123 Author: Lexi Winter AuthorDate: 2026-03-27 14:35:16 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:48:15 +0000 etc/mtree: Restore removed package tags Following commit 436618a427b4 which added package tags to mtree, some of the tags were later removed due to an issue with empty packages being created. That problem has been fixed by commit 7965c93e4d41, so we can now restore the tags that were removed. This reverts commit 00352ef6d2a013650f0ab2a4c9b016c22552ed25. This reverts commit 1fbdb149aa486961c5d9d6403065e90123b3f5fe. This reverts commit ef2d586d7efb908bf39e7d5eb5d4305193d0ca6e. This reverts commit 2a8a6179eb6cef8ba1a417a4c8a1f7063c704533. MFC after: 2 weeks (stable/15 only) Reviewed by: des, bapt, emaste Differential Revision: https://reviews.freebsd.org/D55645 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit 8ba3ada41dda46b41100fa913473058856816e0c) --- 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 56d3a823a8f2..97f2194a3fa1 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -278,7 +278,7 @@ .. lib9p tags=package=lib9p-dev .. - libipt + libipt tags=package=libipt-dev .. libmilter tags=package=libmilter-dev .. From nobody Tue Apr 7 11:26:58 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS320Gnz6Y49g for ; Tue, 07 Apr 2026 11:26: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS236Xpz4MRT for ; Tue, 07 Apr 2026 11:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FpjwsnK4DyuYRlNHBAdxmbq8yw65vGpNL+5FI73GQCQ=; b=cpkzC2wppj25HWxmCGXfUlQJMauWvkm3mz4wjZQybMDcd87GRrg5xmwvHIjkNHLSx0LDOG /ZZ6OGp+hr2ebbO7OoNgIK0KLZRJUq0ss9zNlUhrNZKsfMD9T1mj4drD+IbU1XiwvnXx2y W2Snn2+zZRrCBo0LvS+D6MGpxdzw1hQAeHx0NfaZUR1tc59/dhCZH1OJqzU/LW2x6iwrra 1Hp+pxsWOP4cQ9uQx8snyIfDbtzgq7ZmpQJ/NKsE9Z4q/UwZ4hSlb+pZ9VE3tLU62BpdkN 9Q0jzJBln54d12/jVjuQDlKhj13YqEu8gcbwIgyDS51POcQGVMVIYbYmdFYEwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561218; a=rsa-sha256; cv=none; b=CApUlbfIWNikswn+WToDxJKhVU5WEykmhsyCRnvZyuT5Axuo7Y+IcLEwXZSN2HdtfqWJz2 VkQu38FXFSRzOJvDJRBraHiE6wJUnPusospZiPkdWOoyGkAVM3HCw31iAuKHNTcP5S24Le Z51rlIZ5lhztYc4hFGmpN76+1tbUXidtYwA1XjENftiywOkplxq0dvdrDWoOkXtbemLaA1 /1qb5wA2GYqI6rLSWeArDBW1Ab80VfmLL/m3v/xIDQrnF6QZyfq697e/JuYuFyDohcDV4o 7BN0KMTeI+kj10f1p4CBLRsb4c1dBW8rFy6SKMM0biwXPgx9iyW9nxpDAGuJ5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FpjwsnK4DyuYRlNHBAdxmbq8yw65vGpNL+5FI73GQCQ=; b=YcEFWhnU7vAwQmmrLhvgCIlxs6enjC912LQr0BcC1/3HCrFVi+s7CfKhVQXPXSrTOVIEDM fW/90UXBfK/uinYdQjw4rTmZXxPagyet0Swf9XKl0BrrBedK+ueMWKk4KWanIH2JS1pC8S 09pHOPJHwrCpm+bSSJ2zYQJjDqlIe2IPTfiWPOghg7flzxWWyJ5kxh+XNSAMvzVpkJbj2g 5kj9bJrjIOpD2/9VGqnrUZDe7Xpf9nbl4Tdn9BTeL8u7Vu7/X46oK4Hf7+ivibEuiU9f+s pY7HKHtAGakuhGXpvzi4Wk6nShGdSOA75AeXXMR/tonPdZbhsNgzTY35czvjKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS22QHDzf2p for ; Tue, 07 Apr 2026 11:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20ddd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:26:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: a5eb120222e4 - stable/15 - packages: Move xz to the minimal set List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: a5eb120222e4265f5d6990420308df82f37fc6a1 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:26:58 +0000 Message-Id: <69d4ea02.20ddd.2f952b09@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a5eb120222e4265f5d6990420308df82f37fc6a1 commit a5eb120222e4265f5d6990420308df82f37fc6a1 Author: Lexi Winter AuthorDate: 2026-03-27 14:49:30 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:48:34 +0000 packages: Move xz to the minimal set pkg(8), via its daily periodic script, requires xz. We don't have a way to encode dependencies from ports on base packages right now, so instead move xz to the minimal set so it's always installed. This isn't an ideal solution, but it's justified in this case since pkg(8) is always installed, so having its dependencies always installed is acceptable. (Following discusson on the diff, new versions of pkg have now been changed to use zstd instead of xz, but we still think xz is useful enough to keep in minimal.) MFC after: 1 week (stable/15 only) Reviewed by: des, bapt, emaste Differential Revision: https://reviews.freebsd.org/D55630 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit 43773002fa63262d531ce3ee5cf5d3fe872a3388) --- release/packages/ucl/xz-all.ucl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/ucl/xz-all.ucl b/release/packages/ucl/xz-all.ucl index 8a7c33bcce46..3523dc70ca55 100644 --- a/release/packages/ucl/xz-all.ucl +++ b/release/packages/ucl/xz-all.ucl @@ -25,5 +25,5 @@ applications to use this functionality programmatically. EOD annotations { - set = "optional,optional-jail" + set = "minimal,minimal-jail" } From nobody Tue Apr 7 11:26:59 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS36XM8z6Y4LC for ; Tue, 07 Apr 2026 11:26: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS33mhhz4MLt for ; Tue, 07 Apr 2026 11:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LP03T5H9bimYCKR0t8iErhAhhVCDGWzOGovKaH1kr6o=; b=pDRyTsQtQ0x10Aw6Q8kudGaqIbhOCAkcw/9jKYfWaC4AwSThxkYnqEOxkl9Cs9vo1yHoed q7lkyGhN9zHTW6dG93EW5Xp+w9co+r0rwib9wsi9VYVbKGK8OSCCU1AGPwRpOrcbEm77Az pJnX9m14cJ5GUs6c9FcsKNKAfgO3VoclLPxt2F6MpsWXXiZIOzKkbRRwqQOK5834v9PZBT eFgWWOQRbnOIkzfkr4455qPMhRxKn6UgpPXroGbfIGlhS3ZspTZZ9J0rUKldPYByyhxvrv 13cGEVoh7gpu7XkKP6/6wSOLrBvRezUPp4sEFEvmIWefP/RqvGKM90fC9IOP7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561219; a=rsa-sha256; cv=none; b=hCSOYu6d4Oj77ctBQwwYN6o2OtQrDcGC0P/QylXY1GOIzmpm/iO/1U+qWkM9WLKB36K1eJ /x+TyDs9V/O0LJIOK6pmS05eyUpRT6XCoKf+JFe8Mov8X2SI5k0EsO7iGmFyaUbDlKWYna 8fkhT5C+diX3OGerREJGj9nAbfw6YdePjiKgsyMkw7DmkL0bO5KyG0AsnDtjj0tbsxU9pw fI/2ehoFjWDx/uSc4bTsvoQvwwc2XK80DQjCgtxQHjOD88uW34KSYzPxt2hM/9JwB/Af4W ZAM1v4LoBP/anqPt4sZJ+CheFC90HRwNdxC/sSZwyxy9mdFkpzWykaOFXyjcMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LP03T5H9bimYCKR0t8iErhAhhVCDGWzOGovKaH1kr6o=; b=Holb+cLJQSwtRKTJw0sMZSGkczxRfeUWwP5uNnD5GNidz1QMUBTU2rr5msyRfzsUOtBFAi NX6vwvAVjQFLxQTgJ8osnJJajkBG0sy2sGirp9OPLhRjBQAbUGoCIhqvVRLIcUFHgTw8qN Hn0mDH30byhw8Wr2Ku+gUT9LckpLtxFB83fQ3ouYp41QL56Nbmu7vgRQvrUl/rNyGCTvy5 DfPYUl6mvv9/DrY3N9qiTn+ZKbX2+ACNj0YikgqeyUEjr7MYiPZS5xJNEDj/PK6s0glaCR h+3/MufJA4itnULCpiXpQRb8uQfwbKI7lgUvHtYXdbLaMIJ1zeBujKho/QztZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS33CtMzf2q for ; Tue, 07 Apr 2026 11:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 208d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:26:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 2cb1b47e8c94 - stable/15 - packages: Add dependency from rc to mtree List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2cb1b47e8c9450d8264e97b88fc606e3d7409ac5 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:26:59 +0000 Message-Id: <69d4ea03.208d9.3a616e3a@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2cb1b47e8c9450d8264e97b88fc606e3d7409ac5 commit 2cb1b47e8c9450d8264e97b88fc606e3d7409ac5 Author: Lexi Winter AuthorDate: 2026-03-27 14:52:58 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:48:47 +0000 packages: Add dependency from rc to mtree /etc/rc.d/var_run uses mtree, which is in the devel set and isn't installed as part of either minimal or optional, so add a manual dependency. Reviewed by: des, bapt, emaste Differential Revision: https://reviews.freebsd.org/D54540 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit 833087185a6e9a2bd26707c57c83a71a541a825a) --- release/packages/ucl/rc.ucl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/release/packages/ucl/rc.ucl b/release/packages/ucl/rc.ucl index 854963a81ca1..b750c731469b 100644 --- a/release/packages/ucl/rc.ucl +++ b/release/packages/ucl/rc.ucl @@ -19,6 +19,9 @@ deps { "runtime": { version = "${VERSION}" - } + }, + # /etc/rc.d/var_run depends on mtree. + "mtree": { + version = "${VERSION}" + }, } - From nobody Tue Apr 7 11:27:00 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS53L3Dz6Y4GG for ; Tue, 07 Apr 2026 11:27: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS45GT2z4Mnd for ; Tue, 07 Apr 2026 11:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t9tDOhN6DkS+lq25GUmH2VeqUapB97dz0QY18ZTP7AQ=; b=XscqwqJ/WLTDaw4gonp7cQjaax3OamiVo4P3esgXebafLqin+j6jVZFLItoVzvxq37Pi8K uo+9Y4ytx6Kgf+wikSbrTyU8ckHFRmt2v69kL6iVgl0zjNfsWbzDOJuNu6JROuNqLH4FpW ISpB77rjJKbwgtBt5SSvnwun5P0EeC4ox55dm4F8b8gzF5YgRTAfr4R+AbZpxFowPTHlaU lVNO0L7HDNfmvbcWPzRvc1n6oCaNFvej8Qu6HgUQ7DARcCN1REjfU5jKGB6EVNOz25JxZ8 NY8FY38Z738vVQg12kOgP0knDUgbQmkUiXRRh6EvwMeHTX5AFep+pmddV7Ou6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561220; a=rsa-sha256; cv=none; b=D6//m+zaK1IdntcnI6LZ6mvJsC7UVUCxa6X97lzBRpl5hJ9KquzRP4/y927He+og++Qsjw C1+xfy89m9Eri/X7YDCJScChbq3wqD/OO+KC8fv4fyvWnt84W22Ik1dkqiGlVcC6NPcB/F 2XiFPlVPzNquI2DcSg1bQ6CbbigvrIbbI5ya14qH+pVZjXnNBCKB1lSuSNTPvW0JFRwce3 0DWsubgzHIeJWWNdmqko3nnHV2le5E3S2RjEUCFs11xMdFUpMTOooEe/OkI7ifWGJWLWRH Y74HgJJmkOPIKV/c9jsJC4/Gu0J75pvpbyryv92WpgiEYJd6vEgP2lKytI/Fwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t9tDOhN6DkS+lq25GUmH2VeqUapB97dz0QY18ZTP7AQ=; b=D9CR0wCqjrCMtRKZs5tAmeMf2yQ+ykMVZRVw97ovWp0+ktKvsmrqvLaqYFnehthvyLBVAU EV58NPuUSOb0VoUCMCZKpy8ou4PQmTTnaApIUfwUjlEyuP5F7LYVia7tzv9TcHzOQLis7Z gFBZb9z+5bOTwRgO5z36dI5vg3f4pq5Mu+CGm/Kzy4aOIfXLDhnp80mFgCRNkH24kIh5K2 WeVIg+1lu38HGmoF6y92O9N4eSv9DI+vEh3WgH3/G1W+scebUiiDGJYjzyoBXavP1PNa1D 9yXEZUbh5asfj12EcIFVvTrx1AqqgmkvezPWdwfIUkxmiTcO2fLWGnmFMY65mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS43snCzf0Z for ; Tue, 07 Apr 2026 11:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22543 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:27:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 72b848a3fe93 - stable/15 - packages: Fix caroot deinstall command List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 72b848a3fe934453aac4d0d17a4f791bbb499815 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:27:00 +0000 Message-Id: <69d4ea04.22543.5a4823c8@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=72b848a3fe934453aac4d0d17a4f791bbb499815 commit 72b848a3fe934453aac4d0d17a4f791bbb499815 Author: Lexi Winter AuthorDate: 2026-03-29 18:57:23 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:48:59 +0000 packages: Fix caroot deinstall command The correct syntax is 'post-deinstall', not 'post-uninstall'. MFC after: 3 days (stable/15 only) Reviewed by: jlduran, des Differential Revision: https://reviews.freebsd.org/D56109 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit 63ecedb3c2ce75a44d55b9424d74d94e294de313) --- release/packages/ucl/caroot.ucl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/ucl/caroot.ucl b/release/packages/ucl/caroot.ucl index f7d0dd8acb7f..72c1105248c0 100644 --- a/release/packages/ucl/caroot.ucl +++ b/release/packages/ucl/caroot.ucl @@ -5,5 +5,5 @@ deps { } scripts: { post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash" - post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash" + post-deinstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash" } From nobody Tue Apr 7 11:27:01 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS56xvbz6Y4LH for ; Tue, 07 Apr 2026 11:27: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS553Xkz4MXL for ; Tue, 07 Apr 2026 11:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1yrO4Qe/AgMS5hc9XFPHDm1+cbuE+RrP6BbLcxNswz0=; b=Cgcuxm2I7u7KyZHaq8oZqaroNJluwPRZcey50ci1QQBPWo84b/smOrgxszKQVlqMQsXl+a 0XzkxVZyWmM6CWg7zvncTAJtlhKdQnhuIOXQmHw76YA2SZFp7bvz+o6ST8ra+hrSoBThBA Xsg9vlNarapN0GJEpXjWHjDdLvqc4vcxw18MbnhSy5uH83heCCd5xsmN1t9nHfvvqsDsHS hs1pYXnqsMdziJiZl3slt4IvYGevml9R7eYVzAf49peWU9LD8+NMoI7Ow0EC9N/2gpcVtg ZrLlHqgr1q04ldkywJmvCiTrvQ/Gc18oSernS2Urx0mCDr7QHIX+0ZKAqFd3qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561221; a=rsa-sha256; cv=none; b=hI6AnniTpSUR/vc7bnYHSTGWGE3QnFMTuY2/+1TL8lVqwB9hYbaSsNCC1MavDWqB7xpDaF PcIWckNK9A5r8iFbzFjuY0aakQRfx/9YrUWtxWAvXbnGR4KxdpkW0WUD6gx//sS7P19hGJ kc/y7BsRJEqJ5D4Rbsbwrx/RI8En3pz1p4NTPcOJGm2CL989/5wUCA+tQUVmjdVaqB84Vr 6y9yahdwqM0KG4Kjh5SU7XGdmP9Mb96CbJSwoZbDg1+VVa3o8SrQ4Rw9xz8M93T8E/HLxw lnN1dwvrMTU6pGmI5uvwJwCWAiRd3WfJiqpLkhcXylhk001v0+IyHoGi+tP+vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1yrO4Qe/AgMS5hc9XFPHDm1+cbuE+RrP6BbLcxNswz0=; b=hORclxNpNVD+44ENLAZbSwnG5jytVmpq/YTswuhMBCwJsjaUm2TqUHZ5tyj0YC6cGeN4sn yMS6hVi4Q7n0Rk1AWCeR+VDUCM73SbdIrNKspvkB33LDx7Ex0CnRmm+IIfc6EANjSgMHr4 6bQTBI7v2AOlQpoMdK86jTf52AoRcAvP+8AGtpclfrLu+pwY2xtQ9N1ji2ehobBjGxxSFV WprGWd7B5uaDxqnKIGnivarY/0DRUhp4QHNUW5psjyGsr98Vh1RqYDQXsi1f2bxirGrQ12 qPhfqeXm2CE6smfRXohZaCjZP47n8fCrHb87RHq3pNgRJvRFNtYdYhJn4eP9RA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS54YKqzdlC for ; Tue, 07 Apr 2026 11:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20e49 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:27:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: c4f66ede12d3 - stable/15 - libsamplerate: Only build when virtual_oss is built List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: c4f66ede12d328f3c48d19648585679f53304701 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:27:01 +0000 Message-Id: <69d4ea05.20e49.4907d28c@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=c4f66ede12d328f3c48d19648585679f53304701 commit c4f66ede12d328f3c48d19648585679f53304701 Author: Lexi Winter AuthorDate: 2026-04-03 13:42:20 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:49:10 +0000 libsamplerate: Only build when virtual_oss is built Gate libsamplerate behind MK_CUSE and MK_SOUND, like virtual_oss. Nothing else uses this library, so there's no point building it if we aren't building virtual_oss. This avoids building a useless FreeBSD-sound package containing only this library when WITHOUT_SOUND is set. MFC after: 1 week Reviewed by: christos, emaste Differential Revision: https://reviews.freebsd.org/D56164 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit baa7a870d65db324d4dd781702e7ccefde20a3ee) --- lib/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index c3a95f00d4ef..6e2ff634c963 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -91,7 +91,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ librss \ librt \ librtld_db \ - libsamplerate \ libsbuf \ libsmb \ libstdbuf \ @@ -237,7 +236,7 @@ SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_TELNET}+= libtelnet SUBDIR.${MK_SOUND}+= libmixer -SUBDIR.${MK_CUSE}.${MK_SOUND}+= virtual_oss +SUBDIR.${MK_CUSE}.${MK_SOUND}+= libsamplerate virtual_oss SUBDIR.${MK_TESTS_SUPPORT}+= atf SUBDIR.${MK_TESTS_SUPPORT}+= liblutok SUBDIR.${MK_TESTS}+= tests From nobody Tue Apr 7 11:27:02 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS73fH6z6Y4Hx for ; Tue, 07 Apr 2026 11:27: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS65sXZz4Mp6 for ; Tue, 07 Apr 2026 11:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pb3a3J4cNF8HtvWubc6SlZzj3m1SR2ONvuzUy8SSP5A=; b=HqQxrUrO74Gz8/Lv6Qo6x8JZiguSOsQkUCc160uoT9SPFDVuJeyRpQ143X3G9OOsvlFudp 1IO138dkKUI43LK8Pg4blegOT2g1zCIwPHOrb8XOwnAqdlXbJEycU+EDBkrU/sUU4xmWVW b4NCpluun+tt3/iE0Jcxyal0iCB6K8WKpYtZAwZO0ZrWKQfrXX5i6WVpn19rzJ9JRt+vfr C74bLLbWk6x4xk1wtX3T34LUDqDrNcXIcNRxi/XIq+4ykMGDY2iKYLZGINeV0xi28IljKs slHzsQC7iuAVWJCTNBF9psJqtUyhLg0zTncuFkYjI3zlf4RskaHg8Pxh0W7mKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561222; a=rsa-sha256; cv=none; b=Fd9rVdkVmC/UYFlpvD+lUu3cEZixRowps36L+UfWBO4brLIegeudPCLzxS95CTZNJzIFw3 /sm/KDEXNV0nqAMXRFkYlHlDlU54iHEpTldCzXNv5B6Hp4QSfA+eH0C1uo2jzcpLS1NLZb k0/KfFVIxcyXx3fZBDB0RAyc0BPKz9jZVrdeE+qfbf5mRfq6PGNWTxd2VUpSEoFDfr3ql6 3e7nh2o4WomBBbhSAE6703+zfivKicgOWhcvyAoGAHWnJLDKB95ZSHQLjoJ6JuQJgUuiZ1 rXXEYZaizdd5hY/Xs0QauAh8TDL8KSQjA+3t+dgQkNe4PgArEjj3pY3WzGdQ6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pb3a3J4cNF8HtvWubc6SlZzj3m1SR2ONvuzUy8SSP5A=; b=IUhZvy174FsV8NFzZc9oJvxrKPVMfXn26tfxrPhy/D1ni6jRzRCjOb25f+10g6SqmA+K/z urTQA9I57eIGrzz0qmSVQtsuEYcSNas5b4TtNijYekI69yIm1Ra9ui7p81/mGB/6Ta88AR wYTaYGvWrQAfkq69cgKEReF3P94sq/wdrik7svDyC4eqbq3EE99OlUretFk0kFC2jWKIMU HduPIO0672KGGF8rvfNkpNTldgz59dYjmr0SwNqgKGqFDMRBT38stCzielhtzFPFy0ILp9 8xcKUNzqGMMQIOUo/hVpVMN5Ug3G3fY56foh+nTq2DbcQRcAUj4WDeCqdSdrZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS65NK6zf0c for ; Tue, 07 Apr 2026 11:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:27:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 976b2ebf4309 - stable/15 - packages: Fix build with libucl 0.9.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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 976b2ebf43094076d52e34c8dbeabae032caa6ad Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:27:02 +0000 Message-Id: <69d4ea06.22b03.30cebafb@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=976b2ebf43094076d52e34c8dbeabae032caa6ad commit 976b2ebf43094076d52e34c8dbeabae032caa6ad Author: Lexi Winter AuthorDate: 2026-04-06 17:11:22 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:49:51 +0000 packages: Fix build with libucl 0.9.3 In libucl 0.9.3, macros and includes are disabled by default when creating a new UCL parser. This breaks the package build, which relies on includes. Fix this by explicitly passing zero flags to ucl.parser(). MFC after: 3 days Fixes: abda442d92fd ("contrib/libucl: Import libucl 0.9.3") Reviewed by: kevans, bapt Reported by: freebsd@walstatt-de.de Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56266 (cherry picked from commit 63d0e3e3aa2483420f828686336d6615616363d5) --- release/packages/generate-set-ucl.lua | 2 +- release/packages/generate-ucl.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua index 9ba7026b75df..7a1cddda7be1 100755 --- a/release/packages/generate-set-ucl.lua +++ b/release/packages/generate-set-ucl.lua @@ -16,7 +16,7 @@ substituted as UCL variables. local ucl = require("ucl") -- This parser is the output UCL we want to build. -local parser = ucl.parser() +local parser = ucl.parser(0) if #arg < 1 then io.stderr:write(arg[0] .. ": missing template filename\n") diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua index 19a9a95d5d38..aaaa4375dd4d 100755 --- a/release/packages/generate-ucl.lua +++ b/release/packages/generate-ucl.lua @@ -124,7 +124,7 @@ local pkgprefix = nil local pkgversion = nil -- This parser is the output UCL we want to build. -local parser = ucl.parser() +local parser = ucl.parser(0) -- Set any $VARIABLES from the command line in the parser. This causes ucl to -- automatically replace them when we load the source ucl. From nobody Tue Apr 7 11:27:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS80wW7z6Y46c for ; Tue, 07 Apr 2026 11:27: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS76rXGz4MgL for ; Tue, 07 Apr 2026 11:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lByzckKiqu9z0Pwz1TqvtmKtHZjhxkLOBL9FcI5HjW8=; b=gqHGQjDWXkBDYtsMl3ZCmw2216mz+7egehlIwAH+kX1584ecploevbCE8zcJNOatXrJl60 3wBbJlUAa8+Sb6kG9ID6a7MKycGm44sCQ4YLKC82yMfMTOCGlSwP6mID2j0LD5op83Di9U 8RiBUjRM9SrRRx1aycvtQmak1Gf2kSDao7mDeiNfw6pj+fqZ/n9QQOZP+iluxpXzSKQSIt tuuCga8B8uQnVplzQjWZKPoDdXknZckQbLML7Iioez//G0DuO/BdRk5kqRXp+wd4rvGaOz mbgct1EwdksEte8tlCfX71Ge5699NFfFzW1lwNqd4yNO23O0Dczg/stZPHGjug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561224; a=rsa-sha256; cv=none; b=rKAESXWrdOVCS4R+BPgbPfyz8/XP3+uuztBogZA8yOzJefQAldO6cDdNjDorFd8mPANUj7 H+ov6+TEdvQl5VqDHj32y0Peb7iMsxiCml1FNxxPrnNrbICaGiWN96Ir+C87hzZjjJSjUn s3qCIA3hJZukQH4SYq/2upn1QyCzyHxnTC6edyBsuSoIZE4FxW0FAcRWpkZyKeQV1cGltG NSE6UIexujhc8fGyuCL/nP/NyAyJDRBmXdudLqCT50duJV3bH1tiB+IhnQUqTSWbKGfWq6 TiWmmThwR8691M5EVaK+DuQJigpzFyNPX8E7GAjK+p9WngGr36bebhdLvxb38A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lByzckKiqu9z0Pwz1TqvtmKtHZjhxkLOBL9FcI5HjW8=; b=E+oNNPGNRzscRzZSSHa4lh32SRo+3MYLKBikT60ICtJLmr567j6An4Qm+Qz/dCv3EBhaXM I0yNjsZRywPzAzXJylLqLTPl9MsTGs9Y5PYRPu91q8njolw4QfnLzQdcaGtmtuiU1EGQS/ 8aqAEIBiLLkPksrDjkGBnWtrfy8/ipS+YUdaP8ii+WgQXrM4oIhq8RQETSPqwF9obW5vCs ykLEwA8Yvds9/L+UgeDmhRxa1wU09DTEOqEKJY/X8ixBtBwOS4yJ4oDxHxsoX7CE1m332C m2UJpNDwhgLuFwF4rXATaZPTv49BSEyvxI1/b+hKFo4fDc4fDSl2hrHyxAgViw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS767mvzdjR for ; Tue, 07 Apr 2026 11:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2230c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:27:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 8c61751d078e - stable/15 - zstd: Move to a new zstd 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: 8c61751d078e433ceaee7161716a7e77eb38f14b Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:27:03 +0000 Message-Id: <69d4ea07.2230c.2a5c774e@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8c61751d078e433ceaee7161716a7e77eb38f14b commit 8c61751d078e433ceaee7161716a7e77eb38f14b Author: Lexi Winter AuthorDate: 2026-01-06 04:23:22 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:57:28 +0000 zstd: Move to a new zstd package Zstd is a discrete, self-contained system component. To match how we package zlib, bzip2 and xz, move it to its own package, with a separate lib package. Add the new package to the minimal set, since this is a core component that users expect to be installed. This change adds a new package to the system so, until we have a proper policy on how to handle this in release/stable branches, it should not be MFC'd. [stable/15: MFC under the re@ pkgbase policy for 15.1] MFC after: never Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53603 (cherry picked from commit 9c401bf14854ef20e5e187395a686b0d1b7bcb5f) --- UPDATING | 6 ++++++ lib/libzstd/Makefile | 4 +++- release/packages/ucl/zstd-all.ucl | 30 ++++++++++++++++++++++++++++++ usr.bin/zstd/Makefile | 2 ++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index ae28504cdfd3..749f59a30101 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,12 @@ 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. +20260407: + Zstd has moved to the new "zstd" package. If you have set-minimal + installed, this package will be installed automatically, otherwise + you might want to install it manually. This change only affects + pkgbase users. + 20251123: Commit f27afc476551 changed the internal KAPI between the NFS modules. As such. all must be recompiled from sources. diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 0e25f01d4881..4a1557a14517 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -1,3 +1,6 @@ +PACKAGE= zstd +LIB_PACKAGE= + LIB= zstd SRCS= entropy_common.c \ error_private.c \ @@ -43,7 +46,6 @@ LIBADD= pthread CFLAGS+= -DZSTD_DISABLE_ASM PRIVATELIB= yes -PACKAGE= runtime ZSTDDIR= ${SRCTOP}/sys/contrib/zstd .PATH: ${ZSTDDIR}/lib/common ${ZSTDDIR}/lib/compress \ diff --git a/release/packages/ucl/zstd-all.ucl b/release/packages/ucl/zstd-all.ucl new file mode 100644 index 000000000000..ada125444b68 --- /dev/null +++ b/release/packages/ucl/zstd-all.ucl @@ -0,0 +1,30 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +comment = "Fast, lossless compression algorithm" + +desc = <; Tue, 07 Apr 2026 11:27: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS90LK5z4MjS for ; Tue, 07 Apr 2026 11:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+QR+7RNDbaGEMNhbLdEDGJ6r5pFAek4w/EdAcyMCjM=; b=d5BBc9tJ1W5ahk16ko0hQY8H6lmQ/WEOspEQA1slQ4g0dPAQIv2mcaalLDb95hwk22sDeQ uptNf8i7I9g05E+btCVsVvrplHQJVm/dNn+Pxh0pjt7i9rvtdtydrREsMpeK9inWZk1dAP S+jMQEqJ9RIYzK9TQzq2n6JK5hRi9/2+u7vqHTE/QgPqRrGfN9uu1YSEG1tREXDeU5XtS9 GUMASFxFjz6lCMCUDIDIbJI9UbykeAAYZMMDjllKM7QcYs06tukKsJOrZ1cRkvkY9jTTVh LcbTNAwp9wOgF0V2QotvvBeO75yiEhRyyIYVaT8ZGt6FYUfKDH3QDcBsBrgFRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561225; a=rsa-sha256; cv=none; b=wdYegng7erskIaIY0pd5g+qw8mQgWqTEjflrcKiFgqqRD9/zShtOT+GxT9vb8pC1Uzc/1H 8EEQ/B2+CdPeE21y+r6ORlsX4MY+Mrnj5er5ZU9Ua+2NmpswN4BLRgHgY8tqLV325eYcMv hIaEcfGxj4gEDcviwgHhn9o1nJjtQsR0W+NNA8Vox0GHfB8+3nXS2CAX11ZqqBUpKbTOy5 k8shv9UbiWYa2uTfyggGyasVlhti7LBbwAlNL21C1MN2NmOimsYIQTawQZwwlAZQcZFcTb zBQvZt+jWroypppKzy8+7cmJuuHn7rbW3HvswbOWyVZoLcbB+neGr3GOPqYfbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+QR+7RNDbaGEMNhbLdEDGJ6r5pFAek4w/EdAcyMCjM=; b=PTgjDxhSGFTOS6iUMsAiTuGU5crrinyYvrSX5PHH7pNHyyocjeUVBFlztGOsVto/PiBgwJ 6Su1BdidN2Ss/pJtSek+OOREjJGz1WyckGL8u7Oc3CygFGf6z7s/jQO0r4rBpQfnJicUIv 6ecvGqwpmCtTNkghTS3JYaGknD0+Ve9qwpmSsTMaE5hpXBUEDlBXic9AM2VMiCIV385tyl n6h369ao40SnUkSL2s9txvK6+Iqmr6hjKJN2q6FDXINJWz7VIqBwpcc2M5O5rO/MuKI8tf ku45pDHlr51RmNBFb5s+1/munFD0C3K1L1nNhJ/eT7tS8M1SboOQpCmEIImL8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS873xxzdx1 for ; Tue, 07 Apr 2026 11:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2137f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:27:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 95cc7f59b7ce - stable/15 - libpam: Move to a new "pam" 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: 95cc7f59b7ce99e8f188a6f308db1b38ae064e4c Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:27:04 +0000 Message-Id: <69d4ea08.2137f.e4a3dc3@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=95cc7f59b7ce99e8f188a6f308db1b38ae064e4c commit 95cc7f59b7ce99e8f188a6f308db1b38ae064e4c Author: Lexi Winter AuthorDate: 2025-11-10 10:20:33 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 11:01:39 +0000 libpam: Move to a new "pam" package OpenPAM is a discrete, largely self-contained system component. Users may not need PAM for many use-cases (e.g. jails, containers), so move it to its own package. Use LIB_PACKAGE to create a separate pam-lib package for libpam, so that applications that support PAM don't need to bring in all the PAM modules if PAM isn't actually in use. Add pam to the minimal sets, since this is a core system component that people expect to be installed. This means all supported installation methods will install the PAM modules by default, so don't add explicit dependencies on the PAM modules from things that use PAM (e.g. runtime), allowing custom/embedded systems to omit these easily. This change adds a new package to the system so, until we have a proper policy on how to handle this in release/stable branches, it should not be MFC'd. [stable/15: MFC under the re@ pkgbase policy for 15.1] MFC after: never Reviewed by: des, bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53602 (cherry picked from commit 560af6b43e2a86e591e94bea99777630cd5f84fd) --- UPDATING | 12 ++++++++++ lib/libpam/Makefile.inc | 2 ++ lib/libpam/libpam/Makefile | 2 +- lib/libpam/modules/pam_lastlog/Makefile | 2 -- lib/libpam/modules/pam_login_access/Makefile | 2 -- lib/libpam/modules/pam_nologin/Makefile | 2 -- lib/libpam/modules/pam_securetty/Makefile | 2 -- lib/libpam/modules/pam_self/Makefile | 2 -- lib/libpam/modules/pam_unix/Makefile | 2 -- lib/libpam/pam.d/Makefile | 20 ++++++---------- release/packages/ucl/pam-all.ucl | 35 ++++++++++++++++++++++++++++ 11 files changed, 57 insertions(+), 26 deletions(-) diff --git a/UPDATING b/UPDATING index 749f59a30101..3515623bdfb0 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,18 @@ 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. +20260407: + OpenPAM (including libpam and the PAM modules) has moved to the new + "pam" package. The pam-lib subpackage, which includes libpam, will + be automatically installed when required. + + If you have set-minimal(-jail) installed, the pam base package which + contains the PAM modules will also be automatically installed. + If you don't, you MUST manually install the FreeBSD-pam package if you + need to authenticate users, otherwise you won't be able to log in. + + This change only affects pkgbase users. + 20260407: Zstd has moved to the new "zstd" package. If you have set-minimal installed, this package will be installed automatically, otherwise diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc index bec0687d1b7f..28630e46b949 100644 --- a/lib/libpam/Makefile.inc +++ b/lib/libpam/Makefile.inc @@ -23,6 +23,8 @@ # SUCH DAMAGE. # +PACKAGE?= pam + CFLAGS+= -DOPENPAM_DEBUG SHLIB_MAJOR= 6 diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index c6db4992bb36..f220063971d7 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -42,7 +42,7 @@ OPENPAM= ${SRCTOP}/contrib/openpam SHLIB= pam .endif -PACKAGE= runtime +LIB_PACKAGE= SRCS= openpam_asprintf.c \ openpam_borrow_cred.c \ diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile index ecaf013c504a..9d27f4779184 100644 --- a/lib/libpam/modules/pam_lastlog/Makefile +++ b/lib/libpam/modules/pam_lastlog/Makefile @@ -23,8 +23,6 @@ # SUCH DAMAGE. # -PACKAGE= runtime - LIB= pam_lastlog SRCS= pam_lastlog.c MANNODEV= pam_lastlog.8 diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile index 41bc32212351..e31866395a94 100644 --- a/lib/libpam/modules/pam_login_access/Makefile +++ b/lib/libpam/modules/pam_login_access/Makefile @@ -23,8 +23,6 @@ # SUCH DAMAGE. # -PACKAGE= runtime - LIB= pam_login_access SRCS= pam_login_access.c login_access.c MANNODEV= login.access.5 pam_login_access.8 diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile index c4ccc27b8958..38c9ea2b0a2a 100644 --- a/lib/libpam/modules/pam_nologin/Makefile +++ b/lib/libpam/modules/pam_nologin/Makefile @@ -23,8 +23,6 @@ # SUCH DAMAGE. # -PACKAGE= runtime - LIB= pam_nologin SRCS= pam_nologin.c MANNODEV= pam_nologin.8 diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile index 6e5e7d929b7d..90740721a3f5 100644 --- a/lib/libpam/modules/pam_securetty/Makefile +++ b/lib/libpam/modules/pam_securetty/Makefile @@ -23,8 +23,6 @@ # SUCH DAMAGE. # -PACKAGE= runtime - LIB= pam_securetty SRCS= pam_securetty.c MANNODEV= pam_securetty.8 diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile index ecf85b8de70a..8a6b3702b5a1 100644 --- a/lib/libpam/modules/pam_self/Makefile +++ b/lib/libpam/modules/pam_self/Makefile @@ -23,8 +23,6 @@ # SUCH DAMAGE. # -PACKAGE= runtime - LIB= pam_self SRCS= pam_self.c MANNODEV= pam_self.8 diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile index 1bb1e6f2c71a..124a757eae9d 100644 --- a/lib/libpam/modules/pam_unix/Makefile +++ b/lib/libpam/modules/pam_unix/Makefile @@ -36,8 +36,6 @@ .include .include -PACKAGE= runtime - LIB= pam_unix SRCS= pam_unix.c MANNODEV= pam_unix.8 diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile index a58c37b6c223..2cc5122b2ecc 100644 --- a/lib/libpam/pam.d/Makefile +++ b/lib/libpam/pam.d/Makefile @@ -1,7 +1,5 @@ .include -PACKAGE= runtime - NO_OBJ= CONFGROUPS= CONFS @@ -17,20 +15,16 @@ CONFDIR= /etc/pam.d CONFSMODE_README= 444 CONFGROUPS+= CRON -CRON+= cron +CRON= cron CRONPACKAGE= cron -.if ${MK_AT} != "no" -CONFGROUPS+= AT -AT+= atrun -ATPACKAGE+= at -.endif +CONFGROUPS.${MK_AT}+= AT +AT= atrun +ATPACKAGE= at -.if ${MK_FTP} != "no" -CONFGROUPS+= FTP -FTP+= ftp ftpd +CONFGROUPS.${MK_FTP}+= FTP +FTP= ftp ftpd # Do not put these in the ftp package, since ports also use them. -FTPPACKAGE= runtime -.endif +FTPPACKAGE= pam .include diff --git a/release/packages/ucl/pam-all.ucl b/release/packages/ucl/pam-all.ucl new file mode 100644 index 000000000000..c77b926532e6 --- /dev/null +++ b/release/packages/ucl/pam-all.ucl @@ -0,0 +1,35 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +comment = "Modular user authentication facility" + +desc = <; Tue, 07 Apr 2026 15:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqrLb03P7z3sq1 for ; Tue, 07 Apr 2026 15:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NTNgDv39RsrAneauBsAk7St66ItH4PAITwtH2frkQGA=; b=tPQnzANp3EhUhlvUXnsHIQsbc4TlVY9olMLTQ4Ym8xLtzeQ7skdAG0bWugkUksA2B4O+Hj s5o9bhQ5IiLUXCFa36iB1PLUxc6mSCzd1UDj+vKc8zsUMhLsu5KpbvQVPu/VsRBRv9phm5 sOpmgjxymYGC86QIkgjT+ifKMxUoCq3Jy+UdLrJK5YrMzxG4Kw+yQUXn7Ie6Bt7EjikzUq tA2jK2PGi7OTSKzD8ubqPfMGC8lfXYeAE8c5X2h4E4QhsocsW0jyv0EuIjPD9pxOymF9l1 IbYPTg91cSrhyHtmzfopwdlR1eXjwR9WI/t130knJ7j5NQ+Nfdl6lSSxBT/sCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577159; a=rsa-sha256; cv=none; b=Qahq3hXQpM1w0QuFkp58oPtxYz9W5L27pslnUKBZkrX9ouxIPj+KAzgcLKC/c1UPVNztAN rZ96OH+Yazg8JxSB+S5wGNClyrjgH63OYM0uPc1DiUFVn/0C4G9mA+Tbe3YZlyubW7+CEn DOxqqA7SpN1xuvRbpMDIcVS6uVVXCocexTlnRAdKiGi/Qnv92kkcnYU+B3BSAKwVceVI84 8sMsLtKwgFcN6+VP6hl4DbWiLq4o5aL6CeImqmUrBzvEfzxZ8xenn5v0rLFXceGk8G/UpQ WCXL2VatDh4UEP+CVaJDbuOkoJRtCrxX1UJ0KZLEqbdJFV+XQnxEb7kvN0C3vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NTNgDv39RsrAneauBsAk7St66ItH4PAITwtH2frkQGA=; b=ZUqafuOH0Y3nOgFi2XV1oM6lPerC16kT9kjBCs3EVAaH7IA9KF4GzMmN5v3ZCuIo2JrJEc y0ipD67sBFFQBQx3fJBZyaMa23QJxYjDdotdKSQUb91VQymDKle+PDTinxizNXTlT640tv HoZ6srAVEEniA57f5/J/UoXLDHm+mYI543cVLtrN7Z4lze/Br52h7FEq3rXyjqpRG5DD1I j0b0hTFhlEyO9hk4EeCVi4wP2JZmAD644iwPBtDRrqhVLvLvt6+lSXkHCV5eYAOK5lXAFz ffwdUWde7DpmoEyQH9R1FAIXeeR+sAoCkMJLtIt0cQLS03AaNObTG+4VTsNQrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLZ6hZlzmn0 for ; Tue, 07 Apr 2026 15:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44a32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 8396b387e480 - stable/15 - kernel: Be clearer about what ZSTDIO is for List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 8396b387e4806bc491c0ae5b27f419e5a973b9e4 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:38 +0000 Message-Id: <69d52846.44a32.23c081c3@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8396b387e4806bc491c0ae5b27f419e5a973b9e4 commit 8396b387e4806bc491c0ae5b27f419e5a973b9e4 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-21 07:21:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:08 +0000 kernel: Be clearer about what ZSTDIO is for ZSTDIO is not just for core dumps, and it is now required by ZFS, so move it (and GZIO, which is still just for dumps) to a new “Compression support” section in GENERIC, and add them both to MINIMAL. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55940 (cherry picked from commit 092687a031064dc08ac198648c6393cc50b06cee) --- sys/amd64/conf/FIRECRACKER | 6 ++++-- sys/amd64/conf/GENERIC | 6 ++++-- sys/amd64/conf/MINIMAL | 4 ++++ sys/arm64/conf/std.arm64 | 6 ++++-- sys/conf/NOTES | 4 ++-- sys/i386/conf/GENERIC | 6 ++++-- sys/i386/conf/MINIMAL | 4 ++++ sys/powerpc/conf/GENERIC | 6 ++++-- sys/powerpc/conf/GENERIC64 | 6 ++++-- sys/powerpc/conf/GENERIC64LE | 6 ++++-- sys/riscv/conf/GENERIC | 6 ++++-- 11 files changed, 42 insertions(+), 18 deletions(-) diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER index a36fb974c24e..07c02d51ed4c 100644 --- a/sys/amd64/conf/FIRECRACKER +++ b/sys/amd64/conf/FIRECRACKER @@ -101,10 +101,12 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support options NETGDB # netgdb(4) client support diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index e4ed9704a65b..17f70c6c26fd 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -97,10 +97,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support options NETGDB # netgdb(4) client support diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 38619f527388..c14d8fa261c5 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -74,6 +74,10 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index 58f3748e2700..2a1221d1b1d0 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -82,10 +82,12 @@ options KDB_TRACE # Print a stack trace for a panic. #options KUBSAN # Kernel Undefined Behavior Sanitizer #options KCSAN # Kernel Concurrency Sanitizer +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 293087b02a43..b6e6af1e8827 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2822,8 +2822,8 @@ options IMGACT_BINMISC options GZIO # zstd support -# This enables support for Zstd compressed core dumps, GEOM_UZIP images, -# and is required by zfs if statically linked. +# This enables support for Zstandard compression for core dumps, +# kernel dumps, GEOM_UZIP images, and tarfs, and is required by zfs. options ZSTDIO # BHND(4) drivers diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index f09e8b0703e4..a2f86753e945 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -90,10 +90,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support options NETGDB # netgdb(4) client support diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index 65bdf8f79da2..fc04d4ed6dec 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -84,6 +84,10 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel device apic diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 1346fa8f9476..8720a2c27447 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -91,10 +91,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 446e3afca511..fbea6eb786c3 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -101,10 +101,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index b1a2d12713a8..d7a26d864220 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -97,10 +97,12 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 0b3defb3c285..ee529feb49ab 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -169,10 +169,12 @@ options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # options EARLY_PRINTF=sbi +# Compression support +options GZIO # gzip (dumps) +options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) + # Kernel dump features. options EKCD # Support for encrypted kernel dumps -options GZIO # gzip-compressed kernel and user dumps -options ZSTDIO # zstd-compressed kernel and user dumps options DEBUGNET # debugnet networking options NETDUMP # netdump(4) client support From nobody Tue Apr 7 15:52:40 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLc44zdz6YT8W for ; Tue, 07 Apr 2026 15:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqrLc15VZz3stN for ; Tue, 07 Apr 2026 15:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7OxJgW8raqkz4shEXCwqH1BsT5aCR2Oi8Xy07FEb8E=; b=jAmr5aSGuR84SYdH2izahCsvLORATs2ETEe9nnIQF3sGH2f0FgTko5tlwoNIVYZpFadAdC pV3M/s2xmpgCG7JAGoUcCq2yskZTQfjuvAqdjhQ7Pgud6eTmhzMdAu9a65U41x7+B1y7Na DodA2ri+F4ATYS7TGw41Cl7FvkgHZ9eFtteDoP6F9TNtoAoQIsHcNMXjBTqXbwUBHCuYJB tIDl4Gxkx82HWSEKVKcLx4/phYbeLpyOe053Pi+o9SmMlLlmcsb/kc39lKwe+M1nQ6V5Yx 3npguLvTz4ePI1NKYOd64y/BrCQvf0vZM3wjul1CrR87Ec9XPujdS4CYdU99cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577160; a=rsa-sha256; cv=none; b=m5km2Y06K0WDGhVI0brZAhJ8cRU5xdKL+6ybZn4zwV0kIaM9seUNgNBc+OIoxRtPa8ZOb4 +W0bQ89ZaxoPl0mo+Dq16RqGlWlvjxIIoqeUJ0IVpgrUi7X01m51VHVukvZuJWv2FyHXRI BYv/mvE+NioPlg7CeQeqak/dTXGLjrbzpkJKv1/B4MjCX/MszX2fU2LEy5jUrnKBIT2/KD u2nJIc/qXGVjXsGE41GMEccdMP8XJySnUchAXncqkkWQfC8PJi4FYVPqzgFkHY0c2fbpU3 0C4i+Rd+Nu/vi0Zn0nrd0IJmV4bPBUXQVFuDmuVv4TDXjBRdaqvJIWk2n8iKcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7OxJgW8raqkz4shEXCwqH1BsT5aCR2Oi8Xy07FEb8E=; b=A0mgfcD4bgaN6s2kBW6L1EhyDQdK8ttN6ugmYcwJ8tTFk72h+VUZfAO9BKf427aGSga+XD VhtnKH5emQNwAiTVRynCw+O1yve+WGliJardb5p44SzXvzvSOH6gn28UcfkvVCRg/SkfDy b1ZQlB9yGgdEfk1cSWU4i1nUWOvq12FMb/A9XOEV3E4/oEQa6hLl4RuY3/XgCf3+JRq3ZO 0uvvLnOrbw9Gng9nYBeDsNB9I+ejZ/r1+R5p6mhDXdoBw19rvm7ezP9Li9EgrwLQ2728JE cqdRn+nsIZ08Lag/pXZLzj1qyjblwuh0tUAiiijxklkAfz5I6e1snT7Juib4/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLc0R4Vzmn1 for ; Tue, 07 Apr 2026 15:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44ae9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b68e27d04aea - stable/15 - cd9660: Partial style sweep of Rock Ridge code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b68e27d04aea3c7fe65898d470edb74504f9d4bc Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:40 +0000 Message-Id: <69d52848.44ae9.51b77fa8@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b68e27d04aea3c7fe65898d470edb74504f9d4bc commit b68e27d04aea3c7fe65898d470edb74504f9d4bc Author: Dag-Erling Smørgrav AuthorDate: 2026-03-24 11:29:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:08 +0000 cd9660: Partial style sweep of Rock Ridge code This mostly just fixes indentation and continuations and adds spaces after commas and around binary operators and parentheses around return values, but cd9660_rrip_extref() was so egregiously unreadable I rewrote it. Note that this was done manually, so I may have missed a few spots, and I made no attempt to fix over-long lines. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55865 (cherry picked from commit e6a77f81d1eb345f6a8c827ecf555b88996c8763) --- sys/fs/cd9660/cd9660_rrip.c | 186 +++++++++++++++++++++++--------------------- 1 file changed, 96 insertions(+), 90 deletions(-) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index d0b0008d10b2..6e91f1abb9d2 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -88,7 +88,7 @@ cd9660_rrip_attr(ISO_RRIP_ATTR *p, ISO_RRIP_ANALYZE *ana) ana->inop->inode.iso_gid = isonum_733(p->gid); ana->inop->inode.iso_links = isonum_733(p->links); ana->fields &= ~ISO_SUSP_ATTR; - return ISO_SUSP_ATTR; + return (ISO_SUSP_ATTR); } static void @@ -96,7 +96,7 @@ cd9660_rrip_defattr(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana) { /* But this is a required field! */ printf("RRIP without PX field?\n"); - cd9660_defattr(isodir,ana->inop,NULL,ISO_FTYPE_RRIP); + cd9660_defattr(isodir, ana->inop, NULL, ISO_FTYPE_RRIP); } /* @@ -188,7 +188,7 @@ cd9660_rrip_slink(ISO_RRIP_SLINK *p, ISO_RRIP_ANALYZE *ana) ana->fields = 0; ana->outbuf -= *ana->outlen; *ana->outlen = 0; - return 0; + return (0); } memcpy(outbuf, inbuf, wlen); @@ -201,9 +201,9 @@ cd9660_rrip_slink(ISO_RRIP_SLINK *p, ISO_RRIP_ANALYZE *ana) if (!isonum_711(p->flags)) { ana->fields &= ~ISO_SUSP_SLINK; - return ISO_SUSP_SLINK; + return (ISO_SUSP_SLINK); } - return 0; + return (0); } /* @@ -259,7 +259,7 @@ cd9660_rrip_altname(ISO_RRIP_ALTNAME *p, ISO_RRIP_ANALYZE *ana) ana->fields &= ~ISO_SUSP_ALTNAME; ana->outbuf -= *ana->outlen - wlen; *ana->outlen = 0; - return 0; + return (0); } memcpy(ana->outbuf, inbuf, wlen); @@ -267,18 +267,17 @@ cd9660_rrip_altname(ISO_RRIP_ALTNAME *p, ISO_RRIP_ANALYZE *ana) if (!cont) { ana->fields &= ~ISO_SUSP_ALTNAME; - return ISO_SUSP_ALTNAME; + return (ISO_SUSP_ALTNAME); } - return 0; + return (0); } static void cd9660_rrip_defname(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana) { - isofntrans(isodir->name,isonum_711(isodir->name_len), - ana->outbuf,ana->outlen, - 1,isonum_711(isodir->flags)&4, ana->imp->joliet_level, - ana->imp->im_flags, ana->imp->im_d2l); + isofntrans(isodir->name, isonum_711(isodir->name_len), + ana->outbuf, ana->outlen, 1, isonum_711(isodir->flags)&4, + ana->imp->joliet_level, ana->imp->im_flags, ana->imp->im_d2l); switch (*ana->outbuf) { default: break; @@ -287,7 +286,7 @@ cd9660_rrip_defname(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana) /* FALLTHROUGH */ case 0: /* outlen is 1 already */ - strcpy(ana->outbuf,".."); + strcpy(ana->outbuf, ".."); break; } } @@ -299,8 +298,8 @@ static int cd9660_rrip_pclink(ISO_RRIP_CLINK *p, ISO_RRIP_ANALYZE *ana) { *ana->inump = isonum_733(p->dir_loc) << ana->imp->im_bshift; - ana->fields &= ~(ISO_SUSP_CLINK|ISO_SUSP_PLINK); - return *p->h.type == 'C' ? ISO_SUSP_CLINK : ISO_SUSP_PLINK; + ana->fields &= ~(ISO_SUSP_CLINK | ISO_SUSP_PLINK); + return (*p->h.type == 'C' ? ISO_SUSP_CLINK : ISO_SUSP_PLINK); } /* @@ -312,7 +311,7 @@ cd9660_rrip_reldir(ISO_RRIP_RELDIR *p, ISO_RRIP_ANALYZE *ana) /* special hack to make caller aware of RE field */ *ana->outlen = 0; ana->fields = 0; - return ISO_SUSP_RELDIR|ISO_SUSP_ALTNAME|ISO_SUSP_CLINK|ISO_SUSP_PLINK; + return (ISO_SUSP_RELDIR | ISO_SUSP_ALTNAME | ISO_SUSP_CLINK | ISO_SUSP_PLINK); } static int @@ -323,60 +322,61 @@ cd9660_rrip_tstamp(ISO_RRIP_TSTAMP *p, ISO_RRIP_ANALYZE *ana) ptime = p->time; /* Check a format of time stamp (7bytes/17bytes) */ - if (!(*p->flags&ISO_SUSP_TSTAMP_FORM17)) { - if (*p->flags&ISO_SUSP_TSTAMP_CREAT) + if (!(*p->flags & ISO_SUSP_TSTAMP_FORM17)) { + if (*p->flags & ISO_SUSP_TSTAMP_CREAT) { ptime += 7; - - if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) { - cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime, - ISO_FTYPE_RRIP); + } + if (*p->flags & ISO_SUSP_TSTAMP_MODIFY) { + cd9660_tstamp_conv7(ptime, &ana->inop->inode.iso_mtime, + ISO_FTYPE_RRIP); ptime += 7; - } else + } else { memset(&ana->inop->inode.iso_mtime, 0, sizeof(struct timespec)); - - if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) { - cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime, - ISO_FTYPE_RRIP); + } + if (*p->flags & ISO_SUSP_TSTAMP_ACCESS) { + cd9660_tstamp_conv7(ptime, &ana->inop->inode.iso_atime, + ISO_FTYPE_RRIP); ptime += 7; - } else + } else { ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime; - - if (*p->flags&ISO_SUSP_TSTAMP_ATTR) - cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_ctime, - ISO_FTYPE_RRIP); - else + } + if (*p->flags & ISO_SUSP_TSTAMP_ATTR) { + cd9660_tstamp_conv7(ptime, &ana->inop->inode.iso_ctime, + ISO_FTYPE_RRIP); + } else { ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime; - + } } else { - if (*p->flags&ISO_SUSP_TSTAMP_CREAT) + if (*p->flags & ISO_SUSP_TSTAMP_CREAT) { ptime += 17; - - if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) { - cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime); + } + if (*p->flags & ISO_SUSP_TSTAMP_MODIFY) { + cd9660_tstamp_conv17(ptime, &ana->inop->inode.iso_mtime); ptime += 17; - } else + } else { memset(&ana->inop->inode.iso_mtime, 0, sizeof(struct timespec)); - - if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) { - cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime); + } + if (*p->flags & ISO_SUSP_TSTAMP_ACCESS) { + cd9660_tstamp_conv17(ptime, &ana->inop->inode.iso_atime); ptime += 17; - } else + } else { ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime; - - if (*p->flags&ISO_SUSP_TSTAMP_ATTR) - cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_ctime); - else + } + if (*p->flags & ISO_SUSP_TSTAMP_ATTR) { + cd9660_tstamp_conv17(ptime, &ana->inop->inode.iso_ctime); + } else { ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime; + } } ana->fields &= ~ISO_SUSP_TSTAMP; - return ISO_SUSP_TSTAMP; + return (ISO_SUSP_TSTAMP); } static void cd9660_rrip_deftstamp(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana) { - cd9660_deftstamp(isodir,ana->inop,NULL,ISO_FTYPE_RRIP); + cd9660_deftstamp(isodir, ana->inop, NULL, ISO_FTYPE_RRIP); } /* @@ -395,7 +395,7 @@ cd9660_rrip_device(ISO_RRIP_DEVICE *p, ISO_RRIP_ANALYZE *ana) else ana->inop->inode.iso_rdev = makedev(high, minor(low)); ana->fields &= ~ISO_SUSP_DEVICE; - return ISO_SUSP_DEVICE; + return (ISO_SUSP_DEVICE); } /* @@ -404,12 +404,12 @@ cd9660_rrip_device(ISO_RRIP_DEVICE *p, ISO_RRIP_ANALYZE *ana) static int cd9660_rrip_idflag(ISO_RRIP_IDFLAG *p, ISO_RRIP_ANALYZE *ana) { - ana->fields &= isonum_711(p->flags)|~0xff; /* don't touch high bits */ + ana->fields &= isonum_711(p->flags) | ~0xff; /* don't touch high bits */ /* special handling of RE field */ - if (ana->fields&ISO_SUSP_RELDIR) - return cd9660_rrip_reldir(/* XXX */ (ISO_RRIP_RELDIR *)p,ana); + if (ana->fields & ISO_SUSP_RELDIR) + return (cd9660_rrip_reldir(/* XXX */ (ISO_RRIP_RELDIR *)p, ana)); - return ISO_SUSP_IDFLAG; + return (ISO_SUSP_IDFLAG); } /* @@ -421,7 +421,7 @@ cd9660_rrip_cont(ISO_RRIP_CONT *p, ISO_RRIP_ANALYZE *ana) ana->iso_ce_blk = isonum_733(p->location); ana->iso_ce_off = isonum_733(p->offset); ana->iso_ce_len = isonum_733(p->length); - return ISO_SUSP_CONT; + return (ISO_SUSP_CONT); } /* @@ -430,7 +430,7 @@ cd9660_rrip_cont(ISO_RRIP_CONT *p, ISO_RRIP_ANALYZE *ana) static int cd9660_rrip_stop(ISO_SUSP_HEADER *p, ISO_RRIP_ANALYZE *ana) { - return ISO_SUSP_STOP; + return (ISO_SUSP_STOP); } /* @@ -439,16 +439,18 @@ cd9660_rrip_stop(ISO_SUSP_HEADER *p, ISO_RRIP_ANALYZE *ana) static int cd9660_rrip_extref(ISO_RRIP_EXTREF *p, ISO_RRIP_ANALYZE *ana) { - if ( ! ((isonum_711(p->len_id) == 10 - && bcmp((char *)p + 8,"RRIP_1991A",10) == 0) - || (isonum_711(p->len_id) == 10 - && bcmp((char *)p + 8,"IEEE_P1282",10) == 0) - || (isonum_711(p->len_id) == 9 - && bcmp((char *)p + 8,"IEEE_1282", 9) == 0)) - || isonum_711(p->version) != 1) - return 0; - ana->fields &= ~ISO_SUSP_EXTREF; - return ISO_SUSP_EXTREF; + size_t len = isonum_711(p->len_id); + char *data = (char *)(p + 1); + + if ((len == 10 && memcmp(data, "RRIP_1991A", len) == 0) || + (len == 10 && memcmp(data, "IEEE_P1282", len) == 0) || + (len == 9 && memcmp(data, "IEEE_1282", len) == 0)) { + if (isonum_711(p->version) == 1) { + ana->fields &= ~ISO_SUSP_EXTREF; + return (ISO_SUSP_EXTREF); + } + } + return (0); } static int @@ -471,7 +473,7 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, if (!(isonum_711(isodir->name_len)&1)) pwhead++; isochar(isodir->name, pwhead, ana->imp->joliet_level, &c, NULL, - ana->imp->im_flags, ana->imp->im_d2l); + ana->imp->im_flags, ana->imp->im_d2l); /* If it's not the '.' entry of the root dir obey SP field */ if (c != 0 || isonum_733(isodir->extent) != ana->imp->root_extent) @@ -491,16 +493,16 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, while (pend >= phead + 1) { if (isonum_711(phead->version) == 1) { for (ptable = table; ptable->func; ptable++) { - if (*phead->type == *ptable->type - && phead->type[1] == ptable->type[1]) { - result |= ptable->func(phead,ana); + if (phead->type[0] == ptable->type[0] && + phead->type[1] == ptable->type[1]) { + result |= ptable->func(phead, ana); break; } } if (!ana->fields) break; } - if (result&ISO_SUSP_STOP) { + if (result & ISO_SUSP_STOP) { result &= ~ISO_SUSP_STOP; break; } @@ -530,7 +532,7 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, /* what to do now? */ break; phead = (ISO_SUSP_HEADER *)(bp->b_data + ana->iso_ce_off); - pend = (ISO_SUSP_HEADER *) ((char *)phead + ana->iso_ce_len); + pend = (ISO_SUSP_HEADER *)((char *)phead + ana->iso_ce_len); } else break; } @@ -541,10 +543,10 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, * (attribute/time stamp) */ for (ptable = table; ptable->func2; ptable++) - if (!(ptable->result&result)) - ptable->func2(isodir,ana); + if (!(ptable->result & result)) + ptable->func2(isodir, ana); - return result; + return (result); } /* @@ -572,9 +574,9 @@ cd9660_rrip_analyze(struct iso_directory_record *isodir, struct iso_node *inop, analyze.inop = inop; analyze.imp = imp; - analyze.fields = ISO_SUSP_ATTR|ISO_SUSP_TSTAMP|ISO_SUSP_DEVICE; + analyze.fields = ISO_SUSP_ATTR | ISO_SUSP_TSTAMP | ISO_SUSP_DEVICE; - return cd9660_rrip_loop(isodir,&analyze,rrip_table_analyze); + return (cd9660_rrip_loop(isodir, &analyze, rrip_table_analyze)); } /* @@ -582,8 +584,8 @@ cd9660_rrip_analyze(struct iso_directory_record *isodir, struct iso_node *inop, */ static RRIP_TABLE rrip_table_getname[] = { { "NM", BC cd9660_rrip_altname, cd9660_rrip_defname, ISO_SUSP_ALTNAME }, - { "CL", BC cd9660_rrip_pclink, 0, ISO_SUSP_CLINK|ISO_SUSP_PLINK }, - { "PL", BC cd9660_rrip_pclink, 0, ISO_SUSP_CLINK|ISO_SUSP_PLINK }, + { "CL", BC cd9660_rrip_pclink, 0, ISO_SUSP_CLINK | ISO_SUSP_PLINK }, + { "PL", BC cd9660_rrip_pclink, 0, ISO_SUSP_CLINK | ISO_SUSP_PLINK }, { "RE", BC cd9660_rrip_reldir, 0, ISO_SUSP_RELDIR }, { "RR", BC cd9660_rrip_idflag, 0, ISO_SUSP_IDFLAG }, { "CE", BC cd9660_rrip_cont, 0, ISO_SUSP_CONT }, @@ -604,20 +606,20 @@ cd9660_rrip_getname(struct iso_directory_record *isodir, char *outbuf, analyze.maxlen = NAME_MAX; analyze.inump = inump; analyze.imp = imp; - analyze.fields = ISO_SUSP_ALTNAME|ISO_SUSP_RELDIR|ISO_SUSP_CLINK|ISO_SUSP_PLINK; + analyze.fields = ISO_SUSP_ALTNAME | ISO_SUSP_RELDIR | ISO_SUSP_CLINK | ISO_SUSP_PLINK; *outlen = 0; isochar(isodir->name, isodir->name + isonum_711(isodir->name_len), - imp->joliet_level, &c, NULL, imp->im_flags, imp->im_d2l); + imp->joliet_level, &c, NULL, imp->im_flags, imp->im_d2l); tab = rrip_table_getname; if (c == 0 || c == 1) { - cd9660_rrip_defname(isodir,&analyze); + cd9660_rrip_defname(isodir, &analyze); analyze.fields &= ~ISO_SUSP_ALTNAME; tab++; } - return cd9660_rrip_loop(isodir,&analyze,tab); + return (cd9660_rrip_loop(isodir, &analyze, tab)); } /* @@ -636,6 +638,7 @@ cd9660_rrip_getsymname(struct iso_directory_record *isodir, char *outbuf, u_short *outlen, struct iso_mnt *imp) { ISO_RRIP_ANALYZE analyze; + int ret; analyze.outbuf = outbuf; analyze.outlen = outlen; @@ -645,7 +648,8 @@ cd9660_rrip_getsymname(struct iso_directory_record *isodir, char *outbuf, analyze.imp = imp; analyze.fields = ISO_SUSP_SLINK; - return (cd9660_rrip_loop(isodir,&analyze,rrip_table_getsymname)&ISO_SUSP_SLINK); + ret = cd9660_rrip_loop(isodir, &analyze, rrip_table_getsymname); + return (ret & ISO_SUSP_SLINK); } static RRIP_TABLE rrip_table_extref[] = { @@ -664,21 +668,23 @@ cd9660_rrip_offset(struct iso_directory_record *isodir, struct iso_mnt *imp) { ISO_RRIP_OFFSET *p; ISO_RRIP_ANALYZE analyze; + int ret; imp->rr_skip0 = 0; p = (ISO_RRIP_OFFSET *)(isodir->name + 1); - if (bcmp(p,"SP\7\1\276\357",6)) { + if (memcmp(p, "SP\7\1\276\357", 6) != 0) { /* Maybe, it's a CDROM XA disc? */ imp->rr_skip0 = 15; p = (ISO_RRIP_OFFSET *)((char *)p + 15); - if (bcmp(p,"SP\7\1\276\357",6)) - return -1; + if (memcmp(p, "SP\7\1\276\357", 6) != 0) + return (-1); } analyze.imp = imp; analyze.fields = ISO_SUSP_EXTREF; - if (!(cd9660_rrip_loop(isodir,&analyze,rrip_table_extref)&ISO_SUSP_EXTREF)) - return -1; + ret = cd9660_rrip_loop(isodir, &analyze, rrip_table_extref); + if ((ret & ISO_SUSP_EXTREF) == 0) + return (-1); - return isonum_711(p->skip); + return (isonum_711(p->skip)); } From nobody Tue Apr 7 15:52:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLd3wgpz6YTbT for ; Tue, 07 Apr 2026 15:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqrLd2Dkhz3t2T for ; Tue, 07 Apr 2026 15:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOCvSeyrSb0g2rE4YE+o81G8NrB5fakT38gEBFWvcYY=; b=oZfffAFbDOWRCZLXSatzGj+ZIx8iZfQ3l0AE2IwKPGpM422u0DYiE5NFZHVh5WVenZDvK3 lQBXkAepOJUJosJojw7iz5gbbM6JQLxgQd+s61CTqnnZXBBTTL6DKEO35JVNN+tSycRJvD WT2CWwuazqjxsGOdEICJiiBv/dGzTX7SY9U8PHvX+U2U+SzAdbDxPPzoT6La9XFnbTokEH 8OAe/EZD3GdsWRMLW/U3Y2fdqia6Zg1HcTVQzYHfIqsRW4gaePtmmqHAFvVoO/u6DbaHdM rrlnKKwBRV3wtMCALXFjGT839ICVATBjLcLRPQsdKBYNTxjvIOhXgnj2/KmpXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577161; a=rsa-sha256; cv=none; b=aEUJe/evLEp52lsHOi9vhodGhWVB8ZI94W6RHd+aBs8Wu2OSljnV70O1H0kX39tvI1iMa3 Ot8N6F/o01DZm3GKMkkTeujxWw17YTFdJl27CPSLtEbZrCIfbrkjgJ/92c/vByMtV1t+eG /eKFM7o7XR0e0pYpcsVpPbqBoJKqrkwziMsP6nhK3ln4bPQtoMwnX+LiEaZRI92HGoKLzw r1WVd9e5tJa8ffOkYIFdqrHYXEHgP+ojhaWoBRWgKNwRa9eB/UlUiZ5sBVVSf32MyEdxBV qbI0BWkKEZr0323xIa3z16nKVExgtkPdJXbTSmYKPcK11v8Y2Odu3f4kW6EhBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOCvSeyrSb0g2rE4YE+o81G8NrB5fakT38gEBFWvcYY=; b=JxAxF03jE1QKRpO1E8vPvqqNUDRSyz8vCmM4uAboazao0POSmjzhAC5M3Q20x1XYHT07AU anj5GbbkxFLe/IH2QibdrI153FXE/spBCr3QWqkVN1AuGrUX6HK34yu8DpnG3m2+hpW8YJ 3wy/GCOMx5o0KHgi8fyUpClUzGzTFkBQOpju8dwdt+gca/LsnKdcVKsC799/hMxCR3JJc3 ++0o3xtXtlzxanOuW86j3JWdJpdlWFzswaRTSNrT6rui7QIoYZVwDrtsyi2sWpoNmNiIK2 Aph79ov0Y8yOftAkOnj4JHsBq/t1rQCdg+A1dD1bpH0oFkmucb0onW4/aqs2Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLd1HXkzmDs for ; Tue, 07 Apr 2026 15:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45621 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7c717c3ba09f - stable/15 - cd9660: Add length checks to Rock Ridge parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 7c717c3ba09fdb83a8f78541989b91665c05b4e5 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:41 +0000 Message-Id: <69d52849.45621.6827b795@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7c717c3ba09fdb83a8f78541989b91665c05b4e5 commit 7c717c3ba09fdb83a8f78541989b91665c05b4e5 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-01 17:14:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:08 +0000 cd9660: Add length checks to Rock Ridge parser * cd9660_rrip_slink() did not check that the lengths of individual entries do not exceed the length of the overall record. * cd9660_rrip_altname() did not check that the length of the record was at least 5 before subtracting 5 from it. Note that in both cases, a better solution would be to check the length of the data before calling the handler, or immediately upon entry of the handler, but this would require significant refactoring. MFC after: 1 week Reported by: Calif.io in collaboration with Claude and Anthropic Research Reported by: Adam Crosser, Praetorian Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56215 (cherry picked from commit d0afead876076f605c363f03d92304d1bd75be1c) --- sys/fs/cd9660/cd9660_rrip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 6e91f1abb9d2..9bc8ef655368 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -175,6 +175,8 @@ cd9660_rrip_slink(ISO_RRIP_SLINK *p, ISO_RRIP_ANALYZE *ana) /* Inserting component */ wlen = isonum_711(pcomp->clen); inbuf = pcomp->name; + if (inbuf + wlen > (char *)pcompe) + wlen = ana->maxlen + 1; break; default: printf("RRIP with incorrect flags?"); @@ -246,6 +248,8 @@ cd9660_rrip_altname(ISO_RRIP_ALTNAME *p, ISO_RRIP_ANALYZE *ana) /* Inserting component */ wlen = isonum_711(p->h.length) - 5; inbuf = (char *)p + 5; + if (wlen < 0) + wlen = ana->maxlen + 1; break; default: From nobody Tue Apr 7 15:52:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLf4YR6z6YTC4 for ; Tue, 07 Apr 2026 15:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqrLf2j6cz3sxt for ; Tue, 07 Apr 2026 15:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aedAT5T+tZNeSMxIWC5Vemog/WqksFoKw8eUUWoHeOI=; b=xdLenTDJaqjQj0LcEHGQaqYYttJ7CajZG6YLgQcqFz0ctyWmzeR0lz5qnflnM5mEQm3He5 L2JNAJfCVXnYd0KoSBdBFuVicNcYdIjyliLHth0wnHRAJ51CYrf64goAFhMrOdmctr39py rzB14Mj3H/FgmQuliN+xQmUL/OZUWAiNfYWpXefvR4vdSfQxkIWNTeoksBD6wgp8jJsQmI 4ieZBHxswMMqDMEpolVdAYr1d4WWQdFbXj7akUH75Cm2nlcwoENMlTsthqQ0OOIEeVG2Uw ZhebD+Ts8GNXGVZT7yP3bJt/crH3EIMF2FBiF7CWGd/JM9GyXsQyjJq9/tP1eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577162; a=rsa-sha256; cv=none; b=lfc3VkjiS5szaETwf3h51JKw91kkeoythro2Bin22ehMcaKHf+xXQc6bVsXpLl3JQAqlXd 6F8IINzrrgd8G9pJIZCnu2/N780OCXoOSHR9BFO5llY2t1T16w9oQW250Luad/t2BGSEjz d9oecl4SkazS2mL7CGu2GM5MSLjAILwfngF2Qj4we/xLDDJzkXUagOPsGoxcjs9A08/L2i Jk3OLfigwMbNefTHSCtz8msk8LygZ/b/Uv2iKqTgq0WL1AKpeOrVJKy9s6eRRm8RmEo2Q1 gbSQcZV7QbjZ0fgm9LNkTKQql12I+J2vwxe7nTrE69SB0FZ3mB6O0Qb2htOlNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aedAT5T+tZNeSMxIWC5Vemog/WqksFoKw8eUUWoHeOI=; b=KrUYq8MsTVWpkfjmOHWYvdfO+sYNSh5EbIbwkSXk+UiLADrCAJF8J7n9NYbdswM9HYWy1k Q/rXuNvgSv1D72xwkWlpVFgUjnyHO2uPcqWnxBpavFvzadhHAUfTrN1DtHeIUjqdZLoQkH lRjaR8b54cResf6bJFD+UjsYsB6RKaASGiy3RFvCjbqvrvutf4Ile+i7G1FbqP4kTxB9Lf xAcHQUCIbwcnAJb5AztadCuzrO4pUbXkxzXgixO+7LxMxakro9RCogpjQ+9pPhNc+RGIn7 eU0vXbgqiDpaqbf/VCzLWsix5fSEjfrWgD5BlQ33L+E9SH/i3EmW5jCNE2GU5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLf2DPyzmDt for ; Tue, 07 Apr 2026 15:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45625 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4f13c347fb31 - stable/15 - pkgbase: Move all of ATF into the atf 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4f13c347fb31e9d463dd194d0d21115f2318a8d2 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:42 +0000 Message-Id: <69d5284a.45625.45ddec44@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4f13c347fb31e9d463dd194d0d21115f2318a8d2 commit 4f13c347fb31e9d463dd194d0d21115f2318a8d2 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-30 14:03:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:08 +0000 pkgbase: Move all of ATF into the atf package Parts of ATF (including the licence and some of the documentation) were for some reason part of the tests package instead of the atf package. Moving them to where they logically belong poses no problem since tests already depends on atf. PR: 294129 MFC after: 1 week Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D56158 (cherry picked from commit 0a6dbf51d8ea112a1d164be260004ec795b4368d) --- etc/mtree/BSD.usr.dist | 4 ++-- libexec/atf/atf-sh/Makefile | 1 - share/doc/atf/Makefile | 12 ++++++------ share/man/man1/Makefile | 10 +++++----- share/man/man4/Makefile | 10 +++++----- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index e43a9b341003..fcc1d5de55be 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -199,7 +199,7 @@ sbin .. share - atf tags=package=tests + atf tags=package=atf .. bhyve gdb @@ -236,7 +236,7 @@ doc IPv6 .. - atf tags=package=tests + atf tags=package=atf .. kyua tags=package=tests .. diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile index afd848581f36..a76b59e9a1aa 100644 --- a/libexec/atf/atf-sh/Makefile +++ b/libexec/atf/atf-sh/Makefile @@ -71,7 +71,6 @@ FILESGROUPS= SUBR SUBRDIR= ${SHAREDIR}/atf SUBR= libatf-sh.subr -SUBRTAGS= package=tests HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/share/doc/atf/Makefile b/share/doc/atf/Makefile index 27f820bf86a0..e4a345f9b092 100644 --- a/share/doc/atf/Makefile +++ b/share/doc/atf/Makefile @@ -24,13 +24,13 @@ # SUCH DAMAGE. # -ATF= ${SRCTOP}/contrib/atf -.PATH: ${ATF} ${ATF}/doc +ATFTOP= ${SRCTOP}/contrib/atf +.PATH: ${ATFTOP} ${ATFTOP}/doc -FILESGROUPS= TOP +FILESGROUPS= ATF -TOPDIR= ${SHAREDIR}/doc/atf -TOP= AUTHORS COPYING NEWS README -TOPTAGS= package=tests +ATFDIR= ${SHAREDIR}/doc/atf +ATF= AUTHORS COPYING NEWS README +ATFPACKAGE= atf .include diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile index d3975c8e8084..c58de8345efc 100644 --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -99,11 +99,11 @@ RUNTIMELINKS=\ builtin.1 while.1 .if ${MK_TESTS} != "no" -MANGROUPS+= TESTS -ATF= ${SRCTOP}/contrib/atf -.PATH: ${ATF}/doc -TESTS= atf-test-program.1 -TESTSPACKAGE= tests +MANGROUPS+= ATF +ATFTOP= ${SRCTOP}/contrib/atf +.PATH: ${ATFTOP}/doc +ATF= atf-test-program.1 +ATFPACKAGE= atf .endif .include diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 47e624f9c014..b23e69960f42 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1048,11 +1048,11 @@ MAN+= mlx5io.4 .endif .if ${MK_TESTS} != "no" -MANGROUPS+= TESTS -ATF= ${SRCTOP}/contrib/atf -.PATH: ${ATF}/doc -TESTS= atf-test-case.4 -TESTSPACKAGE= tests +MANGROUPS+= ATF +ATFTOP= ${SRCTOP}/contrib/atf +.PATH: ${ATFTOP}/doc +ATF= atf-test-case.4 +ATFPACKAGE= atf .endif .if ${MK_PF} != "no" From nobody Tue Apr 7 15:52:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLg6T5Fz6YTbY for ; Tue, 07 Apr 2026 15:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqrLg3bffz3t2Z for ; Tue, 07 Apr 2026 15:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MpE8NomO/Qd4eiSZoo4nNT2rFAazz77+RL27UQ/iXuY=; b=Ga4P0lp0lzFI4/l9ywfuTBBfIc0+76t3j0fqTONjJplaEL8i6i2AaEVDfl40tKjBpAS50g t8pbwk3J6NKvg3xTGp8E7n6UgKFThxxWWNDhfwVnFxnfOzYaVIlXXptzglUsNzNXZBkRwW UBroJopOcHfNEk9Ne3lGgpOQ+vwtzOn4LvT/D3qJZ8dsg1lgpsVNbfD7iu78q5z2lVUklf QfmxKhfAue2APfD6xy9LHHH5yKuESbWfKXFvUEtzuGNLJBhxL0uIEb+hsBjNs55vjTy2e8 61+zdOGrzYeprqiARo0r/pPzrfT2PENOfpNCEdXPrsq63XF0ghzmAouI5J0FQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577163; a=rsa-sha256; cv=none; b=NnC0YXObiikuKcglX3dfJgzr2GTerwKs/poSTSye6F0go3XqT4yn9C7X4VxxK2cwQ19LNK 7ePPquPlukDMuPnsvdApQrQ/GeWjhiJO79WmFxQ8rm0hPftk89M7OaZ7WSAYE+dytBhVZP c/fQLo7mRM8Cwhf9BaTvvSmRBXLsNtLz/qNPp7tX2/V38ANPWh6gq1NBWNKb/hMe+xxGCJ DrNNMvwKjO33Z8Tr0AvPAn7cU+xCjmZ2ZOjd7HWEuBSh235ci0jHmBSrCj8CvO7WQS4hyl 3V6Ddeqf/1hXng0dEiyHYn8lzYzULggwRd9YALB99XTgsxY46WnzWGxjDhUq+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MpE8NomO/Qd4eiSZoo4nNT2rFAazz77+RL27UQ/iXuY=; b=NTmP/yHz4y5x65TJvKQPef7EhU80roCCCuu9643eGh659iVTFyAmY0Clh7dM/p3DnaC8uu V46pwuFRazr+MUOAduVVuoEKuaXELWqWB+8FtMocEWaTFAkkfsc8CXt3H1ULDxhTtkyDHk vbW684Rl+iz0skFP1v+a7lyu6p70xty6q8Yg0/MVVsf2dFyNBm6sLfPlJOy4d8TbGT6xLr xAt2sZBwWhgZw9ufMHekaOW29gobBV0Lo1Jcgy+46NletFHlRnSr7frI9Wdi9YoRmClnOF 0IB+r2hsvSMpATv5MVx+ZAcnLyHZZpZMqCOi7V1oAqMEiyZoeODG68pabE5Siw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLg32MNzmfM for ; Tue, 07 Apr 2026 15:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45a45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fb3538f6e634 - stable/15 - pkgbase: Move all of Kyua into the kyua 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fb3538f6e634f067906a8dc937994fd8f091f905 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:43 +0000 Message-Id: <69d5284b.45a45.26cea276@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fb3538f6e634f067906a8dc937994fd8f091f905 commit fb3538f6e634f067906a8dc937994fd8f091f905 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-30 14:03:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:09 +0000 pkgbase: Move all of Kyua into the kyua package Some Kyua directories were improperly tagged as belonging to the tests package. Move them to the kyua package, which contains all of the files found in these directories. PR: 294129 MFC after: 1 week Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56159 (cherry picked from commit 40e8afadc393a102f4199228ae2047d3e6c71251) --- etc/mtree/BSD.root.dist | 2 +- etc/mtree/BSD.usr.dist | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 95a3361b3c61..d5ef29c51a92 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -63,7 +63,7 @@ .. jail.conf.d tags=package=jail .. - kyua tags=package=tests + kyua tags=package=kyua .. mail tags=package=runtime .. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index fcc1d5de55be..2cc041edd2ae 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -238,7 +238,7 @@ .. atf tags=package=atf .. - kyua tags=package=tests + kyua tags=package=kyua .. legal .. @@ -334,7 +334,7 @@ .. .. .. - kyua tags=package=tests + kyua tags=package=kyua .. libusb20 .. @@ -483,10 +483,10 @@ .. .. .. - kyua tags=package=tests - misc tags=package=tests + kyua tags=package=kyua + misc tags=package=kyua .. - store tags=package=tests + store tags=package=kyua .. .. locale From nobody Tue Apr 7 15:52:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLq2wNLz6YTkq for ; Tue, 07 Apr 2026 15:52: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqrLq0kVWz3t0L for ; Tue, 07 Apr 2026 15:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57QKtWD9cGxR6hEuaTnmVM3sBs2AAW+UOmq7AaiKdqs=; b=B4k3h6hawFXS0+q5XcYjPTN0ntTs3RwT6PiS1pEBfd7qeeaPWKynVZrOvKXEip6abgyNKX SbMQqKMC4OaLmYOdxt+I04pUKMnrXATdrcw4jUsiH8/zV7TeB87UNhwEkZli5akVcUQvHP ph49YrSnqKpDai6GsMZ4FwHCBDeBgSynEDnDRz0/UDgV3UeV9EB98vFfXzUsygRc8kVpRE 48uWiG4LW2Z8eFhONa8UnUj+9IVYBh4WN+YQ8y/xR6p1ecqpHwWP9aFOrRnr7zwxrjQe08 TR/6RhCisV2wss5S3ojONF7QzkjX4y+J7q0bLWfBpit11cJ7cHaVBDCahW8TTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577171; a=rsa-sha256; cv=none; b=qSbCHoVReRT5QHfiS4YwiiygxGx2nrEXUjPmvigtuwwTm5Y3ZQ7NrCi3pw25XZeQF6P5zI 0pG8HT6fgLLIHfquFm84Uy5VJJqa02bbEHUJ/uRsQPgI3/MDyEq9m8XcvEqvCT+wGyMK18 DEb0lVBIxcYUD7R86xiWVVVZFwVcTeb+P+oKQop5j1ynKe14g334Ovrw/FTjnW+2h2/A+4 g9oiK0nlx3Wsarff6oL8UZtSsGd0a89Cs2aNtXvBbwq4l9c6/ZDONUZxw1eM9ZQDVBL+Ji YBhYhg+IVu3+z80d/Vak4ZzmGMhNjF4oyRo+QgY8xcjiZYEHHpyjSX7UKjWxmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57QKtWD9cGxR6hEuaTnmVM3sBs2AAW+UOmq7AaiKdqs=; b=MTfoYF8NUsJB8YWhAXxS015rd4aK4NNrh79iZDwkO9oPaAceX3WmFheGZn2vUKK0pgdxsl pekq1kDW+j+4wvWex3T6Pwox1nw0xQRHuNX2w3zwpnmMuD2It0M/FHIWRTliT3Zzg8RQbu RlX46hcBanZzH5KrW0xzFy44QaozD0/qPm9mESlTSAmqvwsNnGWLeN00Fkm8Vnm1joMoQL oCUIpO5uDQrjpy0jxtyGkA/Iag1FGx1WZk0nBzYQL6ILmB98jdPRBbNYHqZOj9IdunT/wv s/BwngjGO4VuaT6/03ocLPYWPj3bGG712JYgHaShqV7gj0o0q5+w6W3ngxIyFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLp6y2hzmhQ for ; Tue, 07 Apr 2026 15:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 456a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 818243722f6e - stable/14 - cd9660: Add length checks to Rock Ridge parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 818243722f6ef4e08bff05a7d3f38984fb758506 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:50 +0000 Message-Id: <69d52852.456a2.6ea479a6@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=818243722f6ef4e08bff05a7d3f38984fb758506 commit 818243722f6ef4e08bff05a7d3f38984fb758506 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-01 17:14:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:41 +0000 cd9660: Add length checks to Rock Ridge parser * cd9660_rrip_slink() did not check that the lengths of individual entries do not exceed the length of the overall record. * cd9660_rrip_altname() did not check that the length of the record was at least 5 before subtracting 5 from it. Note that in both cases, a better solution would be to check the length of the data before calling the handler, or immediately upon entry of the handler, but this would require significant refactoring. MFC after: 1 week Reported by: Calif.io in collaboration with Claude and Anthropic Research Reported by: Adam Crosser, Praetorian Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56215 (cherry picked from commit d0afead876076f605c363f03d92304d1bd75be1c) --- sys/fs/cd9660/cd9660_rrip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index d3b8ccab16ae..28bf7fd3a097 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -178,6 +178,8 @@ cd9660_rrip_slink(ISO_RRIP_SLINK *p, ISO_RRIP_ANALYZE *ana) /* Inserting component */ wlen = isonum_711(pcomp->clen); inbuf = pcomp->name; + if (inbuf + wlen > (char *)pcompe) + wlen = ana->maxlen + 1; break; default: printf("RRIP with incorrect flags?"); @@ -249,6 +251,8 @@ cd9660_rrip_altname(ISO_RRIP_ALTNAME *p, ISO_RRIP_ANALYZE *ana) /* Inserting component */ wlen = isonum_711(p->h.length) - 5; inbuf = (char *)p + 5; + if (wlen < 0) + wlen = ana->maxlen + 1; break; default: From nobody Tue Apr 7 15:53:01 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqrM233lZz6YTks for ; Tue, 07 Apr 2026 15:53: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqrM174dvz3tZk for ; Tue, 07 Apr 2026 15:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SDGu9IPP8jSs+3SmBnZB7gRb2BeL+JC4uI3l/l4IvCw=; b=SgxyGA9ODMfO3r0zYwSixw5F2sVT6zkliqD3BkByGNf/lZwkA+6xnzKZrwlUPqogLZ1O+l xNFSlbQJIU9czz23jZw5dVhxgQ8VES19Jo3wWD21Jb18txdssUVMGv2hfxa5LRT82jG/88 NW4He6jWqdtXFYLi9h3ONO1dcX2FcHoAQhOIZCvE34ja8g2Katxdsg1vOvf6OugpVXw4iH C6XWeTHTm0NQkfGzu1WVuHU5e6gIzwFixh56UgchOCKs1WB4hQqUYm1JqA+wu9PAC8DOm7 +aG7zIPO0ozKI4nZOt9Io9oRPxbRuDSHVx7XU/xFbes2oqKIOb6SmcLRNU7mhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577182; a=rsa-sha256; cv=none; b=Nj0mSz30cYdRVBliI8+jzVXt8D8rmmTZ+B/PWf2LZ3icePs7riWxnGuHqyb88s8/HBX/xu o0XMpV23i0z/qTP2svTfD94s7R/XPgq9D/Y8tg2OaVJ9GbGoFejiNYOqziePF+qhbk1AQs yNnYARfX21fNXqNp4zV//q0yzvOThQ6+sA9N+zXJkU3X+8bPzrJsneVSiClB8Hb1ad2uFp 8EgBoD3c0x/SvjxkxoJYaIqvH+jVLWvO5FhnvCjbaWxXsecWt87rMj58gpcfqAQWq5zfrc wZ3w+xNYA/f6UesWdS4DCrnSqMvA4MJZsHiPefY1Clo08etoikD7ivaf2tw5hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SDGu9IPP8jSs+3SmBnZB7gRb2BeL+JC4uI3l/l4IvCw=; b=vD84ciG+Bq9mu+JGPW7EK32DiU3c4LPU3VrX5wVa0PfbZM5DW19Da4ygj6KBQYlxCslNv5 ai2Gd3fHMCxBiYVwLV2ITDb7aoTUf+CrQijrERXYjwoP8m+6uR1MKKoiHbfRS5CY7FOKs1 r38TyYcFHXGteJPeKH/mwUR2+JUkA62LWohg0g6Vq2UOp2V780Cj1VeKcwX/1bvW12a628 NFA78o2PueVGCFLtW+OWNpMJyWOQwmEZ1YHvSXkR4lxHwtDuI+7UflQhJZXrz28Ts1f4OP l+Mi8KKI4eLXGprukAjKTHB7XMHeoeElADFUCb7WHDUDaso45pxzs14UGqKRuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrM16g4NzmfN for ; Tue, 07 Apr 2026 15:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46681 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:53:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b3bf8410a562 - stable/13 - cd9660: Add length checks to Rock Ridge parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b3bf8410a56260bc0f26b5197b3c8764f3283e9d Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:53:01 +0000 Message-Id: <69d5285d.46681.4c69a2fa@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b3bf8410a56260bc0f26b5197b3c8764f3283e9d commit b3bf8410a56260bc0f26b5197b3c8764f3283e9d Author: Dag-Erling Smørgrav AuthorDate: 2026-04-01 17:14:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:56 +0000 cd9660: Add length checks to Rock Ridge parser * cd9660_rrip_slink() did not check that the lengths of individual entries do not exceed the length of the overall record. * cd9660_rrip_altname() did not check that the length of the record was at least 5 before subtracting 5 from it. Note that in both cases, a better solution would be to check the length of the data before calling the handler, or immediately upon entry of the handler, but this would require significant refactoring. MFC after: 1 week Reported by: Calif.io in collaboration with Claude and Anthropic Research Reported by: Adam Crosser, Praetorian Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56215 (cherry picked from commit d0afead876076f605c363f03d92304d1bd75be1c) --- sys/fs/cd9660/cd9660_rrip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index b7e902b6d9a7..84a779bc9dfc 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -184,6 +184,8 @@ cd9660_rrip_slink(p,ana) /* Inserting component */ wlen = isonum_711(pcomp->clen); inbuf = pcomp->name; + if (inbuf + wlen > (char *)pcompe) + wlen = ana->maxlen + 1; break; default: printf("RRIP with incorrect flags?"); @@ -257,6 +259,8 @@ cd9660_rrip_altname(p,ana) /* Inserting component */ wlen = isonum_711(p->h.length) - 5; inbuf = (char *)p + 5; + if (wlen < 0) + wlen = ana->maxlen + 1; break; default: From nobody Wed Apr 8 00:55:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fr4Nw1vVNz6Y4Dn for ; Wed, 08 Apr 2026 00:55: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fr4Nv6Nd2z3CmX for ; Wed, 08 Apr 2026 00:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775609727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PV58ph8D/hiy1eSfc3SVqpvI6TrfQ/185PEm+Vf8F5s=; b=PmD4JS6Ma8YSJgJVPSk3IFS1727vN7f3AKRmtbz9DahBbNKNghpcXavezTLVcOu+wTltXr rO2Gx5YVnOjKinyBD78KiOdZkazHwOUPEtbLZ5ncSdcUFyZfXGbL3pKMi1iixflrlEldmS opgPmgpId2NUpfHa6NcDq6edtiNW4bzKpo2qZlfgmu1o0PL4KQ0WrQHbvn8s7Pu3y8W5/F a4tD1ntez5p+qCFCH0oLyXtQPaJ1e1qH2W7PLg8a8TY1sAgnKzUjd3YDRnmTdCpi2AsmSo p2nbEIJnWeD2VeUcQfGX66O3HKzhcYsFq97D3YpAI8IsWrQCbH0Lc+g5+QIssA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775609727; a=rsa-sha256; cv=none; b=AFAnENGUwMsyoT61g14KRQkSxqxWBYxaUupnNn0LnKIPxUs6pdYMMx3lNC+u/yMx+Rwk2c 2fKCAXz6Eq73cQ6cLQFK6n+/Hxi4xmXVYOwW1w5GDLbbHF3HnAQPmd+jkao4H+DE02bkFu 2JIgoJz52l+5LggCGJfhP/GPRU6EZ2SFI0CuBQ7ISCM1Bu8SGb2BX41qyXsZSEr3vky3tB nMNGfhB2NPufi+mHgpiO6inh3uuL7SZrBmfR/WvrE5IGmBGC6L8344ACYzP2hEcJ1EcGpa WHfodH++PuVcV3lkiMTYtd464OJlxCVCPWbOgWOwSFEc+k2TkPVgy1lvyX8Tjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775609727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PV58ph8D/hiy1eSfc3SVqpvI6TrfQ/185PEm+Vf8F5s=; b=t/pf9TADR+fau1No8l4rNLpYdroRjQg1uakWLoi+c3IBt/INnoYhmismSVsXpsXKiofeNZ vtwwN+j4oGzYpyzLT6nNfj0m1U7y73iYlyU6DCRcycvV7muYuaBvd6musNp0OWQd8xRssj m9EiD8VGZoNLoXlvN/zjDtYXTSauhKCZlEUDNz1YWE0RNmkth6NaiqoOIxf3UnnD+/VHMJ g0gRnyy9XLPh/P8mBjTDvsyStNtw1JGaEZr1stD+jLL7HL8i+5VxYoO+B4rirlkngr1era CBSCHfMx/ON/kvbNLVS8vvpiHyhheYBDcbGBrbxgAJCconw95K3dQ7sMQDQTxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fr4Nv5jzJz13ff for ; Wed, 08 Apr 2026 00:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3715c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 00:55:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 6c13732570b7 - stable/15 - clnt_bck.c: Delete a couple of old diagnostic printfs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 6c13732570b7e09dc5155055e421ebe8c90dad48 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 00:55:27 +0000 Message-Id: <69d5a77f.3715c.3d7cf4f7@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6c13732570b7e09dc5155055e421ebe8c90dad48 commit 6c13732570b7e09dc5155055e421ebe8c90dad48 Author: Rick Macklem AuthorDate: 2026-03-25 20:53:22 +0000 Commit: Rick Macklem CommitDate: 2026-04-08 00:54:18 +0000 clnt_bck.c: Delete a couple of old diagnostic printfs There were two debug printf()s that were left in the code while debugging the handling of callbacks over a NFSv4.1/4.2 backchannel was being done. This patch removes them, since they are no longer of benefit and cause "noise". (cherry picked from commit 41b423cc4e4dfe3132bb5d287bba03b82ecb5be8) --- sys/rpc/clnt_bck.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/rpc/clnt_bck.c b/sys/rpc/clnt_bck.c index 7e4781ec7e9d..c5cbbf045bdc 100644 --- a/sys/rpc/clnt_bck.c +++ b/sys/rpc/clnt_bck.c @@ -314,10 +314,8 @@ call_again: */ sx_xlock(&xprt->xp_lock); error = sosend(xprt->xp_socket, NULL, NULL, mreq, NULL, 0, curthread); -if (error != 0) printf("sosend=%d\n", error); mreq = NULL; if (error == EMSGSIZE) { -printf("emsgsize\n"); SOCK_SENDBUF_LOCK(xprt->xp_socket); sbwait(xprt->xp_socket, SO_SND); SOCK_SENDBUF_UNLOCK(xprt->xp_socket); From nobody Wed Apr 8 14:01:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPqr0Gc3z6YB4f for ; Wed, 08 Apr 2026 14: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqq6Gtfz3fmN for ; Wed, 08 Apr 2026 14: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=1775656887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VEbwoSn6fr/hhYB5PzzfYz11bGXVWV1a+8AP0Y/tPE=; b=jC5D3/ZhKwbqWuA33DxZO8ztSN4wahdMrajvz8nzOEps0/Uh81vxeQkSEooDujMPo+V3mK TgvzLOtiEpCbNQp9oQPWhJG2tZLEJ21ELy1wcgAxsaHwkYLGhNMYCuigJAsM3OmbrLYUXp U0Rcw16Rl20O/UbVkb3dwtSzgm3JtdfKD5lHlf318/9uymFNkEqIe8krA2Zv5mdAU06d2n 6ETmcziVt1ULWMbdywLYPhkPB2s67iEH3EZuPmzkPquyqHL/+gZKXIyZtrKex2NiCaZbwk AflAKsPQNqoPhx4inxLnxwn1JKrS0td+pZLuOunjaZp4qaiZTQ4+P5KojJc9eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656887; a=rsa-sha256; cv=none; b=kgzSd3ZvnXkY77cmmgomJM1eqCJzWpCpTTljs1sPo6AxmZHN1nb0zKyldxLVBMtfKgD0/k e3w3pt34EqXD/LSbMesVf/aJzkSv6Mn0FvSg+zNkkcN0WJPYzqZssJ5MuUjvyZmFFLKuer iyGVd5kVMBpSEBcWh+T3rd+latRzrnpipVlgSMn2jGnI1c6MeeFH1BFmVeJ1JDKipULKDZ vLyvwpcWs0MS91AvlBmmfFOo+KAgOFXKUqxhfgBI4cTL9gRA7DC1OyuRUPplBoqIFg8OSX 2fAbrl/mtUBm9Qv824g5y80GUfcypsDHzA4xq2icY2dUe46BgRTg2EzX0sMuBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VEbwoSn6fr/hhYB5PzzfYz11bGXVWV1a+8AP0Y/tPE=; b=eLo+Xylz/+XDl8AQ97vPxr9EJwby/lwGuIGeRSjiOO4Xdz8mN+P19+zNNAt52DjR9/SJK6 0GC9sUd9ujQ1h+kKjX5HquBgAM4LhWPRN4cgQsafPJIEyOgqwApVUQN2d5JZPQPFDi5dOc U0alyw5hLt6ED/j6tNDv+W4P4e+jJ4L0X/A8ZFEIIS/aG8UBZXjlBYEwQ1UHUmwlz3n9Xc D7l/9fJT/mWNyF5snvBL7fRSkMJupbwzeXrotz20x4dPf8ppAO7MjWUgptp/MlyZIctkvK ECyihG/O9E/LX8Py3bEax8CvI7YpY67cbV1SDFS3L/sJM1T6+mlmgIhvJoPZ3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqq5YjTzDDq for ; Wed, 08 Apr 2026 14:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b3a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: c91d1de34d26 - stable/15 - arm64: Move creating the ID register views earlier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c91d1de34d260e73c7816c69b9b5f48194019100 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:27 +0000 Message-Id: <69d65fb7.3b3a5.5b72016c@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c91d1de34d260e73c7816c69b9b5f48194019100 commit c91d1de34d260e73c7816c69b9b5f48194019100 Author: Andrew Turner AuthorDate: 2026-02-09 17:24:26 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 arm64: Move creating the ID register views earlier These are needed when enabling CPU features so should be processed earlier in the boot. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55103 (cherry picked from commit 0ea31fe851344af022103fa81dcdf00ef0dddc1d) --- sys/arm64/arm64/identcpu.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index e37c9813582b..7f89098cc840 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2826,6 +2826,26 @@ identify_cpu_sysinit(void *dummy __unused) prev_desc = desc; } + if (dic && idc) { + arm64_icache_sync_range = &arm64_dic_idc_icache_sync_range; + if (bootverbose) + printf("Enabling DIC & IDC ICache sync\n"); + } else if (idc) { + arm64_icache_sync_range = &arm64_idc_aliasing_icache_sync_range; + if (bootverbose) + printf("Enabling IDC ICache sync\n"); + } +} +/* + * This needs to run early to ensure the kernel ID registers have been + * updated for all CPUs before they are used by ifunc resolvers, etc. + */ +SYSINIT(identify_cpu, SI_SUB_CPU, SI_ORDER_MIDDLE, + identify_cpu_sysinit, NULL); + +static void +identify_hwcaps_sysinit(void *dummy __unused) +{ #ifdef INVARIANTS /* Check we dont update the special registers after this point */ hwcaps_set = true; @@ -2848,16 +2868,6 @@ identify_cpu_sysinit(void *dummy __unused) elf32_hwcap |= parse_cpu_features_hwcap32(); #endif - if (dic && idc) { - arm64_icache_sync_range = &arm64_dic_idc_icache_sync_range; - if (bootverbose) - printf("Enabling DIC & IDC ICache sync\n"); - } else if (idc) { - arm64_icache_sync_range = &arm64_idc_aliasing_icache_sync_range; - if (bootverbose) - printf("Enabling IDC ICache sync\n"); - } - if ((elf_hwcap & HWCAP_ATOMICS) != 0) { lse_supported = true; if (bootverbose) @@ -2872,11 +2882,14 @@ identify_cpu_sysinit(void *dummy __unused) install_sys_handler(user_idreg_handler); } /* - * This needs to be after the APs have stareted as they may have errata that + * This needs to be after the APs have started as they may have errata that * means we need to mask out ID registers & that could affect hwcaps, etc. + * + * The errata handling runs at SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + 1, so this + * needs to be later than that. */ -SYSINIT(identify_cpu, SI_SUB_CONFIGURE, SI_ORDER_ANY, identify_cpu_sysinit, - NULL); +SYSINIT(identify_hwcaps, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + 2, + identify_hwcaps_sysinit, NULL); static void cpu_features_sysinit(void *dummy __unused) From nobody Wed Apr 8 14:01:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPqs6c0Bz6YB2v for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqr706kz3g7m for ; Wed, 08 Apr 2026 14:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCDitmLDlUohjiQsZ2q1MTBsblFLSIDDRL2AOxiomcA=; b=KXdfl1+4G+0gpSG3TJAn5R0RwTzGMOd0XKmjpkpAfbmxzdh67kK7X9IDkJwYBe91QznM/W g0mqvsEHN7rKkRqiP4qTuP6LYf35qBiId81ktmTy3ym+PZPwMrA43+a5qnPTh+COWkExUP n0N9CaCj3ogfMTxkY5PuO8dqZkepxCVd75rRpF7aWZG6HRymBLZ6owPWv+zpFQFSnGIxuD 2g7ikpWvlXOsSiqmYUU0ff5ELw4/BL8Ndqu5BXgsY5qBknxvuomo/E0dJh/FZ5JjXhC9sv +kOojJEAva0sPEyfmhB6zqg8nU/CEXoT75XM+yKhY7k4eOqrmg3IjmQ+lhIauw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656889; a=rsa-sha256; cv=none; b=an1BVi+vKCJPjDLai5ywaDJSgPo/pDnzdgF23yjaErimKFYtZeA4PdaOOhir6e7lpvRJjZ 5pONci1T1sdUf8Cy0J7CB3wTM+IlXs9dXQGH20OzdQ3nx0ayM0OIN6H1Hs8EvbUQZWtI7O m6a8g1nEDABCdQRMdsHo/9vUEDhu5ws0ncf03t96iYrfW46sKBse8TsGvi32WOGqchnb0E shcZtUH9FJkR8cgh788I98sfOI5ZsasaAkilN2zCbBnfi89AlEEU8Gp5cDagimspXhhc2h zCa721H4kcrRq09ml0rO9TvZ5f0rtq4pS9Y+g13ihIoufvArNOlQiuWm5CI5hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCDitmLDlUohjiQsZ2q1MTBsblFLSIDDRL2AOxiomcA=; b=w4SWptLU1a3JwCwqQOEFLQbSEj6ef7485BI0VSNNRqAmBhRN1lQMXhj5WiMCcAS1D5rAWU 4mWCxoPgfKSYtNMLmN5qeUV/6jbTCzW364dEP5EsKErR92Rz/cGqivgz9KFgiDV/QeoyIC nDjRNpdQVKqYYYlasOyj/TV75AnySWLDstuwNGl//o4cO0H/oH5yXK4iEu9DjK/EKlE1i3 DY/QitRKYLzgmGzfO5KnkHXU9gUUAqgzqtHQclvbx6rZG+bYF4Fvgf4dqxvO3k7my90hV/ uSaSVSzAD0hzinHIV7CZY08/m3feG4wGg+CTiLOoXmkApoCP28kjhLK4/MmPNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqr6NB8zTJf for ; Wed, 08 Apr 2026 14:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b795 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 7a70c9fcff1d - stable/15 - arm64: Panic if the ID register isn't known List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7a70c9fcff1d79648b45b6936e8172eb696d5490 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:28 +0000 Message-Id: <69d65fb8.3b795.671d742b@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7a70c9fcff1d79648b45b6936e8172eb696d5490 commit 7a70c9fcff1d79648b45b6936e8172eb696d5490 Author: Andrew Turner AuthorDate: 2026-02-09 17:24:27 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 arm64: Panic if the ID register isn't known This will allow for callers to be simplified & not need to check the return status. Keep the return type for now so this can be MFCd without breaking the KBI. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55104 (cherry picked from commit 3b0b6aa2cd05b516ecf4b72f9a3c2aadddf3c94e) --- sys/arm64/arm64/identcpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 7f89098cc840..a1e7a43977f0 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2526,7 +2526,7 @@ get_kernel_reg_iss(u_int iss, uint64_t *val) } } - return (false); + panic("%s: Invalid register %x", __func__, iss); } /* @@ -2553,7 +2553,7 @@ get_kernel_reg_iss_masked(u_int iss, uint64_t *valp, uint64_t mask) } } - return (false); + panic("%s: Invalid register %x", __func__, iss); } bool From nobody Wed Apr 8 14:01:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPqt2M3vz6YB4g for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqt0Rwxz3fpl for ; Wed, 08 Apr 2026 14:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QdB/OFyB0+CEGE/zwlEg0HjAMbTynd1JDPTPA51p7Pw=; b=M9Hbl7mPChqMPJtHprn/3wlGionOAsbfv0r7Q0huoSFFwzIXqh9AAwEQ5HnjNiyBATdxpI PxcMkOLnR1mku69mhaubxm3t0um1oiTLgZ1ia5ZkkpCMOtlDg/CohqTIBGr/vc79junX8o aNh5smzHHq8sBklP1H+/FqPzfdsEBh05z+Iu2y2gVVKI1IqNPQE8qHqURotKGjEcgKKdma 9jxix5iZBuyb6t6IggcEwwZVeJiKdHd3WYyN1DJJzTF6aybLJlL/0rgFGbJ7m5b0jkMaI+ a6l9LyASiIdD1moLON4+gxi/y6SUo9nyqQ9AT32/SUyv+htL74Eo1BbnDvPrjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656890; a=rsa-sha256; cv=none; b=gr1jdQ5KHI5XvH/3UPibi9ui72SbiZF7m7pk2elG22inUuId4cSj2Cm1UxLgdBkCCWwdmG Ds2/sMy7h3VLri19v81JBGgZxYrA+mLXTmThP0XR6UMQFv2v3IwLzvamYsThBVuvTJUZpk rB2RXpOOaxjjaYjyy+rjGFQlBrevsjG+f9ZP2so4FfsVD4a0k+3yNbjkwOmkgCLVluRBLB nK9h3vfY5pFqzhcr+3Cfp8H+SHNzRiPjry5iFTL+62pZqcA2fnJNEbk4R0U0++yyG+XoWz 0R0G04anKeB5K48B2Bss1C4xw//wC3teAHmdDSY8AqXz/1A9Smq+BfEqKcfvug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QdB/OFyB0+CEGE/zwlEg0HjAMbTynd1JDPTPA51p7Pw=; b=qEY+3otNXH4Ys1GJ+PyGP1X6W5e+fZuyYS5Xte59PmOsQCD2jrc1pL+ZLggSo16oGWFRNd h8MJGbm3cAtJo+8FlC36rxVWDuT+x8w6lFLSVMS6SgD5vjazifL5aQqLuGqjDAGFaoihPm mpwSwTQ6bhxmWt+0U7AAREcBcUxyhXbPJpdZyo8vi53hq4beD3iL+9zdAFRUSEk9w/wlMA O6xd7DuBZc1oGEJmFnl+hbpq5dUfmAS/OUZRil0rSkoanXico31/SFBrBofgaJNZxtXtgx hEHyh6tW46rUuuykb2eK4b/Z4t1Nr71B/+V8mgqbIZIPJaqDCc9SsqLTx895bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqs72ffzDSM for ; Wed, 08 Apr 2026 14:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b816 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: ca69c5d68f30 - stable/15 - arm64: Assume get_kernel_reg returns true List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ca69c5d68f300e306490831d4995ae36364c94eb Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:29 +0000 Message-Id: <69d65fb9.3b816.57fc9296@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ca69c5d68f300e306490831d4995ae36364c94eb commit ca69c5d68f300e306490831d4995ae36364c94eb Author: Andrew Turner AuthorDate: 2026-02-09 17:24:27 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 arm64: Assume get_kernel_reg returns true It now only returns true so this can be assumed and doesn't need to be checked. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55105 (cherry picked from commit a8c3933840448eaf04ecfe162c0d05caf11090a4) --- sys/arm/arm/generic_timer.c | 7 +++---- sys/arm64/acpica/acpi_machdep.c | 6 +----- sys/arm64/arm64/machdep.c | 6 ++---- sys/arm64/arm64/pmap.c | 21 +++++++++------------ sys/arm64/arm64/ptrauth.c | 15 ++++++--------- sys/arm64/arm64/vfp.c | 4 +--- sys/arm64/vmm/vmm.c | 5 ++--- sys/arm64/vmm/vmm_arm64.c | 39 +++++++++++++++++---------------------- sys/dev/hwpmc/hwpmc_arm64.c | 7 +++---- sys/dev/random/armv8rng.c | 4 ++-- sys/libkern/gsb_crc32.c | 7 +++---- 11 files changed, 49 insertions(+), 72 deletions(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index e3ba56a6f6ac..43e5d8b56531 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -662,8 +662,8 @@ arm_tmr_attach(device_t dev) sc->get_cntxct = &get_cntxct; #ifdef __aarch64__ - if (get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1) && - ID_AA64MMFR0_ECV_VAL(id_aa64mmfr0_el1) >= ID_AA64MMFR0_ECV_IMPL) + get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1); + if (ID_AA64MMFR0_ECV_VAL(id_aa64mmfr0_el1) >= ID_AA64MMFR0_ECV_IMPL) sc->get_cntxct = &get_cntxctss; #endif #ifdef FDT @@ -912,8 +912,7 @@ wfxt_check(const struct cpu_feat *feat __unused, u_int midr __unused) { uint64_t id_aa64isar2; - if (!get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2)) - return (FEAT_ALWAYS_DISABLE); + get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2); if (ID_AA64ISAR2_WFxT_VAL(id_aa64isar2) >= ID_AA64ISAR2_WFxT_IMPL) return (FEAT_DEFAULT_ENABLE); diff --git a/sys/arm64/acpica/acpi_machdep.c b/sys/arm64/acpica/acpi_machdep.c index 123e5c328255..5ff875a98e53 100644 --- a/sys/arm64/acpica/acpi_machdep.c +++ b/sys/arm64/acpica/acpi_machdep.c @@ -235,11 +235,7 @@ parse_pxm_tables(void *dummy) if (arm64_bus_method != ARM64_BUS_ACPI) return; - if (!get_kernel_reg(ID_AA64MMFR0_EL1, &mmfr0)) { - /* chosen arbitrarily */ - mmfr0 = ID_AA64MMFR0_PARange_1T; - } - + get_kernel_reg(ID_AA64MMFR0_EL1, &mmfr0); switch (ID_AA64MMFR0_PARange_VAL(mmfr0)) { case ID_AA64MMFR0_PARange_4G: parange = (vm_paddr_t)4 << 30 /* GiB */; diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index b1e22c900f3f..5e6a39381e84 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -178,8 +178,7 @@ pan_check(const struct cpu_feat *feat __unused, u_int midr __unused) { uint64_t id_aa64mfr1; - if (!get_kernel_reg(ID_AA64MMFR1_EL1, &id_aa64mfr1)) - return (FEAT_ALWAYS_DISABLE); + get_kernel_reg(ID_AA64MMFR1_EL1, &id_aa64mfr1); if (ID_AA64MMFR1_PAN_VAL(id_aa64mfr1) == ID_AA64MMFR1_PAN_NONE) return (FEAT_ALWAYS_DISABLE); @@ -224,8 +223,7 @@ mops_check(const struct cpu_feat *feat __unused, u_int midr __unused) { uint64_t id_aa64isar2; - if (!get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2)) - return (FEAT_ALWAYS_DISABLE); + get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2); if (ID_AA64ISAR2_MOPS_VAL(id_aa64isar2) == ID_AA64ISAR2_MOPS_NONE) return (FEAT_ALWAYS_DISABLE); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index dbf5c820d20b..680209efd881 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -9161,16 +9161,15 @@ pmap_init_mp(void *dummy __unused) { uint64_t reg; - if (get_kernel_reg(ID_AA64PFR1_EL1, ®)) { - if (ID_AA64PFR1_BT_VAL(reg) != ID_AA64PFR1_BT_NONE) { - if (bootverbose) - printf("Enabling BTI\n"); - pmap_bti_support = true; + get_kernel_reg(ID_AA64PFR1_EL1, ®); + if (ID_AA64PFR1_BT_VAL(reg) != ID_AA64PFR1_BT_NONE) { + if (bootverbose) + printf("Enabling BTI\n"); + pmap_bti_support = true; - pmap_bti_ranges_zone = uma_zcreate("BTI ranges", - sizeof(struct rs_el), NULL, NULL, NULL, NULL, - UMA_ALIGN_PTR, 0); - } + pmap_bti_ranges_zone = uma_zcreate("BTI ranges", + sizeof(struct rs_el), NULL, NULL, NULL, NULL, + UMA_ALIGN_PTR, 0); } } SYSINIT(pmap_init_mp, SI_SUB_CPU, SI_ORDER_ANY, pmap_init_mp, NULL); @@ -9185,9 +9184,7 @@ pmap_init_cnp(void *dummy __unused) uint64_t reg; u_int cpuid; - if (!get_kernel_reg(ID_AA64MMFR2_EL1, ®)) - return; - + get_kernel_reg(ID_AA64MMFR2_EL1, ®); if (ID_AA64MMFR2_CnP_VAL(reg) != ID_AA64MMFR2_CnP_NONE) { if (bootverbose) printf("Enabling CnP\n"); diff --git a/sys/arm64/arm64/ptrauth.c b/sys/arm64/arm64/ptrauth.c index ab40b72887e9..29f73db14e74 100644 --- a/sys/arm64/arm64/ptrauth.c +++ b/sys/arm64/arm64/ptrauth.c @@ -113,18 +113,15 @@ ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused) * The QARMA5 or implementation defined algorithms are reported in * ID_AA64ISAR1_EL1. */ - if (get_kernel_reg(ID_AA64ISAR1_EL1, &isar)) { - if (ID_AA64ISAR1_APA_VAL(isar) > 0 || - ID_AA64ISAR1_API_VAL(isar) > 0) { - return (FEAT_DEFAULT_ENABLE); - } + get_kernel_reg(ID_AA64ISAR1_EL1, &isar); + if (ID_AA64ISAR1_APA_VAL(isar) > 0 || ID_AA64ISAR1_API_VAL(isar) > 0) { + return (FEAT_DEFAULT_ENABLE); } /* The QARMA3 algorithm is reported in ID_AA64ISAR2_EL1. */ - if (get_kernel_reg(ID_AA64ISAR2_EL1, &isar)) { - if (ID_AA64ISAR2_APA3_VAL(isar) > 0) { - return (FEAT_DEFAULT_ENABLE); - } + get_kernel_reg(ID_AA64ISAR2_EL1, &isar); + if (ID_AA64ISAR2_APA3_VAL(isar) > 0) { + return (FEAT_DEFAULT_ENABLE); } return (FEAT_ALWAYS_DISABLE); diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index 64f13458e2d9..d4c0eacf690c 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -895,9 +895,7 @@ sve_init(const void *dummy __unused) uint64_t reg; int i; - if (!get_kernel_reg(ID_AA64PFR0_EL1, ®)) - return; - + get_kernel_reg(ID_AA64PFR0_EL1, ®); if (ID_AA64PFR0_SVE_VAL(reg) == ID_AA64PFR0_SVE_NONE) return; diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 031400f3f1d0..4231746e7eb2 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -154,9 +154,8 @@ vmm_regs_init(struct vmm_regs *regs, const struct vmm_regs *masks) { #define _FETCH_KERN_REG(reg, field) do { \ regs->field = vmm_arch_regs_masks.field; \ - if (!get_kernel_reg_iss_masked(reg ## _ISS, ®s->field, \ - masks->field)) \ - regs->field = 0; \ + get_kernel_reg_iss_masked(reg ## _ISS, ®s->field, \ + masks->field); \ } while (0) _FETCH_KERN_REG(ID_AA64AFR0_EL1, id_aa64afr0); _FETCH_KERN_REG(ID_AA64AFR1_EL1, id_aa64afr1); diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index 6643d32684d8..712783338214 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -251,10 +251,7 @@ vmmops_modinit(int ipinum) return (ENODEV); } - if (!get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1)) { - printf("vmm: Unable to read ID_AA64MMFR0_EL1\n"); - return (ENXIO); - } + get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1); pa_range_field = ID_AA64MMFR0_PARange_VAL(id_aa64mmfr0_el1); /* * Use 3 levels to give us up to 39 bits with 4k pages, or @@ -522,27 +519,25 @@ vmmops_init(struct vm *vm, pmap_t pmap) hyp->vm = vm; hyp->vgic_attached = false; - if (get_kernel_reg(ID_AA64MMFR0_EL1, &idreg)) { - if (ID_AA64MMFR0_ECV_VAL(idreg) >= ID_AA64MMFR0_ECV_POFF) - hyp->feats |= HYP_FEAT_ECV_POFF; + get_kernel_reg(ID_AA64MMFR0_EL1, &idreg); + if (ID_AA64MMFR0_ECV_VAL(idreg) >= ID_AA64MMFR0_ECV_POFF) + hyp->feats |= HYP_FEAT_ECV_POFF; - switch (ID_AA64MMFR0_FGT_VAL(idreg)) { - case ID_AA64MMFR0_FGT_NONE: - break; - default: - case ID_AA64MMFR0_FGT_8_9: - hyp->feats |= HYP_FEAT_FGT2; - /* FALLTHROUGH */ - case ID_AA64MMFR0_FGT_8_6: - hyp->feats |= HYP_FEAT_FGT; - break; - } + switch (ID_AA64MMFR0_FGT_VAL(idreg)) { + case ID_AA64MMFR0_FGT_NONE: + break; + default: + case ID_AA64MMFR0_FGT_8_9: + hyp->feats |= HYP_FEAT_FGT2; + /* FALLTHROUGH */ + case ID_AA64MMFR0_FGT_8_6: + hyp->feats |= HYP_FEAT_FGT; + break; } - if (get_kernel_reg(ID_AA64MMFR1_EL1, &idreg)) { - if (ID_AA64MMFR1_HCX_VAL(idreg) >= ID_AA64MMFR1_HCX_IMPL) - hyp->feats |= HYP_FEAT_HCX; - } + get_kernel_reg(ID_AA64MMFR1_EL1, &idreg); + if (ID_AA64MMFR1_HCX_VAL(idreg) >= ID_AA64MMFR1_HCX_IMPL) + hyp->feats |= HYP_FEAT_HCX; vtimer_vminit(hyp); vgic_vminit(hyp); diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 310e43065716..794b285c0b3c 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -558,10 +558,9 @@ pmc_arm64_initialize(void) snprintf(pmc_cpuid, sizeof(pmc_cpuid), "0x%016lx", midr); /* Check if we have 64-bit counters */ - if (get_kernel_reg(ID_AA64DFR0_EL1, &dfr)) { - if (ID_AA64DFR0_PMUVer_VAL(dfr) >= ID_AA64DFR0_PMUVer_3_5) - arm64_64bit_events = true; - } + get_kernel_reg(ID_AA64DFR0_EL1, &dfr); + if (ID_AA64DFR0_PMUVer_VAL(dfr) >= ID_AA64DFR0_PMUVer_3_5) + arm64_64bit_events = true; /* * Allocate space for pointers to PMC HW descriptors and for diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c index 9573c09aa77a..7aa6f4b0ded1 100644 --- a/sys/dev/random/armv8rng.c +++ b/sys/dev/random/armv8rng.c @@ -98,8 +98,8 @@ rndr_modevent(module_t mod, int type, void *unused) switch (type) { case MOD_LOAD: has_rndr = false; - if (get_kernel_reg(ID_AA64ISAR0_EL1, ®) && - ID_AA64ISAR0_RNDR_VAL(reg) != ID_AA64ISAR0_RNDR_NONE) { + get_kernel_reg(ID_AA64ISAR0_EL1, ®); + if (ID_AA64ISAR0_RNDR_VAL(reg) != ID_AA64ISAR0_RNDR_NONE) { has_rndr = true; random_source_register(&random_armv8_rndr); printf("random: fast provider: \"%s\"\n", diff --git a/sys/libkern/gsb_crc32.c b/sys/libkern/gsb_crc32.c index 8cfee97d8d55..ab8c13d3023c 100644 --- a/sys/libkern/gsb_crc32.c +++ b/sys/libkern/gsb_crc32.c @@ -764,10 +764,9 @@ DEFINE_IFUNC(, uint32_t, calculate_crc32c, { uint64_t reg; - if (get_kernel_reg(ID_AA64ISAR0_EL1, ®)) { - if (ID_AA64ISAR0_CRC32_VAL(reg) >= ID_AA64ISAR0_CRC32_BASE) - return (armv8_crc32c); - } + get_kernel_reg(ID_AA64ISAR0_EL1, ®); + if (ID_AA64ISAR0_CRC32_VAL(reg) >= ID_AA64ISAR0_CRC32_BASE) + return (armv8_crc32c); return (table_crc32c); } From nobody Wed Apr 8 14:01:31 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPqv30PGz6YBLL for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqv1Ghbz3fvZ for ; Wed, 08 Apr 2026 14:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4hTElqGbRl/6RbNWv4Hgt0iXHgxHqmHaX7pO1uFmNn4=; b=uT1tUbqv/jWmAfJzQdiApsTbFP/qLyDmf2Jy9QTWDXaydYJtIWzXGblun0Q6wnaYY8tDrZ q2XIML30L/SJi7JFam6oBMc6B8Q3D9onV+CWMfwP7PG5VwdQnsg9ghEJ78WtKv7SwfLCNh 1+4XRbpPGYD2SUOMu8vxnynpRfmkRrpm7093M8bET6t6JyuGsTm4WwkzV7YORR4UQxYPbU H27s/O7P7nQ3jwcJ9HtTp23AfYiKdMMIzD5HgCUSDNlla/VgC6NqPQO140NfHPuQsFr8aO sDBfkmjtq2A0Wnic/TuQQFJI8/vmdN6yv671e3UuMs3RKAw0CVokK/Gs4GUKiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656891; a=rsa-sha256; cv=none; b=jGZEdoErvZCcG4OY+tcN/IjaHnrvdNANIAPzA115LXiFaMoBG00efwevqapgVBRu8DWfdl Si/4rShoXXPNA2XsCx5SO+xSkNrYnm8UJtCWISfYeCASq3VPNdg79vP6TvQ1I6pdjuba4D aZBMUuKrfLODZinB3KcwA+eL/5bI9LTIDGOjQ4VwealhcOiJmeUDycvBFy058PxH4VjfoD MbaDfEg1uhj42H2czXyVHyPKgYF7L2ggddJSBJDJvmEbimPhajcg4Pc794MlPWC42lHYQu tmvymkTD3IGBf37UgoIKciWgZcJTvZEoGct2djoe6uAA5eoqFWI30X5zXMPstA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4hTElqGbRl/6RbNWv4Hgt0iXHgxHqmHaX7pO1uFmNn4=; b=HS4LlgS6GgnIatzb0kOKQh8BDVQVeSv6b5H6IPuoyRmDa5P6Bgb8CXBEDXbUpp7smt3UqQ NTt4uJ7dsDdyZe8kedEZmiQ6bvGPv3xf/BSLa4iv4Z1NSxjpcgi96ILHub2IwZzHfi6pYB 94jSMQQsYAKSlsTSNjbSS3tnDv01wWv7a+KcS7l0jTWubvEiBLBNH7Cr7zdSdffblkmG6X EbtNn+uGEA8hi4h7hOATRD/YiGo+z2jXbgXib56j+ZnaGm0glcqiAspQR00jqlpipD5IE1 dEwcxjQIQqwN+w7pxiZHVpDsBFwpcNEEcsCcDry8cL4Ym5LmB1MSOApH1+hItg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqv0ndzzDQ8 for ; Wed, 08 Apr 2026 14:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39de6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: edc0dd0445b7 - stable/15 - arm64: Enable MOPS usage in the kernel List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: edc0dd0445b762993052ef9d7ff16c845fb03df1 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:31 +0000 Message-Id: <69d65fbb.39de6.28affda@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=edc0dd0445b762993052ef9d7ff16c845fb03df1 commit edc0dd0445b762993052ef9d7ff16c845fb03df1 Author: Sarah Walker AuthorDate: 2026-02-09 20:39:53 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 arm64: Enable MOPS usage in the kernel Support handling kernel-side MOE exceptions. Reported by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54943 (cherry picked from commit 18af5a180b29f425b8427263be5517d3573ca220) --- sys/arm64/arm64/trap.c | 123 +++++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 3de56187657c..b3c68fa4826f 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -480,6 +480,66 @@ fpe_trap(struct thread *td, void *addr, uint32_t exception) } #endif +static void +handle_moe(struct thread *td, struct trapframe *frame, uint64_t esr) +{ + uint64_t src; + uint64_t dest; + uint64_t size; + int src_reg; + int dest_reg; + int size_reg; + int format_option; + + format_option = esr & ISS_MOE_FORMAT_OPTION_MASK; + dest_reg = (esr & ISS_MOE_DESTREG_MASK) >> ISS_MOE_DESTREG_SHIFT; + size_reg = (esr & ISS_MOE_SIZEREG_MASK) >> ISS_MOE_SIZEREG_SHIFT; + dest = frame->tf_x[dest_reg]; + size = frame->tf_x[size_reg]; + + /* + * Put the registers back in the original format suitable for a + * prologue instruction, using the generic return routine from the + * Arm ARM (DDI 0487I.a) rules CNTMJ and MWFQH. + */ + if (esr & ISS_MOE_MEMINST) { + /* SET* instruction */ + if (format_option == ISS_MOE_FORMAT_OPTION_A || + format_option == ISS_MOE_FORMAT_OPTION_A2) { + /* Format is from Option A; forward set */ + frame->tf_x[dest_reg] = dest + size; + frame->tf_x[size_reg] = -size; + } + } else { + /* CPY* instruction */ + src_reg = (esr & ISS_MOE_SRCREG_MASK) >> ISS_MOE_SRCREG_SHIFT; + src = frame->tf_x[src_reg]; + + if (format_option == ISS_MOE_FORMAT_OPTION_B || + format_option == ISS_MOE_FORMAT_OPTION_B2) { + /* Format is from Option B */ + if (frame->tf_spsr & PSR_N) { + /* Backward copy */ + frame->tf_x[dest_reg] = dest - size; + frame->tf_x[src_reg] = src + size; + } + } else { + /* Format is from Option A */ + if (frame->tf_x[size_reg] & (1UL << 63)) { + /* Forward copy */ + frame->tf_x[dest_reg] = dest + size; + frame->tf_x[src_reg] = src + size; + frame->tf_x[size_reg] = -size; + } + } + } + + if (esr & ISS_MOE_FROM_EPILOGUE) + frame->tf_elr -= 8; + else + frame->tf_elr -= 4; +} + /* * See the comment above data_abort(). */ @@ -589,6 +649,9 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) print_gp_register("far", far); panic("Branch Target exception"); break; + case EXCP_MOE: + handle_moe(td, frame, esr); + break; default: print_registers(frame); print_gp_register("far", far); @@ -597,66 +660,6 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) } } -static void -handle_moe(struct thread *td, struct trapframe *frame, uint64_t esr) -{ - uint64_t src; - uint64_t dest; - uint64_t size; - int src_reg; - int dest_reg; - int size_reg; - int format_option; - - format_option = esr & ISS_MOE_FORMAT_OPTION_MASK; - dest_reg = (esr & ISS_MOE_DESTREG_MASK) >> ISS_MOE_DESTREG_SHIFT; - size_reg = (esr & ISS_MOE_SIZEREG_MASK) >> ISS_MOE_SIZEREG_SHIFT; - dest = frame->tf_x[dest_reg]; - size = frame->tf_x[size_reg]; - - /* - * Put the registers back in the original format suitable for a - * prologue instruction, using the generic return routine from the - * Arm ARM (DDI 0487I.a) rules CNTMJ and MWFQH. - */ - if (esr & ISS_MOE_MEMINST) { - /* SET* instruction */ - if (format_option == ISS_MOE_FORMAT_OPTION_A || - format_option == ISS_MOE_FORMAT_OPTION_A2) { - /* Format is from Option A; forward set */ - frame->tf_x[dest_reg] = dest + size; - frame->tf_x[size_reg] = -size; - } - } else { - /* CPY* instruction */ - src_reg = (esr & ISS_MOE_SRCREG_MASK) >> ISS_MOE_SRCREG_SHIFT; - src = frame->tf_x[src_reg]; - - if (format_option == ISS_MOE_FORMAT_OPTION_B || - format_option == ISS_MOE_FORMAT_OPTION_B2) { - /* Format is from Option B */ - if (frame->tf_spsr & PSR_N) { - /* Backward copy */ - frame->tf_x[dest_reg] = dest - size; - frame->tf_x[src_reg] = src + size; - } - } else { - /* Format is from Option A */ - if (frame->tf_x[size_reg] & (1UL << 63)) { - /* Forward copy */ - frame->tf_x[dest_reg] = dest + size; - frame->tf_x[src_reg] = src + size; - frame->tf_x[size_reg] = -size; - } - } - } - - if (esr & ISS_MOE_FROM_EPILOGUE) - frame->tf_elr -= 8; - else - frame->tf_elr -= 4; -} - void do_el0_sync(struct thread *td, struct trapframe *frame) { From nobody Wed Apr 8 14:01:32 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPqx0QJnz6YBLP for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqw3HMvz3gKD for ; Wed, 08 Apr 2026 14:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T7QLhIU4A4SHIu8pix6VAevN9g97gypUIAItpghTIDA=; b=rnG/0IO5WFK5Wq+hycCIyxR5MwPGa8fqVp1HO/+ps2U3SHAqw7KasuYkMJistBInDVsdmO eV4NGTCQ/o4ALYbDQbsFky689HujY1/I2E/s4gbEkkuMZOx1bB5Yud40icmJECtnphf3cn i5V6b5sDxK2qNtv+dkinedFphd49b11xHwROTEKYfkGfcBdAEsqU3zNhrVQmrgmgbcJRNI ADrTRg7UycHEO7+qIOWXB5fgpM/nR9BUP5Rl2eDNjA+8vx5JXGddbK6h+7OPhrPuuP6dsj FoVRhhv51IFrDnQqQCJ3USnHqHSuVfbiUwjBa+3cY81BRfb1QCvdu+Wq+CWO5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656892; a=rsa-sha256; cv=none; b=uy4KzCmgHUm+c0tYX0XpAFIJq/pz8fghxDRc+lnpDmJHXcrOOdbR1Im+RSfWH7ycxVSdEY oaQ1LHb6hNeVoIrUYItftNE+Y1SOwzTRxo5kGFJuE5N8MBisqCiDJl8HUADXdgvW5eAQaq +W0PsmIpjXbHE8Y3jyXilEHgWdVyYzXFcmIa0lZ50cwDLidQ4+/Hk0aX/9U9yaS/m09YQj 47kfhjfoWL3PXJtdUugwTQAiQchJcaTpoxtjCIvbEPmj4xYeWVnvYa7Yif6XC+ZDinz8mo 4BtlQJ4ZQL6u8KTcVepw8iGM8tFTfttU4207Efn6Owv/PXxIiabSQnNnsBl/Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T7QLhIU4A4SHIu8pix6VAevN9g97gypUIAItpghTIDA=; b=b7QuYTPFIuXKl945jZ7RKEfxgyxWY8Ss956GeeNPURvZAAQ8YnuzocFbNoWdXIgLa6ERii rXNw3tMFrbt6JK76WiZkIEZLPzNWXIeWa9YCjZsPrB3fL3IUEo+1Obmg/W81srBPdLfeHt tJq8F+9fbST4jsfut6U/gwIpwth5ZCpQLhe7tg6vpWVXQyGHYxQX+p8WMiNyxpYRcZPEry PRSfKlN57eQ7paSShVC/wCtNy4uGfzhVG+xiAXA2dHq0GUbPrPUtzQWBd0bcU4wcpl2C9z GyPYGGYyz1BwnG3jE90t1EaIHs5FpeAgxcR3ZfUxpIDcnscXQnJ2B/ncoLX3MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqw1Z9hzTMv for ; Wed, 08 Apr 2026 14:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3acd0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 44d6e17c86cf - stable/15 - arm64: Add MOPS implementations of memset(), memcpy() and memmove() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 44d6e17c86cf0e538cd6d066b8da15b4b4b11597 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:32 +0000 Message-Id: <69d65fbc.3acd0.d711b52@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=44d6e17c86cf0e538cd6d066b8da15b4b4b11597 commit 44d6e17c86cf0e538cd6d066b8da15b4b4b11597 Author: Sarah Walker AuthorDate: 2026-01-28 16:22:50 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 arm64: Add MOPS implementations of memset(), memcpy() and memmove() Enable the use of MOPS implementations of memset, memcpy and memmove within the kernel. Fix pre-ifunc resolution uses of these functions. Reported by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55051 (cherry picked from commit 2ccbf06c0285ca1c06681e7212da8e7d1e87fe19) --- sys/arm64/arm64/identcpu.c | 5 +++-- sys/arm64/arm64/machdep.c | 38 ++++++++++++++++++++++++++++++++++++-- sys/arm64/arm64/machdep_boot.c | 2 +- sys/arm64/arm64/memcpy.S | 24 ++++++++++++++++++++---- sys/arm64/arm64/memset.S | 12 ++++++++++-- sys/arm64/arm64/pmap.c | 10 +++++----- sys/arm64/include/cpu.h | 7 ++++++- 7 files changed, 81 insertions(+), 17 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index a1e7a43977f0..f4e1aa8a4e85 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2675,14 +2675,15 @@ update_special_regs(u_int cpu) if (cpu == 0) { /* Create a user visible cpu description with safe values */ - memset(&user_cpu_desc, 0, sizeof(user_cpu_desc)); + memset_early(&user_cpu_desc, 0, sizeof(user_cpu_desc)); /* Safe values for these registers */ user_cpu_desc.id_aa64pfr0 = ID_AA64PFR0_AdvSIMD_NONE | ID_AA64PFR0_FP_NONE | ID_AA64PFR0_EL1_64 | ID_AA64PFR0_EL0_64; user_cpu_desc.id_aa64dfr0 = ID_AA64DFR0_DebugVer_8; /* Create the Linux user visible cpu description */ - memcpy(&l_user_cpu_desc, &user_cpu_desc, sizeof(user_cpu_desc)); + memcpy_early(&l_user_cpu_desc, &user_cpu_desc, + sizeof(user_cpu_desc)); } desc = get_cpu_desc(cpu); diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 5e6a39381e84..ffe9acb0cfa4 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -80,6 +80,7 @@ #include #include #include +#include #include #include #include @@ -807,6 +808,9 @@ initarm(struct arm64_bootparams *abp) update_special_regs(0); + sched_instance_select(); + link_elf_ireloc(); + /* Set the pcpu data, this is needed by pmap_bootstrap */ pcpup = &pcpu0; pcpu_init(pcpup, 0, sizeof(struct pcpu)); @@ -823,8 +827,6 @@ initarm(struct arm64_bootparams *abp) PCPU_SET(curthread, &thread0); PCPU_SET(midr, get_midr()); - sched_instance_select(); - link_elf_ireloc(); #ifdef FDT try_load_dtb(); #endif @@ -1076,3 +1078,35 @@ DB_SHOW_COMMAND(vtop, db_show_vtop) db_printf("show vtop \n"); } #endif + +#undef memset +#undef memmove +#undef memcpy + +void *memset_std(void *buf, int c, size_t len); +void *memset_mops(void *buf, int c, size_t len); +void *memmove_std(void * _Nonnull dst, const void * _Nonnull src, + size_t len); +void *memmove_mops(void * _Nonnull dst, const void * _Nonnull src, + size_t len); +void *memcpy_std(void * _Nonnull dst, const void * _Nonnull src, + size_t len); +void *memcpy_mops(void * _Nonnull dst, const void * _Nonnull src, + size_t len); + +DEFINE_IFUNC(, void *, memset, (void *, int, size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? memset_mops : memset_std); +} + +DEFINE_IFUNC(, void *, memmove, (void * _Nonnull, const void * _Nonnull, + size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? memmove_mops : memmove_std); +} + +DEFINE_IFUNC(, void *, memcpy, (void * _Nonnull, const void * _Nonnull, + size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? memcpy_mops : memcpy_std); +} diff --git a/sys/arm64/arm64/machdep_boot.c b/sys/arm64/arm64/machdep_boot.c index 1c5e8189e436..0ccfd1b67a39 100644 --- a/sys/arm64/arm64/machdep_boot.c +++ b/sys/arm64/arm64/machdep_boot.c @@ -115,7 +115,7 @@ fake_preload_metadata(void *dtb_ptr, size_t dtb_size) PRELOAD_PUSH_VALUE(uint32_t, MODINFO_METADATA | MODINFOMD_DTBP); PRELOAD_PUSH_VALUE(uint32_t, sizeof(uint64_t)); PRELOAD_PUSH_VALUE(uint64_t, (uint64_t)lastaddr); - memmove((void *)lastaddr, dtb_ptr, dtb_size); + memmove_early((void *)lastaddr, dtb_ptr, dtb_size); lastaddr += dtb_size; lastaddr = roundup(lastaddr, sizeof(int)); } diff --git a/sys/arm64/arm64/memcpy.S b/sys/arm64/arm64/memcpy.S index 01daa8e1c228..3c408d2836aa 100644 --- a/sys/arm64/arm64/memcpy.S +++ b/sys/arm64/arm64/memcpy.S @@ -57,8 +57,8 @@ The loop tail is handled by always copying 64 bytes from the end. */ -EENTRY(memmove) -ENTRY(memcpy) +EENTRY(memmove_std) +ENTRY(memcpy_std) add srcend, src, count add dstend, dstin, count cmp count, 128 @@ -239,7 +239,23 @@ L(copy64_from_start): stp B_l, B_h, [dstin, 16] stp C_l, C_h, [dstin] ret -END(memcpy) -EEND(memmove) +END(memcpy_std) +EEND(memmove_std) + +ENTRY(memcpy_mops) + mov x3, x0 + .inst 0x19010443 /* cpyfp [x3]!, [x1]!, x2! */ + .inst 0x19410443 /* cpyfm [x3]!, [x1]!, x2! */ + .inst 0x19810443 /* cpyfe [x3]!, [x1]!, x2! */ + ret +END(memcpy_mops) + +ENTRY(memmove_mops) + mov x3, x0 + .inst 0x1d010443 /* cpyp [x3]!, [x1]!, x2! */ + .inst 0x1d410443 /* cpym [x3]!, [x1]!, x2! */ + .inst 0x1d810443 /* cpye [x3]!, [x1]!, x2! */ + ret +END(memmove_mops) GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/arm64/arm64/memset.S b/sys/arm64/arm64/memset.S index f52bfd62cc54..f226e8de1e95 100644 --- a/sys/arm64/arm64/memset.S +++ b/sys/arm64/arm64/memset.S @@ -51,7 +51,7 @@ #define dst x8 #define tmp3w w9 -ENTRY(memset) +ENTRY(memset_std) mov dst, dstin /* Preserve return value. */ ands A_lw, val, #255 @@ -196,6 +196,14 @@ ENTRY(memset) ands count, count, zva_bits_x b.ne .Ltail_maybe_long ret -END(memset) +END(memset_std) + +ENTRY(memset_mops) + mov x3, x0 + .inst 0x19c10443 /* setp [x3]!, x2!, x1 */ + .inst 0x19c14443 /* setm [x3]!, x2!, x1 */ + .inst 0x19c18443 /* sete [x3]!, x2!, x1 */ + ret +END(memset_mops) GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 680209efd881..e865569ac377 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1015,7 +1015,7 @@ pmap_bootstrap_l0_table(struct pmap_bootstrap_state *state) /* Create a new L0 table entry */ state->l1 = (pt_entry_t *)state->freemempos; - memset(state->l1, 0, PAGE_SIZE); + memset_early(state->l1, 0, PAGE_SIZE); state->freemempos += PAGE_SIZE; l1_pa = pmap_early_vtophys((vm_offset_t)state->l1); @@ -1063,7 +1063,7 @@ pmap_bootstrap_l1_table(struct pmap_bootstrap_state *state) /* Create a new L1 table entry */ state->l2 = (pt_entry_t *)state->freemempos; - memset(state->l2, 0, PAGE_SIZE); + memset_early(state->l2, 0, PAGE_SIZE); state->freemempos += PAGE_SIZE; l2_pa = pmap_early_vtophys((vm_offset_t)state->l2); @@ -1107,7 +1107,7 @@ pmap_bootstrap_l2_table(struct pmap_bootstrap_state *state) /* Create a new L2 table entry */ state->l3 = (pt_entry_t *)state->freemempos; - memset(state->l3, 0, PAGE_SIZE); + memset_early(state->l3, 0, PAGE_SIZE); state->freemempos += PAGE_SIZE; l3_pa = pmap_early_vtophys((vm_offset_t)state->l3); @@ -1406,7 +1406,7 @@ pmap_bootstrap(void) #define alloc_pages(var, np) \ (var) = bs_state.freemempos; \ bs_state.freemempos += (np * PAGE_SIZE); \ - memset((char *)(var), 0, ((np) * PAGE_SIZE)); + memset_early((char *)(var), 0, ((np) * PAGE_SIZE)); /* Allocate dynamic per-cpu area. */ alloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE); @@ -1444,7 +1444,7 @@ pmap_bootstrap_allocate_san_l2(vm_paddr_t start_pa, vm_paddr_t end_pa, continue; } - bzero((void *)PHYS_TO_DMAP(pa), L2_SIZE); + bzero_early((void *)PHYS_TO_DMAP(pa), L2_SIZE); physmem_exclude_region(pa, L2_SIZE, EXFLAG_NOALLOC); pmap_store(l2, PHYS_TO_PTE(pa) | PMAP_SAN_PTE_BITS | L2_BLOCK); } diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index b15210633d37..9e452e001bbb 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -328,7 +328,12 @@ ADDRESS_TRANSLATE_FUNC(s1e1r) ADDRESS_TRANSLATE_FUNC(s1e1w) #endif /* !__ASSEMBLER__ */ -#endif + +#define MEMSET_EARLY_FUNC memset_std +#define MEMCPY_EARLY_FUNC memcpy_std +#define MEMMOVE_EARLY_FUNC memmove_std + +#endif /* _KERNEL */ #endif /* !_MACHINE_CPU_H_ */ From nobody Wed Apr 8 14:01:33 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPqy04VRz6Y9wy for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqx2tsLz3fxk for ; Wed, 08 Apr 2026 14:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TEX8CU82LAFXAyF3GLLoYPdjuobU6Y0emRtBTcQBaBo=; b=ZqdV7bwZiLlr/7dDUEDWj4XFVzo5Zr8Wr0R4hJ3MNTEelgpbs0StdafUiwB4bLHxZsvT0f nDnLVTd9H8jd4r6Wy8BA0vfFFtsyXggDFRLk0+JPp007P3I0h6+8/Gj0jUi+zUfZBQ8JEU 4RXrk0IMOrCkIKTZ+C3nWIj1jcouE50//OZex9b1qMizbdaFE5qA+NBrWhR/r38D3IBt/W +iRK9NbAIRUAJ3NDx/e81TPoSJNGq4ibFZ5pCE/JcxjgHPE8TY9uPOl13583yLJhK5/Bb+ Bwh+m4qcI05sYYEMnK2fhOLHnVZNkWuuNETf/vI/0mPZR9Ykf79PAr0SrpR5Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656893; a=rsa-sha256; cv=none; b=Ih4L6QxLAiWf7jDa/TemLlhoBOhil7m/icG1Rh8U3pDRQ9ogDv7jK/Y93XxEXp+PoAjsr4 WYVrlIQRpC48wGWFiWhsi5+n/n9Cgj1iGJY1bWsUoSnORyVOsmzcvWkuhEGbRwnQQ/+qw8 QREeuLCY2G3/3/je2tFRZdVZAsbYBXeFJ1Qi+Cfidx8176NeuFdNhjV2FkSyRZCegExe1+ jLRI4fd6c5NzAUAdp+mcrMQ9KqIzli4fY1TENJ037dnud//nlhK/6Ab5J1xN0444HOb/cp v0FDALpYwk/5BUkngKK+utpgCCFoGeD6foGTAcknQFeYVpNYeAXk6OR2ZubZkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TEX8CU82LAFXAyF3GLLoYPdjuobU6Y0emRtBTcQBaBo=; b=czjCe314eAijhb86rNHYIZpNiWQWGEnB1TGZweZvZdyCvWpE+KgzieomgwrBipUT7F+xhd k8OW5buzjWUzK4Bl2sY4kKLlGfFumriYDN7qlikFFIrEc3SBON9cQG88HByEyQlLz4heJ1 YYPKFV26lMye5GyrQaJRKyG3CmdgXSrgMTcsG9Pkv38kuXayJxHWI0uyaBVxScSlHJCADK Qus7vcnvoTWpuFuZvdjTNM6KEbYNqzO+JWSetYOQzNDP91pWgRdJrM6DjnwWno2MvJXERM yMHQrA/76vobJ84ErygriLkhUcklaTAUoyAfPMGDdT+Lw8+m/4MnA4dmWaviBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqx2NtXzDSP for ; Wed, 08 Apr 2026 14:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39eca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: e40964f7123e - stable/15 - arm64: Add MOPS implementation of pagezero() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e40964f7123e92ed13e826e904a7b8161f1f3bd2 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:33 +0000 Message-Id: <69d65fbd.39eca.47fea05d@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e40964f7123e92ed13e826e904a7b8161f1f3bd2 commit e40964f7123e92ed13e826e904a7b8161f1f3bd2 Author: Sarah Walker AuthorDate: 2026-01-29 17:43:45 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 arm64: Add MOPS implementation of pagezero() Reimplement pagezero() as ifunc. As pagezero() is only used in pmap.c, move ifunc to that file. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54946 (cherry picked from commit 7d7295df9b13b98ac395b206667e7586c602862b) --- sys/arm64/arm64/machdep.c | 10 ---------- sys/arm64/arm64/pmap.c | 22 ++++++++++++++++++++++ sys/arm64/arm64/support.S | 12 ++++++++++++ sys/arm64/include/machdep.h | 1 - 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index ffe9acb0cfa4..2addc5af9568 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -155,13 +155,6 @@ uintptr_t socdev_va __read_mostly; vm_paddr_t efi_systbl_phys; static struct efi_map_header *efihdr; -/* pagezero_* implementations are provided in support.S */ -void pagezero_simple(void *); -void pagezero_cache(void *); - -/* pagezero_simple is default pagezero */ -void (*pagezero)(void *p) = pagezero_simple; - int (*apei_nmi)(void); #if defined(PERTHREAD_SSP_WARNING) @@ -720,9 +713,6 @@ cache_setup(void) /* Same as with above calculations */ dczva_line_shift = DCZID_BS_SIZE(dczid_el0); dczva_line_size = sizeof(int) << dczva_line_shift; - - /* Change pagezero function */ - pagezero = pagezero_cache; } } diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index e865569ac377..0cfc8ae80d70 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -147,6 +147,8 @@ #include #include +#include +#include #include #include #include @@ -529,6 +531,7 @@ static void *bti_dup_range(void *ctx, void *data); static void bti_free_range(void *ctx, void *node); static int pmap_bti_copy(pmap_t dst_pmap, pmap_t src_pmap); static void pmap_bti_deassign_all(pmap_t pmap); +static void pagezero(void *); /* * These load the old table data and store the new value. @@ -10207,3 +10210,22 @@ SYSCTL_OID(_vm_pmap, OID_AUTO, kernel_maps, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_SKIP, NULL, 0, sysctl_kmaps, "A", "Dump kernel address layout"); + + +void pagezero_simple(void *); +void pagezero_cache(void *); +void pagezero_mops(void *); + +DEFINE_IFUNC(static, void, pagezero, (void *)) +{ + uint32_t dczid_el0; + + dczid_el0 = READ_SPECIALREG(dczid_el0); + + if (elf_hwcap2 & HWCAP2_MOPS) + return (pagezero_mops); + else if ((dczid_el0 & DCZID_DZP) == 0) + return (pagezero_cache); + else + return (pagezero_simple); +} diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S index bf6fc931e4b0..cee0e3b51aaf 100644 --- a/sys/arm64/arm64/support.S +++ b/sys/arm64/arm64/support.S @@ -397,4 +397,16 @@ ENTRY(pagezero_cache) END(pagezero_cache) +/* + * pagezero, MOPS implementation + */ +ENTRY(pagezero_mops) + mov x1, #PAGE_SIZE + .inst 0x19df0420 /* setp [x0]!, x1!, xzr */ + .inst 0x19df4420 /* setm [x0]!, x1!, xzr */ + .inst 0x19df8420 /* sete [x0]!, x1!, xzr */ + ret + +END(pagezero_mops) + GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/arm64/include/machdep.h b/sys/arm64/include/machdep.h index 4fa80219da42..3606690eb9ba 100644 --- a/sys/arm64/include/machdep.h +++ b/sys/arm64/include/machdep.h @@ -54,7 +54,6 @@ vm_offset_t parse_boot_param(struct arm64_bootparams *abp); void parse_fdt_bootargs(void); #endif int memory_mapping_mode(vm_paddr_t pa); -extern void (*pagezero)(void *); #ifdef SOCDEV_PA /* From nobody Wed Apr 8 14:01:34 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPqy4pxBz6YBLT for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqy3bPgz3gDm for ; Wed, 08 Apr 2026 14:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fj/n67W0FOpWMBFMHTnQB71/s3KYXQ+udPQpz0iFKFA=; b=QufBiV1PVzAN9S/OMMrKpigHiPaGFrTNYs8icLMo0pykPfGR0uHbqrm/QTXCowDwkI34ip y0FVVCrSvBdYfk7JL/HewUPArm+ULD+VrvKfYud3Owcg8uY/GskXM7WPQrct5Te6LZ82uc hnMfNVO+cLl8xc2PKN3mxPuK3IiHhJNCwUEdG2PgyQRCIGzqfOh3Y/YA/5H3wLOtHruWVV USmV4OtfKbZ7Jz+q5CL1GJnWGJdFEpYJFwGt2ozevFred2AXSDtxR3lOJn4dsYlb1+kkDd 5ACC2PebXavziv1GIRslUAiXFtb7em1Meezdkzl/Br4TvlxFsdNbxJNORV1q3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656894; a=rsa-sha256; cv=none; b=JUI0sCTrERfSv3pREKMB/MQYUqUJPSe7UBpe2XAwOmwPAarMVA8ShvAH9g9JhO5d9gGYrN 9XO9EE8AFJityQhlEk/DUx+ocwOmlGCrBZEhyEZ7jh0MxDdw6fZTFpY5aDxuLbf/qf53mG 47LqjloVfF/kNwJ/eOuGISowZGvA8jstcTnJ0Zu15YiuoLpRpdkYoJHPfJkMh+7F/lBhz5 gGe75DrXE28uWhFawwcJMEKeTZAD1nhP2+4oKSDxFEgZ0b8YPGKmkncZwZgcgVcqhdPbuQ X5FsbKzghoRioCegjE8wqFLUVV9v6SKRiRmN/9E1oC3d9z9lzapTVvzHfbPypg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fj/n67W0FOpWMBFMHTnQB71/s3KYXQ+udPQpz0iFKFA=; b=iBVOErokgpwsevMWuUL9ruYLGbv5OlH93u7OSEAMR6/V8igfSRdGbjeTogj3IG+HfKI5To bJ+AvMjlbnsynPAUDqTrNv8FjTeZXCL7rcy5aqnlhmyQaeXL5o7b5A1mhcTvHhtl7rybIe nzmwNMVDw4zNjoPaqSx6gt/Tg7IAy3Iu0ycBHnuOjBr25UfxdCXx/nO0b1NWXJf6/a0Tqw eHMkZZeiWwnMlCNBGKgPrUv+7oWs+W6/QYkhmOTZ11A95xkqnZPaaD2P1nMsZ7cqx2oXfC HdPNY8FpH+lx5enCS+uqj9eSOX4GTqiRtqJR6BoPJbeCQN7C6zGPhuEF5XDYYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqy30LmzDW2 for ; Wed, 08 Apr 2026 14:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b81a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: b608ec429777 - stable/15 - arm64: Add MOPS implementations of copyin/copyout List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b608ec4297778a7f68220ef416d96a44f62acce0 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:34 +0000 Message-Id: <69d65fbe.3b81a.1565fd6c@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b608ec4297778a7f68220ef416d96a44f62acce0 commit b608ec4297778a7f68220ef416d96a44f62acce0 Author: Sarah Walker AuthorDate: 2026-01-29 18:08:49 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 arm64: Add MOPS implementations of copyin/copyout Reimplement copyin() & copyout() as ifuncs. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54947 (cherry picked from commit 1224347817c450596797ae6bcbfcc81927cb1f88) --- sys/arm64/arm64/copyinout.S | 58 +++++++++++++++++++++++++++++++++++---- sys/arm64/arm64/copyinout_ifunc.c | 50 +++++++++++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + 3 files changed, 103 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/copyinout.S b/sys/arm64/arm64/copyinout.S index e41c4b5f6734..8c6fee63f410 100644 --- a/sys/arm64/arm64/copyinout.S +++ b/sys/arm64/arm64/copyinout.S @@ -65,9 +65,9 @@ END(copyio_fault) /* * Copies from a kernel to user address * - * int copyout(const void *kaddr, void *udaddr, size_t len) + * int copyout_std(const void *kaddr, void *udaddr, size_t len) */ -ENTRY(copyout) +ENTRY(copyout_std) cbz x2, 1f check_user_access 1, 2, copyio_fault_nopcb @@ -76,14 +76,37 @@ ENTRY(copyout) 1: mov x0, xzr /* return 0 */ ret -END(copyout) +END(copyout_std) + +/* + * Copies from a kernel to user address + * + * int copyout_mops(const void *kaddr, void *udaddr, size_t len) + */ +ENTRY(copyout_mops) + cbz x2, 1f + check_user_access 1, 2, copyio_fault_nopcb + + adr x6, copyio_fault /* Get the handler address */ + SET_FAULT_HANDLER(x6, x7) /* Set the handler */ + + .inst 0x19001441 /* cpyfpwt [x1]!, [x0]!, x2! */ + .inst 0x19401441 /* cpyfmwt [x1]!, [x0]!, x2! */ + .inst 0x19801441 /* cpyfewt [x1]!, [x0]!, x2! */ + + SET_FAULT_HANDLER(xzr, x7) /* Clear the handler */ + +1: mov x0, xzr /* return 0 */ + ret + +END(copyout_mops) /* * Copies from a user to kernel address * - * int copyin(const void *uaddr, void *kdaddr, size_t len) + * int copyin_std(const void *uaddr, void *kdaddr, size_t len) */ -ENTRY(copyin) +ENTRY(copyin_std) cbz x2, 1f check_user_access 0, 2, copyio_fault_nopcb @@ -92,7 +115,30 @@ ENTRY(copyin) 1: mov x0, xzr /* return 0 */ ret -END(copyin) +END(copyin_std) + +/* + * Copies from a user to kernel address + * + * int copyin_mops(const void *uaddr, void *kdaddr, size_t len) + */ +ENTRY(copyin_mops) + cbz x2, 1f + check_user_access 0, 2, copyio_fault_nopcb + + adr x6, copyio_fault /* Get the handler address */ + SET_FAULT_HANDLER(x6, x7) /* Set the handler */ + + .inst 0x19002441 /* cpyfprt [x1]!, [x0]!, x2! */ + .inst 0x19402441 /* cpyfmrt [x1]!, [x0]!, x2! */ + .inst 0x19802441 /* cpyfert [x1]!, [x0]!, x2! */ + + SET_FAULT_HANDLER(xzr, x7) /* Clear the handler */ + +1: mov x0, xzr /* return 0 */ + ret + +END(copyin_mops) /* * Copies a string from a user to kernel address diff --git a/sys/arm64/arm64/copyinout_ifunc.c b/sys/arm64/arm64/copyinout_ifunc.c new file mode 100644 index 000000000000..33d9f11fc7e6 --- /dev/null +++ b/sys/arm64/arm64/copyinout_ifunc.c @@ -0,0 +1,50 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 ARM Ltd + * + * 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. + * 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 + +int copyout_std(const void *kaddr, void *udaddr, size_t len); +int copyout_mops(const void *kaddr, void *udaddr, size_t len); +int copyin_std(const void *uaddr, void *kdaddr, size_t len); +int copyin_mops(const void *uaddr, void *kdaddr, size_t len); + +DEFINE_IFUNC(, int, copyout, (const void *, void *, size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? copyout_mops : copyout_std); +} + +DEFINE_IFUNC(, int, copyin, (const void *, void *, size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? copyin_mops : copyin_std); +} diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index b45e93cee471..06dc1c42d901 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -32,6 +32,7 @@ arm64/arm64/busdma_bounce.c standard arm64/arm64/busdma_machdep.c standard arm64/arm64/clock.c standard arm64/arm64/copyinout.S standard +arm64/arm64/copyinout_ifunc.c standard arm64/arm64/cpu_errata.c standard arm64/arm64/cpu_feat.c standard arm64/arm64/cpufunc_asm.S standard From nobody Wed Apr 8 14:01:35 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPqz6wwwz6Y9x3 for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqz4H6mz3gL1 for ; Wed, 08 Apr 2026 14:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OPB6bM4m3/htzl6dEJJA8YVyca5mipRhLlHaPLAWsm4=; b=tS6F5wgCqBbWC/YKpjvldtW9de6jSAgnkGH1GKfHxgiYKvX7oZjH9fvEHhWw4webjVWsB/ BaeRltJuE/3j5V49pURN4GvE1xdRbSR6ZSnCfxluj7pSZkaWy2QEUi5Pe4sZZ552Z/uA5j L83LCLQpZ9qCzIUpr14lcNLnsh6At5p4n7/4e6FdltOYJljbc2PC2FRrW3xE/KponVZtfp RSsHGSQyxQbQLpJKzkpoqtGY+ckqtRWaWxntW+gmvlD7k8UCs3k+iJuHUJ4Le5pYAVnCP5 gQHAjlm8s46yhhvia/C3quqGOm7S1UsfxSp3YcgiCQWHHi5kGG4MZDlryhsHiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656895; a=rsa-sha256; cv=none; b=gVlvwDpFOSninmUV7kmClCvBisEOZ28Nj/cFXhfpDQp6+18+q2cVaWPYb6CKS3VMVuB1ov Qmsdtn+Ot8tH4gaK5FavjJu3Q1JGFeoU5GpNGgKpSgk827Tv/O2Trt9sH5ngAoL4seEBLz X8wTjsRyHReu2M+YPuJt48Nsspy5r3psgMRPUjik1+hA5N0BaT2/f09OAXeR1kJRMl5pCV 5hxL3hWEa+PWPBfUKzWCVE4tHDhfA3JMJ6QZ8Tqa0EC2/+DzE2mPiYoT4Gbf8zMcPX40Xi h9/IMooxHGE9J7llj9mhpg5qYSlI+cQBkBsQ5d/KbF57l5yt6VtvFAIVcBTdHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OPB6bM4m3/htzl6dEJJA8YVyca5mipRhLlHaPLAWsm4=; b=M6Bvyyn1kPlpIBRFmaIE3no9Poro5M6MBkFgKn+9gW+VeQUJaBg85au2xaSdh065zVQRcX 3N9K98L6/JAb3hX8SW9uKODM7DDmh19TNZVg1tnmmN31gJmrbWRNoyYN2C3Wdyu9igCEo3 bgmYWfxSiUd8cZSEOD2SRIUTluzQLUKSEgew9aNBjPn0VfbXeAEBdFbxV+5YYfGM8UQL8U pYdRxuiDcA7uPN6sUzKtkZdhzV2OpsMsaWuTPcq9ns8YTDybj4aLTPmuxa/8l0Z8k8CKIX M0lDkdmjJGP81kJcZWLF38m6LbWvjUANUfZrtud4/eR3lpI9scFuRJt8v9uLhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqz3m5HzDW4 for ; Wed, 08 Apr 2026 14:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bc1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 91ce7a19120a - stable/15 - vtgpu: Support virtio gpu on Parallels Desktop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 91ce7a19120a83009348a8bcac6f5af3fd8378f5 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:35 +0000 Message-Id: <69d65fbf.3bc1b.18670afd@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=91ce7a19120a83009348a8bcac6f5af3fd8378f5 commit 91ce7a19120a83009348a8bcac6f5af3fd8378f5 Author: Andrew Turner AuthorDate: 2026-02-10 17:06:31 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 vtgpu: Support virtio gpu on Parallels Desktop The Parallels Desktop Virtio GPU implementation doesn't handle enqueuing the VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING request and memory list together. Work around this by splitting them before sending them to be enqueued. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55147 (cherry picked from commit 1ea0721e1a566fdb552b0a919c22667844a894d9) --- sys/dev/virtio/gpu/virtio_gpu.c | 51 ++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c index 668eb170304a..b95bae9fe286 100644 --- a/sys/dev/virtio/gpu/virtio_gpu.c +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -445,21 +445,33 @@ vtgpu_alloc_virtqueue(struct vtgpu_softc *sc) } static int -vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, - void *resp, size_t resplen) +vtgpu_req_resp2(struct vtgpu_softc *sc, void *req1, size_t req1len, + void *req2, size_t req2len, void *resp, size_t resplen) { struct sglist sg; - struct sglist_seg segs[2]; - int error; + struct sglist_seg segs[3]; + int error, rcount; - sglist_init(&sg, 2, segs); + sglist_init(&sg, 3, segs); - error = sglist_append(&sg, req, reqlen); + rcount = 1; + error = sglist_append(&sg, req1, req1len); if (error != 0) { device_printf(sc->vtgpu_dev, - "Unable to append the request to the sglist: %d\n", error); + "Unable to append the request to the sglist: %d\n", + error); return (error); } + if (req2 != NULL) { + error = sglist_append(&sg, req2, req2len); + if (error != 0) { + device_printf(sc->vtgpu_dev, + "Unable to append the request to the sglist: %d\n", + error); + return (error); + } + rcount++; + } error = sglist_append(&sg, resp, resplen); if (error != 0) { device_printf(sc->vtgpu_dev, @@ -467,7 +479,7 @@ vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, error); return (error); } - error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, 1, 1); + error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, rcount, 1); if (error != 0) { device_printf(sc->vtgpu_dev, "Enqueue failed: %d\n", error); return (error); @@ -479,6 +491,13 @@ vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, return (0); } +static int +vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, + void *resp, size_t resplen) +{ + return (vtgpu_req_resp2(sc, req, reqlen, NULL, 0, resp, resplen)); +} + static int vtgpu_get_display_info(struct vtgpu_softc *sc) { @@ -559,9 +578,15 @@ static int vtgpu_attach_backing(struct vtgpu_softc *sc) { struct { + /* + * Split the backing and mem request arguments as some + * hypervisors, e.g. Parallels Desktop, don't work when + * they are enqueued together. + */ struct { struct virtio_gpu_resource_attach_backing backing; - struct virtio_gpu_mem_entry mem[1]; + char pad; + struct virtio_gpu_mem_entry mem; } req; char pad; struct virtio_gpu_ctrl_hdr resp; @@ -577,11 +602,11 @@ vtgpu_attach_backing(struct vtgpu_softc *sc) s.req.backing.resource_id = htole32(VTGPU_RESOURCE_ID); s.req.backing.nr_entries = htole32(1); - s.req.mem[0].addr = htole64(sc->vtgpu_fb_info.fb_pbase); - s.req.mem[0].length = htole32(sc->vtgpu_fb_info.fb_size); + s.req.mem.addr = htole64(sc->vtgpu_fb_info.fb_pbase); + s.req.mem.length = htole32(sc->vtgpu_fb_info.fb_size); - error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, - sizeof(s.resp)); + error = vtgpu_req_resp2(sc, &s.req.backing, sizeof(s.req.backing), + &s.req.mem, sizeof(s.req.mem), &s.resp, sizeof(s.resp)); if (error != 0) return (error); From nobody Wed Apr 8 14:01:36 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPr13Htgz6YBGJ for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPr04yq5z3gCP for ; Wed, 08 Apr 2026 14:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656896; h=from:from:reply-to:subject:subject: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+X9iGDffmfioKfy9SFGrazyw6ZLeNKIn+4AYP3HA8U=; b=kFoojgFt53OPKvY3AhakPgnb4Qk2m2B5S8zbgYYh95Gc78sG2UOyfw4EF2pUWR1SF/kGSA UrRrgY+8+pc0JM8DyNid7Zq9XOPZTT5qUlRtiPrJ9xWJLOqzB4iBORY55eGvwRBSXTOzh0 MFU3YKaNBGKUEGpyo3CpOJP177E94klQRKYoW2fJLHjtQU4WkmD484ghjH3wjaJlUhgyV+ 2zHBYWwf8Gr838PpCnSi13jRijb/VUuI63Cy58SaszjoFjB/dKcI/hTviFjx6w+QOMIL38 fy3dJv0MnkYmfAduE0G7n/ywGvuQTvBEwKL/4saOYAMyYVGT5SODi8JsdNSWTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656896; a=rsa-sha256; cv=none; b=S/dY8+XviMBEEtt5GWC/ohAeynMEoTYJjN+11IP6XKmhP4xq96g7eL4zL3TtmI+rrzjXjW 5fdn/zuVAz0MSPrUrZCJlo7IxjFUiBBxHGU6b6opMa66Os/Lg1mOjtJZzPdWd6Iod1pbp6 OUaIRSPbsgNa5vG/k3C7bOQgs/OVx+Jo19G0boik8fT6U0xYx9OI8thTCxXPAa8XG5IPE5 5kLILzR5aPNKUM6zCxVfxc8bHdzfGg5+T2VAhslMAoxG0hNChb1NbP9WuSb4k1J7Dk8+XS KjAdjScfEua4/ZhwIvdJWDm/E+ZYhkbZVCHRCID0YV6n5nROiOUPHiuUmbg8hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656896; h=from:from:reply-to:subject:subject: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+X9iGDffmfioKfy9SFGrazyw6ZLeNKIn+4AYP3HA8U=; b=dVL49/K26q+JVmyrrrX5uNenpczfEXuJlJT6lE7J4Gx/CeSMkqDlY/5KMr836LonlF+tk3 C/Q3kaRsbQfpwq8R8ewzUXyLEjxgDgZ32xPmAky8ws5rEGMpodwpEoej6PF/6eB2PG7cm1 dcmfEa7kmH9DcPuhXsAIvuCQFah6tXwH3AfZCzRmZHk0UXN8AEH8M9KyEvAxe73E4wtOC3 cNeFH2LipkyM0RZsjxt2nxS8SzzYufZdBSTY36PGdnNv48jDTquF1ZjcV3k1ZL3njjLK1L xaFym+54idd61+sD82Ebpo8Z6MnEVqYbVXMxQSpdMPNMp5ocvxyMSdjsr8QkiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPr04XFFzTN2 for ; Wed, 08 Apr 2026 14:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bd28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: db2a34bc4528 - stable/15 - nvmecontrol: Remove an incorrect use of PAGE_SIZE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: db2a34bc45288405ab6f41a667a141c32bf232a5 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:36 +0000 Message-Id: <69d65fc0.3bd28.3d331219@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=db2a34bc45288405ab6f41a667a141c32bf232a5 commit db2a34bc45288405ab6f41a667a141c32bf232a5 Author: Andrew Turner AuthorDate: 2026-02-18 14:20:57 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 nvmecontrol: Remove an incorrect use of PAGE_SIZE The mdts value is in terms of the nvme page size, not the host page size. On many architectures these are both 4k, however on arm64 it is possible to build a system with the host page size of 16k. Use NVME_MPS_SHIFT to get the correct nvme page shift. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55334 (cherry picked from commit bfb7c81f93b534f8c10928d80ea56c8177a6f39f) --- sbin/nvmecontrol/identify_ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c index 95ca4b5187d4..13b1d21ce97e 100644 --- a/sbin/nvmecontrol/identify_ext.c +++ b/sbin/nvmecontrol/identify_ext.c @@ -106,7 +106,7 @@ nvme_print_controller(struct nvme_controller_data *cdata) if (cdata->mdts == 0) printf("Unlimited\n"); else - printf("%ld bytes\n", PAGE_SIZE * (1L << cdata->mdts)); + printf("%ld bytes\n", 1L << (cdata->mdts + NVME_MPS_SHIFT)); printf("Sanitize Crypto Erase: %s\n", NVMEV(NVME_CTRLR_DATA_SANICAP_CES, cdata->sanicap) != 0 ? "Supported" : "Not Supported"); From nobody Wed Apr 8 14:01:38 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPr32Tkwz6YBLX for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPr26XQLz3gLf for ; Wed, 08 Apr 2026 14:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AaC9A3Lo6dkT2ILUYuoFG8dXo2R29O8dg2z5Xx48exc=; b=TPHK0En/m+CJrjy7XciiMyKv1Pk7ZK5+DRCTkV7oxE9EjyoyH++/1BEh3cLmkS9NkgI8Rp 7ddlesUo97QZEVmWctzEEHPT9N2hUQMC04KKaSrRCaMfG64AjBmcfpHC3E3kphjAki+OGj AUttemnQxJ1JFICvBMzaJ8uxSaaMA23Z4RfbawJ/AWW6LJCiaGaHRWk5liu0NNqN3n4m9Q 9lM1MehTlvocCrwx1bT6kkiLcSa2a6b8bnUegEHeVH6xyByoYAcCLAvWChUKxD795ymLNN w1MxcFYwlPvh+Kkr/tXMT2Hc74+U4gIROVqNH+L/L5Xko36HejzNnvI6gJdWYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656899; a=rsa-sha256; cv=none; b=LfPW8k/+ayYuESv9vuAn7bXT6W9JsO/Xdal3tlIkQq+U/b5lic6x1XowDfPnV0uGHg4OuD WHcwTuW3Mt2DJ4dpE6tdN4k6mZt7DCVXJ8REsZ/maOtsy8hMEJN75gqgvyZJGt46pA67l4 5o9dHvf6aMvYzdMGmUorziiq0U6utCLLBSwp0y0WDP/pvbUf3hgFk479D7bdXBTI2ci4TQ 7efE0lCUcSKsVE6q3phQGiJiN2EDw97reWJCcIgvYwKEa+FliSUY3UuDdAIywhVsrLS4MT 2VGDR1NooWgn+4NtqHu5uDS/OWN72Um8jmUvJbyWiD4l1xGh3EAn2+89DdcMeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AaC9A3Lo6dkT2ILUYuoFG8dXo2R29O8dg2z5Xx48exc=; b=TcGpIY20INlEjR0YBP7yD/JpYPYG0Rupit3PyfEWI72izI6TRSwPVmuJ84+WTXcGyDZcB8 gA60ARPP1277ZDkcULFCXrpsmlyYcAkmj2NQdE6LBS9x6uBm6QPwpLxY8PPT5VGIXd01+2 AdzrEZNe5ZnofYQSlIiDhqfzvzez7bxvNJD1xOTC333PZ3++lGDF5lGmAGloQ8FdQqtJch +L1SLUAIimdLSywXEzRdULE1Vipm+LsAJkgBn003jgS0/fezpEGU4aYFmwOl6eS5PBvX4t +oEhzhezEXa52+QVu3piLvppCGZM+Ak0Wgsz+/uw9UwQawUXVEiDGkVMxZpx1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPr2646JzDW5 for ; Wed, 08 Apr 2026 14:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 394ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: ffaa67ef59ab - stable/15 - arm64: Add more HWCAP values List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ffaa67ef59ab300bbcd3902875827c1fb665b8b8 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:38 +0000 Message-Id: <69d65fc2.394ea.60026e8c@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ffaa67ef59ab300bbcd3902875827c1fb665b8b8 commit ffaa67ef59ab300bbcd3902875827c1fb665b8b8 Author: Andrew Turner AuthorDate: 2026-02-18 15:28:14 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:54 +0000 arm64: Add more HWCAP values Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55219 (cherry picked from commit 3a960425df759a7bb8f946d23f035c63f3a5de7a) --- sys/arm64/include/elf.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h index 81ee7392f866..a5a90f8c7712 100644 --- a/sys/arm64/include/elf.h +++ b/sys/arm64/include/elf.h @@ -135,6 +135,21 @@ __ElfType(Auxinfo); #define HWCAP_PACA (1 << 30) #define HWCAP_PACG (1UL << 31) #define HWCAP_GCS (1UL << 32) +#define HWCAP_CMPBR (1UL << 33) +#define HWCAP_FPRCVT (1UL << 34) +#define HWCAP_F8MM8 (1UL << 35) +#define HWCAP_F8MM4 (1UL << 36) +#define HWCAP_SVE_F16MM (1UL << 37) +#define HWCAP_SVE_ELTPERM (1UL << 38) +#define HWCAP_SVE_AES2 (1UL << 39) +#define HWCAP_SVE_BFSCALE (1UL << 40) +#define HWCAP_SVE2P2 (1UL << 41) +#define HWCAP_SME2P2 (1UL << 42) +#define HWCAP_SME_SBITPERM (1UL << 43) +#define HWCAP_SME_AES (1UL << 44) +#define HWCAP_SME_SFEXPA (1UL << 45) +#define HWCAP_SME_STMOP (1UL << 46) +#define HWCAP_SME_SMOP4 (1UL << 47) /* HWCAP2 */ #define HWCAP2_DCPODP (1 << 0) @@ -202,6 +217,12 @@ __ElfType(Auxinfo); #define HWCAP2_SME_SF8DP2 (1UL << 62) #define HWCAP2_POE (1UL << 63) +/* HWCAP3 */ +#define HWCAP3_MTE_FAR (1 << 0) +#define HWCAP3_MTE_STORE_ONLY (1 << 1) +#define HWCAP3_LSFE (1 << 2) +#define HWCAP3_LS64 (1 << 3) + #ifdef COMPAT_FREEBSD32 /* ARM HWCAP */ #define HWCAP32_HALF 0x00000002 /* Always set. */ From nobody Wed Apr 8 14:01:37 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPr22R53z6YBJC for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPr16S1Jz3gQl for ; Wed, 08 Apr 2026 14:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BsX+//3rHQCjHS4Qdvwm5hMkc0EeDjRW0dQldA8gHeA=; b=qWhg36gm48p9142mHkAFXiKFtthUc4v+HkiggC+Mlpg/5VReFep81E/1QxrENja5/+fU6K 76u+zD0z2L/94CwHVRRKA3HlUqIv5EiHcDG5tjQNJde/n4lt4YuQcxEEQ9WkJdl5tPsdkN Ah85GR2KnhC3Ceq6e2J5IYTzlqaRfPKOVm6PO6lcjoz5J1vcSkpswkWeN1e9gQFtVYlCaT 6GkPPWUSqBqyJ7mI0JdXGZ4sK7dEkkAaFrs7c9+t2vVjS7mCYF8a53Z+hOp7u/tQootP3a fDt5bL5cE3EJOakgoVuxf52TD8+rBogVWlmM2M/wZ8LVa9D1M2IQ2toVyS+okg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656897; a=rsa-sha256; cv=none; b=fgvIFDdnza5FLKTyCG/zpRhrnzEHs2EM7zB9viuGNVZvlAAcboBi45txcUtnWrsysu9xHh 7tqLPiFpkep/3NbxkbCkRTeWmhJFTJNmT8PA7Y4+n9AI/qorOzMfxaQymUNHzC/4EUNgkS BVVxCV0Ltds5nJy2ilSPsWutP0sMo//kJpqhdlXQIqvlYUhLFZfXRt35DPD7qEOBD25RfK DKlCD6ddkzstITW6tUbJuh9EeWs3cBBPQOK5L+AFL6mIcfbTzo4k9SaNA4WZkl8Sn5h6pt PUFoMhkJbFbhrd/DIhRQ1LeN5X3RuNxMnB6k5ocKuPMkvY7j0RWnjA2yUWOBZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BsX+//3rHQCjHS4Qdvwm5hMkc0EeDjRW0dQldA8gHeA=; b=vIVN2TcqJv2ATr/7CTybsIFTnChyOcDKI8lJX1BSHEhBZX0rWtMdfO6QDsfIdLVQ0DGZV6 nKtHnPQNiDnWqwnfzc5DS9TSIRR6OWlFYvTgb53oFqTRKfXxb4/hnrri4Tg13f70bl4L2E mztN7Y4oKTCdjULZLbUAnO/QzAO1krJzBPjzouPtu1e2p5goyEPFttAd9T2hlw90g5XFNw STbkW4IHe7iZKCTKxozH73oGnok2bRqqdw8xhk0q8sj/RtD9pUfZhPCUAdDodXkGPw+UZw kANuTytLqkBBlS/X778we60jYjG0tB+5gLmIkW9TvcMDkFNkyCseLnrLECTW8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPr15JtBzDSR for ; Wed, 08 Apr 2026 14:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b593 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 767f1aa9fb64 - stable/15 - arm64: Fix the ESR_ELx_EC_MASK definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 767f1aa9fb64b80015f43dac2a896d7029a60d20 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:37 +0000 Message-Id: <69d65fc1.3b593.37038750@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=767f1aa9fb64b80015f43dac2a896d7029a60d20 commit 767f1aa9fb64b80015f43dac2a896d7029a60d20 Author: Andrew Turner AuthorDate: 2026-02-18 15:10:44 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:54 +0000 arm64: Fix the ESR_ELx_EC_MASK definition Sponsored by: Arm Ltd (cherry picked from commit f4d1a3ab0271216df05bab14c641d8023cc43a04) --- sys/arm64/include/armreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 138a1eff51ac..271fe693cdea 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -658,7 +658,7 @@ #define ISS_DATA_DFSC_TLB_CONFLICT (0x30 << 0) #define ESR_ELx_IL (0x01 << 25) #define ESR_ELx_EC_SHIFT 26 -#define ESR_ELx_EC_MASK (0x3f << 26) +#define ESR_ELx_EC_MASK (UL(0x3f) << 26) #define ESR_ELx_EXCEPTION(esr) (((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT) #define EXCP_UNKNOWN 0x00 /* Unkwn exception */ #define EXCP_TRAP_WFI_WFE 0x01 /* Trapped WFI or WFE */ From nobody Wed Apr 8 14:01:39 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPr42xGTz6YBLY for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPr40CgGz3gJQ for ; Wed, 08 Apr 2026 14:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/xZPPx5Yp53/Ceuw9T6anx4EJKcvxCNjomG1ItlkOc=; b=fboLfGjAfCsYowCmQdjOjaoLOOcERJNpRcsFcNbfQe7wiJBy4cYHFQa1xzOBZHxQZI8URq cINg+vQRRZnTtTe0xFcrsdBk8yqHOjoV//6Fl81921XzQ/B8tzMJokopBaE9I3i2rYK2vP NQvrVY6bAS0FGbOgp11Yx1qZbmnILjsEbAocTL10+0hFBrx1D30reu8sH5nW5EcGsjBMjY p78yWd9MRM7mwk5OSAcET4n7a7p0wipjwjRpONGa3GDQBSo5B+5011SWqoemnRtg5V39yt ANrvpd4xDJfn9NENmyK7DQfLKnoxHffNY1caDKSe0PnLlWeABPYvkeODVNhzXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656900; a=rsa-sha256; cv=none; b=iOa6+i3PxCIprhdCUhVt0J63YtHQeGfn2xu1ik563/W4QMlNg1TSTJnsK8MCC/EbGzief8 V1IJGC86CrUOxMFsF3UWurFGR1RZP0unVE4uM/Q47GP4rhtPv9zHwQ++NRH5LqSgXRML25 p74ILwTlMRtYABryAeTDsffwKtFP0ePzFs7/frNi3/LnztqaZwgzBqAgO7RQG9TrwuEwN5 r6dNq4j7CxQaSeCjwi/W4nrKCj4UVxYp2Um93g5EVxMkvpvWjv+b986NHbniF5oCnpid9N /9O+r3h9Yn2u5IwmwYUbgN5mjs9QpgUm7iYq0zFI3pc4Saf4GY99G5E+2FV0dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/xZPPx5Yp53/Ceuw9T6anx4EJKcvxCNjomG1ItlkOc=; b=EFoZpP71r5bvC6qxuaiM+GM5gTtZ6cHT5pPwDeuAvNnMTyVpXuuu/R3AwbDsUryCjf/DDo ic80HJcaG+W/lutmBq7ET/LsmqErVrn/f3mKUP9PdozVml1JxlymnHOU4pTMmK0Lisgspg 7mV3K70uqOlQiqtGET2qh22uxjwpcTj8kbOJWaMT26gEHBCpggMPjZa2k1+1o/Xx3EHVQj G//wMyT39tFTJkr7e69lLVMSP80+VlA+jKOpuQ5KHHHLr/gtYqyYdxGQ5HTzc3tUUcqQ3+ SsDLRsZ8wd/Ptd7WG9bFU6gP6qR6AkoY8G+D89b9FtNpAZsWo8oVNYAgrlc+5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPr36t5mzTJn for ; Wed, 08 Apr 2026 14:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39561 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kajetan Puchalski From: Andrew Turner Subject: git: 920f5f6e10a0 - stable/15 - arm64: Treat the PMUVer field of ID_AA64DFR0 as unsigned List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 920f5f6e10a01b65bd48a624ccba4f51faf9d9b6 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:39 +0000 Message-Id: <69d65fc3.39561.15195075@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=920f5f6e10a01b65bd48a624ccba4f51faf9d9b6 commit 920f5f6e10a01b65bd48a624ccba4f51faf9d9b6 Author: Kajetan Puchalski AuthorDate: 2026-03-04 15:16:35 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:54 +0000 arm64: Treat the PMUVer field of ID_AA64DFR0 as unsigned The PMUVer field of ID_AA64DFR0 contains an unsigned version of the Performance Monitors Extension, but it is currently treated as signed. Change it to unsigned. Reviewed by: andrew Sponsored by: Arm Ltd Signed-off-by: Kajetan Puchalski Pull Request: https://github.com/freebsd/freebsd-src/pull/2062 (cherry picked from commit e40e5458616d13b44cd407aa1afff620f8ff8766) --- sys/arm64/arm64/identcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index f4e1aa8a4e85..c761be878d13 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -632,7 +632,7 @@ static const struct mrs_field id_aa64dfr0_fields[] = { MRS_FIELD(ID_AA64DFR0, PMSS, false, MRS_LOWER, 0, id_aa64dfr0_pmss), MRS_FIELD(ID_AA64DFR0, BRPs, false, MRS_LOWER, MRS_USERSPACE, id_aa64dfr0_brps), - MRS_FIELD(ID_AA64DFR0, PMUVer, true, MRS_LOWER, 0, id_aa64dfr0_pmuver), + MRS_FIELD(ID_AA64DFR0, PMUVer, false, MRS_LOWER, 0, id_aa64dfr0_pmuver), MRS_FIELD(ID_AA64DFR0, TraceVer, false, MRS_LOWER, 0, id_aa64dfr0_tracever), MRS_FIELD(ID_AA64DFR0, DebugVer, false, MRS_LOWER | MRS_SAFE(0x6), 0, From nobody Wed Apr 8 14:01:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPr66fZmz6YBLh for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPr61X5Vz3gJh for ; Wed, 08 Apr 2026 14:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3s4AxsR59KbVCtMy6Rbs+PeuLIXj/IFI4QmIlETJMaA=; b=Dtx1zjftZDdDIRC4h7oehcago0CynHNNGaDROC0Q5i1PrGnOXL6iOZfCOGbdO1gTtAhjQt O6SbYi7ewlf1RArhIuRMQCeXiLnn02E65+ic+EiU3qnu7aUWzqNS5a4Y/47UbDTmTL/ub9 1Mn27TeFj2G9+WeKojpYvr0k7QA6Hm8rC/Dnv8UwuKrfaPsPyO1tQEqncF2Al6GlDKIrD2 BE2Oh1O9tqhmiSyX+wkhj1wvxcyEQOTE8uOrHBGrkQHDWVtgnmO4IjqplIdTP4zu5YsI1C YDRQPXV44bd+kztuWkGxI3zq8OkSeUzAWCU72s1+hEMKNmz4Kwau29myBTBwSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656902; a=rsa-sha256; cv=none; b=pZqGBvBf6eTu1B4Uvn/llCjsNFGqcPOuMPoY1Bpif+SEznL96aaQD+QiscjpiTf2yI3Wpu J9BgGsYh/6A/oGbfA7l0FHjZuzZGWOtZesE6m+8chrJ4pT3T4B88VLb5KprNNXZ8WhFCla 7cqcQXgHsMZgunYPpWRhkFmdHad9l0fh9rvi+Z4Vik8kPLaviAT6lk4AEnCv8/7A/BzMO1 Kl4W3n3v5p61hbjN5LhF3brTqTWqCmZUXhsZ97KGXT1OuS6cIIOo7+5Wi27GNyHrSMOtGl ym4AwHKQfj+dYRPRy6/xrPrfVebJsWzx2kr9qJoH+WtScOJriSm/o0UzKmUdjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3s4AxsR59KbVCtMy6Rbs+PeuLIXj/IFI4QmIlETJMaA=; b=OK+UsFciMs4p+J6XYWCnNMaIQa7m9FNGXLhKAfRcTey+Bg+ABbvRRIBzxaElCTmZw1GLQk qbCoOhQODLbmON84NolhcyI285VXNQn26XCRDHJjG68FhiUKadyFEhKjlLSQh6NvRAyjTw nnVT3A81qQWx40DQaf5K74oAHfEQkQx+8aQaCQVGGbUARn85XB7cRlkLlcr6TRKlWpmLXR wAxjX9arr3jje8XKwGbpiE72m35lH4jRX3XMCREHsqK/zboQ8dSbdjFw6pGNCZIu3UmHcg bEcHyI0++VwKWkzKClpue2aynaE6vhqaRM6HKLTM+VjencPmeX/2o+RSEg0b/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPr614LpzTJr for ; Wed, 08 Apr 2026 14:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b6ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: cf9949fa6c00 - stable/15 - arm64: Optimise the repeated TLBI workaround List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cf9949fa6c0023f98e02e2af2c886644616a25bc Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:42 +0000 Message-Id: <69d65fc6.3b6ff.bb487aa@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=cf9949fa6c0023f98e02e2af2c886644616a25bc commit cf9949fa6c0023f98e02e2af2c886644616a25bc Author: Andrew Turner AuthorDate: 2026-03-05 14:28:01 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:54 +0000 arm64: Optimise the repeated TLBI workaround It has been reported that the overhead of repeating all TLBI instructions is too large [1]. The Software Developer Errata Notices (SDEN) for the relevant Arm CPUs have been updated so a single "tlbi vale1is, xzr" followed by "dsb ish" is sufficient to work around the issues. Replace the places we repeat TLBI instructions with the new sequence. [1] https://lore.kernel.org/linux-arm-kernel/20260218164348.2022831-1-mark.rutland@arm.com/ Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55646 (cherry picked from commit 80b4129bef8b908eb19fe47853cb6e45e4513d76) --- sys/arm64/arm64/pmap.c | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 0cfc8ae80d70..44ec9f1672fe 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1926,17 +1926,13 @@ pmap_s1_invalidate_page(pmap_t pmap, vm_offset_t va, bool final_only) r = TLBI_VA(va); if (pmap == kernel_pmap) { pmap_s1_invalidate_kernel(r, final_only); - if (pmap_multiple_tlbi) { - dsb(ish); - pmap_s1_invalidate_kernel(r, final_only); - } } else { r |= ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)); pmap_s1_invalidate_user(r, final_only); - if (pmap_multiple_tlbi) { - dsb(ish); - pmap_s1_invalidate_user(r, final_only); - } + } + if (pmap_multiple_tlbi) { + dsb(ish); + __asm __volatile("tlbi vale1is, xzr" ::: "memory"); } dsb(ish); isb(); @@ -1978,24 +1974,16 @@ pmap_s1_invalidate_strided(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, end = TLBI_VA(eva); for (r = start; r < end; r += TLBI_VA(stride)) pmap_s1_invalidate_kernel(r, final_only); - - if (pmap_multiple_tlbi) { - dsb(ish); - for (r = start; r < end; r += TLBI_VA(stride)) - pmap_s1_invalidate_kernel(r, final_only); - } } else { start = end = ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)); start |= TLBI_VA(sva); end |= TLBI_VA(eva); for (r = start; r < end; r += TLBI_VA(stride)) pmap_s1_invalidate_user(r, final_only); - - if (pmap_multiple_tlbi) { - dsb(ish); - for (r = start; r < end; r += TLBI_VA(stride)) - pmap_s1_invalidate_user(r, final_only); - } + } + if (pmap_multiple_tlbi) { + dsb(ish); + __asm __volatile("tlbi vale1is, xzr" ::: "memory"); } dsb(ish); isb(); @@ -2036,11 +2024,11 @@ pmap_s1_invalidate_all_kernel(void) { dsb(ishst); __asm __volatile("tlbi vmalle1is"); - dsb(ish); if (pmap_multiple_tlbi) { - __asm __volatile("tlbi vmalle1is"); dsb(ish); + __asm __volatile("tlbi vale1is, xzr" ::: "memory"); } + dsb(ish); isb(); } @@ -2058,17 +2046,13 @@ pmap_s1_invalidate_all(pmap_t pmap) dsb(ishst); if (pmap == kernel_pmap) { __asm __volatile("tlbi vmalle1is"); - if (pmap_multiple_tlbi) { - dsb(ish); - __asm __volatile("tlbi vmalle1is"); - } } else { r = ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)); __asm __volatile("tlbi aside1is, %0" : : "r" (r)); - if (pmap_multiple_tlbi) { - dsb(ish); - __asm __volatile("tlbi aside1is, %0" : : "r" (r)); - } + } + if (pmap_multiple_tlbi) { + dsb(ish); + __asm __volatile("tlbi vale1is, xzr" ::: "memory"); } dsb(ish); isb(); From nobody Wed Apr 8 14:01:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPr61KV9z6YBRJ for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPr51Y4Tz3gJb for ; Wed, 08 Apr 2026 14:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2C9fNZmfaFa/rxST7oAOmGOzuE2ovSiVTVCwH+jGzI=; b=uJkQkif4qNvxCIHoBHWhSuV1fj5pF+NlczAlVXZGfJ9z0IhZgxz3/fQtgbs0GrwtHpWiaB nYY1B0u+z/7zm5uHyBIb3JcUUth479PLLa1V+1tIVXMeQ/9S+Wn4usKRQBCc4E173OkhN+ y1lKA2rUS7Rlcv4WIkaNehPThTwEar7lXkoudPCe9G/uMMAu8sOnIci/tyC7f8n1N3eja1 1jF+0rhc2tQf5QJpcEhlN5D1zao50dxwD23j88Em+Rc1h7SPgc/XBnRp6ppXxiPvuVmkIU Oye9Afk2n/izw+NGIMXy/Xk3SQ8TuOIeysLvjV/MK8aRjPKpkf0kah5vniDv8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656901; a=rsa-sha256; cv=none; b=tQdjg1yB+6E4DcyObsYsaclzSHJisncFDAkh28BmvSmLyUv6tTgeljSpJCdaC3DORykAiR HdRiBEv5u7uZNbXN9iKQ89RwU/cuQJqOYbCKMrHpZELeayXCkANYoPnud7M+upj5QpcF+/ 52jKMubb81kKyu2ppx6Se9IV0PV6YVJWjiDJSA44jojxML4SaiNuVJK+hmlbS4VYVg09DK rtEIPLoZEPoU6iWtLyPvvf2t/8gZZ8FNaa63pb2YAaBJOd3M7qiT7e5zNyAMqM5mrs3BJs yb04tVbc37z0nXYRKluwSx1obUDmUQGtm8gWBvTwZlWSP0zogMJo+XwCW71BkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2C9fNZmfaFa/rxST7oAOmGOzuE2ovSiVTVCwH+jGzI=; b=dYIBT8WDdc4lQ/k95+Ztl1MbbyGeEzQAYWqaDaqXlyufGE+YilD25jO1SulADZ5vX9EFhY i28TgIPyF+L8Lchj+JmKhj0YQyJQ1XdE0nN8EZycUeFDr5jUXnQdnUs6ELaHTS5shed7q9 +gtQyfcEzEHQCGYRVbOKa9/Vho6y+NLs9jHErdX+o526qECIpBtcZFGtz96ZmZ5ZIaKQmv NyRaFqbo/vFq6s3f690/hf5/RUWSe2Rimz4kvcaKW9dLhz4XRCDGD3pxVt9HlhoxonbZJ+ I8fcojkVr/YSt+/jeQMt1MxDZs3D4SHAWpX7w2Y65zJw9aByaN0YYg8v2uHi6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPr50WLLzTSq for ; Wed, 08 Apr 2026 14:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 397cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 1d4a619667ea - stable/15 - arm64/vmm: Support PMU v3p9 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d4a619667eadb01bd13538a3c9feede49bf86ec Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:41 +0000 Message-Id: <69d65fc5.397cc.555c981e@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1d4a619667eadb01bd13538a3c9feede49bf86ec commit 1d4a619667eadb01bd13538a3c9feede49bf86ec Author: Andrew Turner AuthorDate: 2026-03-04 16:35:57 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:54 +0000 arm64/vmm: Support PMU v3p9 The only new register is read-only. As the kernel just passes the registers to the guest directly no further change should be needed. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51764 (cherry picked from commit d1650d226205cdf07fb19e0c9b10b47b941e8747) --- sys/arm64/vmm/vmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 4231746e7eb2..07be8b1707a0 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -98,7 +98,7 @@ static const struct vmm_regs vmm_arch_regs_masks = { ID_AA64DFR0_CTX_CMPs_MASK | ID_AA64DFR0_WRPs_MASK | ID_AA64DFR0_BRPs_MASK | - ID_AA64DFR0_PMUVer_3 | + ID_AA64DFR0_PMUVer_3_9 | ID_AA64DFR0_DebugVer_8, .id_aa64isar0 = ID_AA64ISAR0_TLB_TLBIOSR | From nobody Wed Apr 8 14:01:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frPr81hX6z6YBJT for ; Wed, 08 Apr 2026 14:01: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPr72y3Mz3gMM for ; Wed, 08 Apr 2026 14:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gGuHWP03WkhH40tZxqAfjcrSpifYAV70B3stec8vdXo=; b=rNm9XXyvXOSL7uwF/wlBMyVy87mGYRI5dcDWq8SB7md7XBdGvMk3vLpVQ8JxhV7sJe539x nYcBVOM61IJnBu/A6kBj1GBiT4LcRIxJRzyYSS6oHa8b8Uy5V7AIFVbmvxGl1PZBltAOkL oD3z+0+kKsLH2ry2nMnO+B6kcdIRKtxDTXDCe/GPq4ps9iIi1881PTEkaiq45y+iKOzQYO zme6E0Y4mLC/vgTD+wp/yVMrnNFJt6GBfeK2o3yKUd35RmAbok/Q/6/if5CS9I+NS5UjXQ jLb2WQHZ9vKXjBaxXdE+y9SiZ33KBF9BUVdul9DO4zb1MACgYcsDrAOFXGAf+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656903; a=rsa-sha256; cv=none; b=KGSgdV3mZ4jvgop0tVfSSPtFAlH4Vt+aLfeLhGs85uUopeLkhdaczEF6JSeAhtgt4p1SsE dluCQ4dnhpKt3gNQWbjnfJEm4JeTuknOGTyDPKWUFyeWHTRl/SLKppIQ+8oTB54r3sqeNF r59RYdfc50MlcL6LbDFCXvbUjoeBetj2h62YQIYsC0TkFjvhW88lPJF7st5oA4Ju4ezT7A Qk7RM5lq9R2OHE2wG43mhZMs7p1tNLlm8FYqwSrZ9EiD1g4MTlHqqyjplojl3+fyONm1Bs 7XMqX3ZTTOvr+MqrwX7cJiGrt9ma2JHwPrSPWE27uxSQoUn1TNMrL36ZIfy82Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gGuHWP03WkhH40tZxqAfjcrSpifYAV70B3stec8vdXo=; b=CigaGLtefjlT3zpXd3YMO2HEortgjWcpwRbRunzX2EZidueJdor0Mb1tjf0Fqd9zSnRuU0 NZ6IDY/ii/FmNWutJ7JyJiWT2oACwIsA/GRem8tv1SeoY/DW475VchlXkzN2iECUr9+0rg 7vz490i7OQyHkweD9bfZesj23HRtPmvSHv4TcaqStko+Kib9L8jsJSpqqG4BlKdkkbFJA+ hq8CXUcis3LdrdKGehMzvT9DFEY99UUpSvxpHwhXOAMzqCcH2I4nihUd+w+ykj/jT8G8mQ U9T/b+mpP9o1mhwP2Ncst135UeCGyVKdG9wkIKKH9TUrPSsGLTY5KXv7+/tcWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPr71rQBzDWC for ; Wed, 08 Apr 2026 14:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b799 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: f6f5d927bf75 - stable/15 - arm64: Have a common call to userret List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f6f5d927bf756810bb16c5f90540453eb309eb21 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:43 +0000 Message-Id: <69d65fc7.3b799.4acab9ef@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f6f5d927bf756810bb16c5f90540453eb309eb21 commit f6f5d927bf756810bb16c5f90540453eb309eb21 Author: Andrew Turner AuthorDate: 2026-03-17 17:10:07 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:54 +0000 arm64: Have a common call to userret Rather than each exception calling userret use a common copy. As syscallret already calls userret we need to skip it in that case. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55250 (cherry picked from commit 14e97448fcebbe4b038eaf5628933abe5f9e690d) --- sys/arm64/arm64/trap.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index b3c68fa4826f..867e5c57f8e5 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -193,17 +193,19 @@ test_bs_fault(void *addr) addr == &generic_bs_poke_8f); } -static void +static bool svc_handler(struct thread *td, struct trapframe *frame) { if ((frame->tf_esr & ESR_ELx_ISS_MASK) == 0) { syscallenter(td); syscallret(td); + /* Skip userret as syscallret already called it */ + return (true); } else { call_trapsignal(td, SIGILL, ILL_ILLOPN, (void *)frame->tf_elr, ESR_ELx_EXCEPTION(frame->tf_esr)); - userret(td, frame); + return (false); } } @@ -220,7 +222,6 @@ align_abort(struct thread *td, struct trapframe *frame, uint64_t esr, call_trapsignal(td, SIGBUS, BUS_ADRALN, (void *)frame->tf_elr, ESR_ELx_EXCEPTION(frame->tf_esr)); - userret(td, frame); } @@ -231,7 +232,6 @@ external_abort(struct thread *td, struct trapframe *frame, uint64_t esr, if (lower) { call_trapsignal(td, SIGBUS, BUS_OBJERR, (void *)far, ESR_ELx_EXCEPTION(frame->tf_esr)); - userret(td, frame); return; } @@ -411,9 +411,6 @@ bad_far: frame->tf_elr, error); } } - - if (lower) - userret(td, frame); } static void @@ -667,6 +664,7 @@ do_el0_sync(struct thread *td, struct trapframe *frame) uint32_t exception; uint64_t esr, far; int dfsc; + bool skip_userret; /* Check we have a sane environment when entering from userland */ KASSERT((uintptr_t)get_pcpu() >= VM_MIN_KERNEL_ADDRESS, @@ -694,6 +692,7 @@ do_el0_sync(struct thread *td, struct trapframe *frame) CTR4(KTR_TRAP, "%s: exception=%lu, elr=0x%lx, esr=0x%lx", __func__, exception, frame->tf_elr, esr); + skip_userret = false; switch (exception) { case EXCP_FP_SIMD: #ifdef VFP @@ -705,7 +704,6 @@ do_el0_sync(struct thread *td, struct trapframe *frame) case EXCP_TRAP_FP: #ifdef VFP fpe_trap(td, (void *)frame->tf_elr, esr); - userret(td, frame); #else panic("VFP exception in userland"); #endif @@ -715,11 +713,10 @@ do_el0_sync(struct thread *td, struct trapframe *frame) if (!sve_restore_state(td)) call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)frame->tf_elr, exception); - userret(td, frame); break; case EXCP_SVC32: case EXCP_SVC64: - svc_handler(td, frame); + skip_userret = svc_handler(td, frame); break; case EXCP_INSN_ABORT_L: case EXCP_DATA_ABORT_L: @@ -741,22 +738,18 @@ do_el0_sync(struct thread *td, struct trapframe *frame) if (!undef_insn(frame)) call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)far, exception); - userret(td, frame); break; case EXCP_FPAC: call_trapsignal(td, SIGILL, ILL_ILLOPN, (void *)frame->tf_elr, exception); - userret(td, frame); break; case EXCP_SP_ALIGN: call_trapsignal(td, SIGBUS, BUS_ADRALN, (void *)frame->tf_sp, exception); - userret(td, frame); break; case EXCP_PC_ALIGN: call_trapsignal(td, SIGBUS, BUS_ADRALN, (void *)frame->tf_elr, exception); - userret(td, frame); break; case EXCP_BRKPT_EL0: case EXCP_BRK: @@ -765,12 +758,10 @@ do_el0_sync(struct thread *td, struct trapframe *frame) #endif /* COMPAT_FREEBSD32 */ call_trapsignal(td, SIGTRAP, TRAP_BRKPT, (void *)frame->tf_elr, exception); - userret(td, frame); break; case EXCP_WATCHPT_EL0: call_trapsignal(td, SIGTRAP, TRAP_TRACE, (void *)far, exception); - userret(td, frame); break; case EXCP_MSR: /* @@ -781,7 +772,6 @@ do_el0_sync(struct thread *td, struct trapframe *frame) if (!undef_insn(frame)) call_trapsignal(td, SIGILL, ILL_PRVOPC, (void *)frame->tf_elr, exception); - userret(td, frame); break; case EXCP_SOFTSTP_EL0: PROC_LOCK(td->td_proc); @@ -794,24 +784,22 @@ do_el0_sync(struct thread *td, struct trapframe *frame) PROC_UNLOCK(td->td_proc); call_trapsignal(td, SIGTRAP, TRAP_TRACE, (void *)frame->tf_elr, exception); - userret(td, frame); break; case EXCP_BTI: call_trapsignal(td, SIGILL, ILL_ILLOPC, (void *)frame->tf_elr, exception); - userret(td, frame); break; case EXCP_MOE: handle_moe(td, frame, esr); - userret(td, frame); break; default: call_trapsignal(td, SIGBUS, BUS_OBJERR, (void *)frame->tf_elr, exception); - userret(td, frame); break; } + if (!skip_userret) + userret(td, frame); KASSERT( (td->td_pcb->pcb_fpflags & ~(PCB_FP_USERMASK|PCB_FP_SVEVALID)) == 0, ("Kernel VFP flags set while entering userspace")); From nobody Wed Apr 8 23:14:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frf6D0KmYz6XyQt for ; Wed, 08 Apr 2026 23:14: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frf6D00mhz43bw for ; Wed, 08 Apr 2026 23:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775690084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ulqu86+rqS+XK9AIkhbnzybpZ2g0oNEiQO725Foi0iw=; b=usjhoGD6cNu+5cqi+9MF5to+JE94B8AN3lueIHSwegfklmAnzwcanzRjnBpBlriKI7/EGE sLpn6rzt7emsrY8STTjP2RFP0wUGFeRIG9RY4w3Ix/eOPuIdyqd+fJbqdTIzE3eBgMj54N bEXby5St4QJgd/ELgubqd8hHNYDmPIo5QaqqpEL/iFdVT/RlU4nzd8HPA9vSaChb9pZnij pYWZhBI8DO9sUJX/R+MaNcsiGlGDSewyC5g8IsBtr7Z5Wsf4hIlmTmysTMr/DRd2zZCMde s8hqJIAQ0vXUCusZSK8G4/tHijIJdoDhMg0iJPPTX8MRZu5e0lT7uVUUU4r+ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775690084; a=rsa-sha256; cv=none; b=P/vvGuKoUkkOD160sChtmrb3haSZyuBslzByjxV2hCDI8DmZlxtbT2m2KiKjQdnnGzdWjt bhRddHBg24sXBV/tIzWrgBUv7cOpOwBU1uynJZ8js+/9iVVO0uLcfrLH/TLAIrsitJrZYL m3rgSXmvRFHnczw6DnECiLnurOlqgEajPVlsE2xbzF3mmJiwP9RKupYIH2oGB9AcfoQBsH hwIFuMlTbgQ5XI5s9XMKrABeIbdRvFrP+CamyS1yTRUpESDm/CIs1U9LEKRgZzbr6Gu5n3 Whl270rkAXu4ta5lny0NNEe4/twkHABtONCjEpV6rO+mVWT99OxNmPgXyTgpMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775690084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ulqu86+rqS+XK9AIkhbnzybpZ2g0oNEiQO725Foi0iw=; b=X4j7WlQeTNOXp5LQZMz5QsNGYemxBWXI/IHVAZ+0cFUVYZrb3EsCCYEb3T6ae8vPZs8/+W ILPxC93FR68FM1K6DmlofhKXOcejOneT+J2sV1IVAOlYobPJ9hDKpPFYIxBAPJQ7+TrIog rvBZvtPzkTJ9i3WW3+2UDP3XfhelfreLyRHB7MvNKW77GI1FFHpgbZ99OqO3AjvsRjZ9N3 vSJQGry9tlE9Zhlj44hnq6IZ03H2Nb3dc3Yd2eu0Z+/2rVp8LtRwxqjlsyt8NtMyqw8xHo R46hkh67JUZG8OClcLkyL9irD4maIeZ86xwTO3NBCAdD+kKfVZ5p3jApIeAMFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frf6C6jlpzmgC for ; Wed, 08 Apr 2026 23:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 268a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 23:14:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 09db15067248 - stable/14 - libpcap: Update to 1.10.6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09db15067248b297bf2d419fa77a3b2e39184a64 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 23:14:43 +0000 Message-Id: <69d6e163.268a9.224dace0@gitrepo.freebsd.org> The branch stable/14 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=09db15067248b297bf2d419fa77a3b2e39184a64 commit 09db15067248b297bf2d419fa77a3b2e39184a64 Author: Joseph Mingrone AuthorDate: 2026-03-15 01:42:55 +0000 Commit: Joseph Mingrone CommitDate: 2026-04-08 19:09:25 +0000 libpcap: Update to 1.10.6 Changes: https://raw.githubusercontent.com/the-tcpdump-group/libpcap/89e982c37c36ad0bf9f10b7ded421cb42422effa/CHANGES Reviewed by: bms, emaste Obtained from: https://www.tcpdump.org/release/libpcap-1.10.6.tar.gz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55545 Differential Revision: https://reviews.freebsd.org/D55858 (cherry picked from commit 16cef5f7a65588def71db4fdfa961f959847e3b6) --- contrib/libpcap/CHANGES | 107 ++ contrib/libpcap/CMakeLists.txt | 55 +- contrib/libpcap/CREDITS | 13 + contrib/libpcap/INSTALL.md | 4 + contrib/libpcap/Makefile.in | 12 +- contrib/libpcap/VERSION | 2 +- contrib/libpcap/aclocal.m4 | 11 +- contrib/libpcap/autogen.sh | 41 +- contrib/libpcap/cmake/Modules/FindPacket.cmake | 49 +- contrib/libpcap/cmakeconfig.h.in | 12 +- contrib/libpcap/config.h.in | 8 +- contrib/libpcap/configure | 1097 ++++++++++---------- contrib/libpcap/configure.ac | 37 +- contrib/libpcap/dlpisubs.c | 124 +++ contrib/libpcap/dlpisubs.h | 1 + contrib/libpcap/doc/README.haiku.md | 40 +- contrib/libpcap/doc/README.solaris.md | 24 +- contrib/libpcap/doc/README.windows.md | 175 +++- contrib/libpcap/fad-getad.c | 13 +- contrib/libpcap/fmtutils.c | 2 +- contrib/libpcap/gencode.c | 346 ++++-- contrib/libpcap/grammar.y.in | 13 - contrib/libpcap/ieee80211.h | 6 +- contrib/libpcap/instrument-functions.c | 250 +++++ contrib/libpcap/nametoaddr.c | 452 +++++++- contrib/libpcap/nametoaddr.h | 1 + contrib/libpcap/optimize.c | 2 +- contrib/libpcap/pcap-bpf.c | 40 +- contrib/libpcap/pcap-common.c | 92 +- contrib/libpcap/pcap-dag.c | 5 +- contrib/libpcap/pcap-dbus.c | 4 + contrib/libpcap/pcap-dlpi.c | 348 ++++--- contrib/libpcap/pcap-dpdk.c | 5 +- contrib/libpcap/pcap-haiku.c | 8 +- contrib/libpcap/pcap-int.h | 33 +- contrib/libpcap/pcap-libdlpi.c | 33 +- contrib/libpcap/pcap-linux.c | 636 ++++++++++-- contrib/libpcap/pcap-new.c | 54 +- contrib/libpcap/pcap-npf.c | 100 +- contrib/libpcap/pcap-rpcap.c | 2 +- contrib/libpcap/pcap-savefile.manfile.in | 29 +- contrib/libpcap/pcap-septel.c | 3 +- contrib/libpcap/pcap-snf.c | 5 +- contrib/libpcap/pcap.c | 73 +- contrib/libpcap/pcap/bpf.h | 2 - contrib/libpcap/pcap/dlt.h | 102 +- contrib/libpcap/pcap_close.3pcap | 14 +- contrib/libpcap/pcap_dump_close.3pcap | 11 +- contrib/libpcap/pcap_dump_flush.3pcap | 2 +- contrib/libpcap/pcap_file.3pcap | 2 +- contrib/libpcap/pcap_loop.3pcap | 2 +- contrib/libpcap/pcap_next_ex.3pcap | 2 +- contrib/libpcap/pcap_open_offline.3pcap.in | 8 +- contrib/libpcap/pflog.h | 4 + contrib/libpcap/rpcapd/CMakeLists.txt | 28 +- contrib/libpcap/rpcapd/rpcapd.c | 14 +- contrib/libpcap/scanner.l | 22 - contrib/libpcap/sf-pcap.c | 15 +- contrib/libpcap/testprogs/CMakeLists.txt | 9 +- contrib/libpcap/testprogs/Makefile.in | 5 + contrib/libpcap/testprogs/filtertest.c | 3 + contrib/libpcap/testprogs/fuzz/CMakeLists.txt | 43 - contrib/libpcap/testprogs/fuzz/fuzz_both.c | 101 -- contrib/libpcap/testprogs/fuzz/fuzz_both.options | 2 - contrib/libpcap/testprogs/fuzz/fuzz_filter.c | 43 - contrib/libpcap/testprogs/fuzz/fuzz_filter.options | 2 - contrib/libpcap/testprogs/fuzz/fuzz_pcap.c | 80 -- contrib/libpcap/testprogs/fuzz/fuzz_pcap.options | 2 - contrib/libpcap/testprogs/fuzz/onefile.c | 54 - contrib/libpcap/testprogs/versiontest.c | 29 + lib/libpcap/Makefile | 1 - lib/libpcap/config.h | 261 ++++- sys/net/dlt.h | 175 +++- 73 files changed, 3738 insertions(+), 1667 deletions(-) diff --git a/contrib/libpcap/CHANGES b/contrib/libpcap/CHANGES index bf8701c829a0..cb603f8feac4 100644 --- a/contrib/libpcap/CHANGES +++ b/contrib/libpcap/CHANGES @@ -1,3 +1,110 @@ +Tuesday, December 30, 2025 / The Tcpdump Group + Summary for 1.10.6 libpcap release + General: + Fix "tcpdump -i " for something-only libpcap builds. + gencode: Fix an undefined behavior in gen_mcode(). + gencode: Add a missing free() in gen_scode(). + Remove "DLT_" from the descriptions of two dlt_choices[] entries. + Report the size of time_t in the version string. + Validate remote capture source strings better. + CVE-2025-11961: Fix OOBR and OOBW in pcap_ether_aton(). + Source code: + Remove some unneeded includes. + pcapint_find_function() changed to return "void *" to avoid + warnings. + Clean up code that computes the length of a netmask. + Mind netmap support in pcap_lib_version(). + Link-layer types: + Add LINKTYPE_ETW/DLT_ETW. + Add LINKTYPE_NETANALYZER_NG/DLT_NETANALYZER_NG (pull request + #1008). + Add LINKTYPE_ZBOSS_NCP/DLT_ZBOSS_NCP. + Add LINKTYPE_USB_2_0_LOW_SPEED/DLT_USB_2_0_LOW_SPEED, + LINKTYPE_USB_2_0_FULL_SPEED/DLT_USB_2_0_FULL_SPEED, + LINKTYPE_USB_2_0_HIGH_SPEED/DLT_USB_2_0_HIGH_SPEED + Add LINKTYPE_AUERSWALD_LOG/DLT_AUERSWALD_LOG. + Add LINKTYPE_ZWAVE_TAP/DLT_ZWAVE_TAP. + Add LINKTYPE_SILABS_DEBUG_CHANNEL/DLT_SILABS_DEBUG_CHANNEL. + Add LINKTYPE_FIRA_UCI/DLT_FIRA_UCI. + Rename LINKTYPE_IPMB_LINUX/DLT_IPMB_LINUX to + LINKTYPE_I2C_LINUX/DLT_I2C_LINUX, as it's really just an + encapsulation of I2C, and is also being used for HDMI DDC. + Keep DLT_IPMB_LINUX around as a #define for backwards + compatibility. + Add LINKTYPE_MDB/DLT_MDB. + Add LINKTYPE_DECT_NR/DLT_DECT_NR. + Add LINKTYPE_EDK2_MM/DLT_EDK2_MM. + Add LINKTYPE_DEBUG_ONLY/DLT_DEBUG_ONLY. + Packet filtering: + Make the chunk allocator's alignment more general and + platform-independent. + IEEE 802.11: Fix three undefined behaviors in grammar.y. + Fix IPv4 multicast filtering to only include 224.0.0.0/4. + Fix "(arp|rarp) host NAME" to ignore IPv6 quietly. + Fix ARCnet address parsing. + Linux: + Fix check for mac80211 phydev. + Don't create monitor-mode interface if we're capturing on one. + Expand the table of DSA tag types to include all current types. + Fix an error message when deleting a monN interface. + Fix returning PCAP_ERROR_RFMON_NOTSUP with libnl. + Fix the error message when capure permission is denied. + Fix the error message if PF_PACKET sockets aren't supported. + Fix a file descriptor leak in an error case (pull request #1537). + Handle errors better when checking for a DSA-tagged interface. + Use DLT_DEBUG_ONLY for DSA tags that do not [yet] have a better support. + FreeBSD: + Fix detection and enabling of zero-copy support. + Fix errors in the zero-copy code. + Solaris: + Fix not to ignore logical interfaces in fad-gifc.c and + fad-glifc.c. + Fix attempts to open all-numeric device names with DLPI to + return "no such device". + Fix error returns and messages when an interface has no DLPI + device. + Return all interfaces in pcap_findalldevs() even if they can't be + opened. + HP-UX: + Fix attempts to open all-numeric device names to return + "no such device". + Fix error message if there's no /dev/dlpi device. + Return all interfaces in pcap_findalldevs() even if they can't be + opened. + Windows: + Fix filtering for VLAN-tagged frames. + Add support for Npcap's nanosecond-resolution time stamps in + captures. + CVE-2025-11964: Fix a bug in error message character encoding mapping + from UTF-16 to UTF-8. + Check at create time whether the NPF driver supports nanosecond + precision. + D-Bus: + Fix message leak. + Capture file writing: + Don't close the output stream if it's stdout, just flush it. + Documentation: + Explicitly document that closing a pcap_t for a savefile opened + with pcap_fopen_offline() will close the standard I/O stream. + Building and testing: + Makefile.in: Include instrument-functions.c in the release tarball. + CMake: Fix libnl usage with pkg-config. + CMake: Fix build with CMake 3.31. + CI: Report CMake version in builds. + CI: Visual Studio 2022 builds added, including ARM64 builds; + Visual Studio 2015 builds dropped. + Don't build with sslutils.c if we don't have a TLS library. + Build on Windows with a newer version of OpenSSL. + CMake: generalize handling of non-x86 Windows architectures. + CI: use the -A flag for all Visual Studio generators. + Remove the fuzzing props from the release tarball. + Autoconf: Use AC_SYS_YEAR2038_RECOMMENDED when possible if the + environment variable BUILD_YEAR2038 = yes (via autogen.sh) + DPDK: don't enable it by default. + Update Npcap SDK to 1.15. + autogen.sh: Allow to configure Autoconf warnings. + autogen.sh: Delete all trailing blank lines at end of configure. + Friday, August 30, 2024 / The Tcpdump Group Summary for 1.10.5 libpcap release Source code: diff --git a/contrib/libpcap/CMakeLists.txt b/contrib/libpcap/CMakeLists.txt index 9012ef41769f..8a27687ac355 100644 --- a/contrib/libpcap/CMakeLists.txt +++ b/contrib/libpcap/CMakeLists.txt @@ -13,14 +13,21 @@ else(WIN32) # on a "long-term support" version # of some OS and that # version supplies an older version of CMake; # - # otherwise, require 3.5, so we don't get messages warning - # that support for versions of CMake lower than 3.5 is + # otherwise, if it's a version less than 3.10, require only + # 3.5, just in case somebody is configuring with CMake + # on a "long-term support" version # of some OS and that + # version supplies an older version of CMake; + # + # otherwise, require 3.10, so we don't get messages warning + # that support for versions of CMake lower than 3.10 is # deprecated. # if(CMAKE_VERSION VERSION_LESS "3.5") cmake_minimum_required(VERSION 2.8.12) - else() + elseif(CMAKE_VERSION VERSION_LESS "3.10") cmake_minimum_required(VERSION 3.5) + else() + cmake_minimum_required(VERSION 3.10) endif() endif(WIN32) @@ -506,7 +513,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() option(DISABLE_BLUETOOTH "Disable Bluetooth sniffing support" OFF) option(DISABLE_NETMAP "Disable netmap support" OFF) -option(DISABLE_DPDK "Disable DPDK support" OFF) + +# +# Require that DPDK support be explicitly enabled, as the code is +# immensely hard to keep compiling for every random API change +# the DPDK folks make. +# +set(DISABLE_DPDK ON) # # We don't support D-Bus sniffing on macOS; see @@ -578,6 +591,7 @@ include_directories( include(CheckFunctionExists) include(CMakePushCheckState) include(CheckSymbolExists) +include(CheckIncludeFile) if(WIN32) @@ -595,8 +609,11 @@ if(WIN32) # cmake_push_check_state() set(CMAKE_REQUIRED_LIBRARIES ${Packet_LIBRARIES}) + set(CMAKE_REQUIRED_INCLUDES ${Packet_INCLUDE_DIRS}) check_function_exists(PacketIsLoopbackAdapter HAVE_PACKET_IS_LOOPBACK_ADAPTER) check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES) + check_function_exists(PacketGetInfo HAVE_PACKET_GET_INFO) + check_include_file(npcap-bpf.h HAVE_NPCAP_BPF_H) cmake_pop_check_state() endif(Packet_FOUND) @@ -634,7 +651,6 @@ endif(USE_STATIC_RT) # Detect available platform features ################################################################### -include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckStructHasMember) include(CheckTypeSize) @@ -1244,6 +1260,19 @@ if(NOT WIN32) endif() endif() +# +# Find and print the size of time_t. +# +cmake_push_check_state() +set(CMAKE_EXTRA_INCLUDE_FILES time.h) +check_type_size("time_t" SIZEOF_TIME_T) +if(SIZEOF_TIME_T EQUAL 4) + message(STATUS "32-bit time_t") +elseif(SIZEOF_TIME_T EQUAL 8) + message(STATUS "64-bit time_t") +endif() +cmake_pop_check_state() + if(INET6) message(STATUS "Support IPv6") endif(INET6) @@ -1984,6 +2013,7 @@ else(WIN32) # check_include_file(sys/bufmod.h HAVE_SYS_BUFMOD_H) check_include_file(sys/dlpi_ext.h HAVE_SYS_DLPI_EXT_H) + check_include_file(zone.h HAVE_ZONE_H) # # Checks to see if Solaris has the public libdlpi(3LIB) library. @@ -2025,12 +2055,6 @@ else(WIN32) check_type_size(dl_passive_req_t DL_PASSIVE_REQ_T) cmake_pop_check_state() elseif(PCAP_TYPE STREQUAL "linux") - # - # Do we have the wireless extensions? - # linux/wireless.h requires sys/socket.h. - # - check_include_files("sys/socket.h;linux/wireless.h" HAVE_LINUX_WIRELESS_H) - # # Do we have libnl? # We only want version 3. Version 2 was, apparently, @@ -2043,6 +2067,8 @@ else(WIN32) if(BUILD_WITH_LIBNL) pkg_check_modules(LIBNL libnl-genl-3.0) if(LIBNL_FOUND) + set(HAVE_LIBNL TRUE) + include_directories(${LIBNL_INCLUDE_DIRS}) set(PCAP_LINK_LIBRARIES ${LIBNL_LIBRARIES} ${PCAP_LINK_LIBRARIES}) # @@ -2698,7 +2724,10 @@ if(ENABLE_REMOTE) check_struct_has_member("struct msghdr" msg_flags "ftmacros.h;sys/socket.h" HAVE_STRUCT_MSGHDR_MSG_FLAGS) cmake_pop_check_state() set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} - pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c sslutils.c) + pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c) + if(OPENSSL_FOUND) + set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} sslutils.c) + endif() endif(ENABLE_REMOTE) ################################################################### @@ -2917,7 +2946,6 @@ endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/scanner.c ${CMAKE_CURRENT_BINARY_DIR}/scanner.h - SOURCE ${pcap_SOURCE_DIR}/scanner.l COMMAND ${LEX_EXECUTABLE} -P pcap_ --header-file=scanner.h --nounput -o${CMAKE_CURRENT_BINARY_DIR}/scanner.c ${pcap_SOURCE_DIR}/scanner.l DEPENDS ${pcap_SOURCE_DIR}/scanner.l ) @@ -2992,7 +3020,6 @@ message(STATUS "Parser generator: ${YACC_EXECUTABLE}") # add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/grammar.c ${CMAKE_CURRENT_BINARY_DIR}/grammar.h - SOURCE ${pcap_BINARY_DIR}/grammar.y COMMAND ${YACC_EXECUTABLE} -p pcap_ -o ${CMAKE_CURRENT_BINARY_DIR}/grammar.c -d ${pcap_BINARY_DIR}/grammar.y DEPENDS ${pcap_BINARY_DIR}/grammar.y ) diff --git a/contrib/libpcap/CREDITS b/contrib/libpcap/CREDITS index 78ce6a102cf1..809bcec710de 100644 --- a/contrib/libpcap/CREDITS +++ b/contrib/libpcap/CREDITS @@ -14,6 +14,7 @@ Additional people who have contributed patches (in alphabetical order): Alexander Galanin Alexander 'Leo' Bergolth Alexey Kuznetsov + Alexey Vishnyakov Alex Smith <44322503+MadAlexUK at users dot noreply dot github dot com> Alfredo Alvarez Fernandez Ali Abdulkadir @@ -34,6 +35,7 @@ Additional people who have contributed patches (in alphabetical order): Assar Westerlund Atzm Watanabe Baptiste Peugnez + Barnabás Pőcze Baruch Siach Bill Parker Biswapriyo Nath @@ -78,6 +80,7 @@ Additional people who have contributed patches (in alphabetical order): Eli Schwartz Eric Anderson Erik de Castro Lopo + Eugene Exarevsky Fedor Sakharov Felix Janda Felix Obenhuber @@ -85,6 +88,7 @@ Additional people who have contributed patches (in alphabetical order): Florent Drouin Florian Fainelli François Revol + Frank Gorgas-Waller Franz Schaefer frederich Fulko Hew @@ -95,6 +99,7 @@ Additional people who have contributed patches (in alphabetical order): George Neville-Neil Gerald Combs Gerard Garcia + Gerd Hoffmann Gianluca Varenni Gilbert Hoyek Gisle Vanem @@ -106,14 +111,17 @@ Additional people who have contributed patches (in alphabetical order): Gustavo Zacarias Hagen Paul Pfeifer headshog + Henri Chataing Henri Doreau Hiroaki KAWAI hopper-vul Hyung Sik Yoon + Ido Yariv Igor Khristophorov Jakub Sitnicki Jakub Zawadzki James Ko + Jan Adam Jan-Philip Velders Jason R. Thorpe Javier Achirica @@ -124,6 +132,7 @@ Additional people who have contributed patches (in alphabetical order): Jesper Dangaard Brouer Jesper Peterson Jesse Gross + Jessica Clarke JHA jingyu yang Jiri Slaby @@ -131,6 +140,7 @@ Additional people who have contributed patches (in alphabetical order): Joel <82591719+joelg989 at users dot noreply dot github dot com> Joerg Mayer John Bankier + John Thacker Jon Lindgren Jon Smirl Jorge Boncompte [DTI2] @@ -165,6 +175,7 @@ Additional people who have contributed patches (in alphabetical order): Mark Pizzolato Markus Mayer Martin Husemann + Martin Kaiser Márton Németh Matias Karhumaa Matt Eaton @@ -183,6 +194,7 @@ Additional people who have contributed patches (in alphabetical order): Milosz Kaniewski Miroslav Lichvar Monroe Williams + mooon04 Myricom Help Nan Xiao nic-kaczinsky <68271784+nic-kaczinsky at users dot noreply dot github dot com> @@ -240,6 +252,7 @@ Additional people who have contributed patches (in alphabetical order): Stefan Hudson Stephen Donnelly Steve Karg + Stig Bjørlykke stubbfel Takashi Yamamoto Tanaka Shin-ya diff --git a/contrib/libpcap/INSTALL.md b/contrib/libpcap/INSTALL.md index 2787580767fc..a8350607c45f 100644 --- a/contrib/libpcap/INSTALL.md +++ b/contrib/libpcap/INSTALL.md @@ -8,6 +8,10 @@ To build libpcap with the configure script and `make`: run `./autogen.sh` (a shell script). The autogen.sh script will build the `configure` and `config.h.in` files. +* If you build on a Linux 32-bit system, with Autoconf version >= 2.72 +and GNU C Library version >= 2.34, run `export BUILD_YEAR2038=yes` +before running `./autogen.sh` to build with 64-bit time_t (Y2038-safe). + On some system, you may need to set the `AUTORECONF` variable, like: `AUTORECONF=autoreconf-2.69 ./autogen.sh` to select the `autoreconf` version you want to use. diff --git a/contrib/libpcap/Makefile.in b/contrib/libpcap/Makefile.in index 207ad8c0db90..fe32c40cf62f 100644 --- a/contrib/libpcap/Makefile.in +++ b/contrib/libpcap/Makefile.in @@ -291,6 +291,7 @@ EXTRA_DIST = \ fad-glifc.c \ grammar.y.in \ install-sh \ + instrument-functions.c \ lbl/os-aix4.h \ lbl/os-aix7.h \ lbl/os-hpux11.h \ @@ -402,14 +403,6 @@ EXTRA_DIST = \ testprogs/filtertest.c \ testprogs/findalldevstest.c \ testprogs/findalldevstest-perf.c \ - testprogs/fuzz/CMakeLists.txt \ - testprogs/fuzz/fuzz_both.c \ - testprogs/fuzz/fuzz_both.options \ - testprogs/fuzz/fuzz_filter.c \ - testprogs/fuzz/fuzz_filter.options \ - testprogs/fuzz/fuzz_pcap.c \ - testprogs/fuzz/fuzz_pcap.options \ - testprogs/fuzz/onefile.c \ testprogs/nonblocktest.c \ testprogs/opentest.c \ testprogs/reactivatetest.c \ @@ -417,6 +410,7 @@ EXTRA_DIST = \ testprogs/threadsignaltest.c \ testprogs/unix.h \ testprogs/valgrindtest.c \ + testprogs/versiontest.c \ testprogs/visopts.py \ testprogs/writecaptest.c @@ -858,7 +852,7 @@ releasetar: tar xf -) && \ echo "No $$TAG tag. Archive build from HEAD."; \ fi && \ - (cd "$$TAG" && "$${AUTORECONF:-autoreconf}" && rm -rf autom4te.cache) && \ + (cd "$$TAG" && ./autogen.sh && rm -rf autom4te.cache) && \ tar cf "$$DIR/$$TAG".tar "$$TAG" && \ rm -f "$$DIR/$$TAG".tar.gz && \ gzip --best "$$DIR/$$TAG".tar && \ diff --git a/contrib/libpcap/VERSION b/contrib/libpcap/VERSION index db77e0ee9760..7b4d9a4ff9bc 100644 --- a/contrib/libpcap/VERSION +++ b/contrib/libpcap/VERSION @@ -1 +1 @@ -1.10.5 +1.10.6 diff --git a/contrib/libpcap/aclocal.m4 b/contrib/libpcap/aclocal.m4 index 374a68db2e7d..1ad668080bd6 100644 --- a/contrib/libpcap/aclocal.m4 +++ b/contrib/libpcap/aclocal.m4 @@ -825,6 +825,11 @@ dnl os-proto.h (symlinked) dnl AC_DEFUN(AC_LBL_DEVEL, [rm -f os-proto.h + # + # MKDEP defaults to no-op (":") if we don't test whether the compiler + # supports generating dependencies + # + MKDEP=: if test "${LBL_CFLAGS+set}" = set; then $1="$$1 ${LBL_CFLAGS}" fi @@ -901,14 +906,16 @@ testme(unsigned short a) # .devel file; why should the ABI for which we produce code # depend on .devel? # + AC_MSG_CHECKING([whether to use an os-proto.h header]) os=`echo $host_os | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]].*$/\1/'` name="lbl/os-$os.h" if test -f $name ; then + AC_MSG_RESULT([yes, at "$name"]) ln -s $name os-proto.h AC_DEFINE(HAVE_OS_PROTO_H, 1, - [if there's an os_proto.h for this platform, to use additional prototypes]) + [if there's an os-proto.h for this platform, to use additional prototypes]) else - AC_MSG_WARN(can't find $name) + AC_MSG_RESULT([no]) fi fi]) diff --git a/contrib/libpcap/autogen.sh b/contrib/libpcap/autogen.sh index c84a6b5c5dd2..ee72627ffe23 100755 --- a/contrib/libpcap/autogen.sh +++ b/contrib/libpcap/autogen.sh @@ -1,6 +1,7 @@ #!/bin/sh -e : "${AUTORECONF:=autoreconf}" +: "${BUILD_YEAR2038:=no}" AUTORECONFVERSION=`$AUTORECONF --version 2>&1 | grep "^autoreconf" | sed 's/.*) *//'` @@ -21,5 +22,43 @@ if [ "$maj" = "" ] || [ "$min" = "" ] || \ exit 1 fi +# On Linux, if Autoconf version >= 2.72 and GNU C Library version >= 2.34, +# s/AC_SYS_LARGEFILE/AC_SYS_YEAR2038_RECOMMENDED/ to ensure time_t +# is Y2038-safe. +if [ "$BUILD_YEAR2038" = yes ] && [ "`uname -s`" = Linux ]; then + if [ "$maj" -gt 2 ] || { [ "$maj" -eq 2 ] && [ "$min" -ge 72 ]; }; then + GLIBC_VERSION=`ldd --version|head -1|grep GLIBC|sed 's/.* //'` + maj_glibc=`echo "$GLIBC_VERSION" | cut -d. -f1` + min_glibc=`echo "$GLIBC_VERSION" | cut -d. -f2` + echo "GNU C Library identification: $GLIBC_VERSION" + if [ "$maj_glibc" -gt 2 ] || { [ "$maj_glibc" -eq 2 ] && \ + [ "$min_glibc" -ge 34 ]; }; then + CONFIGURE_AC_NEW="configure.ac.new$$" + sed 's/^AC_SYS_LARGEFILE/AC_SYS_YEAR2038_RECOMMENDED/' \ + "$CONFIGURE_AC_NEW" + cmp -s configure.ac "$CONFIGURE_AC_NEW" || \ + cat "$CONFIGURE_AC_NEW" >configure.ac + rm -f "$CONFIGURE_AC_NEW" + echo 'Setup to ensure time_t is Y2038-safe.' + fi + fi +fi + echo "$AUTORECONF identification: $AUTORECONFVERSION" -"$AUTORECONF" -f + +# configure.ac is an Autoconf 2.69 file, but it works as expected even with +# Autoconf 2.72. However, in Autoconf versions 2.70 and later obsolete +# construct warnings are enabled by default, which adds varying (depending on +# the branch) amount of noise to the build matrix output, so provide a means +# to silence that. +env ${AUTOCONF_WARNINGS:+WARNINGS="$AUTOCONF_WARNINGS"} "$AUTORECONF" -f + +# Autoconf 2.71 adds a blank line after the final "exit 0" on Linux, but not +# on OpenBSD. Remove this difference to make it easier to compare the result +# of "make releasetar" across different platforms. From sed one-liners: +# "delete all trailing blank lines at end of file (works on all seds)". Don't +# use mktemp(1) because AIX does not have it. +CONFIGURE_NEW="configure.new$$" +sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' "$CONFIGURE_NEW" +cmp -s configure "$CONFIGURE_NEW" || cat "$CONFIGURE_NEW" >configure +rm -f "$CONFIGURE_NEW" diff --git a/contrib/libpcap/cmake/Modules/FindPacket.cmake b/contrib/libpcap/cmake/Modules/FindPacket.cmake index 8224cd3f3e5c..3d31cba83299 100644 --- a/contrib/libpcap/cmake/Modules/FindPacket.cmake +++ b/contrib/libpcap/cmake/Modules/FindPacket.cmake @@ -47,42 +47,27 @@ # (e.g cmake -DPacket_ROOT=C:\path\to\packet [...]) # -# The 64-bit Packet.lib is located under /x64 -if(CMAKE_SIZEOF_VOID_P EQUAL 8) +if(CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") # - # For the WinPcap and Npcap SDKs, the Lib subdirectory of the top-level - # directory contains 32-bit libraries; the 64-bit libraries are in the - # Lib/x64 directory. + # 32-bit x86; no need to look in subdirectories of the SDK's + # Lib directory for the libraries, as the libraries are in + # the Lib directory # - # The only way to *FORCE* CMake to look in the Lib/x64 directory - # without searching in the Lib directory first appears to be to set - # CMAKE_LIBRARY_ARCHITECTURE to "x64". +else() # - # In newer versions of CMake, CMAKE_LIBRARY_ARCHITECTURE is set according to - # the language, e.g., CMAKE__LIBRARY_ARCHITECTURE. So, set the new - # variable, CMAKE_C_LIBRARY_ARCHITECTURE, so that CMAKE_LIBRARY_ARCHITECTURE - # inherits the correct value. + # Platform other than 32-bit x86. # - set(archdetect_c_code " - #ifndef _M_ARM64 - #error Not ARM64 - #endif - int main() { return 0; } - ") - - file(WRITE "${CMAKE_BINARY_DIR}/archdetect.c" "${archdetect_c_code}") - try_compile( - IsArm64 - "${CMAKE_BINARY_DIR}/archdetect" - "${CMAKE_BINARY_DIR}/archdetect.c" - ) - if(IsArm64) - set(CMAKE_C_LIBRARY_ARCHITECTURE "ARM64") - set(CMAKE_LIBRARY_ARCHITECTURE "ARM64") - else() - set(CMAKE_C_LIBRARY_ARCHITECTURE "x64") - set(CMAKE_LIBRARY_ARCHITECTURE "x64") - endif() + # For the WinPcap and Npcap SDKs, the Lib subdirectory of the top-level + # directory contains 32-bit x86 libraries; the libraries for other + # platforms are in subdirectories of the Lib directory whose names + # are the names of the supported platforms. + # + # The only way to *FORCE* CMake to look in the appropriate + # subdirectory of Lib for libraries without searching in the + # Lib directory first appears to be to set + # CMAKE_LIBRARY_ARCHITECTURE to the name of the subdirectory. + # + set(CMAKE_LIBRARY_ARCHITECTURE "${CMAKE_GENERATOR_PLATFORM}") endif() # Find the header diff --git a/contrib/libpcap/cmakeconfig.h.in b/contrib/libpcap/cmakeconfig.h.in index ae7cf5252de8..b7b20fc4da92 100644 --- a/contrib/libpcap/cmakeconfig.h.in +++ b/contrib/libpcap/cmakeconfig.h.in @@ -93,9 +93,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_LINUX_USBDEVICE_FS_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LINUX_WIRELESS_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MEMORY_H 1 @@ -129,6 +126,9 @@ /* Define to 1 if Packet32 API (Npcap driver) is available */ #cmakedefine HAVE_PACKET32 1 +/* Define to 1 if Npcap BPF extension definitions are available */ +#cmakedefine HAVE_NPCAP_BPF_H 1 + /* Define to 1 if NPcap's version.h is available */ #cmakedefine HAVE_VERSION_H 1 @@ -265,6 +265,9 @@ /* Define to 1 if you have the `PacketIsLoopbackAdapter' function. */ #cmakedefine HAVE_PACKET_IS_LOOPBACK_ADAPTER 1 +/* Define to 1 if you have the `PacketGetInfo' function. */ +#cmakedefine HAVE_PACKET_GET_INFO 1 + /* IPv6 */ #cmakedefine INET6 1 @@ -325,6 +328,9 @@ /* target host supports RDMA sniffing */ #cmakedefine PCAP_SUPPORT_RDMASNIFF 1 +/* The size of `time_t', as computed by sizeof. */ +#cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@ + /* Define to 1 if you have the ANSI C header files. */ #cmakedefine STDC_HEADERS 1 diff --git a/contrib/libpcap/config.h.in b/contrib/libpcap/config.h.in index fbc49c1d151a..e3cad6190843 100644 --- a/contrib/libpcap/config.h.in +++ b/contrib/libpcap/config.h.in @@ -102,9 +102,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_USBDEVICE_FS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_WIRELESS_H - /* Define to 1 if you have the header file. */ #undef HAVE_NETPACKET_PACKET_H @@ -138,7 +135,7 @@ /* Use OpenSSL */ #undef HAVE_OPENSSL -/* if there's an os_proto.h for this platform, to use additional prototypes */ +/* if there's an os-proto.h for this platform, to use additional prototypes */ #undef HAVE_OS_PROTO_H /* Define to 1 if you have a POSIX-style `strerror_r' function. */ @@ -256,6 +253,9 @@ /* Define to 1 if you have the `vsyslog' function. */ #undef HAVE_VSYSLOG +/* Define to 1 if you have the header file. */ +#undef HAVE_ZONE_H + /* Define to 1 if you have the `_wcserror_s' function. */ #undef HAVE__WCSERROR_S diff --git a/contrib/libpcap/configure b/contrib/libpcap/configure index 61fcd037a07a..4512c34d1293 100755 --- a/contrib/libpcap/configure +++ b/contrib/libpcap/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for pcap 1.10.5. +# Generated by GNU Autoconf 2.71 for pcap 1.10.6. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pcap' PACKAGE_TARNAME='pcap' -PACKAGE_VERSION='1.10.5' -PACKAGE_STRING='pcap 1.10.5' +PACKAGE_VERSION='1.10.6' +PACKAGE_STRING='pcap 1.10.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1380,7 +1380,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pcap 1.10.5 to adapt to many kinds of systems. +\`configure' configures pcap 1.10.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1447,7 +1447,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pcap 1.10.5:";; + short | recursive ) echo "Configuration of pcap 1.10.6:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ Optional Packages: directory DIR, if supplied). [default=yes, if present] --with-dpdk[=DIR] include DPDK support (located in directory DIR, if - supplied). [default=yes, if present] + supplied). [default=no] Some influential environment variables: CC C compiler command @@ -1611,7 +1611,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pcap configure 1.10.5 +pcap configure 1.10.6 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1664,6 +1664,53 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + # ac_fn_c_try_run LINENO # ---------------------- # Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that @@ -2183,7 +2230,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pcap $as_me 1.10.5, which was +It was created by pcap $as_me 1.10.6, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4221,132 +4268,409 @@ if test "$ac_cv_prog_cc_c99" = "no"; then fi # -# Get the size of a void *, to determine whether this is a 32-bit -# or 64-bit build. +# Try to arrange for large file support. # -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +# Check whether --enable-largefile was given. +if test ${enable_largefile+y} then : + enableval=$enable_largefile; +fi -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h +if test "$enable_largefile" != no; then -fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -printf %s "checking size of void *... " >&6; } -if test ${ac_cv_sizeof_void_p+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} then : printf %s "(cached) " >&6 else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default" -then : + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ -else $as_nop - if test "$ac_cv_type_void_p" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (void *) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_void_p=0 - fi + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO" +then : + break fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_largefile_CC=' -n32'; break fi *** 7144 LINES SKIPPED *** From nobody Wed Apr 8 23:14:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frf6F40M3z6Xxvp for ; Wed, 08 Apr 2026 23:14: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frf6F18hpz43Ny for ; Wed, 08 Apr 2026 23:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775690085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPVxOHpDqSSO+/fISA27q8fQ0hlyv8wWnkdMXB30u6k=; b=fa0h020RilD6MuQ/A6no6Q9lgigu4TEQh3ZKJ2Ay3fwxr4z/S08HGnHUH1l6avohVX1orz xiz7or2jet7uFdMXwKWQWXalUgCsjJVZGqp+tRkx2PjcNtMEd5sBOwoc6Vlc5v3T1jPSL0 xU7rGYxm7WDaQJv3j2NfT/UlLS3/gqfda4ss7gWcJNHZYi1ZYNQc+QnsY68lU7Ci3fWdZh Br/Ecm2XkkpPVEeZNLpMcMa2/gkzlH5bZa3lemUS6qY6/Yxrf6Q1tfL6tOYw5z8JPPzmPs 54KT/b/LBi8JWT+S47AzDxtO6n1zjXkn6zafUXjj/BWjurmIENyBk8adtqQZHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775690085; a=rsa-sha256; cv=none; b=KTSZ8qia9t8Rl8FCu58p5Ey5GT8bmgfrLzs2W5EzH7c05gQsDFGwxdGAOWZieLKzcphgqQ phcNzceOm/5Xtnk3TG+zOIxPNMw7xatjv/rmhb0vqHsrlITg8ClC5CVA4Kx2vxU6WL4RT+ BERFLVi4XmLUi2uzQmn4I467Xhz0gJWCcptApg5NpBAWHfbhimCf2mpOXBwp4A4Q9Tsd37 C88tY2ICxbm67Z1k94MOTechpM1wjVtdPVzvya+K3RbFnEs7O1GeLg4wLFBbkbbpViQfJh 8HL56PUVXh8qOtcuRsPbDUOxgKkXOEWLMprCYHH7OJPe+FlVKSg/QmcWBovXwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775690085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPVxOHpDqSSO+/fISA27q8fQ0hlyv8wWnkdMXB30u6k=; b=ZeQu+2zhBfJU7SDo7I0OTLjuMwDIyKEOJPPPw9jGlcGfbdnfRxQOcrazfcgNsFh6yx21TO 9nDuIhUHRSdupvhnzoGzUa8rjtl7AIh0yQ1glqpdeOXD3Pb0OR+qqC53GdJl0QR6NdoGNm JbA+4ctp372UBsucInrlZ79saAjSci1uCn6ofl+7HCx0hHZl0lY0lF9NG/e4xKOKB0gr+/ IybBxiJCztWmgpBSYi+B5QZllnja80oF3q53XAYita/MNC5CPf5BJYEmli5HxCXC3LXdv3 aPq7BRzttjc2t/Y55tmSrzA1bO70gnchouuXIrNVSjjoZB2aRqWuqhEXKoKY7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frf6F0NzPznZT for ; Wed, 08 Apr 2026 23:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2611e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 23:14:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 150048878988 - stable/14 - ipfwpcap: Fix build after libpcap 1.10.6 update List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 150048878988717cd5e96718886610d6bfdaf9ac Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 23:14:45 +0000 Message-Id: <69d6e165.2611e.1dd95933@gitrepo.freebsd.org> The branch stable/14 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=150048878988717cd5e96718886610d6bfdaf9ac commit 150048878988717cd5e96718886610d6bfdaf9ac Author: Joseph Mingrone AuthorDate: 2026-03-15 05:32:01 +0000 Commit: Joseph Mingrone CommitDate: 2026-04-08 19:10:06 +0000 ipfwpcap: Fix build after libpcap 1.10.6 update pcap-int.h now references SIZEOF_TIME_T from libpcap's config.h, which is not available to consumers of the internal header outside of the libpcap build. Switch to the public header and replace the direct FILE* casts and ferror()/fflush() calls with pcap_dump_flush(3), which is the correct public API for flushing a pcap dump file. Sponsored by: The FreeBSD Foundation (cherry picked from commit a0b3ef1952603ebf0307ca723b03e5a71598dd5a) --- usr.sbin/ipfwpcap/ipfwpcap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ipfwpcap/ipfwpcap.c b/usr.sbin/ipfwpcap/ipfwpcap.c index a9cead99bd07..2032387aaa0b 100644 --- a/usr.sbin/ipfwpcap/ipfwpcap.c +++ b/usr.sbin/ipfwpcap/ipfwpcap.c @@ -41,11 +41,7 @@ #include -/* XXX normally defined in config.h */ -#define HAVE_STRLCPY 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 -#include /* see pcap(3) and /usr/src/contrib/libpcap/. */ +#include #ifdef IP_MAXPACKET #define BUFMAX IP_MAXPACKET @@ -295,8 +291,7 @@ if (debug) fprintf(stderr, " sendto(%d) = %d\n", sd, r); (void) gettimeofday(&(phd.ts), NULL); phd.caplen = phd.len = nr; pcap_dump((u_char *)dp, &phd, buf); - if (ferror((FILE *)dp)) { perror(dumpf); quit(14); } - (void) fflush((FILE *)dp); + if (pcap_dump_flush(dp) == -1) { pcap_perror(p, dumpf); quit(14); } } quit(0); From nobody Wed Apr 8 23:14:46 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frf6G4hHdz6XyQy for ; Wed, 08 Apr 2026 23:14: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frf6G28m3z43R7 for ; Wed, 08 Apr 2026 23:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775690086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RbEz3sdt2vx7GYRvwq9v7ukzDYP4+ATkafpqYuespFg=; b=Q93MwxiglGl5OzCjjqgOBMwfqBJPexUab+oq/PXa3nI/aVKpyneztVsv/rxwrnc3CGNCVN Z7zq4K7nSU5ZExgC9VjVs9bX7zR5mimQOSq4fK1Ox0BV1VAaACUpqn7PZBkFzZatMTF/uc iZzVQRWNFkIV+fG4qUcBa+t2rjcxUH3yN7jV+Hsgla/rJ138MqG/AGUK9Cvjhr1wKIioar As7kD8YgGzDw6VnG+Uy5nPYJ7cNfbf6+l/zlGGpRkH5SfVXYjgjty8Vy47WVVbRBbHkwmF DDR3mA1X2uXF4NjZPR8HKaNNuU0uSPraNron8pQ3l7nu++z0ojzB4sSgyHBHfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775690086; a=rsa-sha256; cv=none; b=trcYsIrBpGXxF1+T84iYUj9QN6qZJjTz7Ex3Qibn2CSscEITNh5EpemMNJS6hGCsEZaQ2t 6/avEPQPABCpxTmduo1f4QkeGe1BJ+Iz2nBWwJ+zTsjJE4OT9JGdLlphMCcyZekJ8gHAfB CB7HmJGjOShRcFr2I5iyZMTZyfpOx5Ncl6XFlXK3RSuuWabh/UZknluzXnT0EbBk7Y9s2s 9dKHtjoVBwaY/BjeIKNl0p3CA7MQe/j4jyZTH5Fe13c7keSxX6M1c7aik4U0M+ZiWKk4ql en/wBSCFlIsXLStO1YkPaTz9ryEpHkCchPcBp1Jh1DxS/HuyRPSes3r7XAHL9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775690086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RbEz3sdt2vx7GYRvwq9v7ukzDYP4+ATkafpqYuespFg=; b=vzVV9dxKiO0M9DmNUVVkqdkoJjqTvepJvb0+lsgiZxGnzTqnqcCySPXo8jtRkYeL02/qaI I3AaTgqB2Fh29o8+W9cFkTKGiurihFFqRxqbl90PrAOVh7uU/WOj5Qen9eFpkWHNRHstW1 HEkV0JMjCw7n+qERvgV2c55YKdLjgoSp56AOZZSUNeC4y9QXsK8BYhO4FcU0d+/8uViF/w a/2EGvqgYscP0Kz3zsuUaUdX+LwXVc8TF1Qu4c2wQoE7mPL7KyEg3B/QQZWNu9QSb4tQc9 QJmEgVTmm5bB6zhDlX2UnDXYpWofL/eO+LVPAK9Vr5l2j/b04ngsq5DgLveHtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frf6G1l9qzn9K for ; Wed, 08 Apr 2026 23:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26015 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 23:14:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 8a0d626219f1 - stable/14 - tcpdump: Update to 4.99.6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a0d626219f1863c79808bdda2175cc136250b07 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 23:14:46 +0000 Message-Id: <69d6e166.26015.21ce8934@gitrepo.freebsd.org> The branch stable/14 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=8a0d626219f1863c79808bdda2175cc136250b07 commit 8a0d626219f1863c79808bdda2175cc136250b07 Author: Joseph Mingrone AuthorDate: 2026-03-16 02:22:18 +0000 Commit: Joseph Mingrone CommitDate: 2026-04-08 19:10:23 +0000 tcpdump: Update to 4.99.6 Changes: https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99/CHANGES Obtained from: https://www.tcpdump.org/release/tcpdump-4.99.6.tar.xz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55578 Differential Revision: https://reviews.freebsd.org/D55871 (cherry picked from commit e6083790f217ba7f89cd2957922bd45e35466359) --- contrib/tcpdump/CHANGES | 78 +++- contrib/tcpdump/CMakeLists.txt | 186 ++++++---- contrib/tcpdump/CONTRIBUTING.md | 2 +- contrib/tcpdump/INSTALL.md | 4 + contrib/tcpdump/Makefile.in | 28 +- contrib/tcpdump/README.md | 2 +- contrib/tcpdump/VERSION | 2 +- contrib/tcpdump/addrtostr.c | 8 +- contrib/tcpdump/autogen.sh | 41 ++- contrib/tcpdump/checksum.c | 24 +- contrib/tcpdump/cmake/Modules/FindPCAP.cmake | 36 ++ contrib/tcpdump/cmakeconfig.h.in | 5 + contrib/tcpdump/config.h.in | 11 +- contrib/tcpdump/configure | 136 +++++-- contrib/tcpdump/configure.ac | 50 ++- contrib/tcpdump/diag-control.h | 30 +- contrib/tcpdump/doc/README.NetBSD.md | 22 -- contrib/tcpdump/doc/README.aix.md | 17 - contrib/tcpdump/doc/README.haiku.md | 33 -- contrib/tcpdump/doc/README.solaris.md | 46 --- contrib/tcpdump/extract.h | 6 +- contrib/tcpdump/ipproto.c | 3 +- contrib/tcpdump/ipproto.h | 2 +- contrib/tcpdump/missing/getopt_long.h | 2 +- contrib/tcpdump/missing/snprintf.c | 508 --------------------------- contrib/tcpdump/netdissect-stdinc.h | 15 - contrib/tcpdump/netdissect.c | 2 +- contrib/tcpdump/netdissect.h | 24 +- contrib/tcpdump/nfs.h | 2 +- contrib/tcpdump/ntp.c | 26 +- contrib/tcpdump/ntp.h | 2 + contrib/tcpdump/parsenfsfh.c | 17 +- contrib/tcpdump/print-802_11.c | 2 +- contrib/tcpdump/print-arista.c | 19 +- contrib/tcpdump/print-ascii.c | 20 +- contrib/tcpdump/print-bootp.c | 117 +++--- contrib/tcpdump/print-domain.c | 10 +- contrib/tcpdump/print-egp.c | 186 +++++----- contrib/tcpdump/print-frag6.c | 3 + contrib/tcpdump/print-icmp6.c | 187 +++++----- contrib/tcpdump/print-ip.c | 22 +- contrib/tcpdump/print-ip6.c | 8 +- contrib/tcpdump/print-ip6opts.c | 129 +++---- contrib/tcpdump/print-isakmp.c | 8 +- contrib/tcpdump/print-isoclns.c | 82 ++--- contrib/tcpdump/print-juniper.c | 4 +- contrib/tcpdump/print-lspping.c | 5 +- contrib/tcpdump/print-lwapp.c | 86 ++--- contrib/tcpdump/print-mobility.c | 138 +++----- contrib/tcpdump/print-msdp.c | 51 ++- contrib/tcpdump/print-ntp.c | 4 +- contrib/tcpdump/print-otv.c | 74 ---- contrib/tcpdump/print-pflog.c | 2 +- contrib/tcpdump/print-ppp.c | 2 - contrib/tcpdump/print-ptp.c | 80 +++-- contrib/tcpdump/print-raw.c | 2 +- contrib/tcpdump/print-sunrpc.c | 2 +- contrib/tcpdump/print-tcp.c | 60 ++-- contrib/tcpdump/print-udp.c | 4 +- contrib/tcpdump/print-zep.c | 42 +-- contrib/tcpdump/rpc_auth.h | 2 +- contrib/tcpdump/rpc_msg.h | 2 +- contrib/tcpdump/tcpdump.1.in | 68 +++- contrib/tcpdump/tcpdump.c | 358 ++++++++++++++++--- contrib/tcpdump/timeval-operations.h | 2 + contrib/tcpdump/udp.h | 4 +- contrib/tcpdump/util-print.c | 63 ++-- usr.sbin/tcpdump/tcpdump/Makefile | 1 - usr.sbin/tcpdump/tcpdump/config.h | 42 +-- 69 files changed, 1592 insertions(+), 1669 deletions(-) diff --git a/contrib/tcpdump/CHANGES b/contrib/tcpdump/CHANGES index b63d1eb658d3..72496fde7a43 100644 --- a/contrib/tcpdump/CHANGES +++ b/contrib/tcpdump/CHANGES @@ -1,3 +1,76 @@ +Tuesday, December 30, 2025 / The Tcpdump Group + Summary for 4.99.6 tcpdump release + Remove protocol decoding for: + OTV (draft-hasmit-otv-04, this Internet-Draft is no longer active). + Refine protocol decoding for: + DNS: Use ND_TCHECK_LEN() instead of a custom bounds check. + IPv6: Add a missing comma and remove a colon in the output. + TCP: Note if the Urgent Pointer is non-zero while URG flag not set, + if the verbose level is > 1 (option -vv and more). + TCP: Note if the Acknowledgment Number is non-zero while ACK flag not set, + if the verbose level is > 1 (option -vv and more). + TCP: Fix Reset segment processing. + IP, IPv6: Fix setting the snapshot length for the payload. + IP: Use ND_TTEST_LEN() instead of a custom bounds check. + frag6: Add a bounds check in non-verbose mode. + PTP: Remove spaces before colons in output. + PTP: Fix management packet fields. + ISO: Avoid undefined behavior and integer overflow in the Fletcher + checksum calculation. + NFS: Delete dead code. + BOOTP: Use an uint16_t variable to get the result of a GET_BE_U_2(). + ZEP: use the existing NTP time formatting code. + NTP: Fix p_ntp_time_fmt() using epoch 1/epoch 2 convention (RFC 4330). + NTP: Update a field name with the RFC 5905 name (Origin Timestamp). + IPv6 mobility: Modernize packet parsing and make fixes. + IP6OPTS: Modernize packet parsing and make fixes. + VXLAN: Add UDP port 8472 used by Linux as the default port. + EGP: Replace custom code with tok2str(); Modernize packet parsing and + fix printing with -v option. + User interface: + Add optional unit suffix on -C file size. + Improve the handling of size suffixes for -C. + Print errors for options -A, -x[x] and -X[X] (mutually exclusive). + Print errors about -C, -G and -z options usage. + For PCAP_ERROR_CAPTURE_NOTSUP, show the error message provided + by libpcap for that error if it's non-empty. + Update the -z option processing. Print "invalid option -- z" when it is. + Add the -g option, causing IPv4 output in verbose mode to be on one line. + Other: + Avoid race condition when receiving signal during shutdown. + Always show the interface name in error messages when the + interface can't be opened. + Clean up the message shown if a -i flag is specified with an + interface index that's too large. + Source code: + Fix '-tt' option printing when time > 2106-02-07T06:28:15Z. + Add sub-second packet timestamp checks for invalid micro/nano. + Remove unused missing/snprintf.c. + Fix incompatible pointer types with time functions calls on Windows. + Use C99 macros to define 64-bit constants and maximum 64-bit values. + Windows: + Fixed to find wpcap.dll if WinPcap isn't installed and Npcap was + installed without the WinPcap API compatibility option. (GitHub + issue #1226). + Building and testing: + Makefile.in: Use a local libpcap in the releasecheck target. + CMake: Fix build with CMake 3.31. + autotools, CMake: don't separately test whether snprintf(3) is + available and whether it's suitable - the test for whether it's + suitable also fails if it's unavailable. + CMake: Skip snprintf(3) tests when cross-compiling. + autotools, CMake: fix issues with snprintf test and sanitizers. + CMake: check whether check_c_source_runs() works, treat the build + as a cross-compile if it doesn't work. + Autoconf: Use AC_SYS_YEAR2038_RECOMMENDED when possible if the + environment variable BUILD_YEAR2038 = yes (via autogen.sh). + Autoconf: Avoid incorrectly include the libpcap's config.h. + Autoconf: Refine reporting of os-proto.h. + Require config.h to be from the tcpdump build. + AppVeyor: Update Npcap SDK to 1.15. + autogen.sh: Allow to configure Autoconf warnings. + autogen.sh: Delete all trailing blank lines at end of configure. + Friday, August 30, 2024 / The Tcpdump Group Summary for 4.99.5 tcpdump release Refine protocol decoding for: @@ -38,7 +111,7 @@ Friday, August 30, 2024 / The Tcpdump Group OSPF: Pad TLVs in LS_OPAQUE_TYPE_RI to multiples of 4 bytes. OSPF: Update LS-Ack printing not to run off the end of the packet. OSPF6: Fix an undefined behavior. - pflog: use nd_ types in struct pfloghdr. + pflog: Use nd_ types in struct pfloghdr. PPP: Check if there is some data to hexdump. PPP: Remove an extra colon before LCP Callback Operation. Use the buffer stack for de-escaping PPP; fixes CVE-2024-2397; @@ -122,6 +195,7 @@ Friday, August 30, 2024 / The Tcpdump Group Make various improvements to the man page. Add initial README file for Haiku. Make various improvements to CONTRIBUTING.md. + man: Clarify the "any" pseudo-interface further. Friday, April 7, 2023 / The Tcpdump Group Summary for 4.99.4 tcpdump release @@ -179,7 +253,7 @@ Saturday, December 31, 2022 / The Tcpdump Group 802.11: Fetch the CF and TIM IEs a field at a time. 802.15.4, BGP, LISP: fix some length checks, compiler warnings, and undefined behavior warnings. - PFLOG: handle LINKTYPE_PFLOG/DLT_PFLOG files from all OSes on all + PFLOG: Handle LINKTYPE_PFLOG/DLT_PFLOG files from all OSes on all OSes. RRCP: support more Realtek protocols than just RRCP. MPLS: show the EXP field as TC, as per RFC 5462. diff --git a/contrib/tcpdump/CMakeLists.txt b/contrib/tcpdump/CMakeLists.txt index f9071295eff1..6b8647201038 100644 --- a/contrib/tcpdump/CMakeLists.txt +++ b/contrib/tcpdump/CMakeLists.txt @@ -13,14 +13,21 @@ else(WIN32) # on a "long-term support" version # of some OS and that # version supplies an older version of CMake; # - # otherwise, require 3.5, so we don't get messages warning - # that support for versions of CMake lower than 3.5 is + # otherwise, if it's a version less than 3.10, require only + # 3.5, just in case somebody is configuring with CMake + # on a "long-term support" version # of some OS and that + # version supplies an older version of CMake; + # + # otherwise, require 3.10, so we don't get messages warning + # that support for versions of CMake lower than 3.10 is # deprecated. # if(CMAKE_VERSION VERSION_LESS "3.5") cmake_minimum_required(VERSION 2.8.12) - else() + elseif(CMAKE_VERSION VERSION_LESS "3.10") cmake_minimum_required(VERSION 3.5) + else() + cmake_minimum_required(VERSION 3.10) endif() endif(WIN32) @@ -392,6 +399,35 @@ if(MSVC) endif (USE_STATIC_RT) endif(MSVC) +# +# CMake's definition of "cross-compiling" appears to be "compiling +# for an *operating system* other than the one on which the build +# is being done*. +# +# This is an inadequate definition, as people build for the same +# operating system but a different instruction set, e.g. building +# on an IA-32 or x86-64 Linux box for an Arm embedded Linux box, +# or building Arm code on an IA-32 or x86-64 Windows box. +# +# So just test whether check_c_source_runs() on a trivial program +# works; if not, it's probably because the generated code won't +# run on the platform on which we're running. +# +include(CheckCSourceRuns) +if (NOT CMAKE_CROSSCOMPILING) + check_c_source_runs(" + int main() + { + return 0; + } + " + CHECK_C_SOURCE_RUNS_WORKS + ) + if (NOT CHECK_C_SOURCE_RUNS_WORKS) + set(CMAKE_CROSSCOMPILING TRUE) + endif() +endif() + ################################################################### # Detect available platform features ################################################################### @@ -407,11 +443,16 @@ include(CheckVariableExists) include(CheckTypeSize) # -# Get the size of a time_t, to know whether it's 32-bit or 64-bit. +# Get the size of a time_t, to know whether it's 32-bit or 64-bit. Print it. # cmake_push_check_state() set(CMAKE_EXTRA_INCLUDE_FILES time.h) check_type_size("time_t" SIZEOF_TIME_T) +if(SIZEOF_TIME_T EQUAL 4) + message(STATUS "32-bit time_t") +elseif(SIZEOF_TIME_T EQUAL 8) + message(STATUS "64-bit time_t") +endif() cmake_pop_check_state() # @@ -493,67 +534,77 @@ else(STDLIBS_HAVE_GETSERVENT) endif(STDLIBS_HAVE_GETSERVENT) cmake_pop_check_state() -# -# Make sure we have snprintf(); we require it. -# We use check_symbol_exists(), as it isn't necessarily an external -# function - in Visual Studio, for example, it is an inline function -# calling an external function. -# -check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF) -if(NOT HAVE_SNPRINTF) - message(FATAL_ERROR "snprintf() is required but wasn't found") -endif() - -# -# Require a proof of suitable snprintf(3), same as in Autoconf. -# -include(CheckCSourceRuns) -check_c_source_runs(" -#include -#include -#include -#include - -int main() -{ - char buf[100]; - uint64_t t = (uint64_t)1 << 32; - - snprintf(buf, sizeof(buf), \"%zu\", sizeof(buf)); - if (strncmp(buf, \"100\", sizeof(buf))) - return 1; - - snprintf(buf, sizeof(buf), \"%zd\", -sizeof(buf)); - if (strncmp(buf, \"-100\", sizeof(buf))) - return 2; - - snprintf(buf, sizeof(buf), \"%\" PRId64, -t); - if (strncmp(buf, \"-4294967296\", sizeof(buf))) - return 3; - - snprintf(buf, sizeof(buf), \"0o%\" PRIo64, t); - if (strncmp(buf, \"0o40000000000\", sizeof(buf))) - return 4; - - snprintf(buf, sizeof(buf), \"0x%\" PRIx64, t); - if (strncmp(buf, \"0x100000000\", sizeof(buf))) - return 5; - - snprintf(buf, sizeof(buf), \"%\" PRIu64, t); - if (strncmp(buf, \"4294967296\", sizeof(buf))) - return 6; - - return 0; -} - -" - SUITABLE_SNPRINTF -) -if(NOT SUITABLE_SNPRINTF) - message(FATAL_ERROR +if (NOT CMAKE_CROSSCOMPILING) + # + # Require a proof of suitable snprintf(3), same as in Autoconf. + # + check_c_source_runs(" + #include + #include + #include + #include + + #if defined(_WIN32) && !defined(_SSIZE_T_DEFINED) + /* + * On UN*Xes, this is a signed integer type of the same size as size_t. + * + * It's not defined by Visual Studio; we assume that ptrdiff_t will + * be a type that is a signed integer type of the same size as size_t. + */ + typedef ptrdiff_t ssize_t; + #endif + + /* + * Avoid trying to cast negative values to unsigned types, or doing + * shifts of signed types, in order not to have the test program fail + * if we're building with undefined-behavior sanitizers enabled. + */ + int main() + { + char buf[100]; + unsigned int ui = sizeof(buf); + int i = sizeof(buf); + int64_t i64 = INT64_C(0x100000000); + uint64_t ui64 = UINT64_C(0x100000000); + + snprintf(buf, sizeof(buf), \"%zu\", (size_t)ui); + if (strncmp(buf, \"100\", sizeof(buf))) + return 1; + + snprintf(buf, sizeof(buf), \"%zd\", (ssize_t)(-i)); + if (strncmp(buf, \"-100\", sizeof(buf))) + return 2; + + snprintf(buf, sizeof(buf), \"%\" PRId64, -i64); + if (strncmp(buf, \"-4294967296\", sizeof(buf))) + return 3; + + snprintf(buf, sizeof(buf), \"0o%\" PRIo64, ui64); + if (strncmp(buf, \"0o40000000000\", sizeof(buf))) + return 4; + + snprintf(buf, sizeof(buf), \"0x%\" PRIx64, ui64); + if (strncmp(buf, \"0x100000000\", sizeof(buf))) + return 5; + + snprintf(buf, sizeof(buf), \"%\" PRIu64, ui64); + if (strncmp(buf, \"4294967296\", sizeof(buf))) + return 6; + + return 0; + } + + " + SUITABLE_SNPRINTF + ) + if(NOT SUITABLE_SNPRINTF) + message(FATAL_ERROR "The snprintf(3) implementation in this libc is not suitable, tcpdump would not work correctly even if it managed to compile." - ) + ) + endif() +else() + message(STATUS "Skipped SUITABLE_SNPRINTF because cross-compiling.") endif() check_function_exists(getopt_long HAVE_GETOPT_LONG) @@ -908,7 +959,7 @@ check_function_exists(pcap_dump_ftell64 HAVE_PCAP_DUMP_FTELL64) # we should check for it, so that we can use it if it's present. # # So we check for pcap_open() and pcap_findalldevs_ex() if 1) this isn't -# macOS or 2) the the libpcap we found is not a system library, meaning +# macOS or 2) the libpcap we found is not a system library, meaning # that its path begins neither with /usr/lib (meaning it's a system # dylib) nor /Application/Xcode.app (meaning it's a file in # the Xcode SDK). @@ -1160,6 +1211,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.devel OR EXISTS ${CMAKE_BINARY_DIR}/.devel) check_and_add_compiler_option(-Wall) check_and_add_compiler_option(-Wassign-enum) check_and_add_compiler_option(-Wcast-qual) + check_and_add_compiler_option(-Wcomma) check_and_add_compiler_option(-Wmissing-prototypes) check_and_add_compiler_option(-Wmissing-variable-declarations) check_and_add_compiler_option(-Wold-style-definition) @@ -1331,7 +1383,6 @@ set(NETDISSECT_SOURCE_LIST_C print-openflow.c print-ospf.c print-ospf6.c - print-otv.c print-pflog.c print-pgm.c print-pim.c @@ -1496,6 +1547,9 @@ add_executable(tcpdump ${TCPDUMP_SOURCE_LIST_C}) if(NOT C_ADDITIONAL_FLAGS STREQUAL "") set_target_properties(tcpdump PROPERTIES COMPILE_FLAGS ${C_ADDITIONAL_FLAGS}) endif() +if(NOT "${PCAP_LINK_FLAGS}" STREQUAL "") + set_target_properties(tcpdump PROPERTIES LINK_FLAGS ${PCAP_LINK_FLAGS}) +endif() target_link_libraries(tcpdump netdissect ${TCPDUMP_LINK_LIBRARIES}) ###################################### @@ -1551,7 +1605,7 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) # -# Tcpdump tests +# tcpdump tests # We try to find the Perl interpreter and, if we do, we have the check # rule run tests/TESTrun with it, because just trying to run the TESTrun # script as a command won't work on Windows. diff --git a/contrib/tcpdump/CONTRIBUTING.md b/contrib/tcpdump/CONTRIBUTING.md index 215e4c6831c4..fdad452b47b8 100644 --- a/contrib/tcpdump/CONTRIBUTING.md +++ b/contrib/tcpdump/CONTRIBUTING.md @@ -39,7 +39,7 @@ and ask! 1) Check that there isn't a pull request already opened for the changes you intend to make. -2) [Fork](https://help.github.com/articles/fork-a-repo/) the Tcpdump +2) [Fork](https://help.github.com/articles/fork-a-repo/) the tcpdump [repository](https://github.com/the-tcpdump-group/tcpdump). 3) The easiest way to test your changes on multiple operating systems and diff --git a/contrib/tcpdump/INSTALL.md b/contrib/tcpdump/INSTALL.md index 08fc31b682d0..15b8270ccced 100644 --- a/contrib/tcpdump/INSTALL.md +++ b/contrib/tcpdump/INSTALL.md @@ -18,6 +18,10 @@ directory), do the following steps: run `./autogen.sh` (a shell script). The autogen.sh script will build the `configure` and `config.h.in` files. +* If you build on a Linux 32-bit system, with Autoconf version >= 2.72 +and GNU C Library version >= 2.34, run `export BUILD_YEAR2038=yes` +before running `./autogen.sh` to build with 64-bit time_t (Y2038-safe). + On some system, you may need to set the `AUTORECONF` variable, like: `AUTORECONF=autoreconf-2.69 ./autogen.sh` to select the `autoreconf` version you want to use. diff --git a/contrib/tcpdump/Makefile.in b/contrib/tcpdump/Makefile.in index e991cce2da0f..72dd01d6e3c0 100644 --- a/contrib/tcpdump/Makefile.in +++ b/contrib/tcpdump/Makefile.in @@ -49,7 +49,7 @@ DEFS = @DEFS@ @CPPFLAGS@ @V_DEFS@ # Standard CFLAGS CFLAGS = @CFLAGS@ -FULL_CFLAGS = $(CCOPT) $(DEFS) $(INCLS) $(CFLAGS) +FULL_CFLAGS = $(INCLS) $(CCOPT) $(DEFS) $(CFLAGS) # Standard LDFLAGS LDFLAGS = @LDFLAGS@ @@ -192,7 +192,6 @@ LIBNETDISSECT_SRC=\ print-openflow.c \ print-ospf.c \ print-ospf6.c \ - print-otv.c \ print-pflog.c \ print-pgm.c \ print-pim.c \ @@ -373,7 +372,6 @@ EXTRA_DIST = \ missing/getopt_long.h \ missing/getservent.c \ missing/pcap_dump_ftell.c \ - missing/snprintf.c \ missing/strdup.c \ missing/strlcat.c \ missing/strlcpy.c \ @@ -409,8 +407,6 @@ getservent.o: $(srcdir)/missing/getservent.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getservent.c getopt_long.o: $(srcdir)/missing/getopt_long.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getopt_long.c -snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c strdup.o: $(srcdir)/missing/strdup.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strdup.c strlcat.o: $(srcdir)/missing/strlcat.c @@ -504,7 +500,7 @@ releasetar: tar xf -) && \ echo "No $$TAG tag. Archive build from HEAD."; \ fi && \ - (cd "$$TAG" && "$${AUTORECONF:-autoreconf}" && rm -rf autom4te.cache) && \ + (cd "$$TAG" && ./autogen.sh && rm -rf autom4te.cache) && \ tar cf "$$DIR/$$TAG".tar "$$TAG" && \ rm -f "$$DIR/$$TAG".tar.gz && \ gzip --best "$$DIR/$$TAG".tar && \ @@ -516,6 +512,22 @@ releasecheck: releasetar INSTALL_DIR=/tmp/install_"$$TAG"_$$$$ && \ DIR=`pwd` && \ cd /tmp && \ + rm -rf libpcap && \ + rm -rf install_libpcap && \ + echo "[$@] $$ git clone [...] libpcap.git" && \ + git clone --depth 3 --quiet https://github.com/the-tcpdump-group/libpcap.git && \ + echo "[$@] $$ cd libpcap" && \ + cd libpcap && \ + echo "[$@] $$ ./autogen.sh" && \ + ./autogen.sh && \ + echo "[$@] $$ ./configure --quiet --prefix=/tmp/install_libpcap" && \ + ./configure --quiet --prefix=/tmp/install_libpcap && \ + echo "[$@] $$ make -s " && \ + make -s && \ + echo "[$@] $$ make -s install" && \ + make -s install && \ + echo "[$@] $$ cd .." && \ + cd .. && \ rm -rf "$$TAG" && \ rm -rf "$$INSTALL_DIR" && \ tar xf "$$DIR"/"$$TAG".tar.gz && \ @@ -537,6 +549,8 @@ releasecheck: releasetar touch .devel && \ mkdir build && \ cd build && \ + echo "[$@] $$ export PKG_CONFIG_PATH=/tmp/install_libpcap/lib/pkgconfig" && \ + export PKG_CONFIG_PATH=/tmp/install_libpcap/lib/pkgconfig && \ echo '[$@] $$ cmake -DENABLE_SMB=yes [...] ..' && \ cmake -DENABLE_SMB=yes \ -DCMAKE_INSTALL_PREFIX="$$INSTALL_DIR" \ @@ -551,6 +565,8 @@ releasecheck: releasetar cd ../.. && \ rm -rf "$$TAG" && \ rm -rf "$$INSTALL_DIR" && \ + rm -rf install_libpcap && \ + rm -rf libpcap && \ echo '[$@] Done.' whitespacecheck: diff --git a/contrib/tcpdump/README.md b/contrib/tcpdump/README.md index 566b7b7a874f..a227e126d00c 100644 --- a/contrib/tcpdump/README.md +++ b/contrib/tcpdump/README.md @@ -40,7 +40,7 @@ tcpdump compiles and works on at least the following platforms: * Windows (requires WinPcap or Npcap, and Visual Studio with CMake) ### Dependency on libpcap -Tcpdump uses libpcap, a system-independent interface for user-level +tcpdump uses libpcap, a system-independent interface for user-level packet capture. Before building tcpdump, you must first retrieve and build libpcap. diff --git a/contrib/tcpdump/VERSION b/contrib/tcpdump/VERSION index 33640cd1b928..aeec4132fdd6 100644 --- a/contrib/tcpdump/VERSION +++ b/contrib/tcpdump/VERSION @@ -1 +1 @@ -4.99.5 +4.99.6 diff --git a/contrib/tcpdump/addrtostr.c b/contrib/tcpdump/addrtostr.c index 1fd2cf0908bf..2c4133b5be72 100644 --- a/contrib/tcpdump/addrtostr.c +++ b/contrib/tcpdump/addrtostr.c @@ -127,9 +127,11 @@ addrtostr6 (const void *src, char *dst, size_t size) cur.base = -1; for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { if (words[i] == 0) { - if (cur.base == -1) - cur.base = i, cur.len = 1; - else cur.len++; + if (cur.base == -1) { + cur.base = i; + cur.len = 1; + } else + cur.len++; } else if (cur.base != -1) { if (best.base == -1 || cur.len > best.len) best = cur; diff --git a/contrib/tcpdump/autogen.sh b/contrib/tcpdump/autogen.sh index c84a6b5c5dd2..95c0233c80de 100755 --- a/contrib/tcpdump/autogen.sh +++ b/contrib/tcpdump/autogen.sh @@ -1,6 +1,7 @@ #!/bin/sh -e : "${AUTORECONF:=autoreconf}" +: "${BUILD_YEAR2038:=no}" AUTORECONFVERSION=`$AUTORECONF --version 2>&1 | grep "^autoreconf" | sed 's/.*) *//'` @@ -21,5 +22,43 @@ if [ "$maj" = "" ] || [ "$min" = "" ] || \ exit 1 fi +# On Linux, if Autoconf version >= 2.72 and GNU C Library version >= 2.34, +# s/AC_SYS_LARGEFILE/AC_SYS_YEAR2038_RECOMMENDED/ to ensure time_t +# is Y2038-safe. +if [ "$BUILD_YEAR2038" = yes ] && [ "`uname -s`" = Linux ]; then + if [ "$maj" -gt 2 ] || { [ "$maj" -eq 2 ] && [ "$min" -ge 72 ]; }; then + GLIBC_VERSION=`ldd --version|head -1|grep GLIBC|sed 's/.* //'` + maj_glibc=`echo "$GLIBC_VERSION" | cut -d. -f1` + min_glibc=`echo "$GLIBC_VERSION" | cut -d. -f2` + echo "GNU C Library identification: $GLIBC_VERSION" + if [ "$maj_glibc" -gt 2 ] || { [ "$maj_glibc" -eq 2 ] && \ + [ "$min_glibc" -ge 34 ]; }; then + CONFIGURE_AC_NEW="configure.ac.new$$" + sed 's/^# \(AC_SYS_YEAR2038_RECOMMENDED\)/\1/' \ + "$CONFIGURE_AC_NEW" + cmp -s configure.ac "$CONFIGURE_AC_NEW" || \ + cat "$CONFIGURE_AC_NEW" >configure.ac + rm -f "$CONFIGURE_AC_NEW" + echo 'Setup to ensure time_t is Y2038-safe.' + fi + fi +fi + echo "$AUTORECONF identification: $AUTORECONFVERSION" -"$AUTORECONF" -f + +# configure.ac is an Autoconf 2.69 file, but it works as expected even with +# Autoconf 2.72. However, in Autoconf versions 2.70 and later obsolete +# construct warnings are enabled by default, which adds varying (depending on +# the branch) amount of noise to the build matrix output, so provide a means +# to silence that. +env ${AUTOCONF_WARNINGS:+WARNINGS="$AUTOCONF_WARNINGS"} "$AUTORECONF" -f + +# Autoconf 2.71 adds a blank line after the final "exit 0" on Linux, but not +# on OpenBSD. Remove this difference to make it easier to compare the result +# of "make releasetar" across different platforms. From sed one-liners: +# "delete all trailing blank lines at end of file (works on all seds)". Don't +# use mktemp(1) because AIX does not have it. +CONFIGURE_NEW="configure.new$$" +sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' "$CONFIGURE_NEW" +cmp -s configure "$CONFIGURE_NEW" || cat "$CONFIGURE_NEW" >configure +rm -f "$CONFIGURE_NEW" diff --git a/contrib/tcpdump/checksum.c b/contrib/tcpdump/checksum.c index 4bb97f1e33f4..bb07664dcec7 100644 --- a/contrib/tcpdump/checksum.c +++ b/contrib/tcpdump/checksum.c @@ -106,9 +106,9 @@ create_osi_cksum (const uint8_t *pptr, int checksum_offset, int length) int x; int y; - uint32_t mul; + int32_t mul; uint32_t c0; - uint32_t c1; + uint64_t c1; uint16_t checksum; int idx; @@ -134,21 +134,23 @@ create_osi_cksum (const uint8_t *pptr, int checksum_offset, int length) mul = (length - checksum_offset)*(c0); - x = mul - c0 - c1; - y = c1 - mul - 1; - - if ( y >= 0 ) y++; - if ( x < 0 ) x--; + /* + * Casting c0 and c1 here is guaranteed to be safe, because we know + * they have values between 0 and 254 inclusive. These casts are + * done to ensure that all of the arithmetic operations are + * well-defined (i.e., not mixing signed and unsigned integers). + */ + x = mul - (int)c0 - (int)c1; + y = (int)c1 - mul; x %= 255; y %= 255; - - if (x == 0) x = 255; - if (y == 0) y = 255; + if (x <= 0) x += 255; + if (y <= 0) y += 255; y &= 0x00FF; - checksum = ((x << 8) | y); + checksum = (uint16_t)((x << 8) | y); return checksum; } diff --git a/contrib/tcpdump/cmake/Modules/FindPCAP.cmake b/contrib/tcpdump/cmake/Modules/FindPCAP.cmake index 11074655f457..e27709256f72 100644 --- a/contrib/tcpdump/cmake/Modules/FindPCAP.cmake +++ b/contrib/tcpdump/cmake/Modules/FindPCAP.cmake @@ -61,6 +61,42 @@ if(WIN32) if(PCAP_FOUND) set(PCAP_LIBRARIES ${PCAP_LIBRARY}) set(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR}) + + # + # We need to look for wpcap.dll in \Windows\System32\Npcap first, + # as either: + # + # 1) WinPcap isn't installed and Npcap isn't installed in "WinPcap + # API-compatible Mode", so there's no wpcap.dll in + # \Windows\System32, only in \Windows\System32\Npcap; + # + # 2) WinPcap is installed and Npcap isn't installed in "WinPcap + # API-compatible Mode", so the wpcap.dll in \Windows\System32 + # is a WinPcap DLL, but we'd prefer an Npcap DLL (we should + # work with either one if we're configured against WinPcap, + # and we'll probably require Npcap if we're configured against + # it), and that's in \Windows\System32\Npcap; + # + # 3) Npcap is installed in "WinPcap API-compatible Mode", so both + # \Windows\System32 and \Windows\System32\Npcap have an Npcap + # wpcap.dll. + # + # Unfortunately, Windows has no notion of an rpath, so we can't + # set the rpath to include \Windows\System32\Npcap at link time; + # what we need to do is to link wpcap as a delay-load DLL and + # add \Windows\System32\Npcap to the DLL search path early in + # main() with a call to SetDllDirectory(). + # + # We add /delayload:wpcap.dll to the linker options here. + # + # See https://npcap.com/guide/npcap-devguide.html#npcap-feature-native-dll-implicitly + # + set(PCAP_LINK_FLAGS /delayload:wpcap.dll) + + # + # Delay-loading libraries means we need to link with delayimp.lib. + # + set(PCAP_LIBRARIES ${PCAP_LIBRARIES} delayimp.lib) endif() else(WIN32) # diff --git a/contrib/tcpdump/cmakeconfig.h.in b/contrib/tcpdump/cmakeconfig.h.in index 0bd1e96e165a..244bcb818a6a 100644 --- a/contrib/tcpdump/cmakeconfig.h.in +++ b/contrib/tcpdump/cmakeconfig.h.in @@ -1,5 +1,8 @@ /* cmakeconfig.h.in */ +#ifndef TCPDUMP_CONFIG_H_ +#define TCPDUMP_CONFIG_H_ + /* Define to 1 if arpa/inet.h declares `ether_ntohost' */ #cmakedefine ARPA_INET_H_DECLARES_ETHER_NTOHOST 1 @@ -288,3 +291,5 @@ /* Define to the type of an unsigned integer type wide enough to hold a pointer, if such a type exists, and if the system does not define it. */ #cmakedefine uintptr_t 1 + +#endif // TCPDUMP_CONFIG_H_ diff --git a/contrib/tcpdump/config.h.in b/contrib/tcpdump/config.h.in index c1bc5f7d9de8..da600e885fde 100644 --- a/contrib/tcpdump/config.h.in +++ b/contrib/tcpdump/config.h.in @@ -1,5 +1,10 @@ /* config.h.in. Generated from configure.ac by autoheader. */ + +#ifndef TCPDUMP_CONFIG_H_ +#define TCPDUMP_CONFIG_H_ + + /* Define to 1 if arpa/inet.h declares `ether_ntohost' */ #undef ARPA_INET_H_DECLARES_ETHER_NTOHOST @@ -75,7 +80,7 @@ /* define if the OS provides AF_INET6 and struct in6_addr */ #undef HAVE_OS_IPV6_SUPPORT -/* if there's an os_proto.h for this platform, to use additional prototypes */ +/* if there's an os-proto.h for this platform, to use additional prototypes */ #undef HAVE_OS_PROTO_H /* Define to 1 if you have the `pcap_breakloop' function. */ @@ -287,3 +292,7 @@ /* Define to the type of an unsigned integer type wide enough to hold a pointer, if such a type exists, and if the system does not define it. */ #undef uintptr_t + + +#endif // TCPDUMP_CONFIG_H_ + diff --git a/contrib/tcpdump/configure b/contrib/tcpdump/configure index 9400d62bc838..222d8a513fd0 100755 --- a/contrib/tcpdump/configure +++ b/contrib/tcpdump/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for tcpdump 4.99.5. +# Generated by GNU Autoconf 2.71 for tcpdump 4.99.6. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tcpdump' PACKAGE_TARNAME='tcpdump' -PACKAGE_VERSION='4.99.5' -PACKAGE_STRING='tcpdump 4.99.5' +PACKAGE_VERSION='4.99.6' +PACKAGE_STRING='tcpdump 4.99.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1306,7 +1306,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tcpdump 4.99.5 to adapt to many kinds of systems. +\`configure' configures tcpdump 4.99.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1372,7 +1372,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tcpdump 4.99.5:";; + short | recursive ) echo "Configuration of tcpdump 4.99.6:";; esac cat <<\_ACEOF @@ -1489,7 +1489,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tcpdump configure 4.99.5 +tcpdump configure 4.99.6 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2086,7 +2086,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tcpdump $as_me 4.99.5, which was +It was created by tcpdump $as_me 4.99.6, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4248,6 +4248,11 @@ then : fi + +# On Linux, if Autoconf version >= 2.72 and GNU C Library version >= 2.34, +# uncomment AC_SYS_YEAR2038_RECOMMENDED to ensure time_t is Y2038-safe. +# (Can be done by autogen.sh) +# AC_SYS_YEAR2038_RECOMMENDED # # Get the size of a void *, to know whether this is a 32-bit or 64-bit build. # @@ -5838,18 +5843,6 @@ then : fi -# -# Make sure we have snprintf(); we require it. -# -ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" -if test "x$ac_cv_func_snprintf" = xyes -then : - -else $as_nop - as_fn_error $? "snprintf() is required but wasn't found" "$LINENO" 5 -fi - - # # It became apparent at some point that using a suitable C99 compiler does not # automatically mean snprintf(3) implementation in the libc supports all the @@ -5883,32 +5876,50 @@ else $as_nop #include #include +#if defined(_WIN32) && !defined(_SSIZE_T_DEFINED) +/* + * On UN*Xes, this is a signed integer type of the same size as size_t. + * + * It's not defined by Visual Studio; we assume that ptrdiff_t will + * be a type that is a signed integer type of the same size as size_t. + */ +typedef ptrdiff_t ssize_t; +#endif + +/* + * Avoid trying to cast negative values to unsigned types, or doing + * shifts of signed types, in order not to have the test program fail + * if we're building with undefined-behavior sanitizers enabled. + */ int main() { char buf[100]; - uint64_t t = (uint64_t)1 << 32; + unsigned int ui = sizeof(buf); + int i = sizeof(buf); + int64_t i64 = INT64_C(0x100000000); + uint64_t ui64 = UINT64_C(0x100000000); - snprintf(buf, sizeof(buf), "%zu", sizeof(buf)); + snprintf(buf, sizeof(buf), "%zu", (size_t)ui); if (strncmp(buf, "100", sizeof(buf))) return 1; - snprintf(buf, sizeof(buf), "%zd", -sizeof(buf)); + snprintf(buf, sizeof(buf), "%zd", (ssize_t)(-i)); if (strncmp(buf, "-100", sizeof(buf))) return 2; - snprintf(buf, sizeof(buf), "%" PRId64, -t); + snprintf(buf, sizeof(buf), "%" PRId64, -i64); if (strncmp(buf, "-4294967296", sizeof(buf))) return 3; - snprintf(buf, sizeof(buf), "0o%" PRIo64, t); + snprintf(buf, sizeof(buf), "0o%" PRIo64, ui64); if (strncmp(buf, "0o40000000000", sizeof(buf))) return 4; - snprintf(buf, sizeof(buf), "0x%" PRIx64, t); + snprintf(buf, sizeof(buf), "0x%" PRIx64, ui64); if (strncmp(buf, "0x100000000", sizeof(buf))) return 5; - snprintf(buf, sizeof(buf), "%" PRIu64, t); + snprintf(buf, sizeof(buf), "%" PRIu64, ui64); if (strncmp(buf, "4294967296", sizeof(buf))) return 6; @@ -7845,6 +7856,11 @@ fi rm -f os-proto.h + # + # MKDEP defaults to no-op (":") if we don't test whether the compiler + # supports generating dependencies + # + MKDEP=: if test "${LBL_CFLAGS+set}" = set; then V_CCOPT="$V_CCOPT ${LBL_CFLAGS}" fi @@ -8066,6 +8082,59 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag="$save_ac_c_werror_flag" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wcomma option" >&5 +printf %s "checking whether the compiler supports the -Wcomma option... " >&6; } *** 5391 LINES SKIPPED *** From nobody Thu Apr 9 08:25:46 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frtL23spBz6YkW7 for ; Thu, 09 Apr 2026 08:25: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frtL23Hmjz3CNJ for ; Thu, 09 Apr 2026 08:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cnzPxUdOY81+BVo+bwbcSAO2eMikDHWsyZVJW7GTvM=; b=wFcxgJCjhH5wtsTcuHEdbhuqW14gJohXpXKCTYIy/946W2otkkS1dDi6DdPvN9TVvwLh6S OgKkgr5zLpFDBKqBXFijTXhLo6wDqU8TitWmM4ljcrslfnszpR3EbIK2ddQZlv/LJ5O7na 68KZRMg+j2y2ZMNgL+8VeGfm+ZZ3dkRjmQqmYMCJosqagriPZ5APNwRk+3d9da0T1dRHDV e2CVC/l5mhw+J63YJDkGIBqedOUHvzPDQRCnpFFxzyMJeUvC9FMsJzYdeN8OJ97WKc+bcl +mZEsh+/o7nIBreLuzZYYxNWXvB3pmR/q4vrBdxcY6M7r8J4ylRz86aGnBHAEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775723146; a=rsa-sha256; cv=none; b=RJXtc9wxj6mgBSlchNLa7jOWnwVRyVeN0ppvXAA5mIGVvA1TylxQLqO+68JNjbajSqe8rn 16In9kvMiTMMuUNBvW0ItfhpRR19jbxaKwPoPvvI+Iefpbf7XmvDoHbrSP6ozqMbRQ3Wru RV1HC6JeIEg+n2bPgKJ8PJaElv89hnJNn+owD2NQgNmn3vLYSJkCbx1ibpwyRGCy+18v4c Ae3pmnHEmsSqsXmS7F6oh7NREibKhvslA2We8wyRhL+2Xkg9xn70mcolpp3tiB8MnV7Duj 5NwIZ01Wf0F6KHpDqmp2+bydIJvlXmAh8EafTnWlkYwygHg6qAR+7mLKt/dtJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cnzPxUdOY81+BVo+bwbcSAO2eMikDHWsyZVJW7GTvM=; b=ZSRz4t6bFMKnHCm+TZvll65z2iaQXoYHj33v1I1rIvXkXYp+HrnM2kUIOzb3xDtXcfHlyF a18fDHAJnDU9arRUTBb+6XzZciQMarVeWeDQgiEFsSVApZ/S11knpJ7nH22D8/heHqVHhg iMh6pYkcidKAB1uMgfv/Rhp/tDpm/1PgOFAlyTqRO6nxlZTPZ2VPLQWTtqCIR3MB5QYxDB VWfNBOYI1386R2S54zjbsFJCctplyESda7tNs04Y16fdVlCILJdqCGve9dPty4YZ0ixuqF 4kPAzd5CCfK2gRTG+AR8jderI5JUEqbRU+6jgreLY31epXGShKQ8C6AVMnBwHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frtL22Hlcz14dH for ; Thu, 09 Apr 2026 08:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40780 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 08:25:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5b4d2229f788 - stable/15 - kqueue: assert that kqueue knote lists own the knotes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 5b4d2229f788502359be39135073c606af444251 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 08:25:46 +0000 Message-Id: <69d7628a.40780.828a533@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5b4d2229f788502359be39135073c606af444251 commit 5b4d2229f788502359be39135073c606af444251 Author: Konstantin Belousov AuthorDate: 2026-03-31 09:13:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-08 18:22:39 +0000 kqueue: assert that kqueue knote lists own the knotes (cherry picked from commit 51db69c14fb1a1c2dc807695e6f564d498d33d5a) --- sys/kern/kern_event.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index e8e670d39d09..2bb965f3e5e4 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1740,9 +1740,11 @@ findkn: KQ_LOCK(kq); if (kev->ident < kq->kq_knlistsize) { - SLIST_FOREACH(kn, &kq->kq_knlist[kev->ident], kn_link) + SLIST_FOREACH(kn, &kq->kq_knlist[kev->ident], kn_link) { + MPASS(kn->kn_kq == kq); if (kev->filter == kn->kn_filter) break; + } } } else { if ((kev->flags & EV_ADD) == EV_ADD) { @@ -1768,10 +1770,12 @@ findkn: list = &kq->kq_knhash[ KN_HASH((u_long)kev->ident, kq->kq_knhashmask)]; - SLIST_FOREACH(kn, list, kn_link) + SLIST_FOREACH(kn, list, kn_link) { + MPASS(kn->kn_kq == kq); if (kev->ident == kn->kn_id && kev->filter == kn->kn_filter) break; + } } } @@ -2862,6 +2866,7 @@ knote_attach(struct knote *kn, struct kqueue *kq) KASSERT(kn_in_flux(kn), ("knote %p not marked influx", kn)); KQ_OWNED(kq); + MPASS(kn->kn_kq == kq); if ((kq->kq_state & KQ_CLOSING) != 0) return (EBADF); @@ -2910,6 +2915,7 @@ knote_drop_detached(struct knote *kn, struct thread *td) msleep(kq, &kq->kq_lock, PSOCK, "kqflxwt", 0); } + MPASS(kn->kn_kq == kq); if (kn->kn_fop->f_isfd) list = &kq->kq_knlist[kn->kn_id]; else @@ -3086,6 +3092,7 @@ kqueue_fork_copy_list(struct klist *knlist, struct knote *marker, KQ_OWNED(kq); kn = SLIST_FIRST(knlist); while (kn != NULL) { + MPASS(kn->kn_kq == kq); if ((kn->kn_status & KN_DETACHED) != 0 || (kn_in_flux(kn) && (kn->kn_status & KN_SCAN) == 0)) { kn = SLIST_NEXT(kn, kn_link); @@ -3119,6 +3126,7 @@ kqueue_fork_copy(struct filedesc *fdp, struct file *fp, struct file *fp1, kq = kq1->kq_forksrc; marker = knote_alloc(M_WAITOK); marker->kn_status = KN_MARKER; + marker->kn_kq = kq; KQ_LOCK(kq); for (i = 0; i < kq->kq_knlistsize; i++) { @@ -3230,6 +3238,7 @@ kern_proc_kqueue_report(struct sbuf *s, struct proc *p, int kq_fd, KQ_LOCK(kq); for (i = 0; i < kq->kq_knlistsize; i++) { SLIST_FOREACH(kn, &kq->kq_knlist[i], kn_link) { + MPASS(kn->kn_kq == kq); error = kern_proc_kqueue_report_one(s, p, kq_fd, kq, kn, compat32); if (error != 0) @@ -3240,6 +3249,7 @@ kern_proc_kqueue_report(struct sbuf *s, struct proc *p, int kq_fd, goto out; for (i = 0; i <= kq->kq_knhashmask; i++) { SLIST_FOREACH(kn, &kq->kq_knhash[i], kn_link) { + MPASS(kn->kn_kq == kq); error = kern_proc_kqueue_report_one(s, p, kq_fd, kq, kn, compat32); if (error != 0) From nobody Thu Apr 9 08:25:47 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frtL41D2fz6YkF3 for ; Thu, 09 Apr 2026 08:25: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frtL33BGZz3CSt for ; Thu, 09 Apr 2026 08:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqOa0Ugiugzb0HqE+0HHRayardcSlPFSt5OjgragBF4=; b=utXmCflKAag0BYGhfrJbqkwyJNpZtMyvsdLaVazz4fcwX5R9SftCx7p/RSXucvdHtb6wPN sFRYnBVHju8fyktcTB5TLrmUaqQB6hkM4FE7BKb/heC5SfzbMVW1W9tWs0e0+GTyCr0PBe QIDGye6t8RXGR8lMw+gQjoe2ulB+9WBRd4XwcoMZbBg5x8PdNLEKQ3uq696MpmiNUrtAUT jEzEd2UsPVzRw28A18qPG04ndCTMYAw7zGMD5zQpCn+QSU50tXlgGF1tlZjSv8Ff4dZ+CN PGji8qxUeYkC9R/ufofIBoWkuUe7IGO/FUPGERuNvlh85L++7aLEQpKPX09F4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775723147; a=rsa-sha256; cv=none; b=j80+8ZvY3IiVROGeKfT34vxX+QbZqY3GTgJHp9nRTJMwpGzoEcumlmw3P+wg7ITEXrCtVH XTs3nOPhmo6J6CZsOUyD+Mx/lhQzFILwc6IzkC9dwDOjxZH675bsjH8dr8QihSafXz0mEH ccFIuCcQp8LLf0vn9He6CsMbdWpVB7/yxf18sdYc4MqgqZpaeWn/d4cAjLDaX3wR3OBGOa SjNr/W4ywSL72HP++hofo94rsQNem19+rTrHtMxGHzb3h/wNyL4pJ61CDZ70uCvH1EonSj v8BVIynn31azHjzNz8YtJ+28m8ZQ6sDfbh7ifskyc3BTcu1q5s69XjyjPWcXsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqOa0Ugiugzb0HqE+0HHRayardcSlPFSt5OjgragBF4=; b=v2nsKKtzN2FC4KaqATzdHjXz99PEJjhbz0i9mk+iMZZrfpWL9Cm/jEClzyTs/czb1IwdTD QPFqFlixGPe3JO9jxNsI1C1AmeF6E13aXzX51FSHwQmNkuZnN2w3NwrjkGcwCsOPhTnYs0 p8dBcE/I/M8CG3hWaQmZhzB1tgN5UZvfF2QZPXMWsljFGe6fTEaXBy4RM5cuVopxCPmJha cDu+vigxGjEltvKAapwq8kdir/J29K3rlEmgdBzrjK8YwkjgOVBjSddUZCg4rnNcjYHWnv 1LpNnLOjC9OBC/eXhf6b10DJCyUUSCpzxs5Ijn6EAZeoaBRZrGPCO3ULVfLBlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frtL32Vfgz14dJ for ; Thu, 09 Apr 2026 08:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fa95 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 08:25:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8fb16a5c7f81 - stable/15 - rtld: allow dlopen("#/") List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 8fb16a5c7f81121a68b5aa185d70f7fdcb228da5 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 08:25:47 +0000 Message-Id: <69d7628b.3fa95.39af2d93@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8fb16a5c7f81121a68b5aa185d70f7fdcb228da5 commit 8fb16a5c7f81121a68b5aa185d70f7fdcb228da5 Author: Konstantin Belousov AuthorDate: 2026-03-29 22:45:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-08 18:22:39 +0000 rtld: allow dlopen("#/") (cherry picked from commit ffbf3fecdeffa17c0745e7ed342989acb620d68e) --- lib/libc/gen/dlopen.3 | 14 ++++++++++++ libexec/rtld-elf/rtld.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3 index 340545114114..2f10c17a4f53 100644 --- a/lib/libc/gen/dlopen.3 +++ b/lib/libc/gen/dlopen.3 @@ -164,6 +164,20 @@ Symbols from the loaded library are put before global symbols when resolving symbolic references originated from the library. .El .Pp +A special syntax for the +.Fa path +is supported, in the form of +.Dl #number/name . +The +.Ql number +should be a decimal number, which references an open file descriptor, +and which must be also listed in the environment variable +.Ev LD_LIBRARY_PATH_FDS . +In this case, the linker tries to load an object that can be opened by +.Ql openat(number, path, O_RDONLY) . +This feature is only available to trusted processes, i.e., +the activated image must be not set-uid or set-gid. +.Pp If .Fn dlopen fails, it returns a null pointer, and sets an error condition which may diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 9e64d1bf8aee..db5d22dfefdb 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -178,6 +178,7 @@ static int symlook_obj1_sysv(SymLook *, const Obj_Entry *); static int symlook_obj1_gnu(SymLook *, const Obj_Entry *); static void *tls_get_addr_slow(struct tcb *, int, size_t, bool) __noinline; static void trace_loaded_objects(Obj_Entry *, bool); +static int try_fds_open(const char *name, const char *path); static void unlink_object(Obj_Entry *); static void unload_object(Obj_Entry *, RtldLockState *lockstate); static void unref_dag(Obj_Entry *); @@ -2877,9 +2878,12 @@ load_object(const char *name, int fd_u, const Obj_Entry *refobj, int flags) * using stat(). */ if ((fd = open(path, O_RDONLY | O_CLOEXEC | O_VERIFY)) == -1) { - _rtld_error("Cannot open \"%s\"", path); - free(path); - return (NULL); + fd = try_fds_open(path, ld_library_dirs); + if (fd == -1) { + _rtld_error("Cannot open \"%s\"", path); + free(path); + return (NULL); + } } } else { fd = fcntl(fd_u, F_DUPFD_CLOEXEC, 0); @@ -3588,6 +3592,53 @@ rtld_nop_exit(void) { } +/* + * Parse string of the format '#number/name", where number must be a + * decimal number of the opened file descriptor listed in + * LD_LIBRARY_PATH_FDS. If successful, tries to open dso name under + * dirfd number and returns resulting fd. + * On any error, returns -1. + */ +static int +try_fds_open(const char *name, const char *path) +{ + const char *n; + char *envcopy, *fdstr, *last_token, *ncopy; + size_t len; + int fd, dirfd, dirfd_path; + + if (!trust || name[0] != '#' || path == NULL) + return (-1); + + name++; + n = strchr(name, '/'); + if (n == NULL) + return (-1); + len = n - name; + ncopy = xmalloc(len + 1); + memcpy(ncopy, name, len); + ncopy[len] = '\0'; + dirfd = parse_integer(ncopy); + free(ncopy); + if (dirfd == -1) + return (-1); + + envcopy = xstrdup(path); + dirfd_path = -1; + for (fdstr = strtok_r(envcopy, ":", &last_token); fdstr != NULL; + fdstr = strtok_r(NULL, ":", &last_token)) { + dirfd_path = parse_integer(fdstr); + if (dirfd_path == dirfd) + break; + } + free(envcopy); + if (dirfd_path != dirfd) + return (-1); + + fd = __sys_openat(dirfd, n + 1, O_RDONLY | O_CLOEXEC | O_VERIFY); + return (fd); +} + /* * Iterate over a search path, translate each element, and invoke the * callback on the result. From nobody Thu Apr 9 08:25:48 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frtL50h7Yz6YkW9 for ; Thu, 09 Apr 2026 08:25: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frtL43v4Zz3CF3 for ; Thu, 09 Apr 2026 08:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hd1RcyDnFYCKkp8Sn6N+2qyIX7WtgX9AwZmU06UarJY=; b=iK0UcRiaieRgCy+n+McZCKkWMbQbSBguQJcv4+o4kEdrs8bu3Mm3ohzm9k+gNQ70SdYLFS edK8ybnw+Oyp66kBorvVwQaQ5OwP4Oi6SufnKbkQ/qqvPHUnYWk1AWHSM8Tvl7lqpcaKN+ QdgK9EcRkR9LlaqHw6Jr6sxK+ufvAC8VFzD4uzcFZO5t7wi4eE34FTXCpOh7LhcrUANkXJ mJKYFZOVafCRv+zAHR5zua91X1pHwBOMQ6uWU3qk8woYJguHANJJViR1quB7c68cUBzUMv p7YfK+vSY7UIkLI0TKfxOqYUYfviT8yqitP/vi5OYm49hfrpLbXZUEAONV+a4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775723148; a=rsa-sha256; cv=none; b=vWb7xhKa4Au79vIEs1C/ZSfkqKLqyga4uDlbU54PQAg38p3LoSm8Ixg7D8ISDegVGq1V8g 3Iwl2riO9cQ9MRj787d8lv7GwzhckoUJHFuzKtt+fOxjoCxb6O8A+E5i1TNsHJyiXVAp17 8Q0sPqvd+tLMn3m+KIL0OifqkGEt61t40jHNQ1BZubPgxxaLVCcfF/4GfUUfOpgyUEhxqJ 2DslHjy1EBeJ6MsU0M4SzdRlGY/cT6+QNSTgBu2S8XG6s2jdmDw2Ht4+C+XPeC/YaIlx0l mOmDS4xyxf+GYNG/u7az9NBMSdK3GMyiI4YT9/GsaYN5nc2Q7v7uA1EjFJPDpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hd1RcyDnFYCKkp8Sn6N+2qyIX7WtgX9AwZmU06UarJY=; b=Zt6SX4CmKmdzh1yKLosOphXsE3dMvTnLqTbcZtuUJVz5zJ7qa/4XxPJFk2TeWd/kj4UHTc 1VqRF3nq5WAcpjhgYJFGUrdgmRRuPzIqgXKfkVrqzQiodXD6FfSF8rK/qNEjkRiSeDfxQL WEUF2V3XonS53JVVNCEprEk5Ytny4yl0KXx7J5P+0HFyDWb8mFXYrqKVDsP9yx3xeK7iMT WiA0N5+yfkD+4xwxaJKjhD95kyOR+gP9TXWdgQm0q3ufpG4dYdZ9Bd7zE2/1C4PxwPDQXM zIbKP492DrUDsRmHSOa9Dl9V90mzXMFpmSESLTo6mDlDsORU91aFDsFZYSSKLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frtL43JVvz14WS for ; Thu, 09 Apr 2026 08:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3edfa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 08:25:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 20318719dfd8 - stable/15 - rtld: add test for dlopen("#dirfd/path") List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 20318719dfd8077c47ed3c37e8e29b17c365ae18 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 08:25:48 +0000 Message-Id: <69d7628c.3edfa.1b984ecc@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=20318719dfd8077c47ed3c37e8e29b17c365ae18 commit 20318719dfd8077c47ed3c37e8e29b17c365ae18 Author: Konstantin Belousov AuthorDate: 2026-03-30 00:42:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-08 18:22:39 +0000 rtld: add test for dlopen("#dirfd/path") (cherry picked from commit 72252591ac01037fa53501adb88f00d5d3cc09ed) --- libexec/rtld-elf/tests/Makefile | 1 + libexec/rtld-elf/tests/dlopen_hash_test.c | 45 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index 3c05b52b83bb..4fbc32d87615 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -14,6 +14,7 @@ SRCS.$t= $t.c common.c .endfor ATF_TESTS_C+= dlopen_test +ATF_TESTS_C+= dlopen_hash_test WARNS?= 3 diff --git a/libexec/rtld-elf/tests/dlopen_hash_test.c b/libexec/rtld-elf/tests/dlopen_hash_test.c new file mode 100644 index 000000000000..a95ebdb34381 --- /dev/null +++ b/libexec/rtld-elf/tests/dlopen_hash_test.c @@ -0,0 +1,45 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Alex S + * Copyright 2026 The FreeBSD Foundation + * + * Portions of this software were developed by + * Konstantin Belousov under sponsorship from + * the FreeBSD Foundation. + */ + +#include +#include +#include +#include +#include + +ATF_TC_WITHOUT_HEAD(dlopen_hash); +ATF_TC_BODY(dlopen_hash, tc) +{ + void *handle; + char *pathfds; + char *name; + int testdir; + + handle = dlopen("libpythagoras.so.0", RTLD_LAZY); + ATF_REQUIRE(handle == NULL); + + testdir = open(atf_tc_get_config_var(tc, "srcdir"), + O_RDONLY | O_DIRECTORY); + ATF_REQUIRE(testdir >= 0); + + ATF_REQUIRE(asprintf(&pathfds, "%d", testdir) > 0); + ATF_REQUIRE(rtld_set_var("LIBRARY_PATH_FDS", pathfds) == 0); + + ATF_REQUIRE(asprintf(&name, "#%d/libpythagoras.so.0", testdir) > 0); + handle = dlopen(name, RTLD_LAZY); + ATF_REQUIRE(handle != NULL); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, dlopen_hash); + return atf_no_error(); +} From nobody Thu Apr 9 08:25:49 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frtL56BzJz6YkHb for ; Thu, 09 Apr 2026 08:25: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frtL54bPFz3CBN for ; Thu, 09 Apr 2026 08:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VyMV2FXEZHYx99ix8P8xBDI+jLwHkgUmhwBc+1PwyJc=; b=iRHMCX1/cFzrL28olgvZVCVm4EpVqJSDVktJAz/oC9qiChCNkm4q9CLOtZw/VvquwTE1Vp 9rNuuro6bFHd5wwi1EYaJlz3oYXFp3rGvJrOM2qRw4Bbli5yAIjjllTQWSIZtbMFTfdove rtJ+TIr+XkEFvZGa9Gl452MXYOF19CMqTYF6JqGrgpNx7WCnJW/SBy7uvL30nD25eM2Quo fC69qa3pShxtlm+TZdjGENG4Y6M4y8vkkcJrjxskn2Va4GQU9I8VJ3ul0TVgAr9P1vNbFC SVoJNIxzdezRkb+myRp4FLDIpTJ9tBX8KiJbMwOUvqU+cTNnEvfzYlyLqJFGjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775723149; a=rsa-sha256; cv=none; b=SZ9Ccw9FttU3oeL2Om/0BrDiK0Bqx4KRUfpE4Kfa9DTURiw0wU3T9r1yL00CjWCpBbTWaA u0wq0f9JO4AyQpMj8nQSgQSlC2mYrnnpPEJGQ3t2i8t3k55HaWgLshfumlB5PVmztxnk+i A4DSiCZtryvyZo8sRx8Ltt+05TW+O5uZlz+pmPRnJSS/JojyP22kIcXjm18sw+IWhJM8mv 4SS+e9M2n96GLyiULfEp23QT9Gru8h39apP1rsr5P+FVc9hrLse4jZ4EwDUWVeQg/v15BL R6fxMrr/Uzd+4gf6n4ZETLZHU30RPtDYxyvCjGA/qtadJg+bzRi0hNtZmLYWag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VyMV2FXEZHYx99ix8P8xBDI+jLwHkgUmhwBc+1PwyJc=; b=OvT3/9VeuJjoTkM3+jXG66vC5/zQVLbImSb1qepyyELNUQRA4kA8tMQl+WLfGovscBpVS9 IwWjQ7Cxs3nbXbnBQrLsmfEXhdMjZvPMnYX2szSMRx9h05ZXCOuw8fbX82PNAGClYFG37c 0SnJUjf9pZu+gIUkL7bKEYXK0psLOAgU3N5ZyR4sKl9aNpooPcu9upfwM586ao6wwh1On3 RLj+U1YtJH594ZFexsD+vCrSkcMWcYQo4kA2euA5/an1p+oQ2YZh7uYxcsUmW74GsrcAZj 5aFzbS/EkFpZTliq+/pFVfAI10YQHWTKmQFZjBUOr95fzYVFOA6eju70NiU7og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frtL548jfz15Dw for ; Thu, 09 Apr 2026 08:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eb53 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 08:25:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 43347b26fb46 - stable/15 - posix_spawn: actions chdir and fchdir are now required by POSIX List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 43347b26fb461891fb139e24a9dd9f335465168b Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 08:25:49 +0000 Message-Id: <69d7628d.3eb53.b4d8171@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=43347b26fb461891fb139e24a9dd9f335465168b commit 43347b26fb461891fb139e24a9dd9f335465168b Author: Konstantin Belousov AuthorDate: 2026-04-02 07:57:58 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-08 18:22:39 +0000 posix_spawn: actions chdir and fchdir are now required by POSIX (cherry picked from commit 7caa71145c5eea5925c295e0cdd95b517005acf9) --- ObsoleteFiles.inc | 4 ++++ include/spawn.h | 4 ++++ lib/libc/gen/Makefile.inc | 4 ++-- lib/libc/gen/Symbol.map | 2 ++ lib/libc/gen/posix_spawn.3 | 4 ++-- lib/libc/gen/posix_spawn.c | 5 +++++ lib/libc/gen/posix_spawn_file_actions_addopen.3 | 29 +++++++++++++++---------- 7 files changed, 36 insertions(+), 16 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4a92f2778d8c..86358dabf407 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20260402: posix_spawn_file_actions_addchdir lost _np suffix +OLD_FILES+=usr/share/man/man3/posix_spawn_file_actions_addchdir_np.3.gz +OLD_FILES+=usr/share/man/man3/posix_spawn_file_actions_addfchdir_np.3.gz + # 20260114: remove ncurses html documentation OLD_FILES+=usr/share/doc/ncurses/hackguide.html OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html diff --git a/include/spawn.h b/include/spawn.h index 636b20755238..e0b11d78d595 100644 --- a/include/spawn.h +++ b/include/spawn.h @@ -85,6 +85,10 @@ int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t * __restrict, int, const char * __restrict, int, mode_t); int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *, int, int); int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *, int); +int posix_spawn_file_actions_addchdir(posix_spawn_file_actions_t * + __restrict, const char * __restrict); +int posix_spawn_file_actions_addfchdir(posix_spawn_file_actions_t *, + int); #if __BSD_VISIBLE int posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t * diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 28e55f58ccf3..c36c4e10f2dc 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -468,8 +468,8 @@ MLINKS+=posix_spawn.3 posix_spawnp.3 \ posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclose.3 \ posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclosefrom_np.3 \ posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_adddup2.3 \ - posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addchdir_np.3 \ - posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addfchdir_np.3 \ + posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addchdir.3 \ + posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addfchdir.3 \ posix_spawn_file_actions_init.3 posix_spawn_file_actions_destroy.3 \ posix_spawnattr_getflags.3 posix_spawnattr_setflags.3 \ posix_spawnattr_getexecfd_np.3 posix_spawnattr_setexecfd_np.3 \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index ddbd0522e13f..60f34b3a1923 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -475,6 +475,8 @@ FBSD_1.8 { }; FBSD_1.9 { + posix_spawn_file_actions_addchdir; + posix_spawn_file_actions_addfchdir; posix_spawnattr_getexecfd_np; posix_spawnattr_getprocdescp_np; posix_spawnattr_setexecfd_np; diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3 index f9dc95330a8c..ad66d1a426c4 100644 --- a/lib/libc/gen/posix_spawn.3 +++ b/lib/libc/gen/posix_spawn.3 @@ -446,11 +446,11 @@ action. .Xr sched_setscheduler 2 , .Xr setpgid 2 , .Xr vfork 2 , -.Xr posix_spawn_file_actions_addchdir_np 3 , +.Xr posix_spawn_file_actions_addchdir 3 , .Xr posix_spawn_file_actions_addclose 3 , .Xr posix_spawn_file_actions_addclosefrom_np 3 , .Xr posix_spawn_file_actions_adddup2 3 , -.Xr posix_spawn_file_actions_addfchdir_np 3 , +.Xr posix_spawn_file_actions_addfchdir 3 , .Xr posix_spawn_file_actions_addopen 3 , .Xr posix_spawn_file_actions_destroy 3 , .Xr posix_spawn_file_actions_init 3 , diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index 656c0f20f798..11cdb5a29d03 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -549,6 +549,8 @@ posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t * STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list); return (0); } +__weak_reference(posix_spawn_file_actions_addchdir_np, + posix_spawn_file_actions_addchdir); int posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t *__restrict fa, @@ -571,6 +573,9 @@ posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t *__restrict fa, return (0); } +__weak_reference(posix_spawn_file_actions_addfchdir_np, + posix_spawn_file_actions_addfchdir); + int posix_spawn_file_actions_addclosefrom_np (posix_spawn_file_actions_t * __restrict fa, int from) diff --git a/lib/libc/gen/posix_spawn_file_actions_addopen.3 b/lib/libc/gen/posix_spawn_file_actions_addopen.3 index 80bc91454471..1d0eac45f872 100644 --- a/lib/libc/gen/posix_spawn_file_actions_addopen.3 +++ b/lib/libc/gen/posix_spawn_file_actions_addopen.3 @@ -40,8 +40,8 @@ .Nm posix_spawn_file_actions_adddup2 , .Nm posix_spawn_file_actions_addclose , .Nm posix_spawn_file_actions_addclosefrom_np , -.Nm posix_spawn_file_actions_addchdir_np , -.Nm posix_spawn_file_actions_addfchdir_np +.Nm posix_spawn_file_actions_addchdir , +.Nm posix_spawn_file_actions_addfchdir .Nd "add open, dup2, close, closefrom, or chdir/fchdir actions to spawn file actions object" .Sh LIBRARY .Lb libc @@ -72,12 +72,12 @@ .Fa "int from" .Fc .Ft int -.Fo posix_spawn_file_actions_addchdir_np +.Fo posix_spawn_file_actions_addchdir .Fa "posix_spawn_file_actions_t *restrict file_actions" .Fa "const char *restrict path" .Fc .Ft int -.Fo posix_spawn_file_actions_addfchdir_np +.Fo posix_spawn_file_actions_addfchdir .Fa "posix_spawn_file_actions_t * file_actions" .Fa "int fildes" .Fc @@ -189,9 +189,9 @@ For each open file descriptor, logically the close action is performed, and any possible errors encountered are ignored. .Pp The -.Fn posix_spawn_file_actions_addchdir_np +.Fn posix_spawn_file_actions_addchdir and -.Fn posix_spawn_file_actions_addfchdir_np +.Fn posix_spawn_file_actions_addfchdir functions add a change current directory action to the object referenced by .Fa file_actions @@ -201,11 +201,11 @@ in the order of insertion into the object. It also sets the working directory for the spawned program. The -.Fn posix_spawn_file_actions_addchdir_np +.Fn posix_spawn_file_actions_addchdir function takes the .Fa path to set as the working directory, while -.Fn posix_spawn_file_actions_addfchdir_np +.Fn posix_spawn_file_actions_addfchdir takes the directory file descriptor. .Sh RETURN VALUES Upon successful completion, these functions return zero; @@ -250,11 +250,8 @@ is equal to A future update of the Standard is expected to require this behavior. .Pp The -.Fn posix_spawn_file_actions_addchdir_np , -.Fn posix_spawn_file_actions_addfchdir_np , -and .Fn posix_spawn_file_actions_addclosefrom_np -functions are non-standard functions implemented after the similar +function is non-standard and implemented after the similar functionality provided by glibc. .Sh HISTORY The @@ -271,5 +268,13 @@ and .Fn posix_spawn_file_actions_addclosefrom_np functions first appeared in .Fx 13.1 . +In +.Fx 16.0 , +the +.Fn posix_spawn_file_actions_addchdir , +.Fn posix_spawn_file_actions_addfchdir +aliases where added to the corresponding functions with the +.Ql _np +suffix. .Sh AUTHORS .An \&Ed Schouten Aq Mt ed@FreeBSD.org From nobody Thu Apr 9 08:25:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frtL70GrLz6Ykd2 for ; Thu, 09 Apr 2026 08:25: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frtL65PQJz3CJ6 for ; Thu, 09 Apr 2026 08:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXJ5G2EyVdjtC5IBJgx0CmKZ40uWFt0GxOtcPgw+2ow=; b=ieX8ieGiPFd5nZu5s6G6biFqu+S5uc1thurFSJXzPxreAQ/zABIevc/0BmIzYKn18R1nex 5I31LxF7uBKCi086LxmOw+SCR6xQ+rOQuKImT632RzKpX52D2XDW9tOzUMsb/Vv5ZE4mXg B8cQbseQ/auikSoUBk46csDfztl4yB2u6VWPySvBX96SmjemZtS9J2aoI6rmVl/lQqxe45 S4XOi1Otr/7GtioEvn67D0MGUcZHRszLKD2CXqDE3TbibLVe+Mi8KJEOhxMBWMx9gAU4pd 3farmmT/unq8EgMVDSzP6OhXHzN4lwrZ6J3mjHi+IYy7H51y9zgmnUKXluV3lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775723150; a=rsa-sha256; cv=none; b=UceKwJyHb2hiH/puvuuxzfLN+qL0UAxabkBtfcSowbgdTZ8KW0duizGxufCHnuTEQ1FiSY 8AzFayv4LiUk8iTVmhKg2pip0D3aWwRAMEGOENSBi2qVjgfBtYT9HgYyJodepr215+VIuV RUWbv54uYyB6lirXW175UDsuASY6L5c7l0rgOowxeYJXD64kXm1q/fQe766BBDD8FxUvU4 hKtK/JNXIqhu2US5lu0fmRv7Mcd9wsg9y7g4vXFvtCBrBY1CH/4AxWp4uzQdaOj2W5JDtl ipfwZfkyA+Zhx42oeJD0PrBBlFjEZ+CO8Mj7ybCM7NruIwlbIovPlZt4foRbNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXJ5G2EyVdjtC5IBJgx0CmKZ40uWFt0GxOtcPgw+2ow=; b=nG3fFq9hhCIZYXYmv/sEugma+kgWXA1DhXfLlAjnxZSxOHWGYD9csz0cougwVKCcEs+cLU ppuPK73AUZQcks9HZ8LUmpEQ8xAKLkyRwCYPrWOym4Kwse+Lp23K67VyVCJWu3ZV3tDWJP tSj3LDP/ATFhgz6hmlypZzuzAsVf9qOt3usuJn16ZQGaDXFhkniFAnpDc+6ahmzyTUZexi vvJOUyHqjA2X5JnnGnKBak1oDysOugiDQWos4QrqZYOvnNfAWYyKdDErwf1HmzbzNwCJ89 938KgNMZ7Eb4ak5Jou0o23JS3BrlyIYp1GsNk+S631OQYhNOExyyorPmtgvsSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frtL650XRz14yY for ; Thu, 09 Apr 2026 08:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eb57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 08:25:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b6527c930c46 - stable/15 - posix_spawn test: switch to POSIX spelling for addchdir and addfchdir List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b6527c930c46d783a384f82a53eeef9b0b5a631f Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 08:25:50 +0000 Message-Id: <69d7628e.3eb57.48a0ba17@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b6527c930c46d783a384f82a53eeef9b0b5a631f commit b6527c930c46d783a384f82a53eeef9b0b5a631f Author: Konstantin Belousov AuthorDate: 2026-04-03 02:56:19 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-08 18:22:39 +0000 posix_spawn test: switch to POSIX spelling for addchdir and addfchdir (cherry picked from commit e56858f05fd7071a39de7f7b1e632426fdf0624d) --- contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c index ce2078eae98e..58feb4f209ff 100644 --- a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c +++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c @@ -405,12 +405,12 @@ t_spawn_chdir_impl(bool chdir) posix_spawn_file_actions_addopen(&fa, fileno(stdout), TESTFILE, O_WRONLY | O_CREAT, 0600); if (chdir) { - ATF_REQUIRE(posix_spawn_file_actions_addchdir_np(&fa, + ATF_REQUIRE(posix_spawn_file_actions_addchdir(&fa, tmp_path) == 0); } else { tmpdir_fd = open(tmp_path, O_DIRECTORY | O_RDONLY); ATF_REQUIRE(tmpdir_fd > 0); - ATF_REQUIRE(posix_spawn_file_actions_addfchdir_np(&fa, + ATF_REQUIRE(posix_spawn_file_actions_addfchdir(&fa, tmpdir_fd) == 0); } err = posix_spawn(&pid, bin_pwd, &fa, NULL, args, NULL); From nobody Thu Apr 9 08:36:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frtZ82gy1z6YlLL for ; Thu, 09 Apr 2026 08:36: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frtZ81vC2z3GXK for ; Thu, 09 Apr 2026 08:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NtEjmDjbf+gulU27VD0j1wj/bhtzklBgSG63arpJhLk=; b=wVpgKVMukY3+JKQdYIhmlS23tum4TSYA/aITVoiVacNid/2jMis6fFSmzNxXA4gBCxfJyL vrw4d2yQq/rlebFHC2lGu0Sc3hMLaHnDoGxt4Pk2fG3xiI0OM78Hn7M7RDDNW7DgwjC65Y xfCREE62bWzHjj+EzekouKOMDhxMwHFi8932nqEgezU6GMWYZ1JmMMhZzgU00+C3qtBakU bKRcSRRsJPVolZKmsqH22wcAWosEwYFxzVG7UBqrYoJIE4BV+xXNrD3Mkak5GnVqP1sbX4 Gw+A/M3Se7Jn3m6ymjzHl/8yXzVfxK5DwHxy9+x1fL75xpXtm4NMX+JAUevupA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775723776; a=rsa-sha256; cv=none; b=O5Rj6vyweISg+I+wAi3bNNitRNf9QOSoUpuKdpIBUwvX48DrepH3sHp2K1x5fBNoeQPsYe PNWKCx/MYiR+CEyfSsrxcehmI5lGhKx3Nu5KOaEde0YVrQGF9seYD9nsJ5ftxfyeq95IOY vz5ImikCiZXGGNGVTqW7WHLtVoIuXcqmFXE3EaM+R+OgbB3KWiArbGMsRZc6bzWIJb7yeA fgiGMCLccz8T/cz5Fbwd+e9Xi6tXLS+DfnRhG5fSWBui45qbx2InSBA5oOTsFRbp4dSKxL uglO4tNK/U2IPR5+NfykgGHs+9sOd5mVKppbyYx/mnwHK5cOkb/4QsVolGxVBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NtEjmDjbf+gulU27VD0j1wj/bhtzklBgSG63arpJhLk=; b=uu6hhwL1+6eEtdHqloF20TnqRf3DDSZMKeMtouj1eNzNxidEzM2f4iCzHJziIRIBWp2wn7 33bhqcpOTBypRIValJ+/gFaq//S9/y33gYyfTq37NcmzeMyWLnLadxjRE0oVpDpLUw1VO+ uPD19+kyfOKM2ZmaLmIEP8AyEop+Wqhfu+yxPLodlt81tvXVroPJYnCthR9nHMNMcNNDBJ TbHOlb1ith76VG8IqiOD4kFFPLkDmUFyehQYsNPIGljI46jz9wG2bH1rVI695osULRhMl+ 11+O3/y7hkhk1nUTO3tlVrAG/ZPgrwuthu9taiPrBvFyKmtnGAGZlKkJGYB+hA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frtZ81D7cz15R8 for ; Thu, 09 Apr 2026 08:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4125f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 08:36:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrey V. Elsukov Subject: git: bdad7024181b - stable/15 - ipfw_nptv6: fix handling the ifaddr removal event List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bdad7024181b1ee14555ff334235b8d52e0ab15c Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 08:36:16 +0000 Message-Id: <69d76500.4125f.40daf80e@gitrepo.freebsd.org> The branch stable/15 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=bdad7024181b1ee14555ff334235b8d52e0ab15c commit bdad7024181b1ee14555ff334235b8d52e0ab15c Author: Andrey V. Elsukov AuthorDate: 2026-04-02 10:14:29 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-04-09 08:34:42 +0000 ipfw_nptv6: fix handling the ifaddr removal event The result of IN6_ARE_MASKED_ADDR_EQUAL() macro is not an integer, so threat it as a boolean value. PR: 294114 Reported by: Peter Much (cherry picked from commit d9d7b59486499615a5fdce54443ce62aecf557e8) --- sys/netpfil/ipfw/nptv6/nptv6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/nptv6/nptv6.c b/sys/netpfil/ipfw/nptv6/nptv6.c index bfe28d75a01d..c36e9597fe22 100644 --- a/sys/netpfil/ipfw/nptv6/nptv6.c +++ b/sys/netpfil/ipfw/nptv6/nptv6.c @@ -593,8 +593,8 @@ ifaddr_cb(struct namedobj_instance *ni, struct named_object *no, if ((cfg->flags & NPTV6_READY) == 0) return (0); /* If address does not match the external prefix, ignore */ - if (IN6_ARE_MASKED_ADDR_EQUAL(&cfg->external, args->addr, - &cfg->mask) != 0) + if (!IN6_ARE_MASKED_ADDR_EQUAL(&cfg->external, args->addr, + &cfg->mask)) return (0); /* Otherwise clear READY flag */ cfg->flags &= ~NPTV6_READY; From nobody Thu Apr 9 08:37:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4frtbW5cF0z6YlGF for ; Thu, 09 Apr 2026 08: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frtbW54dVz3H1P for ; Thu, 09 Apr 2026 08: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=1775723847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRAb0kvYjvURQg/0r1R9l+PsgnP3pEeiN9hMEGLbNN0=; b=uYd9t50f93MSYgxkZzsc3QP3cwcHUOeGbryuZwJ8mxQQyOQ6drL1nwYdsAyGF5+f1SADfb pRrQiPOSfcLy9LGLOUIPJM/sooLuywIatX83KWdWbMrYinEPpQt/ThIoYtmn+OLyzX029n 2LN+xcexgRvckupCkYubYhSupr/yqeCMzaH0BdFORtZX7ixFFuS7nOVgSnkIv3SAKNvk1D 6GdpJjoqXdR7PzfToQiXWETTX+wAFLQKQcV4LfttTWWGpFGPX5o1h1CsaaTsygqGdQdBSb kp/QpP71eBaDSxpewUrb9TyMeUY518/sIBfEOKEb3RjcrwemluI7umPS4p+sIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775723847; a=rsa-sha256; cv=none; b=Ltskzu1z9FMJlUoploUMuPTiSrlCYW9+Vcxr9SwCFiPeF3VAgy4fdz4AgIoEnLmwSJTW9G vVwB+leBUlOCmINctgCJd/J2Dcegl4jU4UdemYdvvzjqwRajOZu4r9SWgTPKYscKf12f+o 7nKrKm+0CGOHOtSFyVl9jehOg9fbQCtR4VUaViGP3WAduLiTnrB98kxTp2Q4osQBwvNmax vg2sqlFqy7d3sRIwjdsQtfRW3g2NghvqLPqi9XsTcGqoWketZksG8azgJ2rjGPQUAd192z 6WkQ0MThEEkphFe88CqeLUyxzYtsCFkwp1f6lomDD8GfBoN5P4gt6yz3KtL3Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRAb0kvYjvURQg/0r1R9l+PsgnP3pEeiN9hMEGLbNN0=; b=eHAoSQ3sb3KM5MxEAMe89ShZe7EAwUYYg20LV1v7h0c32awS7SSzAajubLbkjSCDJv3vjH lVitsMzc9sBISe0xFq2DjFYy07goAkWk4aQFyd2mLX5jAUpfTwu+EFNZx80WalhIyG3e+5 qImvP6LHEBUWejK/cYZR3zu6q4xTdQj6SdYL9l0mCicugw0belTnaJQNYpJk3MqG/Q3ZMA 6x1hOCvFt+ooLWBaF8A+twON2HOfHi5qn2sBbv/S3u73AXdrIDpjBYx+vOopift4LOPl07 OFY3skYaFn1JYl5CKY6qGqGeUTzoo5JMWC9XGNhqJnzmonZc3tako1jxNPRQpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frtbW3HxWz15C9 for ; Thu, 09 Apr 2026 08:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41854 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 08:37:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrey V. Elsukov Subject: git: 4b6de64b99b9 - stable/14 - ipfw_nptv6: fix handling the ifaddr removal event List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4b6de64b99b984bee2f9f16f00364ba7f52a5dc1 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 08:37:27 +0000 Message-Id: <69d76547.41854.73d053eb@gitrepo.freebsd.org> The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=4b6de64b99b984bee2f9f16f00364ba7f52a5dc1 commit 4b6de64b99b984bee2f9f16f00364ba7f52a5dc1 Author: Andrey V. Elsukov AuthorDate: 2026-04-02 10:14:29 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-04-09 08:36:13 +0000 ipfw_nptv6: fix handling the ifaddr removal event The result of IN6_ARE_MASKED_ADDR_EQUAL() macro is not an integer, so threat it as a boolean value. PR: 294114 Reported by: Peter Much (cherry picked from commit d9d7b59486499615a5fdce54443ce62aecf557e8) --- sys/netpfil/ipfw/nptv6/nptv6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/nptv6/nptv6.c b/sys/netpfil/ipfw/nptv6/nptv6.c index 640bdedbf037..3aa2df306480 100644 --- a/sys/netpfil/ipfw/nptv6/nptv6.c +++ b/sys/netpfil/ipfw/nptv6/nptv6.c @@ -594,8 +594,8 @@ ifaddr_cb(struct namedobj_instance *ni, struct named_object *no, if ((cfg->flags & NPTV6_READY) == 0) return (0); /* If address does not match the external prefix, ignore */ - if (IN6_ARE_MASKED_ADDR_EQUAL(&cfg->external, args->addr, - &cfg->mask) != 0) + if (!IN6_ARE_MASKED_ADDR_EQUAL(&cfg->external, args->addr, + &cfg->mask)) return (0); /* Otherwise clear READY flag */ cfg->flags &= ~NPTV6_READY; From nobody Fri Apr 10 18:30:57 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fsljs2vM5z6YBKQ for ; Fri, 10 Apr 2026 18:30: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsljs28wnz41s3 for ; Fri, 10 Apr 2026 18:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSpiheWBc9gYudhH2IJOJYvWpch2eeRSMBsz2oRxGTM=; b=tnwGMN+IN/Iv7TkhPy/DnfBVVP8k4tPQrchNOsBEvsX8N2iSYFMMS5vG7KN7ZaQCSwuKS0 pxnCCMOJT7qzUqmD5801O7MVYSUi5ZhUr3gS3cfjpNiVxUNV7+L3OmjmFef+SK2JI4oWTT gY26NxrENYjS23smdNcQ44hHYzdAoZLCv9bLTyM5C7/TeXKlE3nlmFE9sV+SHIvxIbufaC wT5nIanSMObDaEHDE2vxGCPdyw/n+37B5DBE5C6AniL4HuQi+VS4WxcGiQKYAeLXL+UR1n ZmDxX1kZ+dVoEoSQrN0rdX/XGZp0o9K/cR3XK2hjHeWTm2wgMxuYWFtDKph56w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845857; a=rsa-sha256; cv=none; b=O0LfKwaQAa0o8axbbTI9yteZbdBRYSr+oMdznFLWs0DUtjCtqsVCB7OVtmPa9M0un6b+zn 63ynwcAdA2FUM27O9yTGcQSBCLTFvVmZs0rncO38PmgYSsWJCRIs+47NHLH2vxkVvn5KCd 1ujNbbdmt+HNI/r6bcbWCahuUicvkfEIF62aW7Jjmu0ehWOa+BUZ67fGN9VMh8Ei8sgV3e 7l/H7WLan9HDxb8W99LDcllg2AAhRJqOMCERZWHPzkhhwDHNbZQley56m63GX/pZBuwMkN eT5dLT9rpTiNUK7hQnGXLF+yAhaSamCTDQWBOPcCR/H7fk/h0VGvpo7OwGaZwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSpiheWBc9gYudhH2IJOJYvWpch2eeRSMBsz2oRxGTM=; b=v5lViTNQh84taY8PFNLk/JaTPxqnZyrL8Qn+m/u9Stc7c8BXoPGgJCpspryT2A99vHXyeN vfun6yH8Sm8v6oPhm1yI24CdoanQKnFtP4e/1CGkjbH2OyhnsfFw4UZG03WbSmxZU0m8/i wmrWQ+8QHcuI3EHD6vLFmYCwF+GaBG1BEGl9U3zmBLWt2W4WW9Rcv5JafIs+aqbXAXEgRb ATO5OFWd++E5qRHDSUNiIi46pforY+QhMSTzkw+im9GcRA3SaMDGK5iciOp3hAJzLYoZUs UyIHNqubsgL3u725QBjZ64eaNwNclbh09Xds/RpwxrCxcjzGhLOoBxQ8T2xedg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsljs1j75zwF0 for ; Fri, 10 Apr 2026 18:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:30:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: eb4b66863bf3 - stable/15 - builtin.1: Command list maintenance List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: eb4b66863bf32e96a837b908add7d90e18631d8b Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:30:57 +0000 Message-Id: <69d941e1.38cb4.1aadbb7d@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=eb4b66863bf32e96a837b908add7d90e18631d8b commit eb4b66863bf32e96a837b908add7d90e18631d8b Author: Alexander Ziaee AuthorDate: 2026-04-10 17:18:42 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 17:18:42 +0000 builtin.1: Command list maintenance + link to return(1) like the other exclusive builtins + fix alphabetical sorting of list in rendered manual MFC after: 3 days (commit remade due to merge conflicts) (cherry picked from commit e54a1ef4ebdf1ea606eb0e00cf2345f9c0db7a7f) --- share/man/man1/Makefile | 1 + share/man/man1/builtin.1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile index c58de8345efc..19d6a655ced6 100644 --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -69,6 +69,7 @@ RUNTIMELINKS=\ builtin.1 readonly.1 \ builtin.1 rehash.1 \ builtin.1 repeat.1 \ + builtin.1 return.1 \ builtin.1 sched.1 \ builtin.1 set.1 \ builtin.1 setenv.1 \ diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1 index ee89006caea5..fbdd35208207 100644 --- a/share/man/man1/builtin.1 +++ b/share/man/man1/builtin.1 @@ -95,8 +95,8 @@ and the standard shells that provide them. .It Ic false Ta Yes Ta \&No Ta Yes .It Ic fc Ta No* Ta \&No Ta Yes .It Ic fg Ta No* Ta Yes Ta Yes -.It Ic filetest Ta \&No Ta Yes Ta \&No .It Ic fi Ta \&No Ta \&No Ta Yes +.It Ic filetest Ta \&No Ta Yes Ta \&No .It Ic for Ta \&No Ta \&No Ta Yes .It Ic foreach Ta \&No Ta Yes Ta \&No .It Ic getopts Ta No* Ta \&No Ta Yes From nobody Fri Apr 10 18:30:58 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fsljt4qKfz6YBSN for ; Fri, 10 Apr 2026 18:30: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsljt33F0z429N for ; Fri, 10 Apr 2026 18:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kGWWBjK1ir5pq+49kxgRdmDoSm7xnYNZtu8fRHrrriQ=; b=Cn+qEyH6CbGxuow6odwoJ5Kw8TWon837egznxXUjdI1zQUAYmPCCAI0pxpNEiGKj2Y6rKc GD9RQQjt1Ti6oSPHbiM9nw1b8JgzYPcd5xyn4e48Y1Q7xBK3ZdYaKdMLKnEEEXmExSdSZ3 86nsyrqu5W9qNVnaF1WqtCuR+I5bz6grxgLZTnQVRWJTrWjR1/7LDuAriqq2bksQG5IOsF zsMpf8Hc8bRbvC8I2OOdP6PznW4Et3QC2dltMHbSqLBOBG/ZlFituC6+9NZUQOvocdZqV7 u1uw7duxIa5GRVSN48r56sHS6BNKIpCbCFiMf8eMDMChvXx455hTKAgwhXDrXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845858; a=rsa-sha256; cv=none; b=v1NvR5O/uorDC/3j6+hWmF7Z5GKFwHO14s8QmAlFyJVmYYoeQSkod/e02romU2N/I9i7oc uDHssIOhlkKxVdcVW/VqY6rgkSclud+fKIbx5wnkkr6JX3B0PS9SMGYtoPkrDJhr3SW9QK lNWwt4qzSIW9ZTKKxWqqXBJWY6BObvEy0O2GCuLUFy0ax9E3NkuYhHluxGmlJOmO4mfYRM kVAVdxqBmTwc08nl+qA/ZL7amV8ofXYMhgV5xGKIeR4rLXG53q5dW3cHX/8NKQcWYDjufA PhIeojjK3ieV7CiUddTbes6axrBvjs+pcQDqGDONMKrmSriRQta+GOj+9e1/xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kGWWBjK1ir5pq+49kxgRdmDoSm7xnYNZtu8fRHrrriQ=; b=xBrg5EV0MN9TZQKmWVGI0xJZMD54uLzfk5lHcP1ON6Ka/mMbhcTfhnPeytdQ/NxQlIS/kA 5RtklVpaleO4ObStsgBHnjB4rm3NvI4G8IgzlF4SpJ9MI1a4ffXhDGcahB8+hMnmhUVGoc KwQpk4VubwES5u919BOAseeOdw4qfUXWKZ6fcyn/u2S02W+oy0Tv7+uq7rJCQWF/x3dppb 6WSqbpiZgouciIXMuzTEi0F2pGQj7HJXeKE7Em6Jcp2PY//IEbNrwi20DT3Ks/mCHtitA9 SIbJ5n9jFRRm6hmTe3Ql3iSXsoenXxLBcn18gzVGF6KRTHLfz7vFB/QhW/CS5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsljt2Xt8zvp8 for ; Fri, 10 Apr 2026 18:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 399a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:30:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rick Parrish From: Alexander Ziaee Subject: git: 31711e1cc57d - stable/15 - libusb20: Add dev_open + be_device_foreach manuals List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 31711e1cc57d9538be648e29a2acb85c1cf62ea3 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:30:58 +0000 Message-Id: <69d941e2.399a1.1d1073c@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=31711e1cc57d9538be648e29a2acb85c1cf62ea3 commit 31711e1cc57d9538be648e29a2acb85c1cf62ea3 Author: Rick Parrish AuthorDate: 2026-02-15 17:45:21 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:26:40 +0000 libusb20: Add dev_open + be_device_foreach manuals Manual pages for libusb20_open(3) and libusb20_be_device_foreach(3). PR: 291675 MFC after: 3 days Reviewed by: adrian (usb), ziaee (manpages) Differential Revision: https://reviews.freebsd.org/D54231 (cherry picked from commit caf23c8e0b7981dd022c52feaf6edfef232f7e27) --- lib/libusb/Makefile | 6 +-- lib/libusb/libusb20_be_device_foreach.3 | 56 ++++++++++++++++++++++++++ lib/libusb/libusb20_dev_open.3 | 69 +++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 4 deletions(-) diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index 4a0c392f0d8f..b3ef5a061584 100644 --- a/lib/libusb/Makefile +++ b/lib/libusb/Makefile @@ -1,5 +1,4 @@ # -# # Makefile for the FreeBSD specific LibUSB 2.0 # @@ -11,7 +10,8 @@ SRCS+= libusb20_desc.c SRCS+= libusb20_ugen20.c INCS+= libusb20.h INCS+= libusb20_desc.h -MAN= libusb.3 libusb20.3 +MAN= libusb.3 libusb20.3 libusb20_be_device_foreach.3 \ + libusb20_dev_open.3 MKLINT= no NOGCCERROR= PTHREAD_LIBS?= -lpthread @@ -229,7 +229,6 @@ MLINKS += libusb20.3 libusb20_dev_set_config_index.3 MLINKS += libusb20.3 libusb20_dev_get_debug.3 MLINKS += libusb20.3 libusb20_dev_get_fd.3 MLINKS += libusb20.3 libusb20_dev_kernel_driver_active.3 -MLINKS += libusb20.3 libusb20_dev_open.3 MLINKS += libusb20.3 libusb20_dev_process.3 MLINKS += libusb20.3 libusb20_dev_request_sync.3 MLINKS += libusb20.3 libusb20_dev_req_string_sync.3 @@ -261,7 +260,6 @@ MLINKS += libusb20.3 libusb20_be_get_quirk_name.3 MLINKS += libusb20.3 libusb20_be_add_dev_quirk.3 MLINKS += libusb20.3 libusb20_be_remove_dev_quirk.3 MLINKS += libusb20.3 libusb20_be_alloc_default.3 -MLINKS += libusb20.3 libusb20_be_device_foreach.3 MLINKS += libusb20.3 libusb20_be_dequeue_device.3 MLINKS += libusb20.3 libusb20_be_enqueue_device.3 MLINKS += libusb20.3 libusb20_be_free.3 diff --git a/lib/libusb/libusb20_be_device_foreach.3 b/lib/libusb/libusb20_be_device_foreach.3 new file mode 100644 index 000000000000..bc741813ddb0 --- /dev/null +++ b/lib/libusb/libusb20_be_device_foreach.3 @@ -0,0 +1,56 @@ +.\" +.\" Copyright (c) 2025 Rick Parrish +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd December 14, 2025 +.Dt LIBUSB20 3 +.Os +.Sh NAME +.Nm libusb20_be_device_foreach +.Nd iterate connected USB devices +.Sh SYNOPSIS +.Lb libusb +.In libusb20.h +.Ft struct libusb20_device * +.Fn libusb20_be_device_foreach "struct libusb20_backend *pbe" "struct libusb20_device *pdev" +.Sh DESCRIPTION +The +.Nm +function iterates connected USB devices, one device at a time. +A backend pointer for +.Fa pbe +may be obtained by calling +.Xr libusb20_be_alloc_default 3 . +The starting value of +.Fa pdev +is NULL. +Calling +.Nm libusb20_be_device_foreach +again with +.Fa pdev +set to the return value of the previous call yields the next device. +To begin interacting with a USB device, pass the pointer in a call to +.Xr libusb20_dev_open 3 . +.Sh RETURN VALUES +.Nm +returns NULL for end of list. +Otherwise this is a pointer to the next device. +.Sh EXAMPLES +.Bd -literal + #include + struct libusb20_backend *be = libusb20_be_alloc_default(); + struct libusb20_device *device = NULL; + while ( (device = libusb20_be_device_foreach(be, device)) != NULL ) { + if (libusb20_dev_open(device, 0) == LIBUSB20_SUCCESS) { + /* do something */ + libusb20_dev_close(device); + } + } + libusb20_be_free(be); +.Ed +.Sh SEE ALSO +.Xr libusb20 3 , +.Xr libusb20_be_alloc_default 3 , +.Xr libusb20_be_free 3 , +.Xr libusb20_dev_open 3 diff --git a/lib/libusb/libusb20_dev_open.3 b/lib/libusb/libusb20_dev_open.3 new file mode 100644 index 000000000000..fa5d1746ff23 --- /dev/null +++ b/lib/libusb/libusb20_dev_open.3 @@ -0,0 +1,69 @@ +.\" +.\" Copyright (c) 2025 Rick Parrish +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd December 14, 2025 +.Dt LIBUSB20 3 +.Os +.Sh NAME +.Nm libusb20_dev_open +.Nd open a USB device to retrieve descriptors and initiate transfers +.Sh SYNOPSIS +.Lb libusb +.In libusb20.h +.Ft int +.Fn libusb20_dev_open "struct libusb20_device *pdev" "uin16_t transfer_max" +.Sh DESCRIPTION +The +.Nm +function opens a USB device to retrieve descriptors and initiate transfers. +.Nm +accepts a pointer as +.Fa pdev +to a libusb20_device obtained from +.Nm libusb20_be_device_foreach . +A zero for +.Fa transfer_max +limits the device to only control transfers. +Call +.Xr libusb20_dev_close 3 +to free resources taken by the open device handle. +.Sh RETURN VALUES +.Nm +returns one of the following to report success or failure: +.Pp +.Bl -tag -width "LIBUSB20_ERROR_NO_DEVICE," -compact +.It Er LIBUSB20_SUCCESS , +The operation succeeds. +.It Er LIBUSB20_ERROR_BUSY , +The device is in use elsewhere. +.It Er LIBUSB20_ERROR_ACCESS , +A permissions issue. +.It Er LIBUSB20_ERROR_NO_DEVICE , +The device detached. +.It Er LIBUSB20_ERROR_NO_MEM +The library couldn't allocate memory. +.El +.Pp +Errors not listed here may be found in +.Xr libusb20 3 +and +.In libusb20.h . +.Sh EXAMPLES +.Bd -literal + #include + struct libusb20_backend *be = libusb20_be_alloc_default(); + struct libusb20_device *device = NULL; + while ( (device = libusb20_be_device_foreach(be, device)) != NULL ) { + if (libusb20_dev_open(device, 0) == LIBUSB20_SUCCESS) { + /* do something */ + libusb20_dev_close(device); + } + } + libusb20_be_free(be); +.Ed +.Sh SEE ALSO +.Xr libusb20 3 , +.Xr libusb20_be_device_foreach 3 , +.Xr libusb20_dev_close 3 From nobody Fri Apr 10 18:30:59 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fsljw1yPXz6Y9hJ for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsljw0HVJz41v6 for ; Fri, 10 Apr 2026 18:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fb6WJbYvtneTKFISK6d30r3T66Y/kD2Zk2WsMRjT7Ks=; b=f3cU/vF2mzzzCY+HjWl/GobDPAQteQYmTWtdbbxxHDhgRha4wsWi5Ne8aktK3mUAtQqwB+ NySrcYiDlk1ls5VjASOKFzcVStIFYsGt0Itn1CXVWSjqJdFQrpjRP3zk529XLAypWOnyTq MxU9VtuW4xBRUt5GKyrSqCTfIIpbFde+PfIWzG7AVV7OPf++zla4ifVSlA0t9uTgVuIK6M 4GR053xaiW/d4SKID1xVCmCVKHOjZeusq+IJ62/3RcM/2E8fRm2ulfSGfp2m0G9Q6x/jV1 wHoOdBAsQWmr3pGXnM8xJLN3oZCYSHdDgOIk4ingFoH02tI3TvlIFyswZw2RwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845860; a=rsa-sha256; cv=none; b=RMT1HixJ4tuhVkXuMuNRRSPXprFzw49AjreZbbS5ZG+m9OMysH0FekUXxO+19ep8HGAERR IMYxbhxSA8DlCCUFLjUpx9zYjMqd7iP5zRFjzuPzwyZUYbC5DDXZBrj62InpfKqbsDYLqZ doF65ItKFfniPfh5CI8MdEpRbvr0p6CCLlKK5EJgBGK1VGosAFpTtlMszrH7STYEsPFNXj iOJjyLjdn8V/HhDqAFVV2Hy2Q4dRnDBUy/7BQMvI26Q6Auw0L/P/21nCmCgsF4W4Ug8oTM +fCAtCwEO49I487IOkuCVrxkg1LwlA2URMrntms92hbCgDr8k7ZRWQffI+PqVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fb6WJbYvtneTKFISK6d30r3T66Y/kD2Zk2WsMRjT7Ks=; b=GIc/Vq5rPRD8hbuRp455xzoUQ87e3j5/BRVBTCZzdJ9cl/nJaj5uglex1nPlTPzYclSX8Y rRI6iqua38F7Pa61/MCDUgnLp4W/YT5dfKF3Q5JfFau29Y9pbmg7g2dAXHW5W4w5zJlniD jZKbPJeX98KIo2wAakb0DVo716FTdw+4vI6X+WIm8Ho9Vgvl+rLosUli9irjEiq9BoVGhb 7Pkiw1/2ihjH+GFOjtLNeKqLUgiV+uGq54upSBEjwak494DF8zOnsujVuIMwXi7Z+ahxnk 0g5A2MOQw9AVUhm77IKNkFvfchQMrY7K5DMSDYF9SWpzwFcC6GGE6OFZUSQzWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsljv3G6FzwQB for ; Fri, 10 Apr 2026 18:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37d6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:30:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 3211cbbe4191 - stable/15 - sh.1: Document the exit status of return List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 3211cbbe4191fd7bbce3037132b017c663f0c578 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:30:59 +0000 Message-Id: <69d941e3.37d6b.73497932@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3211cbbe4191fd7bbce3037132b017c663f0c578 commit 3211cbbe4191fd7bbce3037132b017c663f0c578 Author: Artem Bunichev AuthorDate: 2026-02-16 17:14:00 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:26:47 +0000 sh.1: Document the exit status of return It's not obvious that if `exitstatus` is omitted, the exit status of the function is taken from the last executed command. MFC after: 3 days Reviewed by: jilles, ziaee Differential Revision: https://reviews.freebsd.org/D55026 (cherry picked from commit 931d4f0ae4f2dcd088bb92459ff19c8b6aafc2cc) --- bin/sh/sh.1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 3113c1cf6166..f4340fab6cdc 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -41,7 +41,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.Dd February 3, 2026 +.Dd February 9, 2026 .Dt SH 1 .Os .Sh NAME @@ -1223,6 +1223,10 @@ It terminates the current executional scope, returning from the closest nested function or sourced script; if no function or sourced script is being executed, it exits the shell instance. +If +.Ar exitstatus +is specified, the exit status is set to its value, +otherwise it is set to the exit status of the last executed command. The .Ic return command is implemented as a special built-in command. From nobody Fri Apr 10 18:31:00 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fsljw6k1bz6YBST for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsljw4VmMz41pn for ; Fri, 10 Apr 2026 18:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slCSyTVaS2To38PaVaQFHYAIqPZEtli2ktZFrFwMGII=; b=fIxQJTJWoFida+tBRMJB61PfvyJVH0OVeowkA99miWnx17+vQ5veOy66meHd0KvxfTfmmM DvTlZnaMSCb8axSuufWLURXA91K+lCMXpWg32uy35Ni52/DktvOSuK1fMg94nmuRqWtqrO OVzas++ECgQJVrkXIlR2MrsjURAi5N3VpS7+yK/0V7QVMF9aKX2y2+Qq68prB41Lf8fshD i9VNrzmxO+4pOupKC8OiWd49Yp0u8wvACe2sVe/jERqZL/TL1nxLg7pzsKYrVxJo1r+9Cb IlW5ADd4xIPuZWFTTW/FiP4DKUybUM/cNNlJ0idtwGWom3B37xoZoBUQO4sjYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845860; a=rsa-sha256; cv=none; b=SwbyAlQC+38ZqLThoyDfMINRdgJQh6Xg5aQhf83Nb8OVJWd7uePcvHlFfpbilnr1lcTSSU wL3DLyp8L2ttdHDoH1cLApRkQ/hC15tYSxlxmYPbOGBDIyS27lxPXd5rb/Dk08AFQVapGE UFVkWcvDKTAcL7vOE+vpLD20KxlSex8NjGuxo2N8IRQOhU99NuRWpXqd/ZXGcNA68r0EJc JybXtH2RYg1yj4KNHcQKX5YA5OC1i8WB4cKHriQYjr6yvW/FcLvOtkwZpFZpIf/R+LPCtV SstwozLDYZR4GlcdZCQ8Sj8EH0S56ftPvIWxvV1cQMN/E2jkbRnA9mgpBaX3wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slCSyTVaS2To38PaVaQFHYAIqPZEtli2ktZFrFwMGII=; b=vkjmSEaOvOgWutDVnhT5AgEnicvLELlOFiNrITrev5Zqbk8Fg89BhKkjFtUoYvzug0ZA2c KwYUiIJNKwxc7/Aj/9K6F3LcgXmJKhN9nNWZLQlJFmPvS/az36XXP5OXduL622VaM8nREB ndAdPXajkKBtNY3IxtM+8+w/Ekx3QQAdXBStZk/sCrrN+qnlh/1xJ0959IzP3Ptg8FMAuV UdfyZ7DZCgDCEp8UeB9mY16QiT/sZMHI0kFXyj1mUvNz+yHr1S5gaQOa6MuoZN1g6ICZBz XYq31MlWGjzbubgTK8/AqwVSLtLW5dspHKaO3izJGQtLBcbV3zz/3NWWtqIkLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsljw42cyzwF5 for ; Fri, 10 Apr 2026 18:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 226c48a4522a - stable/15 - sh.1: Fix ordering of Cm and Aq 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 226c48a4522a108ee8a5f50ded42629bd7d06c08 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:00 +0000 Message-Id: <69d941e4.38e0a.3f0a1e3f@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=226c48a4522a108ee8a5f50ded42629bd7d06c08 commit 226c48a4522a108ee8a5f50ded42629bd7d06c08 Author: Artem Bunichev AuthorDate: 2026-02-16 17:21:21 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:26:56 +0000 sh.1: Fix ordering of Cm and Aq macros MFC after: 3 days Reviewed by: ziaee Fixes: 2711852bd9ac (sh.1: Provide detailed job control documentation) Differential Revision: https://reviews.freebsd.org/D55194 (cherry picked from commit e5213ca4a3ca742fd8d3b8db413a561b28fa6989) --- bin/sh/sh.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index f4340fab6cdc..dfe5419479a3 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -2554,7 +2554,7 @@ commands. .It Cm - Identifies the job that would become the default if the current default job were to exit. -.It Cm Aq space +.It Aq Cm space For all other jobs that are neither marked with .Cm + nor From nobody Fri Apr 10 18:31:01 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fsljx757wz6YBPG for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsljx5M8Cz41vN for ; Fri, 10 Apr 2026 18:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JZd/+NPouVnCmlzYnMxdJjQ9rWGv0fjyo3PAGGzzpiA=; b=xgIpGzp6CrKaf5FXvwzeViXFSxKleHtgb4bXURTxdVGDcjsW/PH+mXyKENcU5I7TS7eEAm Vnc0rxPoOg3gTclC/SnAlT4TTfFzh+ZmMRnzIprA/L+rtF+Pl65WVCRv5Av9IaZXPdRHPK m4Yf/jWkjc1wlfpwTGEduNq2Q+JxDACUwNJiJ1eH8aDlTRsHjwGYb6Lblk27qbIPwjjPyz SL/zU5nUrfWxr70Ex8U8ZQOmUZ7Exr9n630ulyg4d9fl2W0ePhyzdkGXaHJYqqTrpneLWg BCCaC4g5Z7237m3CkMvjoTL51XeK42OHumPB4FcjulgfZAIs1uMAciAF/ZpIDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845861; a=rsa-sha256; cv=none; b=olkPjI98SE77pO5gkQXA+L1C1U0UD4Ds+M1MjjEw/uCm26QiGVE3y5sCwMG3Lr/HsdLMGV Q0pdPESz4wRiQdIL3YhNPdJK1eC2qOAzUcsZq8oowGfHwv7uYIhL1i653TSploQdaWrUMe zDCMKa9BBU8EstCX92/9rJCY6jTw2D+LvmObHZR/OWyinctg4Tstiefjn6DKI8okrwrpHb uht2R+YwTkLujTib7Epp9ciwop9oKbIViX3sYhinurpj7Z1zcWYPe8zZ9aJrpg/OSFMedD f7mFhDsPVkeETqpgckZLUZbNtNINXyhe5FyaZqO35PK28teTgLknlDab4/Sd3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JZd/+NPouVnCmlzYnMxdJjQ9rWGv0fjyo3PAGGzzpiA=; b=fD6GiKUG0sNFAVyrarx4IRIKLJPsknGPUP7KBhe9A2pZ+tmAXX/hnRQHjWuytNu3T13aSI MgTR6L05affrieUvlxMY30qsNI9sg9SenXmmNehINloV5BTBFWj/81r5jAr+7637cZ3OBS GQNpnh5ZxrJt9vmR0Y3thiLcdokj5oo4ncCUCfjNe8P3NsKrTKh4ywA9ttFNnq9jdJYYf8 doAbfcSqSOoBHklAfHecMRSz6cp1tNAdQKnkJQFW6Le7tx5jP9Vnyt1MxoQ3c58aDFh+7Z 2tUqtwIAMtQ3bjLG0MU9oghYeCsA/QTgzsUNosPXOzwEIxiqt36G5mcS20SxDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsljx4qt8zw0l for ; Fri, 10 Apr 2026 18:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a3b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 7da07a7686c7 - stable/15 - trimdomain.3: Explain DISPLAY a bit more List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 7da07a7686c7d9c52853882bbeeec35eab139c51 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:01 +0000 Message-Id: <69d941e5.3a3b1.32e85b3f@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7da07a7686c7d9c52853882bbeeec35eab139c51 commit 7da07a7686c7d9c52853882bbeeec35eab139c51 Author: Alexander Ziaee AuthorDate: 2026-02-17 17:22:26 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:27:03 +0000 trimdomain.3: Explain DISPLAY a bit more MFC after: 3 days Reported by: jrtc27 Reviewed by: des Differential Revision: https://reviews.freebsd.org/D54629 (cherry picked from commit 960719762f0a1f6689ec58bc6d8ce21c4daa9096) --- lib/libutil/trimdomain.3 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3 index 0e65a864936c..114d8d139869 100644 --- a/lib/libutil/trimdomain.3 +++ b/lib/libutil/trimdomain.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 1999 +.Dd February 17, 2025 .Dt TRIMDOMAIN 3 .Os .Sh NAME @@ -60,20 +60,18 @@ name does not exceed .Pp If the passed .Ar fullname -is actually a -.Dv DISPLAY +is actually an X11 +.Ev DISPLAY specification of the form .Sm off -.Ar host . domain : nn Oo . -.Ar nn -.Oc +.Ar host . Ar domain : Ar display Op . screen , .Sm on and the domain name is the same as the local domain name, .Fn trimdomain will remove the embedded domain name, copying the screen and display numbers to the end of the base host name and resulting in .Sm off -.Ar host : nn Op . Ar nn . +.Ar host : display Op . Ar screen . .Sm on .Sh RETURN VALUES The From nobody Fri Apr 10 18:31:02 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fsljz0rn6z6YBHX for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsljy5vKdz426y for ; Fri, 10 Apr 2026 18:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2lNoUrWDBzr3VKeCcknyIBmDaEfg3/tjHiI+1cTIOQ=; b=mcBgYnzHuQsJBqbGlcLzTTmtAFs6fOp//AN/NafS3mrxI/t8eTkRxHW5+3TBHfgmO+33TL YI3QitDdvas7zd53JvSFjFWjSfFzXcac/7SqaS+O9+QrxYtsNGSTRJl4ZL0r5UsnIQIygT 3Z8TKDl+vjPbCSjAt+I7zJ/+qYGIDdyz5N7z5KRfH5ECYbNn6kkeSWy/rP5qijFy4MnxX3 sBkjVUiC3WtkEfdNczZNBkY8u3Fvi2/oDqVwTLjYrD94Vf41KIG+cH2+/MMev8m1PIhPfR dw+Yjc4Ufs6JBaXsNqYgH3J4nl3b3popOQwpLa+qgfsqI2tn3xa9V/ibUsoYFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845862; a=rsa-sha256; cv=none; b=jbmGK7FyYW15WVXqTi51MY0aLoLqMp4gCoW1jaELhxs4WMQQUQ94Yr1DYoyZCLdMg7HrQ/ Z6zMU6ajjlHupSAMm+D8KDan6rnmDb+lNmpL/oyno06JFY5ybW8YWVq0IBRDsgqhM20RZq zcHUmNXqFM8zBYthYWqzeftjzY5ShX3s/uxZNJOGXOuHg1C+aPdOoHi8P2MSBLN2pFA3cO BxJAYd/+mlmibEqvmXogr5XEwQq2HkwZCpQyVTedks6W/pUr5nutjjMnjJoG1mE2TsIGNZ a/Bf4atjM+kCviqmOdz33zaEORCBM4ilbDf1jV+5K1iT8KNvzSBM7415f3/h/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2lNoUrWDBzr3VKeCcknyIBmDaEfg3/tjHiI+1cTIOQ=; b=teuw/xl7wWUQNd8YlsUzTXJYgr5ktApP0Tw+gwHELAI6ubTLtPAmVQEOu2gyRQAzzq77qt E7g0qJmcVYdTtPoe8n80R1LB5e6bOqKtapEffLia6QADP3pcubxzOTvDZnp+aHIPj+46Cu abPToPff0RnKdAahswNdH3ZTIxNkwOcKjZ3AyZY/NPHb7sGVxghHLmtps0U/8/dngcxQ4Q N+yDzLj6/Evyd00C8JPTi5DdWyt4GOctGvPEbmhXsWyfyYkVU71mFZ1EOs282lWOjGCtZv 86jp6+OSFwckcp49Prz1Od+UNUxMwWOXFYQUjCVpGEvVF6QNPAAcx8u2+NEwkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsljy5Mzjzw0m for ; Fri, 10 Apr 2026 18:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Alexander Ziaee Subject: git: cfb1bb486a74 - stable/15 - devd.conf.5: Fix cross-references to devfs(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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cfb1bb486a741f2d585f7ccc15c8fc322c71133b Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:02 +0000 Message-Id: <69d941e6.38e0f.1f1c8f1e@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=cfb1bb486a741f2d585f7ccc15c8fc322c71133b commit cfb1bb486a741f2d585f7ccc15c8fc322c71133b Author: Quentin Thébault AuthorDate: 2026-02-11 07:39:17 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:27:09 +0000 devd.conf.5: Fix cross-references to devfs(4) Fixes: 1687d77197c0 (man filesystems: move driver pages) MFC after: 3 days Reviewed by: ziaee Sponsored by: Defenso Signed-off-by: Quentin Thébault Closes: https://github.com/freebsd/freebsd-src/pull/2015 (cherry picked from commit 59b7f3ed69df1031e11cdaa3a571248487af91ba) --- sbin/devd/devd.conf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index 67d73d4ebf49..a1d6a9051389 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -246,7 +246,7 @@ The time this event was processed, in seconds since 1970 dot fraction. Device name of parent bus. .It Li cdev Device node path if one is created by the -.Xr devfs 5 +.Xr devfs 4 filesystem. .It Li class Device class. @@ -400,11 +400,11 @@ String containing the temperature of the core that has become too hot. .It Li DEVFS .It Li DEVFS Ta Li CDEV Ta Li CREATE Ta The -.Xr devfs 5 +.Xr devfs 4 node is created. .It Li DEVFS Ta Li CDEV Ta Li DESTROY Ta The -.Xr devfs 5 +.Xr devfs 4 node is destroyed. .El .Pp @@ -915,7 +915,7 @@ has many additional examples. .Sh SEE ALSO .Xr cam 4 , .Xr coretemp 4 , -.Xr devfs 5 , +.Xr devfs 4 , .Xr re_format 7 , .Xr devd 8 .Sh BUGS From nobody Fri Apr 10 18:31:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk0372Cz6YBgV for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsljz71smz42Bl for ; Fri, 10 Apr 2026 18:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kc8bRaakEmPhpkXT9Zj2Kahv7WDR0yhaC1zMl7Alrhw=; b=fpxmwz8v3zPooczupDMBrXM41/SUL4Ce3uXXr3bylpoXFX6U3K2KSj3zv6hlpSdyvEEpG9 cTnSpTRDrY6wQ7mpRBA3cuXcW0po82XkcUUqTEK+WSEH3VH9JfD1di+PGh7YwMcOoOASoy 4f8ybyjH5QVVI5PLhMxuhJno4xySf/HGhQw2aUzpHyDhBdCy3p5EdSRZktZNVB9NBrozHm /wr4ZRfz4OBxoazjnpUGnkKrT5LZPHW9jXT7iViy8Ce9OixByr0Krd2M3vc/vUel8nyn34 vUg7fxzmJ7NV1QJwe82lL2mCDL/eeaQGB85BS8gB2QLSKuSvF7V99EqrAQjeDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845864; a=rsa-sha256; cv=none; b=imC+WTNCGG56PivXlsWGVEOiX2o9WtUcexrZ6anQ7Newhekps+nRKlbGd+SEV+IweToQY6 gZPVSxf1ctpaWNloHrQOaTPVRvNBOTicY/htmc3DLtFLQiJmbnLWZXd45IWVwaNqb4v9Ue a/M3zbYDQ+s5XTLMWPxn2Cb8Zy00fdWzVHDfR7ueqygEulgqnMksWw84Qu7B1i3p1t+6+p e9dVlGk1bqOnBQ8IVp6CTa+WXCbwUaI5t0HJ0HSQZPV39ICBRwztsWcVUMU+tbDR8RIQ9w ahn7382sHUufkPRsdC+/seqE2ZRBuHpeRRB7nUlE6StvV64KOeShG/W36SYQ3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kc8bRaakEmPhpkXT9Zj2Kahv7WDR0yhaC1zMl7Alrhw=; b=k+gwLV3DhhWse3DiRWm7pULzsPyBwfvFRjQWzP0EsiWDhCb4ZQ0eUhpRSoqVbrtjOWTkm0 dWp2Vs3Fcw1KQz7oLAFlPW+FO+WWferA83rR0yvWJszPg0ZOmOPVvCI8/1uUzh8o+vZ6Js fBjdiu949+Co9oIxhUaAi9L4/+tduTzZjJHmdLI99diMC7hx73O98KU221xc279voDo/K0 fuwqwqvocgMxyTTxPYrjzLy5L7Z3/KQGD6+C5ommYCTEafbYJCCsnt1z3qmqqCcWANdGve lrOrj3W+jpQn0M73wsYPdJvv55eYyMTXjb/HSTkU6D84QqH8Y2v+71CyHlWbjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsljz5gBLzwF6 for ; Fri, 10 Apr 2026 18:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39c08 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 064e203f63af - stable/15 - sh.1: Reference editline(7) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 064e203f63af17e13a570afae91c3d90b8e1214b Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:03 +0000 Message-Id: <69d941e7.39c08.3f7ff7a2@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=064e203f63af17e13a570afae91c3d90b8e1214b commit 064e203f63af17e13a570afae91c3d90b8e1214b Author: Artem Bunichev AuthorDate: 2026-02-18 18:16:38 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:27:16 +0000 sh.1: Reference editline(7) Key bindings for command line editing are documented in editline(7). MFC after: 3 days Reviewed by: jilles, ziaee Differential Revision: https://reviews.freebsd.org/D54767 (cherry picked from commit 009be09172348c352db5d74f6ece2f4cb47ee193) --- bin/sh/sh.1 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index dfe5419479a3..63755bbcf8a9 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -41,7 +41,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.Dd February 9, 2026 +.Dd February 17, 2026 .Dt SH 1 .Os .Sh NAME @@ -228,6 +228,8 @@ command line editor (disables the .Fl V option if it has been set; set automatically when interactive on terminals). +See +.Sx Command Line Editing . .It Fl e Li errexit Exit immediately if any untested command fails in non-interactive mode. The exit status of a command is considered to be @@ -337,6 +339,8 @@ Enable the built-in command line editor (disables .Fl E if it has been set). +See +.Sx Command Line Editing . .It Fl v Li verbose The shell writes its input to standard error as it is read. @@ -2064,7 +2068,8 @@ See .Sx Job Control for a list of job ID forms. .It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc -List or alter key bindings for the line editor. +List or alter key bindings for the line editor, +.Xr editline 7 . This command is documented in .Xr editrc 5 . .It Ic break Op Ar num @@ -3049,6 +3054,11 @@ Similarly, the command can be used to enable a subset of .Nm emacs Ns -style command line editing features. +.Pp +Command line editing in +.Nm +is handled by the +.Xr editline 7 . .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -3119,7 +3129,8 @@ will return the argument. .Xr signal 3 , .Xr wctype 3 , .Xr editrc 5 , -.Xr shells 5 +.Xr shells 5 , +.Xr editline 7 .Sh HISTORY A .Nm From nobody Fri Apr 10 18:31:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk13flFz6Y9hh for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk10NwFz42N8 for ; Fri, 10 Apr 2026 18:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6cw6/3zb+ZWC9Nb6HwYOn9qYqyRn9+IqCxwGEUcelg=; b=hPn+gacGVdx9DgKBPHStzBnyN9IsbI4Vf1yip30wy/ihSXZza5sjo3a/asZW02bhpxJlof qHUDMxXDwrj0smxU4W1teGQ6YLZUwIpkmRHpmP76jaq1E9BPmYP3ckeIJtNfN4N2ej57xm zhqLsABVMu7/OLzB1cu16nirbQKAqxf/zrMA0tZWSI02LVzg25rMzCyrkSWNBWJpQ4pabx MANjV9JdDTpqVtq3QgIgz4QFZG8nJnQL2JteAtn4+e0WOeToTmBH/c/2zsPQ0J6bSmkauD cYUYvdhAptgtz3WCwwIqnL4wqlfpmTJFJOpdIsEimbFg2GX9aHURTqh2Mums6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845865; a=rsa-sha256; cv=none; b=abhPWMDYrRZ2yYLIkhWjDVWYqdVNolAHFxoWLdRIZdJ5fjujkkuE+/hk0rq/6G0uhW2TAq V20gsA1/+pC/qOPiHM/AXMLJFRa6CxyKNFJAvIO0+J3K1nmZHl7zeEhCqSG5XkKYn7OKk/ IxWg2vUJDs2BcEnThO/QMS73pzR7uJVGx0G3+7Geu9W04i5SH8RYpdEY40+lFCfi4rCLBX Rk4qGFI5rh8h4H9dkM3RykyyUQHiKUP9+ic1Zu+XWkyy2c/t4lH3AW25J+csxwmm5gKEnh 9I90Z5ePPpAr8JTO+ZjOFcAjeg1DYcwzK+B1PBxoefpIeIP0sr8WxTyQEk1cEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6cw6/3zb+ZWC9Nb6HwYOn9qYqyRn9+IqCxwGEUcelg=; b=yaAsKkXTtQgqb/nGFkz5cnOy0o1jfB+udpyB3fTVcTcLuuInNQbJRSABpLg/ZVKgN8gDex c36dWecLItn9L6QVGcAgQhNhaVB1N5f2CKBla0JrYB/8cukbbl2GE8Fbn0LI4zaX8GZajM 8d4CYRFVuxEFs0zmrt5ic3MthXJvBSG6SXyg2+KDQz5O87CnLviGTrN4GrvUVobUnCp1La gIlOvcy+Ge02HXz9VUbFq6/MMZGV5OyP0sXNxlq6Nr9mgC6Mv4RFO/aXUNNIVDp+nGRhLR OVTXm3afV+EbfO1qxkRQVcXHIdKavBvRWK8a3l2+LEOkHdgVCnPDz3i1QaJE1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk06RtSzwQG for ; Fri, 10 Apr 2026 18:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a235 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christos Longros From: Alexander Ziaee Subject: git: 562e10169fe9 - stable/15 - src.conf.5: Fix "incompatibility" 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/15 X-Git-Reftype: branch X-Git-Commit: 562e10169fe9d1ea75ce8b9ef047657a764c80d6 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:04 +0000 Message-Id: <69d941e8.3a235.6a6a9073@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=562e10169fe9d1ea75ce8b9ef047657a764c80d6 commit 562e10169fe9d1ea75ce8b9ef047657a764c80d6 Author: Christos Longros AuthorDate: 2026-02-19 19:37:47 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:27:23 +0000 src.conf.5: Fix "incompatibility" typo MFC after: 3 days Reviewed by: ziaee Signed-off-by: Christos Longros Closes: https://github.com/freebsd/freebsd-src/pull/2035 (cherry picked from commit 102fed041d7f9aec6b962e215f53347a7e5d1a20) --- share/man/man5/src.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 74c45a6e2138..d5f44e79bee7 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1994,7 +1994,7 @@ Build the base system or kernel with stack variables initialized to zero on function entry. This value is converted to .Li none -for amd64 kernel builds due to incompatability with ifunc memset. +for amd64 kernel builds due to incompatibility with ifunc memset. .El .It Va LIBC_MALLOC Specify the From nobody Fri Apr 10 18:31:06 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk2376Xz6YBgs for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk20mdjz41yn for ; Fri, 10 Apr 2026 18:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ta86EXjP7TesJYoiKTYPXC3GEY0J7t4gsJ6evfnPlo=; b=X+0qgw97J3K6o2767k6ENUnVi27kAQPp8OSCqJFKJNzRdF7p4pp4rqE/8jlOko+OpCBmrb /v1n+QI9BkKmy6kIXqwKCXk8JBwV0ak8y7SMO5bWq7CDosqzgMk9Wor4WMOpidzaNtsl1W z3mrLJHj0CeI50TZzaFfH4eRe4JQD9B6i9bH+33YAieRoG8WtZXPUpdha06Q3WaHWhZtnH 4Mej4iH8auOdHZ28d6eTTW0qvcj6RXfFCIyO9dwIGXzRIpypwFgvmYZkAPmFlkq2MsgThN Z93xvOOpgaQeQ/zDjBRdMsJV/kgl5EXBU6FvhUbVlHlYuCk+8j9wxcVi7YdSiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845866; a=rsa-sha256; cv=none; b=PiWs2AM1Xo9bZBV4BKzWeJdNmWQA/NlPYKyK080sL+mWYK9bWUqLU5ntF/BtSyRyAXQhXY yEvncMmP6PQYIgnVw7IdumjkFKJXydl4ZorpPfWHizrxY9GXpsjXlOvENJ782ccpZj2a1w QCfpXjYgPDgr0JiSgZgRuKZDvnvccQzhyc1XTOaOlunVJJ9CEfyhBF6TUUeqvbnT10NU2+ XbXIoEDXXWKd8I3A6GnpTZ6+hmhnBb0KON8wvCbm+PVhJjYIRNKiWqHLJqX/S4lcMyN0fS LQKVaFEPAuHjoMlha5zkyIyiKLirN5E41y9NyrxBkFtzuIEtXbkAf00KL2yukA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ta86EXjP7TesJYoiKTYPXC3GEY0J7t4gsJ6evfnPlo=; b=W0m6VNtfQ0nBwTaiPrBDz2JdJAaoBsPSrO9R4DxGzd+YkeBbtJhYrh8HfGjo4lL8k5qFnE 8rsNduBYX+KEdWTsy6rpjGu8AdCeNnXiw8bwvZN3gq2KHzgvOfBdGJ2kD1me5M15hdQI89 2+D2j3UorQQvCsUL1YbAnZnhpK1liQi2Y8gpOWbdCFuAwK/0HM+AfM3DDmG5Vs6+2jHQC8 isyJG8yva1Be/vIdEiUM9nwCDQvfqKMAbETPDR9iIWb0TgYe9h2u0V2S1f2dNOIAnvpShL AWqSCOIf19U9YkJBMhPz6Ivj3b4dFZP2f1+whRDeGBa6pxfHiqL9SwdOzjsqxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk207VMzvfM for ; Fri, 10 Apr 2026 18:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a103 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 2482dd9d7a4e - stable/15 - ufs_disk_close.3: Correct include header macro List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2482dd9d7a4e468d2baef7a06c9bdac8776b0da3 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:06 +0000 Message-Id: <69d941ea.3a103.69b7d888@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2482dd9d7a4e468d2baef7a06c9bdac8776b0da3 commit 2482dd9d7a4e468d2baef7a06c9bdac8776b0da3 Author: Alexander Ziaee AuthorDate: 2026-02-21 21:24:20 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:27:33 +0000 ufs_disk_close.3: Correct include header macro This manual used the library macro to mark up a header file, causing pollution in the apropos database for libraries, as well as omission from the apropos database for headers. This also renders differently, enclosing the header in angle brackets. MFC after: 3 days (cherry picked from commit 456ae9820823fcd078746318620925792f112c9a) --- lib/libufs/ufs_disk_close.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libufs/ufs_disk_close.3 b/lib/libufs/ufs_disk_close.3 index f332a9bb5de9..04cae3965a81 100644 --- a/lib/libufs/ufs_disk_close.3 +++ b/lib/libufs/ufs_disk_close.3 @@ -56,7 +56,7 @@ The structure referenced by the pointer must be aligned to at least the alignment specified by .Dv LIBUFS_ALIGN that is defined in the -.Lb libufs.h +.In libufs.h header file. The disk is opened read-only. The specified From nobody Fri Apr 10 18:31:07 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk36hNDz6Y9lb for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk32jWVz42JH for ; Fri, 10 Apr 2026 18:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rsrTrsuJW4RVSy4Ed7nCBjdg/27XSR2jsgJrA0N0xuo=; b=yT1UdUex1r4Ms7EZydQa7ISJ8QRMWshcNE6L9ksD4ElzYR/F20fwvndIrDquPbBwdiWZEe ya6Nldu7Z/n4PDI2ttZHjhc3DycjNHSK7gjDYq4QAUDM783mP1OXbgob7JNhBtPYblKTMg ed/voMl/6a71FE8RTa4BjB6ayJDrU+FRPwY19DGBUjQJLjiRYiVzZlhmkg/lkvc8hSmX5m udysHlBTS4VlHQICRymgTaysbORs7pW8xg4oX2C+cHVEBLWGet35Do2/EbhXv0twFTtLFf 89/ezRlEPgRkkjmS1nmeunDeB8oYiLZPERkaEcp+97AC88m/+iaSKdPe1Q+Vdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845867; a=rsa-sha256; cv=none; b=JSneXTyNNQgQy6lx9LXSvW6qO8AVmCybz4+F5Nthjw3r0bvZn/pKhVXAu6kNojBw4gL+K+ eGTxHNBHVJTCCfMginaMIPYw3wRwLv9LVhgpyIARxDBp8KASZ4LTNAoDfcSo3sOLCZwjpA o1FdB+tnpjUEE3C8tNBrtxJuCwg2ZawWhzh+ReLDMnQmIUuMCN0hGzDti2/24D0Q9KGeJ5 YWs+LZhZ7h+wnAyWEvyQwViUDdrYkRjFuVTctJThT82UOT26x1ImZMNxUaRV4buASiROyb gUQE2yhF5GCXYwWDQJXC9v4strZciz26fYXfzoTInDf9Z7k1omb9mFkshlMxwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rsrTrsuJW4RVSy4Ed7nCBjdg/27XSR2jsgJrA0N0xuo=; b=yo+aOilcZySDLY8Rln4yO6C/NEoFkV/byhuWe83kErD8MCFA6PfJVHIX19zyPW1bggP7qU NGd8ZihHwYxpqBj3fwiISOEYocIxfCqv4b/5wckQhh9ok3DzL8POhbMzmJngnf3/YgVCJm sj7/sRKU7QuOAJTuFsVIZNxJI+upcS8cIZCE1/juaP3kAWA/HkBI8JRc1aVM7IYeNXauno +3NheaS3aNaltzwOB4Xu4nGsGoEqLDcaq3Hj2V7OxF5yGWG/SgFvA+PhQPJSzGtVZxGdFR ZcHWK2DOPgYoS5+k3CrgQbBFIQ9yfPJhcn1m5EsNOqTB4isMTTrdqmUKb1Mz+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk30vZnzw0n for ; Fri, 10 Apr 2026 18:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39d52 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 0ebf602e1785 - stable/15 - ports.7: Add port files 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0ebf602e178546b1fe1fb9dd2f8304f343fe9572 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:07 +0000 Message-Id: <69d941eb.39d52.1a1ff02@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=0ebf602e178546b1fe1fb9dd2f8304f343fe9572 commit 0ebf602e178546b1fe1fb9dd2f8304f343fe9572 Author: Alexander Ziaee AuthorDate: 2026-02-22 02:51:13 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:27:42 +0000 ports.7: Add port files to FILES Add terse descriptions for the individual files that make up a port to the FILES section of the ports reference manual. MFC after: 3 days Reviewed by: adamw Differential Revision: https://reviews.freebsd.org/D55404 (cherry picked from commit 451f593194cbea74bcae53b4b8e6e55f6b2ec12d) --- share/man/man7/ports.7 | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 24c1eb4b7f51..318a19ba98c0 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 November 6, 2025 +.Dd February 21, 2026 .Dt PORTS 7 .Os .Sh NAME @@ -592,15 +592,30 @@ Which directory to use for the data. .El .Sh FILES -.Bl -tag -width ".Pa /usr/ports/Mk/bsd.port.mk" -compact -.It Pa /usr/ports +.Bl -tag -width "/usr/ports/Mk/bsd.port.mk" -compact +.It Pa /usr/ports/ The default ports directory. .It Pa /usr/ports/Mk/bsd.port.mk The big Kahuna. -.It Pa /var/db/ports +.It Pa /var/db/ports/ The directory where the results of configuring .Va OPTIONS are stored. +.It Pa ${PORT}/Makefile +The specification for building the port. +.It Pa ${PORT}/distfiles +The directory where fetched files are stored. +.It Pa ${PORT}/distinfo +The checksums generated with +.Ql make makesum . +.It Pa ${PORT}/files/ +The directory for any patches. +.It Pa ${PORT}/pkg-descr +The long description of the port. +.It Pa ${PORT}/pkg-plist +The list of all files installed by the port. +.It Pa ${PORT}/work +The port's building and staging directory. .El .Sh EXAMPLES .Bl -tag -width 0n From nobody Fri Apr 10 18:31:08 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk45MwSz6YBh4 for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk427G6z42Ww for ; Fri, 10 Apr 2026 18:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JKHitnDYwjNLCKDqcpPIe4Hmv/zqXpkUwcnT/lY1SO4=; b=WpgYpydKoD9L2A8dAIFyp8JIJRsXj3fPu3f8Vtk5Rva+h8YV4FqEYeVFbQt1TQ44LSDCox JRQZE1ztK0G0wBhDKdNlM+khOxKtZyWJ7EYcjvsKaMo7UYyOJMOERLTeOXnA3R3SEYMy0E s42vNDKqrO5W3BCZxNXGrVtsRScNF/hWlh9pmUQ3s4KjgxlstYvjI4T1TqyQn4H25HuQMs gHl92WTJilrkxuRhI8jT9HBCqjWwg762yFcesMIqUClIOgk2oQ6DZ5px4TQWmKIh3P774A 3uwgXqNgl3zKSLbupAN6ux1A+QfMzo34F0p8IqXOe35uedGhhHk1REuXilKC8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845868; a=rsa-sha256; cv=none; b=hJvfwEnXubPF2Qtct4SP8u53t4dkce3x2u24JAaBLc++uGqscwUzXNS6WZ4mH0JL70UuHw 5f9sNjuNjMuxAv+ftbuO6nGCJLdSiuw4HrMlV2wHmXjNdtDfmnjWR15tCHVo4ESgE2sxhM TaxFazCP9tA00pkkfvDcXdclsDoxgUtu4ZBlI49m6drHCNC6ai51g3WgKTqZYBOCo17k1a IEaeKGenvaM56kDA50i9AbVLf9mtHcC8L9ri+c3yt5Lf5HQSTboqsQXaRGXew+0huiic0q FCv9AcGUAlO3UxlyNR4iMvPMfX5cBNpUn7nf7QMV6SDIxgxW1NTfb54CryzNYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JKHitnDYwjNLCKDqcpPIe4Hmv/zqXpkUwcnT/lY1SO4=; b=fKK66Sroc/EU3DWBPCjwi9xVMdUjlxmhVID3J/GhdTrZWil+09Vzj+WMvJ9FN1SQOIyEQc RBWcbBhLgRvx6w2PgthOBBAe6vx0G8RufJBkqclNOcSHtH0m442xYdNGnh48GeLMFvY1cD mgTvFX91TfhzEc6Nx8xdZCmfoGmVw0T/HFfFOVlH5wjBtJfTrLgut4JZFbqWw+XP7Dkzwi yeX6av/u2SgJo/YMwZ+83KVdt/DF6RGjBiRB9I42EARYXpngpf/IVhdpped4RhXglGHDgl Ot0oc8MRlyjChqaditIsrTTVf1xQeNyz7oF+X1tLpVbarxynHbvZ80dabTfO5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk41jGhzvh8 for ; Fri, 10 Apr 2026 18:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cb8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 50f1660ad831 - stable/15 - sh.1: Add .sh_history and .shrc 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 50f1660ad831f1d7c4878eaeb20014f38d36a024 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:08 +0000 Message-Id: <69d941ec.38cb8.6fc47287@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=50f1660ad831f1d7c4878eaeb20014f38d36a024 commit 50f1660ad831f1d7c4878eaeb20014f38d36a024 Author: Alexander Ziaee AuthorDate: 2026-02-23 08:16:33 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:27:50 +0000 sh.1: Add .sh_history and .shrc to FILES MFC after: 3 days Reviewed by: bapt (previous), jilles, tembun@bk.ru Differential Revision: https://reviews.freebsd.org/D55295 (cherry picked from commit 9a20515bc9ce3fe6d7f09fd6bdece0dd45bdbc87) --- bin/sh/sh.1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 63755bbcf8a9..4f860d89c654 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -3091,6 +3091,10 @@ which may affect the shell as described under .Bl -tag -width "/etc/suid_profileXX" -compact .It Pa ~/.profile User's login profile. +.It Pa ~/.sh_history +Default shell history. +.It Pa ~/.shrc +Default shell resources. .It Pa /etc/profile System login profile. .It Pa /etc/shells From nobody Fri Apr 10 18:31:09 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk55S5Lz6YBMH for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk52wfLz42Cd for ; Fri, 10 Apr 2026 18:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oKefZMMAAuX5DOsoYtKqaWfCnGfupxeNBTZoG3fC6MA=; b=l+DJVREZK9jnWOP8RJ2UCMy+9ntLcw0KC4fMzU06J19oY5zXViiz7jT32QQFNzKOUQKcC0 8HpviyCZJ9umrF4qwcQu8XxgzFSbIiyCTNOPtIgKUDx4mVz8IY6slBK3A40vGyc9lB18al ks2GTakv7Bn3NJRge2en4zcBUQztHVuig4DNk8dq+LDQmHkgtDYBIzqWGbuYpC6z2bsX+n /xxT4CHwhuIXV4eHTApo/U6p1pKYyuxi9KqfxFg9gLl6oOJIjl0t1kt+kPIuLbB5eYIKmp ZtlmEpu07F+ExgWbh2fz2oVZ3hdwjgdYaMXQOwFk9iuI1seZ20Y8EtxARlEJtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845869; a=rsa-sha256; cv=none; b=nbJRtEFb4lxctGQfUbjqTDmpMA4bWGB4aUXJTAohGjEPOSvPquqCkIBu7t45NxVKmXS7uK 8SdaDtOl0Xcn2QrfKG39O5S0tPtP+ZC5OzAGiICvB43WL8giy6QTeUJgNxQdXyLGuygDEG RqBSl4Y+odBtI67D7/E5hDUP2sL0l9L32THix223h0gLhCc10C/n10H6nvmJ+Fra2NQHWL W1XyENFKYwAX1iWmBweB9D0uH1nFpS3rKx72z29TNgFcCXoPqfbBcXrHVm4XnFIsBQbiNJ SdkVqR3eraIOPniFdE+Sgvji/rz432XZszORlkUGmFLBNQLXlVVRy23znvDzuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oKefZMMAAuX5DOsoYtKqaWfCnGfupxeNBTZoG3fC6MA=; b=xnCoCaWG4DqUNBliZPXt37iQLiIq1xj5+YY6Y8cwv/oBZ/V16ewqTRtAljCG8KNcOPnNMj nuZGkyM8WCEr12uvSiU1CtJuAH8DJo/vMlM0l5JGuhfMgKGT1c/jbK+FVmfeq/37zzNix0 bUK3Lql7WtR6vdFiBggNgzTSY0dULd/8/NQ2omQ6riLFHkBlex5WjWR7BXUZkbj4W+G+zM chci2fxw7vQLnj7grOPwBoypygGC4AKTuvNwqUqubBeI9hQSgUCzm/eqr4dM4xBXg2xg5p yosSW8DsCrJpkxzXbbtnMWl9k5vr9AYG6PnkhscX4Kz2copfAc+Hvib8JBTOIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk52QdBzvfP for ; Fri, 10 Apr 2026 18:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39a23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 1242ffc56750 - stable/15 - debug.sh: Fix a 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/15 X-Git-Reftype: branch X-Git-Commit: 1242ffc56750e32c40f6fbc9f9d7f45f0e13d787 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:09 +0000 Message-Id: <69d941ed.39a23.5ea3ee2b@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1242ffc56750e32c40f6fbc9f9d7f45f0e13d787 commit 1242ffc56750e32c40f6fbc9f9d7f45f0e13d787 Author: Artem Bunichev AuthorDate: 2026-02-23 08:31:31 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:27:55 +0000 debug.sh: Fix a typo MFC after: 3 days Reviewed by: emaste, guest-seuros, sjg, ziaee Differential Revision: https://reviews.freebsd.org/D55416 (cherry picked from commit ab835b37075e6478ef82f8c807a2335f5d19edaf) --- libexec/rc/debug.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/debug.sh b/libexec/rc/debug.sh index 739c81a709f6..4284a6e3b5fb 100755 --- a/libexec/rc/debug.sh +++ b/libexec/rc/debug.sh @@ -201,7 +201,7 @@ _debugOn() { DEBUG_DO= DEBUG_SKIP=: DEBUG_X=-x - # do this firt to reduce noise + # do this first to reduce noise case ",$DEBUG_SH," in *,$1:debug_add:*) _debugAdd $1;; *,$2:debug_add:*) _debugAdd $2;; From nobody Fri Apr 10 18:31:10 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk671bdz6YBgk for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk63dJhz42RS for ; Fri, 10 Apr 2026 18:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9Sd9dPtSBt0EqO69RFz7MVllb3rBpJvdx13+9N3sQI=; b=sQD/G8UaKSzswQdkCan0WCnc7b9J9grsrAJ3m9mINAU1jUdBDT8qsM644J9IOLL5BaS2XS 9IKl8f8O3gGzmCF6C8zq4PzBW8Ryzq4wV5blvkSFtDKOYiP3s7SrUCvwbceQW6lux9s/UF ly1UwYgF/89lJMb38h4zZ2af5nMXzt2WoUpV2OwZJm8IVpaGCtAGkI35isOktO3IdmxO4i rcV2aL6OkicNLFbYejox+leM18QVve+tz175/jQ5BnJKXKTm1QozWCePFDhHLfZK2DlCF8 NhWvzXzdSWHYMjZOTjs7BvcunN/2K5DNbcyCXcmp8hs2oWBopFRCVc4/iUP9Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845870; a=rsa-sha256; cv=none; b=cv7IYYy0MC74rzawho2gMY1JjznqyiVa8GTg4E6VFUrpfvdzBG2iATmjJE+LZVzAiHPyYI ktr6pZXIVJLrMyzhqnDx7+7dqTFpghqAVF43rcswzWaRnpNM0WFXepDOSi4Vl3FV83SASP pw2IehUhGs5fnyMSsOeciaqp6gT9qQxJv5gvLo42XeRjU5EQ2szX4zEDeTpkfhHZbNCdM3 UAjABgkmV8OSKsyrQCEXADgHS5rABQSE0peb42hTJPvH5y7pf5hUSeT7F1tYJ9qM0uIn12 fijEXbNIZT7QsQvY1qxTbwS9C+egOEeOvDVwXXcu361xTdvD6VMbnIk4KSLS8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9Sd9dPtSBt0EqO69RFz7MVllb3rBpJvdx13+9N3sQI=; b=kxdSH5aO3nqc7nInYNx+KvZmo6D8A4GZZ9wY/+G9XRps7fB8fqSCbsc0PsZCrHQia6AYu5 6ADD0GEKtGcTUx/PchVJND3h6lDzBOz4+maD5W+1B4ulLpDpIb89tfxH87uS83mtlZQj/r IRPcPXW0KW0XfLBicP+IGYVBFC9bjeHyeCOfsx+k/gJkZTSHHs+YbBvwkyP5FVB0XcsERb t1EPrMbRzoJpEOSDkbEmsJviWTDw64cop415/SbCo5kIAeAnaZ9RFH1idDDGrmidix/dQB 84/GKW4qzxzmLm6tMU7ty66bjH+mEUi6MrIHz+jVp+iL8txLzAkLpF+vUdZG0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk636JfzwSJ for ; Fri, 10 Apr 2026 18:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39b12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 482e77ad3687 - stable/15 - ffs.4: Mlink to ufs.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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 482e77ad3687fc4628a78316b4ce4265ce3477ff Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:10 +0000 Message-Id: <69d941ee.39b12.7ded4fc3@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=482e77ad3687fc4628a78316b4ce4265ce3477ff commit 482e77ad3687fc4628a78316b4ce4265ce3477ff Author: Alexander Ziaee AuthorDate: 2026-02-24 13:24:16 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:28:00 +0000 ffs.4: Mlink to ufs.4 PR: 293423 MFC after: 3 days Requested by: bms (cherry picked from commit f0b8355db6ba57a0849c41722e0a09f312d9eef5) --- share/man/man4/Makefile | 1 + share/man/man4/ffs.4 | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b23e69960f42..ecf10bc693c8 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -715,6 +715,7 @@ MLINKS+=ext2fs.4 ext4fs.4 MLINKS+=fd.4 stderr.4 \ fd.4 stdin.4 \ fd.4 stdout.4 +MLINKS+=ffs.4 ufs.4 MLINKS+=fdt.4 FDT.4 MLINKS+=firewire.4 ieee1394.4 MLINKS+=fwe.4 if_fwe.4 diff --git a/share/man/man4/ffs.4 b/share/man/man4/ffs.4 index 5f8787d6fefc..519ef1d1e8a5 100644 --- a/share/man/man4/ffs.4 +++ b/share/man/man4/ffs.4 @@ -28,11 +28,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 19, 2025 +.Dd February 24, 2026 .Dt FFS 4 .Os .Sh NAME -.Nm ffs +.Nm ffs , +.Nm ufs .Nd Berkeley fast file system .Sh SYNOPSIS In the kernel configuration file: From nobody Fri Apr 10 18:31:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk816zgz6YBQL for ; Fri, 10 Apr 2026 18:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk762blz42K4 for ; Fri, 10 Apr 2026 18:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qy2uU70fQwGpJwCGsN3H773fogVUhULRERA+dilCicc=; b=ttA1rnGsv+3MYvn1+EeEGFvhLdq7AXV8nhAEpax+yu0600mtxoN7c+BfDqAscPHv9owOAQ hY55foEC+vin4y6eFm74VOIb+QQjosE2fUtzL+c4c/UP5+vvSQ+IykS40pC2YLq+KX+k4N qJsDeX6P1jgCXGw5XxfKjG90m4FHRmTbsT34rBEsjX72f3O02IVQDapJLetQg7VS1ufSwy s9QpCNOFy8qKFWKcX5Ut659FeIgwavQPXeRciN+BwKR15idhsbDgyVOwlURnfFJhvNh0a8 /FVGahuVZgjV91ii23VrbmnVbDcnjwdkO9BBW3800fHyh7+hsawq3AQDtK1gJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845871; a=rsa-sha256; cv=none; b=jQTPyI8V5xOeVltYIVGXM4qEUj8Qe07dnMPv2tNCY5OWXZuW/Yq02Fv+WDoaE8EOQYiM3I Z79169z65h3Uy7i7rqgEYaXAJPi8PWlwfxE+t+C7J49LM8j4bw0rO+9xkhU2lpfiiBzhhd 1vWbePkAdDJUXhy/XdBWepXqKcfgzPz6+NVI12aW7U2l+oz9k8IxD9mh0FrKZk4B5RrvrN 9iTOSdLtfjT3IAAid/VXO1Bewx0EHQzkjRuDGOqEZSwE5k0dG3hTC5Rq9SCHz/a3p7HWe3 ZYk8zQeJ+2DNtCxvhqdNi5J0k38nh95Gh66HJMc0L4DKew98sKsFG28KLLvuLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qy2uU70fQwGpJwCGsN3H773fogVUhULRERA+dilCicc=; b=AilhHI9jh3c/mH0yQrvcGb+jxWSGZEFfVbK42drB7s6FQi0zTxxcuNY6J4vEyONbkxjQ2J 0FpbOZATv0FfSUbr8xr7R13WblhI5tHudxj0fqWcH8iQAok4IRAYj6hiyFeSxz3aE/L7yS BhKhIxvXwtZ53vn8YcRKO6VpqdSMRcLhmwLKxOAnKAAnQpSz7YrQlSk7AUbCYyr/7UQN75 2oApSk9acd6R5sTGD+9ScbuhxPc/t9Q/P/iByh+1Opx/DwKn800KldpAeTk22fJl5XhZjz F6CMVu+DRnFYCQwoN1T3/1ZVe2MAln7fnjZJ2tPWVBRFml+z6cV73ptyrpYdtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk73ttYzvhB for ; Fri, 10 Apr 2026 18:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e14 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: c3fa626952fb - stable/15 - style.mdoc: Add example manuals 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c3fa626952fbd4bb5338248775a6152fb3493f1b Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:11 +0000 Message-Id: <69d941ef.38e14.f3832b2@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c3fa626952fbd4bb5338248775a6152fb3493f1b commit c3fa626952fbd4bb5338248775a6152fb3493f1b Author: Alexander Ziaee AuthorDate: 2026-02-26 07:07:09 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:28:06 +0000 style.mdoc: Add example manuals to FILES This is the OG meat and potatoes. MFC after: 3 days Reviewed by: 0mp, carlavilla Differential Revision: https://reviews.freebsd.org/D55301 (cherry picked from commit 2abdbe9d796419e8149705ffb4c81f0c0cdea05f) --- share/man/man5/style.mdoc.5 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index 2f8ea90ae21f..98cc516ffd64 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -286,6 +286,11 @@ that would be rendered as: .Va critical_filesystems_ Ns Ar type .Ed .El +.Sh FILES +.Bl -tag -width "/usr/share/examples/mdoc/tab" +.It /usr/share/examples/mdoc/ +Examples for writing manual pages. +.El .Sh SEE ALSO .Xr man 1 , .Xr mandoc 1 , From nobody Fri Apr 10 18:31:12 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslk91KWjz6YBkP for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk853W7z42GF for ; Fri, 10 Apr 2026 18:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FjpFu9qVM2cJVv6Bh0N+yur5OiCUfSKqkwBUUNrbZFc=; b=EtW1z4yMch3rFkJlSRQFBkNLY47XELNyWuYA3PNrEsJuMpVQNgkNkMoW2BbvZUTjsHhWt4 8jbGZh65Np+SV3esIRDZ/uet/xFod9WZGpYWTbD7zDNS/iW8Us/jwS63tG1WrJ384j34N+ qYwNv1U8W2/39fUSI87fVocFwe86QDtRImECnp3gsVvnqamjzlLZiMqqAzImp6sfai1HEX cTDUWJGKffYd6Wd2xjObQwdsU4c2PcmRBgHsR5M97QHs9gPHsxulub1t+XR8E9K5tGxT4E 1VKxZbbIFsjWX03UW7w/OzF+kCnkGQk3+TOZ8rMIkSStzJCKRZJhhM0g5hC3yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845872; a=rsa-sha256; cv=none; b=TLMzxXI6Ewbx8C6it9KV4VofX2nSWUk0CbHK/Wz8QP+PCm50rfYC9VEdaD8Tf4dKpsS2n6 OdL9aq2mx1xpfm75/1qtvzqb/uZVog+3QdQdDaKnQPF1JCAqgescuMUt0HhV/yC3oFCfaj p5UF9fHjuQSzSuWAPnnziqjbeyjh1Sews3BeptY3EXhiJLzdrMlql4MnrT0spdM2u67i2Z VVUf8X0m3ULx2Lbk+NaPlBymVjkkRZTG8D9UlQtHGnUVsw/z4VQjHzopeDrXsghLkc6l7o 4bzWpWDTNq5E1J+TTdfHK4tUNYhabW0x0ufOOBnBSC/LiOtU2WKaOoUiIDes5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FjpFu9qVM2cJVv6Bh0N+yur5OiCUfSKqkwBUUNrbZFc=; b=tYpdoWatAw7qwbgep1DPsc3GxDPorhNzrQbafJqRCOwHcwn0Va/pZzArzuN4dz99C7f3u5 6ehvUELoLiFgTgl0/FclVC3VudW88fBO3S9kN3lWBBr3t1D7FZSGSwK6nRvneXTLPyBW3S dBVEJWcExjW4zzuQu9N6WQG3VP47Q3a9v5NWMpfodpt4tB0INj4SZLqn/V/YfLQ856DsjI tVJLqTrhSKm7ZYlyZ/1D2kSLI4w4tSqn3NLE3yXB9f7w+HhRHdmp6NMsA7JjfaS97OT7t0 z3ASXLsuWMdsZttg4OyMTQsZBA3lFI9F5umwisXnYyTNuwZRq3UoYNkR5K/yTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk84g0pzwFD for ; Fri, 10 Apr 2026 18:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a3b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pat Maddox From: Alexander Ziaee Subject: git: da2f440db5fe - stable/15 - rc.8: Add rc.suspend as an alias List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: da2f440db5fe980db03ef67f645f72e3b853bd72 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:12 +0000 Message-Id: <69d941f0.3a3b5.2b7bd5d8@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=da2f440db5fe980db03ef67f645f72e3b853bd72 commit da2f440db5fe980db03ef67f645f72e3b853bd72 Author: Pat Maddox AuthorDate: 2026-02-24 20:25:15 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:28:18 +0000 rc.8: Add rc.suspend as an alias Make it consistent with the other lifecycle scripts, thus making it more findable. Reviewed by: ziaee Signed-off-by: Pat Maddox Closes: https://github.com/freebsd/freebsd-src/pull/2047 (cherry picked from commit 77dc773ecfcfd177c26dde4e858feb9a35fd970f) --- share/man/man8/Makefile | 3 ++- share/man/man8/rc.8 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index c408f1b65a80..de06f5b67900 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -25,7 +25,8 @@ RCLINKS= rc.8 rc.d.8 \ rc.8 rc.pccard.8 \ rc.8 rc.resume.8 \ rc.8 rc.serial.8 \ - rc.8 rc.shutdown.8 + rc.8 rc.shutdown.8 \ + rc.8 rc.suspend.8 RCPACKAGE= rc .if ${MK_NIS} != "no" diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index b7bd7b2de1f0..a68878f0a10a 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -44,6 +44,7 @@ .Nm rc.resume .Nm rc.shutdown .Nm rc.subr +.Nm rc.suspend .Sh DESCRIPTION The .Nm From nobody Fri Apr 10 18:31:13 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkB0bzlz6YBh9 for ; Fri, 10 Apr 2026 18:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslk962Rkz42VX for ; Fri, 10 Apr 2026 18:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8VxNhNHOz7XEYBDx/sxyCjn6q5QynAHIwowcdlSJak=; b=t0AW5cfJG3H8/h6+2M2zjDeRqr6RAnmQt09zRe2iFhdedHlTf+asYRqWguuIlp1ialJVaF MX9N37h/P8yxyVjR1PO7vwK2uaBeQc0uYsTfDYFM/shpz8rg6yXjXnftvc8GitidB+JX/t M/tYjodK+zlb4WbwTsi2Cs7/ulngU918f3TicuUKLdgPyEA3+f5eKrnFQLHxOaam+A/1fq 5Qwkb3muPz95UmbWj3BlNVzURIvsjoqfr/+XOtC4dUx84VReA8kBC1FyWreGI4TPIvkb9k suEQ7DO4BR7MtKDXLd1ykTNFXVoStkk5XgTScHCbNe4Pned5w0Q9WJDyQShgww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845873; a=rsa-sha256; cv=none; b=Prds2M9sFJMrvBW0cD/rHFenn1qeGmqdKgZH8MsngFUxyfDByjO4p8Jm6TR1Zaaun/JwsQ RQbt8zHFaqgd4gZ4tbbkAhlxY6p+0yL1Fu/K4I+VXTLy1nzk03vRu5/kzUJT/a8O//L2Hz IluoMC4eHB/4ZmJ3u64SvEiYQRKXqO7+wJhW9pV46f3mcW4b7gICnO2ItODdz+od4Qx3VM BYsFDPxTcZ9XtMHkdZrOspszJfvaByz2DeDaP3k0/0sxqb/g29WFgwAFdogxNqQSbK1KvZ nAiwaMn0CgxCavFuXo518Bi22aIypPE1iglG5Mmm0/WZWIhubQbvHlavBH9uRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8VxNhNHOz7XEYBDx/sxyCjn6q5QynAHIwowcdlSJak=; b=DLwNQRQwXkcs9Dq23cAC/kMqKGkKJ7Xt2WplTdi8K80/hRIZsLJp2pWozBg0ki5qGFhkVL YkYjmP0DEE1DimD3V3R/3uwov3uvGTCEMCtfz2IVzrK0vocjbCQbR/GVZt+iaKtk5ReIsd 6+QOiJX0N8DOYybF/dnND5o0PbOtMZL49eVT+uP1/VtwVCqp2YNCuUjXNEr6S5gThHy2rp 7gzl4hIuXKfzmlQli9Da7N7GTjMcztGkexwiVv+BBoqF9hzfGnAEeRl/JO4UoR2kuyHOoh IzDiRLfA8Kn52jcfoMpAcPQ5xnFxWEw1XGyRpsxBVUpbsdXXqX9VX2P+DiwH9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslk95RmFzvpJ for ; Fri, 10 Apr 2026 18:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39c0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Felix Johnson From: Alexander Ziaee Subject: git: 67f28803e0ec - stable/15 - newgrp.1: Provide examples List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 67f28803e0ec3ec93cb431bb6c0b3680a91d0849 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:13 +0000 Message-Id: <69d941f1.39c0d.e85e05e@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=67f28803e0ec3ec93cb431bb6c0b3680a91d0849 commit 67f28803e0ec3ec93cb431bb6c0b3680a91d0849 Author: Felix Johnson AuthorDate: 2026-02-27 00:45:03 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:28:36 +0000 newgrp.1: Provide examples "These examples appear to be originally noted thirteen years ago by Mark Saad, contributed by eadler, put into a patch by Felix Johnson, and made into mdoc by myself. Finally, put this bug to rest." ~ziaee PR: 167742 Co-authored-by: eadler, ziaee, Mark Saad Differential Revision: https://reviews.freebsd.org/D48877 (cherry picked from commit 86dc5dd0b2a861cf9d8cad18fc17c17dbbfc4465) --- usr.bin/newgrp/newgrp.1 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/usr.bin/newgrp/newgrp.1 b/usr.bin/newgrp/newgrp.1 index d9701feef0d7..032aeb72616d 100644 --- a/usr.bin/newgrp/newgrp.1 +++ b/usr.bin/newgrp/newgrp.1 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 8, 2013 +.Dd February 6, 2025 .Dt NEWGRP 1 .Os .Sh NAME @@ -67,6 +67,21 @@ exits >0. Otherwise, the exit status of .Nm is the exit status of the shell. +.Sh EXAMPLES +Create a new group, +.Ar foo , +with +.Xr pw 8 : +.Pp +.Dl pw group add foo +.Pp +Set the group password: +.Pp +.Dl pw group mod foo -h 0 +.Pp +As a non-root user, switch to the group: +.Pp +.Dl newgrp foo .Sh SEE ALSO .Xr csh 1 , .Xr groups 1 , From nobody Fri Apr 10 18:31:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkC3Xy5z6YBhD for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkB6sBnz42Vh for ; Fri, 10 Apr 2026 18:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1hwyRHV4c8cFYmsKRXHYjWUiLAXW7cj3NP/zODRTxKE=; b=E0GRfWeSANLPlDL+glJ8l2fS4QT24MCL7WShGGNnyfb6yJ3mkAFt0ESxNPtqMx2diFbr4t BsxLS6RQubTaa4/z2wKk9gouvDvUPMGhNKLlLiQpreIjwl7EUVRpuBHBH5oH0LoHN9dBD/ 3b+c8CZV2xfxerquxFxOkW+1OrTgV/Hz19u6a0w+1CMB8BMbhKwO316uodG7796RQnj0BV /Xt0EZ6X4e7xYykVuLjBFerDSOih2zYe5j1+7cXyiReA18aqc3bpTFZJntNJ3mxclzjTwj kd7TjUclUcRR91LdaV1k1uYx8lG85HjF3Y3E2CSw7+YaslTD/EFAiIxrA+Do5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845875; a=rsa-sha256; cv=none; b=fSO06lm1amqy7M6iuHZnwE+LP0dWJkTNHb5NuTt/1vcVNhs4mUkUx8Rz1z7RtSGOr2dFHK C2xHfNtriIGOHVIL0HCby7DP7nGDk9NLt1clrsMXz6z5JUfJ4RZxiuMqLUlSRDYOBaR3ok RvIGE2O60vFdw4Z8BZXTQpA9UbvoY2NnYIEulPx5zyKnNmWRGgzbiMEIueWMvLl1SGnIVP Ifbx4DP+/1uvv8GuffvkYcebwhh7rbAWBcy4Y6uqWbRuCuNMJatPOmamq/OmzdKIWFHnlA moFT3LTQ81mn5+aHyNvXhg7fTd6lx0Hros4eE6raK7HX1Me+x3XS77Xans4zyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1hwyRHV4c8cFYmsKRXHYjWUiLAXW7cj3NP/zODRTxKE=; b=fpVqCvhJ43pSOU0eY+wc0Fimam5835DfVfqK65G49175Vd24ue2MqzMR23nV4vjiots4Sg NpL1rcswTP7dcBtDX48RK5oLF4i7DNtWkqiub7fz/7ECZYv3ERXo0a/13SusR/XRe1unZL Qg77j3pIuu921U3pGktHMimUw82+DPoR+bIeKg9Zn1P7LkvHjPWSE/ALOtJFipKb0cU8K8 gGnMvsJ3Jt57jBqJr7Nyx44F/APUgpmofzW1e5nhfy3WOt5JRtXo+IVfVAzi0TtqJu8OWd 8AthKk1TnOhg8dpQmVYZ2jip9oVMsS5SOkZXUelc1BmP1o7DqFzVgpIDiVIixA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkB6FBSzvhD for ; Fri, 10 Apr 2026 18:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 399a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 906f2745bd84 - stable/15 - style.mdoc: Li macro is undeprecated for some 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 906f2745bd842cba8c017ae2fe7e7f18a64f3c44 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:14 +0000 Message-Id: <69d941f2.399a6.7e3e7028@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=906f2745bd842cba8c017ae2fe7e7f18a64f3c44 commit 906f2745bd842cba8c017ae2fe7e7f18a64f3c44 Author: Alexander Ziaee AuthorDate: 2026-03-02 10:20:01 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:28:41 +0000 style.mdoc: Li macro is undeprecated for some time Previously, the mdoc linter warned against using Li as it was deprecated upstream. However, upstream undeprecated it since last year. As usual when it comes to style, the best thing to do is to follow the existing style of the page. We have many manuals which prefer double quotes. MFC after: 3 days Citation: https://cvsweb.bsd.lv/mandoc/mdoc.7?rev=1.297 Differential Revision: https://reviews.freebsd.org/D55297 (cherry picked from commit fae551b76785d2357b09e2c022a92f410d871b9b) --- share/man/man5/style.mdoc.5 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index 98cc516ffd64..e0c41915ecb1 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd October 24, 2025 +.Dd February 16, 2025 .Dt STYLE.MDOC 5 .Os .Sh NAME @@ -41,14 +41,6 @@ which renders as: Then run .Ql Nm make Cm install Cm clean . .Ed -.It -The -.Sy \&Ql -macro is the preferred macro for formatting literal inline fragments. -Historically, -.Sy \&Dq \&Li -was the preferred way before the deprecation of -.Sy \&Li . .El .Ss Copyright Header Refer to From nobody Fri Apr 10 18:31:15 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkD2h5pz6YBkV for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkD0QpCz42gB for ; Fri, 10 Apr 2026 18:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQ/JqCSD7BHY9dXEH1U9e1ukCNcltBvcI3INtKtug9c=; b=EZ137XawuxglNfT8MKp+yB3gED2A5bu7hYSv6uhImxoRlE9dNhxdf/2A8xHn3RVK7x3ObM OVgm1joHgcnzQixfeVRhbB21/muAG0pmqe7deIbmfRSh42GwiaVI1yt/x8kXv/S4mfPS1u aVoBn0A4IRFpu36wjX7wUpMEC2fHOWO3dKXrrEWr2M/hmbMpQUCeXV/5VlNmfztV1K/lKD jKfesS0kDxQ8RqwK+1k3DWCst/TS1kPFwQM4jiC0umOllHy5P2FBKlADsDBF3YHHrK0/03 BGHwGqM81sr1fFOjtCRf1ENX4OkFoztJPx0s0SO+GPdAEMM1hBxAqdVSQ9tHjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845876; a=rsa-sha256; cv=none; b=cxR/HJVLYIimsrd3VOPrFR3uaxTDLFZ+lAZa0cmvkPOd110DC4ijdYW2mNGw3j3FJSaCZH tfTzwmqEmV2YnBf8VRWvHFbCA9L73Ieljs5Mnj1nePxlmx7LUmxDzoaNUIIkB4b7Hr+nBF ockPhRilEsG1OA2M7zgqRHOZJltO+ii8enll6E14eVKL40LFIcED2JGD2WjT44Mw+HqzGk Cr4jLmbtHKk0BtK56YSbC644QdrxGNz8XRrNq9TyB1ZBmsqzEO0Iiwl8SRbX5By7TMf1Qs /EqPv6dk5s6sM/TQwvUdsdkdXATDZV5dEnBOBXB3UBL5BwL5Owbn7skCOV7Iwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQ/JqCSD7BHY9dXEH1U9e1ukCNcltBvcI3INtKtug9c=; b=act74Z0Eo96f+wLSkgKtxrGYUalcxnGLm8DwU5NccBIW5Zp3Ico/4T4vIhGPuIP7Ki72Qz ltn4w7LCi9GjOz7yCFdFT8BAlCjqfB8C/fUPcV02WmEJ/gxbOi2VP9Z+tMUSV0zu61qmVG y86NP2OIb5HUEf8dxhS54Z7nliv2frO2fpSWF+s5ebpi1t8jM5HJZcwghrl1Ezd54gN8HE 5k3aphMUKlya1B8k14Ijorgv7VOpu5FTre72uoGtBl9ViQlpuKKHkuDe8LOBeTrjF9V9Hy u/AcahxSy3lq51sXHUvvLyDW7Htp1BMKMwPtTflJXFgQuWHTTaiN9FiHNVWUPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkC717Xzw0v for ; Fri, 10 Apr 2026 18:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 7f30d5cd3373 - stable/15 - style.mdoc: Remove synopsis formatting advice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 7f30d5cd3373205bcc5411d671de9e4a5ae9941d Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:15 +0000 Message-Id: <69d941f3.38cbc.76d7e006@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7f30d5cd3373205bcc5411d671de9e4a5ae9941d commit 7f30d5cd3373205bcc5411d671de9e4a5ae9941d Author: Alexander Ziaee AuthorDate: 2026-03-02 10:24:11 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:28:50 +0000 style.mdoc: Remove synopsis formatting advice Remove incorrect advice. The first rule was no spaces padding pipes when showing alternates. Almost universally we not do this, and third party manuals do not either. The second was using Cm to mark up symbols. This advice is in conflict with mdoc(7), and the extended documentation on mdoc linked below, which is also linked at the bottom of mdoc(7). Conflicting information in our docs is a natural result of documentation proliferation. The most important thing we can do to reduce technical debt in the documentation is reduce the amount of doc overlap. Excessive technical debt and conflicting rules is a barrier to new contributors. This type of work requires thorough expertise, is not glamorous at all, and to add insult to injury, is socially unsafe. To get new contributors to the docs project, we must deduplicate documentation. We have the mdoc manual, examples/mdoc, style.mdoc, and the fdp chapter on manual pages. With this many, they will inevitably come to contain conflicting information, and people will learn not to read them or work on them. MFC after: 3 days Ref: https://mandoc.bsd.lv/mdoc/style/commands.html Differential Revision: https://reviews.freebsd.org/D55298 (cherry picked from commit 47326cb470278e891975354286481b5ba876929a) --- share/man/man5/style.mdoc.5 | 67 --------------------------------------------- 1 file changed, 67 deletions(-) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index e0c41915ecb1..84eb281dc76a 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -152,73 +152,6 @@ Install the missing packages. \&.El .Ed .El -.Ss Synopsis Formatting -.Bl -dash -width "" -.It -Do not put whitespace between alternative parameters separated with a pipe -.Pq Dq | , -e.g.: -.Bd -literal -offset indent -\&.Cm compression Cm on Ns | Ns Cm off -\&.Cm install Fl -all Ns | Ns Ar portname Ar ... -.Ed -.Pp -which in the SYNOPSIS section is rendered as: -.Bd -unfilled -offset indent -.Cm compression Cm on Ns | Ns Cm off -.Cm install Fl -all Ns | Ns Ar portname Ar ... -.Ed -.It -Use -.Sy \&Cm -to stylize characters that are command modifiers -.Po e.g., -.Dq \&, , -.Dq @ -or -.Dq "=" -.Pc . -For example: -.Bd -literal -offset indent -\&.Sm off -\&.Fl -meet Cm = Ar who Oo Cm \&, Ar who " " Ar "..." Oc Cm @ Ar where -\&.Sm on -.Ed -.Pp -which renders as: -.Bd -filled -offset indent -.Sm off -.Fl -meet Cm = Ar who Oo Cm \&, Ar who " " Ar "..." Oc Cm @ Ar where -.Sm on -.Ed -.Pp -instead of: -.Bd -literal -offset indent -\&.Sm off -\&.Fl -meet No = Ar who Oo , Ar who " " Ar "..." Oc @ Ar where -\&.Sm on -.Ed -.Pp -which would render as: -.Bd -filled -offset indent -.Sm off -.Fl -meet No = Ar who Oo , Ar who " " Ar "..." Oc @ Ar where -.Sm on -.Ed -.Pp -It is important to realize that in the correct example, -.Dq \&, , -.Dq @ -and -.Dq = -are stylized with -.Sy \&Cm . -At the same time, the square brackets -.Pq Dq "[]" -are not stylized as they do not belong to the syntax of the -.Fl -meet -flag. -.El .Ss Quoting .Bl -dash -width "" .It From nobody Fri Apr 10 18:31:17 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkF6gHpz6YBMc for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkF1CnLz42YN for ; Fri, 10 Apr 2026 18:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uCNcmfWVDogG4fAYSPVkXqWvSvc+o+yLE8veSYdZU58=; b=owPaMmTEeDUm7DYN5BqWoyGLjo/RDiB5Kc52CynF/TMmc79t8dZEoVxVXBghqvI3dol0W9 gkHW6iK8CmuQjlLTSNUWabjLmNZynEvxctAPf9DoHpaL4uIhCBu96brOFdQO+Kt/XTmB0h QCT3CUmIYq0e3enu51ER3GyxxgE3piwTDacnAKTV4kms8XH7NcdqFEDPh1YoUNRVcbREKx hb5bK0i8ltX3b0j+5OTrVrWe1AuNN7Xr40qqQkMY/1FYrVDKHHxg7rvv3pV/L7sRR98z3d SeK/d+1OsP7hhmmdRpqPXRdPMQBS10llP9M6rOhgKsIBYIt+t87MVcjOGg0jOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845877; a=rsa-sha256; cv=none; b=Oe7DQ8sUJ8vpmMSgtXs+ANYL4fF4RjGC9MpV1fHa5B4loQtLZRdPVdul2N+WJ/Fb8UanJo os88HcDubwaCnfLFynZhZr9twhm7HWr+e+VQfeejRnh1l9U7pIH2wbQLloNWbybtkyKZRU CQCyv53LZdv246LhU6uL28LYPvLPNJkNdCi9lvW942AegkLBjlcQqKmdybq99DlLMT2XJ3 wU/QtPLLGygnmZiw7AGdUdT4DiG5LuaZe6/K8hoSYQRfI35jqWKgFYCZ/5NSuzH021onup CLi9b8/RFYNrdheeyKGOJA2kg2mxhtKIJz3MCThU+hwP/9wekLEUbhN/5XsmBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uCNcmfWVDogG4fAYSPVkXqWvSvc+o+yLE8veSYdZU58=; b=UMZF3VvD9swhTGB2mapla+YCCpbE45BQc+Ql2ytLSJspi4AyxQbtXezq1j8SyEFBLu51oa lDHYDBUwRQGP0sYYG/oIMN5/3K1N97RLzqrQGVnBWm/wCLFlemv2bEtzqZ3EueF2syB8gz 3dHm9bUZrOvNx1jCiyLsEiN00JCDUE5LSqJyqNl3GgN2pFBht3y491Wc1EM7vTDD9Qt4K+ Nv9KNYe21MWYMj/vrz30/YkEeNEkQ0utVsOuCZIid4MI2bVf/7kCBDIWy547UOOWA1FfGi 3Bsd4gB3VDzyH59TZ8a8qgmYTFbTkOKtm1m07otyeZYQdCooGxfBaV06cNvvfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkF0k9HzvfX for ; Fri, 10 Apr 2026 18:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a1aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: e774d86025a9 - stable/15 - style.mdoc: Left angle bracket is not less-than List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: e774d86025a9d6c1284cb7a3bd4859bbb11b3c2e Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:17 +0000 Message-Id: <69d941f5.3a1aa.5490c75d@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e774d86025a9d6c1284cb7a3bd4859bbb11b3c2e commit e774d86025a9d6c1284cb7a3bd4859bbb11b3c2e Author: Alexander Ziaee AuthorDate: 2026-03-02 10:41:07 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:28:56 +0000 style.mdoc: Left angle bracket is not less-than MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55300 (cherry picked from commit 06ac71cffba4a0f86334844453d0a6fb3c46aa12) --- share/man/man5/style.mdoc.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index 84eb281dc76a..64e2291d1c75 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -183,7 +183,7 @@ variables like .It Use the angle brackets .Sy \&Aq -.Pq Dq "<>" +.Pq Dq Ao Ac macro for arguments .Pq Sy \&Ar From nobody Fri Apr 10 18:31:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkG5yWHz6Y9jq for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkG1gqLz42Sj for ; Fri, 10 Apr 2026 18:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BfBPcXxqpdfFjHHk3PXDuo63ixshjKex+r0li0v3q4U=; b=BJEWqkpPkH6cwARhhp22oz+QFRZvWx3gzial4+x6cX/yIaIIGOWcNibi6eJ0m/AlnriZQs h4+7rtVwY2+dnFzY0WrnXmR3u7HoKeSXrrJ8W8/zsKFPYuDYMRHH4HoRe6JEgjdxWiwAim 3wU7MkTxki8zSPCFUSbAw8jtx5VqOP2BVjBv58ngB8vWK/qLYF7AG0p+3c+UHgQ1UCNVw2 QDKjUszK9Wb5M8iZVr7ggQohFy4yo27QFXEqUgot5Wbxi0AymHeZ2f792VatCOX/SYQqub KWo8h7C2DMxIxwftZvMepF893PE6JLrso3uYcn1GBdTrvNrSW8JwV5L3g64hug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845878; a=rsa-sha256; cv=none; b=JNiQulG8QTjqpY7TIDZFO5+s+CORIxkwc2r79wj7oMxcDqpRzbDFqTs2t915B4FHWetU0i 9Ra4/kzNM7zThMuj02DPtAsS4DkZgVyStg+crvtGQ5QZWdw1BzASzRdx7a0zP/aSFZSA+i eky2cHfZZIJ/IlcVkKrTxxmVudJNVeVTrk+Vm11Wwvrb5CTG4/eS22WrehkW4pcfyjD4B2 ajmgaXuzur6bRTKZxekNUtCHuPhUC+yM5lU1X/oe+Mvl66IWzX42j9GZvmK/BVoax8ZG2J a7hRagbZmP+8SXNJRlx5ABlzvTX2lcjQXsASppkiVCadWJlAiLRIESoWsSdTJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BfBPcXxqpdfFjHHk3PXDuo63ixshjKex+r0li0v3q4U=; b=e0c6EviXNVq75weAUYC4bWfY7yRSxKLlMkVnhB2hA7PDJi/NvEpm7SHLAYhFpblKyKYGu6 DDxpUXhV0Q3g3BBRbBxoylinZZaX6c3O+MqujjhSNLGm/NGC6WDa8gylhfWCBd/fkpKJ0t YFHsCQLR+Ca2H7SzkSOY5fmUzq3394SAurx6nVpJQQTXsZehAfsRe64bn+vVijVmoy9NxN mwSWhyIh4mO+VWvI8yBkllReWEj6G3+T3VymxRVya9hNXkPpoBzmjb2MZC/lm6FghY3j7w uc0+gJWAdzv7ccAYczruIStJyr3Y/Wx7qmxmwP8V6bZ8/aZX4zmxopbjUIMJgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkG14q1zw2n for ; Fri, 10 Apr 2026 18:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37b79 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 782ea981ea72 - stable/15 - ports.7: Document DEFAULT_VERSIONS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 782ea981ea725f567b0fe61285d1d6ebc9f0024b Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:18 +0000 Message-Id: <69d941f6.37b79.6501134f@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=782ea981ea725f567b0fe61285d1d6ebc9f0024b commit 782ea981ea725f567b0fe61285d1d6ebc9f0024b Author: Alexander Ziaee AuthorDate: 2026-03-06 23:44:50 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:29:06 +0000 ports.7: Document DEFAULT_VERSIONS MFC after: 3 days Co-authored-by: Adam Weinberger Differential Revision: https://reviews.freebsd.org/D55443 (cherry picked from commit 74aec9f02d9d8fbde250da1ecc881729c8baf489) --- share/man/man7/ports.7 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 318a19ba98c0..6e28f85da964 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -581,6 +581,10 @@ Additional to set when .Va WITH_DEBUG is set. +.It Va DEFAULT_VERSIONS +Override the default variant used for ports +with multiple concurrent versions in the tree, +such as database or compiler versions. .It Va WITH_CCACHE_BUILD .Pq Vt bool If set, enables the use of From nobody Fri Apr 10 18:31:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkH5Gz3z6YBQp for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkH2qKRz42gg for ; Fri, 10 Apr 2026 18:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcC2Wzi2FOFh0yHCVWTZ3opjwKgIqt6CTpqT4TlvdmI=; b=jI5fTTRi3XU68CUCp0ZHLdN7TkrreG0L5kziiwyeEXPSJwqDBtqKD42qQ1YNzjo+4eQrQM 0sfKnTRYjvVbPMlNe1yubPIZS6kFeiGFRle76Mz+R9gj4QI6f8Vs6EdRGICaNWuMUQmMi3 n0M97Gwtbuei84Pbg/JsYpct/jmRxZVRIl/c16cLDz+VPc8OU84jAyyTDSY0TLHxolNyx2 wBI45Vcpj1jzlDEBAvzMt0G2VZ98/j8Hl/DXuEtd+aKyOGE6pQIanseHDCvL4w8son9+Ck +J1IP7IKWj0xJRjYr1i28ZmNsaPbVaFvmgyLaRa0ohaIBQdG4z6crf5OfvF0uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845879; a=rsa-sha256; cv=none; b=qbA97aqk6yhb0XKRTwNpfd+g8lBJOYZptk5CCZUswMqJFCtqYhTMLENTvu1RHjAEbGJ1Hw IrHV0oxbG3YAkEnrtjHHaVAYSFODHag3KQvsaI4HDV3CE91RBXGmva1Z5XI440orpDEGMs ebWctaXO7Vyp2g+EfZLVg/HC2rtCItl9SdkchY46cMPiol2+r4ATR8T7eQ6zl6lGV+sQeD 55ItoN0CgqHam6VnhMcdjjlYa1yOJubJkufCicFksmr07AdwoN75xc3UlskJYC6GOa4h6T 9zpQ1KLFzkoNHPm/a1mC18TUY9ibOj2Km2odLiH1pAcUxLPTyNoR8X+8CwZQLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcC2Wzi2FOFh0yHCVWTZ3opjwKgIqt6CTpqT4TlvdmI=; b=feus7lPu5P8hPeTsvyRe80hlMYqmXu3bYuliRDOXOY5dc6++cmfJMJKNI/t+3bsK00VKrC uWd6dGUZ1qhj9HBEgHpBYrKVkJmYb+LfrfRRwo+We7k6r/NKzulQAZDOeQgxW2AUVZlk6U JoYz8VKiBVFIEFOtQRsVggodpO73i7yDlMbcA2PdJOH/Rg2VpjEcDIR+QhvFCsD6UNFKfS fgYbsqBKGaPdtHoVRRg8DFbNcRGHkQWEtuj7iIq4k10Bn5td8L1d9x/wcJR+Sc+IryDAiJ Au3AZ9+oAr1RUBZQ8REe2SYj36V8boRYNKEurMYwYe5k1OGonO4JeCJHFYkeOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkH1t9szwQP for ; Fri, 10 Apr 2026 18:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39a28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Paarth Shirsat From: Alexander Ziaee Subject: git: d7bda1a99637 - stable/15 - freebsd-update: Document -v verbosity 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d7bda1a9963717f98bcccc95c2b188a8753a16f6 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:19 +0000 Message-Id: <69d941f7.39a28.7adacc07@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=d7bda1a9963717f98bcccc95c2b188a8753a16f6 commit d7bda1a9963717f98bcccc95c2b188a8753a16f6 Author: Paarth Shirsat AuthorDate: 2026-03-09 13:49:51 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:29:15 +0000 freebsd-update: Document -v verbosity flag PR: 276099 MFC after: 3 days Reported by: michaelo Co-authored-by: Alexander Ziaee (cherry picked from commit 02fd9fa2952705ea0ed142061dd86aad7e01f8db) --- usr.sbin/freebsd-update/freebsd-update.8 | 13 ++++++++++++- usr.sbin/freebsd-update/freebsd-update.sh | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 7524087cb95b..cdb4915f7bfd 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -23,7 +23,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 2, 2024 +.Dd March 9, 2026 .Dt FREEBSD-UPDATE 8 .Os .Sh NAME @@ -42,6 +42,7 @@ .Op Fl r Ar newrelease .Op Fl s Ar server .Op Fl t Ar address +.Op Fl v Ar level .Ar command ... .Sh DESCRIPTION The @@ -135,6 +136,16 @@ Mail output of command, if any, to .Ar address . (default: root, or as given in the configuration file.) +.It Fl v Ar level +Set output verbosity. +.Ar level +must be one of +.Cm stats +(show progress statistics while fetching files; the default), +.Cm nostats +(suppress progress statistics), or +.Cm debug +(show all output from internal utilities). .It Fl -not-running-from-cron Force .Nm Cm fetch diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index c77f4b18fc61..09b81d1a28cd 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -52,6 +52,7 @@ Options: (default: update.FreeBSD.org) -t address -- Mail output of cron command, if any, to address (default: root) + -v level -- Set output verbosity to stats, nostats, or debug --not-running-from-cron -- Run without a tty, for use by automated tools --currently-running release From nobody Fri Apr 10 18:31:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkJ6YHtz6YBMq for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkJ39ZCz42kK for ; Fri, 10 Apr 2026 18:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAE6cU7yS33dav4wPiZfZELsgQbRDW85FdK/ZuH+1JQ=; b=FcqpJotboM09dgOqICX6YgD+BUDv+NxRKGhFmC6kak1kGBbeAesdzH8faSWbNFswxmDF91 5/rFFC7kcMpZjC2NBLVjYex6+HfRK1opSzJcJHxsYTGHuZDrtwwjy1MhDbtICKANqZLm5j L6R8Xu1vuSso44DB45XtDezcM56EAhgk4SaSrc/eYQ47lIcbDaYZJp6SseAUu8hXEKayV5 9/IGAEwdZYilgWJbcx6x75O/52jK55PnGeKH1HrROQiOse4NX9C3u8TIikI7dwD7t8uOjV 5JzT4gVmhh4IS8bVkUqWCoMC2zoPOmfvPCPhE0Ond2D2q310pzyT9EsOAYS24Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845880; a=rsa-sha256; cv=none; b=UYG/MbxNXNpA/TW0KNriCXaJ4DUE97Ba9cEoW+5mIkDMu38Jo3dYH9H78K0EY5hXFlu+H+ 4ALLR1qkdfIqb1Pgvt/bWPPrg+BP0kpqv002cGzANcMZQfuh2uwLiFTIyb3VghuVCFs3b1 W5bXy5HEXY3IHLPKQvtJkSH5UQD+XLNuk3roFY2QxcMvYJPbadsz63MsUhLF0Bsa71s5fm 8AIN875x+UloiT83aHk+cioLOQAbnZBL1JyNahoEmwFMTo+EOQJfBTLCb+sfUCb4oLGb+j 1/F0MPVsw01mBYdEmJ6nElSKO81UWAJVgJnxoR3pe28NrV06QYjDStQpu6U9lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAE6cU7yS33dav4wPiZfZELsgQbRDW85FdK/ZuH+1JQ=; b=mmXefOMf3fbTm8bWP0Ncx79XZc6RlMmB3/y2TXjrmtrXu8rPjPEFvvLQQZqaW126ozWAvX URSshwHVs3l5AEAzlQCDkLMdeTW5M64qUIQ3+ilCk4SrPHGvIS1SR87pg2dVsgZ567KqH2 ovfnZ6VnnmAqRQKQyR/2LopiOil5OkZaBPnSlWohLFP0W3atsTRNvybDIm+HtvW1HRo40/ HqZ4Sz6VrIPiQgo+05sJCvV7xnbOToZSk2O9uJ9H6oLImQdjOQGSsyKhnNSFigSDCSr728 0SQrxX7XWB0FIQdbt4mWBQAUUnOgYQ4M4w8F95jmNpzKgJfAyTA702nXNUvgfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkJ2d6zzvfZ for ; Fri, 10 Apr 2026 18:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37d70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 74406b7e0042 - stable/15 - igc.4: Describe better List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 74406b7e004291d09e109485f643c4153b4932ed Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:20 +0000 Message-Id: <69d941f8.37d70.1081558@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=74406b7e004291d09e109485f643c4153b4932ed commit 74406b7e004291d09e109485f643c4153b4932ed Author: Alexander Ziaee AuthorDate: 2026-03-09 16:34:00 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:29:20 +0000 igc.4: Describe better MFC after: 3 days (cherry picked from commit 6560ee97e8f51d5147521319dfd9d1e7afe74d34) --- share/man/man4/igc.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/igc.4 b/share/man/man4/igc.4 index a67ed1c15ee8..757c7dd4510d 100644 --- a/share/man/man4/igc.4 +++ b/share/man/man4/igc.4 @@ -1,14 +1,14 @@ -.\"- +.\" .\" Copyright 2021 Intel Corp .\" Copyright 2021 Rubicon Communications, LLC (Netgate) .\" SPDX-License-Identifier: BSD-3-Clause .\" -.Dd January 9, 2023 +.Dd March 9, 2026 .Dt IGC 4 .Os .Sh NAME .Nm igc -.Nd "Intel Ethernet Controller I225 driver" +.Nd Intel Ethernet Controller I225 2.5GbE driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -77,7 +77,7 @@ mode is supported at this speed. .Sh HARDWARE The .Nm -driver supports the following models: +driver supports the following 2.5Gb Ethernet controllers: .Pp .Bl -bullet -compact .It From nobody Fri Apr 10 18:31:21 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkK66kgz6Y9jv for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkK3rWZz42dr for ; Fri, 10 Apr 2026 18:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/WeFoSuTpVPCPRz9LcdPNkYgqzieHkTL2iYi08OCOk=; b=DYFUTJ1C45DmFZOBR3CImrjxlPP5ruYS9dyfaTaQnVoyECrULYfIm09m7eQpl+p+2jEMW0 n2IsntyPe68MlZTqprD+VRkayd+3K+AQQlvgdIud2TUPfsUb0dphDJe0mHB2P5l/A0eZW6 XZpV8k2rPSESex6W57OQpJZsDxbjgY98OeK96OXt/mf7CYFAN4xg/Vuzq4frzaYCQeP0H1 lcX3AKUhsztgsSahVM6hESx3m984vFdCVX9RvuCz0cTpgRbeQZr1trxYCmu+73LY2DaFyB cPHCzgRWu8KwFLM8B75PpjmYxl9BVK8MTvdk/9uPcpWdDNUgIA2MTy9LDVC1lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845881; a=rsa-sha256; cv=none; b=Dphv654NPBDDz7zL351yZ36m3rfpExo1ZtrtBQEdgoEIZSA5tfcBpBgbISHILi3yo/U7jI MYJ8NrsXBCh1NsKtl+X1w/cRQeEQR6p3mc1k9qsxEQm41n8g00NHW7HA3uWpruNbBlkzrf nF85MrX7yY4ooJYJkP4XaMoznvm8p1KoEmWa8bgZvar+ocnOHvFHp20tb6JwzE65piw61F q55HxMIK8m0GQh7bhpA/uojIqq1P69h525ul9/kgHgzNfG4jUOGeD5seHOsBBES9dmctg+ EQ9PENmaYYOVp7u80gCxXNBlKBCtIHh1ZyjsjgP0DI0wzoJKTtNaydAAHtqGSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/WeFoSuTpVPCPRz9LcdPNkYgqzieHkTL2iYi08OCOk=; b=CTr/GtZlvM6//73bZKFbpPlfVYDKwLAQSA2f1UzOq2oZvo+/quD73yq/BYP7tkx5/W1GKy 1TwWpBPbZRBDV5ZR01YSeKYNnBj3ntIZCuLrFDYA6HxNygy+E+twmf3PvhwAycXMb1kSwj R751cQgKtfP1ebVjD90oUuHvtLzA2PzJWAT/qmyFHxuXtZLgSuPNrF9EtPwuHfcWSHYFj2 km/ZLvgDy/P9cEtlp9Heb6G+p77wuVPRMZdJmVscBUZE0x4MroLdS9XfTthqy4ihoTxcfD gn+q9J9cc/0DYdWdl2mY0hYGdkn6v7B8vKcCsE06XYJMD92mufSW+IpHZv6g+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkK3NPkzw0y for ; Fri, 10 Apr 2026 18:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38dab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 528d53b10f26 - stable/15 - dwcotg.4: Initial manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 528d53b10f2653d0733b88eee5c8346418d4a8eb Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:21 +0000 Message-Id: <69d941f9.38dab.5d7dfd81@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=528d53b10f2653d0733b88eee5c8346418d4a8eb commit 528d53b10f2653d0733b88eee5c8346418d4a8eb Author: Alexander Ziaee AuthorDate: 2026-03-20 14:42:33 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:29:27 +0000 dwcotg.4: Initial manual page Create visibility in apropos and the Hardware Release Notes. MFC after: 3 days Reviewed by: pauamma, ray Differential Revision: https://reviews.freebsd.org/D53287 (cherry picked from commit 8475cd93fb6db65a02afe435f16306bc18e96ec9) --- share/man/man4/man4.arm/Makefile | 1 + share/man/man4/man4.arm/dwcotg.4 | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile index 2be255ad913f..eb09c119b151 100644 --- a/share/man/man4/man4.arm/Makefile +++ b/share/man/man4/man4.arm/Makefile @@ -2,6 +2,7 @@ MAN= \ ar40xx.4 \ bcm283x_pwm.4 \ devcfg.4 \ + dwcotg.4 \ imx6_ahci.4 \ imx6_snvs.4 \ imx_wdog.4 \ diff --git a/share/man/man4/man4.arm/dwcotg.4 b/share/man/man4/man4.arm/dwcotg.4 new file mode 100644 index 000000000000..e6e8c797fbe9 --- /dev/null +++ b/share/man/man4/man4.arm/dwcotg.4 @@ -0,0 +1,29 @@ +.\" +.\" Copyright (c) 2025 Alexander Ziaee +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 5, 2025 +.Dt DWCOTG 4 arm +.Os +.Sh NAME +.Nm dwcotg +.Nd Synopsys DesignWare USB controller driver +.Sh SYNOPSIS +.Cd device acpi +.Cd device fdt +.Cd device dwcotg +.Sh HARDWARE +The +.Nm +driver supports the +Synopsys DesignWare USB controller found in many embedded devices. +.Sh SEE ALSO +.Xr usb_template 4 +.Sh HISTORY +The +.Nm +driver appeared in +.Fx 10.0 . +.Sh AUTHORS +.An Hans Petter Selasky From nobody Fri Apr 10 18:31:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkM1tHLz6YBR1 for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkL4VPnz42bp for ; Fri, 10 Apr 2026 18:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2/xtP9y7EWWPTP9sAn38YCD7RP0AcTzKF3K/D5iugcA=; b=BOmpiVHtKeosD2d6xz/Xw4owZP6VSnulQUHgUVLbTB4Y6xSIomDO0k6/5oxOgEFE1ZIVOm rJR5rKZALrwobHkM5DzZKyR1xxDkd0t/JYSSQS5oskCO+hNaMsa91F6OptPB9s4wrlhpAQ +U3vZ7Vj6rSJZf5fPPiz6lnTLDYXOUd3z5Ush0BQ0ttpMP3tx1iOYOHpeOeRrVlLA4HFxd GfTDErqweU5mk2vxV57QXHz5xx30opJVYTfZyDiuFhRmWUBsQh83TNulOid95gICDjYu0R gl+VbJWpp4U+z0OBvQI4bAwHLGKrsNETOVkVCFobr1nAJnxCXo9cnPw+RblkQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845882; a=rsa-sha256; cv=none; b=uOPb4Z2wa72IFV1mzmfcnV16fiByeyBes/w6MPNAfacSAS1hIzaemCg1Dwao6A0blcVq4e nJFD6JYY3Dh+NkU3mDxpd/QORiwMoHFyP0FRBKScXMSdaw7NxeLtHSw5b1YdGugPNrljiO UUDWdsMuc7bCt2402a5ZyzpxVaxqN5SbaNtLczjDXQojH/oJKtwdvKh4Z2fPZbykXX4ubR CJg45onun3rLdRCgNkKXNpskmZ4tMzYjGYdNINiY1aAcYNk1y2G1ygxzIPKADetwHALDlp N62osXAvsA4aKmluHJaaRXvb7momzBfHGzEU7lX/v9S4Yfb4Ln+x9q8uu1dfxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2/xtP9y7EWWPTP9sAn38YCD7RP0AcTzKF3K/D5iugcA=; b=HUs+fVcMm/6L7+ztVTwMp5Z3FRX/UL9R9eZD1WT/oW8jmJZPpYzpul+gv/8vymZ6JnZjuk PHTIDi7Orgu3W2pj2NrOU/fRPcxuzJh4gmXpBedXhhBw8Kq79Df0IKaP8SeElMTx+V+0L8 kQNU6tDJl7+UvMlCYX/ZbEO2id3/3AkV6ED02uZlcPbGdpP2sKUkgp+ws57AQ+Bisf6vYV 7kha9N2vqODi6wgki1lBBnNoHamQgAFQ1l/J/XrQDXucxQT+aWWVfZkrPKYTVZkoFQrEdh 7yV7LS1kLZ96bnpBWk2CXuowVHwanlrTEjN499+sr7HXl9wmrY4qTGanCL/J7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkL3wM9zw10 for ; Fri, 10 Apr 2026 18:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 2ba48ee1ec83 - stable/15 - kldload.2: Provide more info about file argument List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2ba48ee1ec83b72388ae59cf9e2bc7d6eedbb27c Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:22 +0000 Message-Id: <69d941fa.38cc0.18223697@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba48ee1ec83b72388ae59cf9e2bc7d6eedbb27c commit 2ba48ee1ec83b72388ae59cf9e2bc7d6eedbb27c Author: Artem Bunichev AuthorDate: 2026-03-26 13:11:26 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:29:36 +0000 kldload.2: Provide more info about file argument The information is basically taken from kldload(8). Reviewed by: kib, ziaee Differential Revision: https://reviews.freebsd.org/D55170 (cherry picked from commit 1e2c9bcc4ed5fd2a27abdbcf5dfb007193251648) --- lib/libsys/kldload.2 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/libsys/kldload.2 b/lib/libsys/kldload.2 index 63a13c328d58..55dd16300af0 100644 --- a/lib/libsys/kldload.2 +++ b/lib/libsys/kldload.2 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 3, 1999 +.Dd March 26, 2026 .Dt KLDLOAD 2 .Os .Sh NAME @@ -39,7 +39,20 @@ The .Fn kldload system call -loads a kld file into the kernel using the kernel linker. +loads a kld file specified by +.Fa file +into the kernel using the kernel linker (see +.Xr kld 4 ) . +The +.Fa file +can be specified as a full or relative path, or otherwise is searched +within the module path as defined by the +loader tunable and sysctl variable +.Va kern.module_path . +The .ko +extension for +.Fa file +is not mandatory. .Sh RETURN VALUES The .Fn kldload From nobody Fri Apr 10 18:31:24 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkP1KfVz6YBN3 for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkN5jBZz42hS for ; Fri, 10 Apr 2026 18:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A40b+JzT1tUiNRkQUR7J1e9RJoixDDl/ZE+3cXlUBEE=; b=xAwjb8eYdiF6VsklCh/Duux8FvPDMvPoYI6Swtdkq3eSeI7v4J+y8VEfw0XPTgG+II5vxz UFDua4e4OgZQaXKbe/EonIxkUc2dSyU+SJ03xceYgXyWSlY5D/I8GiU8gyoHBlRD7qEzoX o3QfDOok9lhnWeVeHEmERlvcxnE2sD2O7uI4iBwLf5eVLvANh8EiekPvt5q+6DGcDFeoGf cJbmHmFqk0pZvnQRDdDY1aMQ/EQwJPY3rn/+uaoJJVLYQuxgqtBQLlJ9ZNYlQUMLfgiclu B7MXX9fQCwU/ehEyVpZVcaJQ3t5c45l7Nb23BapAK+eT69hdfj/LlCtUJXwioQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845884; a=rsa-sha256; cv=none; b=KEBE5vXQmTbMuUE1gAApCzP5l/bI6l5XymI8enME1vmOkyS3J/doti8URSJ8L4hBs0e8XH iyIOhmJicggrsi8jn3cEtuExHJpV5pwIqSSKAh5Tin1mM1FtEsow1/uAnymb7JvPTHyPP0 k2B077gxSlxjjbEWFQFJJi8XygikhPcySHGz2Bc7ohw3LzTyxHyB0D0YH4DD1jPJvSdTTR gGfs3uEKFfFuw5w76ofWwpOE0VkT8xPlPnbmXPBth7CucR1391eUFDx4azr8x+tIHIyaJB G74MvP95aAGhdcHStFWnWMxdyfavke1MhzhULyCedhghcBxISrX5bbTZAlDOdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A40b+JzT1tUiNRkQUR7J1e9RJoixDDl/ZE+3cXlUBEE=; b=rtaWM2jk9B0o99heDxPcg/LVO6xGstNEESw3116lx7CTiKnr9rH1xI3bjjg5/EZ+ha8VnR XezvOoXKauJivhRO9UhMmIQs1z15h+Tj3ULK6sdqDUdjuEaDPFBdZaPTF+8X/X7g0VeFSZ gMUW1Vbk5JwTUmrV12SEiADjTz/k56gnhURQxeL+kxfJz7gjp8JOf4zhhJRw1yr+NWKIlY /9IXdpA6nsGFOQJrhv/E4ONbmBnWII4COJdre5Ol9HT/bJcYX4Y3rVbsA4PbIYzXw4VIvt 4CpMmFavBklPKC1gIqzjqb9Cu0j8jD4VbmmGNcbSHHu9ELCP8kk5BsqwJzj5tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkN56jDzw11 for ; Fri, 10 Apr 2026 18:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 20bbad13f247 - stable/15 - _exit.2: Cross-reference atexit(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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 20bbad13f24744e86cbef02b1e3e3475abec6a71 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:24 +0000 Message-Id: <69d941fc.38e18.1ebe21b0@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=20bbad13f24744e86cbef02b1e3e3475abec6a71 commit 20bbad13f24744e86cbef02b1e3e3475abec6a71 Author: Artem Bunichev AuthorDate: 2026-03-31 17:09:00 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:30:21 +0000 _exit.2: Cross-reference atexit(3) atexit(3) is one of the cases when _exit(2) must be used instead of exit(3). MFC after: 3 days Reviewed by: mhorne, ziaee Differential Revision: https://reviews.freebsd.org/D54467 (cherry picked from commit c082e5656417945bfa567114c60969844f3d7bdf) --- lib/libc/stdlib/atexit.3 | 3 ++- lib/libsys/_exit.2 | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libc/stdlib/atexit.3 b/lib/libc/stdlib/atexit.3 index 4ff384813550..4082c887497c 100644 --- a/lib/libc/stdlib/atexit.3 +++ b/lib/libc/stdlib/atexit.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 6, 2002 +.Dd March 31, 2026 .Dt ATEXIT 3 .Os .Sh NAME @@ -90,6 +90,7 @@ function was called by a program that did not supply a implementation. .El .Sh SEE ALSO +.Xr _exit 2 , .Xr at_quick_exit 3 , .Xr exit 3 .Sh STANDARDS diff --git a/lib/libsys/_exit.2 b/lib/libsys/_exit.2 index 6f038f79f6ea..6e46e65ac86e 100644 --- a/lib/libsys/_exit.2 +++ b/lib/libsys/_exit.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 8, 2016 +.Dd March 31, 2026 .Dt EXIT 2 .Os .Sh NAME @@ -95,9 +95,9 @@ and all current access to the controlling terminal is revoked. .Pp Most C programs call the library routine .Xr exit 3 , -which flushes buffers, closes streams, unlinks temporary files, etc., -before -calling +which flushes buffers, closes streams, unlinks temporary files, invokes +.Xr atexit 3 +handlers, etc., before calling .Fn _exit . .Sh RETURN VALUES The @@ -108,6 +108,7 @@ can never return. .Xr fork 2 , .Xr sigaction 2 , .Xr wait 2 , +.Xr atexit 3 , .Xr exit 3 , .Xr init 8 .Sh STANDARDS From nobody Fri Apr 10 18:31:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkM6Qdkz6YBmp for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkM58Ytz42qR for ; Fri, 10 Apr 2026 18:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bcwjQyKXiD5nWgyxdZdO3DKGCGBTIFBKTtxCpoqTvfw=; b=T3dXdXdaaaE/y5SSadFuGSXIc8nuZ4GBQfPWTgP1QrmPxGixhJPfokjoRrx+Iy8uAdB3sZ gpKCreUVTg1eEHwHMI9WyC9z2VGP1o0QvX8wGXT3IMbgsjDNK4fKlFsFpfcTB+ln1H63Wg xB1aqiU2gDiSUq6ybTY9yW/Un7L61AKLO4/XmyENQlefufl2UdbP+ybWpunJtBopb9Kgn5 m37yPnMhRx3iL8GMW/S0H2lygl7oJCdLVQL+/O4l6ViRkk7ypdiPgBwUjrIAYW3qEDK45D nqTHkFtCNR53OHwTWN+RHm/ZE1s3VW2bbq+IEBAsePMb/y0AkK8PQYX9b4n9cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845883; a=rsa-sha256; cv=none; b=wMfX5+WMiLhdKC9Td1/0k21cie/JWSyBpS0IVhW8W/wi8K7H4CvfwxRzh5Ty4qNum2zL+2 zMkiZznTOIvdR/sXQXe0zGTKyGbwEZmPnqXpEcWIOIo8JeJlqE9FgjftHXHI17DsGYN+ou u/jha1bZ++yCrvw+lTiDQjZZsjohZGgxXklTUCrkPzuDF0SU03Osoi/4jTEDAhUNlwrygU CYEI99V7ZQLlVIqhRvnZmMPtuV+lzDrvq+b36oUCk75MShIyAGKNTATrY1N0OYo94SpDhz grdCdsMhTs8WAVDtVje7RnpP3vvdsYJRQTLxNrUOkS+tuXd4wsNYU/W+BiLYPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bcwjQyKXiD5nWgyxdZdO3DKGCGBTIFBKTtxCpoqTvfw=; b=KO2PgVgmdnjZ9hlbSMSQKOMYWKPNzK/szDWPAu7SdRUL88rCARjLKN3sQkF8KdRA0oK3Lo OZlBZSjqjZfJJeAIbQPeitb1eNy61PoG0v4mYVhOsm+ot0OH+xHGbkByMaDNwXUbdAuvL5 oI6ygFJJq0xmQ0K8bEmSfotzCTmVg+MNgZmdCMNOV6lRMVocsIoZ82FFxADsXx2vXtrHfD CCSn3ePnVTsL6HCKHeMFOjSo/2Kpp4gA4hf1WRs5WmnUTENxmC8Vc2OdCHQKpBCdXWAaBj XfvFCGXXvp5F39LxpSjwo8C1Z0NtsRmB8sPfuAkerpnYfRhxazKio6n2gqpiKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkM4j3szw2r for ; Fri, 10 Apr 2026 18:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 390f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christos Longros From: Alexander Ziaee Subject: git: 252f0c28855b - stable/15 - vmgenc.4: Add VM Generation ID Counter manual List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 252f0c28855bf089d0e54147c52af8f8d6961cdc Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:23 +0000 Message-Id: <69d941fb.390f1.6f4c8095@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=252f0c28855bf089d0e54147c52af8f8d6961cdc commit 252f0c28855bf089d0e54147c52af8f8d6961cdc Author: Christos Longros AuthorDate: 2026-03-31 02:24:16 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:30:15 +0000 vmgenc.4: Add VM Generation ID Counter manual Document the vmgenc(4) ACPI driver which detects virtual machine cloning and snapshot restoration via the VM Generation ID specification. The driver reseeds the kernel entropy pool when a generation change is detected. MFC after: 3 days Reviewed by: cem (previous), ziaee Signed-off-by: Christos Longros Differential Revision: https://reviews.freebsd.org/D56011 (cherry picked from commit 59cb18f35617d3a53f7d7e142b4f91ad7951f5e0) --- share/man/man4/Makefile | 1 + share/man/man4/vmgenc.4 | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index ecf10bc693c8..62d0b8f77f0f 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -621,6 +621,7 @@ MAN= aac.4 \ virtio_random.4 \ virtio_scsi.4 \ ${_vmci.4} \ + vmgenc.4 \ vkbd.4 \ vlan.4 \ vxlan.4 \ diff --git a/share/man/man4/vmgenc.4 b/share/man/man4/vmgenc.4 new file mode 100644 index 000000000000..1938e7f70eac --- /dev/null +++ b/share/man/man4/vmgenc.4 @@ -0,0 +1,62 @@ +.\" +.\" Copyright (c) 2026 Christos Longros +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd March 21, 2026 +.Dt VMGENC 4 +.Os +.Sh NAME +.Nm vmgenc +.Nd ACPI virtual machine generation ID counter +.Sh SYNOPSIS +.Cd device vmgenc +.Pp +In +.Xr loader.conf 5 : +.Cd vmgenc_load="YES" +.Sh DESCRIPTION +The +.Nm +driver provides support for the Virtual Machine Generation ID, +a 128-bit unique identifier exposed by the hypervisor via ACPI. +The hypervisor changes this identifier whenever the virtual machine +is cloned, restored from a snapshot, or otherwise duplicated. +.Pp +When a generation ID change is detected, the +.Nm +driver feeds the new identifier into the kernel entropy pool via +.Xr random 4 , +ensuring that duplicated virtual machines do not share +cryptographic state. +The driver also sends a +.Xr devctl 4 +event and an internal kernel notification so that other subsystems +can respond to the duplication. +.Pp +The Virtual Machine Generation ID specification is supported by +QEMU, VMware ESXi, Microsoft Hyper-V, and Xen. +.Sh SYSCTL VARIABLES +The following variable is available: +.Bl -tag -width indent +.It Va dev.vmgenc.%d.guid +The current cached VM generation counter as a 128-bit value. +This value is updated each time the hypervisor signals a +generation change. +.El +.Sh SEE ALSO +.Xr acpi 4 , +.Xr random 4 +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 13.0 . +.Sh AUTHORS +The +.Nm +driver was written by +.An Conrad Meyer Aq Mt cem@FreeBSD.org . +.Pp +This manual page was written by +.An Christos Longros Aq Mt chris.longros@gmail.com . From nobody Fri Apr 10 18:31:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fslkQ6lWpz6YBkw for ; Fri, 10 Apr 2026 18:31: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fslkP6QXnz42cT for ; Fri, 10 Apr 2026 18:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XbVU1D14LfOl2qv4LkRjUsXRqjDtso1jqN20oXeP+Y=; b=Vmy66QssCmhtLyQrAdno6ZU0U2+t8pyT1XDGDgOrsv+yO2cJVV1EBKXNBHwiMiCwyvR3F6 +IxR4jiCwop+c5fT7pay+OkYGultmnNVACajWZYs2iCwKdXm55wXs1pqOWCKePhlamTTcZ HqySkCJrSTf+LOT4PQbGd51PHdquzn0TS+4IeNvQfTKuE3o820f4IchpYFwdrqIjwy/kGx 3sPXoQ03/BAamj5pHp6GmFA+KfPUbvxDrm3Od/YEcbHvW/o0cW+rsTXKaQjYKjD02LRIou GgDwetMsZhU39+ABk5zxPhskThAEfQ6oos50kXf1yNl/5jXDDLibsyxjKvWy3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775845885; a=rsa-sha256; cv=none; b=sS1rYH1WV8tri7Emeso/o5Wv4Ds1yHhOaljyTR0ZnlaTaZOdXrVAcEMuwcBV83QURkuNsk 6AovcrU/ArAER4bxsyBf0AcV2XTR92qU4iACWiswtdDM3/3BKsMROMcHpf19WpKYohj58b Dhr5xvYxBmgppLIDR3uaTmjBCgn4/zY7dSe95nFPnM3RZvSoEv4WadOBmTxN3WacMInJnY MheN5Oe7oP/8OojjUe4V8u7nLl1dcwNSWbpuN8CdvXe02Jy2NC8MR/zTXDfluYjZ8aAFrW wub/wU0gJ7lymoO3JWYutJvSv404NSXSf8sZ2KHp85PL3Yja/zgawVYtkiKMyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775845885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XbVU1D14LfOl2qv4LkRjUsXRqjDtso1jqN20oXeP+Y=; b=GLihLJWqPxZYVXEMcfLJzXST449kK7Txv6uimN10mq4PyLdJ1tyWiAv2XLGcTCOmbM4ecK j+gI0izuvetyaKWWwWgaDdNt/8qamvddbpUjkpTaWbCQCR0n4jq5dDzQ/UWfOQsLeh2Q97 LSp0E/gKZ05VuhOzo7kQYjFHvKZvKvEP06JDA90FSW8v5iweUfdxICfQykdBrq9jjJI0ko xozl0iRDdkq4OC3PLNKJFb3tECgETAomyMbrRRZluiBoqW+YhwUqpsnuQ1Uy0XqirxF8Tv M7I0IriIIHAwJ69vVAcQFZoaBtAypzI7/i2CptShIPEW/R6v+Vzu4nlW+5u59w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fslkP5qXSzwFM for ; Fri, 10 Apr 2026 18:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 18:31:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 820887188ee4 - stable/15 - procctl.2: Align list indentation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 820887188ee4eba72427a840721300c1757b01e7 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 18:31:25 +0000 Message-Id: <69d941fd.38e1d.1366c81b@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=820887188ee4eba72427a840721300c1757b01e7 commit 820887188ee4eba72427a840721300c1757b01e7 Author: Alexander Ziaee AuthorDate: 2026-04-02 03:07:28 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-10 18:30:26 +0000 procctl.2: Align list indentation Remove 81 lines of whitespace at default manual rendering width. MFC after: 3 days (cherry picked from commit db9bbe131c92f55e6cf03657dc030c9eea93a9fb) --- lib/libsys/procctl.2 | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/libsys/procctl.2 b/lib/libsys/procctl.2 index dfb7931de265..cccaad83bf4a 100644 --- a/lib/libsys/procctl.2 +++ b/lib/libsys/procctl.2 @@ -56,7 +56,7 @@ to control as many of the selected processes as possible. An error is only returned if no selected processes successfully complete the request. The following identifier types are supported: -.Bl -tag -width P_PGID +.Bl -tag -width indent .It Dv P_PID Control the process with the process ID .Fa id . @@ -79,7 +79,7 @@ All status query requests require the caller to have the right to observe the target. .Pp The following commands are supported: -.Bl -tag -width PROC_LOGSIGEXIT_STATUS +.Bl -tag -width indent .It Dv PROC_ASLR_CTL Controls Address Space Layout Randomization (ASLR) in program images created @@ -91,7 +91,7 @@ The .Fa data parameter must point to an integer variable holding one of the following values: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_ASLR_FORCE_ENABLE Request that ASLR is enabled after execution, even if it is disabled system-wide. @@ -117,7 +117,7 @@ The .Fa data parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_ASLR_FORCE_ENABLE .It Dv PROC_ASLR_FORCE_DISABLE .It Dv PROC_ASLR_NOFORCE @@ -133,7 +133,7 @@ dump. The .Va arg parameter must point to an integer variable holding one of the following values: -.Bl -tag -width PROC_LOGSIGEXIT_CTL_FORCE_DISABLE +.Bl -tag -width indent .It Dv PROC_LOGSIGEXIT_CTL_FORCE_ENABLE Enables logging of exits due to signals that would normally cause a core dump. Logging is done via @@ -155,7 +155,7 @@ The .Va arg parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width PROC_LOGSIGEXIT_CTL_FORCE_DISABLE +.Bl -tag -width indent .It Dv PROC_LOGSIGEXIT_CTL_FORCE_ENABLE .It Dv PROC_LOGSIGEXIT_CTL_FORCE_DISABLE .It Dv PROC_LOGSIGEXIT_CTL_NOFORCE @@ -186,7 +186,7 @@ The .Fa data parameter must point to an integer variable holding one of the following values: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_PROTMAX_FORCE_ENABLE Use the permissions in .Fa prot @@ -214,7 +214,7 @@ The .Fa data parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_PROTMAX_FORCE_ENABLE .It Dv PROC_PROTMAX_FORCE_DISABLE .It Dv PROC_PROTMAX_NOFORCE @@ -233,7 +233,7 @@ The parameter must point to an integer containing an operation and zero or more optional flags. The following operations are supported: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PPROT_SET Mark the selected processes as protected. .It Dv PPROT_CLEAR @@ -241,7 +241,7 @@ Clear the protected state of selected processes. .El .Pp The following optional flags are supported: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PPROT_DESCEND Apply the requested operation to all child processes of each selected process in addition to each selected process. @@ -300,7 +300,7 @@ struct procctl_reaper_status { The .Fa rs_flags may have the following flags returned: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv REAPER_STATUS_OWNED The specified process is a reaper. When this flag is returned, the specified process @@ -380,7 +380,7 @@ the (grand-)parent of the descendant process. The .Fa pi_flags field returns the following flags, further describing the descendant: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv REAPER_PIDINFO_VALID Set to indicate that the .Vt procctl_reaper_pidinfo @@ -431,7 +431,7 @@ The .Fa rk_flags field further directs the operation. It is or-ed from the following flags: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv REAPER_KILL_CHILDREN Deliver the specified signal only to direct children of the reaper. .It Dv REAPER_KILL_SUBTREE @@ -473,7 +473,7 @@ as well as dumping core. Possible values for the .Fa data argument are: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_TRACE_CTL_ENABLE Enable tracing, after it was disabled by .Dv PROC_TRACE_CTL_DISABLE . @@ -524,7 +524,7 @@ system call. Possible values for the .Fa data argument are: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_TRAPCAP_CTL_ENABLE Enable .Dv SIGTRAP @@ -634,7 +634,7 @@ The .Fa data argument must point to an integer variable containing flags. The following flags are allowed: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_STACKGAP_ENABLE This flag is only accepted for consistency with .Dv PROC_STACKGAP_STATUS . @@ -667,7 +667,7 @@ Returns the current stack gap state for the specified process. .Fa data must point to an integer variable, which is used to return a bitmask consisting of the following flags: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_STACKGAP_ENABLE Stack gaps are enabled. .It Dv PROC_STACKGAP_DISABLE @@ -699,7 +699,7 @@ The .Fa data parameter must point to an integer variable holding the following value: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_NO_NEW_PRIVS_ENABLE Request set-user-ID and set-group-ID bits to be ignored. .El @@ -711,7 +711,7 @@ The .Fa data parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_NO_NEW_PRIVS_ENABLE .It Dv PROC_NO_NEW_PRIVS_DISABLE .El @@ -722,7 +722,7 @@ The .Fa data parameter must point to an integer variable holding one of the following values: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_WX_MAPPINGS_PERMIT Enable creation of mappings that have both write and execute permissions in the specified process' current and future address spaces. @@ -760,7 +760,7 @@ The .Dv data parameter must point to an integer variable, where one of the following values is written: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_WX_MAPPINGS_PERMIT Creation of simultaneously writable and executable mappings are permitted; otherwise, the process cannot create such mappings. @@ -779,7 +779,7 @@ creation, the flag is set in the returned value. .El .Sh x86 MACHINE-SPECIFIC REQUESTS -.Bl -tag -width PROC_KPTI_STATUS +.Bl -tag -width indent .It Dv PROC_KPTI_CTL AMD64 only. Controls the Kernel Page Table Isolation (KPTI) option for the children @@ -795,7 +795,7 @@ The .Fa data parameter must point to an integer variable containing one of the following commands: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_KPTI_CTL_ENABLE_ON_EXEC Enable KPTI after .Xr execve 2 . @@ -811,7 +811,7 @@ Returns the current KPTI status for the specified process. .Fa data must point to an integer variable, where one of the following values is written: -.Bl -tag -width Ds +.Bl -tag -width indent .It Dv PROC_KPTI_CTL_ENABLE_ON_EXEC .It Dv PROC_KPTI_CTL_DISABLE_ON_EXEC .El From nobody Sat Apr 11 00:59:12 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fswKr3Nltz6Yj1Z for ; Sat, 11 Apr 2026 00:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fswKr2dJSz3ftj for ; Sat, 11 Apr 2026 00:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775869152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+g0GLtu2+D6dOVmyo/dXwHdo2254clHap5bjRZJI1HA=; b=ZY+/zwz6EBDaCSkjAugP1+rzavQcAgoesa25w6Wl8tnL9YpOxsYuU9gxuwsARhA/Nxlpm5 6DEcWjcHyAwVCrakK+j3k6VxQFoSE3eNeoPmUem3gUKbLiC9ohDuve8K1a3KUMEzIBgo5q IQcZAORV0MChzUxxJOyhoEKgYcCRkcaH5LXpeQ+cRF6XyEqI3L0Pglv0y149k+q4MUsAm9 zy8oTzbDKaQFwwiD9Q1ZOeWQeXQOSdP/KBYTucwY70/rkEeA0+CZvf7KsLXQmauGEv9E2R BVseYqKkwQ2L3PJfBITSoNFLRmqn/NNWTAH70HBP3kEKPS8p+Ct1SPdyuk30Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775869152; a=rsa-sha256; cv=none; b=fAGeSiS2/GF4MDUAs51TxWjPaayEyqC/j62ZlBtOxUPyq8MeAXzhP6q5fHTGZueqpgr3kD L0k30Hjyas/0aNc/nq/jaP8RnwFgQxcRHYCAbmgtMwXPaKVkZ3euVyuIxP57TPCd8BGPsv L72tsUE6pn0rWrqNDPOu0mVtLghcTlvRcYP/sdGatvZ2dMVb23v2PmfpYrL1epjc17ZypA oE/qeU65HcnOtNarQ7t3HL51iNIuXsxEwTnUK8wlo9tK471e9BIXvbGG0J8B+KkxPjlJTl JjLYXcNvz4lziyZHdebefGzG/cASF8h29LpybaS1U5ujbmFlwHSnu82KYYrPbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775869152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+g0GLtu2+D6dOVmyo/dXwHdo2254clHap5bjRZJI1HA=; b=PCfEu1tDgh16YSFq70Nsh8VzInwwtH7FLnRLBpNT/x5AjlgntyXtClWG9XOwT7gOSHCUDd 2xXWb0MuGk/sgKOYOHzgyBbncoa0EIyta+Yzz09X4tCJC854p7Rgl1iiZ/UA5ct3tj/AD0 F5j21gkFvHd+LIu6vowX7dF7J3U3xNTJ+Axt2QgF3p6e+Ql8l9Z6c3F/Og0Sx/3XqZAzJv BL1wQZYxPyPCXAYyJl4ROfFpSEUeCMP41ww1XIbGqilUtQ9Av57qaZu7NkUgGAB4w8XbI2 CeZYpkwkGkoIg668DMBo4Yogwxevp5ARk40K7fICvitLv21MZVWqg+dJdU77GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fswKr1zJ8z16M9 for ; Sat, 11 Apr 2026 00:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 00:59:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 6dddd2503fc7 - stable/15 - nfs_nfsdsocket.c: All Copy and Clone across file systems List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 6dddd2503fc71b6e192b198209cdcd81b1b04fa8 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 00:59:12 +0000 Message-Id: <69d99ce0.38d31.6edd2027@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6dddd2503fc71b6e192b198209cdcd81b1b04fa8 commit 6dddd2503fc71b6e192b198209cdcd81b1b04fa8 Author: Rick Macklem AuthorDate: 2026-03-28 19:39:10 +0000 Commit: Rick Macklem CommitDate: 2026-04-11 00:57:08 +0000 nfs_nfsdsocket.c: All Copy and Clone across file systems For some server file system types, such as ZFS, a Copy/Clone operation can be done across file systems of the same file system type. As such, this patch allows the Copy/Clone to be attempted when the file handles are for files on different file systems. This fixes a problem for exported ZFS file systems when a copy_files on file_range(2) between file systems in the same NFSv4 mount is attempted. PR: 294010 (cherry picked from commit b65e7b4944cc2f594c9d9e6abc9b8618d3d62ff8) --- sys/fs/nfsserver/nfs_nfsdsocket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c index 636c4735a131..d6cfdb6b9c8e 100644 --- a/sys/fs/nfsserver/nfs_nfsdsocket.c +++ b/sys/fs/nfsserver/nfs_nfsdsocket.c @@ -1272,7 +1272,8 @@ tryagain: if (vp == NULL || savevp == NULL) { nd->nd_repstat = NFSERR_NOFILEHANDLE; break; - } else if (fsidcmp(&cur_fsid, &save_fsid) != 0) { + } else if (fsidcmp(&cur_fsid, &save_fsid) != 0 && + op != NFSV4OP_COPY && op != NFSV4OP_CLONE) { nd->nd_repstat = NFSERR_XDEV; break; } From nobody Sat Apr 11 03:35:15 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fsznw1VBkz6Yw6T for ; Sat, 11 Apr 2026 03:35: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsznw0kBYz3xN0 for ; Sat, 11 Apr 2026 03:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775878516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3v5BDe8iSVz+WzKbi7dyryvCNiZksQ1OZzjTxj/tLdM=; b=OG/9z4ixiX1TvKQIb3sauyWOz7M95KwlLQcekbB7KB64wB3oE0ND3J+lpp5moz6Ipnplt3 x9cyPD5PGuzC48YP4uWpF9X1S8nN3gU1ZRz2WODje3vLH5EeWgTR4eRC8MJ6Ie6vvb0cNs Me0yGJYn+d9HjeIcAIvioOlh0Z8qxFo4Ow92xb1GCfAT+Hxvrz/Dm4tM194hcZ0f8yySq+ fp+51Eu73kHgetGosalwkNKoTgoolMguG4Rp7JLXn98Z4jzyEhhOXQIsbPFJNrLeEAPuHQ PrRaGiIF5H0YZ4tPdWUcewEhgXJq8NEztREUzYK+dLQwHRWXJv6yUvbjtm8P6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775878516; a=rsa-sha256; cv=none; b=uxcAywXfpvBlZURdabWyimA//KIvTtUW0f+yZdsIJzAAwsu7zJ6ixv2XEFGK/zB4YOv4jY aEdDTjLbpb8LHZANO5RJhdo/UkrjCTnXhXlGf58242wlsVBvNNdeXsoAsJ5MiYsMMXO069 H/rRre/DR2195t6CU6fHLGQLr+Tbw10jZgYATd7xldn4QqSAYiIz7QjUIj1nrEuQbjbxoQ 4bs3G2X2/UUeJ/5v8To6KHjgKhaI/n/ZJG+ugKaLuBVP/k8D8/OYnPnNQUOzeq1xyp6W9S qQYqmDcSPRg7Tq015bWLr5UbwUvugJBEoWE/8dFpoEEmphCQmqxZUzP/YPtj9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775878516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3v5BDe8iSVz+WzKbi7dyryvCNiZksQ1OZzjTxj/tLdM=; b=gJjdj/3bss68+UMduO2PR5L0RLQU7SERr1KczjRFkYQh4ZAWEyWP4G8KvII8syLHafTk0e HnXSUygUmMbSF1rGqLEE7h7FTT6JO6Hwq7noG/CKuyVnNWmXPBVqlBifsL3g8lzI7DnhOQ ntzcRJ7+sdBiQfGPejvlje6XwFfCjczuJbP9wNWVhxCKE9aCBFuLKluwsmN5MHOsT/HRZB wYPBdPopNnL9Gq5JvaNfGxsXMUbxyDJ2QO2YVh5vNiO5nf7wuEC2hcBbiN7yfrIpnGicie EQ9ueWqObAyWk+p+4YamsANa0PUPWT37kWXqaIh24ZUjN6u7LlWzJxONb3pLMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsznw0K1mz1CNs for ; Sat, 11 Apr 2026 03:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ee8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 03:35:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 1d4e9d2b5ef5 - stable/14 - nfs_nfsdsocket.c: Allow Copy across file systems List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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/14 X-Git-Reftype: branch X-Git-Commit: 1d4e9d2b5ef5c8055740c949ad4446aed9a4d308 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 03:35:15 +0000 Message-Id: <69d9c173.18ee8.4e938d06@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=1d4e9d2b5ef5c8055740c949ad4446aed9a4d308 commit 1d4e9d2b5ef5c8055740c949ad4446aed9a4d308 Author: Rick Macklem AuthorDate: 2026-03-28 19:39:10 +0000 Commit: Rick Macklem CommitDate: 2026-04-11 03:33:19 +0000 nfs_nfsdsocket.c: Allow Copy across file systems For some server file system types, such as ZFS, a Copy/Clone operation can be done across file systems of the same file system type. As such, this patch allows the Copy/Clone to be attempted when the file handles are for files on different file systems. This fixes a problem for exported ZFS file systems when a copy_files on file_range(2) between file systems in the same NFSv4 mount is attempted. PR: 294010 (cherry picked from commit b65e7b4944cc2f594c9d9e6abc9b8618d3d62ff8) --- sys/fs/nfsserver/nfs_nfsdsocket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c index d1b6198ba0e1..81c224860cc0 100644 --- a/sys/fs/nfsserver/nfs_nfsdsocket.c +++ b/sys/fs/nfsserver/nfs_nfsdsocket.c @@ -1272,7 +1272,8 @@ tryagain: if (vp == NULL || savevp == NULL) { nd->nd_repstat = NFSERR_NOFILEHANDLE; break; - } else if (fsidcmp(&cur_fsid, &save_fsid) != 0) { + } else if (fsidcmp(&cur_fsid, &save_fsid) != 0 && + op != NFSV4OP_COPY) { nd->nd_repstat = NFSERR_XDEV; break; } From nobody Sat Apr 11 15:49:09 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4j5TC9z6Ygqt for ; Sat, 11 Apr 2026 15:49: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftJ4j4zLXz3HNB for ; Sat, 11 Apr 2026 15:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YScf4/sQH0dkmgouxTGc2KlTosk2vHMn0odJ0C4H/4A=; b=C6J398EwAzYHJLBEM5BcMbJYJ9/yR/RHk38rwHqfppj/KDOAInNxLigCeasBNcjG2OGXcJ fj3qlGalKlfB6qb6cMqVXxeCICB6vC/JS65fiZDa1wY+UeBVQqI5Cp9Ilv1GGUjLM4RCo6 JL26m+gBjHJ6GP0AO80buK7B2BWN15HTJzQI6CStQ5e63p5R7Ms8RdtyTTMItjKC1bKSij eMkgBfuZEOD9ZbdTVrX0UnkHEtuGvhGyAy4r+Fs6xjdb42FQNp9U3w9PxO4n31n5hrHKgc YnV+tMcBRKpEP/yKvbNw/jhC7gs3LGdLC6wZZvfGWjPyFgq3nVR8sQ22E5XOYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775922549; a=rsa-sha256; cv=none; b=QLGL2jVHxL3YifGxy9ZA3RRlPb2vlZyq2bKGPl014euDtUcjBIW3M4OfUTE+w50C3sZnb6 Ju/g8JJnUW7z+lrSuxiu77z5tgC1SZykLPdnf5c7QjeXry2Cot7HXSH/2BLxF3GESL3ufu eF6zgQsKLGVPADdYT9ptJK3c8heKxpYwGqzbrv7qUAQOy1FXhQeWBn9jNVX605RIg3mjyI /2wK8NKdKSN1LR2uzjJoP4vtH4UML/DxSclsmUoUsRMGWylnZAbr1qFRfOqZbVjmnQvhWc KQq9T7naaa+zwcjqs4za+ghsP+noRQCwMzLOyeBF0lPzr4YglcI3QaTg2eZEbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YScf4/sQH0dkmgouxTGc2KlTosk2vHMn0odJ0C4H/4A=; b=l557el7l91sKgBZnY7QwfOT33bfuhaKyzLt0vIz3ilHZDxZ3eH6BQoiHvR7g2xcJSfa4PF LvFOVgpragkvqd+g1vMy+pfshlAQH9odLCJpu/vj/8+070cxQVNtPKkO1tkZBxXZILMxlc yHsd0COMRdhyhIUyagfhoNrjzzINd91rNHkrPSDX9M073Tebvo7098LsC1cN/F1FKSsaE5 dNXWJ0cj3khw5+bPlBHFH0Gz61jjRFxHPpc4hkIkAe+jrcwPtWXF5ZoIReYlS9LKgthNNw aIOUZW7Bp1ICau3o62pQszbKIkPCgyqkfqj/nbTxgtHF9pe4dfgkAHoiugUcdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4j4XcKzdPx for ; Sat, 11 Apr 2026 15:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d678 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 15:49:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 072ca5df87a6 - stable/15 - nuageinit: require lfs where it's needed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 072ca5df87a6c3fa25ecc10e806d21326b04e868 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 15:49:09 +0000 Message-Id: <69da6d75.1d678.3aa9d3f0@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=072ca5df87a6c3fa25ecc10e806d21326b04e868 commit 072ca5df87a6c3fa25ecc10e806d21326b04e868 Author: Kyle Evans AuthorDate: 2025-10-04 13:58:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-11 03:17:19 +0000 nuageinit: require lfs where it's needed nuageinit largely already did this, but one spot was missed -- add the necessary require() in to get the module loaded. (cherry picked from commit bb4167463ac44b47ded4e0223a0abd8381ca6cd8) --- libexec/nuageinit/nuageinit | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index c8a53316f682..f7700f7d8e70 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -6,6 +6,7 @@ -- Copyright(c) 2025 Jesús Daniel Colmenares Oviedo local nuage = require("nuage") +local lfs = require("lfs") local ucl = require("ucl") local yaml = require("lyaml") From nobody Sat Apr 11 15:49:10 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4k6jXqz6Ygm6 for ; Sat, 11 Apr 2026 15:49: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftJ4k5xc5z3Hqh for ; Sat, 11 Apr 2026 15:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/EtnroLDoErGnYkeaEJvrdPVZsVoFkuflws9T6YrS1s=; b=FigeJ/lp6TcLsVptdZe2+fp1GyRh/pYGuGALXRIGC0ohUjrLsuGbBCGiNOJfx57dZ8f8xq MyeG3hgaZ0VUIFlaAxT4FbvpRIGqa5gOm3daK83yHhZzv8eFZxV+GNYkwie6QNmHw7Iprj KhJYuXVbKFy3ia8zhCwnxqWGcVPWiw8oAjhbgbIuoNr6hoOZ4K5nynd/02/r/zJOI6y30N A4APs0emJ9uXXA3SH9xsfjnt+80QlgW/Uth+JV26caD1gMKJMlMpyOUcrOn4QBEVfkg2AO ga30fQyJ4TBzUWMbfZeBKCO6fgZviLhQC7hpaqlEEVdABfvplkpogAhmWUjsuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775922550; a=rsa-sha256; cv=none; b=hpc0crkfqwJLpQEDoOT72vcFXbh3NLnLXVzzY6SJHoBUKpHLR9aTS9Px7zV0bAwZCYSYDG 3bpAbSvgROiIJkGmbjMOvlYR8j65pN1dS13hl39LLHGRSgKXnR5FCR4tCgVhpurz17AJPP zNR+lxDco7/Hbaw2RqKXOEePYWSUPbip+ZAbHq9cE1fb67YAPjbkxKLEi7fr5cfN9Dd+Zt tCDwIZ150D+CO62DOHG5rWQAjC+senrpYSBMPpLYhEux97MG0vX/oN5Q6mu5hvaCcK0AB6 2JPN43Sf/2c6u1AdmuexGHLfcjkk5NjVOvbSke5885g1VELO6cwI+85B7TvgEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/EtnroLDoErGnYkeaEJvrdPVZsVoFkuflws9T6YrS1s=; b=naiF8M1OCkq1HnCPwGMeo/vR/3Y4qb/CCzLVImgr5EuLnMFKox8UUPRiFgF9w9Ksu2BNHA OLg5g0oHEQpd7nKqmZLKYQaLJn36HrHG0JU6I68A+6r6Wko/L95utfCyLWqqbxdaulBmV6 o/YuvEPjRJ1XCwl1Je/ougbzcQdZGI3otqIgF5i06iFxfKFhQoWEWqmcBJ2rcw+OKpbyxs EbBcaLE9Z83faEJkyYpEZwd6q+hn2ygau42e5w+6k/2LgG/RjdoDKX8YOsGU9zBw1cPPdG jsS2y4liBOdd3A0upq0SPTf21zCR4NFDPqS7VHeGtxpvlqr1JBBb0OkdfGUdfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4k5RlyzcwX for ; Sat, 11 Apr 2026 15:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fa6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 15:49:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 2ef21abe8960 - stable/15 - flua: support our flua modules in the bootstrap flua List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2ef21abe8960737238cb519c204131d1d6e31361 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 15:49:10 +0000 Message-Id: <69da6d76.1fa6b.3cddda76@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2ef21abe8960737238cb519c204131d1d6e31361 commit 2ef21abe8960737238cb519c204131d1d6e31361 Author: Kyle Evans AuthorDate: 2025-10-03 18:09:03 +0000 Commit: Kyle Evans CommitDate: 2026-04-11 03:18:20 +0000 flua: support our flua modules in the bootstrap flua This version builds every module into the flua binary itself, since all of the bootstrap tools are built -DNO_SHARED. As a result, we also cannot dlsym(), so we can't really discover the names of our newly builtin modules. Instead, just build out a linker set with all of our luaopen_*() functions to register everything up-front. Building in all of the modules isn't strictly necessary, but it means that we have an example of how to add a bootstrap module everywhere you go and one doesn't need to consider whether bootstrap flua can use a module when writing scripts. On my build machine, the consequence on our binary size is an increase from around 1.6M -> 1.9M, which isn't really that bad. .lua modules can install into their usual path below $WORLDTMP/legacy and we'll pick them up automagically by way of the ctor that sets up LUA_PATH early on. This re-lands bootstrap module support with a more sensible subset, and after having verified that it cross-builds fine on macOS and Linux -- we cannot do libfreebsd on !FreeBSD because it's more system header dependant. We also need to bootstrap libmd to bring in libhash, and libucl + libyaml. Reviewed by: bapt, emaste (both previous version) (cherry picked from commit 1953a12ee2cde1afacb3e3f7612d89695c96e04f) (cherry picked from commit 80ada959004c4386880e47b11618f8abfc2d80e1) (cherry picked from commit 31320402472394af57eb3a36bee7f944117ca0ed) (cherry picked from commit 981cf36d64c48ebfa22d44ac83b6d448c2974f23) (cherry picked from commit d4c973fa148544a0b949ceb1efb6c68096f02baf) (cherry picked from commit bbef1c72b4873b657fdb0466b48b15d1d4f0a731) (cherry picked from commit 151bd3516b541823b16793460d73916e63d2b9c1) build: don't create duplicate bootstrap-tools targets The general problem is that we might have a somewhat complicated dependency tree depending on bootstrap version requirements. We could document when multiple bootstrap tools might have a shared dependency and be careful to add them only once to the list, but that is a little more fragile- particularly if we purge some bootstrap tools and need to re-work the logic a little bit. Just avoid redefining the build commands as we're iterating over the list so that we can keep the actual requirements intact. Reported by: dhw, others Reviewed by: imp (cherry picked from commit ab492c08fc3cbf4fb5d569663c0751bc2a41cb1f) --- Makefile.inc1 | 15 ++++++++- contrib/libucl/lua/lua_ucl.c | 4 +++ contrib/lyaml/ext/yaml/yaml.c | 4 +++ libexec/flua/Makefile | 42 +++++++++++++++++++++---- libexec/flua/Makefile.inc | 7 ++++- libexec/flua/bootstrap.h | 32 +++++++++++++++++++ libexec/flua/libfreebsd/kenv/Makefile | 2 +- libexec/flua/libfreebsd/kenv/Makefile.inc | 2 ++ libexec/flua/libfreebsd/kenv/kenv.c | 4 +++ libexec/flua/libfreebsd/sys/linker/Makefile | 3 +- libexec/flua/libfreebsd/sys/linker/Makefile.inc | 2 ++ libexec/flua/libfreebsd/sys/linker/linker.c | 4 +++ libexec/flua/libhash/Makefile | 5 +-- libexec/flua/libhash/Makefile.inc | 3 ++ libexec/flua/libhash/lhash.c | 4 +++ libexec/flua/libjail/Makefile | 5 +-- libexec/flua/libjail/Makefile.inc | 3 ++ libexec/flua/libjail/lua_jail.c | 4 +++ libexec/flua/liblyaml/Makefile | 20 +----------- libexec/flua/liblyaml/Makefile.inc | 20 ++++++++++++ libexec/flua/libucl/Makefile | 12 +------ libexec/flua/libucl/Makefile.inc | 12 +++++++ libexec/flua/linit_flua.c | 29 ++++++++++++++++- tools/build/Makefile | 1 + 24 files changed, 189 insertions(+), 50 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 30d37e6bd2f5..d8890822d6ad 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2616,6 +2616,10 @@ ${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} ${_bt_libkldelf_depend} .if ${BOOTSTRAPPING} < 1300059 ${_bt}-libexec/flua: ${_bt}-lib/liblua _flua= lib/liblua libexec/flua +.if ${BOOTSTRAPPING} == 0 +_flua+= lib/libmd lib/libucl lib/libyaml +${_bt}-libexec/flua: ${_bt}-lib/libmd ${_bt}-lib/libucl ${_bt}-lib/libyaml +.endif # BOOTSTRAPPING == 0 .endif # r245440 mtree -N support added @@ -2927,6 +2931,15 @@ bootstrap-tools: ${_bt}-links .PHONY ${_mkesdb} \ ${_zic} \ ${LOCAL_BSTOOL_DIRS} +# We don't enforce any particular uniqueness of targets in the above list; it +# may be the case that different bootstrap tools may have shared dependencies +# at different BOOTSTRAPPING points, so we don't object to them using their own +# conditionals and duplicating them into their ${_foo} variable to ease future +# maintenance if we purge some entries. These target names are purposefully +# unique and this is the only place that should be generating commands for them, +# but the target may have been defined earlier to express dependencies -- thus, +# we specifically want commands() here. +.if !commands(${_bt}-${_tool}) ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -2936,8 +2949,8 @@ ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install - bootstrap-tools: ${_bt}-${_tool} +.endif .endfor .if target(${_bt}-lib/libmd) # If we are bootstrapping libmd (e.g. when building on macOS/Linux) add the diff --git a/contrib/libucl/lua/lua_ucl.c b/contrib/libucl/lua/lua_ucl.c index d6be69e42a71..1b3f9dfd111c 100644 --- a/contrib/libucl/lua/lua_ucl.c +++ b/contrib/libucl/lua/lua_ucl.c @@ -30,6 +30,8 @@ #include "lua_ucl.h" #include +#include "bootstrap.h" + /*** * @module ucl * This lua module allows to parse objects from strings and to store data into @@ -1571,3 +1573,5 @@ ucl_object_toclosure (const ucl_object_t *obj) return (struct ucl_lua_funcdata*)obj->value.ud; } + +FLUA_MODULE(ucl); diff --git a/contrib/lyaml/ext/yaml/yaml.c b/contrib/lyaml/ext/yaml/yaml.c index 54478610134f..6a5ddc605e0f 100644 --- a/contrib/lyaml/ext/yaml/yaml.c +++ b/contrib/lyaml/ext/yaml/yaml.c @@ -35,6 +35,8 @@ #include "lyaml.h" +#include "bootstrap.h" + #define MYNAME "yaml" #define MYVERSION MYNAME " library for " LUA_VERSION " / " VERSION @@ -64,3 +66,5 @@ luaopen_yaml (lua_State *L) return 1; } + +FLUA_MODULE(yaml); diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 0b870817331c..02e177b12f3d 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -2,11 +2,41 @@ PACKAGE= flua -SUBDIR+= libfreebsd -SUBDIR+= libhash -SUBDIR+= libjail -SUBDIR+= libucl -SUBDIR+= liblyaml +# New flua modules should be added here rather than to SUBDIR so that we can do +# the right thing for both bootstrap flua and target flua. The former does not +# do any shared libs, so we just build them all straight into flua itself rather +# than mucking about with the infrastructure to make them linkable -- thus, why +# these are all structured to have a Makefile that describes what we want +# *installed*, and a Makefile.inc that describes what we need to *build*. +FLUA_MODULES+= libhash +.ifndef BOOTSTRAPPING +# Bootstrap flua can't usefully do anything with libjail anyways, because it +# can't assume it's being run on a system that even supports jails. +FLUA_MODULES+= libjail +.endif +FLUA_MODULES+= libucl +FLUA_MODULES+= liblyaml + +.ifdef BOOTSTRAPPING +# libfreebsd is generally omitted from the bootstrap flua because its +# functionality largely assumes a FreeBSD kernel/system headers, so it doesn't +# really offer functionality that we can use in bootstrap. +CFLAGS+= -I${.CURDIR} -DBOOTSTRAPPING + +SHAREDIR= ${WORLDTMP}/legacy/usr/share/flua +FLUA_PATH= ${SHAREDIR}/?.lua;${SHAREDIR}/?/init.lua +CFLAGS+= -DBOOTSTRAP_FLUA_PATH=\"${FLUA_PATH:Q}\" + +.for mod in ${FLUA_MODULES} +.include "${mod}/Makefile.inc" +.endfor + +.else + +FLUA_MODULES+= libfreebsd +SUBDIR+= ${FLUA_MODULES} + +.endif LUASRC?= ${SRCTOP}/contrib/lua/src .PATH: ${LUASRC} @@ -16,7 +46,7 @@ WARNS?= 3 CWARNFLAGS.gcc+= -Wno-format-nonliteral -LIBADD= lua +LIBADD+= lua # Entry point SRCS+= lua.c diff --git a/libexec/flua/Makefile.inc b/libexec/flua/Makefile.inc index 0ccb1a62f4cb..5e214c76921b 100644 --- a/libexec/flua/Makefile.inc +++ b/libexec/flua/Makefile.inc @@ -4,4 +4,9 @@ SHLIBDIR?= ${LIBDIR}/flua CFLAGS+= \ -I${SRCTOP}/contrib/lua/src \ - -I${SRCTOP}/lib/liblua + -I${SRCTOP}/lib/liblua \ + -I${SRCTOP}/libexec/flua + +.ifdef BOOTSTRAPPING +CFLAGS+= -DBOOTSTRAPPING +.endif diff --git a/libexec/flua/bootstrap.h b/libexec/flua/bootstrap.h new file mode 100644 index 000000000000..caf00518c1e0 --- /dev/null +++ b/libexec/flua/bootstrap.h @@ -0,0 +1,32 @@ +/*- + * Copyright (c) 2025 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef FLUA_BOOTSTRAP_H +#define FLUA_BOOTSTRAP_H + +#ifdef BOOTSTRAPPING +#include + +#include + +#define FLUA_MODULE_SETNAME flua_modules + +SET_DECLARE(FLUA_MODULE_SETNAME, const luaL_Reg); +#define FLUA_MODULE_DEF(ident, modname, openfn) \ + static const luaL_Reg ident = { modname, openfn }; \ + DATA_SET(FLUA_MODULE_SETNAME, ident) + +#define FLUA_MODULE_NAMED(mod, name) \ + FLUA_MODULE_DEF(module_ ## mod, name, luaopen_ ## mod) +#define FLUA_MODULE(mod) \ + FLUA_MODULE_DEF(module_ ## mod, #mod, luaopen_ ## mod) +#else /* !BOOTSTRAPPING */ +#define FLUA_MODULE_DEF(ident, modname, openfn) +#define FLUA_MODULE_NAMED(mod, name) +#define FLUA_MODULE(modname) +#endif /* BOOTSTRAPPING */ + +#endif /* FLUA_BOOTSTRAP_H */ diff --git a/libexec/flua/libfreebsd/kenv/Makefile b/libexec/flua/libfreebsd/kenv/Makefile index 1726c892c515..a1b388bb3612 100644 --- a/libexec/flua/libfreebsd/kenv/Makefile +++ b/libexec/flua/libfreebsd/kenv/Makefile @@ -1,5 +1,5 @@ SHLIB_NAME= kenv.so -SRCS+= kenv.c MAN= freebsd.kenv.3lua +.include "Makefile.inc" .include diff --git a/libexec/flua/libfreebsd/kenv/Makefile.inc b/libexec/flua/libfreebsd/kenv/Makefile.inc new file mode 100644 index 000000000000..05819c5280d9 --- /dev/null +++ b/libexec/flua/libfreebsd/kenv/Makefile.inc @@ -0,0 +1,2 @@ +.PATH: ${.PARSEDIR} +SRCS+= kenv.c diff --git a/libexec/flua/libfreebsd/kenv/kenv.c b/libexec/flua/libfreebsd/kenv/kenv.c index 954baa00facb..56b24c72904a 100644 --- a/libexec/flua/libfreebsd/kenv/kenv.c +++ b/libexec/flua/libfreebsd/kenv/kenv.c @@ -14,6 +14,8 @@ #include #include +#include "bootstrap.h" + int luaopen_freebsd_kenv(lua_State *L); static int @@ -94,3 +96,5 @@ luaopen_freebsd_kenv(lua_State *L) return (1); } + +FLUA_MODULE_NAMED(freebsd_kenv, "freebsd.kenv"); diff --git a/libexec/flua/libfreebsd/sys/linker/Makefile b/libexec/flua/libfreebsd/sys/linker/Makefile index 1adf547b503c..f1f65ad5f6c1 100644 --- a/libexec/flua/libfreebsd/sys/linker/Makefile +++ b/libexec/flua/libfreebsd/sys/linker/Makefile @@ -1,7 +1,6 @@ SHLIB_NAME= linker.so -SRCS+= linker.c - MAN= freebsd.sys.linker.3lua +.include "Makefile.inc" .include diff --git a/libexec/flua/libfreebsd/sys/linker/Makefile.inc b/libexec/flua/libfreebsd/sys/linker/Makefile.inc new file mode 100644 index 000000000000..da65c0070170 --- /dev/null +++ b/libexec/flua/libfreebsd/sys/linker/Makefile.inc @@ -0,0 +1,2 @@ +.PATH: ${.PARSEDIR} +SRCS+= linker.c diff --git a/libexec/flua/libfreebsd/sys/linker/linker.c b/libexec/flua/libfreebsd/sys/linker/linker.c index 87eccfb651f0..c78fbb2b39d2 100644 --- a/libexec/flua/libfreebsd/sys/linker/linker.c +++ b/libexec/flua/libfreebsd/sys/linker/linker.c @@ -15,6 +15,8 @@ #include #include +#include "bootstrap.h" + int luaopen_freebsd_sys_linker(lua_State *L); static int @@ -80,3 +82,5 @@ luaopen_freebsd_sys_linker(lua_State *L) return (1); } + +FLUA_MODULE_NAMED(freebsd_sys_linker, "freebsd.sys.linker"); diff --git a/libexec/flua/libhash/Makefile b/libexec/flua/libhash/Makefile index b7c8d7ee9948..9cbd6f15acae 100644 --- a/libexec/flua/libhash/Makefile +++ b/libexec/flua/libhash/Makefile @@ -1,9 +1,6 @@ SHLIB_NAME= hash.so -SRCS+= lhash.c - -LIBADD+= md - MAN= hash.3lua +.include "Makefile.inc" .include diff --git a/libexec/flua/libhash/Makefile.inc b/libexec/flua/libhash/Makefile.inc new file mode 100644 index 000000000000..d112dfe7df33 --- /dev/null +++ b/libexec/flua/libhash/Makefile.inc @@ -0,0 +1,3 @@ +.PATH: ${.PARSEDIR} +SRCS+= lhash.c +LIBADD+= md diff --git a/libexec/flua/libhash/lhash.c b/libexec/flua/libhash/lhash.c index 4587961fe8a0..7127ddc1d530 100644 --- a/libexec/flua/libhash/lhash.c +++ b/libexec/flua/libhash/lhash.c @@ -11,6 +11,8 @@ #include #include +#include "bootstrap.h" + #define SHA256_META "SHA256 meta table" #define SHA256_DIGEST_LEN 32 @@ -175,3 +177,5 @@ luaopen_hash(lua_State *L) return 1; } + +FLUA_MODULE(hash); diff --git a/libexec/flua/libjail/Makefile b/libexec/flua/libjail/Makefile index 20cd9f5f1429..b9c8bdc39095 100644 --- a/libexec/flua/libjail/Makefile +++ b/libexec/flua/libjail/Makefile @@ -1,9 +1,6 @@ SHLIB_NAME= jail.so -SRCS+= lua_jail.c - -LIBADD+= jail - MAN= jail.3lua +.include "Makefile.inc" .include diff --git a/libexec/flua/libjail/Makefile.inc b/libexec/flua/libjail/Makefile.inc new file mode 100644 index 000000000000..a896bf38c65b --- /dev/null +++ b/libexec/flua/libjail/Makefile.inc @@ -0,0 +1,3 @@ +.PATH: ${.PARSEDIR} +SRCS+= lua_jail.c +LIBADD+= jail diff --git a/libexec/flua/libjail/lua_jail.c b/libexec/flua/libjail/lua_jail.c index 9632db795775..8c3ec6c1d500 100644 --- a/libexec/flua/libjail/lua_jail.c +++ b/libexec/flua/libjail/lua_jail.c @@ -38,6 +38,8 @@ #include #include +#include "bootstrap.h" + #define JAIL_METATABLE "jail iterator metatable" /* @@ -716,3 +718,5 @@ luaopen_jail(lua_State *L) return (1); } + +FLUA_MODULE(jail); diff --git a/libexec/flua/liblyaml/Makefile b/libexec/flua/liblyaml/Makefile index e7a89d09bb9e..8d1432acd325 100644 --- a/libexec/flua/liblyaml/Makefile +++ b/libexec/flua/liblyaml/Makefile @@ -1,22 +1,4 @@ SHLIB_NAME= yaml.so -WARNS= 1 -LYAMLSRC?= ${SRCTOP}/contrib/lyaml -.PATH: ${LYAMLSRC}/ext/yaml ${LYAMLSRC}/lib/lyaml -SRCS= emitter.c \ - parser.c \ - scanner.c \ - yaml.c -CFLAGS+= \ - -I${LYAMLSRC}/ext/yaml \ - -I${SRCTOP}/contrib/libyaml/include \ - -DVERSION=\"6.2.8\" -LIBADD+= yaml - -FILES= explicit.lua \ - functional.lua \ - implicit.lua \ - init.lua -FILESDIR= ${SHAREDIR}/flua/lyaml - +.include "Makefile.inc" .include diff --git a/libexec/flua/liblyaml/Makefile.inc b/libexec/flua/liblyaml/Makefile.inc new file mode 100644 index 000000000000..caa1f37b57eb --- /dev/null +++ b/libexec/flua/liblyaml/Makefile.inc @@ -0,0 +1,20 @@ +WARNS= 1 + +LYAMLSRC?= ${SRCTOP}/contrib/lyaml +.PATH: ${LYAMLSRC}/ext/yaml ${LYAMLSRC}/lib/lyaml +SRCS+= emitter.c \ + parser.c \ + scanner.c \ + yaml.c +CFLAGS+= \ + -I${LYAMLSRC}/ext/yaml \ + -I${SRCTOP}/contrib/libyaml/include \ + -DVERSION=\"6.2.8\" +LIBADD+= yaml + +FILESGROUPS+= YAML +YAML= explicit.lua \ + functional.lua \ + implicit.lua \ + init.lua +YAMLDIR= ${SHAREDIR}/flua/lyaml diff --git a/libexec/flua/libucl/Makefile b/libexec/flua/libucl/Makefile index a88c8bda6bfc..32d76d1ea1ad 100644 --- a/libexec/flua/libucl/Makefile +++ b/libexec/flua/libucl/Makefile @@ -1,14 +1,4 @@ SHLIB_NAME= ucl.so -WARNS= 2 - -UCLSRC?= ${SRCTOP}/contrib/libucl -.PATH: ${UCLSRC}/lua -SRCS+= lua_ucl.c -CFLAGS+= \ - -I${UCLSRC}/include \ - -I${UCLSRC}/src \ - -I${UCLSRC}/uthash -LIBADD+= ucl - +.include "Makefile.inc" .include diff --git a/libexec/flua/libucl/Makefile.inc b/libexec/flua/libucl/Makefile.inc new file mode 100644 index 000000000000..70fb0f265635 --- /dev/null +++ b/libexec/flua/libucl/Makefile.inc @@ -0,0 +1,12 @@ +.if ${WARNS:U6} > 2 +WARNS= 2 +.endif + +UCLSRC?= ${SRCTOP}/contrib/libucl +.PATH: ${UCLSRC}/lua +SRCS+= lua_ucl.c +CFLAGS+= \ + -I${UCLSRC}/include \ + -I${UCLSRC}/src \ + -I${UCLSRC}/uthash +LIBADD+= ucl diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index b466b7872158..e5e38353ec9b 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -26,8 +26,8 @@ #include "lprefix.h" - #include +#include #include "lua.h" @@ -37,6 +37,8 @@ #include "lposix.h" #include "lfbsd.h" +#include "bootstrap.h" + /* ** these libs are loaded by lua.c and are readily available to any Lua ** program @@ -62,6 +64,28 @@ static const luaL_Reg loadedlibs[] = { {NULL, NULL} }; +#ifdef BOOTSTRAPPING +static void __attribute__((constructor)) flua_init_env(void) { + /* + * This happens in the middle of luaopen_package(). We could move it into + * flua_setup_mods(), but it seems better to avoid its timing being so + * important that it would break some of our bootstrap modules if someone + * were to reorder things. + */ + if (getenv("LUA_PATH") == NULL) + setenv("LUA_PATH", BOOTSTRAP_FLUA_PATH, 1); +} + +static void flua_setup_mods (lua_State *L) { + const luaL_Reg **flib; + + SET_FOREACH(flib, FLUA_MODULE_SETNAME) { + luaL_requiref(L, (*flib)->name, (*flib)->func, 1); + lua_pop(L, 1); /* remove lib */ + } +}; +#endif + LUALIB_API void luaL_openlibs (lua_State *L) { const luaL_Reg *lib; /* "require" functions from 'loadedlibs' and set results to global table */ @@ -69,4 +93,7 @@ LUALIB_API void luaL_openlibs (lua_State *L) { luaL_requiref(L, lib->name, lib->func, 1); lua_pop(L, 1); /* remove lib */ } +#ifdef BOOTSTRAPPING + flua_setup_mods(L); +#endif } diff --git a/tools/build/Makefile b/tools/build/Makefile index 973b3a12d98f..fed4f06c290c 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -507,6 +507,7 @@ INSTALLDIR_LIST= \ usr/include/casper \ usr/include/openssl \ usr/include/private/ucl \ + usr/include/private/yaml \ usr/include/private/zstd \ usr/lib \ usr/libdata/pkgconfig \ From nobody Sat Apr 11 15:49:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4m1qtbz6YgpL for ; Sat, 11 Apr 2026 15:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftJ4l6vThz3Hsx for ; Sat, 11 Apr 2026 15:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4fETtfTJQcGmdGP9sQ0bpth5J0j9vyvqw4mMlUeFUg=; b=q7cAaWEO7zOClG1PVd37rrAeUUsPZ0FsYic5TCDFhELvUw8a6eLaTWT8BQhhpsyR9ODmY6 69BMettfJtfpLVBpnPhcty2qBCOJFO/ae4MsaZcit0ymBp65BhiUzPkRTF0QRYWU8wo8lP 3VEzR60W+DPMtEWobHNDSObVksHcksktmuhT6Ssy/UN3GY1IMT1ILGamcK9nOxJwHRgnxA UCWyScDCSg15RdZrBg0nrl96vz2rqAQHbCZI6bQQTK8B4tyiYkOPes3chFg9xhXSrSK/cV jRqtPUFmwlAM6nZwytNLC/dEpl/NjMDhihRO9tNA7U8Qt78fEkW7HEHp8GvSmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775922552; a=rsa-sha256; cv=none; b=AjtEa8CWWC5fbOLj9f9bFzconNkWVH3aQIVxKUnw6rM/9/bSvK29SpA6EB+hKq8rTwvznS DtyDXqReX7LD+yQrYFg0+bIRiNm5hWCDoxnWgzaYNPdBEfw4Kf6K/Oy5bbrYPzaghb1iiL OjCkgLG74dZUdJdUbeysbVVEOt32Yi6HopBe/S2/mS0S1mRswRtM2cg2MiF+7CdpYARMmH LL5aogj/4LSkOaPRE4zXmeQD4IUVhBNdal2KDk3e/aWemx3rfbcSHHFJnDqQ3XXpjJ3Z1v aO8eGssYli7h9+LEWNzB3s6XLpA9zSaKxRinbXpGgTjLUnACTuVR7mfNEqv8Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4fETtfTJQcGmdGP9sQ0bpth5J0j9vyvqw4mMlUeFUg=; b=hvflzObGS1yOpnasjHY6oCcarhm2RY123DDNgD9zq+zaVJx61O8n/R7/QYcMqAd6kOF7Y7 nYbKN1Wx9YSVhmZXIYr3jPQ+hgQFU894NgEAmHZ0HbL/LFFvPCGSKYWN9nidcO2kXmPFF1 ds0dM3gZwP9h211Q2ob7FtJTLpZrUqtsIASZb0DALIsgeXkTfnGScp+93IscPptNDmJ5Yo oQpT1uBbEpOWyDQZjZAM/U2DM0YTxzBDfL/ONFbIoW8yD9VEVvIIfMpSaO1oovsbq8/6xi VsNh+K4wU5jVNPRvP97uJN8Kw3WP79a27eQNfqx6Vqx617mnpcA3RGkL+b+DPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4l65yMzcdM for ; Sat, 11 Apr 2026 15:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20377 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 15:49:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9ba365ad5374 - stable/15 - flua: kick out the remaining builtin modules List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 9ba365ad53745e45b099dd28628e3e9e20d35112 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 15:49:11 +0000 Message-Id: <69da6d77.20377.1754feb@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9ba365ad53745e45b099dd28628e3e9e20d35112 commit 9ba365ad53745e45b099dd28628e3e9e20d35112 Author: Kyle Evans AuthorDate: 2025-10-04 02:16:51 +0000 Commit: Kyle Evans CommitDate: 2026-04-11 03:18:35 +0000 flua: kick out the remaining builtin modules Bootstrap flua has some magic now to handle modules by building them in and discovering them via linker sets. This is slightly cleaner than always building them in and baking them into loadedlibs for both bootstrap and system flua. Adjust the stand build now that these three libs have their own new homes. lposix remains builtin because it's structured incorrectly in our version. Reviewed by: bapt, emaste, markj (cherry picked from commit b11a5709ec2b61fefb03bfdd38e2f06d2c1107c1) (cherry picked from commit 9c7db0931d486ce800aa71d9f41abfad9f7f691f) (cherry picked from commit d505ef08ffbe3b7383fbc6ed30121de9256ac18e) --- libexec/flua/Makefile | 4 +++- libexec/flua/lfbsd/Makefile | 5 +++++ libexec/flua/lfbsd/Makefile.inc | 2 ++ libexec/flua/{modules => lfbsd}/lfbsd.c | 4 ++++ libexec/flua/{modules => lfbsd}/lfbsd.h | 0 libexec/flua/lfs/Makefile | 5 +++++ libexec/flua/lfs/Makefile.inc | 2 ++ libexec/flua/{modules => lfs}/lfs.c | 7 ++++++- libexec/flua/{modules => lfs}/lfs.h | 0 libexec/flua/libhash/lhash.c | 2 ++ libexec/flua/linit_flua.c | 4 ---- stand/liblua/Makefile | 2 +- stand/loader.mk | 2 +- 13 files changed, 31 insertions(+), 8 deletions(-) diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 02e177b12f3d..f1c46b270ded 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -8,6 +8,8 @@ PACKAGE= flua # than mucking about with the infrastructure to make them linkable -- thus, why # these are all structured to have a Makefile that describes what we want # *installed*, and a Makefile.inc that describes what we need to *build*. +FLUA_MODULES+= lfbsd +FLUA_MODULES+= lfs FLUA_MODULES+= libhash .ifndef BOOTSTRAPPING # Bootstrap flua can't usefully do anything with libjail anyways, because it @@ -54,7 +56,7 @@ SRCS+= lua.c # FreeBSD Extensions .PATH: ${.CURDIR}/modules SRCS+= linit_flua.c -SRCS+= lfs.c lposix.c lfbsd.c +SRCS+= lposix.c CFLAGS+= -I${SRCTOP}/lib/liblua -I${.CURDIR}/modules -I${LUASRC} CFLAGS+= -DLUA_PROGNAME="\"${PROG}\"" diff --git a/libexec/flua/lfbsd/Makefile b/libexec/flua/lfbsd/Makefile new file mode 100644 index 000000000000..e2a4aae14bcd --- /dev/null +++ b/libexec/flua/lfbsd/Makefile @@ -0,0 +1,5 @@ +SHLIB_NAME= fbsd.so +WARNS?= 3 + +.include "Makefile.inc" +.include diff --git a/libexec/flua/lfbsd/Makefile.inc b/libexec/flua/lfbsd/Makefile.inc new file mode 100644 index 000000000000..7a78ef82e0fc --- /dev/null +++ b/libexec/flua/lfbsd/Makefile.inc @@ -0,0 +1,2 @@ +.PATH: ${.PARSEDIR} +SRCS+= lfbsd.c diff --git a/libexec/flua/modules/lfbsd.c b/libexec/flua/lfbsd/lfbsd.c similarity index 99% rename from libexec/flua/modules/lfbsd.c rename to libexec/flua/lfbsd/lfbsd.c index ef660ba9fd77..541b6c9611df 100644 --- a/libexec/flua/modules/lfbsd.c +++ b/libexec/flua/lfbsd/lfbsd.c @@ -40,6 +40,8 @@ #include "lauxlib.h" #include "lfbsd.h" +#include "bootstrap.h" + #define FBSD_PROCESSHANDLE "fbsd_process_t*" struct fbsd_process { @@ -283,3 +285,5 @@ luaopen_fbsd(lua_State *L) return (1); } + +FLUA_MODULE(fbsd); diff --git a/libexec/flua/modules/lfbsd.h b/libexec/flua/lfbsd/lfbsd.h similarity index 100% rename from libexec/flua/modules/lfbsd.h rename to libexec/flua/lfbsd/lfbsd.h diff --git a/libexec/flua/lfs/Makefile b/libexec/flua/lfs/Makefile new file mode 100644 index 000000000000..3df83d6d2fc1 --- /dev/null +++ b/libexec/flua/lfs/Makefile @@ -0,0 +1,5 @@ +SHLIB_NAME= lfs.so +WARNS?= 3 + +.include "Makefile.inc" +.include diff --git a/libexec/flua/lfs/Makefile.inc b/libexec/flua/lfs/Makefile.inc new file mode 100644 index 000000000000..9d40c42dc0e6 --- /dev/null +++ b/libexec/flua/lfs/Makefile.inc @@ -0,0 +1,2 @@ +.PATH: ${.PARSEDIR} +SRCS+= lfs.c diff --git a/libexec/flua/modules/lfs.c b/libexec/flua/lfs/lfs.c similarity index 99% rename from libexec/flua/modules/lfs.c rename to libexec/flua/lfs/lfs.c index 8cb8d6fc9fed..517e16ae65c8 100644 --- a/libexec/flua/modules/lfs.c +++ b/libexec/flua/lfs/lfs.c @@ -66,9 +66,10 @@ #ifdef _STANDALONE #include "lstd.h" #include "lutils.h" -#include "bootstrap.h" #endif +#include "bootstrap.h" + #ifndef nitems #define nitems(x) (sizeof((x)) / sizeof((x)[0])) #endif @@ -446,3 +447,7 @@ luaopen_lfs(lua_State *L) #endif return 1; } + +#ifndef _STANDALONE +FLUA_MODULE(lfs); +#endif diff --git a/libexec/flua/modules/lfs.h b/libexec/flua/lfs/lfs.h similarity index 100% rename from libexec/flua/modules/lfs.h rename to libexec/flua/lfs/lfs.h diff --git a/libexec/flua/libhash/lhash.c b/libexec/flua/libhash/lhash.c index 7127ddc1d530..f455f006bf27 100644 --- a/libexec/flua/libhash/lhash.c +++ b/libexec/flua/libhash/lhash.c @@ -178,4 +178,6 @@ luaopen_hash(lua_State *L) return 1; } +#ifndef _STANDALONE FLUA_MODULE(hash); +#endif diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index e5e38353ec9b..65356c938671 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -33,9 +33,7 @@ #include "lualib.h" #include "lauxlib.h" -#include "lfs.h" #include "lposix.h" -#include "lfbsd.h" #include "bootstrap.h" @@ -58,9 +56,7 @@ static const luaL_Reg loadedlibs[] = { {LUA_BITLIBNAME, luaopen_bit32}, #endif /* FreeBSD Extensions */ - {"lfs", luaopen_lfs}, {"posix", luaopen_posix}, - {"fbsd", luaopen_fbsd}, {NULL, NULL} }; diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile index ce7eb89fe494..b1c34ec0a466 100644 --- a/stand/liblua/Makefile +++ b/stand/liblua/Makefile @@ -24,7 +24,7 @@ SRCS+= lauxlib.c lbaselib.c lstrlib.c loadlib.c SRCS+= lerrno.c lpager.c lstd.c lutils.c SRCS+= gfx_utils.c -.PATH: ${FLUASRC}/modules +.PATH: ${FLUASRC}/lfs SRCS+= lfs.c .PATH: ${FLUALIB}/libhash SRCS+= lhash.c diff --git a/stand/loader.mk b/stand/loader.mk index 4073e523e552..e26ba1401912 100644 --- a/stand/loader.mk +++ b/stand/loader.mk @@ -89,7 +89,7 @@ SRCS+= interp_lua.c .include "${BOOTSRC}/lua.mk" LDR_INTERP= ${LIBLUA} LDR_INTERP32= ${LIBLUA32} -CFLAGS.interp_lua.c= -DLUA_PATH=\"${LUAPATH}\" -I${FLUASRC}/modules +CFLAGS.interp_lua.c= -DLUA_PATH=\"${LUAPATH}\" -I${FLUASRC}/lfs .elif ${LOADER_INTERP} == "4th" SRCS+= interp_forth.c .include "${BOOTSRC}/ficl.mk" From nobody Sat Apr 11 15:49:12 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4n1njNz6Ygjk for ; Sat, 11 Apr 2026 15:49: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftJ4n0CV0z3HlT for ; Sat, 11 Apr 2026 15:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nLtG8LWAygPadJFC4fjA+w08JMK7n+Anv3lsZxU7f3E=; b=u5iJRj3hsb194oHw5Nwm7xh9athiak05VGBfmSBmjNg7S8NkO+fFk4m8ds5OAE9nsASxSg RqPAHn7Sf8WAcHGyW3DO26eeZgzP7EdDtxBbuQxSgAS6qR6RG8/eHM81TGl0zMw07LKIB1 fmPjWXwl5IiZtqLfmtTVA07JysVNE2Qc8lS3rGBkss2EVJAybuG3md84XYGS3fFVest77Z UGp2J6posaEpCrWpGQy00hg+u6HqZXF7r4RPg/UcWaohyeNmqbTL9pdfNnjM/CeOqnxBQA IaVC5CvaF8uUIDha2xiNWm0tnDbdRfX0qVuD6lkwIW9MDbj/XRjIyDFPnFzDjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775922553; a=rsa-sha256; cv=none; b=HvrNGhnzCqSDlpvqKCrSdojUsXY7kIRPE+EKzy7L1E/0e8ZQc2yB4K4ukHs9kqNXsviUhb vr5UE7/UzSlbXHZvI488S4lpw0PdLKOVF2jayU8pE34kDKNWS1VzS+Tl4BqKGSRlb9UzNp taUJGr1bTFNzmoIEI/jxk8ajFHyhVxeNFjesDrpsn7xTrgs03HNrqzBwp8BJ3dWQeZQ6or /7lo/xr7d2EeeLI7xHttB3CxC9oL3P5TaILnoB5ZpWXpAiG1ns5gUdWYLlwZ0Wb9xhdYrQ Maebv85C8Ma4jDYdK8sbRU0SHjrCJgCN+Fa+vHPIr20Lhz/o0BPxpaFYOX1zwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nLtG8LWAygPadJFC4fjA+w08JMK7n+Anv3lsZxU7f3E=; b=IHX86QlXdkrcs5nBJZSagVY69BAuMj4ImdaIyNbQ4x1k4SzUBB3abBrjwimyjyN0CC2KMV zeiMiuiDLEORzGaRPzaVwxMHLJDYzqx2mdAEie1X4rc+frFSaAxdYRrt3GFj2eCn7QbVTX QOMf7MJ15g0cGwXtnPPzkZo1WJgtn3AUFjLgfIwi6/m6j1/PsVJS6qoIT3lwiE4nNLJ478 jhvPGDSBv0GPS6TSBliAcJI5DOnJfOZDeA9Axhkeqz5KDUwovTXFOnTRpqFPXM0w618GyM uHBgDPUWG3HK01iWOMPPgjlIv6UVnN5ZEH2ZQwn50DICb5AiIqcfu6pJbdyLDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4m6rcVzdMG for ; Sat, 11 Apr 2026 15:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2037b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 15:49:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ec37fd5422b8 - stable/15 - flua: lposix: fix WARNS=6 issues List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: ec37fd5422b8d5704110b4d1a0bb5a398c1bc05f Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 15:49:12 +0000 Message-Id: <69da6d78.2037b.77b42f4d@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ec37fd5422b8d5704110b4d1a0bb5a398c1bc05f commit ec37fd5422b8d5704110b4d1a0bb5a398c1bc05f Author: Kyle Evans AuthorDate: 2026-01-28 15:37:04 +0000 Commit: Kyle Evans CommitDate: 2026-04-11 03:18:47 +0000 flua: lposix: fix WARNS=6 issues lposix is the last holdout of modules built into flua until we can fix the module design to have the right parts require()able. Address a valid bug in lua_read() found at a higher WARNS and drop the override entirely. Some of the modules could possibly be re-evaluated. Reported by: des Reviewed by: des Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. (cherry picked from commit b41b6fdb3a1635de4c2a9280aab12b83e3aeffc5) --- libexec/flua/Makefile | 1 - libexec/flua/modules/lposix.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index f1c46b270ded..c40328d37963 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -44,7 +44,6 @@ LUASRC?= ${SRCTOP}/contrib/lua/src .PATH: ${LUASRC} PROG= flua -WARNS?= 3 CWARNFLAGS.gcc+= -Wno-format-nonliteral diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index 75cdd345aeaa..a25e875045a2 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -254,7 +255,7 @@ lua_execp(lua_State *L) } argv[argc + 1] = NULL; - execvp(file, (char **)argv); + execvp(file, __DECONST(char **, argv)); error = errno; lua_pushnil(L); @@ -386,7 +387,7 @@ lua_read(lua_State *L) char *buf; ssize_t ret; size_t sz; - int error, fd; + int error = 0, fd; enforce_max_args(L, 2); fd = luaL_checkinteger(L, 1); @@ -398,8 +399,10 @@ lua_read(lua_State *L) } buf = malloc(sz); - if (buf == NULL) + if (buf == NULL) { + error = errno; goto err; + } /* * For 0-byte reads, we'll still push the empty string and let the @@ -412,12 +415,13 @@ lua_read(lua_State *L) error = errno; /* Save to avoid clobber by free() */ free(buf); - if (error != 0) + if (ret < 0) goto err; /* Just the string pushed. */ return (1); err: + assert(error != 0); lua_pushnil(L); lua_pushstring(L, strerror(error)); lua_pushinteger(L, error); From nobody Sat Apr 11 15:49:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4p3jF5z6Ygjr for ; Sat, 11 Apr 2026 15:49: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftJ4p1MJyz3Hlk for ; Sat, 11 Apr 2026 15:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=29MvsiQKJnPEw88KXQBxzEhhqQO+CHVh6WZYlPCuBfg=; b=qRglNavq8/TxvTXX+qLlaIqmqbpgA51/2Ux1SsmgwcbrQiHQGFVi3ZSYNa4XvuTZi+GwcY kVRIrZZmn7nP4Ndc6l/LsxY8RY3lzGMnztdg9zPATQq/O6GgCq8GfJlsrVUGTYzkT4mK3Z w2+dlHpr4IDRPKJqM6MeQy+/2GlgfHVXmoWivSQsNl6iV0hu52sMrXYqlUHrI97yLRJ5Wp 4HBeQT2t/Z7TOUwP2y1uvE3F43AQA5fDS1xt517fLDDoJZE8vGOitD51G4loU773HED0Gp bJO0VUzHboRCRbS8c1s6jNLpY/rVmeZpgk0+7Li67b2PNd6+WtyQlZrbPqJqOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775922554; a=rsa-sha256; cv=none; b=iQzUQMH4c9/53kkA+Bl47dny0q3QfCdED6zcWh8wBiUtRfj6Fbl2SynbvMxlFGcgmQ2Gc1 z+rdk4acPFsSqDhCoHeRNIK+Kn8UuTF49rq0Ed1rWzQtaiavXRQLil2I4hZOszkfXRFLyu DHH19C9nzwVMFNFUpgnslGDuO6KMtfRsZgxRsaCZpm8Y7eimqledYkMaSUuvohB7ROZZVT QKvkkgsQYiLfM6JttdhPBzAoh97Qjmt4QNjGutRikstkrpYHT3Zss8I+3HgAGMBAYPGYPP qQcZJ+MfCk1oCBP5Vo2d0shyb92oe7n7bOs1AIA4CWQX0o9Xnyshi09EHGmsng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775922554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=29MvsiQKJnPEw88KXQBxzEhhqQO+CHVh6WZYlPCuBfg=; b=dNv6d6kd30C7lUHdUAsRAvQ25U24PwlILDmWFD7Jl+7j7Wn5TIASTKgn0bWa8bZA1jX/dC E43qD5lE/xM7R00TMOARfga6Kzzc7zivygBIUDnuEZWHcE52HAk6ZLBy8VGbgaxEnKZw0H Y70m462KGq9EN1NEud64qsE4usRKZ06akCb8zsBSZuConEDO3vBmGtmeawI2JUpc8wQ/x+ Rt8oto3KNE3PN9SnV/qk0bQs4v5lXuSrV6whcZG/MDgqUXg1SR6B/kNA+3qQqrPXo2UziI O7+3Xil31MW04jHGIgjrMhTvQ+wkZYVFQ0W/uKFFSNMObltxeBjivuRSvWgfwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftJ4p0PSKzd6m for ; Sat, 11 Apr 2026 15:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e533 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 15:49:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 5183de194795 - stable/15 - stand: lua: break out a few more dirent types in lfs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 5183de1947959ccde67561a4d9ac4ed4eff93f82 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 15:49:14 +0000 Message-Id: <69da6d7a.1e533.5c02828d@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5183de1947959ccde67561a4d9ac4ed4eff93f82 commit 5183de1947959ccde67561a4d9ac4ed4eff93f82 Author: Kyle Evans AuthorDate: 2026-03-09 21:38:57 +0000 Commit: Kyle Evans CommitDate: 2026-04-11 03:19:20 +0000 stand: lua: break out a few more dirent types in lfs These are non-standard and specific to the version used in loader. We have some desire to recognize symlinks to avoid filtering out kernel symlinks in the autodetection bits when they would be perfectly fine to `load`. This won't be usable right away, so any impending use will need to be careful to account for nil. Reported by: leres (cherry picked from commit bc531a96c9b28b1cabcd5deb0c9f8f6d815cfebc) --- libexec/flua/lfs/lfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/flua/lfs/lfs.c b/libexec/flua/lfs/lfs.c index 517e16ae65c8..a3594d2b7d97 100644 --- a/libexec/flua/lfs/lfs.c +++ b/libexec/flua/lfs/lfs.c @@ -444,6 +444,10 @@ luaopen_lfs(lua_State *L) /* Non-standard extension for loader, used with lfs.dir(). */ lua_pushinteger(L, DT_DIR); lua_setfield(L, -2, "DT_DIR"); + lua_pushinteger(L, DT_REG); + lua_setfield(L, -2, "DT_REG"); + lua_pushinteger(L, DT_LNK); + lua_setfield(L, -2, "DT_LNK"); #endif return 1; } From nobody Sat Apr 11 23:42:47 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftVbK4qVzz6Y3h4 for ; Sat, 11 Apr 2026 23:42: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftVbK2Kfwz4G5k for ; Sat, 11 Apr 2026 23:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775950973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgMr46roBXBaJj5D3cwpQOr25KiJSFM0gtFQTrYgU2s=; b=kFMwt6cxPPiu8N9Tiogsc32lVWUl72r2jVubALPJ7va1ikERNgYh5x4765tiuGre5M5LQS GgC5jy7g+Uk5+IJXLmkJ1q80bF89BNoPMWNADMJrYnUaPLASK/eSZIocG4SAkTruxVFd+L JPB/ogP/lGpytajDxZKNI3DT3Q/Dh+IolSW58H4nHYSVFsZHRmX3mDOJV4jcNuiY9HpiBX ZZ98XDLVzGg0H6QERJoSRTTimmgkpmSgZvx5yk2Ycoa3klu2GeF19CUVnzeGO7Zeikzz2L NvTi+pVJ0V0N78X6NQw3bUEjhqf1nEwMBkl7qBe/arZ4bl/zr914bF/fvIWTZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775950973; a=rsa-sha256; cv=none; b=kZxzG5BgUnZfaBIMkiCpOvCHWk+AEaqreNmIm0FpAE9JcQ/A/jGQX1mr4qyUWgRxNRAW2K wgu+2xyF2vaofQB9xKEg3rJt3EIXnO8dO2pM/dWVE0X6E6Hkcw/ZX2oXw/c5hpiDFJfkLW gDveRXY6mY1HQOJ86CLMih3TVxDqNXhez32ZrfFHyrxVjfuhm20zMxFpwVwcqNpk1GkhGG kZTWNkDGpz3UYUZwaYvHLfqvVTUek4fbrDd5fS/1CIay9o6BXRJRE31O8J/hj04YOSY2mR +8vamrGWdJfJxkxHZ3r3tcz3EmabK/ZDNalir6IzSXSb2ynKf9a6nhi/hdVGoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775950973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgMr46roBXBaJj5D3cwpQOr25KiJSFM0gtFQTrYgU2s=; b=yBpkB3ACBrMIeWysz5NTxszguOBcW+frv4AwVcK0u/62IQPBOMLKsPJLRuZ2St8GwHcJYM /hDmPOcyKFq+TZehb6dF0bUZEGeQNFk1qvUZsEutgDzSIbCCy6oCzbvDjgQmW8QGtGDiWW vHkVe0qT1vgksJc3vnGAkjzPvehYd9QeOoELWH3tBOvC8snsoNAWQnujWwA/YIyyLtegs0 7noWDkZJbcyjUgw4dA1PMiCOiVXWlWl9vtwrQ/4ahkl69nS+W0bhAin2acLeY8JoZ3FQ2H cGo4N+BZzAT4Uuz8Ewi1IQQpTWPYfztJDZJXZyyh0nTa21PomQ/2Tu+TiNTy5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftVbK1hTpzsNv for ; Sat, 11 Apr 2026 23:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30abb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 23:42:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Enji Cooper Subject: git: 28ddaaa69375 - stable/15 - tests/fusefs: fix sign-compare warning on armv7 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 28ddaaa693756d5ba62790f333913c24fb393d72 Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 23:42:47 +0000 Message-Id: <69dadc77.30abb.4d63c2c4@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=28ddaaa693756d5ba62790f333913c24fb393d72 commit 28ddaaa693756d5ba62790f333913c24fb393d72 Author: Siva Mahadevan AuthorDate: 2026-03-14 03:48:31 +0000 Commit: Enji Cooper CommitDate: 2026-04-11 17:11:12 +0000 tests/fusefs: fix sign-compare warning on armv7 Fixes: 7e68af7ce2c1b892954df415774fe59fd2f1b62f Reviewed by: asomers Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D55846 (cherry picked from commit 736d8852e190f69dc93206ed3fb2d1f712dc3ad1) --- tests/sys/fs/fusefs/read.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc index 52dad3bc829e..c71b84241c71 100644 --- a/tests/sys/fs/fusefs/read.cc +++ b/tests/sys/fs/fusefs/read.cc @@ -461,10 +461,10 @@ TEST_F(AsyncReadNoAttrCache, read_sizechange) uint64_t ino = 42; mode_t mode = S_IFREG | 0644; int fd; - ssize_t bufsize = strlen(CONTENTS); + size_t bufsize = strlen(CONTENTS); uint8_t buf[bufsize]; - ssize_t size1 = bufsize - 1; - ssize_t size2 = bufsize; + size_t size1 = bufsize - 1; + size_t size2 = bufsize; Sequence seq; expect_lookup(RELPATH, ino); @@ -532,12 +532,12 @@ TEST_F(AsyncReadNoAttrCache, read_sizechange) fd = open(FULLPATH, O_RDONLY); ASSERT_LE(0, fd) << strerror(errno); - ASSERT_EQ(size1, read(fd, buf, bufsize)) << strerror(errno); + ASSERT_EQ(static_cast(size1), read(fd, buf, bufsize)) << strerror(errno); ASSERT_EQ(0, memcmp(buf, CONTENTS, size1)); /* Read again, but this time the server has changed the file's size */ bzero(buf, size2); - ASSERT_EQ(size2, pread(fd, buf, bufsize, 0)) << strerror(errno); + ASSERT_EQ(static_cast(size2), pread(fd, buf, bufsize, 0)) << strerror(errno); ASSERT_EQ(0, memcmp(buf, CONTENTS, size2)); leak(fd); From nobody Sun Apr 12 00:38:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftWqm0LFdz6Y7yt for ; Sun, 12 Apr 2026 00:38: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftWql6gyKz4MXq for ; Sun, 12 Apr 2026 00:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775954324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jxqJu2DdL6hr2rP0bk6sw3ybdpDUFnK3/TVzApJf+8U=; b=sggLNp8YS8pF3tmaUOJLPpesE/EFgPd2fPYH7awGhMZVel8kU8qXtd30Xf829ZlprclRRf MjGcpJNZ3rnBPyJTcAkR/PWdx2bJQrUTfE5D7HRt3dRn+ApgH0GSNB/gsjLPr9s3zcgyPs k5c+wr3QXX2BDm+FIhT5YO1XLSlrStY2WUbP4injmexE3QZ9Zb2C5ecT9v9L2f/QSJhz6q rw4oHs5VIeny433C0BqLAaNZeyHFSiIDLVYULD6OKlW0giQVOlBStJa9wahkHx03n4mFMz qLZHl5CoO2bC6cQveAxZ2wU2MGeZcz3ZMzzl+EApNCmJAhh/6tsV2+8a7OQpYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775954324; a=rsa-sha256; cv=none; b=GoiQj3I+olLjnD5d7ZqibclGo4O2rs/IP3ErzN+mbi16dEM0bpzo1/TN2CqtNjNejrNGzh b5taEgX7tfPhY+v26uYxGL+FCDWpAtzp9MbQK/gRTRytJQMfrBSgsWL6YYwH6GVIjmCyLH yZd2NymxgQPy7ss5USLfC9rWvplZRv39loDNa5f037himzFCw2U82VHurAG2YEVloQ5Rzt vix0ZkUKRXE+z+eFLaSQ40gIxmZQRwKmm2rIoB4rGl0K/LE5v2S4U3zLlgkBhtdRbnhTmy I9X734N7KsI2S6bf6cfd+kKbtZQO2VY9dRvdPeRRC8QBLi0gPFbWAAMuTDjV7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775954324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jxqJu2DdL6hr2rP0bk6sw3ybdpDUFnK3/TVzApJf+8U=; b=AcLtj2nBfsaTzOY8PJWCO8WE3PkU3IOz0V/W+hX29mmUWumpdHjQuklKKV9l75kzH8k6/K HO/L58vyBpR2jivd6LOmgRCQrjvKEMFE5luGnPPa+EbGIQfJr51a3KOnUCEBa+1eWE3WJz EgOck9ah/YylhJBpejSj2k64u0zRsy/EbPVMk9prlIa+yPdR61sFNsi9zPKEmGnGprjM3F K6Q+tGUiyHPAH606qGLBMCMxIr2wljiKucSr0n/2HX8CRYh4ziakPk0tvOHkN7mhd6V4Dw h9YOHs048i1KrRnB52OBAAwESTCiHilyT7xdQUwOrifua4Iunp6/DnNWjxNKmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftWql602dztd3 for ; Sun, 12 Apr 2026 00:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37f67 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 00:38:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 4beef6a4c567 - stable/15 - nfs_nfsdsocket.c: Allow Copy/Clone from a read-only fs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 4beef6a4c5676249c6e87de5354938d5b15dbd88 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 00:38:43 +0000 Message-Id: <69dae993.37f67.4315677e@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4beef6a4c5676249c6e87de5354938d5b15dbd88 commit 4beef6a4c5676249c6e87de5354938d5b15dbd88 Author: Rick Macklem AuthorDate: 2026-03-29 21:41:36 +0000 Commit: Rick Macklem CommitDate: 2026-04-12 00:36:51 +0000 nfs_nfsdsocket.c: Allow Copy/Clone from a read-only fs For some server file system types, such as ZFS, a Copy/Clone operation can be done across file systems of the same file system type. However, without this patch, the Copy/Clone will fail with EROFS if the input file is on a read-only mounted file system. This happens because Copy/Clone will try to do a VOP_SETATTR() of atime to set the atime. This patch pretends the VOP_SETATTR() of atime worked for read-only file systems. It fixes a problem when copying files from a ZFS snapshot. PR: 294010 (cherry picked from commit b5815ee99a015c6ac118d7e9646d0c95b72e9f2d) --- sys/fs/nfsserver/nfs_nfsdserv.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index bf0f638c52bb..55bf56c4daf1 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -407,7 +407,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, int preat_ret = 1, postat_ret = 1, gcheck = 0, error = 0; int gotproxystateid; struct timespec guard = { 0, 0 }; - nfsattrbit_t attrbits, retbits; + nfsattrbit_t atimeonly, attrbits, retbits; nfsv4stateid_t stateid; NFSACL_T *aclp = NULL, *daclp = NULL; struct thread *p = curthread; @@ -481,9 +481,28 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, */ if (!nd->nd_repstat) { if (NFSVNO_NOTSETSIZE(&nva)) { + /* + * For an NFSv4.2 Setattr of atime only that fails with + * EROFS, pretend the operation succeeded. This makes + * the semantics of copying files from a ZFS snapshot + * the same over NFSv4.2 as it is locally. + * Without this "hack", the copy will fail + * with EROFS unless the NFSv4.2 mount has the + * "noatime" mount option. + */ + NFSZERO_ATTRBIT(&atimeonly); + NFSSETBIT_ATTRBIT(&atimeonly, NFSATTRBIT_TIMEACCESSSET); if (NFSVNO_EXRDONLY(exp) || - (vp->v_mount->mnt_flag & MNT_RDONLY)) - nd->nd_repstat = EROFS; + (vp->v_mount->mnt_flag & MNT_RDONLY)) { + if ((nd->nd_flag & ND_NFSV42) != 0 && + NFSEQUAL_ATTRBIT(&attrbits, &atimeonly)) { + NFSCLRBIT_ATTRBIT(&attrbits, + NFSATTRBIT_TIMEACCESSSET); + NFSSETBIT_ATTRBIT(&retbits, + NFSATTRBIT_TIMEACCESSSET); + } else + nd->nd_repstat = EROFS; + } } else { if (vp->v_type != VREG) nd->nd_repstat = EINVAL; From nobody Sun Apr 12 00:42:33 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftWwB04Fzz6Y8C0 for ; Sun, 12 Apr 2026 00:42: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftWw954tjz4NV3 for ; Sun, 12 Apr 2026 00:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775954553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+YuSw1HEUsuttxrWWDVCvHXl3b+2oAL4iPGSJW8k2l0=; b=olRXAMEaFxD3Lnd2XyCp/K/sTzvQ+FegROLE6qKXBEeVggsIBPMHtrpDVsBX3tI/TqVdcQ FntJllOTQqViBmnMCM0Y2SdCHQgSFd68FwjJuwiSyHh9btXncV39WUcLKMuMu3DkodSv9D vQx7IgUV7DI9mkmbpPoEiFj5QlpM9xYnBo6WBkqXwge/cEm0POOC3tuJCmDa9wSjydGtWC OkQLueoda52JoETy6oOVuyoJKfth6Ra1GT0mqxOcmMIGdS53mW05lXiDbC1vRS6pLCyDcE lMIhbNyfdb9+5uK5LSJr2sPwRdWacs9W74XywPHewael59dUxaQDCDjEz6BHXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775954553; a=rsa-sha256; cv=none; b=w4gLVvX1kCoRuNisU/hr1HGNi4Ab3T3mqzgeUoTY+tiGAcGPb1GlU+xWB9pD7G43AfDmKA yI7UNLFAYNLRqNUs7NuRzyBq4VwcHz2wRgrDy8mUKQCVzhDheCMaFTcBwirpCnAyvw6omS Z2ePnxyQpRQJBGhrug7uR5ceMBloqOo1x1Oc7FlD5J8JnSuYdNniHFS94iwJKUWcEssDZ2 5Kt//ql7X13JsbsWmBxATRlsRZ/MxKq8RXwkRaMn40TgLEkqelT2RnSGJ/wgYL71xa5enW gs9dyRDL9kSAbc9cR4Y13cLKXQUY08Wy5beBuiQChKBkw6tubjil96IT0CLPgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775954553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+YuSw1HEUsuttxrWWDVCvHXl3b+2oAL4iPGSJW8k2l0=; b=nzdHa3gZqNMS3igISPMjhjASRgHZdQyfUXhkVKuikRrnt6CFtNV17q+Hd/FDxX8j9f0HHw F28JMgJMExTs8c7zqDSHorKBIV+QIop9/0jKfDFE54dQc5l8G9wkb5WdRe1vfJmisH/oR/ UtS0b4EbSMEYYZ1uD0H76VTFyno7A+mcZVIYY6QlvyrQ2Vi/yn0YfWOAEi215rDhEry+Hw z8711s4nNmTxEY2btJMbHo2A28dO6tGkH+Wq/+7eKATWW/a6XcTAkUi6mIQviwYhkREEKj +SqSH0vQwp1XrpfifHl7McQzehQ7IFZy4xj3/dOsxJ4ciqzJSTrzLeNqNXfh7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftWw94Zdlzv7m for ; Sun, 12 Apr 2026 00:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38896 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 00:42:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 2a97b49bc472 - stable/15 - nfs_diskless: Add support for an NFSv4 root fs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2a97b49bc47228618242843d0d84f51ec67f3f36 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 00:42:33 +0000 Message-Id: <69daea79.38896.1aa38bba@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2a97b49bc47228618242843d0d84f51ec67f3f36 commit 2a97b49bc47228618242843d0d84f51ec67f3f36 Author: Rick Macklem AuthorDate: 2026-04-05 16:00:24 +0000 Commit: Rick Macklem CommitDate: 2026-04-12 00:38:44 +0000 nfs_diskless: Add support for an NFSv4 root fs Without this patch, diskless root NFS file systems could only be mounted via NFSv3 (or NFSv2). This patch adds the basic support needed to mount a root fs via NFSv4. At this time, the NFSv4 mount will only work if the following is done on the NFS server configuration: - The root directory specified in the "V4:" line in /etc/exports must be "/". This is needed since the path to mount must be the same for NFSv3 and NFSv4. - The NFS server must be configured to do both NFSv3 and NFSv4, since the bootstrap code still uses NFSv3. - The NFSv4 server must be configured with: vfs.nfs.enable_uidtostring=1 vfs.nfsd.enable_stringtouid=1 since the NFSv4 root fs cannot be running nfsuserd(8) when it is booting. (This limitation may be removed in a future commit by hard-wiring enough id<-->name mapping entries to handle things until the nfsuserd(8) is running.) To enable the root fs to be mounted via NFSv4, it needs: - in the root file system's /boot/loader.conf boot.nfsroot.options="nfsv4" (Additional options like rsize=65536,wsize=65536 can also be specified.) - in the root file system's /etc/sysctl.conf vfs.nfs.enable_uidtostring=1 (cherry picked from commit 8b9775912cbc7bb3c05c1fdfc3597dc4b68a9b9e) --- sys/fs/nfs/nfs_var.h | 1 + sys/fs/nfsclient/nfs_clport.c | 31 +++++++++++++++++++++++++++++++ sys/fs/nfsclient/nfs_clrpcops.c | 3 ++- sys/fs/nfsclient/nfs_clstate.c | 17 +++++++++++++++-- sys/fs/nfsclient/nfs_clvfsops.c | 7 +++++-- sys/nfs/nfs_diskless.c | 37 +++++++++++++++++++++++++------------ 6 files changed, 79 insertions(+), 17 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 28088c12d7e7..145cbf984464 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -609,6 +609,7 @@ int nfscl_relbytelock(vnode_t, u_int64_t, u_int64_t, int nfscl_checkwritelocked(vnode_t, struct flock *, struct ucred *, NFSPROC_T *, void *, int); void nfscl_lockrelease(struct nfscllockowner *, int, int); +void nfscl_uuidcheck(char *); void nfscl_fillclid(u_int64_t, char *, u_int8_t *, u_int16_t); void nfscl_filllockowner(void *, u_int8_t *, int); void nfscl_freeopen(struct nfsclopen *, int, bool); diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index cf163adc02de..d23051058ce4 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -659,6 +659,37 @@ ncl_pager_setsize(struct vnode *vp, u_quad_t *nsizep) return (setnsize); } +/* + * If the uuid passed in is the DEFAULT_UUID, try and find an + * alternate to replace it with. + * If no alternate is available, set uuid to "" so that nfscl_fillclid() + * will use random bytes. + */ +void +nfscl_uuidcheck(char *uuid) +{ + int ucplen, uuidlen; + char *ucp; + + /* + * If the uuid is the DEFAULT_UUID, try and get an alternative. + */ + uuidlen = strlen(uuid); + ucp = NULL; + if (uuidlen == strlen(DEFAULT_HOSTUUID) && + NFSBCMP(uuid, DEFAULT_HOSTUUID, uuidlen) == 0) { + *uuid = '\0'; + /* Use smbios.system.uuid if it exists. */ + if ((ucp = kern_getenv("smbios.system.uuid")) != NULL) { + ucplen = strlen(ucp); + if (ucplen < HOSTUUIDLEN && ucplen > 0) + strlcpy(uuid, ucp, HOSTUUIDLEN); + } + } + if (ucp != NULL) + freeenv(ucp); +} + /* * Fill in the client id name. For these bytes: * 1 - they must be unique diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 9c86e0696153..308c45462002 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -67,6 +67,7 @@ SYSCTL_U64(_vfs_nfs, OID_AUTO, maxcopyrange, CTLFLAG_RW, /* * Global variables */ +uint32_t nfs_exchangeboot = 0; extern struct nfsstatsv1 nfsstatsv1; extern int nfs_numnfscbd; extern struct timeval nfsboottime; @@ -5537,7 +5538,7 @@ nfsrpc_exchangeid(struct nfsmount *nmp, struct nfsclclient *clp, nfscl_reqstart(nd, NFSPROC_EXCHANGEID, nmp, NULL, 0, NULL, NULL, NFS_VER4, minorvers, NULL); NFSM_BUILD(tl, uint32_t *, 2 * NFSX_UNSIGNED); - *tl++ = txdr_unsigned(nfsboottime.tv_sec); /* Client owner */ + *tl++ = txdr_unsigned(nfs_exchangeboot); /* Client owner */ *tl = txdr_unsigned(clp->nfsc_rev); (void) nfsm_strtom(nd, clp->nfsc_id, clp->nfsc_idlen); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 6dc97142b77f..a511c31d5202 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -89,6 +89,8 @@ extern u_int32_t newnfs_false, newnfs_true; extern int nfscl_debuglevel; extern int nfscl_enablecallb; extern int nfs_numnfscbd; +extern struct timeval nfsboottime; +extern uint32_t nfs_exchangeboot; NFSREQSPINLOCK; NFSCLSTATEMUTEX; int nfscl_inited = 0; @@ -883,9 +885,11 @@ nfscl_getcl(struct mount *mp, struct ucred *cred, NFSPROC_T *p, if (cred != NULL) { getcredhostuuid(cred, uuid, sizeof uuid); idlen = strlen(uuid); - if (idlen > 0) + if (idlen > 0) { + nfscl_uuidcheck(uuid); + idlen = strlen(uuid); idlen += sizeof (u_int64_t); - else + } else idlen += sizeof (u_int64_t) + 16; /* 16 random bytes */ newclp = malloc( sizeof (struct nfsclclient) + idlen - 1, M_NFSCLCLIENT, @@ -996,6 +1000,15 @@ nfscl_getcl(struct mount *mp, struct ucred *cred, NFSPROC_T *p, * such that the server throws away the clientid before * receiving the SetClientIDConfirm. */ + /* + * Must be done here while locked and before calling + * nfsrpc_setclient(). + */ + if (nfs_exchangeboot == 0) { + nfs_exchangeboot = nfsboottime.tv_sec; + if (nfs_exchangeboot == 0) + nfs_exchangeboot = arc4random(); + } if (clp->nfsc_renew > 0) clidinusedelay = NFSCL_LEASE(clp->nfsc_renew) * 2; else diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 212c88f28930..74e5e2dc9b1b 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -567,7 +567,7 @@ nfs_mountdiskless(char *path, struct vnode **vpp, struct mount *mp) { struct sockaddr *nam; - int dirlen, error; + int dirlen, error, minvers; char *dirpath; /* @@ -580,9 +580,12 @@ nfs_mountdiskless(char *path, else dirlen = 0; nam = sodupsockaddr((struct sockaddr *)sin, M_WAITOK); + minvers = 0; + if ((args->flags & NFSMNT_NFSV4) != 0) + minvers = -1; if ((error = mountnfs(args, mp, nam, path, NULL, 0, dirpath, dirlen, NULL, 0, vpp, td->td_ucred, td, NFS_DEFAULT_NAMETIMEO, - NFS_DEFAULT_NEGNAMETIMEO, 0, 0, NULL, 0)) != 0) { + NFS_DEFAULT_NEGNAMETIMEO, minvers, 0, NULL, 0)) != 0) { printf("nfs_mountroot: mount %s on /: %d\n", path, error); return (error); } diff --git a/sys/nfs/nfs_diskless.c b/sys/nfs/nfs_diskless.c index 0f0cf80feeec..d5278612d8d9 100644 --- a/sys/nfs/nfs_diskless.c +++ b/sys/nfs/nfs_diskless.c @@ -119,6 +119,10 @@ nfs_parse_options(const char *envopts, struct nfs_args *nd) else if (strcmp(o, "nfsv3") == 0) { nd->flags &= ~NFSMNT_NFSV4; nd->flags |= NFSMNT_NFSV3; + } else if (strcmp(o, "nfsv4") == 0) { + nd->flags &= ~NFSMNT_NFSV3; + nd->flags |= NFSMNT_NFSV4; + nd->sotype = SOCK_STREAM; } else if (strcmp(o, "tcp") == 0) nd->sotype = SOCK_STREAM; else if (strcmp(o, "udp") == 0) @@ -271,24 +275,33 @@ match_done: return; } nd3->root_saddr.sin_port = htons(NFS_PORT); - fhlen = decode_nfshandle("boot.nfsroot.nfshandle", - &nd3->root_fh[0], NFSX_V3FHMAX); - if (fhlen == 0) { - printf("nfs_diskless: no NFS handle\n"); - return; + if ((cp = kern_getenv("boot.nfsroot.options")) != NULL) { + nfs_parse_options(cp, &nd3->root_args); + freeenv(cp); } - if (fhlen != nd3->root_fhsize) { - printf("nfs_diskless: bad NFS handle len=%d\n", fhlen); - return; + if ((nd3->root_args.flags & NFSMNT_NFSV4) == 0) { + fhlen = decode_nfshandle("boot.nfsroot.nfshandle", + &nd3->root_fh[0], NFSX_V3FHMAX); + if (fhlen == 0) { + printf("nfs_diskless: no NFS handle\n"); + return; + } + if (fhlen != nd3->root_fhsize) { + printf("nfs_diskless: bad NFS handle len=%d\n", + fhlen); + return; + } + } else { + /* + * For NFSv4, the file handle is derived from the + * boot.nfsroot.path during mounting by NFSv4. + */ + nd3->root_fhsize = 0; } if ((cp = kern_getenv("boot.nfsroot.path")) != NULL) { strncpy(nd3->root_hostnam, cp, MNAMELEN - 1); freeenv(cp); } - if ((cp = kern_getenv("boot.nfsroot.options")) != NULL) { - nfs_parse_options(cp, &nd3->root_args); - freeenv(cp); - } nfs_diskless_valid = 3; } else { From nobody Sun Apr 12 00:47:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftX1b1ZpRz6Y82B for ; Sun, 12 Apr 2026 00:47: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftX1b0qv4z4NqP for ; Sun, 12 Apr 2026 00:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775954835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gk8RWOV16dI/Eu7b0b7kQq1R909JHpOHhPwDUv7Hsrs=; b=LcaIJVWP6rB7EqIG7JuCCnJIdqfNF5ajCfIirI+LP2yR0xRPawGgItvEUnh0fB4vvDBtg+ SKzxyr4Xp6LqDRAbfC7pnfapzyTPQHaB9w84NZ8XyFO7JtrMqdIkJMcw1usqvQcDphDd+K avNGLoLrztWbIhP6rrgNOfoWUTQ/rPAf7jFjtym0NXkUoSm5K+mwQas7tU7h6FpzcxtDjx FaSp2UIUhffcEajbnEvizZBY1TEFeLXoWnqQGvWcLrXy/a3Vf3ufF/uGYMsLBSKQDI73BR rTc2T+e7ZZpwgepyhMBRHQvIhcae7nrW72xlw2yUyLjX71O2jlY0XL22bv/7Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775954835; a=rsa-sha256; cv=none; b=kiz2nTygV96+qh2Nr6N+gjR0O8esqWDFoDhf6/OrngvVPUt/vF/AaYMuvH5XpeqdmU5PCB 1ZQe804PSUl2O31sVo71d4nik7owpr2DwDjEkd8fIryn2NSQEwomdbHh23UyUbefwT2+Kr TGsWQw1VmzMEQIY+JwVyIkD3f3jjZqDZNMFzLJwZ9N3e+aFYIvnnH9rCn83y3rxbkx95Aj Wcpej+nmD9ymj6kugyIGSj7irtep5VKifZbxRzPPfCoqSFC0ahTayVnNw05bPVXK+ZY8Il 5ULKv4Tl7ls8G9qg9xjp9V9iTj53Zce7YszCc8XEYWDdj/DU7HSJx4ofPKTb9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775954835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gk8RWOV16dI/Eu7b0b7kQq1R909JHpOHhPwDUv7Hsrs=; b=m1cGOfzJGUrKzL5lxg3AJG+8+oAdyuhGZaHnxIvH+ERtn4+cFrX6lkkLdbPVZsnoG5V3H6 TBq4cfGv56Y/LR4NIPRQWYrXWFP4q1DYfGGOR0QOZnUkPnPYIsIzHTzVFzCdqDTbVGkO1M Tbp3TiHa1Ak1/82KU7qM9fOQd/RhG/6FQVYlBIX6Cb6CP4zwLSglPXyjUiAYQ6PFRGe9XA mP8pSqUSyJUO3OSj/eR70mS20HTkux+6lX76+4KhIZx1KfOElOQ1imr1ZZlgL3RTwIqXte H4Gs/pUW12oAeshbnhrt8wn2x9IV7w/PVguHl+bK0K9AEdGJsEeOWSr4Io0bhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftX1Z71t8zvTM for ; Sun, 12 Apr 2026 00:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38269 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 00:47:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: fcec95bca38f - stable/14 - nfs_nfsdsocket.c: Allow Copy/Clone from a read-only fs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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/14 X-Git-Reftype: branch X-Git-Commit: fcec95bca38fb9bd3bd30b94efc4a0fe2bde3034 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 00:47:14 +0000 Message-Id: <69daeb92.38269.5691e620@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=fcec95bca38fb9bd3bd30b94efc4a0fe2bde3034 commit fcec95bca38fb9bd3bd30b94efc4a0fe2bde3034 Author: Rick Macklem AuthorDate: 2026-03-29 21:41:36 +0000 Commit: Rick Macklem CommitDate: 2026-04-12 00:45:40 +0000 nfs_nfsdsocket.c: Allow Copy/Clone from a read-only fs For some server file system types, such as ZFS, a Copy/Clone operation can be done across file systems of the same file system type. However, without this patch, the Copy/Clone will fail with EROFS if the input file is on a read-only mounted file system. This happens because Copy/Clone will try to do a VOP_SETATTR() of atime to set the atime. This patch pretends the VOP_SETATTR() of atime worked for read-only file systems. It fixes a problem when copying files from a ZFS snapshot. PR: 294010 (cherry picked from commit b5815ee99a015c6ac118d7e9646d0c95b72e9f2d) --- sys/fs/nfsserver/nfs_nfsdserv.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 6047e6f2970e..460d08bd1da0 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -382,7 +382,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, int preat_ret = 1, postat_ret = 1, gcheck = 0, error = 0; int gotproxystateid; struct timespec guard = { 0, 0 }; - nfsattrbit_t attrbits, retbits; + nfsattrbit_t atimeonly, attrbits, retbits; nfsv4stateid_t stateid; NFSACL_T *aclp = NULL; struct thread *p = curthread; @@ -450,9 +450,28 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, */ if (!nd->nd_repstat) { if (NFSVNO_NOTSETSIZE(&nva)) { + /* + * For an NFSv4.2 Setattr of atime only that fails with + * EROFS, pretend the operation succeeded. This makes + * the semantics of copying files from a ZFS snapshot + * the same over NFSv4.2 as it is locally. + * Without this "hack", the copy will fail + * with EROFS unless the NFSv4.2 mount has the + * "noatime" mount option. + */ + NFSZERO_ATTRBIT(&atimeonly); + NFSSETBIT_ATTRBIT(&atimeonly, NFSATTRBIT_TIMEACCESSSET); if (NFSVNO_EXRDONLY(exp) || - (vp->v_mount->mnt_flag & MNT_RDONLY)) - nd->nd_repstat = EROFS; + (vp->v_mount->mnt_flag & MNT_RDONLY)) { + if ((nd->nd_flag & ND_NFSV42) != 0 && + NFSEQUAL_ATTRBIT(&attrbits, &atimeonly)) { + NFSCLRBIT_ATTRBIT(&attrbits, + NFSATTRBIT_TIMEACCESSSET); + NFSSETBIT_ATTRBIT(&retbits, + NFSATTRBIT_TIMEACCESSSET); + } else + nd->nd_repstat = EROFS; + } } else { if (vp->v_type != VREG) nd->nd_repstat = EINVAL; From nobody Sun Apr 12 02:15:09 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftYz15yRZz6YGtr for ; Sun, 12 Apr 2026 02:15: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftYz13TTXz3Hvr for ; Sun, 12 Apr 2026 02:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775960109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YU5e4WpD3EeuXBOMAm3LXl/4OLnIMkMR60suu6rXiDI=; b=OpodHSTwGbLPYaCj6XBOauxR2u/2VWIdROSc7aSPj5neGXS4GopPsqYSfB8PTGi3z1ixW6 2oTbj+ssRVJG4my7zSvD20ht6XIPDQHrG9OeKo9bn1C4UKL08wUU5jHHbxDARrlEPe56/+ qSnHkuKR1AuW/qwNs7nIOhOrdNY8lywT55e6UM35YKIGKHlHgQTtsmom2Invhiq0FHCoOS QBTQKbMupZrxxgBb2Kb3GZVySlNBsd0qBHel7fCDDn1GLQ+UcoB+QEAQadF4uFHMC/liVX ejRHhy/Ssc7tY8nDaYyASM0EebMOVnLJMJkRs3jW+UJGquZgs7/qiS/vXqLTew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775960109; a=rsa-sha256; cv=none; b=amh/n3Gebdg+rcXq6vpgUFq5Zx9wKfsym6T1qO8viTnaqOskQywxw+qbOFsmiXIGKPeFaB YsQMgIZEQCTPR85qCmPPzsMyf787sToS/IXGl6XtRxCNmD4v4hYGfQDTtD3z0evo1lm/qv ETO7cf6PeTmDMMn4ItOYzq/ENmJPL/8bVJ/luGFIF/hnfyOioxFsglef/vyVDvbG5Nd3TL OXrDhKolQAeTvK/wwPXoBrORDmbFVKL8G7meD9KG4Nge1fkjpfvOiM8cRcAyCTRvgdd64i DXRhhOvXbtfptitv1dkjWGR7EllJphzxZPW6o0q0SD+oKjZsuzlufeZmVI33mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775960109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YU5e4WpD3EeuXBOMAm3LXl/4OLnIMkMR60suu6rXiDI=; b=enkrAwl/Mm2z6mE2fPcZLIkPeGWKCoTrhyL9DUvMuEzNd3wvXr5nLPUMBpRJl/nRfCA4jM mWmOOMFHxaplGTu9SuYkkYnufcABBLP3DrEWL3x7I43RZcy199oP/H8sFY5//Vea6EOWwI w04c8xNKxtNoCZSlvmEKu4IDPHwwntVP5CCcbvROQS1BQoZGqQajugPAn3gGSUs9z/+BbQ 4y+SkWtlCEf6HYz/tzGsmycozuJ9DCX4jMJ5z1ZkvhZVM97MWP1GhT6aEK4LaIBTZr2slX fTH2AXFwGuMHTan++vNlSThUtxxO9pXSLMUjjBChX43NrGm5O6KZ/gYxCJmI2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftYz134JCzxn4 for ; Sun, 12 Apr 2026 02:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 422f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 02:15:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 293c738aa450 - stable/15 - crypto/openssl: update artifacts to match 3.5.6 release 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: 293c738aa45003423f45eb7f0e37f3047e52c502 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 02:15:09 +0000 Message-Id: <69db002d.422f3.69316325@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=293c738aa45003423f45eb7f0e37f3047e52c502 commit 293c738aa45003423f45eb7f0e37f3047e52c502 Author: Enji Cooper AuthorDate: 2026-04-09 01:54:40 +0000 Commit: Enji Cooper CommitDate: 2026-04-12 02:14:40 +0000 crypto/openssl: update artifacts to match 3.5.6 release artifacts A new manpage and any associated links will be added in the next commit. MFC after: 1 day (the security issues warrant a quick backport). MFC with: 10a428653ee7216475f1ddce3fb4cbf1200319f8 (cherry picked from commit 5254e16213ff1bb136ef24e0b0fe30625ac53563) --- crypto/openssl/exporters/libcrypto.pc | 3 +- crypto/openssl/exporters/libssl.pc | 3 +- crypto/openssl/exporters/openssl.pc | 3 +- crypto/openssl/include/openssl/cmp.h | 4 +- crypto/openssl/include/openssl/opensslv.h | 10 +- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 6 +- 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 | 12 +- .../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 | 6 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 8 +- 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_set_flags.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 +- .../man/man3/CMS_EncryptedData_set1_key.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_app_data.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 | 12 +- 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 | 8 +- secure/lib/libcrypto/man/man3/OPENSSL_ppccap.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 | 13 +- .../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 | 8 +- 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 | 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 | 15 +- 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 | 12 +- 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 | 20 +- 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 | 127 +++- .../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 | 12 +- .../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 | 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 | 6 +- .../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 | 9 +- 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 | 4 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 6 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 6 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 4 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ML-DSA.7 | 8 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 4 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-SLH-DSA.7 | 6 +- 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 | 10 +- 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 | 6 +- .../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 | 29 +- .../lib/libcrypto/man/man7/provider-asym_cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-base.7 | 7 +- 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 | 8 +- 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 | 786 ++++++++++++--------- secure/usr.bin/openssl/man/openssl-cmds.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmp.1 | 12 +- secure/usr.bin/openssl/man/openssl-cms.1 | 6 +- 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 | 6 +- 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 | 6 +- 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 | 10 +- secure/usr.bin/openssl/man/openssl-verify.1 | 9 +- 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 +- sys/crypto/openssl/aarch64/vpsm4_ex-armv8.S | 104 +-- sys/crypto/openssl/amd64/rsaz-2k-avxifma.S | 1 + sys/crypto/openssl/amd64/rsaz-3k-avxifma.S | 3 +- sys/crypto/openssl/amd64/rsaz-4k-avxifma.S | 3 +- sys/crypto/openssl/powerpc/aes-gcm-ppc.S | 5 - sys/crypto/openssl/powerpc64/aes-gcm-ppc.S | 5 - sys/crypto/openssl/powerpc64le/aes-gcm-ppc.S | 5 - 909 files changed, 1656 insertions(+), 1426 deletions(-) diff --git a/crypto/openssl/exporters/libcrypto.pc b/crypto/openssl/exporters/libcrypto.pc index 829121ff73f5..339c799132d7 100644 --- a/crypto/openssl/exporters/libcrypto.pc +++ b/crypto/openssl/exporters/libcrypto.pc @@ -1,3 +1,4 @@ +# prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib @@ -7,7 +8,7 @@ modulesdir=${libdir}/ossl-modules Name: OpenSSL-libcrypto Description: OpenSSL cryptography library -Version: 3.5.5 +Version: 3.5.6 Libs: -L${libdir} -lcrypto Libs.private: -pthread Cflags: -I${includedir} diff --git a/crypto/openssl/exporters/libssl.pc b/crypto/openssl/exporters/libssl.pc index 154bf1ca64cc..e5fce192a971 100644 --- a/crypto/openssl/exporters/libssl.pc +++ b/crypto/openssl/exporters/libssl.pc @@ -1,3 +1,4 @@ +# prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib @@ -5,7 +6,7 @@ includedir=${prefix}/include Name: OpenSSL-libssl Description: Secure Sockets Layer and cryptography libraries -Version: 3.5.5 +Version: 3.5.6 Requires.private: libcrypto Libs: -L${libdir} -lssl Cflags: -I${includedir} diff --git a/crypto/openssl/exporters/openssl.pc b/crypto/openssl/exporters/openssl.pc index 110c7835e352..4e0aed6e9db3 100644 --- a/crypto/openssl/exporters/openssl.pc +++ b/crypto/openssl/exporters/openssl.pc @@ -1,3 +1,4 @@ +# prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib @@ -5,5 +6,5 @@ includedir=${prefix}/include Name: OpenSSL Description: Secure Sockets Layer and cryptography libraries and tools -Version: 3.5.5 +Version: 3.5.6 Requires: libssl libcrypto diff --git a/crypto/openssl/include/openssl/cmp.h b/crypto/openssl/include/openssl/cmp.h index d46192c7172c..af844ec8ed10 100644 --- a/crypto/openssl/include/openssl/cmp.h +++ b/crypto/openssl/include/openssl/cmp.h @@ -2,7 +2,7 @@ *** 13825 LINES SKIPPED *** From nobody Sun Apr 12 02:15:07 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftYz03JPHz6YH9m for ; Sun, 12 Apr 2026 02:15: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftYz00fNwz3JFL for ; Sun, 12 Apr 2026 02:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775960108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b97aEXsNOzN8MIwvbn24f1OKajDmBLiH56rlxxTe4Rs=; b=G5/g5ouTmg/14i3+2W0QeW4Bv67Ytbb341Upa95dRH1SbsaejHmomX3TWCzZFZxEmxJtD7 1fQuT0ObzjfqRsp7hYxnZyNAgMRHP6BRbC3UrNKsS5Gzc5irZraWQYnH6he4DwYSjT/B/B 4MtY8e9+3PC3W4JmvCjfq0MqUZq7DYX7293LjZUFNoN7uQFFYdcJcH4iggSVuAemI9vzM6 gKW4yjTDZ1UjA79aqHd2VBHiFHLxGosTyBZa3QFNFA7uxU2kTqGo8xsgpc+jCmDZl8NXBM jAe7o7r2FNnhoJWQ2FWQ+kQQhDOIR58Dhz4jQoyOZKtzAVRt5hZw6af8Stsoww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775960108; a=rsa-sha256; cv=none; b=GT+V/sHaP2DTSmChdBQ4JsBJykQ0ruUunqQx61c50BYMPZH59Zaus9lNiBFQIvUlhxBJBP CEPThR8TwRFr0ZC+P+4FrWJQPUoAo8pfAzYFXhNngzW94vhPEu1E9FYh/OSAn6ErSlvbQO 30m9fbdeqE47itSLktK5TJpa7TZjZU8z/TosE7ZFa6tEVUokh1NyaPkTwxbT8pGZnVwoR5 z8M5/iKfQCKqE+/IsfViZ9ei5wDAMx8bh/2Pk2QxrI6oFZP9p0QKxyCMTl9ydFD+4ZQ3HU ePtCVMJ1bQ8hqOV4CHtzQA0vcrHUBwvlmqFu2kM4UP0V2QvEuRqkFruX50zufg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775960108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b97aEXsNOzN8MIwvbn24f1OKajDmBLiH56rlxxTe4Rs=; b=cSu5biMOZRyxqmggqON4q9CUZAA9HSYCQsTtnu6vHXXC/IaiYWQR9YBV0jEBLwVvTJ+YGF FE9iB7yyin380/QOI06a8PcUwfNG+7gj86KwK6x7sA48OQZw4T+Fn0QOI0k2fPmqZJqqyt cdkp3cEtE6g2d5N0w9mSQQgt6WVRCV82iRVwsnBXizEdQcKB+37Ayi6f8+gqLG82d5IzX1 C5mFBEp1Ak1yI8KG8h0SoYNpV9lOJVTZl2yl+xmvm6LE5EoSHG9UvRmGT6JZf7AQMan9YS /2jHy1LmGDIdb120d4k+pzy4RL+27cpW+CNNMLwV1pPRYoI1c0PSVPN39ndNUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftYz00Dt2zxbQ for ; Sun, 12 Apr 2026 02:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4170b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 02:15:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: e2fcde7333a5 - stable/15 - MFV: crypto/openssl: update to 3.5.6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: e2fcde7333a515907316cf1a4ee4858edc90419d Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 02:15:07 +0000 Message-Id: <69db002b.4170b.7f123bf5@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e2fcde7333a515907316cf1a4ee4858edc90419d commit e2fcde7333a515907316cf1a4ee4858edc90419d Author: Enji Cooper AuthorDate: 2026-04-09 01:44:24 +0000 Commit: Enji Cooper CommitDate: 2026-04-12 02:14:40 +0000 MFV: crypto/openssl: update to 3.5.6 This change brings in version 3.5.6 of OpenSSL, which features several security fixes (the highest of which is a MEDIUM severity issue), as well as some miscellaneous feature updates. Please see the release notes [1] for more details. PS Apologies for the confusing merge commits -- I was testing out a new automated update process and failed to catch the commit message issues until after I pushed the change. 1. https://github.com/openssl/openssl/blob/openssl-3.5.6/NEWS.md MFC after: 1 day (the security issues warrant a quick backport). Merge commit 'ab5fc4ac933ff67bc800e774dffce15e2a541e90' (cherry picked from commit 10a428653ee7216475f1ddce3fb4cbf1200319f8) --- crypto/openssl/CHANGES.md | 575 +++++++++------ crypto/openssl/CONTRIBUTING.md | 12 + crypto/openssl/Configurations/10-main.conf | 3 +- crypto/openssl/Configurations/unix-Makefile.tmpl | 3 +- .../openssl/Configurations/windows-makefile.tmpl | 5 +- crypto/openssl/NEWS.md | 427 +++++------ crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/cmp.c | 18 +- crypto/openssl/apps/include/cmp_mock_srv.h | 5 +- crypto/openssl/apps/lib/app_provider.c | 3 +- crypto/openssl/apps/lib/apps.c | 15 +- crypto/openssl/apps/lib/cmp_mock_srv.c | 38 +- crypto/openssl/apps/lib/win32_init.c | 3 +- crypto/openssl/apps/ocsp.c | 2 +- crypto/openssl/apps/s_client.c | 6 +- crypto/openssl/apps/ts.c | 4 +- crypto/openssl/build.info | 16 +- crypto/openssl/crypto/aes/asm/aes-riscv32-zkn.pl | 7 +- crypto/openssl/crypto/aes/asm/aes-riscv64-zkn.pl | 7 +- .../openssl/crypto/aes/asm/aes-riscv64-zvkned.pl | 13 +- crypto/openssl/crypto/aes/asm/aes-riscv64.pl | 10 +- crypto/openssl/crypto/asn1/evp_asn1.c | 4 +- crypto/openssl/crypto/asn1/n_pkey.c | 4 +- crypto/openssl/crypto/asn1/p5_scrypt.c | 11 +- crypto/openssl/crypto/bf/bf_cfb64.c | 4 +- crypto/openssl/crypto/bf/bf_ofb64.c | 4 +- crypto/openssl/crypto/bio/bss_dgram.c | 4 +- crypto/openssl/crypto/bio/bss_file.c | 15 +- crypto/openssl/crypto/bn/asm/armv4-gf2m.pl | 4 +- crypto/openssl/crypto/bn/asm/rsaz-2k-avxifma.pl | 105 ++- crypto/openssl/crypto/bn/asm/rsaz-3k-avxifma.pl | 41 +- crypto/openssl/crypto/bn/asm/rsaz-4k-avxifma.pl | 41 +- crypto/openssl/crypto/bn/asm/sparcv9-mont.pl | 4 +- crypto/openssl/crypto/bn/bn_dh.c | 64 +- crypto/openssl/crypto/bn/bn_exp.c | 34 +- crypto/openssl/crypto/bn/bn_local.h | 4 +- crypto/openssl/crypto/bn/bn_mont.c | 9 +- crypto/openssl/crypto/bn/bn_ppc.c | 10 +- crypto/openssl/crypto/bn/bn_prime.c | 4 +- crypto/openssl/crypto/bn/bn_rsa_fips186_4.c | 4 +- crypto/openssl/crypto/bn/bn_sparc.c | 16 +- crypto/openssl/crypto/bsearch.c | 4 +- crypto/openssl/crypto/cast/c_cfb64.c | 4 +- crypto/openssl/crypto/cast/c_ofb64.c | 4 +- crypto/openssl/crypto/cmp/cmp_client.c | 23 +- crypto/openssl/crypto/cmp/cmp_ctx.c | 4 +- crypto/openssl/crypto/cmp/cmp_local.h | 4 +- crypto/openssl/crypto/cmp/cmp_vfy.c | 25 +- crypto/openssl/crypto/cms/cms_asn1.c | 30 +- crypto/openssl/crypto/cms/cms_dh.c | 15 +- crypto/openssl/crypto/cms/cms_ec.c | 16 +- crypto/openssl/crypto/cms/cms_local.h | 5 +- crypto/openssl/crypto/cms/cms_rsa.c | 33 +- crypto/openssl/crypto/cms/cms_smime.c | 6 +- crypto/openssl/crypto/conf/conf_lib.c | 4 +- crypto/openssl/crypto/conf/conf_mod.c | 4 +- crypto/openssl/crypto/des/cfb64ede.c | 4 +- crypto/openssl/crypto/des/cfb64enc.c | 4 +- crypto/openssl/crypto/des/ofb64ede.c | 4 +- crypto/openssl/crypto/des/ofb64enc.c | 4 +- crypto/openssl/crypto/dh/dh_asn1.c | 7 +- crypto/openssl/crypto/dh/dh_rfc5114.c | 6 +- crypto/openssl/crypto/dllmain.c | 4 +- crypto/openssl/crypto/dsa/dsa_asn1.c | 8 +- crypto/openssl/crypto/ec/ec_asn1.c | 12 +- crypto/openssl/crypto/ec/ec_check.c | 4 +- crypto/openssl/crypto/ec/ec_lib.c | 4 +- crypto/openssl/crypto/err/err_all.c | 6 +- crypto/openssl/crypto/err/openssl.txt | 3 +- crypto/openssl/crypto/ess/ess_asn1.c | 8 +- crypto/openssl/crypto/evp/digest.c | 7 +- crypto/openssl/crypto/evp/e_aes.c | 56 +- crypto/openssl/crypto/evp/e_aria.c | 22 +- crypto/openssl/crypto/evp/e_camellia.c | 22 +- crypto/openssl/crypto/evp/e_des.c | 18 +- crypto/openssl/crypto/evp/e_des3.c | 24 +- crypto/openssl/crypto/evp/e_idea.c | 6 +- crypto/openssl/crypto/evp/e_sm4.c | 14 +- crypto/openssl/crypto/evp/encode.c | 4 +- crypto/openssl/crypto/evp/evp_enc.c | 12 +- crypto/openssl/crypto/evp/kem.c | 4 +- crypto/openssl/crypto/hashtable/hashtable.c | 6 +- crypto/openssl/crypto/http/http_client.c | 26 +- crypto/openssl/crypto/http/http_err.c | 4 +- crypto/openssl/crypto/http/http_lib.c | 8 +- crypto/openssl/crypto/idea/i_cfb64.c | 3 +- crypto/openssl/crypto/idea/i_ofb64.c | 3 +- crypto/openssl/crypto/init.c | 7 +- crypto/openssl/crypto/initthread.c | 14 +- crypto/openssl/crypto/modes/asm/aes-gcm-ppc.pl | 5 - crypto/openssl/crypto/modes/asm/ghash-armv4.pl | 4 +- crypto/openssl/crypto/modes/build.info | 2 +- crypto/openssl/crypto/o_str.c | 15 +- crypto/openssl/crypto/param_build.c | 108 ++- crypto/openssl/crypto/perlasm/x86_64-xlate.pl | 5 +- crypto/openssl/crypto/pkcs12/p12_mutl.c | 4 + crypto/openssl/crypto/pkcs12/p12_utl.c | 4 +- crypto/openssl/crypto/pkcs7/pk7_doit.c | 8 + crypto/openssl/crypto/pkcs7/pk7_lib.c | 9 +- crypto/openssl/crypto/punycode.c | 4 +- crypto/openssl/crypto/rand/rand_egd.c | 25 +- crypto/openssl/crypto/rc2/rc2cfb64.c | 4 +- crypto/openssl/crypto/rc2/rc2ofb64.c | 4 +- crypto/openssl/crypto/rc5/rc5cfb64.c | 4 +- crypto/openssl/crypto/rc5/rc5ofb64.c | 4 +- crypto/openssl/crypto/riscvcap.c | 37 +- crypto/openssl/crypto/rsa/rsa_backend.c | 4 +- crypto/openssl/crypto/sha/asm/keccak1600-s390x.pl | 3 +- crypto/openssl/crypto/slh_dsa/slh_dsa.c | 25 +- crypto/openssl/crypto/sm4/asm/vpsm4_ex-armv8.pl | 13 +- crypto/openssl/crypto/store/store_lib.c | 6 +- crypto/openssl/crypto/threads_none.c | 4 +- crypto/openssl/crypto/threads_pthread.c | 57 +- crypto/openssl/crypto/threads_win.c | 4 +- crypto/openssl/crypto/ts/ts_asn1.c | 14 +- crypto/openssl/crypto/x509/pcy_tree.c | 14 +- crypto/openssl/crypto/x509/t_acert.c | 8 +- crypto/openssl/crypto/x509/v3_ac_tgt.c | 8 +- crypto/openssl/crypto/x509/v3_cpols.c | 4 +- crypto/openssl/crypto/x509/v3_prn.c | 6 +- crypto/openssl/crypto/x509/v3_san.c | 5 +- crypto/openssl/crypto/x509/v3_timespec.c | 4 +- crypto/openssl/crypto/x509/v3_utl.c | 9 +- crypto/openssl/crypto/x509/x509_vfy.c | 7 +- crypto/openssl/crypto/x509/x_pubkey.c | 6 +- crypto/openssl/doc/build.info | 6 + .../doc/internal/man3/OSSL_SAFE_MATH_SIGNED.pod | 4 +- .../internal/man3/ossl_cmp_msg_check_update.pod | 5 +- crypto/openssl/doc/internal/man7/deprecation.pod | 4 +- crypto/openssl/doc/man1/CA.pl.pod | 4 +- crypto/openssl/doc/man1/openssl-ciphers.pod.in | 777 ++++++++++++--------- crypto/openssl/doc/man1/openssl-cmp.pod.in | 10 +- crypto/openssl/doc/man1/openssl-cms.pod.in | 2 +- crypto/openssl/doc/man1/openssl-format-options.pod | 4 +- crypto/openssl/doc/man1/openssl-pkeyutl.pod.in | 4 +- .../doc/man1/openssl-verification-options.pod | 8 +- crypto/openssl/doc/man1/openssl-verify.pod.in | 7 +- crypto/openssl/doc/man3/ADMISSIONS.pod | 4 +- crypto/openssl/doc/man3/BIO_get_data.pod | 11 +- crypto/openssl/doc/man3/BIO_push.pod | 4 +- crypto/openssl/doc/man3/BIO_read.pod | 6 +- crypto/openssl/doc/man3/EVP_EncryptInit.pod | 10 +- crypto/openssl/doc/man3/OPENSSL_malloc.pod | 6 +- crypto/openssl/doc/man3/OSSL_CMP_CTX_new.pod | 11 +- crypto/openssl/doc/man3/OSSL_HPKE_CTX_new.pod | 6 +- crypto/openssl/doc/man3/PKCS5_PBE_keyivgen.pod | 13 +- crypto/openssl/doc/man3/RSA_set_method.pod | 10 +- crypto/openssl/doc/man3/SSL_CONF_cmd.pod | 18 +- crypto/openssl/doc/man3/SSL_CTX_set1_curves.pod | 125 +++- .../doc/man3/SSL_CTX_set_psk_client_callback.pod | 10 +- crypto/openssl/doc/man3/SSL_get_ciphers.pod | 4 +- crypto/openssl/doc/man3/X509V3_EXT_print.pod | 51 ++ crypto/openssl/doc/man3/X509_NAME_print_ex.pod | 7 +- crypto/openssl/doc/man7/EVP_SIGNATURE-DSA.pod | 4 +- crypto/openssl/doc/man7/EVP_SIGNATURE-ECDSA.pod | 4 +- crypto/openssl/doc/man7/EVP_SIGNATURE-ED25519.pod | 4 +- crypto/openssl/doc/man7/EVP_SIGNATURE-HMAC.pod | 4 +- crypto/openssl/doc/man7/EVP_SIGNATURE-ML-DSA.pod | 6 +- crypto/openssl/doc/man7/EVP_SIGNATURE-RSA.pod | 4 +- crypto/openssl/doc/man7/EVP_SIGNATURE-SLH-DSA.pod | 4 +- crypto/openssl/doc/man7/openssl-env.pod | 9 +- .../doc/man7/ossl-guide-tls-introduction.pod | 4 +- crypto/openssl/doc/man7/property.pod | 34 +- crypto/openssl/doc/man7/provider-base.pod | 5 +- .../openssl/exporters/cmake/OpenSSLConfig.cmake.in | 1 + .../exporters/cmake/OpenSSLConfigVersion.cmake.in | 1 + .../openssl/exporters/pkg-config/libcrypto.pc.in | 1 + crypto/openssl/exporters/pkg-config/libssl.pc.in | 1 + crypto/openssl/exporters/pkg-config/openssl.pc.in | 1 + .../perl/Text-Template-1.56/lib/Text/Template.pm | 4 +- .../lib/Text/Template/Preprocess.pm | 4 +- crypto/openssl/include/crypto/aes_platform.h | 4 +- crypto/openssl/include/crypto/evp.h | 24 +- crypto/openssl/include/crypto/httperr.h | 2 +- crypto/openssl/include/crypto/sparc_arch.h | 14 +- crypto/openssl/include/crypto/sparse_array.h | 4 +- crypto/openssl/include/internal/time.h | 72 +- crypto/openssl/include/openssl/cmp.h.in | 4 +- crypto/openssl/include/openssl/core_dispatch.h | 34 +- crypto/openssl/include/openssl/httperr.h | 3 +- crypto/openssl/include/openssl/macros.h | 3 +- crypto/openssl/include/openssl/rsa.h | 6 +- crypto/openssl/include/openssl/types.h | 4 +- crypto/openssl/providers/fips-sources.checksums | 96 +-- crypto/openssl/providers/fips.checksum | 2 +- crypto/openssl/providers/fips/self_test.c | 4 +- crypto/openssl/providers/fips/self_test_kats.c | 11 +- .../ciphers/cipher_aes_gcm_hw_ppc.inc | 8 +- .../implementations/ciphers/cipher_aes_ocb.c | 4 +- .../implementations/ciphers/ciphercommon.c | 6 +- .../include/prov/ciphercommon_ccm.h | 16 +- .../include/prov/ciphercommon_gcm.h | 14 +- .../providers/implementations/kdfs/pkcs12kdf.c | 11 +- .../providers/implementations/kem/rsa_kem.c | 22 +- .../implementations/keymgmt/ml_kem_kmgmt.c | 4 +- .../providers/implementations/rands/drbg_hmac.c | 4 +- .../providers/implementations/signature/dsa_sig.c | 36 +- .../implementations/signature/ecdsa_sig.c | 47 +- .../providers/implementations/signature/sm2_sig.c | 10 +- .../implementations/storemgmt/file_store.c | 11 +- .../implementations/storemgmt/winstore_store.c | 6 +- crypto/openssl/ssl/quic/quic_impl.c | 47 +- crypto/openssl/ssl/quic/quic_lcidm.c | 14 +- crypto/openssl/ssl/quic/quic_reactor.c | 6 + crypto/openssl/ssl/quic/quic_rx_depack.c | 3 +- crypto/openssl/ssl/quic/quic_srtm.c | 7 +- crypto/openssl/ssl/quic/quic_stream_map.c | 3 +- crypto/openssl/ssl/quic/uint_set.c | 4 +- crypto/openssl/ssl/record/methods/tls_common.c | 17 +- crypto/openssl/ssl/s3_lib.c | 6 +- crypto/openssl/ssl/ssl_asn1.c | 4 +- crypto/openssl/ssl/ssl_lib.c | 22 +- crypto/openssl/ssl/ssl_sess.c | 4 +- crypto/openssl/ssl/statem/statem_dtls.c | 8 +- crypto/openssl/ssl/t1_lib.c | 96 +-- crypto/openssl/test/README-external.md | 2 +- crypto/openssl/test/asn1_decode_test.c | 14 +- crypto/openssl/test/asn1_encode_test.c | 14 +- crypto/openssl/test/asn1_internal_test.c | 20 +- crypto/openssl/test/bntest.c | 49 +- crypto/openssl/test/certs/cve-2026-28388-ca.pem | 19 + crypto/openssl/test/certs/cve-2026-28388-crls.pem | 22 + crypto/openssl/test/certs/cve-2026-28388-leaf.pem | 19 + .../ext-timeSpecification-periodic-no-second.pem | 14 + crypto/openssl/test/certs/mkcert.sh | 4 +- crypto/openssl/test/cmp_client_test.c | 75 +- crypto/openssl/test/evp_extra_test.c | 110 ++- crypto/openssl/test/evp_test.c | 4 +- crypto/openssl/test/fake_rsaprov.c | 5 +- crypto/openssl/test/http_test.c | 22 +- crypto/openssl/test/ossl_store_test.c | 9 +- crypto/openssl/test/pkcs12_api_test.c | 32 +- crypto/openssl/test/quicapitest.c | 10 +- .../openssl/test/recipes/10-test_bn_data/bnmod.txt | 10 +- crypto/openssl/test/recipes/25-test_verify.t | 16 +- crypto/openssl/test/recipes/25-test_x509.t | 10 +- .../openssl/test/recipes/61-test_bio_readbuffer.t | 8 +- .../80-test_cmp_http_data/test_commands.csv | 3 +- crypto/openssl/test/recipes/80-test_cms.t | 47 +- .../test/recipes/80-test_cms_data/dh-cert.pem | 31 + .../test/recipes/80-test_cms_data/dh-key.pem | 15 + .../test/recipes/80-test_cms_data/dh-malformed.der | Bin 0 -> 558 bytes .../test/recipes/80-test_cms_data/ecdh-cert.pem | 10 + .../test/recipes/80-test_cms_data/ecdh-key.pem | 5 + .../recipes/80-test_cms_data/ecdh-malformed.der | Bin 0 -> 275 bytes .../recipes/80-test_cms_data/rsa-malformed.der | Bin 0 -> 526 bytes crypto/openssl/test/recipes/80-test_ocsp.t | 16 +- crypto/openssl/test/sslapitest.c | 98 ++- crypto/openssl/test/tls-provider.c | 5 +- crypto/openssl/test/tls13groupselection_test.c | 39 +- crypto/openssl/util/checkplatformsyms.pl | 40 +- crypto/openssl/util/missingcrypto.txt | 2 - crypto/openssl/util/mkerr.pl | 77 +- crypto/openssl/util/mkinstallvars.pl | 5 +- .../util/platform_symbols/windows-symbols.txt | 339 ++++----- crypto/openssl/util/wrap.pl.in | 1 + 256 files changed, 3690 insertions(+), 2012 deletions(-) diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md index 1a65b72b2965..380840deb712 100644 --- a/crypto/openssl/CHANGES.md +++ b/crypto/openssl/CHANGES.md @@ -28,6 +28,150 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Changes between 3.5.5 and 3.5.6 [7 Apr 2026] + + * Fixed incorrect failure handling in RSA KEM RSASVE encapsulation. + + Severity: Moderate + + Issue summary: Applications using RSASVE key encapsulation to establish + a secret encryption key can send contents of an uninitialized memory buffer + to a malicious peer. + + Impact summary: The uninitialized buffer might contain sensitive data + from the previous execution of the application process which leads + to sensitive data leakage to an attacker. + + Reported by: Simo Sorce (Red Hat). + + ([CVE-2026-31790]) + + *Nikola Pajkovsky* + + * Fixed loss of key agreement group tuple structure when the `DEFAULT` keyword + is used in the server-side configuration of the key-agreement group list. + + Severity: Low + + Issue summary: An OpenSSL TLS 1.3 server may fail to negotiate the expected + preferred key exchange group when its key exchange group configuration + includes the default by using the 'DEFAULT' keyword. + + Impact summary: A less preferred key exchange may be used even when a more + preferred group is supported by both client and server, if the group + was not included among the client's initial predicated keyshares. + This will sometimes be the case with the new hybrid post-quantum groups, + if the client chooses to defer their use until specifically requested by + the server. + + + ([CVE-2026-2673]) + + *Viktor Dukhovni* + + * Fixed potential use-after-free in DANE client code. + + Severity: Low + + Issue summary: An uncommon configuration of clients performing DANE + TLSA-based server authentication, when paired with uncommon server DANE TLSA + records, may result in a use-after-free and/or double-free on the client + side. + + Impact summary: A use after free can have a range of potential consequences + such as the corruption of valid data, crashes, or execution of arbitrary + code. + + Reported by: Igor Morgenstern (Aisle Research). + + ([CVE-2026-28387]) + + *Viktor Dukhovni* + + * Fixed NULL pointer dereference when processing a delta CRL. + + Severity: Low + + Issue summary: When a delta CRL that contains a Delta CRL Indicator extension + is processed, a NULL pointer dereference might happen if the required CRL + Number extension is missing. + + Impact summary: A NULL pointer dereference can trigger a crash which + leads to a Denial of Service for an application. + + Reported by: Igor Morgenstern (Aisle Research). + + ([CVE-2026-28388]) + + *Igor Morgenstern* + + * Fixed possible NULL dereference when processing CMS KeyAgreeRecipientInfo. + + Severity: Low + + Issue summary: During processing of a crafted CMS EnvelopedData message + with KeyAgreeRecipientInfo a NULL pointer dereference can happen. + + Impact summary: Applications that process attacker-controlled CMS data may + crash before authentication or cryptographic operations occur resulting in + Denial of Service. + + Reported by: Nathan Sportsman (Praetorian), Daniel Rhea, + Jaeho Nam (Seoul National University), Muhammad Daffa, + Zhanpeng Liu (Tencent Xuanwu Lab), Guannan Wang (Tencent Xuanwu Lab), + Guancheng Li (Tencent Xuanwu Lab), and Joshua Rogers. + + ([CVE-2026-28389]) + + *Neil Horman* + + * Fixed possible NULL dereference when processing CMS + KeyTransportRecipientInfo. + + Severity: Low + + Issue summary: During processing of a crafted CMS EnvelopedData message + with KeyTransportRecipientInfo a NULL pointer dereference can happen. + + Impact summary: Applications that process attacker-controlled CMS data may + crash before authentication or cryptographic operations occur resulting in + Denial of Service. + + Reported by: Muhammad Daffa, Zhanpeng Liu (Tencent Xuanwu Lab), + Guannan Wang (Tencent Xuanwu Lab), Guancheng Li (Tencent Xuanwu Lab), + Joshua Rogers, and Chanho Kim. + + ([CVE-2026-28390]) + + *Neil Horman* + + * Fixed heap buffer overflow in hexadecimal conversion. + + Severity: Low + + Issue summary: Converting an excessively large OCTET STRING value to + a hexadecimal string leads to a heap buffer overflow on 32 bit platforms. + + Impact summary: A heap buffer overflow may lead to a crash or possibly + an attacker controlled code execution or other undefined behavior. + + Reported by: Quoc Tran (Xint.io - US Team). + + ([CVE-2026-31789]) + + *Igor Ustinov* + + * Fixed usage of `openssl s_client -connect HOST -proxy PROXY` with `HOST` + containing a raw IPv6 address. + + + *Peter Zhang* + + * Fixed broken detection of plantext HTTP over TLS. + + + *Matt Caswell* + ### Changes between 3.5.4 and 3.5.5 [27 Jan 2026] * Fixed Improper validation of PBMAC1 parameters in PKCS#12 MAC verification. @@ -3461,7 +3605,7 @@ breaking changes, and mappings for the large list of deprecated functions. *Richard Levitte* - * Fixed an overflow bug in the x64_64 Montgomery squaring procedure + * Fixed an overflow bug in the x86_64 Montgomery squaring procedure used in exponentiation with 512-bit moduli. No EC algorithms are affected. Analysis suggests that attacks against 2-prime RSA1024, 3-prime RSA1536, and DSA1024 as a result of this defect would be very @@ -21607,216 +21751,223 @@ ndif -[CVE-2026-22796]: https://www.openssl.org/news/vulnerabilities.html#CVE-2026-22796 -[CVE-2026-22795]: https://www.openssl.org/news/vulnerabilities.html#CVE-2026-22795 -[CVE-2025-69421]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69421 -[CVE-2025-69420]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69420 -[CVE-2025-69419]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69419 -[CVE-2025-69418]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69418 -[CVE-2025-68160]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-68160 -[CVE-2025-66199]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-66199 -[CVE-2025-15469]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15469 -[CVE-2025-15468]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15468 -[CVE-2025-15467]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15467 -[CVE-2025-11187]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-11187 -[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 -[CVE-2024-6119]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-6119 -[CVE-2024-5535]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-5535 -[CVE-2024-4741]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4741 -[CVE-2024-4603]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4603 -[CVE-2024-2511]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-2511 -[CVE-2024-0727]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-0727 -[CVE-2023-6237]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6237 -[CVE-2023-6129]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6129 -[CVE-2023-5678]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5678 -[CVE-2023-5363]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5363 -[CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807 -[CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817 -[CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446 -[CVE-2023-2975]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2975 -[RFC 2578 (STD 58), section 3.5]: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5 -[CVE-2023-2650]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2650 -[CVE-2023-1255]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255 -[CVE-2023-0466]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0466 -[CVE-2023-0465]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0465 -[CVE-2023-0464]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0464 -[CVE-2023-0401]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0401 -[CVE-2023-0286]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0286 -[CVE-2023-0217]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0217 -[CVE-2023-0216]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0216 -[CVE-2023-0215]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0215 -[CVE-2022-4450]: https://www.openssl.org/news/vulnerabilities.html#CVE-2022-4450 -[CVE-2022-4304]: https://www.openssl.org/news/vulnerabilities.html#CVE-2022-4304 -[CVE-2022-4203]: https://www.openssl.org/news/vulnerabilities.html#CVE-2022-4203 -[CVE-2022-3996]: https://www.openssl.org/news/vulnerabilities.html#CVE-2022-3996 -[CVE-2022-2274]: https://www.openssl.org/news/vulnerabilities.html#CVE-2022-2274 -[CVE-2022-2097]: https://www.openssl.org/news/vulnerabilities.html#CVE-2022-2097 -[CVE-2020-1971]: https://www.openssl.org/news/vulnerabilities.html#CVE-2020-1971 -[CVE-2020-1967]: https://www.openssl.org/news/vulnerabilities.html#CVE-2020-1967 -[CVE-2019-1563]: https://www.openssl.org/news/vulnerabilities.html#CVE-2019-1563 -[CVE-2019-1559]: https://www.openssl.org/news/vulnerabilities.html#CVE-2019-1559 -[CVE-2019-1552]: https://www.openssl.org/news/vulnerabilities.html#CVE-2019-1552 -[CVE-2019-1551]: https://www.openssl.org/news/vulnerabilities.html#CVE-2019-1551 -[CVE-2019-1549]: https://www.openssl.org/news/vulnerabilities.html#CVE-2019-1549 -[CVE-2019-1547]: https://www.openssl.org/news/vulnerabilities.html#CVE-2019-1547 -[CVE-2019-1543]: https://www.openssl.org/news/vulnerabilities.html#CVE-2019-1543 -[CVE-2018-5407]: https://www.openssl.org/news/vulnerabilities.html#CVE-2018-5407 -[CVE-2018-0739]: https://www.openssl.org/news/vulnerabilities.html#CVE-2018-0739 -[CVE-2018-0737]: https://www.openssl.org/news/vulnerabilities.html#CVE-2018-0737 -[CVE-2018-0735]: https://www.openssl.org/news/vulnerabilities.html#CVE-2018-0735 -[CVE-2018-0734]: https://www.openssl.org/news/vulnerabilities.html#CVE-2018-0734 -[CVE-2018-0733]: https://www.openssl.org/news/vulnerabilities.html#CVE-2018-0733 -[CVE-2018-0732]: https://www.openssl.org/news/vulnerabilities.html#CVE-2018-0732 -[CVE-2017-3738]: https://www.openssl.org/news/vulnerabilities.html#CVE-2017-3738 -[CVE-2017-3737]: https://www.openssl.org/news/vulnerabilities.html#CVE-2017-3737 -[CVE-2017-3736]: https://www.openssl.org/news/vulnerabilities.html#CVE-2017-3736 -[CVE-2017-3735]: https://www.openssl.org/news/vulnerabilities.html#CVE-2017-3735 -[CVE-2017-3733]: https://www.openssl.org/news/vulnerabilities.html#CVE-2017-3733 -[CVE-2017-3732]: https://www.openssl.org/news/vulnerabilities.html#CVE-2017-3732 -[CVE-2017-3731]: https://www.openssl.org/news/vulnerabilities.html#CVE-2017-3731 -[CVE-2017-3730]: https://www.openssl.org/news/vulnerabilities.html#CVE-2017-3730 -[CVE-2016-7055]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-7055 -[CVE-2016-7054]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-7054 -[CVE-2016-7053]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-7053 -[CVE-2016-7052]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-7052 -[CVE-2016-6309]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-6309 -[CVE-2016-6308]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-6308 -[CVE-2016-6307]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-6307 -[CVE-2016-6306]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-6306 -[CVE-2016-6305]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-6305 -[CVE-2016-6304]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-6304 -[CVE-2016-6303]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-6303 -[CVE-2016-6302]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-6302 -[CVE-2016-2183]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2183 -[CVE-2016-2182]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2182 -[CVE-2016-2181]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2181 -[CVE-2016-2180]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2180 -[CVE-2016-2179]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2179 -[CVE-2016-2178]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2178 -[CVE-2016-2177]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2177 -[CVE-2016-2176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2176 -[CVE-2016-2109]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2109 -[CVE-2016-2107]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2107 -[CVE-2016-2106]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2106 -[CVE-2016-2105]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-2105 -[CVE-2016-0800]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-0800 -[CVE-2016-0799]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-0799 -[CVE-2016-0798]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-0798 -[CVE-2016-0797]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-0797 -[CVE-2016-0705]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-0705 -[CVE-2016-0702]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-0702 -[CVE-2016-0701]: https://www.openssl.org/news/vulnerabilities.html#CVE-2016-0701 -[CVE-2015-3197]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-3197 -[CVE-2015-3196]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-3196 -[CVE-2015-3195]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-3195 -[CVE-2015-3194]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-3194 -[CVE-2015-3193]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-3193 -[CVE-2015-1793]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-1793 -[CVE-2015-1792]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-1792 -[CVE-2015-1791]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-1791 -[CVE-2015-1790]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-1790 -[CVE-2015-1789]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-1789 -[CVE-2015-1788]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-1788 -[CVE-2015-1787]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-1787 -[CVE-2015-0293]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0293 -[CVE-2015-0291]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0291 -[CVE-2015-0290]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0290 -[CVE-2015-0289]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0289 -[CVE-2015-0288]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0288 -[CVE-2015-0287]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0287 -[CVE-2015-0286]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0286 -[CVE-2015-0285]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0285 -[CVE-2015-0209]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0209 -[CVE-2015-0208]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0208 -[CVE-2015-0207]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0207 -[CVE-2015-0206]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0206 -[CVE-2015-0205]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0205 -[CVE-2015-0204]: https://www.openssl.org/news/vulnerabilities.html#CVE-2015-0204 -[CVE-2014-8275]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-8275 -[CVE-2014-5139]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-5139 -[CVE-2014-3572]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3572 -[CVE-2014-3571]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3571 -[CVE-2014-3570]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3570 -[CVE-2014-3569]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3569 -[CVE-2014-3568]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3568 -[CVE-2014-3567]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3567 -[CVE-2014-3566]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3566 -[CVE-2014-3513]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3513 -[CVE-2014-3512]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3512 -[CVE-2014-3511]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3511 -[CVE-2014-3510]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3510 -[CVE-2014-3509]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3509 -[CVE-2014-3508]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3508 -[CVE-2014-3507]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3507 -[CVE-2014-3506]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3506 -[CVE-2014-3505]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3505 -[CVE-2014-3470]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-3470 -[CVE-2014-0224]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-0224 -[CVE-2014-0221]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-0221 -[CVE-2014-0195]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-0195 -[CVE-2014-0160]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-0160 -[CVE-2014-0076]: https://www.openssl.org/news/vulnerabilities.html#CVE-2014-0076 -[CVE-2013-6450]: https://www.openssl.org/news/vulnerabilities.html#CVE-2013-6450 -[CVE-2013-4353]: https://www.openssl.org/news/vulnerabilities.html#CVE-2013-4353 -[CVE-2013-0169]: https://www.openssl.org/news/vulnerabilities.html#CVE-2013-0169 -[CVE-2013-0166]: https://www.openssl.org/news/vulnerabilities.html#CVE-2013-0166 -[CVE-2012-2686]: https://www.openssl.org/news/vulnerabilities.html#CVE-2012-2686 -[CVE-2012-2333]: https://www.openssl.org/news/vulnerabilities.html#CVE-2012-2333 -[CVE-2012-2110]: https://www.openssl.org/news/vulnerabilities.html#CVE-2012-2110 -[CVE-2012-0884]: https://www.openssl.org/news/vulnerabilities.html#CVE-2012-0884 -[CVE-2012-0050]: https://www.openssl.org/news/vulnerabilities.html#CVE-2012-0050 -[CVE-2012-0027]: https://www.openssl.org/news/vulnerabilities.html#CVE-2012-0027 -[CVE-2011-4619]: https://www.openssl.org/news/vulnerabilities.html#CVE-2011-4619 -[CVE-2011-4577]: https://www.openssl.org/news/vulnerabilities.html#CVE-2011-4577 -[CVE-2011-4576]: https://www.openssl.org/news/vulnerabilities.html#CVE-2011-4576 -[CVE-2011-4109]: https://www.openssl.org/news/vulnerabilities.html#CVE-2011-4109 -[CVE-2011-4108]: https://www.openssl.org/news/vulnerabilities.html#CVE-2011-4108 -[CVE-2011-3210]: https://www.openssl.org/news/vulnerabilities.html#CVE-2011-3210 -[CVE-2011-3207]: https://www.openssl.org/news/vulnerabilities.html#CVE-2011-3207 -[CVE-2011-0014]: https://www.openssl.org/news/vulnerabilities.html#CVE-2011-0014 -[CVE-2010-4252]: https://www.openssl.org/news/vulnerabilities.html#CVE-2010-4252 -[CVE-2010-4180]: https://www.openssl.org/news/vulnerabilities.html#CVE-2010-4180 -[CVE-2010-3864]: https://www.openssl.org/news/vulnerabilities.html#CVE-2010-3864 -[CVE-2010-1633]: https://www.openssl.org/news/vulnerabilities.html#CVE-2010-1633 -[CVE-2010-0740]: https://www.openssl.org/news/vulnerabilities.html#CVE-2010-0740 -[CVE-2010-0433]: https://www.openssl.org/news/vulnerabilities.html#CVE-2010-0433 -[CVE-2009-4355]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-4355 -[CVE-2009-3555]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-3555 -[CVE-2009-3245]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-3245 -[CVE-2009-1386]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-1386 -[CVE-2009-1379]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-1379 -[CVE-2009-1378]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-1378 -[CVE-2009-1377]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-1377 -[CVE-2009-0789]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-0789 -[CVE-2009-0591]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-0591 -[CVE-2009-0590]: https://www.openssl.org/news/vulnerabilities.html#CVE-2009-0590 -[CVE-2008-5077]: https://www.openssl.org/news/vulnerabilities.html#CVE-2008-5077 -[CVE-2008-1678]: https://www.openssl.org/news/vulnerabilities.html#CVE-2008-1678 -[CVE-2008-1672]: https://www.openssl.org/news/vulnerabilities.html#CVE-2008-1672 -[CVE-2008-0891]: https://www.openssl.org/news/vulnerabilities.html#CVE-2008-0891 -[CVE-2007-5135]: https://www.openssl.org/news/vulnerabilities.html#CVE-2007-5135 -[CVE-2007-4995]: https://www.openssl.org/news/vulnerabilities.html#CVE-2007-4995 -[CVE-2006-4343]: https://www.openssl.org/news/vulnerabilities.html#CVE-2006-4343 -[CVE-2006-4339]: https://www.openssl.org/news/vulnerabilities.html#CVE-2006-4339 -[CVE-2006-3738]: https://www.openssl.org/news/vulnerabilities.html#CVE-2006-3738 -[CVE-2006-2940]: https://www.openssl.org/news/vulnerabilities.html#CVE-2006-2940 -[CVE-2006-2937]: https://www.openssl.org/news/vulnerabilities.html#CVE-2006-2937 -[CVE-2005-2969]: https://www.openssl.org/news/vulnerabilities.html#CVE-2005-2969 -[CVE-2004-0112]: https://www.openssl.org/news/vulnerabilities.html#CVE-2004-0112 -[CVE-2004-0079]: https://www.openssl.org/news/vulnerabilities.html#CVE-2004-0079 -[CVE-2003-0851]: https://www.openssl.org/news/vulnerabilities.html#CVE-2003-0851 -[CVE-2003-0545]: https://www.openssl.org/news/vulnerabilities.html#CVE-2003-0545 -[CVE-2003-0544]: https://www.openssl.org/news/vulnerabilities.html#CVE-2003-0544 -[CVE-2003-0543]: https://www.openssl.org/news/vulnerabilities.html#CVE-2003-0543 -[CVE-2003-0078]: https://www.openssl.org/news/vulnerabilities.html#CVE-2003-0078 -[CVE-2002-0659]: https://www.openssl.org/news/vulnerabilities.html#CVE-2002-0659 -[CVE-2002-0657]: https://www.openssl.org/news/vulnerabilities.html#CVE-2002-0657 -[CVE-2002-0656]: https://www.openssl.org/news/vulnerabilities.html#CVE-2002-0656 -[CVE-2002-0655]: https://www.openssl.org/news/vulnerabilities.html#CVE-2002-0655 [CMVP]: https://csrc.nist.gov/projects/cryptographic-module-validation-program +[CVE-2002-0655]: https://openssl-library.org/news/vulnerabilities/#CVE-2002-0655 +[CVE-2002-0656]: https://openssl-library.org/news/vulnerabilities/#CVE-2002-0656 +[CVE-2002-0657]: https://openssl-library.org/news/vulnerabilities/#CVE-2002-0657 +[CVE-2002-0659]: https://openssl-library.org/news/vulnerabilities/#CVE-2002-0659 +[CVE-2003-0078]: https://openssl-library.org/news/vulnerabilities/#CVE-2003-0078 +[CVE-2003-0543]: https://openssl-library.org/news/vulnerabilities/#CVE-2003-0543 +[CVE-2003-0544]: https://openssl-library.org/news/vulnerabilities/#CVE-2003-0544 +[CVE-2003-0545]: https://openssl-library.org/news/vulnerabilities/#CVE-2003-0545 +[CVE-2003-0851]: https://openssl-library.org/news/vulnerabilities/#CVE-2003-0851 +[CVE-2004-0079]: https://openssl-library.org/news/vulnerabilities/#CVE-2004-0079 +[CVE-2004-0112]: https://openssl-library.org/news/vulnerabilities/#CVE-2004-0112 +[CVE-2005-2969]: https://openssl-library.org/news/vulnerabilities/#CVE-2005-2969 +[CVE-2006-2937]: https://openssl-library.org/news/vulnerabilities/#CVE-2006-2937 +[CVE-2006-2940]: https://openssl-library.org/news/vulnerabilities/#CVE-2006-2940 +[CVE-2006-3738]: https://openssl-library.org/news/vulnerabilities/#CVE-2006-3738 +[CVE-2006-4339]: https://openssl-library.org/news/vulnerabilities/#CVE-2006-4339 +[CVE-2006-4343]: https://openssl-library.org/news/vulnerabilities/#CVE-2006-4343 +[CVE-2007-4995]: https://openssl-library.org/news/vulnerabilities/#CVE-2007-4995 +[CVE-2007-5135]: https://openssl-library.org/news/vulnerabilities/#CVE-2007-5135 +[CVE-2008-0891]: https://openssl-library.org/news/vulnerabilities/#CVE-2008-0891 +[CVE-2008-1672]: https://openssl-library.org/news/vulnerabilities/#CVE-2008-1672 +[CVE-2008-1678]: https://openssl-library.org/news/vulnerabilities/#CVE-2008-1678 +[CVE-2008-5077]: https://openssl-library.org/news/vulnerabilities/#CVE-2008-5077 +[CVE-2009-0590]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-0590 +[CVE-2009-0591]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-0591 +[CVE-2009-0789]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-0789 +[CVE-2009-1377]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-1377 +[CVE-2009-1378]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-1378 +[CVE-2009-1379]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-1379 +[CVE-2009-1386]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-1386 +[CVE-2009-3245]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-3245 +[CVE-2009-3555]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-3555 +[CVE-2009-4355]: https://openssl-library.org/news/vulnerabilities/#CVE-2009-4355 +[CVE-2010-0433]: https://openssl-library.org/news/vulnerabilities/#CVE-2010-0433 +[CVE-2010-0740]: https://openssl-library.org/news/vulnerabilities/#CVE-2010-0740 +[CVE-2010-1633]: https://openssl-library.org/news/vulnerabilities/#CVE-2010-1633 +[CVE-2010-3864]: https://openssl-library.org/news/vulnerabilities/#CVE-2010-3864 +[CVE-2010-4180]: https://openssl-library.org/news/vulnerabilities/#CVE-2010-4180 +[CVE-2010-4252]: https://openssl-library.org/news/vulnerabilities/#CVE-2010-4252 +[CVE-2011-0014]: https://openssl-library.org/news/vulnerabilities/#CVE-2011-0014 +[CVE-2011-3207]: https://openssl-library.org/news/vulnerabilities/#CVE-2011-3207 +[CVE-2011-3210]: https://openssl-library.org/news/vulnerabilities/#CVE-2011-3210 +[CVE-2011-4108]: https://openssl-library.org/news/vulnerabilities/#CVE-2011-4108 +[CVE-2011-4109]: https://openssl-library.org/news/vulnerabilities/#CVE-2011-4109 +[CVE-2011-4576]: https://openssl-library.org/news/vulnerabilities/#CVE-2011-4576 +[CVE-2011-4577]: https://openssl-library.org/news/vulnerabilities/#CVE-2011-4577 +[CVE-2011-4619]: https://openssl-library.org/news/vulnerabilities/#CVE-2011-4619 +[CVE-2012-0027]: https://openssl-library.org/news/vulnerabilities/#CVE-2012-0027 +[CVE-2012-0050]: https://openssl-library.org/news/vulnerabilities/#CVE-2012-0050 +[CVE-2012-0884]: https://openssl-library.org/news/vulnerabilities/#CVE-2012-0884 +[CVE-2012-2110]: https://openssl-library.org/news/vulnerabilities/#CVE-2012-2110 +[CVE-2012-2333]: https://openssl-library.org/news/vulnerabilities/#CVE-2012-2333 +[CVE-2012-2686]: https://openssl-library.org/news/vulnerabilities/#CVE-2012-2686 +[CVE-2013-0166]: https://openssl-library.org/news/vulnerabilities/#CVE-2013-0166 +[CVE-2013-0169]: https://openssl-library.org/news/vulnerabilities/#CVE-2013-0169 +[CVE-2013-4353]: https://openssl-library.org/news/vulnerabilities/#CVE-2013-4353 +[CVE-2013-6450]: https://openssl-library.org/news/vulnerabilities/#CVE-2013-6450 +[CVE-2014-0076]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-0076 +[CVE-2014-0160]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-0160 +[CVE-2014-0195]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-0195 +[CVE-2014-0221]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-0221 +[CVE-2014-0224]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-0224 +[CVE-2014-3470]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3470 +[CVE-2014-3505]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3505 +[CVE-2014-3506]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3506 +[CVE-2014-3507]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3507 +[CVE-2014-3508]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3508 +[CVE-2014-3509]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3509 +[CVE-2014-3510]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3510 +[CVE-2014-3511]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3511 +[CVE-2014-3512]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3512 +[CVE-2014-3513]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3513 +[CVE-2014-3566]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3566 +[CVE-2014-3567]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3567 +[CVE-2014-3568]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3568 +[CVE-2014-3569]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3569 +[CVE-2014-3570]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3570 +[CVE-2014-3571]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3571 +[CVE-2014-3572]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-3572 +[CVE-2014-5139]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-5139 +[CVE-2014-8275]: https://openssl-library.org/news/vulnerabilities/#CVE-2014-8275 +[CVE-2015-0204]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0204 +[CVE-2015-0205]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0205 +[CVE-2015-0206]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0206 +[CVE-2015-0207]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0207 +[CVE-2015-0208]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0208 +[CVE-2015-0209]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0209 +[CVE-2015-0285]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0285 +[CVE-2015-0286]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0286 +[CVE-2015-0287]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0287 +[CVE-2015-0288]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0288 +[CVE-2015-0289]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0289 +[CVE-2015-0290]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0290 +[CVE-2015-0291]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0291 +[CVE-2015-0293]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-0293 +[CVE-2015-1787]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-1787 +[CVE-2015-1788]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-1788 +[CVE-2015-1789]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-1789 +[CVE-2015-1790]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-1790 +[CVE-2015-1791]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-1791 +[CVE-2015-1792]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-1792 +[CVE-2015-1793]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-1793 +[CVE-2015-3193]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-3193 +[CVE-2015-3194]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-3194 +[CVE-2015-3195]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-3195 +[CVE-2015-3196]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-3196 +[CVE-2015-3197]: https://openssl-library.org/news/vulnerabilities/#CVE-2015-3197 +[CVE-2016-0701]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-0701 +[CVE-2016-0702]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-0702 +[CVE-2016-0705]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-0705 +[CVE-2016-0797]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-0797 +[CVE-2016-0798]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-0798 +[CVE-2016-0799]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-0799 +[CVE-2016-0800]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-0800 +[CVE-2016-2105]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2105 +[CVE-2016-2106]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2106 +[CVE-2016-2107]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2107 +[CVE-2016-2109]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2109 +[CVE-2016-2176]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2176 +[CVE-2016-2177]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2177 +[CVE-2016-2178]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2178 +[CVE-2016-2179]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2179 +[CVE-2016-2180]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2180 +[CVE-2016-2181]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2181 +[CVE-2016-2182]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2182 +[CVE-2016-2183]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-2183 +[CVE-2016-6302]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-6302 +[CVE-2016-6303]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-6303 +[CVE-2016-6304]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-6304 +[CVE-2016-6305]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-6305 +[CVE-2016-6306]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-6306 +[CVE-2016-6307]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-6307 +[CVE-2016-6308]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-6308 +[CVE-2016-6309]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-6309 +[CVE-2016-7052]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-7052 +[CVE-2016-7053]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-7053 +[CVE-2016-7054]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-7054 +[CVE-2016-7055]: https://openssl-library.org/news/vulnerabilities/#CVE-2016-7055 +[CVE-2017-3730]: https://openssl-library.org/news/vulnerabilities/#CVE-2017-3730 +[CVE-2017-3731]: https://openssl-library.org/news/vulnerabilities/#CVE-2017-3731 +[CVE-2017-3732]: https://openssl-library.org/news/vulnerabilities/#CVE-2017-3732 +[CVE-2017-3733]: https://openssl-library.org/news/vulnerabilities/#CVE-2017-3733 +[CVE-2017-3735]: https://openssl-library.org/news/vulnerabilities/#CVE-2017-3735 +[CVE-2017-3736]: https://openssl-library.org/news/vulnerabilities/#CVE-2017-3736 +[CVE-2017-3737]: https://openssl-library.org/news/vulnerabilities/#CVE-2017-3737 +[CVE-2017-3738]: https://openssl-library.org/news/vulnerabilities/#CVE-2017-3738 +[CVE-2018-0732]: https://openssl-library.org/news/vulnerabilities/#CVE-2018-0732 +[CVE-2018-0733]: https://openssl-library.org/news/vulnerabilities/#CVE-2018-0733 +[CVE-2018-0734]: https://openssl-library.org/news/vulnerabilities/#CVE-2018-0734 +[CVE-2018-0735]: https://openssl-library.org/news/vulnerabilities/#CVE-2018-0735 +[CVE-2018-0737]: https://openssl-library.org/news/vulnerabilities/#CVE-2018-0737 +[CVE-2018-0739]: https://openssl-library.org/news/vulnerabilities/#CVE-2018-0739 +[CVE-2018-5407]: https://openssl-library.org/news/vulnerabilities/#CVE-2018-5407 +[CVE-2019-1543]: https://openssl-library.org/news/vulnerabilities/#CVE-2019-1543 +[CVE-2019-1547]: https://openssl-library.org/news/vulnerabilities/#CVE-2019-1547 +[CVE-2019-1549]: https://openssl-library.org/news/vulnerabilities/#CVE-2019-1549 +[CVE-2019-1551]: https://openssl-library.org/news/vulnerabilities/#CVE-2019-1551 +[CVE-2019-1552]: https://openssl-library.org/news/vulnerabilities/#CVE-2019-1552 +[CVE-2019-1559]: https://openssl-library.org/news/vulnerabilities/#CVE-2019-1559 +[CVE-2019-1563]: https://openssl-library.org/news/vulnerabilities/#CVE-2019-1563 +[CVE-2020-1967]: https://openssl-library.org/news/vulnerabilities/#CVE-2020-1967 +[CVE-2020-1971]: https://openssl-library.org/news/vulnerabilities/#CVE-2020-1971 +[CVE-2022-2097]: https://openssl-library.org/news/vulnerabilities/#CVE-2022-2097 +[CVE-2022-2274]: https://openssl-library.org/news/vulnerabilities/#CVE-2022-2274 +[CVE-2022-3996]: https://openssl-library.org/news/vulnerabilities/#CVE-2022-3996 +[CVE-2022-4203]: https://openssl-library.org/news/vulnerabilities/#CVE-2022-4203 +[CVE-2022-4304]: https://openssl-library.org/news/vulnerabilities/#CVE-2022-4304 +[CVE-2022-4450]: https://openssl-library.org/news/vulnerabilities/#CVE-2022-4450 +[CVE-2023-0215]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-0215 +[CVE-2023-0216]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-0216 +[CVE-2023-0217]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-0217 +[CVE-2023-0286]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-0286 +[CVE-2023-0401]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-0401 +[CVE-2023-0464]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-0464 +[CVE-2023-0465]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-0465 +[CVE-2023-0466]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-0466 +[CVE-2023-1255]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-1255 +[CVE-2023-2650]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-2650 +[CVE-2023-2975]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-2975 +[CVE-2023-3446]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-3446 +[CVE-2023-3817]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-3817 +[CVE-2023-4807]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-4807 +[CVE-2023-5363]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-5363 +[CVE-2023-5678]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-5678 +[CVE-2023-6129]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-6129 +[CVE-2023-6237]: https://openssl-library.org/news/vulnerabilities/#CVE-2023-6237 +[CVE-2024-0727]: https://openssl-library.org/news/vulnerabilities/#CVE-2024-0727 +[CVE-2024-2511]: https://openssl-library.org/news/vulnerabilities/#CVE-2024-2511 +[CVE-2024-4603]: https://openssl-library.org/news/vulnerabilities/#CVE-2024-4603 +[CVE-2024-4741]: https://openssl-library.org/news/vulnerabilities/#CVE-2024-4741 +[CVE-2024-5535]: https://openssl-library.org/news/vulnerabilities/#CVE-2024-5535 +[CVE-2024-6119]: https://openssl-library.org/news/vulnerabilities/#CVE-2024-6119 +[CVE-2024-9143]: https://openssl-library.org/news/vulnerabilities/#CVE-2024-9143 +[CVE-2024-13176]: https://openssl-library.org/news/vulnerabilities/#CVE-2024-13176 +[CVE-2025-4575]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-4575 +[CVE-2025-9230]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-9230 +[CVE-2025-9231]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-9231 +[CVE-2025-9232]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-9232 +[CVE-2025-11187]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-11187 +[CVE-2025-15467]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-15467 +[CVE-2025-15468]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-15468 +[CVE-2025-15469]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-15469 +[CVE-2025-66199]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-66199 +[CVE-2025-68160]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-68160 +[CVE-2025-69418]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-69418 +[CVE-2025-69419]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-69419 +[CVE-2025-69420]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-69420 +[CVE-2025-69421]: https://openssl-library.org/news/vulnerabilities/#CVE-2025-69421 +[CVE-2026-2673]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-2673 +[CVE-2026-22795]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-22795 +[CVE-2026-22796]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-22796 +[CVE-2026-28387]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-28387 +[CVE-2026-28388]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-28388 +[CVE-2026-28389]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-28389 +[CVE-2026-28390]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-28390 +[CVE-2026-31789]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-31789 +[CVE-2026-31790]: https://openssl-library.org/news/vulnerabilities/#CVE-2026-31790 [ESV]: https://csrc.nist.gov/Projects/cryptographic-module-validation-program/entropy-validations +[RFC 2578 (STD 58), section 3.5]: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5 diff --git a/crypto/openssl/CONTRIBUTING.md b/crypto/openssl/CONTRIBUTING.md index 09416095e64d..06dfbaeff1fe 100644 --- a/crypto/openssl/CONTRIBUTING.md +++ b/crypto/openssl/CONTRIBUTING.md @@ -27,6 +27,18 @@ communication before submitting many pull requests. In addition, contributors should personally evaluate potential patches generated by automated tools. +Provide a clear description of the issue or feature being addressed, +including any relevant implementation details and, for performance +improvements, benchmark results. + +Pull requests and commits should be self-contained, enabling readers to +understand what changed and why without needing to reference related +issues or having prior knowledge. Commit messages should include all +relevant details to help future contributors follow the git history, +with clear explanations of what is changing and why. Long descriptions +are encouraged if they aid understanding. Commit message titles (their +first line) should be kept to 50-70 characters if possible. + To make it easier to review and accept your pull request, please follow these guidelines: diff --git a/crypto/openssl/Configurations/10-main.conf b/crypto/openssl/Configurations/10-main.conf index cba57b41273f..692eccbfa1dc 100644 --- a/crypto/openssl/Configurations/10-main.conf +++ b/crypto/openssl/Configurations/10-main.conf @@ -5,7 +5,8 @@ my $vc_win64a_info = {}; sub vc_win64a_info { unless (%$vc_win64a_info) { - if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) { + # Minimum NASM version is 2.09 otherwise SHA3 might be miscompiled + if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+)\.([0-9]+)/ && ($1 > 2 || ($1 == 2 && $2 >= 9))) { $vc_win64a_info = { AS => "nasm", ASFLAGS => "-g", asflags => "-Ox -f win64 -DNEAR", diff --git a/crypto/openssl/Configurations/unix-Makefile.tmpl b/crypto/openssl/Configurations/unix-Makefile.tmpl index 78be4a319964..5bf397eba021 100644 --- a/crypto/openssl/Configurations/unix-Makefile.tmpl +++ b/crypto/openssl/Configurations/unix-Makefile.tmpl @@ -72,6 +72,7 @@ OPTIONS={- $config{options} -} CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) SRCDIR={- $config{sourcedir} -} BLDDIR={- $config{builddir} -} +RESULT_D=$(BLDDIR)/test-runs FIPSKEY={- $config{FIPSKEY} -} VERSION={- "$config{full_version}" -} @@ -642,7 +643,7 @@ clean: libclean ## Clean the workspace, keep the configuration -find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -exec $(RM) {} \; $(RM) core $(RM) tags TAGS doc-nits md-nits - $(RM) -r test/test-runs + $(RM) -r $(RESULT_D) $(RM) providers/fips*.new -find . -type l \! -name '.*' -exec $(RM) {} \; diff --git a/crypto/openssl/Configurations/windows-makefile.tmpl b/crypto/openssl/Configurations/windows-makefile.tmpl index 894834cfb7ef..e553e8f9fec3 100644 --- a/crypto/openssl/Configurations/windows-makefile.tmpl +++ b/crypto/openssl/Configurations/windows-makefile.tmpl @@ -38,6 +38,7 @@ PLATFORM={- $config{target} -} SRCDIR={- $config{sourcedir} -} BLDDIR={- $config{builddir} -} +RESULT_D=$(BLDDIR)\test-runs FIPSKEY={- $config{FIPSKEY} -} VERSION={- "$config{full_version}" -} @@ -222,7 +223,7 @@ OPENSSLDIR_dir={- canonpath($openssldir_dir) -} LIBDIR={- our $libdir = $config{libdir} || "lib"; file_name_is_absolute($libdir) ? "" : $libdir -} MODULESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath catpath); - our $modulesprefix = catdir($prefix,$libdir); + our $modulesprefix = file_name_is_absolute($libdir) ? $libdir : catdir($prefix,$libdir); our ($modulesprefix_dev, $modulesprefix_dir, $modulesprefix_file) = splitpath($modulesprefix, 1); @@ -484,7 +485,7 @@ clean: libclean -del /Q /S /F engines\*.lib engines\*.exp -del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp -del /Q /S /F test\*.exp - -rd /Q /S test\test-runs + -@if exist "$(RESULT_D)" rd /Q /S "$(RESULT_D)" distclean: clean -del /Q /F include\openssl\configuration.h diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index f4ec14718d71..07f78ae2af17 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -23,6 +23,36 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Major changes between OpenSSL 3.5.5 and OpenSSL 3.5.6 [7 Apr 2026] + +OpenSSL 3.5.6 is a security patch release. The most severe CVE fixed in this +release is Medium. + *** 11324 LINES SKIPPED *** From nobody Sun Apr 12 02:15:10 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftYz25n8Sz6YH9v for ; Sun, 12 Apr 2026 02:15: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftYz23zRRz3JNF for ; Sun, 12 Apr 2026 02:15:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775960110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xfDqaccvVWb6lD2u1NFP7Z1gYyiv0u9k3fpzfl6MDps=; b=E4RNuVlU2mLPV0gi+jFb4mHvFkKw7QI4hgE5EMuXbuiKIzzXA27FpTwjL8B5Uyq+UTXrD8 YCUC8gV7w5dkqiGwUaGSpmYeSqmO232Tzix2VzvTgAUl3JUFsrRbX8yyYeyNVkiLzSiKM/ wx4BtXI1AL3gFyPGIw3IqYB/NK8bF7Uk4eiMqJG8hQgOzvqbWBAWhmwuSTMJDX0dF1l+V6 AckFAFe653gyyXkW29xMPtRXDiIC+z74LjRs2UmKAEVY2XbVmAhl7BbBaBGrWMYSV/sBWB y8iSp+FzjAKWWuImh7liqgC2g4yGQU9ODyV0WFyWlH68fUo85EkD+ezD2a8Kyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775960110; a=rsa-sha256; cv=none; b=cmagRHIp2WktryHP8pHpIHaa8jbmO/iSfdjJJTwKVM5rRfNNyt7lv8SoULWNScvsOiNGTL xO/3pOKXkms6YBTPP7RQAPjbyXxYlyn84l14pvjAglMzCxCggg4gYmje89eO6VHL/3B6RO I0s7mkyGHa/znqyKWo6uinvtmwbcBQXHeYPfE+kjdJV/GxKwL8DbJubS5BthmjcliGhmG8 Hk6K4U6Wl9G6nYXriXIIWrY987L4hbA0iB9+l4QPtE55JyliInZOjM0VTF5bouHMnxwqO6 NbyOIWdJZ/gtQKNbXP/ytW4PJpI+hFVdqkebl4630mLat/2M3RsxYHn91ZIT0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775960110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xfDqaccvVWb6lD2u1NFP7Z1gYyiv0u9k3fpzfl6MDps=; b=EfJVa9B+5NFNwzZd5Xc6BHHo6DFXo0wABCXAZAOlvpRBMmzXdMrxfvSakgufJlHqij+bsX M9AMjixM3Vz7zZhpteu0Y91H5rTYd/++xY1bZSnXyzUJe2RkzPSDTATSMsl3Y/Oh1VH2Gb uhO/519gKyXaGMUwIK+tkGktWm5S7FZMWqpIXNeaPA8hjcJ6YwpvSwRRgbA4g0PXxkUgH/ 5xjpxIM9AIqhzr/NbQUC7EZIVM9FtRes0DjckD3FDZDQX+JaqkCsnQkEkDFPsq6JN4tEPn 4OKEamPSK7aA04cHYhK/A8ddeesKrEeI2N14dSG+75XkAbCzjwitKisFcrcn8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftYz23YKszxn5 for ; Sun, 12 Apr 2026 02:15:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41d3d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 02:15:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 51a80be04fe6 - stable/15 - crypto/openssl: add new manpage from release 3.5.6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 51a80be04fe63a8d6950a7524b3ca0d511ade131 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 02:15:10 +0000 Message-Id: <69db002e.41d3d.2b7646fc@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=51a80be04fe63a8d6950a7524b3ca0d511ade131 commit 51a80be04fe63a8d6950a7524b3ca0d511ade131 Author: Enji Cooper AuthorDate: 2026-04-09 02:00:10 +0000 Commit: Enji Cooper CommitDate: 2026-04-12 02:15:00 +0000 crypto/openssl: add new manpage from release 3.5.6 MFC after: 1 day (the security issues warrant a quick backport). MFC with: 10a428653ee7216475f1ddce3fb4cbf1200319f8 (cherry picked from commit 9f7080ba6bcf18d013ae3b91dc9d92cfa731a8c0) --- secure/lib/libcrypto/man/man3/Makefile | 2 + secure/lib/libcrypto/man/man3/X509V3_EXT_print.3 | 108 +++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/secure/lib/libcrypto/man/man3/Makefile b/secure/lib/libcrypto/man/man3/Makefile index 172444fcb68c..8e81b1871d33 100644 --- a/secure/lib/libcrypto/man/man3/Makefile +++ b/secure/lib/libcrypto/man/man3/Makefile @@ -663,6 +663,7 @@ MAN+= X509_sign.3 MAN+= X509_verify.3 MAN+= X509_verify_cert.3 MAN+= X509v3_get_ext_by_NID.3 +MAN+= X509V3_EXT_print.3 MAN+= b2i_PVK_bio_ex.3 MAN+= d2i_PKCS8PrivateKey_bio.3 MAN+= d2i_PrivateKey.3 @@ -5615,6 +5616,7 @@ MLINKS+= X509v3_get_ext_by_NID.3 X509v3_get_ext.3 MLINKS+= X509v3_get_ext_by_NID.3 X509v3_get_ext_by_OBJ.3 MLINKS+= X509v3_get_ext_by_NID.3 X509v3_get_ext_by_critical.3 MLINKS+= X509v3_get_ext_by_NID.3 X509v3_get_ext_count.3 +MLINKS+= X509V3_EXT_print.3 X509V3_EXT_print_fp.3 MLINKS+= b2i_PVK_bio_ex.3 b2i_PVK_bio.3 MLINKS+= b2i_PVK_bio_ex.3 i2b_PVK_bio.3 MLINKS+= b2i_PVK_bio_ex.3 i2b_PVK_bio_ex.3 diff --git a/secure/lib/libcrypto/man/man3/X509V3_EXT_print.3 b/secure/lib/libcrypto/man/man3/X509V3_EXT_print.3 new file mode 100644 index 000000000000..f23dc989ae29 --- /dev/null +++ b/secure/lib/libcrypto/man/man3/X509V3_EXT_print.3 @@ -0,0 +1,108 @@ +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man v6.0.2 (Pod::Simple 3.45) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. +.ie n \{\ +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds C` +. ds C' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is >0, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{\ +. if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. if !\nF==2 \{\ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" +.\" Required to disable full justification in groff 1.23.0. +.if n .ds AD l +.\" ======================================================================== +.\" +.IX Title "X509V3_EXT_PRINT 3ossl" +.TH X509V3_EXT_PRINT 3ossl 2026-04-07 3.5.6 OpenSSL +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH NAME +X509V3_EXT_print, X509V3_EXT_print_fp \- pretty print X509 certificate extensions +.SH SYNOPSIS +.IX Header "SYNOPSIS" +.Vb 1 +\& #include +\& +\& int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent); +\& int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent); +.Ve +.SH DESCRIPTION +.IX Header "DESCRIPTION" +\&\fBX509V3_EXT_print()\fR and \fBX509V3_EXT_print_fp()\fR parse and print the extension +info from \fIext\fR to \fIbio\fR or \fIout\fR with indentation set via \fIindent\fR. +\&\fIflag\fR determines the behaviour if an extension could not be parsed and can be +one of: +\&\fBX509V3_EXT_DEFAULT\fR (equivalent to 0): an unknown or unparsable extension +stops the parsing and the function returns a failure. +\&\fBX509V3_EXT_PARSE_UNKNOWN\fR: an unknown or unparsable extension is handled by +printing it through the \fBASN1_parse_dump()\fR function, and the function returns +success. +\&\fBX509V3_EXT_DUMP_UNKNOWN\fR: an unknown or unparsable extension is handled by +printing it through the \fBBIO_dump_indent()\fR function, and the function returns +success, +\&\fBX509V3_EXT_ERROR_UNKNOWN\fR: an unknown or unparsable extension is handled by +printing either "" or "", and the function returns +success. +.SH "RETURN VALUES" +.IX Header "RETURN VALUES" +\&\fBX509V3_EXT_print()\fR and \fBX509V3_EXT_print_fp()\fR return 1 for success and 0 for +failure. +.SH "SEE ALSO" +.IX Header "SEE ALSO" +\&\fBBIO_dump_indent\fR\|(3), +\&\fBASN1_parse_dump\fR\|(3), +.SH COPYRIGHT +.IX Header "COPYRIGHT" +Copyright 2026 The OpenSSL Project Authors. All Rights Reserved. +.PP +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 +. From nobody Sun Apr 12 03:16:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKj3TP2z6YLtX for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKj1Tpkz3NrL for ; Sun, 12 Apr 2026 03:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ni5zdXBruF1DdzDjiZ4D4jWkJm9tatUYeISFq+TsQmM=; b=W2nUvAEYhGHeyoid1JnYHsUAPmJ7uCN+2hM/6fjE2gE+4GVA7uXoEOOakLk7JNthcehQm/ pyfRgX/3PrbZ5LIV0rjB/DOoD0fcJuUmKhXst+2tjiPp/yJZAWJ85niiUioVkyDuNZHkJQ sCXb+16Neccpv8nqr14hHCyw4dOcbSjLcnLXKSBYKAOxWAecxb8Kkn5wRe4wuVLAhc+vVD JeDLzAFNc1vfKArBbCvl4lf5Ej1wTsbcA7M+d3C0762F1A1Tm0hKND4Eay8ct9Vq22TAPP HrDsfbPx8UqOi+HIfhDB8yKJhoVQvRZ/Drqlcf5xGDRePKd6ptrR2AXMhr61iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963785; a=rsa-sha256; cv=none; b=Ydd9J2DXx/cN+QwLt3Kmq0jPFBKH2Fz/te+gRnO5/Fwo3TlaSPukLvJ4YWvla8Bi7b32ow LrMLOOlHVDqp5aToGIjbYdlhELOtd3fj0+xowtU82jbQ8ke/1bCBki4M+J6AeptKZ/2RQE gNxDY0OLRml9FBTivKjczVHW250BRumy8IcPpUPwKAY8bd4mDhCZPRVt96Dfbqv6G7PGK4 upUfvE2NkgfP3D6+PdT+MOimIXmIji4kQRMqOtE7REVwyZkYzm0UL/k1nCgQxy91mrkvd5 vfAFYO9tZLeP4aJMqlcXyIZ2a/oeLJB24TCA+NwvM7vncYuC6M73rLqo8PaKtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ni5zdXBruF1DdzDjiZ4D4jWkJm9tatUYeISFq+TsQmM=; b=robixbSZdQtYwFOegbat4F+cTXPef7bkECcfMXOeQfonakSF1dLgSLdECmnhr+P8MjW9a3 omd+4Ai15nzskFQ6xjltv/FDspJSD5rcXw65DOBWxbiR+3EdjSztLGu3yHixvgw2kM4x4L HAGL8XM5UhIez3uPX6ENtdc0E19sPYaTWQRFYbviZQw8bpzZY8DFcB06tMPtP87AhpoYr6 njvEiSr9cw76jLg8PBj8zZJxKcynneSaAIf/jUlK7EzniHuY0vIkgoK5sv/M3aCA5/XpEH StfJoPxG5y+5VFzDZOMJ7SFrOwHKuOBnh4xGYkoIsGY2cLNESs76jUC+qVYXug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKj0kxTzyWC for ; Sun, 12 Apr 2026 03:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47509 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4b7f99f39244 - stable/15 - tpm: fix the conditional for the arm64 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4b7f99f392448963327f6d39361a91429acd7e9b Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:25 +0000 Message-Id: <69db0e89.47509.5645b2f6@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4b7f99f392448963327f6d39361a91429acd7e9b commit 4b7f99f392448963327f6d39361a91429acd7e9b Author: Kyle Evans AuthorDate: 2025-11-15 02:22:11 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:09 +0000 tpm: fix the conditional for the arm64 build The intention was clearly that these ACPI bits would be included for arm64, but MACHINE_ARCH there is aarch64 -- correct the minor typo to build everything that should be there. (cherry picked from commit c490bc73eb68556bc44da9893af9be48a360de8c) --- sys/modules/tpm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/tpm/Makefile b/sys/modules/tpm/Makefile index d929649d40fe..e7a87a22d2ed 100644 --- a/sys/modules/tpm/Makefile +++ b/sys/modules/tpm/Makefile @@ -17,7 +17,7 @@ SRCS+= tpm20.c tpm_tis_core.c .if defined(${OPT_FDT}) SRCS+= tpm_spibus.c tpm_tis_spibus.c spibus_if.h .endif -.if ${MACHINE_ARCH:Namd64:Ni386:Narm64} == "" +.if ${MACHINE_ARCH:Namd64:Ni386:Naarch64} == "" SRCS+= acpi_if.h SRCS+= tpm_tis_acpi.c SRCS+= tpm_crb.c From nobody Sun Apr 12 03:16:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKh3qVWz6YM4w for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKh0vb4z3Ncw for ; Sun, 12 Apr 2026 03:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FY9pvAzS9T/MDKu+SsqfMGuyK/b/FpuD5IIwtEiEND4=; b=kmCFYZYx1c+Jrfke0RcdqEYHX3f/P5uF8SSVM2a1IVMuV/7pjuFS+Cb2hezoQN+/Vm/P/q qtTzst+b55ddFrm94X+EtUud3Pn+qlh2Md2cQAInzG7H7sGOIFmg2iMPUhyPqvgB5tavht bcUu9xANv9y9WJf19dZt8VvUgdfEdrHAOuv/Ml6Ddy3w7uN1n2yjNLumN4gZIdrb7Ktwlt HQ6UC0GCtfYTpo99Guvr6xeIAQiVrwVoNx4OSKGj6mcPA47ByTX35bf18RmSzPBAhYaCF9 I7xrCF+nA/SGfhY2egLPBZJLzK8gCqTifcVXyuCBYZ2ZaKJ9autqlmTwsZLUmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963784; a=rsa-sha256; cv=none; b=J41u4rOFMQXevdUjPiVzdkRLbA/jcPkr0bvNPiiBXlde31s+daT4DNm3aHuqV4AfLvrqhd ILyiTg78npwm9xFbShPrZeJFCUwoLHqXeqz5T1tQQXYckmD+VmKY/abJ5c894Y23U6abDm 8KqBl7Xh9HLBC+qKHxUD5fAh948dVgemUSQA7IjYNgpk30JWsFz7A1XatE1YrVlQ6VztXB M/rXzBZoeVuZCUUfUGxpCJ/ry7ERnSyawB8fV2x/ORmovZ9MTFGhTLNe0wls0cvml9rprP Hvi2eZOoLrdHqUEwfE3k8i0LCcoJDuMl16Zm7QzJdcVUnr28Hw1jsiX8lPBMKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FY9pvAzS9T/MDKu+SsqfMGuyK/b/FpuD5IIwtEiEND4=; b=UrE8vytA3dNjMNE9zuYGuHLg3PwMisZn9d+q+AMV6ovGTzZoAWyQBionPHe95W2s20sKFD VtfO5VyFRdDxxZAYj70EY4YBKSEDBtybwgR9LrY9iN4+Mw9fNpAyIiPSUABZ/jjIWw2o/n wPqhKbuEQQRcqTZo/O/qlDfMM55YK10oUU4HJyDE44d1SJWAcRKpNVs+QaGmV85Je1qv+c iqIxzkaYjjzDR3dwLOgycvha7pyndROTvUSEptb34HKv6YYjJVD0bnnDH69PxkoOvhULDx u9G5tv1IhNG2nvpqyjiSL707TcFdkUNvChjTnU+rGX44xV1ogB6IQQ/yx6OcoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKg74hVzyny for ; Sun, 12 Apr 2026 03:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 474f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 40aab705b6a9 - stable/15 - tpm: crb: factor out idle/ready state transitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 40aab705b6a998fb42b3a58b2b1ebb51a50b4875 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:23 +0000 Message-Id: <69db0e87.474f8.7d76de3c@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=40aab705b6a998fb42b3a58b2b1ebb51a50b4875 commit 40aab705b6a998fb42b3a58b2b1ebb51a50b4875 Author: Kyle Evans AuthorDate: 2025-11-15 02:22:10 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:08 +0000 tpm: crb: factor out idle/ready state transitions Some TPM implementations have a different start method that requires an additional notification for some state changes; for instance, the "Pluton" start method. Just factor these transitions out for now, and the coming commits will introduce points that the start method can hook in at. Reviewed by: obrien (cherry picked from commit cca34aa1d005ffc859704331a3221b8c506d2f06) --- sys/dev/tpm/tpm_crb.c | 61 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 017ebd45c7ea..28b4f21eccfb 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -301,6 +301,48 @@ tpmcrb_cancel_cmd(struct tpm_sc *sc) return (true); } +static bool +tpmcrb_state_idle(struct tpmcrb_sc *crb_sc, bool wait) +{ + struct tpm_sc *sc; + int mask, timeout; + + timeout = wait ? TPM_TIMEOUT_C : 0; + + sc = &crb_sc->base; + OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_IDLE); + + if (timeout > 0) { + mask = TPM_CRB_CTRL_STS_IDLE_BIT; + if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_STS, mask, mask, + timeout)) + return (false); + } + + return (true); +} + +static bool +tpmcrb_state_ready(struct tpmcrb_sc *crb_sc, bool wait) +{ + struct tpm_sc *sc; + int mask, timeout; + + timeout = wait ? TPM_TIMEOUT_C : 0; + + sc = &crb_sc->base; + OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_READY); + + if (timeout > 0) { + mask = TPM_CRB_CTRL_REQ_GO_READY; + if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_STS, mask, !mask, + timeout)) + return (false); + } + + return (true); +} + int tpmcrb_transmit(device_t dev, size_t length) { @@ -335,22 +377,15 @@ tpmcrb_transmit(device_t dev, size_t length) /* Switch device to idle state if necessary */ if (!(TPM_READ_4(dev, TPM_CRB_CTRL_STS) & TPM_CRB_CTRL_STS_IDLE_BIT)) { - OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_IDLE); - - mask = TPM_CRB_CTRL_STS_IDLE_BIT; - if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_STS, - mask, mask, TPM_TIMEOUT_C)) { + if (!tpmcrb_state_idle(crb_sc, true)) { device_printf(dev, "Failed to transition to idle state\n"); return (EIO); } } - /* Switch to ready state */ - OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_READY); - mask = TPM_CRB_CTRL_REQ_GO_READY; - if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_STS, - mask, !mask, TPM_TIMEOUT_C)) { + /* Switch to ready state */ + if (!tpmcrb_state_ready(crb_sc, true)) { device_printf(dev, "Failed to transition to ready state\n"); return (EIO); @@ -394,7 +429,11 @@ tpmcrb_transmit(device_t dev, size_t length) bus_read_region_stream_1(sc->mem_res, crb_sc->rsp_off + TPM_HEADER_SIZE, &sc->buf[TPM_HEADER_SIZE], bytes_available - TPM_HEADER_SIZE); - OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_IDLE); + if (!tpmcrb_state_idle(crb_sc, false)) { + device_printf(dev, + "Failed to transition to idle state post-send\n"); + return (EIO); + } tpmcrb_relinquish_locality(sc); sc->pending_data_length = bytes_available; From nobody Sun Apr 12 03:16:26 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKk6hFMz6YLgv for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKk291gz3Ntg for ; Sun, 12 Apr 2026 03:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXjGwZLx9iHVvT56UiscSWmg69O+OdGr1J1lYtL+rYk=; b=J9+TWIxHVnkICqM1u4F6fWWj8Q4FlPBxW5LUWQGeeqhaqOlCbqCKzHpC3VKmaIfzcfDBPh dIIErxwAKnB7CA2eFzknbgI18RfvZaT23NhY2+XiXSFu2Rml4RWysaWsv4ZTeBn/tj0tRd 4BoVBySNla+D6SAsiNaIrSl2++JtvEQeouaTgua21Y2fIQe4fWVF54bnmOIrT5FtnKR5Ua 2yDAqVBHKOzcGymaWRwEr81uh0v76ErE2D6Ubbr4So6JeP0o/B6r8wPqEyxmLWa4qG47j0 SyUaIBeePgb2AKx/J510Uq82fs11T3Mx1OfINuYcY4jojqiAQBPbAs3NrhpeHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963786; a=rsa-sha256; cv=none; b=Wy6VFw7/MXg9YeMF3MQyPgwtTrhEq+DEnCHs5X4/xnPqUNau+LMAR4dvXiqgfPt2hKXsI2 8oP8yx2nxOHIB7mifNKWxrkTWFWZOCc+6ALfyRIijJju9a6ENkeZBoauhUO984hA0B5Y8b AIK5BtpOmu7vh+8MqfcXNw/FySstsdFq7hlFBGgw3lMPzQlo6uofFaETrmT8MplYOdY1oI MWyaraGl+F53VQ+Mcs62rod+M/tIDUH25HQdslCsKnhLy6Ug/nl9nTQR0MRQxL6ak5o/Lx QlUzuH64ewt8JdZIGnPM6jd579kTm3tETBko/EJ17HItnhHNOnqPdvoAKO1mpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXjGwZLx9iHVvT56UiscSWmg69O+OdGr1J1lYtL+rYk=; b=UX5pFnt0AzN8MAnP+Rck+EZZTi7of9Zg9aTlURMUV+3C0jEwUcMTvN+ttdBpXXnpjI5Hhy Oys+tIFTIMaZCKsn7nS+H7s25Bq+cQYp9aIYqzd9GC9dkr+t4Zch9IYvSaeXNZeXnyo9Qc hR2QGjEptLpAoaXEG1dbPrQdzfvXcV5uQNogWJJK//tOmcXH8xlMzOBS11ztIe/axjnNUl yReNbdD6WcaiQ1T+xHiuwi7L4PxAsyTmUF7nHu5NDxOKxrgANMQMl/+rUa1+SNdYiC9hbm l0KDzTEifQx5+9uWhiM9xSnZ49JdX7ub9uzKTqaanBKejq3d0SgILkgxWQjs4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKk1Wzmz10GT for ; Sun, 12 Apr 2026 03:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47804 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: cd42ecf5229c - stable/15 - files.amd64: remove some lines duplicated from files.x86 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: cd42ecf5229c426ff548a0b603ec96555c386795 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:26 +0000 Message-Id: <69db0e8a.47804.335ea972@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cd42ecf5229c426ff548a0b603ec96555c386795 commit cd42ecf5229c426ff548a0b603ec96555c386795 Author: Kyle Evans AuthorDate: 2025-12-19 22:17:30 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:09 +0000 files.amd64: remove some lines duplicated from files.x86 These were added to files.x86 because they were duplicated in both files.i386 and files.amd64, but they did not end up removed in the latter. Garbage collect them now. Reviewed by: jhibbits Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. (cherry picked from commit a8c594d27779b95f33c856521ec1039fa552d869) --- sys/conf/files.amd64 | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index ace100a1de31..9837086aff99 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -379,8 +379,6 @@ dev/smartpqi/smartpqi_tag.c optional smartpqi dev/sume/if_sume.c optional sume dev/syscons/apm/apm_saver.c optional apm_saver apm dev/tpm/tpm_crb.c optional tpm acpi -dev/tpm/tpm_acpi.c optional tpm acpi -dev/tpm/tpm_isa.c optional tpm isa dev/p2sb/p2sb.c optional p2sb pci dev/p2sb/lewisburg_gpiocm.c optional lbggpiocm p2sb dev/p2sb/lewisburg_gpio.c optional lbggpio lbggpiocm From nobody Sun Apr 12 03:16:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKm4Y2rz6YM2n for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKm12Qnz3NdT for ; Sun, 12 Apr 2026 03:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jt0IX/KEb14Xp1C5rtaqvskBD0ETFxIm3+KhN2VEXw8=; b=dv9yWncphkhSkT3lmTi/FVmscLE/7o7JamN5M+2o8sOrjtvxPFjn35ZvMO3w/Q6MRAJSZJ GIGJXPoLNRppVDOjDHvaM3yWrhgz1/4qqcW61EmjfrHIWZ8XKGrnQOc+dm5eaRciz3doEl FhUFXPLfBT22BEOr2SAR/UQIn9WvYD4KK4vxGurUFu+6dQNJRNv56QagJF8WLnamUyQkZ9 o6qymESTGB03QxqCFmOr3PRkFbw0fT9utvDaYyyRvLGFimrTLtyEFDqLpm0UA8OaywTZ8y mYKyqTd2odSUSz01WWitO/I4YWwS3iaoLzcvEcbQH9pmQX58MSe5RMgaGxIX/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963788; a=rsa-sha256; cv=none; b=Rn3y0D2emWqUsQq45PSvE3pJl8H24c3CUWcO1Vwb1Bm+WdwjKl9TrkjLTu3oNFl2cFNNqU 6mOlU4x6kchUTE2Q0JFlhEE1aWaNjcwc87Bk/EGUnCm4VLCWJnrg2aqirL+pXxm/8qYi9f hApa9hKFVLh4Pbx7FjLzzUxhAw7yXdb/V+b2XSBIz1ay2iEd/vwiph09/cglefTW+8vvJ3 BEy2+1jMjzm5UFa8vfJW2QtREyxI5lMG34wG8QU5sTOUiEitcuLTl3gT0Xl7RjEJ6GFTQn Ydnuhi/myJDjr9jW14UDifDD7pYZwKbEPk67BDN9+496KAQ/CALUhgIfjsFlzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jt0IX/KEb14Xp1C5rtaqvskBD0ETFxIm3+KhN2VEXw8=; b=XcrXIrW0Z2u21qXn0Hsj1nWpjsZhxZdQIEdBE0e7ppJReaVm3yyjgtbPgOc4S89ErI3soP IBczlpRn8dEz0YMDlgY0XmBjkMa/CSh3mIlZEZTTfrHfrcwbbQ+gFYTz0xk4cD5Yy7pApG mDw9MkTpgyN9jIK7EijKvR50Lq332ImCMvgdVsllXYh2s4ogYRf+akt5F/fKiBJTcUqirN 456h+UGLDSA2mF+xURJM7YanOGcYLvWFkitXOC/7x/70Ay4MC5MNei4iLT9QQNbLeo9ck+ lVzmT9YlEvNQ6Tx+LFYrHsw0Dxshn9yll6yP1LDZSlKaGS7Ft7FK06Drp/qAHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKm0MkKzySp for ; Sun, 12 Apr 2026 03:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 462cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christian S.J. Peron From: Kyle Evans Subject: git: 1cf7c6cd513f - stable/15 - libsys: install manpage links for jail_attach_jd/jail_remove_jd List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 1cf7c6cd513f8333174450bbbd41c14140d48bcf Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:22 +0000 Message-Id: <69db0e86.462cc.52d0d853@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1cf7c6cd513f8333174450bbbd41c14140d48bcf commit 1cf7c6cd513f8333174450bbbd41c14140d48bcf Author: Christian S.J. Peron AuthorDate: 2025-11-07 01:08:17 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:08 +0000 libsys: install manpage links for jail_attach_jd/jail_remove_jd This was a minor oversight from their introduction. Commit message by kevans@. Reviewed by: kevans (cherry picked from commit 51c5e2b60247b3deb204a1d78ea6edc91a8ac652) --- lib/libsys/Makefile.sys | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index fc948ae9c5c7..b17336babfcb 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -471,7 +471,9 @@ MLINKS+=intro.2 errno.2 MLINKS+=jail.2 jail_attach.2 \ jail.2 jail_get.2 \ jail.2 jail_remove.2 \ - jail.2 jail_set.2 + jail.2 jail_set.2 \ + jail.2 jail_attach_jd.2 \ + jail.2 jail_remove_jd.2 MLINKS+=kldunload.2 kldunloadf.2 MLINKS+=kqueue.2 kevent.2 \ kqueue.2 kqueue1.2 \ From nobody Sun Apr 12 03:16:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKm0GV6z6YLtg for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKl4n07z3NdP for ; Sun, 12 Apr 2026 03:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2NIF/T77rb77hUVoZNSAnOfoSseI0jmg4yr/TtSwDt8=; b=QbuVwVCTsikKHVCSJM4DkBXmqVrTIj46nYrGSVyz1GhhgTSvvalQKL79lbcgKSJDdVorHK N+MOKTyz8telyFVnb4/CuyAXl8u2rrmuzgwycIw8MERCkB4/FzDRagYzmDQnWWP/e0PHrA frxRQm2uNPVRu9SL7OwKgMyB33ED5nXEaAvVGgvw3S4GDafujdB9V/y9FCnfXippVRf/Hv iMzPex/xVdKs7xuGnkW4yPG7xChH2tWwnRIIiu/iLLBZDehcA7VmRERfbyQeu0NNaymARi QHVPNv0XKisaSnsJorlh61CMTAanvloYfKDlZNAZB3aQVOW7//r3XRuTQL+1gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963787; a=rsa-sha256; cv=none; b=f4ADZyRW9bsWaz1k2T6ITe6aNnJ4B6cPNANrJ4Ja7uT6Sza6tcSqoMHZNLGX8wauOoULBc 4FeDsikJvjNXzqWp7/rs51ct4ePbdva8GIIOiU4eLa5fwNmR26sNeVGf2GLkRDaRh/EBhD 2WPuKYXtXjYZttq6irxzGzOiWjnEHB/A2CDmIhYflr37UBQmLwM4wpk2ESNHRaEXKjMVvE sJZwTtiFhjL5Iu4NFcTUtJA1SvDQRrhqENCFVqBNDGN6cSB68mV9TctulM9b5Ow5QZGlDr vPwaJPoP9FKUCSWhbWQlUFaBbBmNB0QIX+ggHqil5hs6IN9QoSCdqB9mPS08zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2NIF/T77rb77hUVoZNSAnOfoSseI0jmg4yr/TtSwDt8=; b=YHObgyTw+q8wlU5YLFFKGtc2o7OvHb3D1NNn6OK0L2Yb+XhJjOLHhcRKYPe1M4XZguYfUN G97VBFMo64RR7Zc7P5/nfWIwiKiWNZSEHaECxIgjPBgpHSpvxon771iY/calN3k4h3eqEc TWt1adlRj92/oLGyBmTys7ZDjhnTZ10UdYCMUPQd6hA3Qhn/98sxqgkphMQVDcw9sPyUN0 tyHbywvAVJfn6sS8HpyP/AR0ouULB9kkr6VWT+NUQsDV8Kg4/ECX2FcYixHhXhyuiwQfA8 BXa0Y0xbXC5WaUruI/MppelDBh7EisEmC0XT4/vwgKG6axg0yTX+BlD0XV6NjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKl2NVlzySn for ; Sun, 12 Apr 2026 03:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46430 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Kyle Evans Subject: git: 6c143fff52b7 - stable/15 - vt(4): allow up to _SIG_MAXSIG (128) for VT_SETMODE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 6c143fff52b72c9fedbd72259ad60b0db166efe2 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:27 +0000 Message-Id: <69db0e8b.46430.71ba97a8@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6c143fff52b72c9fedbd72259ad60b0db166efe2 commit 6c143fff52b72c9fedbd72259ad60b0db166efe2 Author: Quentin Thébault AuthorDate: 2026-01-14 00:14:22 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:10 +0000 vt(4): allow up to _SIG_MAXSIG (128) for VT_SETMODE VT_SETMODE ioctl currently checks the provided signal numbers with its own ISSIGVALID macro that uses NSIG (32) as a maximum, although the code that will actually send the signal in sys/kern/kern_sig.c uses _SIG_VALID which allows up to _SIG_MAXSIG (128). This change aligns the vt code with the kernel internals and enables the use of higher signal numbers so that applications are not limited to SIGUSR1 and SIGUSR2 for vt release and acquire signals. Signed-off-by: Quentin Thébault Reviewed by: emaste, imp, kevans (cherry picked from commit 5e1c7867e1b9a8abe7307d01087cddc057e39859) --- sys/dev/vt/vt.h | 1 - sys/dev/vt/vt_core.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index 8e35a81bc101..4abe99e4ab13 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -81,7 +81,6 @@ #else #define DPRINTF(_l, ...) do {} while (0) #endif -#define ISSIGVALID(sig) ((sig) > 0 && (sig) < NSIG) #define VT_SYSCTL_INT(_name, _default, _descr) \ int vt_##_name = (_default); \ diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index bd6596eceacb..ef95df208863 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -3050,9 +3050,9 @@ skip_thunk: DPRINTF(5, "reset WAIT_ACQ, "); return (0); } else if (mode->mode == VT_PROCESS) { - if (!(ISSIGVALID(mode->relsig) && - ISSIGVALID(mode->acqsig) && - (mode->frsig == 0 || ISSIGVALID(mode->frsig)))) { + if (!(_SIG_VALID(mode->relsig) && + _SIG_VALID(mode->acqsig) && + (mode->frsig == 0 || _SIG_VALID(mode->frsig)))) { DPRINTF(5, "error EINVAL\n"); return (EINVAL); } From nobody Sun Apr 12 03:16:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKq1RFKz6YM08 for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKp5yVCz3NmR for ; Sun, 12 Apr 2026 03:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MV3i3m0IA9xSE0yigD6VXpNIUhbQUiGQVch+oCO71/8=; b=W8+/gEvR0MRnPCm73hnZEZGbXUpNQUAVHWZbb5nb61slgSUgeq0fcZpaTudsFmJxYcpbC+ D0+mgGYgx/1eIq8ktNCyrrA01Otc6d2Z4WLG/lPi4AXVWBcpc/34LUySZj/RJQYKIJ8zQD +f4SvKptorxt8TNC5YmeQORMmM0S22/bgEPO5Z+70wSSkv2BqILhwf2uamjLEcnf+7dsZP +oy3GYkG8rOJBpzo85YBVEaiYgPCVp8ylI8cy5/ZZiR5KqS7koRxIDYQcayliaiN4bXQUg M/wje1e0yTKMWgB+noZ/ZyCwfRZPZHnuV1poHz7FkRxuf7zFFY3WBu64nqMHbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963790; a=rsa-sha256; cv=none; b=AF2Un33jBN/t6FCS9uOqW6r+6NRhuC6Y4bj0zbn/PYHEKR008wpFirWfAhG9blckIpA7L3 1nkNEb/m39xqAqRACkQjnr3oW1KhbmNWLHR1wBDtJ9IOlehjq5tOYHjUXmBBlMmL5t+gCs lSiBWrbfn9A22KUPMGwekIr07nP+1JZIKo/QkUO3hItshYTNuwA7YYde9x3wYGsQHLsBnE 2ZU28LlWIbYsLzVUTMA7GAwEKW8V58SdS1Veyt9uyYiOjKOQbm6tCyJBsmKQNAYBOCSDSk yL/g0eXChvj6o3sedNxlYGsuRKzBskWKm7BHmVXjJM4/X6IR6iOLz7CR26ErUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MV3i3m0IA9xSE0yigD6VXpNIUhbQUiGQVch+oCO71/8=; b=PuuonyyLdFzdpqZDKSV+qB3NIRzt6eQ9CiUlylI0vsT+F+535Y4gWNAQZR7GLgStTbV9nQ UQRHRLuAm7uOsckq5ACUyNHQZ07pjz6R/VLN9iILFy3G+HN4q4AMwxFZLkItz6SrHke9Bp QhskmpuffbGO0pmkSV1mhG1jZ0XsOUE0v22I5hKwQV8rHZ5T0cnukAxLI1/pxJwMNDHU4C FS1BGoChuG1hG8y9CRnHwohpCdaa4uNZxrnV5vKB5ATn43VIQex9Bg/dVy21AQIrU/ciDo 4v7c2V+ud0JWJcC12lg2WHWfBSHsWhXN9jbyqIjyM6BNxgCsiXZlgF5kLgyfrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKp4Ts5z10Cy for ; Sun, 12 Apr 2026 03:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46bd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ebf890d48f51 - stable/15 - rc: run the zfs rc script before tmp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: ebf890d48f51615ffacd32b3ed5c154a51392754 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:30 +0000 Message-Id: <69db0e8e.46bd2.27e6b4f3@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ebf890d48f51615ffacd32b3ed5c154a51392754 commit ebf890d48f51615ffacd32b3ed5c154a51392754 Author: Kyle Evans AuthorDate: 2026-02-03 03:21:42 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:11 +0000 rc: run the zfs rc script before tmp The tmp rc script has much the same problem that the var does: it wants to test if /tmp is writable, and mount a tmpfs if it's not. This means that we actually want our zfs datasets mounted first, because we might have a /tmp dataset that changes the story. The ordering problem is particularly noticable with a r/o zfs root, since the write test will fail and we'll mount a tmpfs that later gets covered by our /tmp dataset. If that /tmp dataset inherited readonly, then we're still in trouble. This also fixes `tmpmfs=yes`, which would again get covered by a zfs dataset with the existing ordering. Reviewed by: des (cherry picked from commit d3f21856aa72c28408660ed40ce76bbd0716a991) --- libexec/rc/rc.d/zfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/zfs b/libexec/rc/rc.d/zfs index f88f65c2ec18..99156332e47b 100755 --- a/libexec/rc/rc.d/zfs +++ b/libexec/rc/rc.d/zfs @@ -4,7 +4,7 @@ # PROVIDE: zfs # REQUIRE: zfsbe -# BEFORE: FILESYSTEMS var +# BEFORE: FILESYSTEMS tmp var . /etc/rc.subr From nobody Sun Apr 12 03:16:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKn67b0z6YLgx for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKn48Cwz3Nv8 for ; Sun, 12 Apr 2026 03:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pgc5BquEOn9K5FkMCSuCRHzBwDhMVr++4XyCXMriGfI=; b=N1uagmkYtETywmsdBQKpfowUnct95GpIAl5IFj3o4uPlFSzxzCeu88dYLthV4u5t2db8te CN6DSkYJ4qD/bW/Hf14avF+WF6Q9Zb9o4tppykeibtI2sfO8EhItJFJ2bc3LqjPjcw8IVB LJe05n3/RIytsKCHru2Z4h/L9ikhR4d0LeCHksnVndTeTflvb/0I/gajKZHlf/GsgLKw7A 3WHVqxQfqGjl89hSXzI4MqoiP8xumBYb//wgHgZBZAs+Ndrr2U/q45P8ZyVCRGWOYE2U26 zfDn+iFt2jzLSiPQjDjAdjYcjGzIxLmYtERDz9NQq7bM/Ez6/8B7GpCXM6S5AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963789; a=rsa-sha256; cv=none; b=ve1MzwlPIrfPeS8TTCWrmQfo7VNpFN0ZYMKfEna30XG1OcG3PRAFwNUl1QD0Q2Ey+0Ce62 KliYTChibqjljiCSgSwUh09re2cbLmhkH9623i/aV0w+blgbN1U7c2907Z90RVpWGIBmFJ oEykWpOOMdLeHbORtuct9LApWyQKMmNkKsA8DqlpUz7pFPebXbi9qwDcdXpFD89h/FLZC+ VbMKeDGVlNuhdE7qjZWOPtqMWMKiAg2quS9jiqKkM1xava1fm80Nzhev5Ny0wXC6VwVj1e PoKYXbate7JwpcuzH/TCgQKx//lG9gmDqowgqTQ/QDUeYqkqyV8QvM0FssOxLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pgc5BquEOn9K5FkMCSuCRHzBwDhMVr++4XyCXMriGfI=; b=L0TgXULLnFiAckuZvVX2tMuTrWymWujljedl/ggq625J6/McpC+tZvkMLge0MMGckuJa46 QDEiz4Y/4AVKysj19FJpS6ukZdRUSvguhfLxCbxSJWLXiXxSL6gFcOqTrO3sFVk5BGVKaW hTfzCXLQSivBn7YnA7+0jXUcYN5U/pr+iM4M3U7MNSP9EjccdBmSqRYL4wfMZjot3X64C7 qYw+h0knn6vyE/7fcnWPkeR71cVm5SCGUJhgDv/d7FLV7bf08vH1qZBUsq5GXAPnAyDWa2 Qo66Ju8aQMf8vbMQ7wkuRHFxBUq/Z2Xtn4mr7TXD7Qll4kKTd7bKAOjsvUYNAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKn3jYGzyp1 for ; Sun, 12 Apr 2026 03:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 469f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Kyle Evans Subject: git: caa3700d7ace - stable/15 - firmware: Fix inverted FIRMWARE_GET_NOWARN logic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: caa3700d7ace41ea61d43502ac872b67ce0b1ccf Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:29 +0000 Message-Id: <69db0e8d.469f4.4186000d@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=caa3700d7ace41ea61d43502ac872b67ce0b1ccf commit caa3700d7ace41ea61d43502ac872b67ce0b1ccf Author: Abdelkader Boudih AuthorDate: 2026-01-30 00:02:47 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:11 +0000 firmware: Fix inverted FIRMWARE_GET_NOWARN logic The try_binary_file() function has inverted logic for the FIRMWARE_GET_NOWARN flag. When the flag is set (meaning "don't warn"), the code sets warn=true and makes noise anyway. Invert the assignment to warn to correctly suppress warnings when FIRMWARE_GET_NOWARN is set. Reviewed by: kevans (cherry picked from commit fdcd67be8274d237ae2c87d6475d9d34b440b8d8) --- sys/kern/subr_firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_firmware.c b/sys/kern/subr_firmware.c index d616339f2c07..88b2e71ba8df 100644 --- a/sys/kern/subr_firmware.c +++ b/sys/kern/subr_firmware.c @@ -281,7 +281,7 @@ try_binary_file(const char *imagename, uint32_t flags) int oflags; size_t resid; int error; - bool warn = flags & FIRMWARE_GET_NOWARN; + bool warn = (flags & FIRMWARE_GET_NOWARN) == 0; /* * XXX TODO: Loop over some path instead of a single element path. From nobody Sun Apr 12 03:16:31 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKr2z8kz6YMBy for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKq6QjXz3NvP for ; Sun, 12 Apr 2026 03:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8s1EykKSKaDa67plQL9B/0aPDo+4rcDxfR02l6kozU=; b=eD17fr76NAedBMYejetefZOoBYu+2+WYfnKx85UFiCjfH3liqutDqHmkH9FN5Gccks5/Gt trK9z4GhOmRqVYJT1p72F7UY4aTvQ80+3fNXmGm0BTArNFBePtUqBSid4NS66jamiDBidn w5yIT2Nr7S90M2u96U3ixZnxfEIQrp16zR+X4L0RDLW5WCU0iTd9f91k3GmEweM69dWrHy iA3XzmIldzBzbqFHTF+eX2qn/MJFztN/6YTR+9DZOIE7kWtBPLnreO/mF0ZAonPCi/ZPUa Wyb9GPRZ4ZNK70K8lfdTi32hjm/6z382ihYnAP2lghVdL84CGRk2lkG5K0o+rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963791; a=rsa-sha256; cv=none; b=epf4JJyUctbkYc8ts0dGf7UyWZYHpLB2eLgzOunrnWT2qN/KWFCO+bZBNSXJqFEiBH53sx FT8GPoI6YsKTYpwAJQH4i8vlRXQCBVYzg0vZGZ0U9IzKMcF4qj8uLVUlIj3udfd0ZRlpLx cvjfzbA0p93tJDKBCWPO9/+7SfFU4sv74vbMaFaneOzjAJLL15JlXWBKxKBXpADBahq9SQ mlc+UbN7ZQoAjTM2fSzD4i9TP1nnKXimOOmw6TJngpqYUDI5/b3DGKgrISgh1n9upPrbGS d8MXF79ND7bck7REOYArvBhxpw5XNSA6xe2z/M3NvJTFDbJFYLd5sKvqWDxIow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8s1EykKSKaDa67plQL9B/0aPDo+4rcDxfR02l6kozU=; b=lZ6OUAJch5tu9426HfsT5vr3LFFSiDqWQc8cV8d1HGq3FviST6cXmVRyhKOUQG6BIl1Mnp ZwooRqRGBZ3ZAdc5R18Vhkm+Dxr6WWkPeWhx+reJTk1NEc9pUkeEuhlxj16DAezmFsvD99 SuWnaWePe3ZnfGmf7+sAnWUWTMM2ew0eJhPuHE0MpBb2GzSJtMWTZb54Piz/uu9LCThIGp 1Voe5QgldkiS8AtrHAov8WizLTX+moKPhqtGlr5eC9KdZ+uEUO2i95YtykHEh0Q0TlRWDo a0SLcghcAW1g2/yb/U00xLnQpEJvxbahuN+Wtan0SRhRAqCBvstwYw+4lp4wyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKq4wkjz10D0 for ; Sun, 12 Apr 2026 03:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47639 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Kyle Evans Subject: git: b6321b9b8499 - stable/15 - uart: fix sleeping while holding mutex in uart_tty_detach() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b6321b9b8499376d30bd7ca933ff25aae9877596 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:31 +0000 Message-Id: <69db0e8f.47639.562d6ec0@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b6321b9b8499376d30bd7ca933ff25aae9877596 commit b6321b9b8499376d30bd7ca933ff25aae9877596 Author: Abdelkader Boudih AuthorDate: 2026-02-03 03:21:43 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:12 +0000 uart: fix sleeping while holding mutex in uart_tty_detach() Move swi_remove() call before acquiring the tty lock. swi_remove() calls intr_event_remove_handler() which may sleep via msleep(), causing a lock order violation when called with the tty mutex held. The software interrupt handler removal operates on the interrupt event structure independently and does not require the tty lock. This matches the pattern used in other drivers such as tcp_hpts.c where swi_remove() is called without holding other locks. Reviewed by: imp, kevans (cherry picked from commit ed3a2469a71e0ef48cf8e636c35e64a011756da3) --- sys/dev/uart/uart_tty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c index d15d1d0c6ac2..7f0f730b3b6e 100644 --- a/sys/dev/uart/uart_tty.c +++ b/sys/dev/uart/uart_tty.c @@ -447,8 +447,9 @@ uart_tty_detach(struct uart_softc *sc) tp = sc->sc_u.u_tty.tp; - tty_lock(tp); swi_remove(sc->sc_softih); + + tty_lock(tp); tty_rel_gone(tp); return (0); From nobody Sun Apr 12 03:16:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKm591qz6YM01 for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKm3xMnz3NkS for ; Sun, 12 Apr 2026 03:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T8+eqfJL+vTqk9BFQTXdPtQsgRcIy3HygEIBPhZ7HC4=; b=q2mwvEKPXS6kyyvpU/vVdL1cnVFv60bzyQhOXMR+r1ax0PYmcklBo9+esGdyEcjJGHcbl9 OaDMl68zB/4U5vb8fn5hkKjbt8qyearxP/oALSWxNybVhClu4Xm4s9DkSBwTrql48li/V/ FEIIxU9m/x3nhmG1E8kZT4t/W/nuBAIsQJTKlkB0d1EoBFrX8DnddIIqo2mmTMD5odsjP0 f8x6jyUMVsCe48fwY8MlBKjo4d1+L7dw/tY954EwimBFDiJF4XtSOJ4ZTilRY70DjSmNMD VhkXfpGmcU4DaWYOqKLxxbDXezED6oPydnwdTRkAz93At0VGPCEBSis7CZa3Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963788; a=rsa-sha256; cv=none; b=kURfjVM8AWbQxCPVz7lsP3a01c95dFcov1ES/ZZZ/D8AEzp4d6/XeR3pctmsmsznOTE+W2 B5rePNKYaiL0SZoZKa/xgWwQLB8DvHFq2m6pTIhnYM2bObCv/xRgYgZM4MFEI+22MF4m37 E3vLjWF4r7qbNLMAlxORCM2LJlwyHJkajNHULqdVu61yPudxOXhNca7bm2R7xJDGetc992 +eu16FJJRCdAevoCdr1YOwNGmNneSOvS4L/WKvCzni2kCC05+VJoqghnpdQwDnKS4dSDBq TL2ThMa+OGHoXQoYxtHvCyKM4/KrW9J6agl2GZ7UiML1BnG1H7CgIRoatEajIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T8+eqfJL+vTqk9BFQTXdPtQsgRcIy3HygEIBPhZ7HC4=; b=O7S6QvSNnAxoMawUzLiZ3une/yR45RLQdoOE17e4wbsEp65K3PMDMvxf66hgs634kuqytx ww31QTShiZWe049KipBDKVzFMrhBJMaDv6AdKvmQekFO8mj+ziMeZcw6xeiU+XFEtfgQkY zWiuuMCjW7RKaaIBAmTRATDwnL3+Il68lEckeYpt9A99sz+6lP4YHG8ubEoF2IzTBsUZPd osn87HfJgFAE4tWQbspvm5FmKPdd4IeuzkkWL+Oi5v/CfLU9E3sBYxkEhcR8L8xeljmTSK QrOehKeKSZqfi6l0rJc05/MdD+mE3cCyBB+/HvI92NuJPlACoR/3dFJxlT4rlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKm3BsTzyWJ for ; Sun, 12 Apr 2026 03:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 478d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: cf62b00b47ac - stable/15 - truncate: fix a minor nit + add a hole-punching 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cf62b00b47acf9f528dfe147635a95693307003e Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:28 +0000 Message-Id: <69db0e8c.478d2.5cabba40@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cf62b00b47acf9f528dfe147635a95693307003e commit cf62b00b47acf9f528dfe147635a95693307003e Author: Kyle Evans AuthorDate: 2026-01-21 23:34:27 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:10 +0000 truncate: fix a minor nit + add a hole-punching test The struct spacectl_range we use is only really used in these three lines of code, so re-scope it down to just the dealloc branch. This is marginally easier to reason about what might be necessary to replace in porting our truncate(1) to other platforms. While we're here, add a test for the -d flag to be sure it really does punch a hole in the file. The test also tries to confirm that it does not disturb other segments of the file in the process, just to inspire some confidence that it's not corrupting the file somehow. Sponsored by: Klara, Inc. Reviewed by: markj (cherry picked from commit eacc501eff52db16b7b784c89a3a4a03c9a3ef34) --- usr.bin/truncate/tests/truncate_test.sh | 48 +++++++++++++++++++++++++++++++++ usr.bin/truncate/truncate.c | 3 ++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/usr.bin/truncate/tests/truncate_test.sh b/usr.bin/truncate/tests/truncate_test.sh index ec219059de42..845b3e1b4d84 100644 --- a/usr.bin/truncate/tests/truncate_test.sh +++ b/usr.bin/truncate/tests/truncate_test.sh @@ -438,6 +438,53 @@ rounddown_zero_body() [ ${st_size} -eq 0 ] || atf_fail "new file should now be 0 bytes" } +atf_test_case deallocate +deallocate_head() +{ + atf_set "descr" "Verifies that -d punches a hole in the file" + atf_set "require.user" "root" +} +deallocate_body() +{ + blocksz=$(stat -h . | cut -f1 -d' ') + atf_check test -n "$blocksz" + + # We use /dev/random here to defeat ZFS compression, which would + # collapse ranges of zeroes into holes without us deallocating it. This + # isn't a concern below because those are specificially for creating our + # reference files -- we expect the deallocate operation to result in + # ranges of zeroes, whether they end up creating a hole or not. + filesz=$((blocksz * 3)) + atf_check -e not-empty dd if=/dev/random of=sparse \ + bs=${filesz} count=1 conv=notrunc + + atf_check cp sparse sparse.orig + atf_check cp sparse sparse.orig.orig + + # Punch a hole in the middle, ensure that bit is zeroed out. + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=1 count=1 conv=notrunc + atf_check truncate -d -o ${blocksz} -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig + + # Clobber the end part of the original file and punch a hole in + # the same spot on the new file, ensure that it has zeroed out that + # portion. + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=2 count=1 conv=notrunc + atf_check truncate -d -o $((blocksz * 2)) -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig + + # Now bring the original file back and make sure that punching a hole + # in data at the beginning doesn't disturb the data at the end. + atf_check cp sparse.orig.orig sparse.orig + atf_check cp sparse.orig.orig sparse + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=0 count=1 conv=notrunc + atf_check truncate -d -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig +} + atf_init_test_cases() { atf_add_test_case illegal_option @@ -459,4 +506,5 @@ atf_init_test_cases() atf_add_test_case roundup atf_add_test_case rounddown atf_add_test_case rounddown_zero + atf_add_test_case deallocate } diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c index d8484257294a..15be339df0e3 100644 --- a/usr.bin/truncate/truncate.c +++ b/usr.bin/truncate/truncate.c @@ -62,7 +62,6 @@ main(int argc, char **argv) int do_refer; int got_size; char *fname, *rname; - struct spacectl_range sr; fd = -1; rsize = tsize = sz = off = 0; @@ -198,6 +197,8 @@ main(int argc, char **argv) tsize = 0; if (do_dealloc == 1) { + struct spacectl_range sr; + sr.r_offset = off; sr.r_len = len; r = fspacectl(fd, SPACECTL_DEALLOC, &sr, 0, &sr); From nobody Sun Apr 12 03:16:32 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKs2btmz6YMCB for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKs0YWNz3P0q for ; Sun, 12 Apr 2026 03:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ft1TNYj2dHBenr24Tbr6gHZcNt0buE/J2fCBGVzghcg=; b=yA+sYf18MLeDuPn9d+wZ5h0S+IojantjvGyv/AiU7WYU8NqZyk6FTwFLyRhkR8hXPei3xD Dr9rlU5vxv0cYM2QTVttR57s9jgrpcJUQvJi8jLJqbs82EacBAtkWa4NdUWpTQJ1w7NVLC UKFBYpwglytxbMV2xdfvQyaBSsThy1y9VRIHZgFWzZEvgdwAqCQr+sl+t4aQ8Y/nDgLRn8 /qg3jI2byFUF6wyS4Sd61jG16yIP1n0Y+x2ve8Hr0zA4HChsvoibW1GkQf+gbAWPXy4dV0 y1He8rPLZlEC+DFrUfAKp9C86hWfXdBrmn9LAUA4yWkROBg3faXv/dPrQmo/Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963793; a=rsa-sha256; cv=none; b=Bh4Y/zmjTu7D+EsFzbpz4XXbj7Ir8O0uFF3ic+xar7oQQBm1buTqtYlkwIXWD/j01jiJDm 6AAEo0vhm2W0KimmAFdqHn2mkBQHUKY3k8hZfNaaOxR1ecfTuTJmwyRSX2lgHVFlZCFsBA jmHPceBdAzFjCI/3N2selTN7tCLtjRHU+XaoNttpRrPGPiPJoXTPV3aVsfZt5Fh40N7gEe ZQyQx60L5VkHN6PUKTBCxjTXSbpdT3ehqGgTCRWSFM5OSKJ9JfFILI5ZU6rTNgNyCHcHL6 0ceIfgxjxBiz/8N7JxQL5u+gXGFR5znAP67HRYp+s4o06SaDITfXx/qOlm1T8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ft1TNYj2dHBenr24Tbr6gHZcNt0buE/J2fCBGVzghcg=; b=nPXnZ0hgVnC3aRj6eRfU4+GNBnwfCR3I+/0jytw6GbHlzequ5mbs5ZDf7x2EyrBRByu9On pwjUrhmEaYdWTPe8Jq+wT0KBdb6FqTNSyIkRyghlqgwanL/ACxzSY6juUeB0bMg1Ln/QPX mfIM1vBafvKWm+yFVUIFXF5SgLQDxbAsWQiIGFdheRKxJoIvz0/Kpo1PAdd2BUZgKWTj9w xGYj0qsGaYmG/jRmTlj00+o0wNcfLocewTq+mgFqcemOzUlGSO6XeWEZOuz0hD2uKORZYP 69+YRlEu0r5C7rZGpDIrPEG1HFoWsOLmoeiyrOAJa+GadUdNBcwZ0B0V+mfwdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKr5m0kzyWK for ; Sun, 12 Apr 2026 03:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47ba4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: afe262bd5a7b - stable/15 - tpm: crb: add support for the Pluton startmethod List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: afe262bd5a7bffdae388ebafbcaace6da14aa24f Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:32 +0000 Message-Id: <69db0e90.47ba4.2a4f53ff@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=afe262bd5a7bffdae388ebafbcaace6da14aa24f commit afe262bd5a7bffdae388ebafbcaace6da14aa24f Author: Kyle Evans AuthorDate: 2026-02-03 04:48:22 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:12 +0000 tpm: crb: add support for the Pluton startmethod The Pluton startmethod uses a simple doorbell mechanism to wakeup the TPM unit after we've issued various forms of state change, with the registers to use specified in the startmethod-specific segment of the TPM2 table (up to 12 bytes after the StartMethod). At the very least, this is the kind of TPM in use by my AMD Zen 4-based Minisforum machine. (cherry picked from commit e6fa918c4a3ebeb4bcae7614dbb281bda35e06e1) --- sys/dev/tpm/tpm_crb.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 207 insertions(+), 5 deletions(-) diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 28b4f21eccfb..26b53e7a621d 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -75,8 +75,52 @@ #define TPM_CRB_INT_ENABLE_BIT BIT(31) +struct tpmcrb_sc; +/* Attach */ +typedef bool (sm_attach_t)(struct tpmcrb_sc *, void *, size_t); +/* State change notification (timeout == 0 for 'no timeout') */ +typedef bool (sm_statechange_t)(struct tpmcrb_sc *, int); + +struct tpmcrb_sm_cfg { + sm_attach_t *sm_attach; + sm_statechange_t *sm_statechange; + sm_statechange_t *sm_cmdready; +}; + +static sm_attach_t pluton_attach; +static sm_statechange_t pluton_doorbell; + +static const struct tpmcrb_sm_cfg_map { + int acpi_sm; + const char *desc; + const struct tpmcrb_sm_cfg sm_cfg; +} tpmcrb_sm_cfg_map[] = { + { + .acpi_sm = TPM2_START_METHOD_CRB, + .desc = "Trusted Platform Module 2.0, CRB mode", + .sm_cfg = { NULL }, /* No notifications required */ + }, + { + .acpi_sm = ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON, + .desc = "Trusted Platform Module 2.0, CRB mode (Pluton)", + .sm_cfg = { + .sm_attach = &pluton_attach, + .sm_statechange = &pluton_doorbell, + .sm_cmdready = &pluton_doorbell, + }, + }, +}; + struct tpmcrb_sc { struct tpm_sc base; + const struct tpmcrb_sm_cfg *sm_cfg; + union { + /* StartMethod data */ + struct { + uint64_t start_reg; + uint64_t reply_reg; + } pluton; + }; bus_size_t cmd_off; bus_size_t rsp_off; size_t cmd_buf_size; @@ -99,23 +143,46 @@ static bool tpmcrb_cancel_cmd(struct tpm_sc *sc); char *tpmcrb_ids[] = {"MSFT0101", NULL}; +static const struct tpmcrb_sm_cfg_map * +tpmcrb_acpi_startmethod_cfg(int method) +{ + const struct tpmcrb_sm_cfg_map *entry; + + for (size_t i = 0; i < nitems(tpmcrb_sm_cfg_map); i++) { + entry = &tpmcrb_sm_cfg_map[i]; + + if (method == entry->acpi_sm) + return (entry); + } + + return (NULL); +} + static int tpmcrb_acpi_probe(device_t dev) { - int err; + int err, smethod; + const struct tpmcrb_sm_cfg_map *sm_cfg_map; ACPI_TABLE_TPM23 *tbl; ACPI_STATUS status; + err = ACPI_ID_PROBE(device_get_parent(dev), dev, tpmcrb_ids, NULL); if (err > 0) return (err); /*Find TPM2 Header*/ status = AcpiGetTable(ACPI_SIG_TPM2, 1, (ACPI_TABLE_HEADER **) &tbl); - if(ACPI_FAILURE(status) || - tbl->StartMethod != TPM2_START_METHOD_CRB) + if (ACPI_FAILURE(status)) + return (ENXIO); + + smethod = tbl->StartMethod; + AcpiPutTable((ACPI_TABLE_HEADER *)tbl); + + sm_cfg_map = tpmcrb_acpi_startmethod_cfg(smethod); + if (sm_cfg_map == NULL) return (ENXIO); - device_set_desc(dev, "Trusted Platform Module 2.0, CRB mode"); - return (err); + device_set_desc(dev, sm_cfg_map->desc); + return (0); } static ACPI_STATUS @@ -141,6 +208,40 @@ tpmcrb_fix_buff_offsets(ACPI_RESOURCE *res, void *arg) return (AE_OK); } +static bool +tpmcrb_attach_startmethod(struct tpmcrb_sc *crb_sc) +{ + const struct tpmcrb_sm_cfg_map *sm_cfg_map; + const struct tpmcrb_sm_cfg *sm_cfg; + ACPI_TABLE_TPM23 *tbl; + void *smdata; + ACPI_STATUS status; + bool ret; + + /* + * Grab what we need from the StartMethod. + */ + status = AcpiGetTable(ACPI_SIG_TPM2, 1, (ACPI_TABLE_HEADER **)(void **)&tbl); + if (ACPI_FAILURE(status)) + return (false); + + sm_cfg_map = tpmcrb_acpi_startmethod_cfg(tbl->StartMethod); + MPASS(sm_cfg_map != NULL); + sm_cfg = &sm_cfg_map->sm_cfg; + + crb_sc->sm_cfg = sm_cfg; + smdata = tbl + 1; + if (sm_cfg->sm_attach != NULL) { + ret = (*sm_cfg->sm_attach)(crb_sc, smdata, + tbl->Header.Length - sizeof(*tbl)); + } else { + ret = true; + } + + AcpiPutTable((ACPI_TABLE_HEADER *)tbl); + return (ret); +} + static int tpmcrb_attach(device_t dev) { @@ -166,6 +267,11 @@ tpmcrb_attach(device_t dev) return (ENXIO); } + if (!tpmcrb_attach_startmethod(crb_sc)) { + tpmcrb_detach(dev); + return (ENXIO); + } + if(!tpmcrb_request_locality(sc, 0)) { tpmcrb_detach(dev); return (ENXIO); @@ -301,6 +407,30 @@ tpmcrb_cancel_cmd(struct tpm_sc *sc) return (true); } +static bool +tpmcrb_notify_cmdready(struct tpmcrb_sc *crb_sc, int timeout) +{ + sm_statechange_t *cmdready_fn; + + cmdready_fn = crb_sc->sm_cfg->sm_cmdready; + if (cmdready_fn == NULL) + return (true); + + return ((*cmdready_fn)(crb_sc, timeout)); +} + +static bool +tpmcrb_notify_state_changing(struct tpmcrb_sc *crb_sc, int timeout) +{ + sm_statechange_t *statechange_fn; + + statechange_fn = crb_sc->sm_cfg->sm_statechange; + if (statechange_fn == NULL) + return (true); + + return ((*statechange_fn)(crb_sc, timeout)); +} + static bool tpmcrb_state_idle(struct tpmcrb_sc *crb_sc, bool wait) { @@ -312,6 +442,9 @@ tpmcrb_state_idle(struct tpmcrb_sc *crb_sc, bool wait) sc = &crb_sc->base; OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_IDLE); + if (!tpmcrb_notify_state_changing(crb_sc, timeout)) + return (false); + if (timeout > 0) { mask = TPM_CRB_CTRL_STS_IDLE_BIT; if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_STS, mask, mask, @@ -333,6 +466,9 @@ tpmcrb_state_ready(struct tpmcrb_sc *crb_sc, bool wait) sc = &crb_sc->base; OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_READY); + if (!tpmcrb_notify_state_changing(crb_sc, timeout)) + return (false); + if (timeout > 0) { mask = TPM_CRB_CTRL_REQ_GO_READY; if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_STS, mask, !mask, @@ -406,6 +542,13 @@ tpmcrb_transmit(device_t dev, size_t length) TPM_WRITE_4(dev, TPM_CRB_CTRL_START, TPM_CRB_CTRL_START_CMD); TPM_WRITE_BARRIER(dev, TPM_CRB_CTRL_START, 4); + if (!tpmcrb_notify_cmdready(crb_sc, timeout)) { + device_printf(dev, + "Timeout while waiting for device to ready\n"); + if (!tpmcrb_cancel_cmd(sc)) + return (EIO); + } + mask = ~0; if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_START, mask, ~mask, timeout)) { device_printf(dev, @@ -429,6 +572,10 @@ tpmcrb_transmit(device_t dev, size_t length) bus_read_region_stream_1(sc->mem_res, crb_sc->rsp_off + TPM_HEADER_SIZE, &sc->buf[TPM_HEADER_SIZE], bytes_available - TPM_HEADER_SIZE); + /* + * No need to wait for the transition to idle on the way out, we can + * relinquish locality right away. + */ if (!tpmcrb_state_idle(crb_sc, false)) { device_printf(dev, "Failed to transition to idle state post-send\n"); @@ -442,6 +589,61 @@ tpmcrb_transmit(device_t dev, size_t length) return (0); } +/* StartMethod Implementation Details */ + +/** Pluton **/ +struct tpmcrb_startmethod_pluton { + uint64_t sm_startaddr; + uint64_t sm_replyaddr; +}; + +static bool +pluton_attach(struct tpmcrb_sc *crb_sc, void *smdataregion, size_t datasz) +{ + struct tpmcrb_startmethod_pluton *smdata; + struct tpm_sc *sc; + rman_res_t base_addr, end_addr; + + if (datasz < sizeof(*smdata)) + return (false); + + smdata = smdataregion; + sc = &crb_sc->base; + + base_addr = rman_get_start(sc->mem_res); + end_addr = rman_get_end(sc->mem_res); + /* Sanity check */ + if (smdata->sm_startaddr < base_addr || + smdata->sm_startaddr > end_addr || + smdata->sm_replyaddr < base_addr || + smdata->sm_replyaddr > end_addr) + return (false); + + crb_sc->pluton.start_reg = smdata->sm_startaddr - base_addr; + crb_sc->pluton.reply_reg = smdata->sm_replyaddr - base_addr; + return (true); +} + +static bool +pluton_doorbell(struct tpmcrb_sc *crb_sc, int timeout) +{ + struct tpm_sc *sc; + device_t dev; + + sc = &crb_sc->base; + dev = sc->dev; + TPM_WRITE_4(dev, crb_sc->pluton.start_reg, 1); + TPM_WRITE_BARRIER(dev, crb_sc->pluton.start_reg, 4); + + if (timeout > 0) { + if (!tpm_wait_for_u32(sc, crb_sc->pluton.reply_reg, ~0U, 1, + timeout)) + return (false); + } + + return (true); +} + /* ACPI Driver */ static device_method_t tpmcrb_methods[] = { DEVMETHOD(device_probe, tpmcrb_acpi_probe), From nobody Sun Apr 12 03:16:33 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKt3SL4z6YM3M for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKt0wh7z3Npt for ; Sun, 12 Apr 2026 03:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgmXeILrdmCjWGrSXNEMuYfwjvG0eT3PRZJt/gtympE=; b=I3f4UmsQMWuLhyXLL0Omc2p1/2K2MNTWWFYv1y66wWqzbzsa0C7N+x9DCHfLBni57qV9Es hfY9tGESSxcvamQZHuaot8xojP2tgYRMKnUhCF8s7W6UUQKfM35uodT07gV5Xc7DwLJPIE 1+6Z2ccDwY1Fh/hG68ffOrtbZiaLDaU00hjK2xtPZw3L5KaxHrzKTQVxi1vfRZ6DxX60YG /2tTVbaIuUzlnh0hJYxPkTwYlZZVpyTKhCqVqRhnKS7xGToGvlPVDR11M0xw8iVRbltT4U O20vIEgHf5JMQzf+zIuP5I21C/je5ncvsAEoUi8EFkAWn8k7/iKVYqDIB15SIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963794; a=rsa-sha256; cv=none; b=UG4BMDjVfJc7PNWypGNoiLYBR7arPnIqUbxKjj2YD+k/ux+s5ixm5LMDGfX6valufbzQo0 S9kO0W4xXmTYl4njioF4Dvv9AqWWT/Yz41PF0PPi7WgcFc97b+DHBPCMWcZUT7PCl8bHg8 kguA7liG7s8XBzWZNeMsc4QgfGMEXdcQEIGIxuiCDz6YTXmNEQHDgK+gfeLQ6NggBJTyv9 Z1EYR9023+77qvfqxVwUZ8a9PjAZXLKFpSIGc/zGYxxSdKrz3myTbl1XNMUWQKkyWD9wGk W2CxPrbl6apytzV9cks4OgKWfXBIijd7Ll5Kc350kdlNKUFgZRoKPg7sLogD/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgmXeILrdmCjWGrSXNEMuYfwjvG0eT3PRZJt/gtympE=; b=dR6+kG0Kp6xBl1aSeoH5Qzc/w2WwBLhc8qmkpY3Fwf/tkbG3qK69u262JDZGQ12PMayLVM BmuHqtKjjzqNZyf2EEOlRn2PHt6OYYfUWOL/tyb9XG1eRRUcH/OaQuk/RDzrmWlxJZkOx0 NX6nnGlkhK8niRAKRGgDIYLf9Fhg6REqRtJAjTEixpYgEpLkD4V8ygMC7H0M0I1O6Rs0Af H7THjEujfUrhgcAFRy1yzZqpXGdjNDHvjO3+FwPlwoOInqUdURUqSu8TGB8YGxjnecTw71 3NnoDnbc/rZOhco6WqgQGQlpQKXFW39R9OtOj5k686Lpi++7YonCnDCGnQ7Rxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKs6XnMz10D1 for ; Sun, 12 Apr 2026 03:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4763e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Kyle Evans Subject: git: 07ce8141554b - stable/15 - OptionalObsoleteFiles: Add etc/zfs/compatibility.d List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 07ce8141554b3df7ac9135135039b508f8e3a6b8 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:33 +0000 Message-Id: <69db0e91.4763e.3eaad99c@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=07ce8141554b3df7ac9135135039b508f8e3a6b8 commit 07ce8141554b3df7ac9135135039b508f8e3a6b8 Author: Artem Bunichev AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:13 +0000 OptionalObsoleteFiles: Add etc/zfs/compatibility.d If the world is built and installed with WITHOUT_ZFS, then make -DBATCH_DELETE_OLD_FILES delete-old-dirs will give the error: > rmdir: /etc/zfs: Directory not empty because /etc/zfs/compatibility.d is still there. While we're here, clean out /usr/share/zfs as well. Co-authored-by: kevans (cherry picked from commit 5c9d988d865cc4ce849507173c0a2e2f399d0f62) --- tools/build/mk/OptionalObsoleteFiles.inc | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index bea969b77457..6922fe2c5938 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -9248,6 +9248,7 @@ OLD_FILES+=etc/rc.d/zvol OLD_FILES+=etc/devd/zfs.conf OLD_FILES+=etc/periodic/daily/404.status-zfs OLD_FILES+=etc/periodic/daily/800.scrub-zfs +OLD_DIRS+=etc/zfs/compatibility.d OLD_FILES+=etc/zfs/exports OLD_DIRS+=etc/zfs OLD_LIBS+=lib/libavl.so.2 @@ -9333,6 +9334,63 @@ OLD_FILES+=usr/share/man/man8/zfsbootcfg.8.gz OLD_FILES+=usr/share/man/man8/zfsd.8.gz OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz +OLD_FILES+=usr/share/zfs/compatibility.d/2018 +OLD_FILES+=usr/share/zfs/compatibility.d/2019 +OLD_FILES+=usr/share/zfs/compatibility.d/2020 +OLD_FILES+=usr/share/zfs/compatibility.d/2021 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2018 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2019 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2020 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2021 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.4 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.4 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-9.10.2 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2-2.06 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2-2.12 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.0-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.0-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.1-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.1-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.7.0 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.8.1 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.9.3 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.9.4 +OLD_FILES+=usr/share/zfs/compatibility.d/truenas-12.0 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-18.04 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-20.04 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-22.04 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.1 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.4 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.5 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.7 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.8 +OLD_DIRS+=usr/share/zfs/compatibility.d +OLD_DIRS+=usr/share/zfs .endif .if ${MK_ZONEINFO} == no From nobody Sun Apr 12 03:16:35 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKv5mhmz6YMCR for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKv1RYwz3Nn5 for ; Sun, 12 Apr 2026 03:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OzOi6+H752mzAGh0TM+AhJLwbxRwR3xSA0UwQTed9jY=; b=j4SfDV9yWgEwCyOq/KGABL+ydvp8vsO0MYaKjjhCdIIhQAkD/JCoW8Dyb0seam4fJssV7/ vzs8KqQFdYfaAeNPNxS2ki/ZoTKnZceUI4CabhX6chaLbJK3hU2kgFLkLNIZId8CgOdO8s waEyp2C8EjfRMiQilORpVStIPTxzpd76BzqBciaQcvWeL46g9gg9B3Pa/RhLqIcz4bKFs4 BaWJlSO0FgYaZDg4z+ptUwQuL8Kamo8QBXf89gDwoXuYsKUqG68AO7Viej0vI7di8cCbHl b7j9ZFuu2H1jpM7wJtEqU4+7JkKXS9wRh/R8oHzjRrCVtx6x1JJvG8wNwYYVWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963795; a=rsa-sha256; cv=none; b=xHoirRwAY2K0YmuAlGLkAvPOhqEMsRSv/1nISUUyl/LZEtELeCbbGHeO54f/g2jScd3Tz8 tytUbCkLvxxzLV7/TexezqjqXtt5TYlDNgb10FI3wy9UyblK2fhtEWEObLGVN6yx+OepJv IJaN95XJvTNLk1Ot8Nzj6XBVrRJaSOES3sdqrnShp/Gr616n50AXWyRP+8MkZpngnMTqe4 ECHI6c2fhKQW/KQvPZcPktavVTegHwq/uEF5QP+9kIYzpIL/BHf59/uc2QV6OFXc3xTKlJ mRlXEfD6C+WOgcZH+Gk3aNjG8WEElB+uHv2BGF4Up9sk6uUPu/eyN2ExsAangA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OzOi6+H752mzAGh0TM+AhJLwbxRwR3xSA0UwQTed9jY=; b=hMRv0xSJq5xjZGJBNWkn1t+RXlhrrUQIUmTNcpP5Cifvp3+s/asHpBtGxlJ5b1Y5G1CKiR z7xkDDO2PcUUBEDZdjvOAn2wWkKKia1JcXImHXCA7GLn07+Z091WQrM952V0OWjanhOO2x dNF+uBVk9ux/Q4scoB516g8anf77R1BSPrVYmVySfpAbT9LYAl4wFnMYtf1WWP7Dr1gbom FdhVTd6qXVfUZ7OwR8hqpF/RqOotfbjXvkZs64IubThGhPv6DLoX7Xq7QGWq2QDlWlwxl5 CVOkS2u6dIL+Jyc6HPVxA8BVu1Kpg4GH9RxVC9C84kpoIkyUFcjMjbT87J2F/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKv0DtMz10Jq for ; Sun, 12 Apr 2026 03:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4750d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 21fcae195867 - stable/15 - tpm20: fix suspend/resume and entropy harvesting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 21fcae1958672a08726d20a95baaf91940511faa Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:35 +0000 Message-Id: <69db0e93.4750d.26aba45d@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=21fcae1958672a08726d20a95baaf91940511faa commit 21fcae1958672a08726d20a95baaf91940511faa Author: Kyle Evans AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:13 +0000 tpm20: fix suspend/resume and entropy harvesting There were a few problem here: - TPM2_Shutdown results in a response that we need to either process or ignore, otherwise any tpm20_write or tpm20_harvest call will trivially hang on an `sc->pending_data_length != 0` - We should have a matching TPM2_Startup upon resume to restore any state that should have persisted - We must drain the harvest task before we suspend to avoid problems there This commit is sufficient to avoid breaking suspend/resume. PR: 291067 Co-authored-by: markj Tested by: garga (cherry picked from commit 38a4995eb52db21116f8b37ed942e66a8c2f050f) --- sys/dev/tpm/tpm20.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/tpm/tpm20.h | 1 + sys/dev/tpm/tpm_crb.c | 1 + sys/dev/tpm/tpm_tis_core.c | 1 + 4 files changed, 68 insertions(+) diff --git a/sys/dev/tpm/tpm20.c b/sys/dev/tpm/tpm20.c index 067e7ccae8f9..ca73b0de8529 100644 --- a/sys/dev/tpm/tpm20.c +++ b/sys/dev/tpm/tpm20.c @@ -45,6 +45,7 @@ static void tpm20_discard_buffer(void *arg); #ifdef TPM_HARVEST static void tpm20_harvest(void *arg, int unused); #endif +static int tpm20_restart(device_t dev, bool clear); static int tpm20_save_state(device_t dev, bool suspend); static d_open_t tpm20_open; @@ -242,9 +243,31 @@ tpm20_release(struct tpm_sc *sc) destroy_dev(sc->sc_cdev); } +int +tpm20_resume(device_t dev) +{ + + tpm20_restart(dev, false); + +#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM + struct tpm_sc *sc; + + sc = device_get_softc(dev); + taskqueue_enqueue_timeout(taskqueue_thread, &sc->harvest_task, + hz * TPM_HARVEST_INTERVAL); +#endif + return (0); +} + int tpm20_suspend(device_t dev) { +#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM + struct tpm_sc *sc; + + sc = device_get_softc(dev); + taskqueue_drain_timeout(taskqueue_thread, &sc->harvest_task); +#endif return (tpm20_save_state(dev, true)); } @@ -307,6 +330,43 @@ tpm20_harvest(void *arg, int unused) } #endif /* TPM_HARVEST */ +static int +tpm20_restart(device_t dev, bool clear) +{ + struct tpm_sc *sc; + uint8_t startup_cmd[] = { + 0x80, 0x01, /* TPM_ST_NO_SESSIONS tag*/ + 0x00, 0x00, 0x00, 0x0C, /* cmd length */ + 0x00, 0x00, 0x01, 0x44, /* cmd TPM_CC_Startup */ + 0x00, 0x01 /* TPM_SU_STATE */ + }; + + sc = device_get_softc(dev); + + /* + * Inform the TPM whether we are resetting or resuming. + */ + if (clear) + startup_cmd[11] = 0; /* TPM_SU_CLEAR */ + + if (sc == NULL || sc->buf == NULL) + return (0); + + sx_xlock(&sc->dev_lock); + + MPASS(sc->pending_data_length == 0); + memcpy(sc->buf, startup_cmd, sizeof(startup_cmd)); + + /* XXX Ignoring both TPM_TRANSMIT return and tpm's response */ + TPM_TRANSMIT(sc->dev, sizeof(startup_cmd)); + sc->pending_data_length = 0; + sc->total_length = 0; + + sx_xunlock(&sc->dev_lock); + + return (0); +} + static int tpm20_save_state(device_t dev, bool suspend) { @@ -331,8 +391,13 @@ tpm20_save_state(device_t dev, bool suspend) sx_xlock(&sc->dev_lock); + MPASS(sc->pending_data_length == 0); memcpy(sc->buf, save_cmd, sizeof(save_cmd)); + + /* XXX Ignoring both TPM_TRANSMIT return and tpm's response */ TPM_TRANSMIT(sc->dev, sizeof(save_cmd)); + sc->pending_data_length = 0; + sc->total_length = 0; sx_xunlock(&sc->dev_lock); diff --git a/sys/dev/tpm/tpm20.h b/sys/dev/tpm/tpm20.h index 7c2ccd30143a..7f6e8f39c5e6 100644 --- a/sys/dev/tpm/tpm20.h +++ b/sys/dev/tpm/tpm20.h @@ -136,6 +136,7 @@ struct tpm_sc { }; int tpm20_suspend(device_t dev); +int tpm20_resume(device_t dev); int tpm20_shutdown(device_t dev); int32_t tpm20_get_timeout(uint32_t command); int tpm20_init(struct tpm_sc *sc); diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 26b53e7a621d..18414a6c799b 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -651,6 +651,7 @@ static device_method_t tpmcrb_methods[] = { DEVMETHOD(device_detach, tpmcrb_detach), DEVMETHOD(device_shutdown, tpm20_shutdown), DEVMETHOD(device_suspend, tpm20_suspend), + DEVMETHOD(device_resume, tpm20_resume), DEVMETHOD(tpm_transmit, tpmcrb_transmit), {0, 0} }; diff --git a/sys/dev/tpm/tpm_tis_core.c b/sys/dev/tpm/tpm_tis_core.c index 4159de4daf3b..34ecfcc283b1 100644 --- a/sys/dev/tpm/tpm_tis_core.c +++ b/sys/dev/tpm/tpm_tis_core.c @@ -487,6 +487,7 @@ static device_method_t tpmtis_methods[] = { DEVMETHOD(device_detach, tpmtis_detach), DEVMETHOD(device_shutdown, tpm20_shutdown), DEVMETHOD(device_suspend, tpm20_suspend), + DEVMETHOD(device_resume, tpm20_resume), DEVMETHOD(tpm_transmit, tpmtis_transmit), DEVMETHOD_END }; From nobody Sun Apr 12 03:16:36 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKw4drVz6YMCY for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKw1mRfz3NsT for ; Sun, 12 Apr 2026 03:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QUWxf0hQ4FqNNC0pyGGaXgVKge1Bqt2fuCZdVTRr7tI=; b=AOA2gd8UACYL5y0HTdNCx4OhfOBY0xRWgKBHQPQ310ql4+3W1l1CAGEY6OWPNVkO8VsuTQ 5w1iDLD+jOcaIWhOSHDdUgLH1c5gDrqcKSDV+WYrzERHk8h5EtV50/XwXUA2u0xV2ftpCU MGdUqQfIAPcBqsWoQTxFFwAlK5wJzCqStJYy0BibabFo0O5yxOjalF6dtlUHqVJxiY/UXq pCG9Kx/Effdki+I13N9mz95wbqscN7RSL52kj1xlKtyHMB2YOhVWj7eakXk2yyorF/ScxP 6bsQd/Ye/+ZMdNofCgV8nYmZyWy5dwvnUROUUlV5XxrYJdaePFFyX+OXN9hQqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963796; a=rsa-sha256; cv=none; b=H0Dbctpita9Qa/iJV9l7xZqa9LRvDmtX+KN4H9XhqfrApSoHFjyZVE3HZG17eq12gHrqJ0 dQ3zI+iXcTR8rTJLWNAJ4iPQaBO8gj5Nt97Q1sQ9Qv5afEgWX0TykJGpt9b9gH8W/BOoEU GU1jIkZvXRfM0hFJ4i0wq+6p513l3kaUeRpgxOELd0MaXgXw95xqAJMj6DWi1DaQfFuSPP 66D8wlJSmxWDj/uMKQuR8y5AkfSI0r9/ch7GKpwFAVldb5ZgXA5WTAux7mm2qwbg8TSoUL xHP1kn+HCRKwhfuSUSUbup1pbqo70YGHaQJ/GlJ2F9n+seC+SDTV3UZ0vb+C6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QUWxf0hQ4FqNNC0pyGGaXgVKge1Bqt2fuCZdVTRr7tI=; b=fn5hhQZEz7OP/K8msMrHMWRTRmfwEcO9mEHkdqkFvzHwmixHwtHE3aF8Vtatc3L02wFXGJ bnRRx4dvgvLSFmEANBOGp2kIjDaMw6UiUAeClxsf9fzCfGrOfkdptRApxKXyo+o7YbdbRP 1hvirnMBuYUbkHYAPo+pyQi/dNBYT5ooTZVz++9g5bsCu/xviKIUYrU/rYl4aOpIF2X+1k 58e2N+tT9pEfIK3dksZLhSrwQ1+Zdx7Wuv/u7mCRpJiBxKmazfpmt/AoEs/1jvHcYa/TSR Hx2IeWypwda0zsbxxYBGSQ0azAk4vihiA3h9MsvaBb4YuJAB+5f2a39kvluN5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKw0l7kzybf for ; Sun, 12 Apr 2026 03:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 478d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pat Maddox From: Kyle Evans Subject: git: 2b5087e9850b - stable/15 - bectl: Add -E flag to create an empty boot environment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2b5087e9850b088f3e0a997e4a94a1c0806d1b93 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:36 +0000 Message-Id: <69db0e94.478d6.a516c63@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2b5087e9850b088f3e0a997e4a94a1c0806d1b93 commit 2b5087e9850b088f3e0a997e4a94a1c0806d1b93 Author: Pat Maddox AuthorDate: 2026-02-05 03:54:09 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:14 +0000 bectl: Add -E flag to create an empty boot environment Signed-off-by: Pat Maddox Reviewed by: kevans (cherry picked from commit 2e020c84cb5ee1452e448f27ff7a7b6076c0147a) --- lib/libbe/be.c | 64 +++++++++++++++++++++++++++++++++--------- lib/libbe/be.h | 1 + lib/libbe/libbe.3 | 9 +++++- lib/libbe/tests/Makefile | 2 +- lib/libbe/tests/be_create.sh | 9 ++++++ lib/libbe/tests/target_prog.c | 11 +++++--- sbin/bectl/bectl.8 | 14 ++++++++- sbin/bectl/bectl.c | 16 +++++++++-- sbin/bectl/tests/bectl_test.sh | 8 ++++++ 9 files changed, 111 insertions(+), 23 deletions(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 4a7c2e43b2c1..2147435ebf9b 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -891,6 +891,54 @@ be_create_from_existing(libbe_handle_t *lbh, const char *bename, const char *old return (set_error(lbh, err)); } +/* + * Create a zfs dataset and map the return to libbe error. + */ +static int +be_zfs_create(libzfs_handle_t *lzh, const char *buf, zfs_type_t t, + nvlist_t *props) +{ + int err; + + if ((err = zfs_create(lzh, buf, t, props)) != 0) { + switch (err) { + case EZFS_EXISTS: + return (BE_ERR_EXISTS); + case EZFS_NOENT: + return (BE_ERR_NOENT); + case EZFS_BADTYPE: + case EZFS_BADVERSION: + return (BE_ERR_NOPOOL); + case EZFS_BADPROP: + default: + /* We set something up wrong, probably... */ + return (BE_ERR_UNKNOWN); + } + } + + return (BE_ERR_SUCCESS); +} + + +/* + * Create an empty boot environment. + */ +int +be_create_empty(libbe_handle_t *lbh, const char *bename) +{ + char buf[BE_MAXPATHLEN]; + int err; + + if ((err = be_validate_name(lbh, bename)) != 0) + return (set_error(lbh, err)); + + if ((err = be_root_concat(lbh, bename, buf)) != 0) + return (set_error(lbh, err)); + + err = be_zfs_create(lbh->lzh, buf, ZFS_TYPE_FILESYSTEM, NULL); + return (set_error(lbh, err)); +} + /* * Verifies that a snapshot has a valid name, exists, and has a mountpoint of @@ -1118,21 +1166,9 @@ be_create_child_noent(libbe_handle_t *lbh, const char *active, nvlist_add_string(props, "mountpoint", child_path); /* Create */ - if ((err = zfs_create(lbh->lzh, active, ZFS_TYPE_DATASET, + if ((err = be_zfs_create(lbh->lzh, active, ZFS_TYPE_DATASET, props)) != 0) { - switch (err) { - case EZFS_EXISTS: - return (set_error(lbh, BE_ERR_EXISTS)); - case EZFS_NOENT: - return (set_error(lbh, BE_ERR_NOENT)); - case EZFS_BADTYPE: - case EZFS_BADVERSION: - return (set_error(lbh, BE_ERR_NOPOOL)); - case EZFS_BADPROP: - default: - /* We set something up wrong, probably... */ - return (set_error(lbh, BE_ERR_UNKNOWN)); - } + return (set_error(lbh, err)); } nvlist_free(props); diff --git a/lib/libbe/be.h b/lib/libbe/be.h index d3f47c0604fe..18be067c4410 100644 --- a/lib/libbe/be.h +++ b/lib/libbe/be.h @@ -65,6 +65,7 @@ bool be_is_auto_snapshot_name(libbe_handle_t *, const char *); /* Bootenv creation functions */ int be_create(libbe_handle_t *, const char *); int be_create_depth(libbe_handle_t *, const char *, const char *, int); +int be_create_empty(libbe_handle_t *, const char *); int be_create_from_existing(libbe_handle_t *, const char *, const char *); int be_create_from_existing_snap(libbe_handle_t *, const char *, const char *); int be_snapshot(libbe_handle_t *, const char *, const char *, bool, char *); diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index 4331713e9227..f65da5ef1090 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 11, 2025 +.Dd February 4, 2026 .Dt LIBBE 3 .Os .Sh NAME @@ -69,6 +69,9 @@ .Fn be_create_depth "libbe_handle_t *hdl" "const char *be_name" "const char *snap" "int depth" .Pp .Ft int +.Fn be_create_empty "libbe_handle_t *hdl" "const char *be_name" +.Pp +.Ft int .Fn be_create_from_existing "libbe_handle_t *hdl" "const char *be_name" "const char *be_origin" .Pp .Ft int @@ -282,6 +285,10 @@ A depth of '0' is no recursion and '-1' is unlimited (i.e., a recursive boot environment). .Pp The +.Fn be_create_empty +function creates an empty boot environment with the given name. +.Pp +The .Fn be_create_from_existing function creates a boot environment with the given name from the name of an existing boot environment. diff --git a/lib/libbe/tests/Makefile b/lib/libbe/tests/Makefile index 20a4e1ddfeb7..ffd2d03c5ffd 100644 --- a/lib/libbe/tests/Makefile +++ b/lib/libbe/tests/Makefile @@ -19,6 +19,6 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY .include diff --git a/lib/libbe/tests/be_create.sh b/lib/libbe/tests/be_create.sh index e1342368995d..e39ce1a0ccb4 100755 --- a/lib/libbe/tests/be_create.sh +++ b/lib/libbe/tests/be_create.sh @@ -174,6 +174,15 @@ libbe_create_body() # the child dataset should exist atf_check -o not-empty \ zfs list "${zpool}/ROOT/relative-snap/usr" + + # test empty BE creation. + atf_check $prog "${zpool}/ROOT" \ + empty \ + ignored \ + 0 + # the dataset should exist + atf_check -o not-empty \ + zfs list "${zpool}/ROOT/empty" } libbe_create_cleanup() diff --git a/lib/libbe/tests/target_prog.c b/lib/libbe/tests/target_prog.c index 4c79d1a30714..83ef68ab2890 100644 --- a/lib/libbe/tests/target_prog.c +++ b/lib/libbe/tests/target_prog.c @@ -27,6 +27,7 @@ #include #include +#include /* * argv[1] = root boot environment (e.g. zroot/ROOT), @@ -36,15 +37,17 @@ */ int main(int argc, char *argv[]) { - libbe_handle_t *lbh; + libbe_handle_t *lbh; if (argc != 5) - return -1; + return (-1); - if ((lbh = libbe_init(argv[1])) == NULL) - return -1; + if ((lbh = libbe_init(argv[1])) == NULL) + return (-1); libbe_print_on_error(lbh, true); + if (strcmp(argv[2], "empty") == 0) + return (be_create_empty(lbh, argv[2])); return (be_create_depth(lbh, argv[2], argv[3], atoi(argv[4]))); } diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 0e08b3383e9a..7614bea2ddad 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd June 13, 2025 +.Dd February 4, 2026 .Dt BECTL 8 .Os .Sh NAME @@ -33,6 +33,11 @@ .Ar beName@snapshot .Nm .Op Fl r Ar beroot +.Cm create +.Fl E +.Ar newBeName +.Nm +.Op Fl r Ar beroot .Cm destroy .Op Fl \&Fo .Ar beName Ns Op Cm @ Ns Ar snapshot @@ -181,6 +186,13 @@ for a discussion on different layouts. .Pp No new boot environment is created with this subcommand. .It Xo +.Cm create +.Fl E +.Ar newBeName +.Xc +Create a new empty boot environment named +.Ar newBeName . +.It Xo .Cm destroy .Op Fl \&Fo .Ar beName Ns Op Cm @ Ns Ar snapshot diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 28483dae17b2..7f462984267f 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -53,6 +53,7 @@ usage(bool explicit) "\tbectl [-r beroot] check\n" "\tbectl [-r beroot] create [-r] [-e {nonActiveBe | beName@snapshot}] beName\n" "\tbectl [-r beroot] create [-r] beName@snapshot\n" + "\tbectl [-r beroot] create -E beName\n" "\tbectl [-r beroot] destroy [-Fo] {beName | beName@snapshot}\n" "\tbectl [-r beroot] export sourceBe\n" "\tbectl [-r beroot] import targetBe\n" @@ -184,15 +185,19 @@ bectl_cmd_create(int argc, char *argv[]) char snapshot[BE_MAXPATHLEN]; char *atpos, *bootenv, *snapname; int err, opt; - bool recursive; + bool empty, recursive; snapname = NULL; + empty = false; recursive = false; - while ((opt = getopt(argc, argv, "e:r")) != -1) { + while ((opt = getopt(argc, argv, "e:Er")) != -1) { switch (opt) { case 'e': snapname = optarg; break; + case 'E': + empty = true; + break; case 'r': recursive = true; break; @@ -221,6 +226,13 @@ bectl_cmd_create(int argc, char *argv[]) */ *atpos++ = '\0'; err = be_snapshot(be, bootenv, atpos, recursive, NULL); + } else if (empty) { + if (snapname || recursive) { + fprintf(stderr, + "bectl create: -E cannot be combined with -e or -r\n"); + return (usage(false)); + } + err = be_create_empty(be, bootenv); } else { if (snapname == NULL) /* Create from currently booted BE */ diff --git a/sbin/bectl/tests/bectl_test.sh b/sbin/bectl/tests/bectl_test.sh index 8084b0a173f4..6aa94127aa36 100755 --- a/sbin/bectl/tests/bectl_test.sh +++ b/sbin/bectl/tests/bectl_test.sh @@ -126,6 +126,14 @@ bectl_create_body() zfs list "${zpool}/ROOT/recursive/usr" atf_check -o not-empty \ zfs list "${zpool}/ROOT/recursive-snap/usr" + + # Test creation of an empty BE. + atf_check bectl -r ${zpool}/ROOT create -E empty + atf_check -o inline:"-\n" zfs get -H -o value origin ${zpool}/ROOT/empty + atf_check -e match:"cannot be combined" -s not-exit:0 \ + bectl -r ${zpool}/ROOT create -E -e not-allowed empty-existing + atf_check -e match:"cannot be combined" -s not-exit:0 \ + bectl -r ${zpool}/ROOT create -E -r empty-recursive } bectl_create_cleanup() { From nobody Sun Apr 12 03:16:37 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKx4X3lz6YLhT for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKx2l5Jz3NsZ for ; Sun, 12 Apr 2026 03:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmfEgbAAQ7VMFnh6UPll1cPLBcfk4oRyGUNZAbtazmM=; b=Hu/i9NKCIMvsdTZEvDW1LectedNRebS8Sni0grqGvIXNRBSedcc1ALciooMT5/Vm6bz84x kCwqPhJeoxuyFgVq2legGwwgQS39DBqoi6AWsLs8JVxVGynrbHoYL5kRDTU7BFvZuCzNjw 06dwnT4oqvUaXDxftRwHVyCm9v6cMYVZfsKWfIGUY4SEPs4R+0PI0wiw9IoSCMaIb+6vd1 0CKaTdcY/UX7p4/vppLxM3uH1+Mm1O+xwW22XJamAfxqqeZnPeEa2hITLu7+ZHoOXR2NI/ d3rCKYtNsu9Od44A9PFKDkbk5zWD1E5el0wUJ54m8X2C/+jBnohYShiOUTDtkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963797; a=rsa-sha256; cv=none; b=G/UX+wzYdTuS0EgjubF70VrJdFUCDDPwoQ61+axkiCH8a5OGXu2W2tXqq8HYqg4RPAn0O4 gCrWnjoRMVfB830Ui/NNa75serANMYiH6W2cs1cUOzWRkUmk9R3/stmc9kPwVOXo8HZpkA i3Y1TmuUt+ExnPSnobTatIEFVbTgcsmUNpAQ4ade8kMG7KYC+9ZhqRKmI1vTHXq/M7Eaz8 NsKDhlc4jmCLzogMqJG4mrH5wJZzQtBx6yiStIn2IeXcolfGSnMH11OeR2cgsw14UGtFcb 1aZvaAEmV1JVNJ4fGwDI+6kbHuCnexWk2zhlYesyKCazTFU3yXGuhWGi0/7mFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmfEgbAAQ7VMFnh6UPll1cPLBcfk4oRyGUNZAbtazmM=; b=MEuIaOp0anPfmwRQU2Sz/XiImzMgFWLwXVkXrFEYIMyhE0uFc3mFPfUvFqeLH5WntWMhm5 wWbgIXbNFLLxx5K+rvJxgjGxtdYySs1c5ZBSzCUSBfJwuI3WsdX01iST5YD7zscC2fwesD 6++/kQnSjiThLsn6lAAq6gPdiWGf1EOClGbOBO/aY4sht9Y9H4obMoL/9KPjK69/0Bal9v pow7FXbbKqdOo/UrOq/r35S8TcWU9bTbnXXcRaUFBplDmZFUjirXedO3OJd/CsatnXfZmv kYIxQrzFpPG4gDQ3p90RjASIalGzAoe6XNfMSA0UtfOGLh6KGWneS8c+gu9eag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKx1YJHzySt for ; Sun, 12 Apr 2026 03:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 473a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pat Maddox From: Kyle Evans Subject: git: a41c4d904b85 - stable/15 - release: Pass optional VM_IMAGE_CONFIG to vm-image List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: a41c4d904b85ed805e3adf401c4fe5d261e457e2 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:37 +0000 Message-Id: <69db0e95.473a0.38bbb53@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a41c4d904b85ed805e3adf401c4fe5d261e457e2 commit a41c4d904b85ed805e3adf401c4fe5d261e457e2 Author: Pat Maddox AuthorDate: 2026-02-06 07:50:20 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:14 +0000 release: Pass optional VM_IMAGE_CONFIG to vm-image `make vm-image` calls mk-vmimage.sh, which supports `-c CONFFILE`. This file gets sourced before building the image. One example of how to use it is to define vm_extra_filter_base_packages() to filter the list of packages installed into the VM image: # vm-nodbg32.conf vm_extra_filter_base_packages() { grep -v -E '(-dbg|lib32)' } $ make VM_IMAGE_CONFIG=path/to/vm-nodbg32.conf \ VMFORMATS=raw \ -DWITH_VMIMAGES \ vm-image Signed-off-by: Pat Maddox Reviewed by: cperciva (cherry picked from commit 93f482ab3e6b4577f13e85e216a50bdf3704dda3) --- release/Makefile.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index 3e5f4936b518..abbfcb341afc 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -211,6 +211,7 @@ vm-image: ${QEMUTGT} ${PKGBASE_REPO_DIR} PKGBASE_REPO_DIR=${.OBJDIR}/pkgbase-repo-dir \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ + ${VM_IMAGE_CONFIG:D-c ${VM_IMAGE_CONFIG}} \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} || true From nobody Sun Apr 12 03:16:38 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKy5qqMz6YMFp for ; Sun, 12 Apr 2026 03:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKy431zz3Nw2 for ; Sun, 12 Apr 2026 03:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XdYIU1emKjX4uvel3Mo+7tyCnHBkMdRRGkdZquVwuU=; b=UAl5fyfO7YTD47SsfIvkOyeOOsAvysraOgDC7w3xT/5BTG6KOVUOSB+cLd2MKeBqoEQhx5 v9E7SWsYEDwu+yE9tv/nSNUO3VJoCeczfiXMkoHqreanM4mLsjwXk5YE9r7UdGkNFww86d YrTbL7mU4KSPFZQuvg1gX/QdQ90HlntDuPCFSNNd2DicM8FMdhRRJKeEJuxEUA368KTb4H H88iFBesdyoh5ZDITH6vH3kBLk/7fNMHi+1pjgAukCVgkcJST+yE9/bpma04Pn6Ay/BInt L7Y75kBxK+iwnUzmsDxB64Ttoajp+1JY9MMyoOn7U++c2tNSFSj0wBG9JCazIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963798; a=rsa-sha256; cv=none; b=b/xr/HhJAxDGrjuyFXjCS0I2aO8vKu31J6jXFX8aQvjsq97PqNsHvmf2SDVX+bVj2jKFao JsMrkkbJl1bJ62/Mofrr90htktoJWB01LGKcjukze1IIp8EFUcJjFB3HWYmcs5D2nle2jQ DHeo8M89omZHhl87GGDLQk7nEAPOUaU5sGYkTkLXoKkxMCp0gv5VJ2NFNRWercxRJaqab6 UDh79fc47+lfg8c9cROjZIEZFo7JalCgGy5ZYGX3InC7RA0+03t2LXjN+zw8WWORVVbE0i OyWNi54zoGKSBGrEpW1lWqPmeYSOaCITcH6E1KtV8pDKpLU/fnzwxM9Y/umIzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XdYIU1emKjX4uvel3Mo+7tyCnHBkMdRRGkdZquVwuU=; b=jQrFalDC6gr0ZFTA7po7gcqUa7PAu/FpCDGOFWCeIiy+FJz7VoFt123X4rcQU9rjuYD6nU 1bfzQ7o+qsiR1jkZxpJFp7V7aSRx9n5SGMnK8IXwwEtu7s4yg29/USows5xp2hZY0tQyM3 sWN5FZ9CWDvr51VidU3mR46Ln+BF8CJ+sbWO2K7ytT/hxMnX2AHCBBuNpwngqnVxF1EUSe ZlSsV5t9997Le+seeUmhOG1UC5UuSBKqjbdfcVOPsDfKbkhUV8tHGHbXOXU0uO8eOv7qoK eEEO9SXYNgciws5Udbtwzx88I6rr83p/0n1npGfO+jrjAjsgsGvfnLZG+odwLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKy25dQzySv for ; Sun, 12 Apr 2026 03:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47808 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Herbert J. Skuhra From: Kyle Evans Subject: git: 2129e6254dd4 - stable/15 - ObsoleteFiles: remove the shar(1) manpage as well List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 2129e6254dd430abf3cb0e44620af6b4de0875dc Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:38 +0000 Message-Id: <69db0e96.47808.3e1edd81@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2129e6254dd430abf3cb0e44620af6b4de0875dc commit 2129e6254dd430abf3cb0e44620af6b4de0875dc Author: Herbert J. Skuhra AuthorDate: 2026-02-09 14:47:41 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:14 +0000 ObsoleteFiles: remove the shar(1) manpage as well Fixes: 3fde39073c ("shar: remove from the tree [...]") (cherry picked from commit bb0734cf2446ce2be829edfa421af3aa558d2c70) --- ObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 86358dabf407..87cf56fe1972 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -214,6 +214,7 @@ OLD_DIRS+=usr/share/examples/drivers # 20250710: shar(1) removed OLD_FILES+=usr/bin/shar +OLD_FILES+=usr/share/man/man1/shar.1.gz # 20250708: For 34 days 15.0-CURRENT installed libkadm5clnt symlink without .so OLD_FILES+=usr/lib/libkadm5clnt From nobody Sun Apr 12 03:16:39 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbL020p1z6YMD8 for ; Sun, 12 Apr 2026 03: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKz3TMTz3P78 for ; Sun, 12 Apr 2026 03: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=1775963799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xItzYIUi2IkULHWjR3g55vkJ1jrjuu68lIQpd60v9OE=; b=nnbR/D0V9gJMV2JgpyTd7Qd8PmdpReami02IedmmMxmrmMFbQlZGkNXwlSjQ4+Q6N+yb+0 FuMDawePLk8c8nESqu6p8jNWu0JrMXeEHyM26BrlBE5orDD4hIoclK5s3JHC0EGRXZJGAt 2zjP1Y/aXuOyBGaWtBso1I96GxqTPHQlmZnScfXMCnlollwyWzetyt2EbmjyCyVm1GLtgy YKR8ZXR6mtXGTiXYLtPP9Yivz9o2+z8mk3FvgRI7+bGSypBpDakqRIDGn7rGeGYiO9jKwQ jbQ0VCbKKu8hEZ1hOsEO7JN/Irzd8+PxHUGGigP/Zd2eOvJfiKrRKMNim95ZsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963799; a=rsa-sha256; cv=none; b=Rlo61RqJ8xVns4iTSR3PRQRL0b1j+PwdJARG6cFJgroKpRMB2P58V5OSTxUWGyMda4AqT1 79DiCefLdIKfkMIg/2V/EC0XCjQtEI+5SFC9sW1axxGftAc6sJQ/osBI69Gu+aiQylWhYQ PX3ZMEfp9yczlvKhabZCHIckYg5k820R9QOnIFqEJcTtSBrQ7fhfSf6RYikFW0QeFIoFj5 e4drPrLBiI/RkDfS0a5Y/dtqtLqRaNMiuXn4o1Wt/Roz3Qrm+NFjujgluFU8hyyPbpSRXX BLlm/cqnYiT1O4NvyuUJYEeATkJbGFiWjda42RWoW6Z+zQo9kExbNTqQm2fwCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xItzYIUi2IkULHWjR3g55vkJ1jrjuu68lIQpd60v9OE=; b=sPmYr3GO4kubtTuOWiBiZ0i974/0s9nzosOJuIY9YqFKL0K1mVCA2FyWS1wZ0DoAMcy53w LsZFexQzHnpy8TTgX4HbMn4OJPnXw+QZMhuFPzMt8vTSCUR1rFGTsvmQ8Ox0XNDFPRGS2U mXp6F7YNooEci8wf5cHCxI5kNfYXioI62FudA63Dvtu/ptWjsrEzeyc8v2yoKKkotejI7a h48CRLgLCgnQfmqrSVDeBtsIAZrx2FblKZeQyrv34Q/3Tk4Hctow+O2xTBc3oCZO8mCseN 7bs7n8f9OyAgAyIXARpXbbbeeuNtTkdBD/XjHAE+93GIIfOKFx1JCP7q1sQpWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKz31sHz10Jx for ; Sun, 12 Apr 2026 03:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47511 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7bb6c194c969 - stable/15 - ls: check fts_children() for errors that may not surface otherwise List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 7bb6c194c9695377a643b26b59be4af4852c8227 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:39 +0000 Message-Id: <69db0e97.47511.9b4edfb@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7bb6c194c9695377a643b26b59be4af4852c8227 commit 7bb6c194c9695377a643b26b59be4af4852c8227 Author: Kyle Evans AuthorDate: 2026-02-11 19:55:55 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:15 +0000 ls: check fts_children() for errors that may not surface otherwise In particular, if one simply does a non-recursive `ls` on a directory that is not accessible, there are some classes of errors that may cause it to fail that wouldn't be surfaced unless we do an fts_read() that will recurse into the inaccessible directory. Catch those kinds of errors here since we cannot expect to an FTS_ERR/FTS_DNR entry to follow up on them. PR: 287451 Reviewed by: kib Discusssed with: des (cherry picked from commit 7bf81e39d83087dc7f984077b5eed5a48df794d4) --- bin/ls/ls.c | 17 +++++++++++++++++ bin/ls/tests/ls_tests.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index b3d0a508d714..c33d4d38c359 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -707,6 +707,23 @@ traverse(int argc, char *argv[], int options) output = 1; } chp = fts_children(ftsp, ch_options); + if (chp == NULL && errno != 0) { + warn("%s", p->fts_path); + rval = 1; + + /* + * Avoid further errors on this entry. We won't + * always get an FTS_ERR/FTS_DNR for errors + * in fts_children(), because opendir could + * have failed early on and that only flags an + * error for fts_read() when we try to recurse + * into it. We catch both the non-recursive and + * the recursive case here. + */ + (void)fts_set(ftsp, p, FTS_SKIP); + break; + } + display(p, chp, options); if (!f_recursive && chp != NULL) diff --git a/bin/ls/tests/ls_tests.sh b/bin/ls/tests/ls_tests.sh index c732b60b21a4..be662b75695d 100755 --- a/bin/ls/tests/ls_tests.sh +++ b/bin/ls/tests/ls_tests.sh @@ -476,6 +476,35 @@ b_flag_body() atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b } +atf_test_case childerr +childerr_head() +{ + atf_set "descr" "Verify that fts_children() in pre-order errors are checked" + atf_set "require.user" "unprivileged" +} + +childerr_body() +{ + atf_check mkdir -p root/dir root/edir + atf_check touch root/c + + # Check that listing an empty directory hasn't regressed into being + # called an error. + atf_check -o match:"total 0" -e empty ls -l root/dir + + atf_check chmod 0 root/dir + + # If we did not abort after fts_children() properly, then stdout would + # have an output of the total files enumerated (0). Thus, assert that + # it's empty and that we see the correct error on stderr. + atf_check -s not-exit:0 -e match:"Permission denied" ls -l root/dir + + # Now ensure that we didn't just stop there, we printed out a directory + # that would've been enumerated later. + atf_check -s not-exit:0 -o match:"^root/edir" \ + -e match:"Permission denied" ls -lR root +} + atf_test_case d_flag d_flag_head() { @@ -971,6 +1000,7 @@ atf_init_test_cases() #atf_add_test_case Z_flag atf_add_test_case a_flag atf_add_test_case b_flag + atf_add_test_case childerr #atf_add_test_case c_flag atf_add_test_case d_flag atf_add_test_case f_flag From nobody Sun Apr 12 03:16:40 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbL11FW8z6YMFt for ; Sun, 12 Apr 2026 03: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbL04fxgz3P8P for ; Sun, 12 Apr 2026 03:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFR4LKoiznH/1Tq4ehKogY6QqdHF0a/8sS1Ba/EtCUw=; b=NsNcg/V+pDAfI4la5TdkPYtOefWPO7mtfz5UB7XMjHX8Jv+tOlEMWq2/AsprOv9O1iXWdq zDmQWhK6WysXV/TAEJbmcSMmFEokpVFLg7tsswaqLCd4hEybzZw7X65sM+8tdg6jiWBT60 ivrFPERN2WuCAuFgS/PkAkVlaPuj4bGGBY9KnGJW7P6eZlBRvi8tmW3gKGyirkMKyfPB0Z 2QZbOE/dUeUFMjc+YA0oOyC62jmsM57ToUHQV1sqaBWXpLwqcglhs3wini9inah+iUBhHt aROMs2W5dzmY7lb7NlQ3KZ61s4bQKUT3YEXoGSxphCeiXTEkiJY0Dh89JC0XiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963800; a=rsa-sha256; cv=none; b=vhYSMgeaYWRWaITEd3ou4kFe9E4RHXeWCcflEUHToov2Vg5IJi88dUOZIYgpLtFp8s8p1b E3HwlWHIKLWAmpgi8VU5HKt23+knhyBJrxZB9z2xPYbODZ96Ao9ZQnMnDx6eE6D/MuTZet BU1/gWDRZ6l/lamRQTDxgxp0p1YxWd1T/Zq2vsrjKaf5d6Pq2B7/USuS8N890C6er/qPlm v7uVJaND5zn3SMkVmQJ5hKejsUtP+K6Bz36EjJmDZA2rJ8tc5QPKZEOpOto+M1hMW6/x+h Y7cwFKyiTkdHjqFaQXhK/U/M5hcfyZ7i9slYllQRcSjSeGuigKbDR12EQZEyBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFR4LKoiznH/1Tq4ehKogY6QqdHF0a/8sS1Ba/EtCUw=; b=X45l9otTq4SNW5MvC3ppu/9G/UBTnmKhvMuqjXsdnDrPjDSictLvIa/0I5xb2ld0VOo5wp EoP2H7g7eZX6tSqENLFBftL62yKsxc6dTxcV19ixNKTXywqbcDxD9qELnDOec8P6J9ET20 XyEw/FLetrSAghVl1jRACoC9mMrtnE21BbRvYZrGRAHmxaKK6D4BWF3ufFo0S31Npgq/8E uZmEGIRhqEOCA65VCgcbx2AZ+tWENCxuPnpFHZGZe8Z1bsBy82mp9LgrwxsKauE6zuG5F6 B6JXlVKC35UB78NQcZvF/4kGkNsxZJMOoenD/0uiBeJ9CO6s+ml7qBHHD80+eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbL03fVBz10Gb for ; Sun, 12 Apr 2026 03:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 470ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: cc5125aaedbb - stable/15 - bhyveload: simplify cb_open() and eliminate minor TOCTOU List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: cc5125aaedbb5853f1d00ed57e3ae683fef961e9 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:40 +0000 Message-Id: <69db0e98.470ea.64c91156@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cc5125aaedbb5853f1d00ed57e3ae683fef961e9 commit cc5125aaedbb5853f1d00ed57e3ae683fef961e9 Author: Kyle Evans AuthorDate: 2026-03-01 03:23:59 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:15 +0000 bhyveload: simplify cb_open() and eliminate minor TOCTOU It's not at all clear why I wrote it like this, but we can do better. I wouldn't think this really has any meaningful security implications since the hierarchy in question can't really be modified by the guest scripts, but it would seem to make it a little more robust. Reviewed by: bnovkov, markj (cherry picked from commit 6da9d465c54bf2e3496e83db025c5d22f3b3cc17) --- usr.sbin/bhyveload/bhyveload.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 5250e2120938..be99bb342de6 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -169,11 +169,9 @@ cb_open(void *arg __unused, const char *filename, void **hp) { struct cb_file *cf; struct stat sb; - int fd, flags; + int fd; cf = NULL; - fd = -1; - flags = O_RDONLY | O_RESOLVE_BENEATH; if (hostbase_fd == -1) return (ENOENT); @@ -185,20 +183,21 @@ cb_open(void *arg __unused, const char *filename, void **hp) if (filename[0] == '\0') filename = "."; - if (fstatat(hostbase_fd, filename, &sb, AT_RESOLVE_BENEATH) < 0) - return (errno); - - if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) - return (EINVAL); - - if (S_ISDIR(sb.st_mode)) - flags |= O_DIRECTORY; - /* May be opening the root dir */ - fd = openat(hostbase_fd, filename, flags); + fd = openat(hostbase_fd, filename, O_RDONLY | O_RESOLVE_BENEATH); if (fd < 0) return (errno); + if (fstat(fd, &sb) < 0) { + int serrno = errno; + + close(fd); + return (serrno); + } else if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) { + close(fd); + return (EINVAL); + } + cf = malloc(sizeof(struct cb_file)); if (cf == NULL) { close(fd); @@ -217,7 +216,6 @@ cb_open(void *arg __unused, const char *filename, void **hp) return (ENOMEM); } } else { - assert(S_ISREG(cf->cf_stat.st_mode)); cf->cf_isdir = 0; cf->cf_u.fd = fd; } From nobody Sun Apr 12 03:16:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbL22BrXz6YM7Y for ; Sun, 12 Apr 2026 03: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbL16G9Rz3NwP for ; Sun, 12 Apr 2026 03: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=1775963801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oGrMK/RXi2rLpaRFZWlF3hEycrwctjHt0RabN5P0EOQ=; b=csPkxzzakSyW6c+dZDHge0doKVaQ6VhT35QJWadi+HpLQep9Ni1TvMGtedUc98wNie1fSQ K+2i++5vRwaD2KDTM8I/bU3o6F8bKLpdPhubaVw2wAhxCnZQjrGoPjGsvvulxQ+obPPDhw di2UqZ4rSGAUFfMQUMzekSLwRUZPOVCjDkIkdaNRKDX8D3sI9HMIBEB0Be7UzCWjc4qvy0 +CgUkaIv4nSNHTBlyZBsrX8HJxuScUa+2mdVXbXfISTLBaw4tY5aSxlANF2e0imLoZiluD vDzuZcNoj2OzIV+BAHhLgbMPqVtaGBfrHe/HC9eOE+2euEBUjf8EDMkdy5e7dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963801; a=rsa-sha256; cv=none; b=kscDLGFsOZG3uJr6BKninXVTZfA0yF7ogAS8oWxxyDgDkkTxaJc5RRf2fbAxcazoIt30q5 FzKqwqsoyHTHmi+yMioUTmKqn4f3rLA46rSep6ITsrxE/qUUMa5iFkquruvDOru3hnXgSA bAr73RMkblD+Vgs/+xYpVl9LKLADbPNkdTU2XwVJrl6GffIDCPVg2I/QovLZWclajitumi oEjtIgA9149CRkPAa6DaFJUF75+tWvA0OAJRq5GO1IlB0LuBwWWmDYXmCSOkpoUGZ96J23 q5zkQjbS3vCtaksnTmt0DKiDYpcff+1ILroJ5wCjiyzfnY7dmK02oJf/IwsANA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oGrMK/RXi2rLpaRFZWlF3hEycrwctjHt0RabN5P0EOQ=; b=y1xePzDAE5Rba+2mEvmSW4SPo5wK28j0lN4I94SftJihhYZAV/WKopsrWN9pjYKx5sXiqn bHTXbvAc8QePN+jM1JoT6Hif8AhguSBlr5RDZ3o98knmor6Rc6PZl3yxp+DGwxQX688RLX ULiCWrDemOg0/3VqWNrsGRdxzOJmDXlHENEqxfRP1sdSV+DrMu6OMrfn3E7m3vH4CSfb6I rCp2iCenFpjLj7sXDWdA2zQJaZVX4g6FuQwwKZMxVwYfhNHR8t9U0JID79uPiiScQa0cYz mCeIBJCXt8pH98y4AWegFTPcZoT9RUhmg2bNDFyXZHI9YKn4GPMpDVv2upUG6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbL145NCz10CR for ; Sun, 12 Apr 2026 03:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47ba8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kristofer Peterson From: Kyle Evans Subject: git: fee3eba10ff1 - stable/15 - kern/amd64/machdep: Replace memset in wrmsr_early_safe_end List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: fee3eba10ff14541ab2036a3b6420ab29e5cba66 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:41 +0000 Message-Id: <69db0e99.47ba8.34857698@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fee3eba10ff14541ab2036a3b6420ab29e5cba66 commit fee3eba10ff14541ab2036a3b6420ab29e5cba66 Author: Kristofer Peterson AuthorDate: 2026-03-09 19:40:34 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:15 +0000 kern/amd64/machdep: Replace memset in wrmsr_early_safe_end GENERIC-KASAN kernel failed to boot on a Dell PowerEdge C6615 with an AMD EPYC 8224P CPU; UEFI BIOS caught a #GP exception with %RIP in kasan_memset where %GS relative pointer (curthread->td_pflags2) was dereferenced. Investigation led to wrmsr_early_safe_end which calls memset to clear early #GP IDT entry. Replacing memset with __builtin_memset_inline still resulted in the compiler emitting a call to the memset resolver in GENERIC-KASAN build and the kernel stil faulted during boot. This version which has been successfully tested with both GENERIC and GENERIC-KASAN kernels uses memset_early. Signed-off-by: Kristofer Peterson Reviewed-by: kib (cherry picked from commit 615f1b9eb17c921bbcb0cce2b9ad61910361325b) --- sys/amd64/amd64/machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 2af7f1151208..2c69c1b3ace5 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1850,7 +1850,7 @@ wrmsr_early_safe_end(void) lidt(&wrmsr_early_safe_orig_efi_idt); gpf_descr = &idt0[IDT_GP]; - memset(gpf_descr, 0, sizeof(*gpf_descr)); + memset_early(gpf_descr, 0, sizeof(*gpf_descr)); } #ifdef KDB From nobody Sun Apr 12 05:56:56 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftftw1Vgpz6YYxS for ; Sun, 12 Apr 2026 05:56: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftftw0pHZz3lkm for ; Sun, 12 Apr 2026 05:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qC7+OOb15WMN/LL1yh098IVFN1oZCbj1psynF1ft7IQ=; b=QLPyyhpk9VMhQbWHvCuxvGsncR/BXKykXRtSsAA8GHTeWJ847MoEg3atW3CYoWMMUmqBBl GJN9iM++bQizMnrafSwD0axw77BseMbG11kzRjvD8Yjs58Is/FI+5a0PIu/xOjrRWWYT1z mSnCrlihjBeC28bYgXtfTXyLAI2H2O0kHXaCsDgidOL81Hlg/9wAvIlFOL3ix2RrN9s15a 6SK2gwzQjlKRour390WNo+d8B9CDRyYU2na/pA1/1/Nh+xcjpyXy3igkeLEIzg841l+C1f FjoazIUEZ2DnoV+RJgyhcKXgg+kDdiYd+UVYbKU9GBDfnSsqTkL85Xb4koKWbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973416; a=rsa-sha256; cv=none; b=nQxuogarn3+mcEZEZE1On+fZkam9OQrvTOJC3pwMMkFSYF4rbFWIvPQ0O2MzzTarpEzskt Bhw1LbIOnWfyAddzDmd8yQt7viEN9ru0r5imVMokpyyGIHG+4lWNkyvQ9D2Q4yDdgWE6eK j9TSNNffOXNyg7aSbT3Jxx11Z28GR9dLzm/vp4sUIoyh5GhxgdmRGUvzxO392Sxz74a1US jE78x1WQIIlhO7hVVB649dIWAkha8Zv1ez+WGvSzSXe1FpLFrqiSUQeXqVHehgo3A2Zzg+ ntOU/5PXuGYw7A1U4h4HVSdfhbGKkCr5O05z+Acq30E9s+p73gOKrSwKkJo9eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qC7+OOb15WMN/LL1yh098IVFN1oZCbj1psynF1ft7IQ=; b=p8D87FVSCOFLSUoRE56AqrldM1KEqXH5sq4u9Iebk9vk540+cyC8e6NJRPaOCJBko+vAGV B4Mo7gZoqWU9f5bQyEQM8lB/pSc7wGbiCS7AH5Exmzf1QxYgamiB02f4dgXtoPWS0JOM0l wJl786uT9Rvvq03eyyHXfZEBMGhzo/fUVM0OxExUUKVnbLvX7HUb9G30IapJqUtV75aGR6 wS2NUAMszNUm6Rfs+BasWJvGtan2p+opql4/cl7Ny067OhyPSeD2XQGqjQ6U8XFkdVlTiH hkmJSaZrRTvx3Bl4UyWaQG3F7zK17p9ym/4waSep1O57laSRFo9duIWsUsRBlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftftw0Dlkz147Y for ; Sun, 12 Apr 2026 05:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3149d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:56:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 207094af916d - stable/15 - devstat: Provide 32-bit compatibility List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 207094af916d102f73d115cc34b776c05350a9cf Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:56:56 +0000 Message-Id: <69db3428.3149d.1970dc07@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=207094af916d102f73d115cc34b776c05350a9cf commit 207094af916d102f73d115cc34b776c05350a9cf Author: Dag-Erling Smørgrav AuthorDate: 2026-01-26 12:01:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:33 +0000 devstat: Provide 32-bit compatibility If a 32-bit process running on a 64-bit kernel requests kern.devstat.all, translate each struct devstat to its 32-bit equivalent before copying it out. Also fix a bug where an early error would be ignored if there were no devices to report. MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54591 (cherry picked from commit a11d132f6c62f32abe44b19f7527d97ddc239058) freebsd32: Fix includes The previous commit added , which isn't actually needed. Conversely, is needed (and has been for a long time) but was not included. MFC after: 1 week Fixes: a11d132f6c62 ("devstat: Provide 32-bit compatibility") Reported by: gallatin@ (cherry picked from commit 0eb2c9d39b5f5cfb68b404bca358aa5fb11ac60c) --- sys/compat/freebsd32/freebsd32.h | 27 +++++++++++++++++++ sys/kern/subr_devstat.c | 56 +++++++++++++++++++++++++++++++++++----- 2 files changed, 76 insertions(+), 7 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 18f99df4b154..1436b630689f 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -30,6 +30,9 @@ #define _COMPAT_FREEBSD32_FREEBSD32_H_ #include +#include +#include +#include #include #include #include @@ -521,4 +524,28 @@ struct ptrace_sc_remote32 { uint32_t pscr_args; }; +struct devstat32 { + u_int sequence0; + int allocated; + u_int start_count; + u_int end_count; + struct bintime32 busy_from; + struct { u_int32_t stqe_next; } dev_links; + u_int32_t device_number; + char device_name[DEVSTAT_NAME_LEN]; + int unit_number; + freebsd32_uint64_t bytes[DEVSTAT_N_TRANS_FLAGS]; + freebsd32_uint64_t operations[DEVSTAT_N_TRANS_FLAGS]; + struct bintime32 duration[DEVSTAT_N_TRANS_FLAGS]; + struct bintime32 busy_time; + struct bintime32 creation_time; + u_int32_t block_size; + freebsd32_uint64_t tag_types[3]; + devstat_support_flags flags; + devstat_type_flags device_type; + devstat_priority priority; + u_int32_t id; + u_int sequence1; +}; + #endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */ diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index c4d0223d484f..c62df0e210e1 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -43,6 +43,10 @@ #include #include +#ifdef COMPAT_FREEBSD32 +#include +#endif + #include SDT_PROVIDER_DEFINE(io); @@ -398,25 +402,63 @@ sysctl_devstat(SYSCTL_HANDLER_ARGS) */ mygen = devstat_generation; - error = SYSCTL_OUT(req, &mygen, sizeof(mygen)); - - if (devstat_num_devs == 0) - return(0); +#ifdef COMPAT_FREEBSD32 + if ((req->flags & SCTL_MASK32) != 0) { + int32_t mygen32 = (int32_t)mygen; + error = SYSCTL_OUT(req, &mygen32, sizeof(mygen32)); + } else +#endif /* COMPAT_FREEBSD32 */ + error = SYSCTL_OUT(req, &mygen, sizeof(mygen)); if (error != 0) return (error); + if (devstat_num_devs == 0) + return(0); + mtx_lock(&devstat_mutex); nds = STAILQ_FIRST(&device_statq); if (mygen != devstat_generation) error = EBUSY; mtx_unlock(&devstat_mutex); - if (error != 0) return (error); while (nds != NULL) { - error = SYSCTL_OUT(req, nds, sizeof(struct devstat)); +#ifdef COMPAT_FREEBSD32 + if ((req->flags & SCTL_MASK32) != 0) { + struct devstat32 ds32; + unsigned int i; + + CP(*nds, ds32, sequence0); + CP(*nds, ds32, allocated); + CP(*nds, ds32, start_count); + CP(*nds, ds32, end_count); + BT_CP(*nds, ds32, busy_from); + PTROUT_CP(*nds, ds32, dev_links.stqe_next); + CP(*nds, ds32, device_number); + strcpy(ds32.device_name, nds->device_name); + CP(*nds, ds32, unit_number); + for (i = 0; i < DEVSTAT_N_TRANS_FLAGS; i++) { + FU64_CP(*nds, ds32, bytes[i]); + FU64_CP(*nds, ds32, operations[i]); + BT_CP(*nds, ds32, duration[i]); + } + BT_CP(*nds, ds32, busy_time); + BT_CP(*nds, ds32, creation_time); + CP(*nds, ds32, block_size); + for (i = 0; i < nitems(ds32.tag_types); i++) { + FU64_CP(*nds, ds32, tag_types[i]); + } + CP(*nds, ds32, flags); + CP(*nds, ds32, device_type); + CP(*nds, ds32, priority); + PTROUT_CP(*nds, ds32, id); + CP(*nds, ds32, sequence1); + error = SYSCTL_OUT(req, &ds32, sizeof(ds32)); + } else +#endif /* COMPAT_FREEBSD32 */ + error = SYSCTL_OUT(req, nds, sizeof(*nds)); if (error != 0) return (error); mtx_lock(&devstat_mutex); @@ -428,7 +470,7 @@ sysctl_devstat(SYSCTL_HANDLER_ARGS) if (error != 0) return (error); } - return(error); + return (error); } /* From nobody Sun Apr 12 05:57:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv61tlRz6YYfg for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfv60D0Jz3mZg for ; Sun, 12 Apr 2026 05:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cP7NchEaxH/iCIBZ09SI2tJOpHTQI0bxZEOtP8tDJuU=; b=rGNMOVIxkFMar8NZfjVnYKFrchi664CtvnZBzZ/1TVkR0NT+KoPCP3V+4iYDkVzhpQRNYv KNLazLMunXPJyzXtVw4Ba0gOMHcMSqZ3Mw+9pep0jHcp+sNCtagfoy+CgRFNIiRpG7PTVA VXaeAjzgDe2NROt/P+jN0ROKo7b49MfN+bHIgJiU4HpX3TsRk0UYDLquLVwr1cjmahcgW3 Ar5NYB9B+0K7qKWUI2Au/+0wOThRJT78mP9yI20fEihknOhjNdacWNT0IbCjpqC+KgqWjt BlWjTPgCiRcq+wz6qC8Gc5P1KeHe6EwUp3fk1iWtefPKhZO8V/VVIBj9ndRZVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973426; a=rsa-sha256; cv=none; b=GJt4R96Jv3orcFusrMNqk02BSM2UCERWsQ9zcWmQC6YYZS1qZEsuAdT5Wqq68K16AuIudY TroinqHK0+et1LM0c5iCMMNNg8hw5eF0ElorosVwcC3Dyx2Pw4k9PxIQ8cj6ng5LO+5+XX CxC2PHvSkwOXIxr1/IsrKu9uqiuWjphcOrLBjJLz3G+uUdrXk1eU/gSotYC0iWsrDVTUNz LVctPBY83zgQHSt8SGUgPe6L/V4ObsYfgqUnC9yjqBjnmvnlGfQH+ix/wFf//FVMsudgb4 c0Ih3pjf7hmloasyuL92NKpi2uOPiFsCgOfEKfjNSnV5fTD12VGU7GtRdkzSxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cP7NchEaxH/iCIBZ09SI2tJOpHTQI0bxZEOtP8tDJuU=; b=ukfqCZk0fsA9SVo91s4ewWnc+zAbdfEZ+M9WX2NhM4EmH4W6TCoR3YoQb7OsshZCkWlyvl QWmcYWWiPw/KIp/3q7+7PwFuj/pIiOhnnTFx1/RYSZO5AenIMdBZTjwXhXMd0kVI3EUoG9 EwGAa07xSlNeOdb3KlxiuCMyu+suCZFkOANZDB4AdlP0Yb1cEXRRBS+sTfgcaTu1u7txDq +rjydputMc+tZTjI9/Of0oGLQ0l631IU1GgoUgV3vQMDKuZZ1WTc7tKtFfLU9VrK8k5I2D AiEiR2UXkKbTIV46/k3gSo5jneWV3aVGnP2hfHG01ilviUCglmqF4rbSIpxw/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv56sDcz141g for ; Sun, 12 Apr 2026 05:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31276 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 408e20a69900 - stable/14 - sys/abi_compat.h: fix UB for bintime32 handling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 408e20a699006bbe15546052db7b413b21603c2b Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:05 +0000 Message-Id: <69db3431.31276.5006661@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=408e20a699006bbe15546052db7b413b21603c2b commit 408e20a699006bbe15546052db7b413b21603c2b Author: Konstantin Belousov AuthorDate: 2026-01-12 04:46:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 sys/abi_compat.h: fix UB for bintime32 handling Do not cast and then access potentially unaligned uint64_t in the BT_CP() macro. Use freebsd32_uint64_t type and FU64_CP() for the frac member. Noted by: des Reviewed by: des, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54663 (cherry picked from commit be1b2da855cc38531733b5c97891cd4a40a993bc) --- sys/compat/freebsd32/freebsd32.h | 2 +- sys/sys/abi_compat.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 36deb6bd06f2..b5671611c1eb 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -70,7 +70,7 @@ struct itimerspec32 { struct bintime32 { time32_t sec; - uint32_t frac[2]; + freebsd32_uint64_t frac; }; struct ffclock_estimate32 { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 0a7110191430..bd99a21d8e23 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -77,7 +77,7 @@ #define BT_CP(src, dst, fld) do { \ CP((src).fld, (dst).fld, sec); \ - *(uint64_t *)&(dst).fld.frac[0] = (src).fld.frac; \ + FU64_CP((src).fld, (dst).fld, frac); \ } while (0) #endif /* !_COMPAT_H_ */ From nobody Sun Apr 12 05:57:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv54cCTz6YZ2D for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfv516wTz3mGd for ; Sun, 12 Apr 2026 05:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ha3iU1nGnavFPpeHl3UxGhNgE7OBL1uc8jNAZBKt0n4=; b=onxTTobn3DvGqLextqT16+H1/V78krHx5PEljaC14zdXRGnJ9fPRF0MeTH0jSsq+yYpJWX izlez0AzwxyYH65dM1js95S47hdnYfuTWnstExjBxxdpnYfG4237/74wtZI8G3nv6m/1r1 QkB3GVrCdQyO7AG2NiQWMbkdQAWbVAZHLErlKaVnCyDi6pEEyCO8kEx2ZpU9DNwjOeOUvg tkkChjLr9kob1OFJLTKbWk2meecOUQtqb8GfOTTov7jGmq46KXJo6ve8+iFDSSwU5H2/Gn LWVWMqt7jjxyeN0atJOAgEbhcHgd2WgIio0vnu1N5TlgOvAXAVQeJ6iDF3XwKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973425; a=rsa-sha256; cv=none; b=URzHyfwcHS8w7PTqg1RN+HzV/Oi0KdvrpDhQZepFxPsTcdUUH0ie2pO5m+DlvPDx3QJl/4 Zc7Be++3HvhmeLXcYsVd3UgmOTdDJNZdXfODrwyo47sSm5hgl2cI7NzDFDNozOCa6zaJmI DxCcMenfqqZnm3KC3NaqrKAYooMMcPl36yMFkDoeN8dObWZPSr4fvUuDb0JIeA4FFXLhcn CxbaO7qa9KgOkDqua/BLeFidre5eXF2fkRtQ9xhb7u+qvhU2Nw278N7tWFopuK/PH+TjRb x+m6ko0ui6Y2KRvnRCRMvmpSt2+NBbVkAh8C3Ko6JyR9DqZimbBaZ0eLCX48rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ha3iU1nGnavFPpeHl3UxGhNgE7OBL1uc8jNAZBKt0n4=; b=tmPHntI3FNczlVikbTj3lkd7Ss/pi5Cr+gVoCFtcNohaWas0kpiVInb/QSLc+wvkfe9cjl FyF7C1cZRkQom4OXu2djLnaKs/9kF0awcY3RjcFa4xXfAWwK1/h8smxXp0Gl00XqfBXkPT UeCWFNdjBhCQwsRtgBOms/brVu1jF1lhJc/x4xsMZQWQzmrBiR4OBdeDlaZrP93M2AQDEc KbhgEVC95yPL5uWUCaFqQw5n39QNpes4KPfx9CIfoX6VDAe+gCtO3TN6vt0nvzGjdn08Yo +7j8IJOHMJ+Yo8sLxnecN6L78Ez3ILtBWLpYXevEWQmHuDR0m0JyXcxRzVDe2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv463pmz147Z for ; Sun, 12 Apr 2026 05:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27e2c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a60b5778dd04 - stable/14 - compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: a60b5778dd043214e9e094f1b7d41adc3b9ee972 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:04 +0000 Message-Id: <69db3430.27e2c.43c2cc58@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a60b5778dd043214e9e094f1b7d41adc3b9ee972 commit a60b5778dd043214e9e094f1b7d41adc3b9ee972 Author: Konstantin Belousov AuthorDate: 2026-01-12 04:45:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches uint64_t is 4-byte aligned on i386, but is 8-bytes aligned on all other 32bit arches FreeBSD supports. Provide the freebsd32_uint64_t type and the FU64_CP() macro, which are intended to be used where 32bit ABI uses (u)int64_t type, and do proper layout and copying for the aggregate type. Reviewed by: des, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54663 (cherry picked from commit 96acaa960023c20e852e04e7cc5c6a5faca36c67) --- sys/compat/freebsd32/freebsd32.h | 11 ++++++++++- sys/sys/abi_compat.h | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 9d7a99535288..36deb6bd06f2 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -36,8 +36,17 @@ #include /* - * i386 is the only arch with a 32-bit time_t + * i386 is the only arch with a 32-bit time_t. + * Also it is the only arch with (u)int64_t having 4-bytes alignment. */ +typedef struct { +#ifdef __amd64__ + uint32_t val[2]; +#else + uint64_t val; +#endif +} freebsd32_uint64_t; + #ifdef __amd64__ typedef int32_t time32_t; #else diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index c2233f2eac2c..0a7110191430 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -67,6 +67,14 @@ TS_CP((src), (dst), it_value); \ } while (0) +#define FU64_CP(src, dst, fld) do { \ + _Static_assert(sizeof((src).fld) == sizeof(uint64_t), \ + "FU64_CP src: " #src "." #fld "is not 8 bytes"); \ + _Static_assert(sizeof((dst).fld) == sizeof(uint64_t), \ + "FU64_CP dst: " #dst "." #fld "is not 8 bytes"); \ + memcpy(&(dst).fld, &(src).fld, sizeof(uint64_t)); \ +} while (0) + #define BT_CP(src, dst, fld) do { \ CP((src).fld, (dst).fld, sec); \ *(uint64_t *)&(dst).fld.frac[0] = (src).fld.frac; \ From nobody Sun Apr 12 05:57:07 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv76HNWz6YYW3 for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfv71y8bz3mb0 for ; Sun, 12 Apr 2026 05:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yHRv9d7ZJTbf4U0UAfJsIaJgaCTXI3f4OamTy+XNwc=; b=R1qT1S7HnGCT0mWFWiDgo5/XrYqujWUmvGJCkFyyWtROIClYCyeLC8uT48cZXUDOkGv+ga 6T0B+444bSdrPN4baYFVRRrKlajJnwYQ0xKbit2Y/IbSFVNuRR32cdDEkgKo31RvSL7Oig 4xy9ZxuwV8y+ytVCP+weZRYuTYmQTgk7pgUuwn3QYdxWjlPRlUeMT2z5VODtNcFamoAQTg of7zykzYWEPTHhwnOyuX4kXA5di1FHkDor3ciO9oosZ2JxkeSR7OQAIJEY+J0vpNQ3twd5 vV4kPe87ifX5xANFqIARyIKpjlRQrKyN0ssaX2YjD1I5lCrLHlFHNfZespPR7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973427; a=rsa-sha256; cv=none; b=nSJBqkvVazGXCPiO7eW/poQrvTDBotNhYxl0HVX3L/46IGBZR05ZVEyEJBpeuJUi4B8qPV mHxuRRLUnOs/OMKTkRByrkehBxkH3FYuT30dNoF9+/l96pgPrYxNykGkMULgNBB/RLkZnd n6W+zU3q/5zqn5KxnUQ13Y7Jgg3iDVHSM/2kTbXN5QhRMuG93EfTFavvSw3j8FtCjxGkGj FlKzFB6+s4UUGBaE7VX4H1c/17bttXbyTEXEanSuLwxnyHJQAMClPJHTKa2bZK/EHxpOcA 6UXQ/ADT92Wm/zWtQWXP0hFrzBhmp5/g+AdMVjf08HzyD24YL5KpWrX6OvCPqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yHRv9d7ZJTbf4U0UAfJsIaJgaCTXI3f4OamTy+XNwc=; b=fYvEy2u3KkOPauD9dBFnD6v6Vuq3+FWrWj3rV3toX2TZxzUIkqmx25PONcPUr/fzuHsg+L zo6OzntQYDB/MFvgZT/AvE1TvWOY4QppCd5x1pwa/T0X7v84DG8DWa2C1ktyQMDAhX/exE /GFsJyFudKNlqF56IhX7B7T3keW4PHFUuxBGTKgy1zoV7GcfT/3ffGWSJ9Es66Hh2Ig9Nh S3kyy0si2sgB5sm+nMyVwpM5TBSpPsU4QbEAhplpdHo92sr9HBsz/YffpfE8eWlOEHOx6X /dNvRItY1SzSexdDVJUPBzib6pU2ILp3E10Hmvw286EPQuLnUsWhz3eMYI/Q2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv70ZHsz14M6 for ; Sun, 12 Apr 2026 05:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 270d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fbc234c51ade - stable/14 - sys/abi_compat.h: normalize include guard 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fbc234c51adedfa699f52a89ba60c3e0fd819d88 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:07 +0000 Message-Id: <69db3433.270d8.78cb8cf5@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fbc234c51adedfa699f52a89ba60c3e0fd819d88 commit fbc234c51adedfa699f52a89ba60c3e0fd819d88 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:06:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 sys/abi_compat.h: normalize include guard name Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit c3a04a9585ae233c98ee2eef73e6a80d17512578) --- sys/sys/abi_compat.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index bd99a21d8e23..2fcf598ceb7f 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -26,8 +26,8 @@ * SUCH DAMAGE. */ -#ifndef _COMPAT_H_ -#define _COMPAT_H_ +#ifndef _ABI_COMPAT_H_ +#define _ABI_COMPAT_H_ /* * Helper macros for translating objects between different ABIs. @@ -80,4 +80,4 @@ FU64_CP((src).fld, (dst).fld, frac); \ } while (0) -#endif /* !_COMPAT_H_ */ +#endif /* !_ABI_COMPAT_H_ */ From nobody Sun Apr 12 05:57:08 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv85mvLz6YYtv for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfv828rDz3mbG for ; Sun, 12 Apr 2026 05:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFVyT6LeEU6tAii6yXnnMcKAZZAgkNuQQKGhJoarEX8=; b=WDbH8S/inBKHneQJ0daSmkTzZ8/UHFDaw+ROZTsmfFVHYwNDlpXc+IgRrR8/ngtpbP2uIz 1owGTQFWoriTwC5sFxr2qEo4iAdzyBClfWdDxmuLVW4oe7WBmVG1EO+f6TAYYrlrYs2sWJ mhI59y0MAUuqLcFbrGtoFsIRHUoZGCzzH/PRCNivj3Dua6Ci9OuYghKzD/YBhlM/dc/3CV WvszEn7IG4WXbTs1gpIYzr2Bketqeey0gSmgO0eC7o4+njekhyD7tWBI207gOnzg8u1N9e 5ihKkdkPCceX2Diq+7mCRBp8hXZ4mLkur/r5oBZR/MaWikkbfqV25krk5gurnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973428; a=rsa-sha256; cv=none; b=tv2exq5WbRp7KJEBo6w0VUFVPxurOTEl1FM+OMmfMSaXtdh4GEDKDfvfbzJ+l5zH/MEMRL mfnNzs9s/DYrBTHsNYVX0kGG4YPDMZgdef9alCUYGYVxYjBKdCxVzI0CDZfy12jmJLWzwo UN2svofVvFy0Hn8gVEhRsWutDzyBiq7mVWkD8jWHxI8HcbuwoAEauoUwyUomVD6jo1lHeA jNnsuCvO9kP8sVlVl0nSuiPygVJIYbXoV5nlio4DAOCj8SZQIkM32yy12XoXxsWMngXTEu zPF67+V693eUstpegaJGvusHuj0ZU17QIXLFN24wHRZj+LvnQYYMjaJWGXyHIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFVyT6LeEU6tAii6yXnnMcKAZZAgkNuQQKGhJoarEX8=; b=BMgy33nkXMNE6BN4q9v393E5hGoM2157jlnbaQUlnp6vlYHZyo3zS64RBx0OJivUbuDgFI hB1U0I9mCjrs9TCTzRsIPp/0EebLKAMKh48By/h1RfmqDjgIefr0KvgRjHqKXy5ugNI3RD R66p5q52Rk9cCSQE4Ur/mspmxKjlPBywJhbF1VKXDu2kJkyzv+F1iLZs4DnfeN/KuqWPHP pSgiFCRCS8vVSueB9lUIo3GF/9MhozBl+EhST893HSrIMX7UYadMBl/RDA/q4ayuqK9LJU ggXF0T2r04kzrYKIuDgEJ66OIMOlCyBIjmdfUjxphn13J1F8aOvnOwwZLSguEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv81S0Fz1408 for ; Sun, 12 Apr 2026 05:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3127b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3222cb7d213c - stable/14 - sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 3222cb7d213c05787e6a3db0f73caa5778e6ec4a Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:08 +0000 Message-Id: <69db3434.3127b.314a7c53@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3222cb7d213c05787e6a3db0f73caa5778e6ec4a commit 3222cb7d213c05787e6a3db0f73caa5778e6ec4a Author: Konstantin Belousov AuthorDate: 2026-02-05 19:08:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there Use private names for uintXX_t types. Remove conflicting (but equal) PTR_IN() definition from dev/mfi.c. Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit e651c64bcab08c7b12d8ad6e3ad0b1ef3af3b875) --- sys/compat/freebsd32/freebsd32.h | 18 ------------------ sys/dev/mfi/mfi.c | 2 -- sys/sys/abi_compat.h | 22 +++++++++++++++++++++- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index b5671611c1eb..b8cd29e5238f 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -35,24 +35,6 @@ #include #include -/* - * i386 is the only arch with a 32-bit time_t. - * Also it is the only arch with (u)int64_t having 4-bytes alignment. - */ -typedef struct { -#ifdef __amd64__ - uint32_t val[2]; -#else - uint64_t val; -#endif -} freebsd32_uint64_t; - -#ifdef __amd64__ -typedef int32_t time32_t; -#else -typedef int64_t time32_t; -#endif - struct timeval32 { time32_t tv_sec; int32_t tv_usec; diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index cd84e0a1970b..af88085116c1 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -3082,8 +3082,6 @@ out: return (error); } -#define PTRIN(p) ((void *)(uintptr_t)(p)) - static int mfi_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, struct thread *td) { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 2fcf598ceb7f..1753d8dd25c2 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -29,10 +29,30 @@ #ifndef _ABI_COMPAT_H_ #define _ABI_COMPAT_H_ +#include + /* - * Helper macros for translating objects between different ABIs. + * Helper types and macros for translating objects between different ABIs. */ +/* + * i386 is the only arch with a 32-bit time_t. + * Also it is the only arch with (u)int64_t having 4-bytes alignment. + */ +typedef struct { +#ifdef __amd64__ + __uint32_t val[2]; +#else + __uint64_t val; +#endif +} freebsd32_uint64_t; + +#ifdef __amd64__ +typedef __int32_t time32_t; +#else +typedef __int64_t time32_t; +#endif + #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (uintptr_t)(v) From nobody Sun Apr 12 05:57:09 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv95q4Nz6YYfq for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfv92p8lz3mKN for ; Sun, 12 Apr 2026 05:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WO8330w4PJZbncTmlIEjY2avredJqPTm6HCVKZ2qhRs=; b=HBdael0rjPWOIbpURzYHxboSFz8TDKr0U+Vgi+H/Z0Sogm4S6xGmi9E3y9tC0fwyrmKzEx Sei7yES1XQxyi0uRggAq7V5zDg0sbBvBBEnCz9zEEj8svX3br0MAOSqQ13UW3VMwHWh0ST L26dUDuC8cDYdbuL6zUL0XA5bV1niqUz+hRrYPcX2qdvEwZD73MTtJfg3IlnOSEuG78Aeh ekLDodwyGfD039PEudq8qQmRddsfoAoxcG8vvW/xTjfBhmAPPxPDf8bgch3R4GmyELRlCy ZeD7DqvanmOTtc2hm00Ex2Duct7hS2bxZr0CMKlbm8wX4yP5H79tXRKKCKvGXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973429; a=rsa-sha256; cv=none; b=M2zLa9v+MFyHskTV+wiL6OLauhOdJVmfmFTXXNUnbBbu/graxBC6VMZQfGyupGwUB689R4 bhBZmkHL063wJWNz+fnLhGsLInzsf3eEF74+jUWGu0uUhLcd70EtPUclEpkynI2YUL2QE2 f1XJcxlTanYzm+K6xCEZUiYw6OCmlKb8i8mRhm0xNzChaRlIKeXxAlxuGR9A5VYvWAZtdz j28zpKy3DVL0I1J7ERd5Ggc0fsi8Tph4kCl33mnSS7EPQPl15iVlJ2eBUTyzhfbnsPe1Sz LeybnXN7lK1EeAkWCdCGNNuHu5t0adPHsri87reHuKh/7gcqluy6US2vemVquA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WO8330w4PJZbncTmlIEjY2avredJqPTm6HCVKZ2qhRs=; b=yOp8mr8UN37E3ftTUeEcteIkf4hjFQjNnM6T9v6AbUBNOKJXyCGG0qhl0BccsW/UuN2dNx RnJvRNG/jXcknbM33C7ofgEEmATzPnYGx33RrSZZ+7qGio7a/3de0VawyOQNxtqv1xHN08 qL4wqeh2lmamSen/PLbnvH1+T+O3quoMIDWju4S5AtV80S39MCmOeHFu3eX608UL33W0xe pwd8W96iZEDluSEJrVA9XJfKXXc2gDwOKlBO65ElSrIgg9HzHpi1DMDwdXOOs4Hz5W8JHO +gzNEWRxAY2RJPB43BdYoe4tKJCXgYix9XX1t2hpDZvzttSCT0srO2stDz2/bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv92JwWz147b for ; Sun, 12 Apr 2026 05:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31588 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4ebb7c8048ae - stable/14 - sys/abi_compat.h: add Foundation copyright for uint64_t stuff List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 4ebb7c8048aef03d1ab154f1c5ccc30b56376604 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:09 +0000 Message-Id: <69db3435.31588.616decb6@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4ebb7c8048aef03d1ab154f1c5ccc30b56376604 commit 4ebb7c8048aef03d1ab154f1c5ccc30b56376604 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:10:00 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 sys/abi_compat.h: add Foundation copyright for uint64_t stuff Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit 9ce0c190d8b3570c0a537f84952dca8c6e462ec3) --- sys/sys/abi_compat.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 1753d8dd25c2..69fb349edc7a 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -4,6 +4,11 @@ * Copyright (c) 2001 Doug Rabson * All rights reserved. * + * Copyright 2026 The FreeBSD Foundation + * + * 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: From nobody Sun Apr 12 05:57:10 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvB5gLpz6YYfx for ; Sun, 12 Apr 2026 05:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvB3jbvz3mKV for ; Sun, 12 Apr 2026 05:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+32ahOB4dhp1fQFU7xSd8Se/XJ5O7YF82/uKfHsEkdc=; b=SxgLriT4L2rqk5AddahgTPM+GoHZIJiC3BwCH5hjxlDngSNna15AEJIf/hsP++xzvx2dY7 WLNeHJG1MdQftPYnf//VZIMHOj2XTWbI6hwXpOncrfvf/3ZVqmWAS/saHplSoC/cM/EUUx 5KQA2EnM9mlGeK2YedfO8300x5yUxDZWnFIDUbMyqdnydhJAT5tVfZ0Xnfl2ZQ3ld2zCSK 4O8BFLRV0TM+X3KcsH2FnNTmqqo5P5pJGGZgoJIAgVbvKRIDpgHyE4HSp1qI5XWpdaJ0HD 7wTDF6P7ZaBuaQzJB1V0xn3vEIBky4Fh6sqRHTbt4kTq+SkBcACL0MOxTrHHpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973430; a=rsa-sha256; cv=none; b=hOANw+8ysZWRG1uLVRPogCygYousUIEgD08VPKJgxc0dYodL3p8jOy2fSv8zjy4/uzU3mh HCF4XRpLleZwPxi9E4Rn9LLErcESUthCQ6rzf1ymfiHi/so8qmLzgkI0Sv6dinqmZlW05E kuwYSGy9yS7R32qZzzAYSs00s4mcgHGr0S+cvlU8sKXUb1kLp2qoJul5KlT8SjMVuKXUnd 9dKDC+oKT8gUWr/a6Gx6DylSNtJ4QHF/afjiYnp2Y4B0HshZpayWSZE2qwfZRu2CN6bWNR X2kdCQG2JGRUjuF0Svff2457jpYfa3olGHEPg4/VuXt7fNxvKysx+lSzD3/dcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+32ahOB4dhp1fQFU7xSd8Se/XJ5O7YF82/uKfHsEkdc=; b=pGSHxcScMXIAOFB8Ni9VpNDlH2aRkCtx9F87FGEIF6wkT7GoV7tKz4w//0oXO8n8Lq7iAM 5Zzr3QXajAPs0T8JgIs0m8SHOk3Nucfz3TKzwYs9NZVEWZ7h1bCxsjDsiYrfiYe8uYVOQH a+R5vPJfDRyItLIZaICqDmMz9BII74IL1q1FmqwYaHUo/+0ZR84x4Ez0qY/6Fr8ls1VXaH KWgAmhMsg460vtfTkSBShGPFOG+YbkgqVd+6lVZ+tb40nuYUqRdwa/xD6cAaxLHgCOGq6J TMCmAqkEWoJO59Yx6nKlqbmZ6KkUaoOakC/14RUHbDhKzkE4+A62LLYzwXunDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvB3Csbz147c for ; Sun, 12 Apr 2026 05:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27e31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fc30c3f43f7f - stable/14 - sys/event.h: use freebsd32_uint64_t for kevent32 64bit members List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: fc30c3f43f7f0d31e3a90ba871bd58650482e98e Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:10 +0000 Message-Id: <69db3436.27e31.24a99b9c@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fc30c3f43f7f0d31e3a90ba871bd58650482e98e commit fc30c3f43f7f0d31e3a90ba871bd58650482e98e Author: Konstantin Belousov AuthorDate: 2026-02-05 19:22:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 sys/event.h: use freebsd32_uint64_t for kevent32 64bit members Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit ad639400dc9f1c5aec470996473bb54edc113dba) --- sys/compat/freebsd32/freebsd32_misc.c | 38 ++++++----------------------------- sys/sys/event.h | 6 ++++-- usr.bin/kdump/kdump.c | 6 +----- 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index df388a7d67d1..90a4ee466084 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -681,31 +681,16 @@ freebsd32_pselect(struct thread *td, struct freebsd32_pselect_args *uap) static void freebsd32_kevent_to_kevent32(const struct kevent *kevp, struct kevent32 *ks32) { - uint64_t e; int j; CP(*kevp, *ks32, ident); CP(*kevp, *ks32, filter); CP(*kevp, *ks32, flags); CP(*kevp, *ks32, fflags); -#if BYTE_ORDER == LITTLE_ENDIAN - ks32->data1 = kevp->data; - ks32->data2 = kevp->data >> 32; -#else - ks32->data1 = kevp->data >> 32; - ks32->data2 = kevp->data; -#endif + FU64_CP(*kevp, *ks32, data); PTROUT_CP(*kevp, *ks32, udata); - for (j = 0; j < nitems(kevp->ext); j++) { - e = kevp->ext[j]; -#if BYTE_ORDER == LITTLE_ENDIAN - ks32->ext64[2 * j] = e; - ks32->ext64[2 * j + 1] = e >> 32; -#else - ks32->ext64[2 * j] = e >> 32; - ks32->ext64[2 * j + 1] = e; -#endif - } + for (j = 0; j < nitems(kevp->ext); j++) + FU64_CP(*kevp, *ks32, ext[j]); } void @@ -787,7 +772,6 @@ freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; struct kevent32 ks32[KQ_NEVENTS]; - uint64_t e; int i, j, error; KASSERT(count <= KQ_NEVENTS, ("count (%d) > KQ_NEVENTS", count)); @@ -803,20 +787,10 @@ freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count) CP(ks32[i], kevp[i], filter); CP(ks32[i], kevp[i], flags); CP(ks32[i], kevp[i], fflags); - kevp[i].data = PAIR32TO64(uint64_t, ks32[i].data); + FU64_CP(ks32[i], kevp[i], data); PTRIN_CP(ks32[i], kevp[i], udata); - for (j = 0; j < nitems(kevp->ext); j++) { -#if BYTE_ORDER == LITTLE_ENDIAN - e = ks32[i].ext64[2 * j + 1]; - e <<= 32; - e += ks32[i].ext64[2 * j]; -#else - e = ks32[i].ext64[2 * j]; - e <<= 32; - e += ks32[i].ext64[2 * j + 1]; -#endif - kevp[i].ext[j] = e; - } + for (j = 0; j < nitems(kevp->ext); j++) + FU64_CP(ks32[i], kevp[i], ext[j]); } done: return (error); diff --git a/sys/sys/event.h b/sys/sys/event.h index 1b30e4292de8..8ade9690d548 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -102,6 +102,8 @@ struct freebsd11_kevent { #endif #if defined(_WANT_KEVENT32) || defined(_KERNEL) +#include + struct kevent32 { __uint32_t ident; /* identifier for this event */ short filter; /* filter for event */ @@ -110,12 +112,12 @@ struct kevent32 { #ifndef __amd64__ __uint32_t pad0; #endif - __uint32_t data1, data2; + freebsd32_uint64_t data; __uint32_t udata; /* opaque user data identifier */ #ifndef __amd64__ __uint32_t pad1; #endif - __uint32_t ext64[8]; + freebsd32_uint64_t ext[4]; }; #ifdef _WANT_FREEBSD11_KEVENT diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 3240773f357b..47002a065dd6 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -2375,11 +2375,7 @@ ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) kev.filter = kev32.filter; kev.flags = kev32.flags; kev.fflags = kev32.fflags; -#if BYTE_ORDER == BIG_ENDIAN - kev.data = kev32.data2 | ((int64_t)kev32.data1 << 32); -#else - kev.data = kev32.data1 | ((int64_t)kev32.data2 << 32); -#endif + memcpy(&kev.data, &kev32.data, sizeof(kev.data)); kev.udata = (void *)(uintptr_t)kev32.udata; ktrkevent(&kev); } else if (strcmp(name, "freebsd11_kevent32") == 0) { From nobody Sun Apr 12 05:57:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvC6dW8z6YYv5 for ; Sun, 12 Apr 2026 05:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvC4XZCz3mQN for ; Sun, 12 Apr 2026 05:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nb1jT4rj0Nd9xHGPnKC9N+PuBRqiy7YN+dh2MTKSbI0=; b=XfOdgvyawXTR9/KjJmXIcuHEXtK2hMya6CGvBz6FeA+LygrG1sQtDqWXsWoTgwuQmHZ8bM LKwkvTjhiTO9+tnoID7QhpRkwkLIuhjf0EfT7KQNU+wlUeEP8o+TlXyUoBygOgEqCp0RZn gykF6rKPla5cjXrfSpBMNr0xf0XVB7LfQGnHZhy9AsK8StNFJyhR2RmFSf1VzyoC80C6sQ sTYs2DksaoijI3jZAcn72uDmTPxgPs1Rw77IESKN7NDYY7cOhDgWJGvwsDm7sZ60q87C52 EgMhpTpoQBALbtgAlbbGT0+A4leO/1w3s7GCJPNiLTqc8shVj5UDO1WZCBpgFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973431; a=rsa-sha256; cv=none; b=o+y2DAO6TiXsbm4FNGGrO6P2d1kSE0ZvBdhmDv/DkCvYb/rUdviK8PadGc6K+JJWrgxCkg ZVDJQIpxoT/5LWSGD2Fz7aKBPFAm/bFyzbNP9W7gpKZI7+MhayNRcqlpLd95QbQ3/Gr1OG Buvg/nt/QX5Z6qtEn6271MEg4pCTvCkKM83OBCUgWqvmAjEeXHkfAlsioWUt4LYshSliYL xoIwMGih3XfDJ+PrXltEbmZ91zgKlcsOuxyc9LiN9NajyTupGSL4BtJqaGlEbJsim5Kg/g RFCZd/UjjrSSVKVub/oXOtFEhNogHKlz2rTt5EWaQQmukTlZ8H8xn3/3xgFv1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nb1jT4rj0Nd9xHGPnKC9N+PuBRqiy7YN+dh2MTKSbI0=; b=s+r+GjUi38QESNmLCVFqZU2ESj00BFqZAHK4jNvHKCD7deqZfsn4FJUe1jWklsr18+2mNR CsEW2Va/L5zkGSrNn5+KVz9GWnsnBLuPxEugQf0vFtX9hqw9sss5SPppy+dNL/Jjz5nKaH phuef9TjwmDn18Y29mF+wFpaz+ieb1u5gsSVdRtgNNhV3tjPAPEq3MOmt12hWE8orO7VRI a+vIb2a8FxW5v3cA+jDB/WJjZCq3g7CRvsSHMTTJvD2XJ8WumnHB8XY59LvHXMqk/OmSER o7Lnp2WJ/hEcmekKNEPOWL733hvwFLMipO80mZ67N4AvxzyYHFUYMBVWKuOtow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvC44Kmz14Wy for ; Sun, 12 Apr 2026 05:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31bf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d94d93b83aec - stable/14 - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: d94d93b83aec816985632f78eb5c29e0e9c095bf Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:11 +0000 Message-Id: <69db3437.31bf4.7e5d3813@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d94d93b83aec816985632f78eb5c29e0e9c095bf commit d94d93b83aec816985632f78eb5c29e0e9c095bf Author: Konstantin Belousov AuthorDate: 2026-02-05 19:29:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:46 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit 485e916a67b4e700de5f50873e1e7b64de394b16) --- sys/compat/freebsd32/freebsd32.h | 6 +++--- sys/compat/freebsd32/freebsd32_misc.c | 31 +++---------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index b8cd29e5238f..1cc32f102e08 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -447,12 +447,12 @@ struct kinfo_knote32 { union { struct { int knt_vnode_type; - uint32_t knt_vnode_fsid[2]; - uint32_t knt_vnode_fileid[2]; + freebsd32_uint64_t knt_vnode_fsid; + freebsd32_uint64_t knt_vnode_fileid; char knt_vnode_fullpath[PATH_MAX]; } knt_vnode; struct { - uint32_t knt_pipe_ino[2]; + freebsd32_uint64_t knt_pipe_ino; } knt_pipe; }; }; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 90a4ee466084..9dda5c3ecd1e 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -707,38 +707,13 @@ freebsd32_kinfo_knote_to_32(const struct kinfo_knote *kin, break; case KNOTE_EXTDATA_VNODE: CP(*kin, *kin32, knt_vnode.knt_vnode_type); -#if BYTE_ORDER == LITTLE_ENDIAN - kin32->knt_vnode.knt_vnode_fsid[0] = kin->knt_vnode. - knt_vnode_fsid; - kin32->knt_vnode.knt_vnode_fsid[1] = kin->knt_vnode. - knt_vnode_fsid >> 32; - kin32->knt_vnode.knt_vnode_fileid[0] = kin->knt_vnode. - knt_vnode_fileid; - kin32->knt_vnode.knt_vnode_fileid[1] = kin->knt_vnode. - knt_vnode_fileid >> 32; -#else - kin32->knt_vnode.knt_vnode_fsid[1] = kin->knt_vnode. - knt_vnode_fsid; - kin32->knt_vnode.knt_vnode_fsid[0] = kin->knt_vnode. - knt_vnode_fsid >> 32; - kin32->knt_vnode.knt_vnode_fileid[1] = kin->knt_vnode. - knt_vnode_fileid; - kin32->knt_vnode.knt_vnode_fileid[0] = kin->knt_vnode. - knt_vnode_fileid >> 32; -#endif + FU64_CP(*kin, *kin32, knt_vnode.knt_vnode_fsid); + FU64_CP(*kin, *kin32, knt_vnode.knt_vnode_fileid); memcpy(kin32->knt_vnode.knt_vnode_fullpath, kin->knt_vnode.knt_vnode_fullpath, PATH_MAX); break; case KNOTE_EXTDATA_PIPE: -#if BYTE_ORDER == LITTLE_ENDIAN - kin32->knt_pipe.knt_pipe_ino[0] = kin->knt_pipe.knt_pipe_ino; - kin32->knt_pipe.knt_pipe_ino[1] = kin->knt_pipe. - knt_pipe_ino >> 32; -#else - kin32->knt_pipe.knt_pipe_ino[1] = kin->knt_pipe.knt_pipe_ino; - kin32->knt_pipe.knt_pipe_ino[0] = kin->knt_pipe. - knt_pipe_ino >> 32; -#endif + FU64_CP(*kin, *kin32, knt_pipe.knt_pipe_ino); break; } } From nobody Sun Apr 12 05:57:12 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvD6ynJz6YYsV for ; Sun, 12 Apr 2026 05:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvD575Xz3mQb for ; Sun, 12 Apr 2026 05:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lp5bfxeEVvmfJQ4NqGA2XIrk+f1ZlQ7yIewqbVb7PRk=; b=DnpjgQYeG7c6M+atkpS9DuKFu3g69CLOTAX9GOVIeG1/3vrbENbcbsPv1ukHpM0FzkFwy1 Nt+mddmWgCxu2hD0VdSpDbUlB2Rv8v3ldmW+0dYy/z5I+fZ3X28q4+LlxfROoL1mmTZ8ZJ E11U+VeD7hcvDeI06V8U4S9W5GccpSEdo10prKgFBMuEhPzDoii5v5s+gBcPPA+YimUXSo H0rW7e71TMYV92yD5vsblsp0TxwNqO3uqyIqpGYkwDL28p3ucqM4p0LB4tY+1vlCip1EU2 SKEmgSl6jZ4aWkSVS+Lt5RWHl/zU3i+L7Lvc8TsYTh9Jr6nv+NDneX+4cEMBtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973432; a=rsa-sha256; cv=none; b=QojlFui1JPfPqLpN/f81YSlGScsOIqKeDQZg9khnX6/yA8DXFEd8x2kLjCp7BP8PlhNS8F fIzIlYhA0zarI1VnyWpWkfsaLmoag+GnqStk2rvYvuzOyPPtfREEHKTbA7xCOA9fHowOwc hiG0PjEHYdDgKV0wZ2LMKJMDaqeMHjRkPDEnkiIDImi+r02qfwWlUZ8YfTn8ieVWa62elC 0atth7sEsPnLjJ53q7kIcUqR/BSrFihKHh9NJMhZwesTQK1PaaugsqcTx4nR0PbMcpmKnL 04Tn6m4ReLyjC3Up//c6QZlrVvNSKESm0TsWEKJikeAP/H9HVRl368XA9aWG0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lp5bfxeEVvmfJQ4NqGA2XIrk+f1ZlQ7yIewqbVb7PRk=; b=BSNOzcxutNt+CkR+M88XCVUCsT0qOLlMw+O6xhRTBflrrnWjDNrIgGV6EB7Gdhmi/Wir7G mDL0rldRdIU4zErXSMKbId3wYlBefBE++R9/ec0k7b1s5s3mIXFSxu14+sbXjb3WgDPBkh G7eNJylGi8DoqA1VwRouhWi2tUrtFlA5FeKHOZMurmaOozHCovfYzOpMnPnDTWjH1O0HPP o8md42fTbumuS2EfN0udZgz6OkB581dCNLrb6GaKFCmg4KSk71yoT5XzBM45ahPRtuUDHU 53z3hQqPZwP/89aisyrCdtb83S6BfU0ZF6ndTxCFVbM+4eZKmZCv0bBSrj75OA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvD4gbYz141l for ; Sun, 12 Apr 2026 05:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30ca3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7d8b297d02b6 - stable/14 - sys/compat/freebsd32: use freebsd32_uint64_t for struct ffclock_estimate32 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 7d8b297d02b6d17cc10a47a37047c1c232c9c3a4 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:12 +0000 Message-Id: <69db3438.30ca3.34ff185c@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7d8b297d02b6d17cc10a47a37047c1c232c9c3a4 commit 7d8b297d02b6d17cc10a47a37047c1c232c9c3a4 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:35:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:46 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct ffclock_estimate32 Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit 3dc72107d29d304ba21f04426ec82077d23cedcd) --- sys/compat/freebsd32/freebsd32.h | 2 +- sys/compat/freebsd32/freebsd32_misc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 1cc32f102e08..b3b739bb6ad7 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -59,7 +59,7 @@ struct ffclock_estimate32 { struct bintime32 update_time; ffcounter update_ffcount; ffcounter leapsec_next; - uint64_t period; + freebsd32_uint64_t period; uint32_t errb_abs; uint32_t errb_rate; uint32_t status; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 9dda5c3ecd1e..894cb40506ea 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4114,7 +4114,7 @@ freebsd32_ffclock_setestimate(struct thread *td, memcpy(&cest.update_time.frac, &cest32.update_time.frac, sizeof(uint64_t)); CP(cest, cest32, update_ffcount); CP(cest, cest32, leapsec_next); - CP(cest, cest32, period); + FU64_CP(cest, cest32, period); CP(cest, cest32, errb_abs); CP(cest, cest32, errb_rate); CP(cest, cest32, status); @@ -4144,7 +4144,7 @@ freebsd32_ffclock_getestimate(struct thread *td, memcpy(&cest32.update_time.frac, &cest.update_time.frac, sizeof(uint64_t)); CP(cest32, cest, update_ffcount); CP(cest32, cest, leapsec_next); - CP(cest32, cest, period); + FU64_CP(cest32, cest, period); CP(cest32, cest, errb_abs); CP(cest32, cest, errb_rate); CP(cest32, cest, status); From nobody Sun Apr 12 05:57:13 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvG1Q5bz6YYvF for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvF60TMz3mmg for ; Sun, 12 Apr 2026 05:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7UY2DPhC/j/yxIslfrFROzf4WtrH5faEIKubGpgrAb8=; b=mGrRCKGdgx7qUhaU1QBrIQt3PupS/ougYNND49elr44EzZaLKZ+rCl5s5WxNcFvB0XtcoG DWsmFJ/GfF/BSyi9WrimxRqaanG90E9MAj6wzoWaJ0UYK6jB1VNKBj8IwmFTNTQStRTFlN bMLoIXfLdhRd7fCNIxfcYRdwgLUw0RroVuhVpzuNtUN+S9z4S+k/kzROA1c7TEiLymEVZl uFlA1SjfusZp0wZ5j4+p1FQPCo2HzJvcmWul0yPi4uxiRLx+HOyjTLJ4T4cADS2P9SZ8OC 9Z3N/+6oUdro097WEKp9jYSfscuKOLi5GfJaY9b7v2sfH2CicbRCVrMgEuhh1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973433; a=rsa-sha256; cv=none; b=gM2d+opvVaOvSDEP7OVA0hGCIeQJu0Lj0w6upp0yk9iUWH/Izf5blWllBpfgJJvY/t4O4q AcHKXSuuCe5qJgVF7TZTX5pNVnzPzCTQdjv87d4+NFnvy9RJfqOLbtTHemXafx/BVAeOmH Z1Q8Wd5XPl3DwyznPBXk0VOXRqbYvL9I5h5F9l8YPIksYCMhAJxE/1J9h+VA0iiJx2Fr8p zENnR2HCsot4HKNgN5d3sCI4EHjprIZZD4iM1i2EzGooa0o0TG0/LpqtSyonAEVo+3Rxpv gTsBUa4t9VnT0CzYk/WNy/UunMwLKDofQRckLapGSrQUJY3zruD16rc1Z+c+mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7UY2DPhC/j/yxIslfrFROzf4WtrH5faEIKubGpgrAb8=; b=RYAJNpvF2V237oYFhGdNBC9xuPMyrUYshXM5fLZJVVxHxcjxWlbufkOdf+UoDyPzKQ8l0Y 0r+dGbHJdVIH2RljjYN1e8Z6BXknnGhI0M0Dz+1Jkn9eLyXxpeElo8XOt/z7HCDD2KdiXi u8yyhQpWoHJV7R1o3kAedbFZf9aMoljpqrJOSQkacXZBNO1Qvg0vDa7PNC9R75CoiewHEF y8pOQ2qQJrwtMaRF5hdN7WrkTkJwe+eztu8zkqJ1hLLmzelrjNvRuE/Om3ggNkBhg/g6qx 0wlEriQYt2ITdNJNWLrw/EljH9YBSTXWDhsDnLBtzQ02NwvwqxAEzuqe7lkSQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvF5XdVz14Jp for ; Sun, 12 Apr 2026 05:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31c01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f381a87145fa - stable/14 - sys/compat/freebsd32: use freebsd32_uint64_t for several struct stat'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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f381a87145fa4acebd5d2cfd97466c225a8397e1 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:13 +0000 Message-Id: <69db3439.31c01.3f8aacef@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f381a87145fa4acebd5d2cfd97466c225a8397e1 commit f381a87145fa4acebd5d2cfd97466c225a8397e1 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:39:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:46 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for several struct stat's Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit beee89472e3e0e3640c9db5c34a6e422830ff00f) --- sys/compat/freebsd32/freebsd32.h | 10 +++++----- sys/compat/freebsd32/freebsd32_misc.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index b3b739bb6ad7..7a4cfc1fbf0b 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -227,12 +227,12 @@ struct stat32 { #endif struct timespec32 st_birthtim; off_t st_size; - int64_t st_blocks; + freebsd32_uint64_t st_blocks; uint32_t st_blksize; uint32_t st_flags; - uint64_t st_gen; - uint64_t st_filerev; - uint64_t st_spare[9]; + freebsd32_uint64_t st_gen; + freebsd32_uint64_t st_filerev; + freebsd32_uint64_t st_spare[9]; }; struct freebsd11_stat32 { uint32_t st_dev; @@ -246,7 +246,7 @@ struct freebsd11_stat32 { struct timespec32 st_mtim; struct timespec32 st_ctim; off_t st_size; - int64_t st_blocks; + freebsd32_uint64_t st_blocks; uint32_t st_blksize; uint32_t st_flags; uint32_t st_gen; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 894cb40506ea..c3b2b2141e30 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2255,11 +2255,11 @@ copy_stat(struct stat *in, struct stat32 *out) TS_CP(*in, *out, st_mtim); TS_CP(*in, *out, st_ctim); CP(*in, *out, st_size); - CP(*in, *out, st_blocks); + FU64_CP(*in, *out, st_blocks); CP(*in, *out, st_blksize); CP(*in, *out, st_flags); - CP(*in, *out, st_gen); - CP(*in, *out, st_filerev); + FU64_CP(*in, *out, st_gen); + FU64_CP(*in, *out, st_filerev); CP(*in, *out, st_bsdflags); TS_CP(*in, *out, st_birthtim); out->st_padding1 = 0; @@ -2468,7 +2468,7 @@ freebsd11_cvtstat32(struct stat *in, struct freebsd11_stat32 *out) TS_CP(*in, *out, st_mtim); TS_CP(*in, *out, st_ctim); CP(*in, *out, st_size); - CP(*in, *out, st_blocks); + FU64_CP(*in, *out, st_blocks); CP(*in, *out, st_blksize); CP(*in, *out, st_flags); CP(*in, *out, st_gen); From nobody Sun Apr 12 05:57:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvH2PnWz6YYg4 for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvH09hfz3mf1 for ; Sun, 12 Apr 2026 05:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MkfbpQufBryUN056UT4kTVxBjABp4lBBfIj5Zz6+NEY=; b=SvtFl/YDkf9F3mqNVLI7TT46dIb3n8Oz2mmfHk4U8ZF3zzFvFEUZzQB3nbJFMJQp3e3qXr na04XUpUdVezUSh+F7xZEHPhN1q52mn9uYesm63He+1AcVu1XL5TumR1PM3JoFfvGOGY0J FjzidO1rb5oh6PFl6OKnYTYCF+dyaImTmfr+MWB6vnL11hNq127LmP72+gUSAxXoF/axks lqxaCK6MfdGVUgaGmWiaXDS981HWFspU3/DrhMM41jn5R8HmDxxQ5dgULDbBsQdybEMDru V8W8qi2ahMVIM9QInEPKh5/xm+7infofF3hAIb/Lg5LUNUOJ1YSDW8bXNHuyKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973435; a=rsa-sha256; cv=none; b=nMhMFtTYsCyX0ju7Cpy5LpSl8FBDurGMZ8Tq63YBrtz4BTFnfZ/Nrq+n+gAqpc0zfmVEG+ DQFeXbIcQS/g4F1UvbXTnoHch4KXWzbvgFDccBiz2l7BvZlBy3oPprK8kfQPhQE/jm0cyp wn2Lh89K/FpvaVlkvl6JD76ZQLitOIFhoHUGMokDzeAfYR5cnUwW0hQd5gttrFKSvC2dz7 Lo6ghnWGBNK//cq2ze7c5Y9n1GpmBOEy3gv0eyj5rUyK/Pur/+zluNf45I/JxpYqR0O2Cs bOchYc1yjBQHOisQEIdsh5w/X4b+G4g4c95N3LAOcS2bhHhqA/c6aFbf5OYb9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MkfbpQufBryUN056UT4kTVxBjABp4lBBfIj5Zz6+NEY=; b=hsiK7PC+4HiWVCcHgmF5PCxnoccdAuFp3BmfSgKJ8l6LMcl0AIetXTBSWFT3V+6dp7b2RD StEEofCK6Y8fiY6yLUmgj6x2lyFzMOxx0//Xd4gL9PyaGGYx++GrbTwsrvut+1OXZrOq8c DyniXzRJXo4EUD4xI+zQ24dOZhA50Z4WCac6FND5if/ZPSzdBSZwkjQ03TEIWn838HZgC/ ID9T2PZVQY9Q5EQwnwJKr6jl2pbWDX4jEWGYr4vqQgDZckulSVis7XbOHqWCfk0MKLThEj XBUtadqf08p0Bh3FqKnw17i1rpPwW4cGpGF3mWTkSsVW7kVT1rhRCT+5U5C2Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvG6Q1Tz14MF for ; Sun, 12 Apr 2026 05:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 300fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b13bba245653 - stable/14 - sys/compat/freebsd32: ki_pd is missing from struct kinfo_proc32 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b13bba245653e81e35cdcfca7acd05f0065d2b6c Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:14 +0000 Message-Id: <69db343a.300fa.bd214f9@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b13bba245653e81e35cdcfca7acd05f0065d2b6c commit b13bba245653e81e35cdcfca7acd05f0065d2b6c Author: Konstantin Belousov AuthorDate: 2026-02-05 20:02:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:46 +0000 sys/compat/freebsd32: ki_pd is missing from struct kinfo_proc32 This is missed by the sizeof(struct kinfo_proc32) assert due to another bug: namely, the use of uint64_t type that has different alignment on i386 than on amd64 host. Fixes: 85078b8573332c2c83a79adea8a61b519fb3b6af Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit 154778e3585166f613fd3d2978a0cab2262d1611) --- sys/compat/freebsd32/freebsd32.h | 1 + sys/kern/kern_proc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 7a4cfc1fbf0b..9629a3621481 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -410,6 +410,7 @@ struct kinfo_proc32 { uint32_t ki_kstack; uint32_t ki_udata; uint32_t ki_tdaddr; + uint32_t ki_pd; uint32_t ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ int ki_sparelongs[KI_NSPARE_LONG]; int ki_sflag; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index c4d5356bb292..73e120f6a421 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1506,6 +1506,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) PTRTRIM_CP(*ki, *ki32, ki_kstack); PTRTRIM_CP(*ki, *ki32, ki_udata); PTRTRIM_CP(*ki, *ki32, ki_tdaddr); + PTRTRIM_CP(*ki, *ki32, ki_pd); CP(*ki, *ki32, ki_sflag); CP(*ki, *ki32, ki_tdflags); } From nobody Sun Apr 12 05:57:17 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvK4dskz6YZ4q for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvK1Sj6z3mcW for ; Sun, 12 Apr 2026 05:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MuSXmYqVwt1pbAAhYsHQKFQpLzlcgGK8Jcu3P1ZaciU=; b=wJZWfJuGAKLeboirzEqQgg74k5rI9naQQC043qmfPhEpN8m0LUOs2g22uYngv9FLN/WjeD x3JFBHhBau4H8X9y4rRp+IvIXSP5W9xUlaW4PSsbdKZrMiE6UkrysyJcrYhjPG/FuLMk0Z wGbEWv7pK7TrZ87GG1pGD3ApIe8ObWyH3Q6Blx1IWj3D9dKZnReNf07/e3NTigckvu+KOZ KKyuk6cw3yxjW7/OA9pPHt8BcsRiR1EtECCi7xcmP6QQgoTcx78L/Be0NT9bknuK2rZEbj 3PNbsCpz8jjsvF22kCUhqC/s7WxqdvLZDLDpKig+gFNWg2q/+bSCDq0DkYxDPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973437; a=rsa-sha256; cv=none; b=HAsVuktVzD364sY3ayR/YEdHRCU6PqEXZj4krYu67CM6J7MQlVKexqI4pzQ7e5kQ6A5Qvt dTeQe7NZPeE6/z7/OIrqhUgrOqMv9CMn2HDgZ9i9puJNOmYpDOtc2CY0dgaJjU4Mirwm5z kF3Y/jVVbSmLU81Tj58RzZIRXtHE4QSTknZDTauJuCfsioT9E7H5q7tulUPh3cLXO1gaDC frh+W7dfFOQkp8c+s47OhQL4LM+rinEhgjV35HD4JKcut0EkZ5C4o0ywoL4cDcbwJKxvRr /vH9UDok9vXouMjUQYgLtLhFXOkyglpACC9+xmmv5lHyTCV8c5C6nHTGI7sYDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MuSXmYqVwt1pbAAhYsHQKFQpLzlcgGK8Jcu3P1ZaciU=; b=VrbBkcalhZyiim3qRrqhFRy/DBO67vduWAKCXndSjoVinBMlPrdvDksdD8iWdcIdQR8IEB CnGxRvl9gQ6tR1e04GS0M3zVzYuXLFgx1TGrxCeYZBRjHzUuaYX9/ScVipPai/vhgCHQZE iHelqLVXmqbYmS6M66aRr1VM1/owK8BYpr2MD59SuxAoGHETrqMq6a/sAVncHfnC4/H1QR fExYsjLyFjh9iLIHPp++GQBd4pcDGKr3hfSTDgDZNe9vudnjIVx98hHDad0K9brnFtMus4 IJX6QpO2cwi2jMCRk4rfdbD70ipNE6If3p1TRzMMCD9oTNtRPzuA3MxVJVq0yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvK0yH0z14X0 for ; Sun, 12 Apr 2026 05:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 270dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7320170ff210 - stable/14 - openzfs sys/types32.h: use abi_compat.h for time32_t List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 7320170ff210cc1da1f36e73130de7e2e62a867b Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:17 +0000 Message-Id: <69db343d.270dd.4df4722b@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7320170ff210cc1da1f36e73130de7e2e62a867b commit 7320170ff210cc1da1f36e73130de7e2e62a867b Author: Konstantin Belousov AuthorDate: 2026-02-06 23:47:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:46 +0000 openzfs sys/types32.h: use abi_compat.h for time32_t The time32_t typedef leaks into openzfs compilation environment through sys/event.h. Simultaneously, openzfs provides its own definition that is only correct for amd64 on FreeBSD. Try to fix it by using sys/abi_compat.h directly. Since toolchain build from the make buildworld uses host abi_compat.h, add a preprocessor symbol __HAVE_TIME32_T to signal consumers that time32_t is typedef'ed. If not defined, fall back to old and wrong time32_t, which is enough for bootstraping toolchain. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit 87632ddf67b01f3d4787d10332afc1eeece52e2d) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h | 3 ++- sys/contrib/openzfs/lib/libspl/include/sys/types32.h | 5 +++++ sys/sys/abi_compat.h | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h index 907b667e5d80..1b84f84a2ee7 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h @@ -29,9 +29,10 @@ #ifndef _SPL_TYPES32_H #define _SPL_TYPES32_H +#include + typedef uint32_t caddr32_t; typedef int32_t daddr32_t; -typedef int32_t time32_t; typedef uint32_t size32_t; #endif /* _SPL_TYPES32_H */ diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h index d065ebed03b7..81e7f3d7886a 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h @@ -62,7 +62,12 @@ typedef uint32_t dev32_t; typedef int32_t pid32_t; typedef uint32_t size32_t; typedef int32_t ssize32_t; +#ifdef __FreeBSD__ +#include +#endif +#ifndef __HAVE_TIME32_T typedef int32_t time32_t; +#endif typedef int32_t clock32_t; typedef struct timespec32 { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 69fb349edc7a..f190dcda9b68 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -52,11 +52,16 @@ typedef struct { #endif } freebsd32_uint64_t; -#ifdef __amd64__ +#if __SIZEOF_LONG__ == 8 +#if defined __amd64__ typedef __int32_t time32_t; #else typedef __int64_t time32_t; #endif +#else +typedef __int32_t time32_t; +#endif +#define __HAVE_TIME32_T #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (uintptr_t)(v) From nobody Sun Apr 12 05:57:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvJ4qhXz6YYgB for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvJ0f0Cz3msv for ; Sun, 12 Apr 2026 05:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=skvygmcdfWIAMhsGM7Ltgu9GEMDbZhx81yGZxBDuGY0=; b=jcJ6L+8QVLSBdAu8nf2bR/aC9bCJuOLgYqE7AWcZTqsbeEMISBWL6KdzkLAKxkAjisKSoP dZ1fc4G5hQt/3Htxd6sH8OTnjCu3idrN+HNozBDGDPXPKkb19+JyOFRAOMYJi+qmoZ+uAD k3+6FWQfge1DcAAILQJN4OwV9DS7IbO+bLZjNFRpjWWz1kv5aEBpOniJfcOG7Qq9jmWuZg oiu2vlrPYVqVLA0x6Tqagv9PGXYS3gkxG1+rFN/CmFMlrGpdS7QEDsuL6QxFaW+WDVSrRW +55mQAiv5I3WumIJfFpjT8n2cT3vm2JFl32NbT2kGA3pvni/oUnT2NUUrnN7GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973436; a=rsa-sha256; cv=none; b=ir8e58KY+ohvp7BzestE2WHzifmxQZ3KXl8l+3WiBkrbGGdsoBMJecuIvg5N5ILXeXcjyw wU4oDsUeQKoe74/AylTRWVZo5tX0fhJOcJ8li9R2JHvw3VC2tvODpiwFuMloVPuNNkfLap 5pkDgSbqJCkCSVO7l8dhUeesQAAm1U795pyiArx5sCG3NgxtxVqqlCU2y8IOeozDLHjO54 SwIPDEF/ykFvaNBwolELEfPQ2m2oQWh+Gf4ARXLH1XsNLOunIw22lwV3hEQg+6knKGtPcm Q3+1rGD1dufb9JuvIYc0odEqu7+W/94f+qUIq3YcQNEEfESmZG6o25eOwjybgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=skvygmcdfWIAMhsGM7Ltgu9GEMDbZhx81yGZxBDuGY0=; b=DNL7GRkb1RkkGn+CSvnOe7VwYg3jUJtYfTIxKs1jh7FB7wHL5WKwAeMs+wX9h8GErHLyxY tqYWfXcXrvS+aHDaEejxvj1mkBUp1FHp0JB87PxO4jwBxGvsO/8vVmI7bz0gP1AFTdsBJ5 KJFSBbAP8FaXWfZvfPCCsE16SuRn5NIk3EqDL93xkBdsXWaAdTiiO1Scv2pj4nRra5wKWC /DqNQbV7wNmnrtiAMJEOQUEHVxjHspSOlt6AtSl2J8N+SmxEdJ4mhGkaHQyBluGg4lEYwI /Hyyb8M1zhr6hjxzIju2yE6YlQ+0QjdBHEy5rWZ/ovy/3oRTaA4aGpUInmJEmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvJ09x7z147f for ; Sun, 12 Apr 2026 05:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31bf9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: e0c7fcdd1ef1 - stable/14 - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: e0c7fcdd1ef18a66cdb1f84ac05695998a917fd7 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:16 +0000 Message-Id: <69db343c.31bf9.31ffb884@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c7fcdd1ef18a66cdb1f84ac05695998a917fd7 commit e0c7fcdd1ef18a66cdb1f84ac05695998a917fd7 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:40:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:46 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit 31fab773613b21183fbd5a313fa8c69d37fcb196) --- sys/compat/freebsd32/freebsd32.h | 4 ++-- sys/kern/kern_proc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 9629a3621481..7e1e28232a1b 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -371,7 +371,7 @@ struct kinfo_proc32 { u_int ki_slptime; u_int ki_swtime; u_int ki_cow; - uint64_t ki_runtime; + freebsd32_uint64_t ki_runtime; struct timeval32 ki_start; struct timeval32 ki_childtime; int ki_flag; @@ -393,7 +393,7 @@ struct kinfo_proc32 { char ki_moretdname[MAXCOMLEN-TDNAMLEN+1]; char ki_sparestrings[46]; int ki_spareints[KI_NSPARE_INT]; - uint64_t ki_tdev; + freebsd32_uint64_t ki_tdev; int ki_oncpu; int ki_lastcpu; int ki_tracer; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 73e120f6a421..6dd75e21c67e 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1440,7 +1440,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) CP(*ki, *ki32, ki_sid); CP(*ki, *ki32, ki_tsid); CP(*ki, *ki32, ki_jobc); - CP(*ki, *ki32, ki_tdev); + FU64_CP(*ki, *ki32, ki_tdev); CP(*ki, *ki32, ki_tdev_freebsd11); CP(*ki, *ki32, ki_siglist); CP(*ki, *ki32, ki_sigmask); @@ -1467,7 +1467,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) CP(*ki, *ki32, ki_slptime); CP(*ki, *ki32, ki_swtime); CP(*ki, *ki32, ki_cow); - CP(*ki, *ki32, ki_runtime); + FU64_CP(*ki, *ki32, ki_runtime); TV_CP(*ki, *ki32, ki_start); TV_CP(*ki, *ki32, ki_childtime); CP(*ki, *ki32, ki_flag); From nobody Sun Apr 12 05:57:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvL4902z6YZ78 for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvL29dkz3mqj for ; Sun, 12 Apr 2026 05:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yI9n/DnJy0xXhywBccy9OGvp49GMqjgDIyLfdAZ0SQA=; b=B9LvEhBR/FRT7aRSJZ4uM5mEOfijqYLZDtpFSJVMVtM/o+04Qrogvpwp1g6gHJKdczYrTI FvqZVMeMp2QvZkwp4XHOXhd8mS70GDpB5W3ImDejmxR72/aA1V2JOzuvfErPiGwNtuK1QW /JztH86MrwtTCLTJM1E/RaNCqCDpiIBpicQqCGczHhv53MU6x74Qct/NVYAXnlYqZbxtle 4rcxTatyLeMs66luHECQgeVig2blKddY7v4hfsEhRX1ZuJ/YakouDQtNI50nmYhULOeVe/ syVdt2558tPgcjYRJ6Md20rQQZOkuGeuyum0h7rx6486GSUzNZGmd5hQhffJCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973438; a=rsa-sha256; cv=none; b=QyNJdTKD+JTUHvIiekIXq3B+Q4wZ2Z5+3ubwFtFir+F+UNpt2XfS5ENqavzPTw/fzR7CRq wTje3ZMq5AMkWzPeR+WYQ1azjVFm9o34Qh4PlySbMTuv02Zc5E4/MSEzvvO+j+3vnPUkeb 8YWPrycE7/vrL391q10Rmg6IhrG8Lf9pjZwA1EpvCK2bB+Di47Mif5fPIEuP/7RUeX0Ns4 MwFknbV5Ci0gu+35zDBTBrDtwHTNncCDdqA8BoKxBp/AF5gQmNWR7LKUfNWDfWSt+GE0by gEkhAMbUgaDLeYkPUsNficNE0JD62pMMkQuT8w7sD5vBtalGx3DcBfsgLyhZrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yI9n/DnJy0xXhywBccy9OGvp49GMqjgDIyLfdAZ0SQA=; b=tYAXBgoZKbZsJr+9NobIVriHUwINH3MP/R6rO+pZO6grot5ylZsfCexSW33Kk1+Nnrbw8o tAxOeY1xXUd/jzBPni3mQkS2PYkRv06kYyTEgIGutRLWY5ip3F5meJeWt58KMXHVvkwhcA uZxDng7XkfAvIMqHyBcU7UKcBF0QyWPwGLMeZs9/T6HOX03ILsp4URVkJ7nlCkqjgp8lY4 CNyw+QApm0FPpEktPhw9UOzuMuENqkboaV3IqFYwDQ3kfddAZbwTJFNlwdh/+AD6HNQr+B l/8m5oFKtRAwtHcorwzlnOZft5C5uaVYrI8tNu30sKjeiMCaVo8/z4DSMLWo0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvL1gY3z140G for ; Sun, 12 Apr 2026 05:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30ca8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ac1e0db3e405 - stable/14 - sys/user.h: remove XXXSKE markers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: ac1e0db3e405326c83e34102ce086847acc0f658 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:18 +0000 Message-Id: <69db343e.30ca8.1319962d@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ac1e0db3e405326c83e34102ce086847acc0f658 commit ac1e0db3e405326c83e34102ce086847acc0f658 Author: Konstantin Belousov AuthorDate: 2026-02-05 20:19:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:47 +0000 sys/user.h: remove XXXSKE markers Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit ec6cf0c52698f9056cb17456717849653a03f7e4) --- sys/sys/user.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/user.h b/sys/sys/user.h index 3e5dba871c54..bae0737b6f2d 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -198,8 +198,8 @@ struct kinfo_proc { int ki_fibnum; /* Default FIB number */ u_int ki_cr_flags; /* Credential flags */ int ki_jid; /* Process jail ID */ - int ki_numthreads; /* XXXKSE number of threads in total */ - lwpid_t ki_tid; /* XXXKSE thread id */ + int ki_numthreads; /* number of threads in total */ + lwpid_t ki_tid; /* thread id */ struct priority ki_pri; /* process priority */ struct rusage ki_rusage; /* process rusage statistics */ /* XXX - most fields in ki_rusage_ch are not (yet) filled in */ @@ -217,7 +217,7 @@ struct kinfo_proc { void *ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ long ki_sparelongs[KI_NSPARE_LONG]; /* spare room for growth */ long ki_sflag; /* PS_* flags */ - long ki_tdflags; /* XXXKSE kthread flag */ + long ki_tdflags; /* kthread flag */ }; void fill_kinfo_proc(struct proc *, struct kinfo_proc *); /* XXX - the following two defines are temporary */ From nobody Sun Apr 12 05:57:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvN5Ct0z6YZ19 for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvN3pvsz3myg for ; Sun, 12 Apr 2026 05:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dnCDdC5N3FkBAnn9tixWuxm/m/UlDwEwYumUh1zfTTU=; b=hbeIXQKZHXaM3gPoEHp/+5He2qCYAYFZNWF1ytspa25/NldzreCqqZT6qcazCItqqq6xUj v5On2N+GbaLOMFviixwFUnRGDSkjFSESofqn/FKN0mS87zF7OFtbY0mRcV/dsF6k14cqJi XbfE0ZbUUiDEOIxBx66qLX16h9HwdBal4fBJqSP+AGdT6I5RmBu3ueyFSQaliinhvsY4lO 4ENN3T7EKKyjxAcUzNUa83pujKiXABv3nGPjlT69LLfcv1F2d52ibGSz6Ci2WyuiNA9zeb YvSstbaq1LTqrPRIAs00uJb3aXGhEWdCS7bP5cFMcFzXxkBeYq8W2Z0guYAHFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973440; a=rsa-sha256; cv=none; b=UnmoWMdjVK4Uc7DeWAjCYRGzj/IljDVtVN2x6UoLe6ZqWwtLk6t1nRvxxAtqjmGfHsVSE6 hPjddDLU3E1PDprw0rCfqvxa6R6mPfC5G8LViyF+NBZz0NrjV7BUmGFcVDJLu08FY/RPRN 2TDVQU9y16/ifC8FXeJHhrjCSqwRpxTgOLYCeDHmceyf5ZHo4+hVTQyaJrsDftzK6kztE0 YgikTGGKBVvwOWTBIREUn0NVWCi7NUK37y4tUxqGObTo54HT5L38PWxhVMPxlGf/ueqdpK Hy9+YEySMBHvHapKSwF3RA/tbYURVtu/rPmn17zsFlfElFMu2DWinSIZuzkYew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dnCDdC5N3FkBAnn9tixWuxm/m/UlDwEwYumUh1zfTTU=; b=sIDRIV2XyqzI0sFY4WDXc+K9OHzb28rYDf7gKujfp3vMweDQIlUvJA7KVHqwrepIFWUPh4 kXBFcyPDMaMTmBtIG7io/dwv56q9+dp/pnJOrqBWW2tih01hQQ5fJwnlEv98Xc1uatQ/Rh zEI3jkGAEFEE7rzVrCM6T/PGycvACn6G6PR8RiteGoUfAUHA4XuhI829Za7Td2rnnqW1Tz 3lT2mKyjKfoaGJoXw7mqvjl4ROpsJ3HkKfXBUDQEzYgAbjacX0dVxCpOWoyVWw4pUaICGU pSmu4iW2OXdaWGl8EY4YC1bz9zNjDShY1OgQgDCOtaFFZ05pY+bHao6kfIT3Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvN3NHtz14Js for ; Sun, 12 Apr 2026 05:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 270e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 55766459e87b - stable/14 - dev/mfi: include sys/abi_compat.h unconditionally List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 55766459e87b5976e9459942f94772808a7de7a4 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:20 +0000 Message-Id: <69db3440.270e2.2add56bb@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=55766459e87b5976e9459942f94772808a7de7a4 commit 55766459e87b5976e9459942f94772808a7de7a4 Author: Konstantin Belousov AuthorDate: 2026-02-10 04:17:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:47 +0000 dev/mfi: include sys/abi_compat.h unconditionally not only for COMPAT_FREEBSD32 case. The driver uses INPTR() for non-compat32 code. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit bf603dbbb2c9964bba3d5bf2ba2371a75a0cc521) --- sys/dev/mfi/mfi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index b4249f2082f5..40a1ba64e509 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -55,9 +55,7 @@ #include "opt_mfi.h" #include -#ifdef COMPAT_FREEBSD32 #include -#endif #include #include #include From nobody Sun Apr 12 05:57:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvN0VMBz6YYyK for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvM3jfbz3mlY for ; Sun, 12 Apr 2026 05:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQ37Ge6jLS7510RDG1yV4tIgL2tlsUqrTBxSlSqt5vg=; b=k36Oz3SIPY3bcjCFJlz+s7HTl30UGhmziRs66fM6R4A5NqobtlC+yPWb7t9okaUo26q4eO FDE+ItAmKZmimmUxFlL5ACSpZ7P9gQqUifgU9AGe/b3dOTForuRFsTSwQpXyyT7yZhQWoe l02Ap50CiDeJtWok82MQs4njZ9vmSzuOJgXAokRtqu4hScQ3RH6rGk6j1FdRfVCulFydej orBMdBq94e/Bh5pE5xLq/qLzE2z9//vfvCmDiiuRN/Mw4XmiFql3E9Mg32/0scnbeK++u0 1/ZfCqsS3BKMemOVdJGhFMzdLHlDScSbaRB4S0yrxqNVnOYLdp14GiDbh59log== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973439; a=rsa-sha256; cv=none; b=obfYYzLlmnCDEf1z/KotBm5sKNE+kO9DhbP4l9ZZEXNrNJAWC05D2VxpJgR2+jlaCaDF44 19YTKYIbc4VUIFA2p06UkgkXNVX0Z1g0lIQhy0bPt6eyeQUerOPvP59bMtjWfYNZC5jWps V7jNz8h3IRsKruVUrlZmRe3j+hSQ6ObSccEnFunRfbd5yFlCvclOVONm/RyQ4xanzywKxN lFbJP7pzNcQCZv6uKQeFm9BmP6h1KyTdH7e95p9fHJ95bmB7oBAKkFymM665fI61BvzulZ qtFZinEnsgHvKFAP1svM5GlKUBuEkInpNhCIa9Y7C+b8sUJUdHYP+4/fBaIg1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQ37Ge6jLS7510RDG1yV4tIgL2tlsUqrTBxSlSqt5vg=; b=jJGGNlAdcIBPxyqEg0+7qrhs85fkksJvByyBgsF875TQ2IjGd6a5psHUxlcIxFQyBM03Wo +dWbB45/7Ry4PYtLLyVsTh1JQLJ3YyIZcdBD5u1C0OMNvQHrAzCoakhtZcoQzl/bZoOMym 3LqJJbKh6A8w5ZVSMNHntwErdoek00kSNqhOTpSymwc7U5742Jgi+cELp21f/CQWw2l3zG CUvVs+BWNjqNMVbV0TMPTCCeOm3wUT+QNsRMRUw0ZOxBYzB9cDRkJDyzQyNMZwkW5fnFxf I1IFpKRKDSArE3rvpvgI0zk+ZFmDuJAjUpXYYyXxquVvMumFoH+szIad+P2AdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvM2Xjrz144T for ; Sun, 12 Apr 2026 05:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31062 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5b2da2336091 - stable/14 - sys/event.h: reduce namespace pollution from sys/abi_compat.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 5b2da23360917537a086d30189edba22e4124c7e Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:19 +0000 Message-Id: <69db343f.31062.21cc0738@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5b2da23360917537a086d30189edba22e4124c7e commit 5b2da23360917537a086d30189edba22e4124c7e Author: Konstantin Belousov AuthorDate: 2026-02-09 20:13:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:47 +0000 sys/event.h: reduce namespace pollution from sys/abi_compat.h Split out types definitions into sys/abi_types.h, and only include abi_types.h into sys/event.h. Tested and reviewed by: bz Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55202 (cherry picked from commit ecadac729a1b855fe0d77a682ee424c3da1eb3db) --- sys/dev/mfi/mfi.c | 5 +++-- sys/sys/abi_compat.h | 30 +----------------------------- sys/sys/abi_types.h | 39 +++++++++++++++++++++++++++++++++++++++ sys/sys/event.h | 2 +- 4 files changed, 44 insertions(+), 32 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index af88085116c1..b4249f2082f5 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -52,11 +52,12 @@ * SUCH DAMAGE. */ -#include #include "opt_mfi.h" -#include #include +#ifdef COMPAT_FREEBSD32 +#include +#endif #include #include #include diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index f190dcda9b68..e696f0bae9db 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -4,11 +4,6 @@ * Copyright (c) 2001 Doug Rabson * All rights reserved. * - * Copyright 2026 The FreeBSD Foundation - * - * 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: @@ -34,35 +29,12 @@ #ifndef _ABI_COMPAT_H_ #define _ABI_COMPAT_H_ -#include +#include /* * Helper types and macros for translating objects between different ABIs. */ -/* - * i386 is the only arch with a 32-bit time_t. - * Also it is the only arch with (u)int64_t having 4-bytes alignment. - */ -typedef struct { -#ifdef __amd64__ - __uint32_t val[2]; -#else - __uint64_t val; -#endif -} freebsd32_uint64_t; - -#if __SIZEOF_LONG__ == 8 -#if defined __amd64__ -typedef __int32_t time32_t; -#else -typedef __int64_t time32_t; -#endif -#else -typedef __int32_t time32_t; -#endif -#define __HAVE_TIME32_T - #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (uintptr_t)(v) diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h new file mode 100644 index 000000000000..e449c86323f7 --- /dev/null +++ b/sys/sys/abi_types.h @@ -0,0 +1,39 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2026 The FreeBSD Foundation + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + */ + +#ifndef _ABI_TYPES_H_ +#define _ABI_TYPES_H_ + +#include + +/* + * i386 is the only arch with a 32-bit time_t. + * Also it is the only arch with (u)int64_t having 4-bytes alignment. + */ +typedef struct { +#ifdef __amd64__ + __uint32_t val[2]; +#else + __uint64_t val; +#endif +} freebsd32_uint64_t; + +#if __SIZEOF_LONG__ == 8 +#if defined __amd64__ +typedef __int32_t time32_t; +#else +typedef __int64_t time32_t; +#endif +#else +typedef __int32_t time32_t; +#endif +#define __HAVE_TIME32_T + +#endif diff --git a/sys/sys/event.h b/sys/sys/event.h index 8ade9690d548..a1cd224a960e 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -102,7 +102,7 @@ struct freebsd11_kevent { #endif #if defined(_WANT_KEVENT32) || defined(_KERNEL) -#include +#include struct kevent32 { __uint32_t ident; /* identifier for this event */ From nobody Sun Apr 12 05:57:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvR1zybz6YZ1M for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvQ5bqjz3mp3 for ; Sun, 12 Apr 2026 05:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gzmcxj3/yITwvUDHzLzNnTD19DQfFV171+qRyTQjFuM=; b=W5+innSc0mRcpQgwOy8AWCV7wWNQc2ccKra/OI5cUQXaqhWbVT0eAj9PFmNh2QLYoGPSK2 oxyKDOHvR9NlCqE97m53D166z3Y8sI8oJHO4hR3vrbjkWKSRkiIV0TjIRsexr2atYwBiuF 9gJOo4ykssLqXlcbDG9KNIFGZJS4b0fivvciLfFOvZNKHdhEuVa3k152gEdxPRTNmuTWDA veAEBPaXk9gA4X11AW1GTKIYoFp0TecLXjWQkJshCKkW+nvAI8p2DPL1SDt3k6bvTRVtNg 8Hs0KVswwcZo9H4JQY/Oq3WkXio0nqMkZHxKwZBO9FFoRd+h61JGk/cWUFZKEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973442; a=rsa-sha256; cv=none; b=FMlpbvWAo72Hz+7QiEiC8kjrzZuRVBmN8OhrRIJ/qkn6tEIMil0QHlNFT/HTqaq7MAomZI nZGr6eOaMqgMCVQfsNsxtga1Y5N43urA11ArPo2AiPUoPfeHWqFB/yHDDz4+db/QZnUjBY BUbMlBCI2ApazD43700QJqoaM8h0Q2rn264sFqQ/RRg16yDQKerM+nLpW3jMqcvMGUYipE sT2OzyFjQHi/vj9t3D+7DTiSJuRbh9bBb5ZN2JxlmvqjlbRRozl950QRMV+53Odewxd/tl nwSc7RiNzfGMBx678Ros6LQL3SSLVRCWUX1H7GPLABigLnIuHCDIA0XfEy2oAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gzmcxj3/yITwvUDHzLzNnTD19DQfFV171+qRyTQjFuM=; b=d+KRV+lNQ180330MgaOYvMzW/ZvscgpgfnjWcIK7lkXHKpcoyxOjzlzNS7e6QDX2iMq2+B L8JVVg/fvMvFbbVrciSfiDy3pJ3wXamLo9/pI3B1pihKk66Rsn9XxRZ9vbWyWLufysAlS5 NSlJiDx7viwRh2ZIwlvKQWpXvNiLbUEaFZ5hgka6zyBKknnZozjZfhpI/nlca9xYzXfKdG wT4Xd34Zq5Kar45oFzDQiDqLGLBozo8deDZkV6IB5X2A91Lo2dqaDuUNAl/TrfzXDEKUOh Ri4aKdr2CwO60u8kdIU9qeLwn17yODHJkcANsgO9Ko8b9Wd5dDUmyJTH6mzKqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvQ56YZz147h for ; Sun, 12 Apr 2026 05:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30e0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: de8867882c54 - stable/14 - sys/compat/freebsd32: FF clock struct: Don't pack, use 'ffcounter32' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: de8867882c544bab7de260fbb0504fc8949ca05a Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:22 +0000 Message-Id: <69db3442.30e0f.1debcea8@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=de8867882c544bab7de260fbb0504fc8949ca05a commit de8867882c544bab7de260fbb0504fc8949ca05a Author: Olivier Certner AuthorDate: 2026-02-13 17:03:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:47 +0000 sys/compat/freebsd32: FF clock struct: Don't pack, use 'ffcounter32' Packing 'struct ffclock_estimate32', in absence of substitution of 'ffcounter' (some 'uint64_t') by a 32-bit compatible type, was necessary on amd64 since 'uint64_t' is 8-byte aligned, which leaves a padding gap of 4-byte between fields 'update_time' and 'update_ffcount'. This gap does not exist on i386 (or amd64 32-bit mode), as 'uint64_t' there is only 4-byte aligned. Change the type of the 'update_ffcount' and 'leapsec_next' fields to the recently introduced 'freebsd32_uint64_t', and adapt copy-in and copy-out accordingly. Using `CP()` previously worked due to the '__packed__' attribute. Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55282 (cherry picked from commit 7c2fc4419db43a8a7d1886b0b8e08aa97bfa31e4) --- sys/compat/freebsd32/freebsd32.h | 12 +++++------- sys/compat/freebsd32/freebsd32_misc.c | 8 ++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index fad52948d492..b6412b1be917 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -57,8 +57,8 @@ struct bintime32 { struct ffclock_estimate32 { struct bintime32 update_time; - ffcounter update_ffcount; - ffcounter leapsec_next; + freebsd32_uint64_t update_ffcount; + freebsd32_uint64_t leapsec_next; freebsd32_uint64_t period; uint32_t errb_abs; uint32_t errb_rate; @@ -66,11 +66,9 @@ struct ffclock_estimate32 { int16_t leapsec_total; int8_t leapsec; int8_t _pad; -} -#if defined(__amd64__) -__attribute__((packed)) -#endif -; +}; +_Static_assert(sizeof(ffcounter) == sizeof(freebsd32_uint64_t), + "'ffcounter' size discrepancy'"); #if defined(__amd64__) || defined(__i386__) _Static_assert(sizeof(struct ffclock_estimate32) == 52, "ffclock_estimate32 size"); #else diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index c3b2b2141e30..9aaca6853859 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4112,8 +4112,8 @@ freebsd32_ffclock_setestimate(struct thread *td, CP(cest.update_time, cest32.update_time, sec); memcpy(&cest.update_time.frac, &cest32.update_time.frac, sizeof(uint64_t)); - CP(cest, cest32, update_ffcount); - CP(cest, cest32, leapsec_next); + FU64_CP(cest, cest32, update_ffcount); + FU64_CP(cest, cest32, leapsec_next); FU64_CP(cest, cest32, period); CP(cest, cest32, errb_abs); CP(cest, cest32, errb_rate); @@ -4142,8 +4142,8 @@ freebsd32_ffclock_getestimate(struct thread *td, CP(cest32.update_time, cest.update_time, sec); memcpy(&cest32.update_time.frac, &cest.update_time.frac, sizeof(uint64_t)); - CP(cest32, cest, update_ffcount); - CP(cest32, cest, leapsec_next); + FU64_CP(cest32, cest, update_ffcount); + FU64_CP(cest32, cest, leapsec_next); FU64_CP(cest32, cest, period); CP(cest32, cest, errb_abs); CP(cest32, cest, errb_rate); From nobody Sun Apr 12 05:57:21 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvQ1KCHz6YZ1H for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvP4vl5z3myr for ; Sun, 12 Apr 2026 05:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vgXg0MwxHvjUQPuBLVtcTj9N8Ycb0tCSqIiGIhdRpLc=; b=iZO4t2q9JOVxGZiURb/q7bqHQndvYdOZaaj3ctdcOqRcJ5rUBfe7S17pbN/otwygnVAAQ0 vM2XizmM5tW3G16Dj1lM0DpQLpwpZQsls7WF3G58tBsQ0CxE7zOTDp4Rq2jseOr9/xodbN /l4eMXduKTibi5LfxjrpcNLrK7n2f+3ZabBZ2K/QoaSFrJYY3+79A3y3cBrAuJUCXw0psq FUNajnMfqaCwgDyjr0K4R1cdAdPnGUHJNg0g0uUcRFzZArlG8gapLtc/XV5pm8tjsRKP6K DZa7Ygh7jyAGW16kexkDBvyrqlwZOz287pZhoE5XevlrMIBC7WigMrj7u52lKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973441; a=rsa-sha256; cv=none; b=TNKj9wLLpri4MZBjHmlKr2s7FFJ/I+jV49hk8lwhynghcJq62KzGEDNRChJX1sG5KCS8Ma 4+LsDGE4RQ7XUj7NGzfn8W0gqGDwlUPp2KYAigSSNokhj4vPDyvZh1zlJGuCRjXeDT4Voi GMFg4dbjzc8I0HBzTkiTYBpFEWZeHf3PcdcuX+sNNISF3o4gBedkYMZSBUyCDdqximNdPE XIzMJg9R+tx5jZeVppHaexVuhLPcgd4uWzZwQVxv2FEYtwAB2qyZtcd/mTcZw0xVsHFL7Y OhLEo5O2X6Ct6Cf68JYY8aE23JUpxzEu7CAGIb1F89W5jNLH7HnRsxcuNlMQfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vgXg0MwxHvjUQPuBLVtcTj9N8Ycb0tCSqIiGIhdRpLc=; b=k3w3euk0/Yx4G+BddGqeK9N64LbctXYO3iDR8BB3jfxcsYMpf3HrIXwG5I4yz3qbHYLEmy 4/CiYvHkqyUQfUUygXzTxbdkWp5MltEskgc5FWiMiiZAHD2nlxb1zGV2ff42geUwI4hsQX F0vCn5sdpPnzivlRRHmeiv2YaP+jyL9bFNZGtWhap08M+FwC9vK/S6XBZqTCD4ZzaJk7rN gKo074k3zwE5ONA/eeGjLuL9VPfpxhFp84Y3OdP7Fx6f5A0ay2Yege9qJDTcul9r77QO1B ysbRoFOpjoh6FXzAS52ZKRgxp4kIt6DpFE+NdKQH8t2CzRual+8mv6k6pJ+IYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvP4BhRz14X4 for ; Sun, 12 Apr 2026 05:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 300ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: e324486b9b56 - stable/14 - sys/compat/freebsd32: Fix i386 compilation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: e324486b9b562f9a1d4a214492766d83299dbb0d Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:21 +0000 Message-Id: <69db3441.300ff.1bc6ee6@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e324486b9b562f9a1d4a214492766d83299dbb0d commit e324486b9b562f9a1d4a214492766d83299dbb0d Author: Olivier Certner AuthorDate: 2026-02-13 16:37:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:47 +0000 sys/compat/freebsd32: Fix i386 compilation The compile assertion now failing is due to the change '__int64_t' => '__int32_t' as the type of 'time32_t' on i386, which is the correct value. The use of 'freebsd32.h' on i386 may seem strange, but it comes from 'kern_umtx.c' including it unconditionally as it needs 'struct umutex32'. Fixes: 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") Sponsored by: The FreeBSD Foundation (cherry picked from commit 07c4eb506be45a4b836665e14ad63034ef3d573a) --- sys/compat/freebsd32/freebsd32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 7e1e28232a1b..fad52948d492 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -71,7 +71,7 @@ struct ffclock_estimate32 { __attribute__((packed)) #endif ; -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) _Static_assert(sizeof(struct ffclock_estimate32) == 52, "ffclock_estimate32 size"); #else _Static_assert(sizeof(struct ffclock_estimate32) == 56, "ffclock_estimate32 size"); From nobody Sun Apr 12 05:57:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvS1d7fz6YZ3B for ; Sun, 12 Apr 2026 05:57: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvR65T2z3n0F for ; Sun, 12 Apr 2026 05:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xBjTOc2KI76M7R/GydTNKw4BtiNJbGXpaDaK6dfOFQQ=; b=g7xQA5s+loqK84d9QJ3Tv6vYZGx5CBCGHW3n02xuT5ZvKUr3X8osojdSIJr3NEguwYcY6T LRH2DVF+v5HEHi/HjWKDNpZb6u2vaNCFxi6v6jiAKmCKLrlMQBKww9ZxOeP+PCADRDoCWl MNPHFBPkn1osD/iYcs7/TfrvhnMpjCdbJ5Gr8yEsFKERvp1CEBMTXeT/9futZSw7yjqlG0 DpuIB4s+UE9OL/AZs9X1l6k6mjzav0OJkyhkJpug4nCk2iMWdVaiobqopeCp997f9tOjLg PgnHy//ay5tT2R0eI5OFZyEDxUP1dnMO7agcXXJ2dv/3hLoCuZdUzmnzdCz2Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973443; a=rsa-sha256; cv=none; b=VaZsugx6nnpbsnX/+EQc4wtFSGG3YeQqQAOicWbZTDKpJ7YCliA9BLL1Jy2CkHUOtfwB3B M8ZKmt2168OPhyZhpYHWPYV5mJj9BQZMF3FrHzRteDwJ9IJg1ntWVZJZZ9VnKX/oMClQBu 5IPvboes7xaZ0bh1CKZxhF70Q3jFOk6KhmGvxFCC38pUC9nwg+m6WuKUtVNy1yiu2Ca0CX dT6lYrRzwgSuNN88lOrekWvknIYlN7p6p4tkV6Pa8AE+M/7fXxZ+NrFcPLTChX3E8Brqob WJUc16IsVH17uB73TSCW+Xd9J1+ZFrhg3zpyz+kKOWPndTfbO1+/PvVZXZvpPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xBjTOc2KI76M7R/GydTNKw4BtiNJbGXpaDaK6dfOFQQ=; b=Gnm/OrPz0IxeaNJCD0yJV4E1szYEtH0tzoeoe1gc835DIRGiKFSSjOzdh69QimASJtEvXA ih484W0LfD4cvNGx6TMBZtvAabKYIqXjzgEF3Ml5HXtixUaFWfzWRJ+sRZ3GwsjAH9wwwN 0SO/hljcJHihMlewxL7zwkIxmITegIDfvuWIRzVsc0MdwXA/GLuD9gz2vA6ltOqxPr5GtL skXLpGLBSozBV6/hnwBOfD78aozUuj4enrAb66JK40pqOYeTBkE1/8qo8Vhee6huxhQG6b ghYKVYziHl0Fa4rh4slgOzAxeO9Nqb1pklmXx9GfB7w6rO8JwXZbBLX2Ejb27Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvR5j2Gz14Jv for ; Sun, 12 Apr 2026 05:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30d1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b4d3f0887609 - stable/14 - devstat: Provide 32-bit compatibility List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b4d3f088760912dd7384d04e43e6200f76c8a8b8 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:23 +0000 Message-Id: <69db3443.30d1e.3fd8db3a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b4d3f088760912dd7384d04e43e6200f76c8a8b8 commit b4d3f088760912dd7384d04e43e6200f76c8a8b8 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-26 12:01:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:47 +0000 devstat: Provide 32-bit compatibility If a 32-bit process running on a 64-bit kernel requests kern.devstat.all, translate each struct devstat to its 32-bit equivalent before copying it out. Also fix a bug where an early error would be ignored if there were no devices to report. MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54591 (cherry picked from commit a11d132f6c62f32abe44b19f7527d97ddc239058) freebsd32: Fix includes The previous commit added , which isn't actually needed. Conversely, is needed (and has been for a long time) but was not included. MFC after: 1 week Fixes: a11d132f6c62 ("devstat: Provide 32-bit compatibility") Reported by: gallatin@ (cherry picked from commit 0eb2c9d39b5f5cfb68b404bca358aa5fb11ac60c) --- sys/compat/freebsd32/freebsd32.h | 27 +++++++++++++++++++ sys/kern/subr_devstat.c | 56 +++++++++++++++++++++++++++++++++++----- 2 files changed, 76 insertions(+), 7 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index b6412b1be917..05566e6011ce 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -30,6 +30,9 @@ #define _COMPAT_FREEBSD32_FREEBSD32_H_ #include +#include +#include +#include #include #include #include @@ -520,4 +523,28 @@ struct ptrace_sc_remote32 { uint32_t pscr_args; }; +struct devstat32 { + u_int sequence0; + int allocated; + u_int start_count; + u_int end_count; + struct bintime32 busy_from; + struct { u_int32_t stqe_next; } dev_links; + u_int32_t device_number; + char device_name[DEVSTAT_NAME_LEN]; + int unit_number; + freebsd32_uint64_t bytes[DEVSTAT_N_TRANS_FLAGS]; + freebsd32_uint64_t operations[DEVSTAT_N_TRANS_FLAGS]; + struct bintime32 duration[DEVSTAT_N_TRANS_FLAGS]; + struct bintime32 busy_time; + struct bintime32 creation_time; + u_int32_t block_size; + freebsd32_uint64_t tag_types[3]; + devstat_support_flags flags; + devstat_type_flags device_type; + devstat_priority priority; + u_int32_t id; + u_int sequence1; +}; + #endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */ diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index a100ac9921c3..1bc37b970cbf 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -44,6 +44,10 @@ #include #include +#ifdef COMPAT_FREEBSD32 +#include +#endif + #include SDT_PROVIDER_DEFINE(io); @@ -399,25 +403,63 @@ sysctl_devstat(SYSCTL_HANDLER_ARGS) */ mygen = devstat_generation; - error = SYSCTL_OUT(req, &mygen, sizeof(mygen)); - - if (devstat_num_devs == 0) - return(0); +#ifdef COMPAT_FREEBSD32 + if ((req->flags & SCTL_MASK32) != 0) { + int32_t mygen32 = (int32_t)mygen; + error = SYSCTL_OUT(req, &mygen32, sizeof(mygen32)); + } else +#endif /* COMPAT_FREEBSD32 */ + error = SYSCTL_OUT(req, &mygen, sizeof(mygen)); if (error != 0) return (error); + if (devstat_num_devs == 0) + return(0); + mtx_lock(&devstat_mutex); nds = STAILQ_FIRST(&device_statq); if (mygen != devstat_generation) error = EBUSY; mtx_unlock(&devstat_mutex); - if (error != 0) return (error); while (nds != NULL) { - error = SYSCTL_OUT(req, nds, sizeof(struct devstat)); +#ifdef COMPAT_FREEBSD32 + if ((req->flags & SCTL_MASK32) != 0) { + struct devstat32 ds32; + unsigned int i; + + CP(*nds, ds32, sequence0); + CP(*nds, ds32, allocated); + CP(*nds, ds32, start_count); + CP(*nds, ds32, end_count); + BT_CP(*nds, ds32, busy_from); + PTROUT_CP(*nds, ds32, dev_links.stqe_next); + CP(*nds, ds32, device_number); + strcpy(ds32.device_name, nds->device_name); + CP(*nds, ds32, unit_number); + for (i = 0; i < DEVSTAT_N_TRANS_FLAGS; i++) { + FU64_CP(*nds, ds32, bytes[i]); + FU64_CP(*nds, ds32, operations[i]); + BT_CP(*nds, ds32, duration[i]); + } + BT_CP(*nds, ds32, busy_time); + BT_CP(*nds, ds32, creation_time); + CP(*nds, ds32, block_size); + for (i = 0; i < nitems(ds32.tag_types); i++) { + FU64_CP(*nds, ds32, tag_types[i]); + } + CP(*nds, ds32, flags); + CP(*nds, ds32, device_type); + CP(*nds, ds32, priority); + PTROUT_CP(*nds, ds32, id); + CP(*nds, ds32, sequence1); + error = SYSCTL_OUT(req, &ds32, sizeof(ds32)); + } else +#endif /* COMPAT_FREEBSD32 */ + error = SYSCTL_OUT(req, nds, sizeof(*nds)); if (error != 0) return (error); mtx_lock(&devstat_mutex); @@ -429,7 +471,7 @@ sysctl_devstat(SYSCTL_HANDLER_ARGS) if (error != 0) return (error); } - return(error); + return (error); } /* From nobody Sun Apr 12 05:59:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfy56Scpz6YZ7X for ; Sun, 12 Apr 2026 05:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfy559f1z3sdc for ; Sun, 12 Apr 2026 05:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qim+TQDPPBsG5qWvYbeLeyUgSPxvNRK3xr+Uh1c6alw=; b=O7VLvaG4fhUKgw3FI0vvJC91yLECtra8y+Ai+5z7XWJ5s0VpTMh7MqmyoOC7BYimeHc8R+ MWtyush5VFn4qGFWYSgCJsQIq/vnoeFKed7drlLvfaP4cop8ix81afmaJWpOcp8sVsnpFK 6GxG9VNUxJAD28qbq4sqi/4pOCdKcc/5i7jLc+zi/L8f+DucMBhA1DtcXpCs2KD7TqHMZV IkVsY4//wzHsv8yPda/V/Ylb41y25V1C6Y3jT9QzP3MlCOvp+XW6W34CAQARnOG9Y3tK3g WLqiyRZV4D//HVozog3xlCOZVqLVv6AHWZ3VoPdk7qZ+nTAAfU+/VhxyOWj61A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973581; a=rsa-sha256; cv=none; b=e0fspxBVyODjO6Ch/QVYY2jMQ42DkdYmutnk30JQG0ZljCnpGA0SHrbom95YtDPDGo526x WD3f/eHQ8QUiVb6OvKHDG4n4bS/vK0X5Lw7wu7QnXWOf3t1FSm/SMva1EgTqdm3kdFwp3Z bDSlIPawS/8BFozAqI/92CIxXSw63VLPrMAuDwg52S8p4gsQyry0qPPiUxIBzS2fICwPWR rh2dM469/GDGFeuswwC0bTtcAHRNNiXcjc3HVttkvUxbAAc3OxynSMKu1lpf+lxxLWOFi7 MNoXdQzAT0aVyWuoyliIOnIgcyUmYSct1PFyc+LgSUNbmaqY2pxXjZ4dokDJFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qim+TQDPPBsG5qWvYbeLeyUgSPxvNRK3xr+Uh1c6alw=; b=E64YqDYG5188pKyfFA0IuJeY1a/exPO7V/DbD6VCDEjbuv7twJ6UheHoQKJusl6P6RXHIo ldgHwkeZ9JsfQtI1eud1cH+faom+IaqHH3vIqVCScI/YlrQQR86WBtbJWB+GK7p6CGym/A LCtrjHQ4j1Sg8ZslAUvsFC74c+LO3fuR6WLOR5QGeJoWG5bnT32a7Qnluv9Ozgcc7zY5hD o+sdCOpvjGFItEYT9MvNAJa10oEv4w1OQRJ3HvRsX/TNZHasW/Y8hE7v9MPX8RTZx4HiD4 z50VfgjjvWVhses4aSfgpIbTqKWtjnnokDMXJzY+TMz9tYWPN2nSY2L1ZH6bFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfy54k2Sz14MM for ; Sun, 12 Apr 2026 05:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27e36 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:59:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 8bd82e34cd90 - stable/15 - libc: Add missing MLINK for stravis(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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8bd82e34cd90b53fc3b02eedd918916532766348 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:59:41 +0000 Message-Id: <69db34cd.27e36.43102c6@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd82e34cd90b53fc3b02eedd918916532766348 commit 8bd82e34cd90b53fc3b02eedd918916532766348 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-07 11:04:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:59:13 +0000 libc: Add missing MLINK for stravis(3) MFC after: 1 week Fixes: 8dfeba04eb36 ("Update to a June 8th snapshot of (un)vis form NetBSD.") Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D56260 (cherry picked from commit a09d06bc5bff64baab76220a66c3501b89899134) --- lib/libc/gen/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index c36c4e10f2dc..c31f789fd1d1 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -562,6 +562,7 @@ MLINKS+=unvis.3 strunvis.3 \ unvis.3 strunvisx.3 MLINKS+=vis.3 nvis.3 \ vis.3 snvis.3 \ + vis.3 stravis.3 \ vis.3 strenvisx.3 \ vis.3 strnunvis.3 \ vis.3 strnunvisx.3 \ From nobody Sun Apr 12 05:59:44 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfy93Xbhz6YZDm for ; Sun, 12 Apr 2026 05:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfy86tTNz3sph for ; Sun, 12 Apr 2026 05:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1DOH2UNiUPeJybQsq0V4oC6HLNH8NXNslXjLqcX+3Pg=; b=T0gjWZHui0yPBV0cC08OWvWoV6EvCANS0wq+IFlO55tK47D8uegXen/QvwLcZBso/HJsEd DDTew5HFnaH0QMIy/gPoO87BMHlC+gx+wQE2XIjDLKKJyfjfoPetK6DIljq/TuNZ1s28Ud 3yp+RZAUm2DIg5UctHMt5hXhopXQ+CY4yEZz873V8MsAzSC9PSD1UvZoaCXCMDsi1C3cYq Impul/yRQiQasFgbv/tBk24x5EGiVEU/4ZolLJ299KrMdQQ8p6Sc4tLo0tWnJYEW44jor9 1RWkWli7E603CUjGEFAfXv8zZVs75JOGqNrXLOOSMgcjZN4bwM+99lSVoZQJuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973585; a=rsa-sha256; cv=none; b=xUl20RREh3QV22Equ2KIK0pcijbRp2sRBxdeXA4JqEKI9wuEus+6xWtoAHJP7L/Kt6ffWY vk4YH5XYOUDi0SRy7uMKAfgecXFn6RDetzJ1Yw2Uipn9RgcOSLBoUPiXgt7lSeTC6ScFqW WLpW7+NCjOwugEkbRwx8XZrG9qQLd1bMhzOsIp+o5yLAN65Cx76YqZD34BMvLTSk85xLs0 6YniOd1nVNnEYCYB7Wv5a8UaFK/pFAZuUTXcVOsG4kRTey0Q2SMELzdXV8Fo0lXaUKBPNm 4LsOuEF5NuG/YNosQtBHGUtVhi1tqOQMr+zGZIF5k3hsfwVRQrnURiWzev9DBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1DOH2UNiUPeJybQsq0V4oC6HLNH8NXNslXjLqcX+3Pg=; b=I00Z0d/RYyGFIne1uGVccNn2Xoj0QgYWFzAjM/jpNl9cBNDp9ST9RghAbnxO73MRDO3hqi e9vomNh0OqK5BchhFGFCFZrs8y9wjkfsstpdH17GWSvGAExbQcaTVHVxNId+dVM7Ge/9Ow BJmiZab9LsgBATndRVifhW9y3iXV/4WGGg/EMm+p1vlp+GO3voQh1JXkpY7bTui6Iycpdc /k03j1jvHWwzgO0QbQIKOWdnlA3lLz+LZ2RIvbbNnlpKQcPl3h/qZgo4IZ/SM0OdU2XbsQ VA6G0Bh1gnjLBpZ7kx1ySjOPYqEona/ujp90LxiDh6QuH8wv8veOcLwDNRG9Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfy86Ckhz14X6 for ; Sun, 12 Apr 2026 05:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31c06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:59:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 621b3b899283 - stable/14 - libc: Add missing MLINK for stravis(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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 621b3b8992839c62297350363e7d63866af3978c Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:59:44 +0000 Message-Id: <69db34d0.31c06.7a6c01f8@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=621b3b8992839c62297350363e7d63866af3978c commit 621b3b8992839c62297350363e7d63866af3978c Author: Dag-Erling Smørgrav AuthorDate: 2026-04-07 11:04:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:59:22 +0000 libc: Add missing MLINK for stravis(3) MFC after: 1 week Fixes: 8dfeba04eb36 ("Update to a June 8th snapshot of (un)vis form NetBSD.") Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D56260 (cherry picked from commit a09d06bc5bff64baab76220a66c3501b89899134) --- lib/libc/gen/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index ea926d23b325..271340ca49f7 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -564,6 +564,7 @@ MLINKS+=unvis.3 strunvis.3 \ unvis.3 strunvisx.3 MLINKS+=vis.3 nvis.3 \ vis.3 snvis.3 \ + vis.3 stravis.3 \ vis.3 strenvisx.3 \ vis.3 strnunvis.3 \ vis.3 strnunvisx.3 \ From nobody Sun Apr 12 05:59:59 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftfyT2xWmz6YZBl for ; Sun, 12 Apr 2026 06:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfyS1bhDz3tDX for ; Sun, 12 Apr 2026 06:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxLWfTOZsiu3EnhuoU7mmqZOGwpABny2OrpC3mmrehM=; b=I1b2ufGBjrpxBE+LMVBItJX+hFs8Zq14My7x/TyFK5mz4AunKQ2sCVzLlC3CVhpL+H3FWd jVgjK9pnQjwPuBup7jbbzqVnNothyVeHpJLpAv6ZiDMgXnIcbv/z6BNMRVyWCGxelMBOOv zUkHqH/wc04cD1DqBdGRfoPenqXYPcKBfgDx29jzaPhFkp/IZQ051w4zTNSeMx9gyUettC n2iW4MHFSwt/F7jR0/tLLzm/1V3Lo3Q9ukKpQ+/vLnCIUmfS4JmnWzAHPHv8B7OYJcGuwe 8ktNLwJ6yjMixgyht3YQ5FujptPcJrNKyd9dxdw2coM9w9OXRYcDGJ6PXaeypg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973600; a=rsa-sha256; cv=none; b=m3VHuxCwbnW69Zvzz8V/cSorM/EGSxuVPMioBY27NZVl/6VKYVfAiknufggQZlPWRcRv/K 7C4vafiT1rj4AwyMDNNLbKnnZr2lp59vj2YVwedbARSs/iXVBpfT5AMbie86iYQlbY4Y2F 8sCepR8u+OupneKJ4oOwEHbi36O7i2B4s2OZexKe56TD/LB3PXXxxQM4D3e4h3J16eJAQe xG9Y9DH5f3YjLgPBiG0RbECOkGjyjEcOtCeMfWI+6vH0TG236pzRXmnwJubxSSe9fD1mXA 5mdL6oWdlEVgnFUQ212LEXBXWcnCL5uHrDRrRD/Uj3Q4JTN9WmezEenWRc/XWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxLWfTOZsiu3EnhuoU7mmqZOGwpABny2OrpC3mmrehM=; b=kGznO3UeNTTv+ujoEQ8PlV3FHCSO9MUSzTziR4YHM1ft3iWIgXLD7J9fMsnYL88d0961Q/ Orq/JXj7Tw1bnLP11NSqPuLdtXt9yi/LTuadfPX48ZUm3Pa1FzyhYcgKs53Ea0ysfkyy+H tw8iFaJIff1Sx/YbWLbyXwudxDimNZvbfpKQYXvjcpwXduvEU9s0KZS+yik8GNokAYKlrz v5uKIltK353WL22qX3WfV33RJPHNZoQjoOWU+Z+usxqTQSueL7/x7RvCDPgZ71mCCsO77a OMWaENEbRS6z/SQD7rX2Xqpo9zCVWaMFW1wXECg0mHwEGRp9qXzSkPZwbVML+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfyS08n1z147k for ; Sun, 12 Apr 2026 06:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 276c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:59:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 10417355a767 - stable/13 - libc: Add missing MLINK for stravis(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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 10417355a767f69325e2955dd3a6d44a32e5714e Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:59:59 +0000 Message-Id: <69db34df.276c8.78fb6e12@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=10417355a767f69325e2955dd3a6d44a32e5714e commit 10417355a767f69325e2955dd3a6d44a32e5714e Author: Dag-Erling Smørgrav AuthorDate: 2026-04-07 11:04:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:59:39 +0000 libc: Add missing MLINK for stravis(3) MFC after: 1 week Fixes: 8dfeba04eb36 ("Update to a June 8th snapshot of (un)vis form NetBSD.") Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D56260 (cherry picked from commit a09d06bc5bff64baab76220a66c3501b89899134) --- lib/libc/gen/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index bf06374aefd2..b5105a49ab4a 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -552,6 +552,7 @@ MLINKS+=unvis.3 strunvis.3 \ unvis.3 strunvisx.3 MLINKS+=vis.3 nvis.3 \ vis.3 snvis.3 \ + vis.3 stravis.3 \ vis.3 strenvisx.3 \ vis.3 strnunvis.3 \ vis.3 strnunvisx.3 \ From nobody Sun Apr 12 13:44:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFv2Hrfz6ZLgc for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsFv1TKKz3kNY for ; Sun, 12 Apr 2026 13:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Go683rOec50gn92988Q1hAGkrB7MVHJlGioFc8N26E=; b=f7xhhV+GK9LNT+O8ChRYGZkQYYdvrGJ9eUvUSshL8nyZnwr+wAZNqHwPX4CsxTMEWLLmcR grpdo9IoYqfubXZeS2bOiIlWAlFQMftua8il5TIXVfU/2f65Ag0V+dIkOXYz6Mcb8vTLVq k5AblX2LJdOG/K/qx91KkKMTQMKzq3YgwOuaMOmT3QTszM3TsMxzDwdpWW58/ak6ArATNF T4K07ryoL0rjdEgozakx+gunxtDeTi66P8m8oMooDlekPHBG7Y1AxvDKmkm/ryaFUmF1sU /iAn57BmN5ZZDTtcqgbfh4v979L+YiwKT8zyeEoXs0QEbNQrqMn77C+6+WVyXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001443; a=rsa-sha256; cv=none; b=FS92k/fSZ56zLKFR+rHQ32NY3LW5G7MwyOED9aYj3PtgK8CYUfqZm0Zc6cADV0Y5SNhlFF x8UCsGuNEXtwOqWgF9gEVcw1zpaEwWCYr4uoHq3dLdzFxcy2Lbe42aRYWIYmIHbNe6NwAq +CoacwcXYB6bYwlh2pINAd3W37XPtil8t8+K5fyPPSiBgFGXA+1O1jxysR4LbR/+F89Tyr 4JwoXwJnfduuoVq56+8CgaIp7n+8EmeRGBG6LHv8kECHQNZ4ko9ojP2tUsX/JGGEYyBzir 3vRX3Orp2Cx5gAI61ENgS6m0HZLmFNbvcelPXJ0jLp6m1IFwNdbAHznnijrUew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Go683rOec50gn92988Q1hAGkrB7MVHJlGioFc8N26E=; b=w7WhevawzohuqTTt2BwqYwnF8lYKPDeewFuQs0KXUBN58+71au3XJq5cir8bt1Nco1aW/V BlnT0eX4C1IufzDPIg/k+5TaU8VHJhjD4pxmGVdKpQd/94eTfbsL5rzhLbVbDEb1H5aMjv qoCJNm7fCqs5hXgXTvB0Ce5UTURgRHos+4t5PbyGWMB0lm2L9QLt1PZk4vfmEGCq88OyDj ocI9guHKvU4OB5O+GSQu4UhLwRJSNcOVathhnsyE2EQr/NzotFfRavSLVCnqNbTKslCBpM NYHXudrT3g+pQSPqf4F85l0owI4HqUvZ0Rm7vxf888i4p9Lxa9/Vv/DCgGQIpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFv0lXvz4C7 for ; Sun, 12 Apr 2026 13:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7db1376bd151 - stable/14 - loader: add nvidia modules to the loader blacklist List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 7db1376bd1519d5ec48153d8c19a5a343fa59019 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:03 +0000 Message-Id: <69dba1a3.42c1e.2e5bbf4a@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7db1376bd1519d5ec48153d8c19a5a343fa59019 commit 7db1376bd1519d5ec48153d8c19a5a343fa59019 Author: Kyle Evans AuthorDate: 2025-07-31 04:41:28 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:35 +0000 loader: add nvidia modules to the loader blacklist It is known that nvidia modules, like the drm modules that are already present, will panic if loaded in early boot rather than later. Pop them into our list to deny loading them if someone were to add, e.g., nvidia-modeset_load="YES", to their loader.conf. This doesn't prevent them from being loaded if one drops to the loader prompt, but it does prevent the standard user from easy foot-shooting if they find old or inaccurate information out in the wild. Reviewed by: imp, kbowling (cherry picked from commit 763a097c156f36830e774b3cc789f68c5d1ae601) --- stand/defaults/loader.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index 3f06c7371bb1..b714d3d69204 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -111,6 +111,7 @@ kernels_autodetect="YES" # Auto-detect kernel directories in /boot #currdev="disk1s1a" # Set the current device module_path="/boot/modules;/boot/dtb;/boot/dtb/overlays" # Set the module search path module_blacklist="drm drm2 radeonkms i915kms amdgpu if_iwlwifi if_rtw88 if_rtw89" # Loader module blacklist +module_blacklist="${module_blacklist} nvidia nvidia-drm nvidia-modeset" #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem From nobody Sun Apr 12 13:44:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFw3SJ1z6ZM7j for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsFw1w3bz3kLQ for ; Sun, 12 Apr 2026 13:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXRY8bTyhxbndeZ58Twka+c8BZlgFQrjAcBnv00mNWs=; b=Neq5/pBZqQJnXHtYDnWCxSF1+R7XyqsYpmY7Hh+L2qHYEtfemDv07jCf1D97n3d5SSLHpb 6AhyhwIHP/wRNLOGdigm3BZyWnRE6v5JawspmpsAU933pNXai1J/N3sI+F6FCPiKC71kt2 WDIKDQUDZCBPmoPWpYpz1v39/gTsxaZkwrta3yCc8NSenf87FZF2S+nHcfTWI0n8ylizVt kfFxMgmYVba9coDh5CMf3/GzdgM9gI8wIKu2vFd3VoNBlvu2kjqKhtnDh5ab/NigdHUq3C iW6PZm4sqyhP8a1czcz0YTCgqsB4zJJkoYUJjk/uoy7oLLG2SOG1OVpln6aZMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001444; a=rsa-sha256; cv=none; b=PktyRQFwnY3/Tx+imGWe7yrJDRC0n8YZ6O5wS+CYzu6HQlttHh+Bj3mADLfbUuTVC/BoKl hdajpiIWDh7+is/5S3W6BdXF5c9XKyHY3y6z9Z4AZ+aoat+p9atcaaT00exyQzfIJMZAO3 OzRLoNauSVBNcRJ3tYjHMGPcZ9tV2x/3bXYihKfqmLM6fiixJdt6hEy/rA5Yl9NPftcfAw 2jzN9KCUI5QIN7WqUav014dnSpTGWFWm5CCOjCnIw14UU68jAnlgU/yWVceDnaTuJthO/E 4ixHzO2gVJFv3vUBInNVrGXFezCaLVXa5zFCtC+HRi/l2ZM7tt/NKdIC/sBe0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXRY8bTyhxbndeZ58Twka+c8BZlgFQrjAcBnv00mNWs=; b=HaqJAPqV2PxQQhxYD5kcyz3R/IGjlQkQOWJGCo0jPlBYWwWLcho0CDAd5KXy6NwkVZ5qpz 4j3rtdJ5gm1XqTSfl0HV0bXxqtJJ6uvJk4Z/Njx/IzpaZy99bwTOf0imzAw2wPcqpTM35v q1j0Pz8qxB0nd/q1XV5+7rrn/6CgQaEWXikBMR7qk/tX7avcWAQbvECk8ANQDdL6eYxLy4 pHxOZlEx/WIA7SRJFMHAw1kX+wlLHvGed5iZfc7n0qzyJuZZsr8/eAm3d65p02dFhjg3cp HTu/3bJs/3I3hSYTxFoBNMjEfojhTPsutyxd/tnbzwil+ELEm+4XwFQEDpY24A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFw1Vvqz4d0 for ; Sun, 12 Apr 2026 13:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42b96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 41aa44d0b2b6 - stable/14 - grep: toss in some explicit fflush() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 41aa44d0b2b658ab9a560fa325a323ed616c7ecf Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:04 +0000 Message-Id: <69dba1a4.42b96.6a1d8d83@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=41aa44d0b2b658ab9a560fa325a323ed616c7ecf commit 41aa44d0b2b658ab9a560fa325a323ed616c7ecf Author: Kyle Evans AuthorDate: 2025-08-08 04:52:53 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:35 +0000 grep: toss in some explicit fflush() grep|tee of the src/ tree for infrequently-occurring strings is fairly annoying; drop some tactical flushes at line-match boundaries to reduce the long stalls. In the case of `grep -o`, we'll flush after multiple lines if there are multiple matches within a single line of text, while for non`-o` we'll flush generally after every line. (cherry picked from commit 7a7f74dbcc4f41d98218471297eaa629e34326e2) --- usr.bin/grep/util.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index ed87e56956f6..5b40405852b3 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -728,6 +728,8 @@ void grep_printline(struct str *line, int sep) { printline_metadata(line, sep); fwrite(line->dat, line->len, 1, stdout); putchar(fileeol); + + fflush(stdout); } static void @@ -834,6 +836,7 @@ printline(struct parsec *pc, int sep, size_t *last_out) *last_out = pc->ln.len; } putchar('\n'); + fflush(stdout); } else if (!oflag) { /* * -o is terminated on every match output, so this @@ -843,6 +846,8 @@ printline(struct parsec *pc, int sep, size_t *last_out) * to terminate if it needs to. */ terminated = false; + } else { + fflush(stdout); } } else grep_printline(&pc->ln, sep); From nobody Sun Apr 12 13:44:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFx4hgvz6ZM5W for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsFx32PBz3kfw for ; Sun, 12 Apr 2026 13:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AVo9B8My8XuQdtoPK67bwAG4OhTt1nNYYSK72lZW/bM=; b=CXpR/UDW4zn5Mqk2BpiY980wAt1mrpDlUX18UPjKVIQbh5LFzVmuDzKm9vAC8O2Fh2qWJe 8nsySqycHgmYU27iYU0o1ovGQHlGgLewPpd5OjN+ZriXLJnifUSUmPCzcgQj1P+07Y0TqK cLgQVjbuoVmaBA2q1KMHU5z2PShHMKnoEhFn3TMJ+t3l2hPGKEngcGH0wzpErOnDu5+RjI c+liruPx/0NUy/DT8xtfJvDLZ8ywSeJRQaLEdLNZh5611r8of6487yIFNRr1fXig3Si45o JaqKpr3JfJwrY5S5+wGjqWCNyId1Q1q8S09AgKg8ePdupGZD5ZqtuwT9wvVoDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001445; a=rsa-sha256; cv=none; b=vJ94ay0j+QFLmuNYqdnz+Gx/+Vzy1kR90eZCqSf0q4VAwrCVFMMYB50arVNh6H1rxPlNb6 x7ROCXHZlovnJnrWFqW+FuxIzHFiAn4T6XMv0Fz9xqW67K3ljEiM0QwsFYHvDNpCr/qWsT hCMZhqTDfAmocqepPOU5DHYBPKIKtCRLoLCg06VxYlxNnzd5Iz9WbhpjiRC4E3nka6WbBL GTKczjpBRUeezmfNakfjc/viQAOPJN1CjjqibZf6Uizq3unXR+4hJ56o+aXkA7LL7oZ9Ti Vp6N9YZxXtRFpR3HCD4hbfbVncQX51XSq0BXgs6xV+w6qQ4yXF1Kgj1wmRbkKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AVo9B8My8XuQdtoPK67bwAG4OhTt1nNYYSK72lZW/bM=; b=BWOPOUo74MCz+ksYqpcWwpu7XvS1b57Yg2L3yKLgSwPkII9GWn88/9Y3+PhQnbtOdUWSjV VBJO1vo9rjjpER70wls39JAKbq0+BeQ8uk6UeD+8zSGhed9ucWV0tNcyan0yb8T6pvTPMZ 4YrB9hb8P0GCJYBYtQZ12LLthPFSuqxslcCeibtlBnUMhc46YmR/ASD8D5x9mfyn/NJVby yeZXCB0Xaac2XwkldilXArBo8bexYRJcFoFYt42HRJh+W1zp4BQfsCi58ts4FBO8pMpoIK u0I0pfQZdFkUB9qmGGXhKfOPpJXgOotPtF57LIUYi70HbV11ZoKQPWNZ13xzng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFx2K3wz3jJ for ; Sun, 12 Apr 2026 13:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40cd1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: e2d48181239e - stable/14 - inetd: don't assume that initgroups(3) will set the egid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: e2d48181239e99b825862156cd5d6a9756875125 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:05 +0000 Message-Id: <69dba1a5.40cd1.1d04e601@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e2d48181239e99b825862156cd5d6a9756875125 commit e2d48181239e99b825862156cd5d6a9756875125 Author: Kyle Evans AuthorDate: 2025-08-08 22:34:56 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:36 +0000 inetd: don't assume that initgroups(3) will set the egid inetd, in the ident provider, seems to be the only initgroups(3) caller in base that assumes it will set the egid. Everyone else uses it as it's typically used on other platforms: to initialize supplementary groups. (cherry picked from commit 33dd42e632982ba324789f47041d03ceb65f6560) --- usr.sbin/inetd/builtins.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c index aed304ae99c2..0de2179ef52b 100644 --- a/usr.sbin/inetd/builtins.c +++ b/usr.sbin/inetd/builtins.c @@ -606,6 +606,8 @@ ident_stream(int s, struct servtab *sep) */ if (initgroups(pw->pw_name, pw->pw_gid) == -1) iderror(lport, fport, s, ID_UNKNOWN); + if (setegid(pw->pw_gid) == -1) + iderror(lport, fport, s, ID_UNKNOWN); if (seteuid(pw->pw_uid) == -1) iderror(lport, fport, s, ID_UNKNOWN); /* From nobody Sun Apr 12 13:44:06 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFy6NCVz6ZLrT for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsFy3HmHz3kXV for ; Sun, 12 Apr 2026 13:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KlTMSs69UBCm9IZGBI7gkUgI6+u+vQdnHTezwKslR3E=; b=CKvWEbtW5Qr3p6KgHLR4QuXnDjSee0L6sxASpYBNElHJZsNHMP3UVncFndMNdTMbSy9chP I2EWeePjYBJpktpmLg/PQx8/saeffrqxPAKsoIXEccKfayKybsHdkzMk57r+8r25i8gYE1 oizeLsaFJkxt7Oi41Og8blQZ+3rowTKnCHtQuEfhnInZ0x9FOiDPtejke5ToIXWbVCULh6 GxhTF50Q4RaLe+QNlaGU2JMlV2JnUWH+dCl2sbIiSh65pxxAubI4NK1heFcDvyuOc2ibcC XFpN8x6Dg7UQs3Pnd/SYlgG3aZZahepNW6WxNAheMs45AAyFG9KQujI9dtjATg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001446; a=rsa-sha256; cv=none; b=rNgniFMD5PdCZ2frwKT9KTSiYCb1P6xoD0cd5Gm/0y4y0GhOQK4+52aFjH4WnlHde5F7iO jzxvLA6s4ZSF2sspEJcv8qWL/rTy4vpIHdrvLfRc65ibHgEeME3Sy1H60DvThi+/r6sdpw dk0q+l+ZIt/C6PItCsYvOO3oRm6e7hPJgvxWq9xiw09Ov+xB08O0avoqCKqBmtu/sDUHqy mX8gCq+GIrOTbPNVFEIdv3tfioZuBAuVStTzKNIhzlnGUFIzXrfbzxUNIFbt8vbQIkwkmF O8dRVUD9kKParND3RGRndGOu0OOpkLGVu1TXs1RVB3ESb13/TvbfuX313zWjKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KlTMSs69UBCm9IZGBI7gkUgI6+u+vQdnHTezwKslR3E=; b=EXAvEhRu1C2+dST/xHo2Kzn5SnJ8rMovVjNBWzHENsPHyAzuj53P23RGKhNkspsmZsVnfc oVAUy1cpFLblUBb5H3/Q9PaTTFqNx/FOcBjdfhDnt25pWWL0MVc2wXqi1VVqPhqiKRyO04 bpB1N4lmVCgLZjcNBRyRI9h8p9u84I+cmBXg2wWY7bMVi/hfe3PMoM1snNst/Bl9cSX337 sBZ/9Tvx47YqMNyr7Zq+MG+zIBOk5vlrobn9klPAiR7YAfKsD8LYQt5Wp8f4BowwGw3pNI JXR7LX5lqkC3kChs7wjDSyq3elvvn8t9M5mvbkxVI8YxYkbtszGKFboZxz6u+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFy2rW2z4NS for ; Sun, 12 Apr 2026 13:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43087 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: cf7ac61fb574 - stable/14 - top: improve sort field storage/lookup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: cf7ac61fb5747aed94435a7e0f6fbf4233594945 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:06 +0000 Message-Id: <69dba1a6.43087.18066c1f@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cf7ac61fb5747aed94435a7e0f6fbf4233594945 commit cf7ac61fb5747aed94435a7e0f6fbf4233594945 Author: Kyle Evans AuthorDate: 2025-08-09 16:00:31 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:36 +0000 top: improve sort field storage/lookup Switch up comparator mapping to avoid these kinds of errors, use a simple array of (name, comparator) pairs rather than having to maintain entries in two separate arrays that must have matching indices. Reviewed by: obiwac (cherry picked from commit 5f72125339b1d14d1b04329ac561354f5e8133fe) --- usr.bin/top/machine.c | 155 ++++++++++++++++++++++++++++++++++++++++---------- usr.bin/top/machine.h | 7 ++- usr.bin/top/top.c | 29 ++++------ usr.bin/top/utils.c | 21 ------- usr.bin/top/utils.h | 1 - 5 files changed, 142 insertions(+), 71 deletions(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index 8c035b5df383..1f70ee9281e8 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -190,15 +190,6 @@ static int pageshift; /* log base 2 of the pagesize */ #define ki_swap(kip) \ ((kip)->ki_swrss > (kip)->ki_rssize ? (kip)->ki_swrss - (kip)->ki_rssize : 0) -/* - * Sorting orders. The first element is the default. - */ -static const char *ordernames[] = { - "cpu", "size", "res", "time", "pri", "threads", - "total", "read", "write", "fault", "vcsw", "ivcsw", - "jid", "swap", "pid", NULL -}; - /* Per-cpu time states */ static int maxcpu; static int maxid; @@ -214,6 +205,18 @@ static int *pcpu_cpu_states; static int battery_units; static int battery_life; +static int compare_cpu(const void *a, const void *b); +static int compare_size(const void *a, const void *b); +static int compare_res(const void *a, const void *b); +static int compare_time(const void *a, const void *b); +static int compare_prio(const void *a, const void *b); +static int compare_threads(const void *a, const void *b); +static int compare_iototal(const void *a, const void *b); +static int compare_ioread(const void *a, const void *b); +static int compare_iowrite(const void *a, const void *b); +static int compare_iofault(const void *a, const void *b); +static int compare_vcsw(const void *a, const void *b); +static int compare_ivcsw(const void *a, const void *b); static int compare_swap(const void *a, const void *b); static int compare_jid(const void *a, const void *b); static int compare_pid(const void *a, const void *b); @@ -225,6 +228,77 @@ static void update_layout(void); static int find_uid(uid_t needle, int *haystack); static int cmd_matches(struct kinfo_proc *, const char *); +/* + * Sorting orders. The first element is the default. + */ + +typedef int (compare_fn)(const void *arg1, const void *arg2); +static const struct sort_info { + const char *si_name; + compare_fn *si_compare; +} sortdata[] = { + { + .si_name = "cpu", + .si_compare = &compare_cpu, + }, + { + .si_name = "size", + .si_compare = &compare_size, + }, + { + .si_name = "res", + .si_compare = &compare_res, + }, + { + .si_name = "time", + .si_compare = &compare_time, + }, + { + .si_name = "pri", + .si_compare = &compare_prio, + }, + { + .si_name = "threads", + .si_compare = &compare_threads, + }, + { + .si_name = "total", + .si_compare = &compare_iototal, + }, + { + .si_name = "read", + .si_compare = &compare_ioread, + }, + { + .si_name = "write", + .si_compare = &compare_iowrite, + }, + { + .si_name = "fault", + .si_compare = &compare_iofault, + }, + { + .si_name = "vcsw", + .si_compare = &compare_vcsw, + }, + { + .si_name = "ivcsw", + .si_compare = &compare_ivcsw, + }, + { + .si_name = "jid", + .si_compare = &compare_jid, + }, + { + .si_name = "swap", + .si_compare = &compare_swap, + }, + { + .si_name = "pid", + .si_compare = &compare_pid, + }, +}; + static int find_uid(uid_t needle, int *haystack) { @@ -353,7 +427,6 @@ machine_init(struct statics *statics) statics->swap_names = swapnames; else statics->swap_names = NULL; - statics->order_names = ordernames; /* Allocate state for per-CPU stats. */ GETSYSCTL("kern.smp.maxcpus", maxcpu); @@ -742,7 +815,7 @@ static struct handle handle; void * get_process_info(struct system_info *si, struct process_select *sel, - int (*compare)(const void *, const void *)) + const struct sort_info *sort_info) { int i; int total_procs; @@ -753,6 +826,9 @@ get_process_info(struct system_info *si, struct process_select *sel, struct kinfo_proc **prefp; struct kinfo_proc *pp; struct timespec previous_proc_uptime; + compare_fn *compare; + + compare = sort_info->si_compare; /* * If thread state was toggled, don't cache the previous processes. @@ -899,6 +975,43 @@ get_process_info(struct system_info *si, struct process_select *sel, return (&handle); } +/* + * Returns the sort info associated with the specified order. Currently, that's + * really only the comparator that we'll later use. Specifying a NULL ordername + * will return the default comparator. + */ +const struct sort_info * +get_sort_info(const char *ordername) +{ + const struct sort_info *info; + size_t idx; + + if (ordername == NULL) + return (&sortdata[0]); + + for (idx = 0; idx < nitems(sortdata); idx++) { + info = &sortdata[idx]; + + if (strcmp(info->si_name, ordername) == 0) + return (info); + } + + return (NULL); +} + +void +dump_sort_names(FILE *fp) +{ + const struct sort_info *info; + size_t idx; + + for (idx = 0; idx < nitems(sortdata); idx++) { + info = &sortdata[idx]; + + fprintf(fp, " %s", info->si_name); + } +} + static int cmd_matches(struct kinfo_proc *proc, const char *term) { @@ -1559,26 +1672,6 @@ compare_ivcsw(const void *arg1, const void *arg2) return (flp2 - flp1); } -int (*compares[])(const void *arg1, const void *arg2) = { - compare_cpu, - compare_size, - compare_res, - compare_time, - compare_prio, - compare_threads, - compare_iototal, - compare_ioread, - compare_iowrite, - compare_iofault, - compare_vcsw, - compare_ivcsw, - compare_jid, - compare_swap, - compare_pid, - NULL -}; - - static int swapmode(int *retavail, int *retfree) { diff --git a/usr.bin/top/machine.h b/usr.bin/top/machine.h index 57f2846cdba5..b4f2f1a8bd50 100644 --- a/usr.bin/top/machine.h +++ b/usr.bin/top/machine.h @@ -89,10 +89,15 @@ void get_system_info(struct system_info *si); int machine_init(struct statics *statics); /* non-int routines typically used by the machine dependent module */ +struct sort_info; + extern struct process_select ps; void * get_process_info(struct system_info *si, struct process_select *sel, - int (*compare)(const void *, const void *)); + const struct sort_info *); + +const struct sort_info *get_sort_info(const char *name); +void dump_sort_names(FILE *fp); #endif /* MACHINE_H */ diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c index 856ad838dc1c..f0458a4037af 100644 --- a/usr.bin/top/top.c +++ b/usr.bin/top/top.c @@ -252,7 +252,7 @@ main(int argc, const char *argv[]) char no_command = 1; struct timeval timeout; char *order_name = NULL; - int order_index = 0; + const struct sort_info *sort_info = NULL; fd_set readfds; char *nptr; @@ -505,21 +505,18 @@ main(int argc, const char *argv[]) /* determine sorting order index, if necessary */ if (order_name != NULL) { - if ((order_index = string_index(order_name, statics.order_names)) == -1) - { - const char * const *pp; - + if ((sort_info = get_sort_info(order_name)) == NULL) { warnx("'%s' is not a recognized sorting order.", order_name); fprintf(stderr, "\tTry one of these:"); - pp = statics.order_names; - while (*pp != NULL) - { - fprintf(stderr, " %s", *pp++); - } + dump_sort_names(stderr); fputc('\n', stderr); exit(1); } } + else + { + sort_info = get_sort_info(NULL); + } /* initialize termcap */ init_termcap(interactive); @@ -602,17 +599,13 @@ restart: while ((displays == -1) || (displays-- > 0)) { - int (*compare)(const void * const, const void * const); - /* get the current stats */ get_system_info(&system_info); - compare = compares[order_index]; - /* get the current set of processes */ processes = - get_process_info(&system_info, &ps, compare); + get_process_info(&system_info, &ps, sort_info); /* display the load averages */ (*d_loadave)(system_info.last_pid, @@ -1047,7 +1040,9 @@ restart: "Order to sort: "); if (readline(tempbuf2, sizeof(tempbuf2), false) > 0) { - if ((i = string_index(tempbuf2, statics.order_names)) == -1) + const struct sort_info *new_sort_info; + + if ((new_sort_info = get_sort_info(tempbuf2)) == NULL) { new_message(MT_standout, " %s: unrecognized sorting order", tempbuf2); @@ -1055,7 +1050,7 @@ restart: } else { - order_index = i; + sort_info = new_sort_info; } putchar('\r'); } diff --git a/usr.bin/top/utils.c b/usr.bin/top/utils.c index cde89a211b53..a8ddb3eb63a0 100644 --- a/usr.bin/top/utils.c +++ b/usr.bin/top/utils.c @@ -116,27 +116,6 @@ digits(int val) return(cnt); } -/* - * string_index(string, array) - find string in array and return index - */ - -int -string_index(const char *string, const char * const *array) -{ - size_t i = 0; - - while (*array != NULL) - { - if (strcmp(string, *array) == 0) - { - return(i); - } - array++; - i++; - } - return(-1); -} - /* * argparse(line, cntp) - parse arguments in string "line", separating them * out into an argv-like array, and setting *cntp to the number of diff --git a/usr.bin/top/utils.h b/usr.bin/top/utils.h index a730e339d200..bbc63803b6e1 100644 --- a/usr.bin/top/utils.h +++ b/usr.bin/top/utils.h @@ -19,6 +19,5 @@ const char **argparse(char *, int *); long percentages(int, int *, long *, long *, long *); const char *format_time(long); char *format_k(int64_t); -int string_index(const char *string, const char * const *array); int find_pid(pid_t pid); From nobody Sun Apr 12 13:44:07 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG03bG1z6ZLgg for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsFz4Vvjz3kg9 for ; Sun, 12 Apr 2026 13:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FCLIilqGxa/7G8/yUfZO5bMCllpoz7gmZpoHeCYgVhY=; b=uQU36dEviUcdi+ru9JYn1ikLPXO5jIxLFGvagmrCvW0Z65HY7ov/zte3vO+vLo/Qk44+QJ U03lMKOv9XeSEsA6RjLWols9E+N3QZysqWDZwiLvk6Kg3skS1Q40emFcvWLeq2mOnFxvvQ i6OpUo1FRgZ3CpcbkZ8eb4KIU81sZzujzo7LvvbALau7+FH+tedyWPSqkz/xPvuvFj7o9Q QUDO4fA1RwbfB0wsQ9Qkv/QtIgea1wbe9SRU0OC7mwNaX7Va17Lt68clYvnsjMVd8pdaKa yR63mIKm71XaixYjUGeVGQg+7rHHOUZSpJz5rBUIpK3SuXfZDCmn0QGxCZmt3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001447; a=rsa-sha256; cv=none; b=EmP9WcXVAVKnslG5TUIBZvRoT7DDjVeh41M5nlfk1MTgDa9DOEdOdULrw4KSSqXsQvGlH4 mWcBo0lX51uGfu7/yXKkPILoKA1hPkf9cHoNQBAgCCuV5QKSvMIdAXSUtejpMQCq1h5wrb DXvHAa27Q8eWJgAf0e6QVKtfRNSYQ1zBII/Ly5LLmkNjizmVa1M8Xxd75OuBayxyLuABeQ gRhOsrbAcOhaW9bi+E90HJLZiiHG2p5NN7IVy5S+namYvI21ZNzz1ERURxa182ygw1Mekm 89RWmCJhMIvMGAsvwR0HFxrIsFKroA38oVIgsZv0I9N24bk5V2ozW7kS8zfJ7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FCLIilqGxa/7G8/yUfZO5bMCllpoz7gmZpoHeCYgVhY=; b=a4FDZi0iJc5ojm3JG9hs1CB9pMgoZpLx+8Kb+2Qt0/M7HSkmSY647nfiYvYPRsjXoASCBu xEDP0QSBuG1TqrcGyk7MA8kIhPFIKkZ7UOHieR/p6JpEchhs4ho3RhLlx3Q4TIm0Op7dwZ lJLwdz6/7u9A8ektzPNyDlJsWvpR5L/2gN4CIKGS0Hq9gBJ2RwyugLthgYkhptsohjHgbb AQsakMs1IUi96SzhWdzKQ4K4XnPxQtTHGOhUcE+Tg24wZM7CHD2ELSUUEPtghmzl6zRtPP 8waja2gS7yfmrDTrXGMWxh+FjHW6Ud0aePKzyQLVijfJYGYdNO+ROaAaHMlG+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsFz3fbHz4NT for ; Sun, 12 Apr 2026 13:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42439 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3c3228a5275a - stable/14 - ssh: sshd-session: properly save off the privileged gid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 3c3228a5275a3eda0f73aa24a8f24950f3b4823c Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:07 +0000 Message-Id: <69dba1a7.42439.1f5e52e4@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3c3228a5275a3eda0f73aa24a8f24950f3b4823c commit 3c3228a5275a3eda0f73aa24a8f24950f3b4823c Author: Kyle Evans AuthorDate: 2025-08-09 16:01:57 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:36 +0000 ssh: sshd-session: properly save off the privileged gid Current and traditional FreeBSD behavior means that getegid() here is the first element in the prior setgroups() call, if any, so we may inadvertently wipe out our rgid with the unprivileged gid. This is rendered somewhat harmless by the fact that we're losing the privileged gid -- we'll still regain it as the egid in restore_uid() later by way of restoring saved_egroups, rather than by intentionally restoring it from getgid(). This will be promptly reverted if we can get setgroups(2)/getgroups(2) changed in FreeBSD 15.0, but it seemed wise to get this technically correct for previous branches. Reviewed by: jlduran (cherry picked from commit 239e8c98636a7578cc67a6f9d54d14c71b095e36) --- crypto/openssh/uidswap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/crypto/openssh/uidswap.c b/crypto/openssh/uidswap.c index 6ed3024d0180..0143f4994611 100644 --- a/crypto/openssh/uidswap.c +++ b/crypto/openssh/uidswap.c @@ -14,6 +14,9 @@ #include "includes.h" +#ifdef __FreeBSD__ +#include +#endif #include #include #include @@ -121,8 +124,20 @@ temporarily_use_uid(struct passwd *pw) fatal("setgroups: %.100s", strerror(errno)); #ifndef SAVED_IDS_WORK_WITH_SETEUID /* Propagate the privileged gid to all of our gids. */ +#ifdef __FreeBSD__ + /* + * FreeBSD traditionally includes the egid as the first element. If we + * use getegid() here then we effectively propagate user_groups[0], + * which is probably pw->pw_gid. Fix it to work as intended by using + * the egid we already have stashed off. + */ + assert(saved_egroupslen > 0); + if (setgid(saved_egroups[0]) == -1) + debug("setgid %u: %.100s", (u_int) saved_egroups[0], strerror(errno)); +#else if (setgid(getegid()) == -1) debug("setgid %u: %.100s", (u_int) getegid(), strerror(errno)); +#endif /* Propagate the privileged uid to all of our uids. */ if (setuid(geteuid()) == -1) debug("setuid %u: %.100s", (u_int) geteuid(), strerror(errno)); From nobody Sun Apr 12 13:44:08 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG11T1yz6ZM5f for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG05bYwz3kLl for ; Sun, 12 Apr 2026 13:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibdpAaRpizj50JHwWLB/rwmgJ87CSVTzLqQ7Mb8J8YM=; b=t97XDNfnoJOban2CtySaqgwIOgZeGX1C+TcWOBVQXgjQI+A2f/puHR+ZWaza8RfV1EuMNi ozCTA/h6uJTtUxdZcQLuoes22MRvTOrbbktJAX7yWPeyfNI+Z8CjNmf8SxEqRHZcDt+xpI TkRqsTqMksgK1Xcr6HthkZv6JKyOVE1AKcfHxn30lyQgQ/b3R84qFT1X/rEcasIR1cDZ4L OHm/92iAVlOx1Lbn1ZlZhjwJ2BMgPXCkOV2PhoMN5MMU64yaEuxbZimGW1V6+ItGetG+9B PXzxzU02nbetOQ/smhlzv+Yk+WKi1cYfloQ6GzSPQSvLj24Hpg+UP6FmlyIncg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001448; a=rsa-sha256; cv=none; b=A+xO3VU9qhOhH/CZuo4YP7VSIAoXc6Voo40oO8rv50NSeN3o21JyDtk2yba84ZbxGlxi6O 1gah9cg+rBduJ5K2IyYbWx7IOk5EXBgw1opA2iS+k65QkB0MQrZFkgTdL5GVXTHGqRyRAI qeQS2pS6qvCPTDApYN+qRur1obzMdT2glMBoRrbWLQYy0EF+aRrVxGidh3qTWbY3EyNmmv XgC1gV7HHMsssCVfiDNfo2TLLv6vBRfOpwC9sBD5PizQyTP0wTU78cLMXXiDj50eFJlxm/ 3mw9xgSUfF8GWIb68OJGTnF2gkdH+n2pJV1/aiLq+N1EejGGKyfQkyfDGGKrKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibdpAaRpizj50JHwWLB/rwmgJ87CSVTzLqQ7Mb8J8YM=; b=q3yA32I+N/vK1BkIfP30Xx/uLVTE072q1HoQ/hlILWl+17FQ/zc9Vw6F1ZdBD8q12bBpVM 7WK5chxpMBzU1DBnwPqYUDMYi3aosm5HhSMZwhEpMCtyexQpzxvxQJR4KlPQsC8pGNct/4 0c1ygK+R0B//wCp3E+ewNhu2m0EvCmhJtYClRJ9IoL8VAMO33Jon5Xvjk14HYYIiiONKYF 5aqvf6YDp1JwdV9YqtzSHj1VDIkY9GhXicv7ws0MS1p8pCHi1IMubPR/HXJi3Rz3e31d7y nCHKYNvI4HUJLCahfPYjZWeSxIXk2jWrHXnO6+CG7JNL8daTUhzcaiseC6nJqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG04PPSz41F for ; Sun, 12 Apr 2026 13:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4348e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: fd67a7587c1a - stable/14 - if_tuntap: make SIOCIFDESTROY interruptible List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: fd67a7587c1a187cc162cf02ece94f4142874f35 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:08 +0000 Message-Id: <69dba1a8.4348e.746f944d@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fd67a7587c1a187cc162cf02ece94f4142874f35 commit fd67a7587c1a187cc162cf02ece94f4142874f35 Author: Kyle Evans AuthorDate: 2025-08-21 14:21:41 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:37 +0000 if_tuntap: make SIOCIFDESTROY interruptible There's no good justification to permanently hang a thread until the tunnel can be destroyed. Make it interruptible so that the admin can ^C it and remedy the situation if something erroneously has the tunnel open, rather than forcing them to open another shell to resolve it. Reviewed by: markj (cherry picked from commit 274bf7c8ae7e7b51853cd541481985f0e687f10e) --- sys/net/if_tuntap.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 45d981de9fdb..f42daed4a68d 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -623,19 +623,34 @@ out: CURVNET_RESTORE(); } -static void -tun_destroy(struct tuntap_softc *tp) +static int +tun_destroy(struct tuntap_softc *tp, bool may_intr) { + int error; TUN_LOCK(tp); + MPASS((tp->tun_flags & TUN_DYING) == 0); tp->tun_flags |= TUN_DYING; - if (tp->tun_busy != 0) - cv_wait_unlock(&tp->tun_cv, &tp->tun_mtx); - else - TUN_UNLOCK(tp); + error = 0; + while (tp->tun_busy != 0) { + if (may_intr) + error = cv_wait_sig(&tp->tun_cv, &tp->tun_mtx); + else + cv_wait(&tp->tun_cv, &tp->tun_mtx); + if (error != 0) { + tp->tun_flags &= ~TUN_DYING; + TUN_UNLOCK(tp); + return (error); + } + } + TUN_UNLOCK(tp); CURVNET_SET(TUN2IFP(tp)->if_vnet); + mtx_lock(&tunmtx); + TAILQ_REMOVE(&tunhead, tp, tun_list); + mtx_unlock(&tunmtx); + /* destroy_dev will take care of any alias. */ destroy_dev(tp->tun_dev); seldrain(&tp->tun_rsel); @@ -656,6 +671,8 @@ tun_destroy(struct tuntap_softc *tp) cv_destroy(&tp->tun_cv); free(tp, M_TUN); CURVNET_RESTORE(); + + return (0); } static int @@ -663,12 +680,7 @@ tun_clone_destroy(struct if_clone *ifc __unused, struct ifnet *ifp, uint32_t fla { struct tuntap_softc *tp = ifp->if_softc; - mtx_lock(&tunmtx); - TAILQ_REMOVE(&tunhead, tp, tun_list); - mtx_unlock(&tunmtx); - tun_destroy(tp); - - return (0); + return (tun_destroy(tp, true)); } static void @@ -723,9 +735,9 @@ tun_uninit(const void *unused __unused) mtx_lock(&tunmtx); while ((tp = TAILQ_FIRST(&tunhead)) != NULL) { - TAILQ_REMOVE(&tunhead, tp, tun_list); mtx_unlock(&tunmtx); - tun_destroy(tp); + /* tun_destroy() will remove it from the tailq. */ + tun_destroy(tp, false); mtx_lock(&tunmtx); } mtx_unlock(&tunmtx); From nobody Sun Apr 12 13:44:09 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG22k3yz6ZM7r for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG15yKyz3kgn for ; Sun, 12 Apr 2026 13:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJP2SL7PrCkDg/+tDRyorVVWrMUQ6TOGhkyZTkN5gCs=; b=pes5+aoaXJSaMtTT1c+RFIVELxjgUbIrxDV3YFEggSKmEgYaW4zUQTCKB0qsFyWiD0Gagn G7qTHhvRUwi8mFUTctm2d4Vgx9cdeCCNMIWB5E1rkXUypvgQ0umU41qoGRJE4NnmwOAI5e DAhuFr4XgYb3V8Pn85AXEcH2JlrTakD7KkkGrUqA/yciZ7LAl1MIC+8TtY1F36Dw3qFvHY 4ciTkgt1nnHsZPNcE9cEkHh4wGO6ljS16zZdfDNg3RZHTdEK1wSCwhtgqnMmLLCpTKMikj dubQ6HA9bg4OxUwt+/vFWm2D0I99Ls77ZkUmr+DSwqN72o7auN6A90zrCskQwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001449; a=rsa-sha256; cv=none; b=iziVB50Ksj6C7ikx9qirD+IGDCCRASzxEr7JPdfIUHBXmKAS69GrbGWTrAmvoqTK7RgTM/ MQT2AHu1Lbg3fa/w+RVOEf0Vs0K96Tx6Y+wEDguQqDZpfXn7CoNFPQTuLmWb21rAIdNArm B8KPkqMc9AceyN5KlEnzh6S1gVGkhA7YQ4/cy3DveKHAPFMOvqSVoyhynF+mKt0qQbHcRh aG7PLFh51peZupjstPBd+dLsrIqNd2BwXlz/l/u0Fg8RXtdkvi1R8UbpmXtWRWC41A2/SV aWubkg/xWZuJHFSmg7X7C4gSOPcSKYhTNt31ZEJt4vJSMHctnRkd5Vg0d4pdDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJP2SL7PrCkDg/+tDRyorVVWrMUQ6TOGhkyZTkN5gCs=; b=PJhtpxGQ78LORddJ84iao0E4JoZvtKITBKCGfNmj+BdXCWWUgcB9M56BtWpaEfQz8iURW+ QZl+2MR+q0QJF/nFxxqykGOZ9FlCbuANn7E0t5y1Q9hDiRWRUC7LC00uVwBSrkKIB0gPtM 2oc0HA+iSDPL3QKFKGHBhGll2I81eJTcFNkN3YAsyEHw4asCPghrTjOCDM7hevoGqDsVWC fGGEnauYZLi7Dvji0zygVAJ5EPQR3J5ECl3tlsEc5c3j8RUs7sRDHYl1RLVj3gsnr2nTM+ 012J+bfRyjwjF+8kxPf0dpGQ0q9hqgZn4T8EXUdqT3uXcQzfvuGQgympIEro2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG15F4Mz4fS for ; Sun, 12 Apr 2026 13:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42f4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4bb6ec63dace - stable/14 - stand: use a common function in gfx_fb for setting up teken colors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 4bb6ec63dace8fb6d522fe246700ffc30bc79ab5 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:09 +0000 Message-Id: <69dba1a9.42f4f.5b9a1a20@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4bb6ec63dace8fb6d522fe246700ffc30bc79ab5 commit 4bb6ec63dace8fb6d522fe246700ffc30bc79ab5 Author: Kyle Evans AuthorDate: 2025-08-22 03:48:14 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:37 +0000 stand: use a common function in gfx_fb for setting up teken colors These are basically identical, with exception to the hook installed which is specific to the loader we're building by necessity. Pull these out into common/gfx_fb.c and just parameterize the hooks to make it easier to change the logic. Reviewed by: imp (cherry picked from commit c43de099d0138b369b705b3af2c3254d3f3afc6e) --- stand/common/gfx_fb.c | 31 +++++++++++++++++++++++++++++++ stand/common/gfx_fb.h | 1 + stand/efi/libefi/efi_console.c | 23 +---------------------- stand/i386/libi386/vidconsole.c | 21 +-------------------- 4 files changed, 34 insertions(+), 42 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 67f757983cd3..9aa0431a04d6 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -223,6 +223,37 @@ gfx_parse_mode_str(char *str, int *x, int *y, int *depth) return (true); } +void +gfx_fb_setcolors(teken_attr_t *attr, ev_sethook_t sethook, + ev_unsethook_t unsethook) +{ + const char *ptr; + char env[10]; + + /* + * On first run, we setup an environment hook to process any color + * changes. If the env is already set, we pick up fg and bg color + * values from the environment. + */ + ptr = getenv("teken.fg_color"); + if (ptr != NULL) { + attr->ta_fgcolor = strtol(ptr, NULL, 10); + ptr = getenv("teken.bg_color"); + attr->ta_bgcolor = strtol(ptr, NULL, 10); + + teken_set_defattr(&gfx_state.tg_teken, attr); + } else { + snprintf(env, sizeof(env), "%d", + attr->ta_fgcolor); + env_setenv("teken.fg_color", EV_VOLATILE, env, + sethook, unsethook); + snprintf(env, sizeof(env), "%d", + attr->ta_bgcolor); + env_setenv("teken.bg_color", EV_VOLATILE, env, + sethook, unsethook); + } +} + static uint32_t rgb_color_map(uint8_t index, uint32_t rmax, int roffset, uint32_t gmax, int goffset, uint32_t bmax, int boffset) diff --git a/stand/common/gfx_fb.h b/stand/common/gfx_fb.h index 17e419d8ffd3..d12bcd76b7fa 100644 --- a/stand/common/gfx_fb.h +++ b/stand/common/gfx_fb.h @@ -277,6 +277,7 @@ void gfx_fb_bezier(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, int gfx_fb_putimage(png_t *, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t); bool gfx_parse_mode_str(char *, int *, int *, int *); +void gfx_fb_setcolors(teken_attr_t *, ev_sethook_t, ev_unsethook_t); void term_image_display(teken_gfx_t *, const teken_rect_t *); void reset_font_flags(void); diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c index a112528d8c95..26b38603bb3b 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -1041,28 +1041,7 @@ cons_update_mode(bool use_gfx_mode) a = teken_get_defattr(&gfx_state.tg_teken); attr = *a; - /* - * On first run, we set up the efi_set_colors() - * callback. If the env is already set, we - * pick up fg and bg color values from the environment. - */ - ptr = getenv("teken.fg_color"); - if (ptr != NULL) { - attr.ta_fgcolor = strtol(ptr, NULL, 10); - ptr = getenv("teken.bg_color"); - attr.ta_bgcolor = strtol(ptr, NULL, 10); - - teken_set_defattr(&gfx_state.tg_teken, &attr); - } else { - snprintf(env, sizeof(env), "%d", - attr.ta_fgcolor); - env_setenv("teken.fg_color", EV_VOLATILE, env, - efi_set_colors, env_nounset); - snprintf(env, sizeof(env), "%d", - attr.ta_bgcolor); - env_setenv("teken.bg_color", EV_VOLATILE, env, - efi_set_colors, env_nounset); - } + gfx_fb_setcolors(&attr, efi_set_colors, env_nounset); } } diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c index 414803e9af3d..3938bd7822ea 100644 --- a/stand/i386/libi386/vidconsole.c +++ b/stand/i386/libi386/vidconsole.c @@ -956,26 +956,7 @@ cons_update_mode(bool use_gfx_mode) a = teken_get_defattr(&gfx_state.tg_teken); attr = *a; - /* - * On first run, we set up the vidc_set_colors() - * callback. If the env is already set, we - * pick up fg and bg color values from the environment. - */ - ptr = getenv("teken.fg_color"); - if (ptr != NULL) { - attr.ta_fgcolor = strtol(ptr, NULL, 10); - ptr = getenv("teken.bg_color"); - attr.ta_bgcolor = strtol(ptr, NULL, 10); - - teken_set_defattr(&gfx_state.tg_teken, &attr); - } else { - snprintf(env, sizeof(env), "%d", attr.ta_fgcolor); - env_setenv("teken.fg_color", EV_VOLATILE, env, - vidc_set_colors, env_nounset); - snprintf(env, sizeof(env), "%d", attr.ta_bgcolor); - env_setenv("teken.bg_color", EV_VOLATILE, env, - vidc_set_colors, env_nounset); - } + gfx_fb_setcolors(&attr, vidc_set_colors, env_nounset); /* Improve visibility */ if (attr.ta_bgcolor == TC_WHITE) From nobody Sun Apr 12 13:44:10 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG32XFBz6ZMBG for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG26nxDz3kZx for ; Sun, 12 Apr 2026 13:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NipGTtetAxLciBQp9aIdVpK7x96yhUK7WEr4AssRBY=; b=iR/CnzLQ8LwiLw/q5sgXjCqX0dK4jPrLyxmRT7WEWd26IN+4TjSCc/7T9mQI7I079CDLos /3f2tAGUcIiczEGlR/LRkGXsgSlTYiGplhRAx0p7PGko6TD4kVbuckuJsjdDAs6i9PnVJM Lhpj1gjQYrVakhCeMU9cORopwcmy72ZBXo6eBS5vGzzOGbLjUQscEl3N+37N36KPhTCbli fK3V+JqPb0vBL65xDqKbfWmlBU56mrmEAy70dttPcLVKIlZo4n0Bi5PNghWsep133Hzt0O qld4KnuOkDqMy3+PIvaizBsM81aVBILrRRXBxOpddjIV5MqFqaBwVRRL6UYiPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001451; a=rsa-sha256; cv=none; b=PjfgM19M7tWzAO7XB+ZmMLgVu/ThgsEHh9qUGFRyGKTHsjWefY5XQ6Pwdf9CJiCkxO5XKe GG3AklwjEczpDAWlQdVDY7Bv8WZDUlRP7h8cwhbmdY0bf1KEgDnhS8Q/xrWaQhwi7LO3WE yo/65R510/KivwhBlDye2tJyvyNNq74TzkuhuGZEXuJw4Nf4CJAfotFL0n+89wEMh/ZYLj cKf8sLvRGgv1uE5IBap7LQGR97ZURdufmixPY6pJkOSr12kBTzlcMraILyzaGZ5K0RxY9o saZZ0t8o3c/hSQXnee30BQZaezP/XgtS/5OAzFHrWcPuzXdkvJrXQTWGKWvnmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NipGTtetAxLciBQp9aIdVpK7x96yhUK7WEr4AssRBY=; b=fJDeJ/9BamrymSdbs2m/903TU6WKtLYX3NdUiNc00vuugOOVzFjpfbTF1OMEIQeEgawG5g vZkAsMElXfXSfF4fu1XguqTNFSdPUBKS9mTeNLxace0SORQ6CcoKCoZsqQUgVb0Idu9Y+a 6h6mRJLXJcDaagl8H1e5RdTLDcouaKxLwschwYv3UlBLcDWZfKkIacpxMGMpeIDUWDZQLt 06LSbGhTtwSZpLaVZ0VuxhRjfWG+l2v94AMXGUTHpfuqKs/KYSPMbuq0IRdWSyPuFGP2qd /+Hh9mBD0ZOJJz3px6UFOnIvGRSPb+XuoeOEF/xj1+ISDWo21uldL3h+RfXgMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG262Yzz4TM for ; Sun, 12 Apr 2026 13:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 439d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 14c8e003318b - stable/14 - stand: split fg/bg handling up a little further List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 14c8e003318b3c29f1b9a7a61092c9e3df5f2bc1 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:10 +0000 Message-Id: <69dba1aa.439d7.4ff8b5db@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=14c8e003318b3c29f1b9a7a61092c9e3df5f2bc1 commit 14c8e003318b3c29f1b9a7a61092c9e3df5f2bc1 Author: Kyle Evans AuthorDate: 2025-08-22 03:48:14 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:38 +0000 stand: split fg/bg handling up a little further These can be setup independently, so we should also check them and initialize each independently. This fixes a pre-existing bug where-in we may not pickup a bg color specified in the environment if a fg color wasn't set. The new version also ensures that we're hooking the color vars properly if we're using a value that was already there, as the console may need to adjust if something wants to switch them up again. Otherwise, a teken.fg_color set in loader could conceivably occur that only changes the color when you get to the kernel, which could be surprising. Reviewed by: imp (cherry picked from commit 95e6fd1fd85a448d2c68473b85a61fba24c9bc4f) --- stand/common/gfx_fb.c | 59 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 9aa0431a04d6..687c081a1d5d 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -223,35 +223,60 @@ gfx_parse_mode_str(char *str, int *x, int *y, int *depth) return (true); } +/* + * Returns true if we set the color from pre-existing environment, false if + * just used existing defaults. + */ +static bool +gfx_fb_evalcolor(const char *envname, teken_color_t *cattr, + ev_sethook_t sethook, ev_unsethook_t unsethook) +{ + const char *ptr; + char env[10]; + bool from_env = false; + + ptr = getenv(envname); + if (ptr != NULL) { + *cattr = strtol(ptr, NULL, 10); + + /* + * If we can't unset the value, then it's probably hooked + * properly and we can just carry on. Otherwise, we want to + * reinitialize it so that we can hook it for the console that + * we're resetting defaults for. + */ + if (unsetenv(envname) != 0) + return (true); + from_env = true; + } + + snprintf(env, sizeof(env), "%d", *cattr); + env_setenv(envname, EV_VOLATILE, env, sethook, unsethook); + + return (from_env); +} + void gfx_fb_setcolors(teken_attr_t *attr, ev_sethook_t sethook, ev_unsethook_t unsethook) { const char *ptr; - char env[10]; + bool need_setattr = false; /* * On first run, we setup an environment hook to process any color * changes. If the env is already set, we pick up fg and bg color * values from the environment. */ - ptr = getenv("teken.fg_color"); - if (ptr != NULL) { - attr->ta_fgcolor = strtol(ptr, NULL, 10); - ptr = getenv("teken.bg_color"); - attr->ta_bgcolor = strtol(ptr, NULL, 10); - + if (gfx_fb_evalcolor("teken.fg_color", &attr->ta_fgcolor, + sethook, unsethook)) + need_setattr = true; + if (gfx_fb_evalcolor("teken.bg_color", &attr->ta_bgcolor, + sethook, unsethook)) + need_setattr = true; + + if (need_setattr) teken_set_defattr(&gfx_state.tg_teken, attr); - } else { - snprintf(env, sizeof(env), "%d", - attr->ta_fgcolor); - env_setenv("teken.fg_color", EV_VOLATILE, env, - sethook, unsethook); - snprintf(env, sizeof(env), "%d", - attr->ta_bgcolor); - env_setenv("teken.bg_color", EV_VOLATILE, env, - sethook, unsethook); - } } static uint32_t From nobody Sun Apr 12 13:44:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG42PBqz6ZLXP for ; Sun, 12 Apr 2026 13:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG40DRbz3kMH for ; Sun, 12 Apr 2026 13:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HInYv2k7/2V4/amu9sI4R+wKc+VUDuBPkyivUmhkcSk=; b=b28vlsIqxUkJInPJ5cmgBgZx3WGS4PORPyn7SDWJ37J1uDJlQNcQtfUnUGBqH01TGGa6Cv ndeoxK9UgT/7Hcq2CXwHp69qXvdkV2CejjrjXH/aqUXdz0IbTtSrIcMuNRaYGgRb96V7cN No7C9CM9rzmjIFbpabGZTRCF5DqUEjNVw5wzDHc90/cF8zHhCwqOfyiVgnbgBv/0nxKQ2d HJcjE9M+AxQfeCOkOKYs4QsDO2jy7pNN/wZQOH9Dh+NNtOo/izRu5S+9ea5hG1O1O9H4wF CGEBX0VwI9bgI2TQv1tBrTc3AMXjQIv/zLqMZIcJdU/Vj8nbn3ATI684ai5grg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001452; a=rsa-sha256; cv=none; b=wUuexqcTqzl9fnYUtvX6huKhBu2kFtvE81MUCRXWJMCaWt/F5cK4gb1qhehOoTJEKd6MeL LICN9VJD+NxcO8jzJNeFKSSnS9aEVkFfyVeEJtXcMfEJcUKW5t+SzjB+v2Yo0bTzF8SqzY /NENAIb9P9p1lEDxssHqMXSJnhEurHy+6xdX8Sr7fh1lEx+0Vl7b2tXFPAL9iwiZZdDKTM RI+dEs36kGPUx/Cjdx2mjbiBHhzGIyv9pvGHwIVx6WhcPCt2zi2N1nxE9fJ5A3wJ0SA6bK 62+Kdm68TSr07rObQNavr2R9D+OCdgaOc59eOmQp+JCmiolfaUz3sOeBxn7nVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HInYv2k7/2V4/amu9sI4R+wKc+VUDuBPkyivUmhkcSk=; b=OiwveorPJXFIDTDSCKrP2ufzdZhV+WHE2pwVl0/r0JIwwo6lMfYiRZoTvH7X0whisOORVw ENzsrwkz/22sYz3eqJx6+snnrxxyDUALJ8uBD4PlD5QTTxyJpfhTu6rs9cuxDL7zPZArjg NPORmzIVUZt4g+iIfkMVCvX/xDu7gq2dmPuSi/JKJ30PSZUOGHhQ0fgpioMwqi770xEID0 /pSsq5BOCk/8k3oABNgdRZIFFIBlqrPmqcxxZY2PeARh8mY/X8ZYJy4NyqH5caU/xA0dXQ PTyw/vDzQDdtSfplwW8Pn1ByxHkrK9tpik8iLF8FaW2KXvh+qNDf8rNW1mKZoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG36whvz41J for ; Sun, 12 Apr 2026 13:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4300d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b00faab970c0 - stable/14 - stand: add a mechanism to avoid env var propagation to kenv List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b00faab970c0e867b2c8197d7bb14abbb492932e Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:11 +0000 Message-Id: <69dba1ab.4300d.39fc068c@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b00faab970c0e867b2c8197d7bb14abbb492932e commit b00faab970c0e867b2c8197d7bb14abbb492932e Author: Kyle Evans AuthorDate: 2025-08-22 03:48:14 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:38 +0000 stand: add a mechanism to avoid env var propagation to kenv Our only user of this at the moment is teken.{fg,bg}_color. These are special because teken is a library common to both the kernel and the loader, and we want to avoid having special vars to control the loader vs. the kernel. Ideally, if a user wants a different set of console colors, then they set the appropriate teken variable and it Just Works(TM) everywhere. We can't just avoid setting the env vars, because we specifically want to install a hook to adjust how loader is drawn. This allows us to avoid breaking a kernel config(5) that has some default teken colors set with our defaults. That's a valid configuration, even if it might seem weird that they don't want to set colors in both loader and the kernel -- they may not anticipate spending any time in loader, and thus prefer to just let it do its default behavior. NOKENV is expected to be unset if the value is overwritten, rather than acting as a persistent marker that we do not want the value to persist under any circumstance. We can always add another flag bit later for persistence if we find a use for that, but most variables are fine to carry over. This is mostly needed for environment variables that we really just want to set a hook for. Future work could expand this to break it out to the scripted interfaces. We have discussed some options like a new built-in command, or adding a flag to the existing `set` command, but haven't really come up with a concrete plan to avoid confusion. Reviewed by: imp (cherry picked from commit 510e473ff3a6d4620c603c1b9ba06fb2bf5745fd) --- stand/common/gfx_fb.c | 9 ++++++++- stand/common/modinfo.c | 2 ++ stand/libsa/environment.c | 17 ++++++++++++++--- stand/libsa/stand.h | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 687c081a1d5d..92abaed91f6b 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -233,6 +233,7 @@ gfx_fb_evalcolor(const char *envname, teken_color_t *cattr, { const char *ptr; char env[10]; + int eflags = EV_VOLATILE | EV_NOKENV; bool from_env = false; ptr = getenv(envname); @@ -248,10 +249,16 @@ gfx_fb_evalcolor(const char *envname, teken_color_t *cattr, if (unsetenv(envname) != 0) return (true); from_env = true; + + /* + * If we're carrying over an existing value, we *do* want that + * to propagate to the kenv. + */ + eflags &= ~EV_NOKENV; } snprintf(env, sizeof(env), "%d", *cattr); - env_setenv(envname, EV_VOLATILE, env, sethook, unsethook); + env_setenv(envname, eflags, env, sethook, unsethook); return (from_env); } diff --git a/stand/common/modinfo.c b/stand/common/modinfo.c index 381bd9dfd719..8c65bea2e759 100644 --- a/stand/common/modinfo.c +++ b/stand/common/modinfo.c @@ -167,6 +167,8 @@ md_copyenv(vm_offset_t start) /* Traverse the environment. */ for (ep = environ; ep != NULL; ep = ep->ev_next) { + if ((ep->ev_flags & EV_NOKENV) != 0) + continue; len = strlen(ep->ev_name); if ((size_t)archsw.arch_copyin(ep->ev_name, addr, len) != len) break; diff --git a/stand/libsa/environment.c b/stand/libsa/environment.c index 95ee1718f8d4..d139249a8e84 100644 --- a/stand/libsa/environment.c +++ b/stand/libsa/environment.c @@ -65,6 +65,17 @@ env_setenv(const char *name, int flags, const void *value, struct env_var *ev, *curr, *last; if ((ev = env_getenv(name)) != NULL) { + /* + * If the new value doesn't have NOKENV set, we'll drop the flag + * if it's set on the entry so that the override propagates + * correctly. We do this *before* sending it to the hook in + * case the hook declines to operate on it (e.g., because the + * value matches what was already set) -- we would still want + * the explicitly set value to propagate. + */ + if (!(flags & EV_NOKENV)) + ev->ev_flags &= ~EV_NOKENV; + /* * If there's a set hook, let it do the work * (unless we are working for one already). @@ -77,7 +88,6 @@ env_setenv(const char *name, int flags, const void *value, free(ev->ev_value); ev->ev_value = NULL; ev->ev_flags &= ~EV_DYNAMIC; - } else { /* @@ -123,12 +133,13 @@ env_setenv(const char *name, int flags, const void *value, /* If we have a new value, use it */ if (flags & EV_VOLATILE) { ev->ev_value = strdup(value); - ev->ev_flags |= EV_DYNAMIC; + flags |= EV_DYNAMIC; } else { ev->ev_value = (char *)value; - ev->ev_flags |= flags & EV_DYNAMIC; } + ev->ev_flags |= flags & (EV_DYNAMIC | EV_NOKENV); + return (0); } diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index 260defa3a33d..553f965e0ccd 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -339,6 +339,7 @@ extern int pager_file(const char *fname); #define EV_DYNAMIC (1<<0) /* value was dynamically allocated, free if changed/unset */ #define EV_VOLATILE (1<<1) /* value is volatile, make a copy of it */ #define EV_NOHOOK (1<<2) /* don't call hook when setting */ +#define EV_NOKENV (1<<3) /* don't add to kenv (loader-only) */ struct env_var; typedef char *(ev_format_t)(struct env_var *ev); From nobody Sun Apr 12 13:44:13 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG56HBXz6ZM3P for ; Sun, 12 Apr 2026 13:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG51C7Gz3kMb for ; Sun, 12 Apr 2026 13:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZYXCpJ5Nih4p+EsepGzid9NT6ja7SNuGsCUaksxGA50=; b=jFLVGLBcWO3MsUaHluOb/CeVljTgxU2H5GgByrzbtg8qpVneqjHXzfH/2q3MODsC9aDMF8 2WhTyyuhNsqjr3uUBKAWENRzQ+gxXedl+qOfUmNpfqYbIB6b4umqGnlbA38+B55ndlf26G ZAVgLtD5gTrdvWiehExRn4am2bL1+/Z84INNTTAJDdAi+F35R9BH2P8wUQu7ZyxCjN1YPl Ve3zJ5yoyDq2gK9jm4UH71U5grcyMnXmQmv/JUrbjOMvcINpGFPqsJUU8z/v5nIYy6ih7t pOLDqp5e1QYOukUJQ0aP3tCntWXwQSqw+Cm+kV3pAxTy7lL+cXT7yyqfU+6/lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001453; a=rsa-sha256; cv=none; b=XH+9c92VGu9+a6EL/ZBLiUn5E5kmpATDfEMDLa07EKzHixpNcXesbBKdQ5gT+XkIZ/xjcJ L+L8/kU4oNWVtNfOTCQ5q8SEq0U/3824b8OpWYwKscInQ4wvcIq0fcNM5J6gRGjeT6hb5C W/AqsVbOqTWOQ+DIVsMomOuKSkfXtX1LyhotX8GSRE6qI3Yez/u/b1UxIklBC/yB8UQ9X4 3znzwe5Njb+2NgYdKWJDtAWcSB076IDTR+tGgSC36G/zETt+mppmmRzOCg6D1xOEt4jX5w CuxEhJTI/DYuBCr89EPgIBE55jjo7kmOP0/wiP1UCoFGrOL6npqq+9POka28Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZYXCpJ5Nih4p+EsepGzid9NT6ja7SNuGsCUaksxGA50=; b=h3v2tLjvbhdsUnZOBA54Av0KU3Z4K9lk94Q1Z+OiznBnA7LiemU5nmJEU4e+k1WsKz9314 s0JZnxh5FdCtXHpZJQJyb3P8qvlIp26FJRiIe6I5H6Qg6n9k6+v9mMpu6t7XLtMasN2jKv bpNV2EWJTZicM06Op7zbKij5mztmujFsUg0++A2JasOomQgWRY94V9+cexpqEMRtELKskl ag/Z1LhpRGmKLnr9TJq+A/jopcqOh+eZUAPJI8yl+gUHk+mC0YQ3mZvbspDbV9rUomZdv1 GTtNF4jcal0ZIfAyMdIAPBBsq/Ei7RnT3L7c0viQhhab8dvG2+bhtHQMOylVng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG50ZtNz4CB for ; Sun, 12 Apr 2026 13:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4328d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6613b91799ce - stable/14 - patch: test for unified diffs with spaces in filenames List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 6613b91799ce956c5a33ac9415f9bb700d1b5022 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:13 +0000 Message-Id: <69dba1ad.4328d.1da9519a@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6613b91799ce956c5a33ac9415f9bb700d1b5022 commit 6613b91799ce956c5a33ac9415f9bb700d1b5022 Author: Kyle Evans AuthorDate: 2025-08-29 19:24:35 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:38 +0000 patch: test for unified diffs with spaces in filenames The older GNU patch that we had in base did not properly handle spaces in filenames in unified diffs, but bsdpatch seems to have handled this fine at least since the version we imported into base initially. Add a test with spaces in the filename specifically to be sure. PR: 181272 (cherry picked from commit cc36624b2a8be3fbf180c5ae8d310d86486884bc) --- usr.bin/patch/tests/unified_patch_test.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.bin/patch/tests/unified_patch_test.sh b/usr.bin/patch/tests/unified_patch_test.sh index 7d4b74182c41..a91332908773 100755 --- a/usr.bin/patch/tests/unified_patch_test.sh +++ b/usr.bin/patch/tests/unified_patch_test.sh @@ -141,6 +141,23 @@ file_removal_body() atf_check -o inline:"y\n" cat foo } +atf_test_case namespace +namespace_head() +{ + atf_set "descr" "Test that patch(1) handles files with spaces in the name" +} +namespace_body() +{ + echo "ABC" > "with spaces.orig" + echo "ZYX" > "with spaces" + + atf_check -s not-exit:0 -o save:spaces.diff \ + diff -u "with spaces.orig" "with spaces" + + atf_check mv "with spaces.orig" "with spaces" + atf_check -o not-empty patch < spaces.diff +} + atf_test_case plinelen plinelen_body() { @@ -166,5 +183,6 @@ atf_init_test_cases() atf_add_test_case file_creation atf_add_test_case file_nodupe atf_add_test_case file_removal + atf_add_test_case namespace atf_add_test_case plinelen } From nobody Sun Apr 12 13:44:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG85mkvz6ZM5y for ; Sun, 12 Apr 2026 13:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG83MXLz3kmQ for ; Sun, 12 Apr 2026 13:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rLXCTYz3/11iRqLo2QQk5f02roBvW5baqoGqaOE3+To=; b=PYsiKwC6yV7jGgd4lDa+goaYJ5ZpYsSDNH6BaYoNREN17j6fh1exvrbsJ3kobBOhwlv8M7 yWzDizGL3CSopQvzCk4dOJv6bQVmELsrLIhZM+GgB9STCxnikYw6qdFdkJGgdEEPm8W3cI G/vWkSHKntQSJCKzddwMV3WOtXm2HjIspFkGN6kzYNN4jJ+yahJ8WRAH6fOO9TSgRKfA/m cHtwouE1JVYmZKJhaL6dFqy/auRvzBPmLRC7B1rj804Lh4SLH1sGJkwADqDcTNY2h1yglm 8mlLhUZ8Nh6hRtAoS2nZZi8w4Oy41/Evze/+Nf6aIQo9K7swPt2jnTbtYV1iUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001456; a=rsa-sha256; cv=none; b=emla+etjmZBqwOniQYix/hUdxXmraLqacC83EMmHJfPM0E44nKKojlFawX1DAHZoh6KCkL SXhWL2LwjVxsAfbUUi1Fm5vqDoF/UTnvzrVm/q/0ndM5Tay++H8/LTgzfBdiCfBo9hyZ22 QTENLc3bA8Hd2bOy/Ydxn7gKpGXe0x5WjwIHTsSHIHy2Yq9SmWlFZ3HsBZiwmHXHzOk+VG or4VltJH6P3ZVvrIb+q8wQLJ8NWf/UJVUBE+t3EH8H8cHuzB3hwzQVpy51t85WDxgS8d/a 4pxXkeEsKEvvUco4yEzJ/opp/+whZJ+pkyOvV3jKLW9hmwJXE9EBzFqEA65cqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rLXCTYz3/11iRqLo2QQk5f02roBvW5baqoGqaOE3+To=; b=TkjaHMQ1NM6lRXH1FlqNPAYRCjsBHQCtNMrV40a4JxV1aUPlEgW8JwRHnv24Jy7dmCxmIL /wJ5lep5b+CmoQQzO8YAFXvUT9ZW/1gXC/k7vTC2vCbf3zM0IOsdVLBVurxLW3y69kZA70 XlFwyknb3GCA1a063DeR7s4fueE9dSqE6cZmokbyYspM2LUXCG2gUwkWbZ9NFO1yo1TpdM s8PS1eysBapd42FY/tk7Zl7bDuNva1xA2L1UWUMUoBDDiM0whTWHxrH0k6MxtgaraMK7fj pb3n+zc1vNf1iP9CUnTpLv7N7jUEbmA683fY9OxXTIl3BoX9ED0G40KauLuSbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG82w34z41M for ; Sun, 12 Apr 2026 13:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42ef5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 77196f0ad0de - stable/14 - nuageinit: require lfs where it's needed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 77196f0ad0de26235e2b0fc90c8c75203878a9ad Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:16 +0000 Message-Id: <69dba1b0.42ef5.163872a8@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=77196f0ad0de26235e2b0fc90c8c75203878a9ad commit 77196f0ad0de26235e2b0fc90c8c75203878a9ad Author: Kyle Evans AuthorDate: 2025-10-04 13:58:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:40 +0000 nuageinit: require lfs where it's needed nuageinit largely already did this, but one spot was missed -- add the necessary require() in to get the module loaded. (cherry picked from commit bb4167463ac44b47ded4e0223a0abd8381ca6cd8) --- libexec/nuageinit/nuageinit | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index c8a53316f682..f7700f7d8e70 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -6,6 +6,7 @@ -- Copyright(c) 2025 Jesús Daniel Colmenares Oviedo local nuage = require("nuage") +local lfs = require("lfs") local ucl = require("ucl") local yaml = require("lyaml") From nobody Sun Apr 12 13:44:15 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG76p53z6ZM81 for ; Sun, 12 Apr 2026 13:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG72lXSz3krw for ; Sun, 12 Apr 2026 13:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ih73xERlzRstUzryXoSQ7NOcl/Cbbe1OXUHqWuNwyU=; b=CaiNyqxUIu6pEKFQnyk1X/VRtyrCCr0Vm5hmcuJLSMSHiRfZYLZ1Ns7jQBUOEDca+00OKD f5pMZAmNkYoqFrM3i9xsHvtXxZSewJ03ADf6F6dn/fg5rzF9gVUdL1jRm1uQ0FIN1DEItE KC825b5NJwoJd3Hbdk+uLzG7NVR97TSfv+jCXVLrv+gKHJ2YvykCMQAf6wOlmtovO/ry/b 2gEzgAFcsfyaZRU52Uh4OwLZMHRr0Aof84IIa95QV6u+30/PV9QZtZNilPlCTnIPBGXzdq 0AtFr/tSMQtfDDqT7280HXkDOA6douBITfQDNab4bTgqERBB2fvFQ0M1TFD6EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001455; a=rsa-sha256; cv=none; b=XpucG9Y4agy8PFkDZ5elXkGwfqUtJc82BMzhTyKd32fUYAhrshcMyNd644f71l1cKpUFA9 YnvG5vIrkM21uW5SwLKAs3u0K5gX+DtWVakZROIQiXWAhPU08xtgZbSnMaitHfFb2I5fOL s5s/T+eOhS759AJzEy0EsRTfyoa2U6WPWs/VVWbv7eD3QE4YfmANtO+0+ePXhK5wKIG7LF S2w2FCjXJKvC5F5nH99TlFSGO23o6ef28WBfSSXXNUjGgS7vYQVIjre559wCMYxiH/Ii7G JnEgYJS7Uttn2wxHfQ74hyCacFJAOHvrPOe9r+nVtMNhDaMvKT9ByOeIZfQFGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ih73xERlzRstUzryXoSQ7NOcl/Cbbe1OXUHqWuNwyU=; b=EpfDo6WgMQ4XOUTWmVft05t6zJ5QyZ8wXK+8iCc8EeF6tvRj1Kbe9wRlhN0wryPh56uxvn ZRiWWI2eIUoJf5O9ykeQZPN4c7s0TsXK22EFAcmyVr3lhkIhbIsAR2X9xaG7eMkKPOSTuW pV6QtDMh+jS8Ffb1eFj6fVpf1GHFQ5ah9l3QTU7v9ZSW3auGYSL+9fGv/V5QLsNuUPTuRh 4NQwM6iwXNOO1gxoX+IPyQfl7Wl5VhEufcG09TMlSurrmNx1WW+61L+j4glutjvPeExWY1 h8jMoitJGRNLd4OZpx01SF4LWUF2G6MxZmhfd7NgD4DarLRjHKBwQalIp+/Deg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG729CBz4d5 for ; Sun, 12 Apr 2026 13:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42b9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: e1efe20f2a82 - stable/14 - pseudofs: don't leak the unrhdr on error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: e1efe20f2a824a1736ee9aaca9cd0bcd9ace9b20 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:15 +0000 Message-Id: <69dba1af.42b9a.76fe10b@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e1efe20f2a824a1736ee9aaca9cd0bcd9ace9b20 commit e1efe20f2a824a1736ee9aaca9cd0bcd9ace9b20 Author: Kyle Evans AuthorDate: 2025-09-04 02:08:52 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:39 +0000 pseudofs: don't leak the unrhdr on error Reviewed by: des, kib (cherry picked from commit b9746f6185c708ebadc9a8b1e640c1deab52b161) --- sys/fs/pseudofs/pseudofs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index ef45f96a6192..d3aa35379139 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -475,6 +475,7 @@ pfs_init(struct pfs_info *pi, struct vfsconf *vfc) if (error) { pfs_destroy(root); pi->pi_root = NULL; + pfs_fileno_uninit(pi); return (error); } From nobody Sun Apr 12 13:44:17 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG960X5z6ZM85 for ; Sun, 12 Apr 2026 13:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsG945Vrz3l1F for ; Sun, 12 Apr 2026 13:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwE0qWE7/dkyjijpqvoouI62KT2EIcjDHae+SRvu4OQ=; b=STs8760fcQJwEcVsT9hQIfgF0TRUbj5yvXZ0sKFZmUkqZ0Du/UyyDvXQEvfFTvpvPtVAyc BS2JenLPp1L+Njn55g/4/Z5o8KDB77M8SdSIItxrZM25S2dovqG1UePjzJ2Uq9kEMHI1kh X+cxyGjD9h/QZhlTGrqDJgEnngq4hhAPC6gg9KETsAcV0lya/Ere845k3/A8e/diNbFCnd VydC3a5ytu/Lwe7qK6/5DD2RazR3bFYlKYhbHvTsUjgw4ADfunVz2iZQvxkhrB6nxLCA48 g6zV+lbgcNXbgClZdwIDH/lPIdEn+iM63TjJTR8U851nGyz++SfB2iCvkN9fLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001457; a=rsa-sha256; cv=none; b=F3nHuEOm7+2J5eAD9tlovbH/bimsScYYtmbJ6ones7NulcmlR+O22C80rySuhn16zW7Dw3 7ermLuC6Uhra1UgMHuy5GysO2ZwrghHvjHsGDzeUKyAj8RwRJnUXoH0uGEvPbBAMa8qh9Y /JJ6p3BgdLpLegg7DWbUg7olRqUU/Pm6iRyZGkvZzZOP8rJhD2XhHAgcURr+13NomPUF05 ky4pt8XPzHJFaO1Ei5ZjZclLYkywrnSEd8VKcjKdDMoD4dJfzp8bicxwU0FRszLuJX4cCs Qlfys8WTowzv3vm06QKpnAuAugaxh0GYxXibE/0ZiXlxtrvquNHrV+DZX0vnAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwE0qWE7/dkyjijpqvoouI62KT2EIcjDHae+SRvu4OQ=; b=fQQuN/7IH6FVx5K9I0CmfBRmSxSHilgYhcX4NdzRdUp/HRDD7UOh3XmV8N+ZUlMTMGY3Mb FcpjBWXvt3fC83/7wvlDugGuA5UbjX6CmrtmrgWOFehSUcjhpTG5TXv2X8jl00tcYst7Ae KS0OhgcXLELlgbVwHa/yYxMvgYF9ufsd1QSejVAglHPEUtwQwip5JNBrHeS9EK4QTnm9xF Xy3feosyWQNKe3gfSnVB+MO8VThlY0JMy1wW4459hJlUgc8lQQYnENVBvrkXIXFTFD2/2K M0W4ZYUGwoUwtmlF4leHPMExtvQqaX8mkr6BTmA4DShaucN9s9zJPVrKrW+6lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsG93dw1z4fV for ; Sun, 12 Apr 2026 13:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42a9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6422a2448f29 - stable/14 - files.amd64: remove some lines duplicated from files.x86 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 6422a2448f29fa87833ae2b5211e78a7e1f00315 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:17 +0000 Message-Id: <69dba1b1.42a9b.339441@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6422a2448f29fa87833ae2b5211e78a7e1f00315 commit 6422a2448f29fa87833ae2b5211e78a7e1f00315 Author: Kyle Evans AuthorDate: 2025-12-19 22:17:30 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:40 +0000 files.amd64: remove some lines duplicated from files.x86 These were added to files.x86 because they were duplicated in both files.i386 and files.amd64, but they did not end up removed in the latter. Garbage collect them now. Reviewed by: jhibbits Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. (cherry picked from commit a8c594d27779b95f33c856521ec1039fa552d869) --- sys/conf/files.amd64 | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 71a663b79978..5da8c5f898a5 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -377,8 +377,6 @@ dev/syscons/apm/apm_saver.c optional apm_saver apm dev/tpm/tpm20.c optional tpm dev/tpm/tpm_crb.c optional tpm acpi dev/tpm/tpm_tis.c optional tpm acpi -dev/tpm/tpm_acpi.c optional tpm acpi -dev/tpm/tpm_isa.c optional tpm isa dev/p2sb/p2sb.c optional p2sb pci dev/p2sb/lewisburg_gpiocm.c optional lbggpiocm p2sb dev/p2sb/lewisburg_gpio.c optional lbggpio lbggpiocm From nobody Sun Apr 12 13:44:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGC2Qs8z6ZLrr for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGB592Mz3klN for ; Sun, 12 Apr 2026 13:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdEDojffBaI4afOfZQ8RKnduA6UPfrhMrX6yuPb7hkg=; b=dtaS6/f/kcjzrOt+XY7p3oAiWAScKN3bwIxWkDWPe64u9wzI5y13isia3v879/qmGpBim0 ImiHmcaUHeucPakYK1035NLCWqxzz2QI2g3QNVQvb3+azf7Q+aT+3iyYd0mizSnR09eEs8 7lls0ovbqIYoI43hch79kZGRGuA7DM3ndJvp0xH3dgOW/J4GGVeFNaz72Yvw+zpXpCyctj l8hgRx21f48JrP4CtwmHzkHjRo+lDy0HPSdUTdrPi/eVu7h8abqKYACqdLfcocoFCY9FwR Ty/k92CucEVPhTLwxb+IbvUa1d/SczhcmElxcfvJNyBMrk8xUc/Rn4gquA4V7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001458; a=rsa-sha256; cv=none; b=PiKJxswD5Cy7Xd2pLClw65El/hMhMwHkcoSsl6tOLKDqkYLVOpDRIJSUpaSYPGU3N4U6+V r7ftqVIU6FRvyDt9xgOj9gzWGECi7gYkn2+599qCvPc3JljbzEq+14PLAtOZw3kqmU/kDJ uFT0Zu8lA3hOFAJyBzIdWEuBbtgQjaQPMxgAkta5NKIK01PRQ6QEPnEyvgfOBcGsg9p6D5 lUWo9ei1EeaEGAk90jk2mDCFFyuIf4ANW69lm9nLWbqFuIyhEe3+zmeeSYt1NrSmSaxMC+ Rj/ieGPxyN/xC7+0jYlyNpqCISpLXRRsb78rhOT8oWHxvbzLR/+BhsT14caX9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdEDojffBaI4afOfZQ8RKnduA6UPfrhMrX6yuPb7hkg=; b=KkrUZAWM2yzDMfAehyYvrV5oiZGuEQLm9YAOkHkOJaP/Ruf0ZtVPpKRy1QfGUjhIbBghvC Fdse9j6wAQrQEtxXUl8UVBISQH/e9z14zR2oBDZg96jL7Kiial2gGDR1FCNExwCDsrqgv3 79RFUrv90aY89SaHW/RFUFoJA0bED+mBTnUZTYxFNBeDGwldABMOjXuaF5XEOCL47jYkLC cRweiD7GU7KYl5g6b97pRtO2TbhTa0iTwNjnkTWOydzQ3AyIwC1ytlxYfHkFv+PySCePZ1 3LWIyxcuPkXS6eM3SESPLWnxtO2KY0SFoE1dDryoov8Yfwd4U81k6wGJjrj03g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGB4WCpz3jM for ; Sun, 12 Apr 2026 13:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42d7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Kyle Evans Subject: git: 3f4d641f7e69 - stable/14 - vt(4): allow up to _SIG_MAXSIG (128) for VT_SETMODE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 3f4d641f7e6973e6d544c10ac9c0203333b36ecd Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:18 +0000 Message-Id: <69dba1b2.42d7e.5d4a1b76@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3f4d641f7e6973e6d544c10ac9c0203333b36ecd commit 3f4d641f7e6973e6d544c10ac9c0203333b36ecd Author: Quentin Thébault AuthorDate: 2026-01-14 00:14:22 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:41 +0000 vt(4): allow up to _SIG_MAXSIG (128) for VT_SETMODE VT_SETMODE ioctl currently checks the provided signal numbers with its own ISSIGVALID macro that uses NSIG (32) as a maximum, although the code that will actually send the signal in sys/kern/kern_sig.c uses _SIG_VALID which allows up to _SIG_MAXSIG (128). This change aligns the vt code with the kernel internals and enables the use of higher signal numbers so that applications are not limited to SIGUSR1 and SIGUSR2 for vt release and acquire signals. Signed-off-by: Quentin Thébault Reviewed by: emaste, imp, kevans (cherry picked from commit 5e1c7867e1b9a8abe7307d01087cddc057e39859) --- sys/dev/vt/vt.h | 1 - sys/dev/vt/vt_core.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index 8e35a81bc101..4abe99e4ab13 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -81,7 +81,6 @@ #else #define DPRINTF(_l, ...) do {} while (0) #endif -#define ISSIGVALID(sig) ((sig) > 0 && (sig) < NSIG) #define VT_SYSCTL_INT(_name, _default, _descr) \ int vt_##_name = (_default); \ diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 9ca2a547b067..d365187b037f 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -3055,9 +3055,9 @@ skip_thunk: DPRINTF(5, "reset WAIT_ACQ, "); return (0); } else if (mode->mode == VT_PROCESS) { - if (!(ISSIGVALID(mode->relsig) && - ISSIGVALID(mode->acqsig) && - (mode->frsig == 0 || ISSIGVALID(mode->frsig)))) { + if (!(_SIG_VALID(mode->relsig) && + _SIG_VALID(mode->acqsig) && + (mode->frsig == 0 || _SIG_VALID(mode->frsig)))) { DPRINTF(5, "error EINVAL\n"); return (EINVAL); } From nobody Sun Apr 12 13:44:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGC50S0z6ZM87 for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGC1dTPz3l1W for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fT8Cj21+H2nwTjeN6Pu8twaakp4JvqDRVet0THlPb3U=; b=apGKNzp197tfTqOLEFAsEnKz32PXpz/CDDnteZD9JMPGJwOUrxSfXFE3MKhmKVXXoPaj86 CX1qsrfZVK9bKopJm98oImP5ExGJWMFjcJK+1GbUWPV6Fj0YWTXDC5H+tmpy3bsJPZ3RGf gSfIi1DdyKsShdiXF7Tj1zekSq06qNnztNVgBaj1vbj+TmwQGdMRj3ULDGoM5etoQEDjEk wKHDafM7Q7Iw9DIqackPQSj2N9K2fuGOD50Lfls5AeTixDXHuX7xHlgAPLKCRmxH/bb05H 0LiB4H8PgUmjI8Q+jaRlLTaDbfYCh8GqpspXo7wmP/v2sPx+2YGHKaSFvCHViQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001459; a=rsa-sha256; cv=none; b=gM5UUeuRFmSfPr/x71uhSezs+8+ZMRRz+7we8eLYtCYsVTiJMN8RZxm2zlapvDo+tyFLv6 N9BxW9gTkzpQs56XelQBfrVFqRBtqygfYH5TTrnJEDvWODCXfWNFP0+qFlNt6XHIqLHzRa P+wFl9boVToTAJC4VH8X57YQus9v2AJPoeKevjnhJw1nvFCTqZVftZ1WqcDoHXqaglaBrV ZyRbcwTLRiu/rHaboYQ3glZdJjAZp6JmTdbaPCSiPdCddz6MxkIZmRMOCRZj+FtetiwSNG 0Q7X2C00vP18WbRfrIap+hPwQTCGSow52dsdYay+Fmdh4cJWcoONr6S9iSpp3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fT8Cj21+H2nwTjeN6Pu8twaakp4JvqDRVet0THlPb3U=; b=VCXOOsfJcnYDQQZIFraSSMkYzCuxx/RWrSoiTA3Ks1O3M6Y2q5B0nkzVtLuAfAYmHJ5OY2 7TIttgPEO9PuVgzW1tFC8RVss6ZAdR529Nk7cG3VX3xIfr4zHGx7R1hCJG8YcsSBjFkJCa rbE3PGtkPAf9BZGr4MjSMjRPcqW2ZxCUUEmS+8vDh7vvxoK/2DlJ5hnu7qSbdJA6UDVxxF 7qf54DtjXpeChZiyJgVIaVMSKTRbl4wnL1ubuak80HQ5GlLRy5yRJ2zCI1Ry9TrSStmNRA MIsvh/baBzI/e0WC4JplT1B+zrGs0NL9drWcSPAk+xsf9hmnS3rndRNgy1WV2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGC1CpHz4TP for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42f53 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 675ea9d1d6a5 - stable/14 - vfs: handle vfs_init() 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: 675ea9d1d6a5ca8d224f5fdb2d01ef3fee8e6325 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:14 +0000 Message-Id: <69dba1ae.42f53.3afd904e@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=675ea9d1d6a5ca8d224f5fdb2d01ef3fee8e6325 commit 675ea9d1d6a5ca8d224f5fdb2d01ef3fee8e6325 Author: Kyle Evans AuthorDate: 2025-09-04 02:08:51 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:39 +0000 vfs: handle vfs_init() failures Most vfs_init implementations will not fail, with the notable current exception that tmpfs_subr_init() can fail to allocate a new swap pager type, in which case we probably do not want to proceed and keep it registered. linsysfs was a potential consumer, but we opted to go a different direction and move pseudofs init/deinit over to first mount and last mount instead. Reviewed by: fuz, kib (cherry picked from commit 6d33507ff9b877f52516df00b012715b55d4e14f) --- sys/kern/vfs_init.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index e516d929d9d0..880a8780c367 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -404,7 +404,7 @@ vfs_register(struct vfsconf *vfc) static int once; struct vfsconf *tvfc; uint32_t hashval; - int secondpass; + int error, prevmaxconf, secondpass; if (!once) { vattr_null(&va_null); @@ -422,6 +422,7 @@ vfs_register(struct vfsconf *vfc) return (EEXIST); } + prevmaxconf = maxvfsconf; if (vfs_typenumhash != 0) { /* * Calculate a hash on vfc_name to use for vfc_typenum. Unless @@ -514,16 +515,24 @@ vfs_register(struct vfsconf *vfc) vfc->vfc_vfsops = &vfsops_sigdefer; } - if (vfc->vfc_flags & VFCF_JAIL) - prison_add_vfs(vfc); - /* * Call init function for this VFS... */ if ((vfc->vfc_flags & VFCF_SBDRY) != 0) - vfc->vfc_vfsops_sd->vfs_init(vfc); + error = vfc->vfc_vfsops_sd->vfs_init(vfc); else - vfc->vfc_vfsops->vfs_init(vfc); + error = vfc->vfc_vfsops->vfs_init(vfc); + + if (error != 0) { + maxvfsconf = prevmaxconf; + TAILQ_REMOVE(&vfsconf, vfc, vfc_list); + vfsconf_unlock(); + return (error); + } + + if ((vfc->vfc_flags & VFCF_JAIL) != 0) + prison_add_vfs(vfc); + vfsconf_unlock(); /* From nobody Sun Apr 12 13:44:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGD1K1vz6ZMDq for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGC5sxbz3kyT for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylFVjQDAuaSUhdd8wJW8RVA3vGLlBHho+qptVhy9wWU=; b=waEXMaqkx5UMNA3904RBt3BFRgV4JkO7X+IpH5vVQxpNWZKaKkO4+6ej6Qc8EBiOS3Fwe3 HxFQLd/bWAP2jdgCdnh++CqOH6mYnzqgVf8LKF4lT00DqE/9++Zu5xp1GtgeoQ8xSbagiZ 5TtOIBx2sIcvGh6xx7Ni+aj5PggOExPdTPsdE1SATwUCrzt8KbgqMzedAuybm5tcRyka3M zdFGOLN+ZU4b9U7KPfoI4ks48JxZqF/ojTVbY+20HrqBPu9TGAqX1Z9kWO/DiUlJTaGece B+mTVsqN9dD2D+DDRmWUZFZciwUwLfdxxkyTj4TOsJ76SfpetESs5lfsooyjNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001459; a=rsa-sha256; cv=none; b=vCN4dZmMlAffBMAaORYyCFYTNIyySnchPQQ/oTmk9IutV1em1o6cYDT3zSmKTNw6qckTRw F/vHddPDS2JAbF9Fydxw0wNDAALFFP736mSfE2qZTqnJi+0/7tQrYfVh7FSe5L24iBlsoE 3cqXoXdKgVXbTJd+YP7yXSnBxM8UnNmDgZsaITOoboTqZTYeMZwHGyHT0JHIBAe+2wAdV5 JW3t3X9U7sDzJn/g9rBpK4mfJ3zqb/actZ3Nrr2yhAi23jtApNXUd8gP7IkZgzyUbouIvA /tHe1j/TQni2k4XoHVMBDSe7zhPdncL5u6lNa3RTHUUzGKbaLK024FCL3Zwd1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylFVjQDAuaSUhdd8wJW8RVA3vGLlBHho+qptVhy9wWU=; b=XeNHIcvaSKR+teundfYwpNsiJg+TfNr6cUWHaWez+7sGJ1j50BZif5gLhjzqRTtrkdnVMk Ns7cXQlJJbfawYmlFjeaeHFW4YURmJoyDwNVcS+25+CMX2H9FAduiynZVkN3E8/uwxc4Iz s0VbhdKF2zsfWMYLKgsHQEraSSSNpeUHIzm/dI3vYmd/w6QXVFNRrcsZNc66A+VWfyzylA bUvLG2CP7iaa1KEeOhiD0suZiciYOoVGHdBCqO8kYhEOQfk1/3JykqJDnQglaizfeJsRR5 6VCyGaNMfQfLwxuF4QRsEmRcaTinA795Fgitl5lJvjQ+u3qIcmSSDAX78hDseg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGC5G4pz41N for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43291 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 605fd428297c - stable/14 - truncate: fix a minor nit + add a hole-punching 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 605fd428297c464ccb4081af02efdffc6f9a453b Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:19 +0000 Message-Id: <69dba1b3.43291.16bf4eb9@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=605fd428297c464ccb4081af02efdffc6f9a453b commit 605fd428297c464ccb4081af02efdffc6f9a453b Author: Kyle Evans AuthorDate: 2026-01-21 23:34:27 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:41 +0000 truncate: fix a minor nit + add a hole-punching test The struct spacectl_range we use is only really used in these three lines of code, so re-scope it down to just the dealloc branch. This is marginally easier to reason about what might be necessary to replace in porting our truncate(1) to other platforms. While we're here, add a test for the -d flag to be sure it really does punch a hole in the file. The test also tries to confirm that it does not disturb other segments of the file in the process, just to inspire some confidence that it's not corrupting the file somehow. Sponsored by: Klara, Inc. Reviewed by: markj (cherry picked from commit eacc501eff52db16b7b784c89a3a4a03c9a3ef34) --- usr.bin/truncate/tests/truncate_test.sh | 48 +++++++++++++++++++++++++++++++++ usr.bin/truncate/truncate.c | 3 ++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/usr.bin/truncate/tests/truncate_test.sh b/usr.bin/truncate/tests/truncate_test.sh index ec219059de42..845b3e1b4d84 100644 --- a/usr.bin/truncate/tests/truncate_test.sh +++ b/usr.bin/truncate/tests/truncate_test.sh @@ -438,6 +438,53 @@ rounddown_zero_body() [ ${st_size} -eq 0 ] || atf_fail "new file should now be 0 bytes" } +atf_test_case deallocate +deallocate_head() +{ + atf_set "descr" "Verifies that -d punches a hole in the file" + atf_set "require.user" "root" +} +deallocate_body() +{ + blocksz=$(stat -h . | cut -f1 -d' ') + atf_check test -n "$blocksz" + + # We use /dev/random here to defeat ZFS compression, which would + # collapse ranges of zeroes into holes without us deallocating it. This + # isn't a concern below because those are specificially for creating our + # reference files -- we expect the deallocate operation to result in + # ranges of zeroes, whether they end up creating a hole or not. + filesz=$((blocksz * 3)) + atf_check -e not-empty dd if=/dev/random of=sparse \ + bs=${filesz} count=1 conv=notrunc + + atf_check cp sparse sparse.orig + atf_check cp sparse sparse.orig.orig + + # Punch a hole in the middle, ensure that bit is zeroed out. + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=1 count=1 conv=notrunc + atf_check truncate -d -o ${blocksz} -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig + + # Clobber the end part of the original file and punch a hole in + # the same spot on the new file, ensure that it has zeroed out that + # portion. + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=2 count=1 conv=notrunc + atf_check truncate -d -o $((blocksz * 2)) -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig + + # Now bring the original file back and make sure that punching a hole + # in data at the beginning doesn't disturb the data at the end. + atf_check cp sparse.orig.orig sparse.orig + atf_check cp sparse.orig.orig sparse + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=0 count=1 conv=notrunc + atf_check truncate -d -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig +} + atf_init_test_cases() { atf_add_test_case illegal_option @@ -459,4 +506,5 @@ atf_init_test_cases() atf_add_test_case roundup atf_add_test_case rounddown atf_add_test_case rounddown_zero + atf_add_test_case deallocate } diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c index d8484257294a..15be339df0e3 100644 --- a/usr.bin/truncate/truncate.c +++ b/usr.bin/truncate/truncate.c @@ -62,7 +62,6 @@ main(int argc, char **argv) int do_refer; int got_size; char *fname, *rname; - struct spacectl_range sr; fd = -1; rsize = tsize = sz = off = 0; @@ -198,6 +197,8 @@ main(int argc, char **argv) tsize = 0; if (do_dealloc == 1) { + struct spacectl_range sr; + sr.r_offset = off; sr.r_len = len; r = fspacectl(fd, SPACECTL_DEALLOC, &sr, 0, &sr); From nobody Sun Apr 12 13:44:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGF2lyQz6ZMHJ for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGD6VnXz3l6S for ; Sun, 12 Apr 2026 13:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odCDC46RP51IlO4RYefq3am/UPDx2z3iwUfQSbE2SuU=; b=aqiGWvVQL859+P7Z1IFs+G7l/Dertfi3QpK5JOOkcrUzPjsWL1p1BkRvTQkLu0htKG1KOL Ga9lmA/pGa5UAWOR5Y+mAjKJJg14quSZsl0dMvkJ2KcQuBEuvOENEn75/+uACHXxxesyoe uU8d4hCPPlgDWI1I4qmduFBFxy0YFAw4WEfQqI5QtXLJN7tzO/2VlrRHk8HOQFWH1uV8dJ fY6MvLVPQL7rrlF3kAarHt+xJjZszC9BQp/A2pERhTqKoTv8OGVilWwozNeOxWwVHa1U3R 5U34qFfkrcbpg6hyCGoDCyvz3d7JQ9lAYA1AuvOoboylvv72C+0W6mWNIqfxlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001461; a=rsa-sha256; cv=none; b=ggOM+C8goD8P27/v4aYbuDzKb1Xxfy16DHquxF12DTRu32NIwRsLvTaVooJN2rTv5+kZiQ zHpP2H2rZVgxww8cNB6+2TCZ1sS19P/XHHvF1Mem/QJ73nuuP9GO9qSUTWDp+gv4xf/+DC jIiDB0ZLSieGjJaPtU7ti/kEV02kWfGV30ZViGxgwAGg7UWhMfvaoMkK0PBSZYLin8ZiL2 pAMs9+FOpCcaj8LOQgIF4sQDcqsMekpw1sSPP8hYqB3ieBSq1i7CrvLZkIczYID4pMHxSt aEqde3Dby6cdU3RJB4U3JfJAgJu1HtpuOZ2k6XtaJA2rVp/nqvEt77lSPobMHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odCDC46RP51IlO4RYefq3am/UPDx2z3iwUfQSbE2SuU=; b=fpdzabeMbSWk9juL8PPQzmJ/mtuOd8IoSgKz51Cc4MKiNO+uSSR5amIc34td6DyE61ECAk EkD87NMnBwOy52yw2bpPbb2jr8V4TDWWcnksUwQBdQYZ29v9Nzzf1iduL+2GlE5h8hJds5 m9Hrfp1eyqSrVAP9S0g+0UmKWv8G2hXW8nOdePLfkt94cqX1Ia5QM5vaSFrD1zgnPc4FWR lZmW4drraRNPE0r1mQAgmuMiOazYyvOnQvFeM7vYFSsSGCPmPIs2Tix8dSKd3botDRDni3 iVKR+49u9SBYkq46tDwtMoz7WqAra55KuXyXLI/Crt4asLF4Tn0tWFmVjO8nXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGD639Kz4Nf for ; Sun, 12 Apr 2026 13:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 423cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Kyle Evans Subject: git: 874d779aa7dd - stable/14 - firmware: Fix inverted FIRMWARE_GET_NOWARN logic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 874d779aa7ddc8216b06e58ff955adf2a54a17d5 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:20 +0000 Message-Id: <69dba1b4.423cd.77de3348@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=874d779aa7ddc8216b06e58ff955adf2a54a17d5 commit 874d779aa7ddc8216b06e58ff955adf2a54a17d5 Author: Abdelkader Boudih AuthorDate: 2026-01-30 00:02:47 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:42 +0000 firmware: Fix inverted FIRMWARE_GET_NOWARN logic The try_binary_file() function has inverted logic for the FIRMWARE_GET_NOWARN flag. When the flag is set (meaning "don't warn"), the code sets warn=true and makes noise anyway. Invert the assignment to warn to correctly suppress warnings when FIRMWARE_GET_NOWARN is set. Reviewed by: kevans (cherry picked from commit fdcd67be8274d237ae2c87d6475d9d34b440b8d8) --- sys/kern/subr_firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_firmware.c b/sys/kern/subr_firmware.c index e8f9493decc0..a315209a04cf 100644 --- a/sys/kern/subr_firmware.c +++ b/sys/kern/subr_firmware.c @@ -282,7 +282,7 @@ try_binary_file(const char *imagename, uint32_t flags) int oflags; size_t resid; int error; - bool warn = flags & FIRMWARE_GET_NOWARN; + bool warn = (flags & FIRMWARE_GET_NOWARN) == 0; /* * XXX TODO: Loop over some path instead of a single element path. From nobody Sun Apr 12 13:44:21 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGG2jFTz6ZMHK for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGG0CbSz3l26 for ; Sun, 12 Apr 2026 13:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vLp+oa/Vd4sXp3B9yop83mk1d5LjqaI2b1cChLyfGXo=; b=kmNBavwzHwX22qfJavYTPMQr4/yIJZhiSDYaBePahs1p3JpGBrOzs+81wI7KkPoBH4V1EH utN5RHZqMIs9u0IWXHEsuKurGhBXmETCa+2ooHveSydwkfExLXUaGBhO6QIWsvQwkXuC7L LWF0W6cWaz85VnN0oI6QkGr83Nfc5LftPf1HHMQnVd+O1e6G4Fsf0qmRNpuDjzV6XbJ9kI jHUNJ3K4lLXWJ8xDmu7J0LrbYv37WJr7+8VrnmNHoOPG43oiJbEnIfPeuZLn8b0To5DRdA hFQERcuWLeIii56D1h0G1yxsgx0xOZ1+7eAViUslmYWFc2nZ35Hlr/ZlwAaXRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001462; a=rsa-sha256; cv=none; b=Togpd/umMKAUdyNB4SoqYd3kP+fN6dKKVDeDrIQ8pUec7ShYB3xpOFtFThKPyqkvgLi0Lp C1+sGCqc9qz3smuTpmfoBbtYqITbT5tLkVFKRE98LKIwZ6a6eg9I8zYJF8u4iFOSUtfdnp HEr16qAW9L4dw+Zp7sQP84lCiG+en0D1i9TLBGCoaxnwIFgXiBXmgWMabE7/taelk+kW7P bWWWGGs3SLk8I1NJUJGwBo2G1lRV4Y8s+a+jhAw8PTwtghRIkSNw0cPsee1N3nbSnVPhXd I58VfefR12jvdHDe3POSWbBAcdIfXhsG1SaLQ7ABnCtVl56PtbM9Q5pps9/jAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vLp+oa/Vd4sXp3B9yop83mk1d5LjqaI2b1cChLyfGXo=; b=SGrap/grimlC0PMGkzYQCzvL017TaC+ehTLujTxqT4vi5LkN65B5OjWznH/fQrBjfjq9NO 9yAuzYDOpnT3Rmou5FkhAQ5B4mu0ndJ4Bn3dhDOp4NGl7SNw1s5Tc9MdUZSZX0mYTi+ab7 V4/5Bol6mvF43kwvf1uJe4uVEBLT7oaRndugGkRB8bMOq/nCdGPViprwaHFBSAL/vogxg6 EgT/utUTWTr9v1zYb3gSfcXhC30E61ff55FkraRHhepFAJ+7roXt8Vws6dQuzBU3yQw0qD 5V0uxKVZQypThj5KUGd9vRmshGzfTLvihp+KSLHhGremA7c8LJfOmKK1TWsx2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGF6XC6z4d6 for ; Sun, 12 Apr 2026 13:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4225a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b39cac4b834c - stable/14 - rc: run the zfs rc script before tmp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b39cac4b834cee6ab76ebab8ad180a99b1249970 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:21 +0000 Message-Id: <69dba1b5.4225a.3579676a@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b39cac4b834cee6ab76ebab8ad180a99b1249970 commit b39cac4b834cee6ab76ebab8ad180a99b1249970 Author: Kyle Evans AuthorDate: 2026-02-03 03:21:42 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:42 +0000 rc: run the zfs rc script before tmp The tmp rc script has much the same problem that the var does: it wants to test if /tmp is writable, and mount a tmpfs if it's not. This means that we actually want our zfs datasets mounted first, because we might have a /tmp dataset that changes the story. The ordering problem is particularly noticable with a r/o zfs root, since the write test will fail and we'll mount a tmpfs that later gets covered by our /tmp dataset. If that /tmp dataset inherited readonly, then we're still in trouble. This also fixes `tmpmfs=yes`, which would again get covered by a zfs dataset with the existing ordering. Reviewed by: des (cherry picked from commit d3f21856aa72c28408660ed40ce76bbd0716a991) --- libexec/rc/rc.d/zfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/zfs b/libexec/rc/rc.d/zfs index 1e887c67f804..95a5b4774a20 100755 --- a/libexec/rc/rc.d/zfs +++ b/libexec/rc/rc.d/zfs @@ -4,7 +4,7 @@ # PROVIDE: zfs # REQUIRE: zfsbe -# BEFORE: FILESYSTEMS var +# BEFORE: FILESYSTEMS tmp var . /etc/rc.subr From nobody Sun Apr 12 13:44:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGH3LX0z6ZMBl for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGH0fjCz3kqY for ; Sun, 12 Apr 2026 13:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BB02XzngzySR4OorxDDUUFfwJhRKqIA4R6L7goFgtHo=; b=KdWiHrqo7sfP7Qdk2HGFLeh3z/pOvpKuBp5yCyCjIM+42jsUQFF/qULfUzvxsVh1ZDwIq+ 27G2okx7FsQHU9ZFPGdpxcqJY9rWR8Qr0MCYw3zBFxL2NSQuWkV3xm/OHYSF0xmw3bN3UC 79nQXx+Mc5CjklC+QpnWDD4XOFdHvgE1/va+LTks34IrAqxe+i0hrpZ1yB0XMhqKRkZbX2 rniaZZ02ANDyxS6yEbqRAyFY/VrPt2tUh4M1qY8S7FhivH/AxOOsIaW9F1y+uyrcqnNFLQ tW/pKjlo7gPHwHmgIRjb3t5RumVzqJcG8fu+ciQKHrnuN4UA666yQtwfXoIpCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001463; a=rsa-sha256; cv=none; b=t3WhQ/jtBlFvYaljIFwk9kZymAQPXu4+/TxGr7wxTLpfrWURbKFx27LgCIoUJ4608ikIkn ZPIN6JErdrtYk6FoAoa+e/KTWoD4d5RMupN9DzMhM3B/NW4BDlVhsJYlDCg3sqsefmBZA8 hMCzRnLyKdN6qE/ezu5ON4BDrZciGPqwkBX6yX5/uXEyn1rQeFTWNvtUZ3CJR6Wcl5PeeZ Sn0v0O2WMeL+9kBXOhkUXt6kDiMbnlgUY17Y3N/eYESNEdWmXw7vSG0x0nFFA2yAjXZufO MYdTeJshZbf3gF8BjF9nmWOUDobVL14H3pkTwmoyFlYo0mbFmuROZ1/vDSjVOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BB02XzngzySR4OorxDDUUFfwJhRKqIA4R6L7goFgtHo=; b=ovLylOHJOIhPq79XsdXWC1MIVfOlyPcwCVe0WbgwQCO09B2p+Vtut7tx9kJUByV+zIrcgE Dztk8FD6KtH7XeJk6Z7wR2RboXhii1etzx1BgGG3mwm+kVSWx81vDSb+ILrQKx5ImI6hRL iEd0szLX3qeeSyeYpboYd3p1Z9+qrNV4ziHrJATsNOM0qvqXHoYVABtsvHTWH4gw9aDWTg 1Fm1zrtQh/s/o1C+qavCTITmMQuFdFbeB6UhxUIKHDqpAm0DfJUAgYPvGBF0Ja52NtQb1A ll8Qvf0ylGb5JqDByHik8o/8T7er4pqAHDvg/vKZHS33znVd/DNyWmwL8fkG/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGH0D18z48n for ; Sun, 12 Apr 2026 13:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43492 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Kyle Evans Subject: git: 05b84d640274 - stable/14 - uart: fix sleeping while holding mutex in uart_tty_detach() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 05b84d64027451b298c56025eed11bf047be234d Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:23 +0000 Message-Id: <69dba1b7.43492.4e082988@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=05b84d64027451b298c56025eed11bf047be234d commit 05b84d64027451b298c56025eed11bf047be234d Author: Abdelkader Boudih AuthorDate: 2026-02-03 03:21:43 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:43 +0000 uart: fix sleeping while holding mutex in uart_tty_detach() Move swi_remove() call before acquiring the tty lock. swi_remove() calls intr_event_remove_handler() which may sleep via msleep(), causing a lock order violation when called with the tty mutex held. The software interrupt handler removal operates on the interrupt event structure independently and does not require the tty lock. This matches the pattern used in other drivers such as tcp_hpts.c where swi_remove() is called without holding other locks. Reviewed by: imp, kevans (cherry picked from commit ed3a2469a71e0ef48cf8e636c35e64a011756da3) --- sys/dev/uart/uart_tty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c index 736c756322a4..5a86c7325429 100644 --- a/sys/dev/uart/uart_tty.c +++ b/sys/dev/uart/uart_tty.c @@ -448,8 +448,9 @@ uart_tty_detach(struct uart_softc *sc) tp = sc->sc_u.u_tty.tp; - tty_lock(tp); swi_remove(sc->sc_softih); + + tty_lock(tp); tty_rel_gone(tp); return (0); From nobody Sun Apr 12 13:44:24 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGJ52GZz6ZM6K for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGJ1CnWz3l6x for ; Sun, 12 Apr 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WHzv27Jg7SYU0NlTxJbrEGWYez+ZsPBc+RMOmdWJl8=; b=wXlMas9gj64gO/45REb17qCGrCk9wC9J/8kpyJpe2kcaBmFivuPfp5PF/Gb/ruguvgeuuJ wTEPRB6KVdUHNyO7fiiV4X/TupdG9CKWgauk1eSeTbLe7zgcH4JX2BzhN0QzEj9nGg8Vgf hLDgqPUBTdknhzqnjgEQ+A9J3BTxGQbVIu+RtxOgKO8WBu2cdoOrD2VA+KIG//uvFY0Fpp Jxyn5Bu9bhPbhW/xwkxsbKEJvo5odinU6pgCg1J8blUkeBnbayXm3tGUrDGhuPz4+XywcX aNkNJC+YCh+4M7a00l+hyZESO7uOW5jg/B8sR8H7xgmoUa/0Z12jUnf4ZzNAuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001464; a=rsa-sha256; cv=none; b=kozuTQhS9dFlLjzsYwXuZilEKa87U64cifdzUIKVAtY9fqi+TSUbClFlxjxhoIg+07yPs/ g5duue7xXRY3+64Y+RQeoHaHTtNw5ELGrvtxugdf0L3uW7IwbK0AzxsG9tQpWCSjM5sBUM zWs4aNIrT1T0V7tRAI4kZaSwavgthkZOm10gxZUmmQi4xJ0SKLJmDxm6130jQuuiBltj/H F++I9vniw+fawdDeqJufI/qQMsGMF7icET+pUTWho8FXdAjz+bIcqCsTq6B1wBlStKCLwA 8mn2iFUQQQNE/7rw0v4htjItDGq0GuW4L3MEVjzMKo7ts9jynRRP8n2r9lXp9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WHzv27Jg7SYU0NlTxJbrEGWYez+ZsPBc+RMOmdWJl8=; b=GzGHoWujfmH8+9Mih28ngtV/0hdD55RmbV88032fjX4/4RoczV+T+0wa3DG5Ph1DgBhcFg FCZ84HtvOzONhV0TBthYqhOp8q3ZmtG5+aNtSY0UQKGBCmiOxhB6fia6GNrtQbeeheeFaN aGxlulvGvLSbU7wC+THhtYVm2eNsaMUdsoctmRcvUIx4wHdVTjxxMnvtgNcppiRTRGhE6e rovGgqSTUiOEa5b9YEjjYfrJAW/eALnI1ADlNAzNma8/zYk8eDq2WfvDrN+LYEpDfIGi23 N+BllS3FTK6KIOkx6HwWMI3n70MRdzLgr7pgcluriGtfeywlNNaf84q3nE/q/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGJ0q4rz4d8 for ; Sun, 12 Apr 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42ef9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Kyle Evans Subject: git: 4f4669db7040 - stable/14 - OptionalObsoleteFiles: Add etc/zfs/compatibility.d List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 4f4669db7040df5d682e2b08ffa9f3f8c8d36a0c Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:24 +0000 Message-Id: <69dba1b8.42ef9.a98fffd@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4f4669db7040df5d682e2b08ffa9f3f8c8d36a0c commit 4f4669db7040df5d682e2b08ffa9f3f8c8d36a0c Author: Artem Bunichev AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:43 +0000 OptionalObsoleteFiles: Add etc/zfs/compatibility.d If the world is built and installed with WITHOUT_ZFS, then make -DBATCH_DELETE_OLD_FILES delete-old-dirs will give the error: > rmdir: /etc/zfs: Directory not empty because /etc/zfs/compatibility.d is still there. While we're here, clean out /usr/share/zfs as well. Co-authored-by: kevans (cherry picked from commit 5c9d988d865cc4ce849507173c0a2e2f399d0f62) --- tools/build/mk/OptionalObsoleteFiles.inc | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 0e4f08da2284..7764dfea7f35 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -9273,6 +9273,7 @@ OLD_FILES+=etc/rc.d/zvol OLD_FILES+=etc/devd/zfs.conf OLD_FILES+=etc/periodic/daily/404.status-zfs OLD_FILES+=etc/periodic/daily/800.scrub-zfs +OLD_DIRS+=etc/zfs/compatibility.d OLD_FILES+=etc/zfs/exports OLD_DIRS+=etc/zfs OLD_LIBS+=lib/libavl.so.2 @@ -9368,6 +9369,63 @@ OLD_FILES+=usr/share/man/man8/zfsbootcfg.8.gz OLD_FILES+=usr/share/man/man8/zfsd.8.gz OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz +OLD_FILES+=usr/share/zfs/compatibility.d/2018 +OLD_FILES+=usr/share/zfs/compatibility.d/2019 +OLD_FILES+=usr/share/zfs/compatibility.d/2020 +OLD_FILES+=usr/share/zfs/compatibility.d/2021 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2018 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2019 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2020 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2021 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.4 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.4 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-9.10.2 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2-2.06 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2-2.12 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.0-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.0-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.1-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.1-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.7.0 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.8.1 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.9.3 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.9.4 +OLD_FILES+=usr/share/zfs/compatibility.d/truenas-12.0 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-18.04 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-20.04 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-22.04 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.1 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.4 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.5 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.7 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.8 +OLD_DIRS+=usr/share/zfs/compatibility.d +OLD_DIRS+=usr/share/zfs .endif .if ${MK_ZONEINFO} == no From nobody Sun Apr 12 13:44:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGK6LLBz6ZMF7 for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGK206Gz3l2k for ; Sun, 12 Apr 2026 13:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vAOrDxfMeLD0ZTPnj3hEGIQ3iYAM+foPMMY/afci2bc=; b=ffvr3279N44pbVT/uVFKIgEDvd5eueHzB/XAmTSqLCpISC1IhcbTyvWu54rSsv/Z7G966y YO1fmLW/3BG87vZxptSy4JEBt6m3NYF/105mphFpkpIJw7RkbNtk9fzDPNwI+UOgHbj3yM B5KDbNtfMP0lB+8dHAYU4vL2WI5Ol7ZpCF+cFIRNXzuq6ilrSPRRVVSdIZMhgLxd0zFk/m EZLoRn7yxznKQHT8JhrFhcQ2bWChQSMCCN1Njvzw94xqjmfjYJKc5MiQjmMpXF/kvtIDQS z1IY2VpSr/ux+gPK6ekuubK1GF3e+MGdc17reo8D+HUSzWGY9GaV3m0js8bosw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001465; a=rsa-sha256; cv=none; b=IU7tA+XTSYYLo3hlJQMMZgz5zEZts+APyvN+72rcYwWac/O2JmZ5+KRf1ImzYCVlpYR7n7 YNWu8D0TWfOZSb1YHIjozJWIwZVMOHOr8ilguKx3kYNCFRnvrwFE8/3Rr4fc+Hb1XHCENf hG4RRCAKh/Lk9AgcNopJDrHvOPFZAJyWu8iB6uXVOgQHaUmS2aCE5iB6JGUnwdW2/TubnF WNLrLtOkxcuMYZSPqT447xlFHBYqVpk6D0ScgAPMbJis6FHrLUdxj/RnhjQXbGEqgmsFYX qey+TJaibOij03wVIN2SYT7DXAGQ+x0rpXvb46g1nkJkP1vG9lMLiTBy3bkJ/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vAOrDxfMeLD0ZTPnj3hEGIQ3iYAM+foPMMY/afci2bc=; b=yon4U3mxDIMWpBZQ3SRsqyOo48CdT5u7zIAsxQ7svMPRJqb3vNWxqgcIEe3uniUgbEO55Q /GybMOMjSjTmIKtfyw8rAY/JOL/NNy7g+GBqGM95TdjANiVX9tCSul+WK/RSHIpKStoHg7 8gcWJ7yqu8/FK3eyl0PTU0tgl8F8cWGGT4mXGMO3tRl4r3YQMy8k4yt6Zn4ckAzZ9IixS1 N7n1RKew5rltkAJBRcRQiD8U5DvytpR6UGfyAIsSR4ZWApiVE+cogW9LHFJVWfrauzpwkO 3FcpvU6EQGlHK5Zmdr2x1kANikaS30fGPUQaeVvizF4gdfb1gxvbPU/Xc7phTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGK1Kgrz4CG for ; Sun, 12 Apr 2026 13:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f329d69b9176 - stable/14 - tpm20: fix suspend/resume and entropy harvesting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: f329d69b9176a1d407276a010c2b87a07a2bbc5d Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:25 +0000 Message-Id: <69dba1b9.42c88.144f4714@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f329d69b9176a1d407276a010c2b87a07a2bbc5d commit f329d69b9176a1d407276a010c2b87a07a2bbc5d Author: Kyle Evans AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:44 +0000 tpm20: fix suspend/resume and entropy harvesting There were a few problem here: - TPM2_Shutdown results in a response that we need to either process or ignore, otherwise any tpm20_write or tpm20_harvest call will trivially hang on an `sc->pending_data_length != 0` - We should have a matching TPM2_Startup upon resume to restore any state that should have persisted - We must drain the harvest task before we suspend to avoid problems there This commit is sufficient to avoid breaking suspend/resume. Co-authored-by: markj Tested by: garga (cherry picked from commit 38a4995eb52db21116f8b37ed942e66a8c2f050f) --- sys/dev/tpm/tpm20.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/tpm/tpm20.h | 1 + sys/dev/tpm/tpm_crb.c | 1 + sys/dev/tpm/tpm_tis.c | 1 + 4 files changed, 66 insertions(+) diff --git a/sys/dev/tpm/tpm20.c b/sys/dev/tpm/tpm20.c index 393552172656..f2c63b9f0e93 100644 --- a/sys/dev/tpm/tpm20.c +++ b/sys/dev/tpm/tpm20.c @@ -45,6 +45,7 @@ static void tpm20_discard_buffer(void *arg); #ifdef TPM_HARVEST static void tpm20_harvest(void *arg, int unused); #endif +static int tpm20_restart(device_t dev, bool clear); static int tpm20_save_state(device_t dev, bool suspend); static d_open_t tpm20_open; @@ -232,9 +233,31 @@ tpm20_release(struct tpm_sc *sc) destroy_dev(sc->sc_cdev); } +int +tpm20_resume(device_t dev) +{ + + tpm20_restart(dev, false); + +#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM + struct tpm_sc *sc; + + sc = device_get_softc(dev); + taskqueue_enqueue_timeout(taskqueue_thread, &sc->harvest_task, + hz * TPM_HARVEST_INTERVAL); +#endif + return (0); +} + int tpm20_suspend(device_t dev) { +#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM + struct tpm_sc *sc; + + sc = device_get_softc(dev); + taskqueue_drain_timeout(taskqueue_thread, &sc->harvest_task); +#endif return (tpm20_save_state(dev, true)); } @@ -296,6 +319,42 @@ tpm20_harvest(void *arg, int unused) } #endif /* TPM_HARVEST */ +static int +tpm20_restart(device_t dev, bool clear) +{ + struct tpm_sc *sc; + uint8_t startup_cmd[] = { + 0x80, 0x01, /* TPM_ST_NO_SESSIONS tag*/ + 0x00, 0x00, 0x00, 0x0C, /* cmd length */ + 0x00, 0x00, 0x01, 0x44, /* cmd TPM_CC_Startup */ + 0x00, 0x01 /* TPM_SU_STATE */ + }; + + sc = device_get_softc(dev); + + /* + * Inform the TPM whether we are resetting or resuming. + */ + if (clear) + startup_cmd[11] = 0; /* TPM_SU_CLEAR */ + + if (sc == NULL || sc->buf == NULL) + return (0); + + sx_xlock(&sc->dev_lock); + + MPASS(sc->pending_data_length == 0); + memcpy(sc->buf, startup_cmd, sizeof(startup_cmd)); + + /* XXX Ignoring both sc->transmit() return and tpm's response */ + sc->transmit(sc, sizeof(startup_cmd)); + sc->pending_data_length = 0; + + sx_xunlock(&sc->dev_lock); + + return (0); +} + static int tpm20_save_state(device_t dev, bool suspend) { @@ -320,8 +379,12 @@ tpm20_save_state(device_t dev, bool suspend) sx_xlock(&sc->dev_lock); + MPASS(sc->pending_data_length == 0); memcpy(sc->buf, save_cmd, sizeof(save_cmd)); + + /* XXX Ignoring both sc->transmit return and tpm's response */ sc->transmit(sc, sizeof(save_cmd)); + sc->pending_data_length = 0; sx_xunlock(&sc->dev_lock); diff --git a/sys/dev/tpm/tpm20.h b/sys/dev/tpm/tpm20.h index 14f89de3e84e..1e663910cede 100644 --- a/sys/dev/tpm/tpm20.h +++ b/sys/dev/tpm/tpm20.h @@ -131,6 +131,7 @@ struct tpm_sc { }; int tpm20_suspend(device_t dev); +int tpm20_resume(device_t dev); int tpm20_shutdown(device_t dev); int32_t tpm20_get_timeout(uint32_t command); int tpm20_init(struct tpm_sc *sc); diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index bb4df82e613b..38640b010e18 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -411,6 +411,7 @@ static device_method_t tpmcrb_methods[] = { DEVMETHOD(device_detach, tpmcrb_detach), DEVMETHOD(device_shutdown, tpm20_shutdown), DEVMETHOD(device_suspend, tpm20_suspend), + DEVMETHOD(device_resume, tpm20_resume), {0, 0} }; diff --git a/sys/dev/tpm/tpm_tis.c b/sys/dev/tpm/tpm_tis.c index b97d7ab3f8e8..e51f5a656b05 100644 --- a/sys/dev/tpm/tpm_tis.c +++ b/sys/dev/tpm/tpm_tis.c @@ -510,6 +510,7 @@ static device_method_t tpmtis_methods[] = { DEVMETHOD(device_detach, tpmtis_detach), DEVMETHOD(device_shutdown, tpm20_shutdown), DEVMETHOD(device_suspend, tpm20_suspend), + DEVMETHOD(device_resume, tpm20_resume), {0, 0} }; From nobody Sun Apr 12 13:44:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGM4k2Xz6ZM41 for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGM2xY9z3l3D for ; Sun, 12 Apr 2026 13:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3t/2VPaKQsZyxcpV1V8J9bvzq+RWd5+dhUTonEILzo=; b=RL3z8Y0C8Y2Fi/GjMR382ApAhp+gvUaWQg1uIaIEL6uHG8UX6j6CxlmAapWYfLK+SzYQ12 QpzVGbwklVpq25gPmMWcfHZ0BlkE30vciC1GMwmUimZIJgqP6ZDoTVUMM0a+fpjQs4Zyrx RU5OQn6Id7IgG3aW/8VkjOLTFpYkR64kIP19PDGfuD+qu4/L5A1gtbVkMd8pKkX773xqz1 LjVLvP1K7CPAjqJMWpc6BH7CZdQjFMaZiyw9YqnEHAnklepbdp+LeUPECxySCULAlEovNl e1tkXrt6h7qZMwwUcbFNInoQckHhwTEWwie4wADk1o8f134nzxRvZs2Z4FD2Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001467; a=rsa-sha256; cv=none; b=VcTYRh6MmbIq3j+qUU5W48wqzpIxhBHUIXYghoXsRORdvq8P6jTo9daWjbCZNFkZQhyCM2 B8ftD7gbi8jecSTdTacxsE2ysOOeVklSopbEstMYvOWlDaviPIpErAWs0xj6I8rfzFBuX5 Owtjr8SlGSidIk/N7gNosXaLTuRrVL0v8BtB1M2JChmgdnqvaxfQ2CM7CxgkiQHheqGRDz ODFVxrH8Pqv2dLE1BfPN4dP9pDV8OqcO9H1CKhVT/StbF/aeR3PQlpeA9hB707jTM91AvA 7T1sywLqYtZ8ogLlAzJP5vz6w8FurmkvAawcIdZvvVIJZt6F8S90i/3m8o+m/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3t/2VPaKQsZyxcpV1V8J9bvzq+RWd5+dhUTonEILzo=; b=QILu7sM7tWG6qFXszZaGI9Od4fcgB/Mrs6A52RdETAHPE/7y12GU7vRXC7RNJcvvDYAqoI vY0rbO/qDwOF0b2R0Z6KKy0t64YGR+qMCidciV1utNvax6dxIQdGGoyJFIQWYEVP3JvfJH QYdzjT88qtxT1Z4tdjEz7N7s9B79QrrPY/ZmqnU2135Ivomu9xWPrQxQFcZ58aRgDwM2qR rjMeK6FvE9KjXIBVt2OixsXVpw/Fgp7BbRE7Zh5o22LjFvMyce8QYy0/+REJyIlgzJvRvv Qyq/CT/z+T95Grq6OVB2lGexek9PFPIhwlc489eIpB7Z5uC5zheMSIoHwN2CGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGM2CjHz4fb for ; Sun, 12 Apr 2026 13:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43497 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6c92918fa159 - stable/14 - ls: check fts_children() for errors that may not surface otherwise List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 6c92918fa159e974322c5e09ac6cffa9d807b0f2 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:27 +0000 Message-Id: <69dba1bb.43497.2a988a04@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6c92918fa159e974322c5e09ac6cffa9d807b0f2 commit 6c92918fa159e974322c5e09ac6cffa9d807b0f2 Author: Kyle Evans AuthorDate: 2026-02-11 19:55:55 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:45 +0000 ls: check fts_children() for errors that may not surface otherwise In particular, if one simply does a non-recursive `ls` on a directory that is not accessible, there are some classes of errors that may cause it to fail that wouldn't be surfaced unless we do an fts_read() that will recurse into the inaccessible directory. Catch those kinds of errors here since we cannot expect to an FTS_ERR/FTS_DNR entry to follow up on them. PR: 287451 Reviewed by: kib Discusssed with: des (cherry picked from commit 7bf81e39d83087dc7f984077b5eed5a48df794d4) --- bin/ls/ls.c | 17 +++++++++++++++++ bin/ls/tests/ls_tests.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 51cd45b84d63..81036f311e62 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -697,6 +697,23 @@ traverse(int argc, char *argv[], int options) output = 1; } chp = fts_children(ftsp, ch_options); + if (chp == NULL && errno != 0) { + warn("%s", p->fts_path); + rval = 1; + + /* + * Avoid further errors on this entry. We won't + * always get an FTS_ERR/FTS_DNR for errors + * in fts_children(), because opendir could + * have failed early on and that only flags an + * error for fts_read() when we try to recurse + * into it. We catch both the non-recursive and + * the recursive case here. + */ + (void)fts_set(ftsp, p, FTS_SKIP); + break; + } + display(p, chp, options); if (!f_recursive && chp != NULL) diff --git a/bin/ls/tests/ls_tests.sh b/bin/ls/tests/ls_tests.sh index c732b60b21a4..be662b75695d 100755 --- a/bin/ls/tests/ls_tests.sh +++ b/bin/ls/tests/ls_tests.sh @@ -476,6 +476,35 @@ b_flag_body() atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b } +atf_test_case childerr +childerr_head() +{ + atf_set "descr" "Verify that fts_children() in pre-order errors are checked" + atf_set "require.user" "unprivileged" +} + +childerr_body() +{ + atf_check mkdir -p root/dir root/edir + atf_check touch root/c + + # Check that listing an empty directory hasn't regressed into being + # called an error. + atf_check -o match:"total 0" -e empty ls -l root/dir + + atf_check chmod 0 root/dir + + # If we did not abort after fts_children() properly, then stdout would + # have an output of the total files enumerated (0). Thus, assert that + # it's empty and that we see the correct error on stderr. + atf_check -s not-exit:0 -e match:"Permission denied" ls -l root/dir + + # Now ensure that we didn't just stop there, we printed out a directory + # that would've been enumerated later. + atf_check -s not-exit:0 -o match:"^root/edir" \ + -e match:"Permission denied" ls -lR root +} + atf_test_case d_flag d_flag_head() { @@ -971,6 +1000,7 @@ atf_init_test_cases() #atf_add_test_case Z_flag atf_add_test_case a_flag atf_add_test_case b_flag + atf_add_test_case childerr #atf_add_test_case c_flag atf_add_test_case d_flag atf_add_test_case f_flag From nobody Sun Apr 12 13:44:26 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGM2lqyz6ZM8H for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGL2L6Vz3l4q for ; Sun, 12 Apr 2026 13:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2PfWW2VLWfDBHwwtFliLzbe5k6K6+RyJpMSZwpgaqA=; b=JtF7Tk2spdh7yiNjMpM0HHCXWtD1q4SLVABluMKxSdn6z5S/OJpVfjIqfXLSRVMbsbmzMs DMds2hfbXA270Kz3CQROCYhuZWUkTB2Y1SaUS5d1rhev259+JlXvEb/4nFIwGsQOntxBS9 kyyJ3/XDVKgsgTmbPtppM0B+ZdF+vJ2j2ciYP+NCjWzZYVFxUnxsf+WG1NdMYawvaMeBPB AeFxmW7So8Fg9upi3CvuuOnKsBkr8UOJEL4AJ3zSYAApAUzL6t78nNuaelhKzbkikGhHN/ flTNCipjzT5hrWhsnvEgwK0/fFN+8an//Odm4Cgf4J9zWrigv2zmc5ECq0F3eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001466; a=rsa-sha256; cv=none; b=bWxTJY4j3eDYq24H1Yx15EBTXp3PF7lECNA0fN7uS9sL7ONxGbbTiEjC6NYfzoMcZIN3vD VOZAzUlOGALaagCRqpxYhJe7654AzAZVRhnGz2N8PesIWdx7gnA0WfAa4DoLxM8Y1BBH4v Ss/fvrt93BHLtltumfj30TaHziX2MbG4t1TGeTEa50M/6mJm1KK4YwB1TGT922OK+5tLr9 CO7VQh0dJlQjod+kA8TPzZ9DABZv4X1HS7tKkyO8d8MxnBg1CN7tuewXz/+HH3prkU7iXn iVgCmPv4naQvrCnJc4foNGKu9cLMw5lHyh5x//sHWIgmmgR4mdMfLID2cAeyeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2PfWW2VLWfDBHwwtFliLzbe5k6K6+RyJpMSZwpgaqA=; b=guVsnWMEoER+XNDnLT2LQ0GCpe+4+bRsQI3wv7UXiCeVUWyLSCwbKXyTo6Y7lIhDCybaRv d0MX9y8C2JVTPGQEo7tf+le7SMN1MLc5PTlv/ORM2INQQfYejxBW6pVARpSE7Klnc0L11b osIlcj84nUzBiokBCBeEQWEZRAbB9BxfS1FUhWEzLKAYucaaAMRdVPqE+zNXZICDKPE7iT JIbcey4VsjJeGzOsVPx0IxveVuQ3utyCHlvEB97B25pWZfG3SetgDUsG8QOeAnRcdmG0vK dHy8M6zMDqb/S+TRdyzPZd0N6ozvqa0rJoFg6D74q5engoeuZ4wD8xhnAsTzhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGL1kzcz4fZ for ; Sun, 12 Apr 2026 13:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c22 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pat Maddox From: Kyle Evans Subject: git: b71d5748b741 - stable/14 - release: Pass optional VM_IMAGE_CONFIG to vm-image List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: b71d5748b741380cc99e31cffdb5584a3fbc1122 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:26 +0000 Message-Id: <69dba1ba.42c22.761a8fee@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b71d5748b741380cc99e31cffdb5584a3fbc1122 commit b71d5748b741380cc99e31cffdb5584a3fbc1122 Author: Pat Maddox AuthorDate: 2026-02-06 07:50:20 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:44 +0000 release: Pass optional VM_IMAGE_CONFIG to vm-image `make vm-image` calls mk-vmimage.sh, which supports `-c CONFFILE`. This file gets sourced before building the image. One example of how to use it is to define vm_extra_filter_base_packages() to filter the list of packages installed into the VM image: # vm-nodbg32.conf vm_extra_filter_base_packages() { grep -v -E '(-dbg|lib32)' } $ make VM_IMAGE_CONFIG=path/to/vm-nodbg32.conf \ VMFORMATS=raw \ -DWITH_VMIMAGES \ vm-image Signed-off-by: Pat Maddox Reviewed by: cperciva (cherry picked from commit 93f482ab3e6b4577f13e85e216a50bdf3704dda3) --- release/Makefile.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index 6756d99bc288..e0e69deaaf28 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -178,6 +178,7 @@ vm-image: ${QEMUTGT} PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ + ${VM_IMAGE_CONFIG:D-c ${VM_IMAGE_CONFIG}} \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} From nobody Sun Apr 12 13:44:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGP0LmWz6ZM8M for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGN3hRTz3l7j for ; Sun, 12 Apr 2026 13:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDpuEg156J4rY856gnWi2awERfNAUNi6kH0d4Y7WeOo=; b=RW2LtK1eqvsChw0+IT+ScDwMx/y5IgrJI9/qC3ml9trHgGZOvenNm/8RCdrBBnTJyA5Dz8 xhqZgkmicxdpPNm6AlouCwFUyXCVj8xrI7qudAuSxIWZQCY2/qhz/aGr0xo4PXxNwbS5Hi nZATcHISxeSlWO2gpQ6Dt8K+wIl+wQA52Ej3ZGLRMWo4v0GUA9zUyuOWlJBWhsSF0bwVoq b9E1ipGC5RfXB0bIS6ZOwnYzBHwOCByDyMoU88I1dt1B1pCB3Y9gbxmIDtOvoMjidh/6ls 5Wjn1RmEknJGzEB8+zvpAI/2bS/1S1acxmHR+yVjX/cECfQrUTFCubaKUx/j/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001468; a=rsa-sha256; cv=none; b=n0DfuCO6cfg8ipND46Onxz+jIIJSP75KVD3uHfkwtMhqaCdREGPTnElV0MSIUk8i7LOURQ 9Y6wa75R16ssipNC6/iXcjzWaBSCFwpVNqVS0IW8+/IzxdGaG3gyWCNcme+VuyrpuOx+CB Wi+NP0P4Skk8k7WZwXLPTgrrGG2zMBpHHLsiacT4qNaxbn41OPCFxXuY83e2RE4gA6s7Wd oYdrRY2+2/BkCtP2MICaRcTKePmywHQquyKunWrMD9qe+M6edsaSwyt1JrRrvAKJx0xMaU b0M18xTT4oXdL4ui6gDlNPU982tPp6V5B1QbKeSYBeW5VQus/e7T5XrN2KggAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDpuEg156J4rY856gnWi2awERfNAUNi6kH0d4Y7WeOo=; b=VWkguZN0VvP4e5uGzZtETwbuwoLbxcN1WVdYvj7Sv0SdjfQkjGrl3mU5pLVAFONOPPbzV7 4Lw41R54OGxSQIyN/gLWMHcOv4jwxCuM/PUfz3iPv3+9h9kkIl5z1kDSOqS0px0tXvKPyJ Dl9783243Z1ZFDwHnMnTE+H7SvTlsFOT6/dVUYGL0iJu7m7L0io25AbGI6gq9BqiFfOw2X fCXjuPm+MHtttDZ0ikOzHbT4DdInSXNvxC4jBvGICIDBwtIscbpbvZFiqwrzrBo+zdh35h 0deDoNzyeM/5dD3t0ndz30PyIw4K7qnHwGA1w4ZzqEKgMCzkPjIZckr8efItcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGN31Hfz4dC for ; Sun, 12 Apr 2026 13:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4300e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: c9e676f5f2c1 - stable/14 - bhyveload: simplify cb_open() and eliminate minor TOCTOU List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: c9e676f5f2c114556047d053127b1ee6c4e06ec0 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:28 +0000 Message-Id: <69dba1bc.4300e.312d05dc@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c9e676f5f2c114556047d053127b1ee6c4e06ec0 commit c9e676f5f2c114556047d053127b1ee6c4e06ec0 Author: Kyle Evans AuthorDate: 2026-03-01 03:23:59 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:45 +0000 bhyveload: simplify cb_open() and eliminate minor TOCTOU It's not at all clear why I wrote it like this, but we can do better. I wouldn't think this really has any meaningful security implications since the hierarchy in question can't really be modified by the guest scripts, but it would seem to make it a little more robust. Reviewed by: bnovkov, markj (cherry picked from commit 6da9d465c54bf2e3496e83db025c5d22f3b3cc17) --- usr.sbin/bhyveload/bhyveload.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 5250e2120938..be99bb342de6 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -169,11 +169,9 @@ cb_open(void *arg __unused, const char *filename, void **hp) { struct cb_file *cf; struct stat sb; - int fd, flags; + int fd; cf = NULL; - fd = -1; - flags = O_RDONLY | O_RESOLVE_BENEATH; if (hostbase_fd == -1) return (ENOENT); @@ -185,20 +183,21 @@ cb_open(void *arg __unused, const char *filename, void **hp) if (filename[0] == '\0') filename = "."; - if (fstatat(hostbase_fd, filename, &sb, AT_RESOLVE_BENEATH) < 0) - return (errno); - - if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) - return (EINVAL); - - if (S_ISDIR(sb.st_mode)) - flags |= O_DIRECTORY; - /* May be opening the root dir */ - fd = openat(hostbase_fd, filename, flags); + fd = openat(hostbase_fd, filename, O_RDONLY | O_RESOLVE_BENEATH); if (fd < 0) return (errno); + if (fstat(fd, &sb) < 0) { + int serrno = errno; + + close(fd); + return (serrno); + } else if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) { + close(fd); + return (EINVAL); + } + cf = malloc(sizeof(struct cb_file)); if (cf == NULL) { close(fd); @@ -217,7 +216,6 @@ cb_open(void *arg __unused, const char *filename, void **hp) return (ENOMEM); } } else { - assert(S_ISREG(cf->cf_stat.st_mode)); cf->cf_isdir = 0; cf->cf_u.fd = fd; } From nobody Sun Apr 12 13:44:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGP6331z6ZLsF for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGP3vLcz3l13 for ; Sun, 12 Apr 2026 13:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15yE7Zvnkix64R1Z/UOGcxyXa9MRl+XSvWfQm4m+lBg=; b=aN4Lq99xDH/LTZpxy160RK2jC64ooXtDQEkqLkHXgxg5eQ3UNevrMLx7hcB92/kx9uKY92 uCL9aV1/tEUTOKkHDE/SEZm/7MXiJjHWZ/uiJO9mJAj5e6DOV83LIzWqQuPXcHzHdZRiPC 8uTEjdFSLC6v3D6KJACMglrnAXlPoTdLJpmI+ixL7MQEDsmiiYNvxsUKh5wHtp+Jb6dMt7 jVvunrD3MblAsdqc4MdoTCLjuLHI0trSS+UZdxDVhPtBX1MO9ENrn/iyb7l3ACWEQdZEBp 8owhL18ljIXT/S4W/qI+yI/cKFslhIOVqrDFZ6NGn6/HfRHa9leiY8b2htZ3Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001469; a=rsa-sha256; cv=none; b=ZZDXAL5HTKuhowvHMFqnzgzNmT+nzTdhptNMYD84QsX8gzNMf/R9JZU3BC5YOM43Cr6La5 r1V5TmZyu69Ey3iYpib4pHovB+9hlo+4s1lckFiy/xIvB9L47fDMlKQ9+NIgiAClF2zUZ6 Z8n+tiE+LeEHcJBn8rcRGeebXzesqEnzhPn/sAmgXis1JRp2ulnMl30ySlyJMeIBd4Pl+N N+xLmheX8oYdtUfYHNcitqoQ6QdLc0CPGPWX9JosUUj7CrEyvMZii1nyAqSKoGNoikT6Mm UKfMPebQWaxQHZUv8LkyBvXB4vOi6moxDztAjxUWjlv9aotD19ykrIB9mH9RwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15yE7Zvnkix64R1Z/UOGcxyXa9MRl+XSvWfQm4m+lBg=; b=HkDoqfpA5aSLjSuw1vz7jsnufr9ahN8xTqZebFGhKf90pi9DDVS3xgd1xCWvpUZlis9OZj dbmhCBgGumyqaoOczkwlkvS2/2wz5/BUTH9zjv0g7dWhhW4qYzNJn2UCayhHCE/ifPSe49 NO8LP9OL10Pf1/0yMf2nYtMnBJjitT8RLFfoGp4zwsgg3Cup+4nS4HGRTJ9X/+9Nf1qLWF TyyojfZqmTz7YOf5PmL2Kd2P0aAUOXMu0UIDHqwIQa34LzWKykE9C9yXXGTd63ljEhGezi xiGujnf8KGqLusmT+R/N+89aN6kjfaUwquGDqI8C9OZqGLugvT90S5A5k8XNfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGP3Rtpz41Q for ; Sun, 12 Apr 2026 13:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 431e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 06f98df4b7a3 - stable/14 - stand: lua: break out a few more dirent types in lfs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 06f98df4b7a3a16e19166e6007c8023dc9098ffd Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:29 +0000 Message-Id: <69dba1bd.431e1.7f8fadf1@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=06f98df4b7a3a16e19166e6007c8023dc9098ffd commit 06f98df4b7a3a16e19166e6007c8023dc9098ffd Author: Kyle Evans AuthorDate: 2026-03-09 21:38:57 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:46 +0000 stand: lua: break out a few more dirent types in lfs These are non-standard and specific to the version used in loader. We have some desire to recognize symlinks to avoid filtering out kernel symlinks in the autodetection bits when they would be perfectly fine to `load`. This won't be usable right away, so any impending use will need to be careful to account for nil. Reported by: leres (cherry picked from commit bc531a96c9b28b1cabcd5deb0c9f8f6d815cfebc) --- libexec/flua/modules/lfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/flua/modules/lfs.c b/libexec/flua/modules/lfs.c index 8cb8d6fc9fed..259860b4017c 100644 --- a/libexec/flua/modules/lfs.c +++ b/libexec/flua/modules/lfs.c @@ -443,6 +443,10 @@ luaopen_lfs(lua_State *L) /* Non-standard extension for loader, used with lfs.dir(). */ lua_pushinteger(L, DT_DIR); lua_setfield(L, -2, "DT_DIR"); + lua_pushinteger(L, DT_REG); + lua_setfield(L, -2, "DT_REG"); + lua_pushinteger(L, DT_LNK); + lua_setfield(L, -2, "DT_LNK"); #endif return 1; } From nobody Sun Apr 12 13:44:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGQ6gLrz6ZMBx for ; Sun, 12 Apr 2026 13:44: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGQ5GF4z3lG5 for ; Sun, 12 Apr 2026 13:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tSjLr2g+98hydgpy8fzMp3DrATkGBB0V5an5HBDZFI=; b=FExXNDmu/gbAPbwsU6IF7oW81FAryKbqaUoXxGWDR3jYHFz8EXD2YoXTVbuB0N0aMHup7C 17zF+02Bmmzej+FJS4CrEUS/UVVuWHna0B+dRkv+BkBpi3023jRuWWwZqWR/b9FoQMTFUl Ec1rwFKtoasHGrJIBuDh9CsPIzaaWPoDMQNA7XRr71IkQvLjBsfOSjVoYGPHfUN0AwTdhj K0+fWn9uPfVDowkziCMBeELENIIE3Mh4p2ryMyNGIdrkSeYDWyLzJK5G/25080z4OvqBnC UDgoG183kdLGIFHfAGtklX8ZenOAUvoNocew+o/ecdx0yW2H6zRebwbyIEVinA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001470; a=rsa-sha256; cv=none; b=IVLBs0yOp7r7de2tW42TumFs6hWIDe2u3QJ0RNZNUfOA0TxZ1+5JuqSeJOlsjfLnmq4iMi qq25qJpZcIZgdoMjt/mpaaOLp3zYwrUW5dRNK1DYWZE2vEWd9n8O51yJ9UvH9sTpzsvXZQ r3gXfTtreF9L3+pImJTTLCC8vty7CF35fIRP6REMzQaJJVB2ULwqjZcGhrR2mUSsq/glu3 y7Y1bLaT75OSykfKu/MFyguc7aqxk7j6r94+9DLCFUlZAfGpbir0VLcVDjLe5/kJYp7Vur 4O5P9tKzVqUtJzAdrNU9VFG2+cPhnYg2GNIMoop+1IrCp+L9GR9g4Ew2I6Fq8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tSjLr2g+98hydgpy8fzMp3DrATkGBB0V5an5HBDZFI=; b=bMgCYhppxboyY/vdyO8JdD+9mQg8OXNiaAomR3FMBeE1D2YHwyb9sbzsIGYJdkm0+UxgRG fJJ0yM+a2TDuARwuYVrhfzmBS8GFqvAXqdOguNyBe0zgTzT85N+fySlwhBhM+3kpNaUYbb RNOAtLs0kqaG7ayNWiC5RPZQ2tAHzHaKUseFfn9ujKynfN9ub0TuBoXoAAOJlSSVBTIhsj uJvW8ZcQnUPdIhuorZpv5xfX+93QaKiNax35QGb9ZZtSW0mICTTIvmKLa/nDvbk2j91rpO 9xXUUxCd46sRlZ1lnRGutGq8Udw5NgAHWDao2wC1GKaHVITkxVYCms9/9LiSZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGQ4K7mz48q for ; Sun, 12 Apr 2026 13:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43295 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kristofer Peterson From: Kyle Evans Subject: git: 9d87f30b3322 - stable/14 - kern/amd64/machdep: Replace memset in wrmsr_early_safe_end List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 9d87f30b3322c910a2cb68442e5d35daea59df82 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:30 +0000 Message-Id: <69dba1be.43295.2bd88560@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9d87f30b3322c910a2cb68442e5d35daea59df82 commit 9d87f30b3322c910a2cb68442e5d35daea59df82 Author: Kristofer Peterson AuthorDate: 2026-03-09 19:40:34 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:46 +0000 kern/amd64/machdep: Replace memset in wrmsr_early_safe_end GENERIC-KASAN kernel failed to boot on a Dell PowerEdge C6615 with an AMD EPYC 8224P CPU; UEFI BIOS caught a #GP exception with %RIP in kasan_memset where %GS relative pointer (curthread->td_pflags2) was dereferenced. Investigation led to wrmsr_early_safe_end which calls memset to clear early #GP IDT entry. Replacing memset with __builtin_memset_inline still resulted in the compiler emitting a call to the memset resolver in GENERIC-KASAN build and the kernel stil faulted during boot. This version which has been successfully tested with both GENERIC and GENERIC-KASAN kernels uses memset_early. Signed-off-by: Kristofer Peterson Reviewed-by: kib (cherry picked from commit 615f1b9eb17c921bbcb0cce2b9ad61910361325b) --- sys/amd64/amd64/machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f5733eef685e..e4761a2e8579 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1863,7 +1863,7 @@ wrmsr_early_safe_end(void) lidt(&wrmsr_early_safe_orig_efi_idt); gpf_descr = &idt0[IDT_GP]; - memset(gpf_descr, 0, sizeof(*gpf_descr)); + memset_early(gpf_descr, 0, sizeof(*gpf_descr)); } #ifdef KDB From nobody Sun Apr 12 18:49:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv02K3lGDz6YX25 for ; Sun, 12 Apr 2026 18:49: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv02K311dz3hhx for ; Sun, 12 Apr 2026 18:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776019769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IkIEJauLCol6dieOkWIH16uGbfutbP/Y47suuMASNw=; b=P7y/J/3F8YVPmUC/x9TdE5RQ0Qw/MScqsAoELagNB/VwVHivYKCRG2bWDWqUuZDJuXaXJt AWBNGX2x1q6MA/B/tOiBZj5uz9VojMYBmMK+C06WDIaIXMVRhMSdsLGMYEaGSlZCo+xMIj 3LaE7ujN/pFH8DRo4cP/hPWNii2/+mKbFZ8cVBVqWwe38c1ks3GEE73Sh2rnI6jofHE+aM IpaLL/bUIqIvwTTFs82Johl68gMgYwoHWVxx0wxCl2BvFpvyZK1QNLyEk475pb3ZBXQtu/ uJlHRcCglVOw8l7w8Om9lOAIgz37ZHxmPqX0l3sq5EIltSSHye8kvZeO15Zx9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776019769; a=rsa-sha256; cv=none; b=AOIHzv5RGOvCWX9zIWwT1QrTxWNEfYej0p+2NO9cXLwtsyx+mP+cTk6SRjh6jFLSq4ITVc jXK70BGensuTGEd87zmYADxKg3iABgIncIxhBCYgUhqGTIjJyYWkueL+tK2ZuubDmEkrwN nfAb03ZT5kv/WzBbrk+n2QXrlCPtWSdw59oBIcQilIw564E0z423Cr6sJB0RAu1PnT1O/c 8o+496XuFywScFegl44WUAV+h5xoYl/ZrC1TcwV2Co2HjHNOAGe//YxY51MQ2LS5XWzz73 U2CsTwu3FbjDfrJNOYUWAC9zMLUTBlfYEub5oQM8G89amE5eeu11F9f+CFh46w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776019769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IkIEJauLCol6dieOkWIH16uGbfutbP/Y47suuMASNw=; b=h2iNmnpd1rjHdvmcnKsnp5wFlHxn5GgB3QZr3qkzNDgs8bbJmfO5D+G1jgTJUg4bq0OSyx QHeJKLK2D6MUGNvCk8A7xr31NtL+LeqFjWS/Ba/VdB7tA5/mpQIUsc44jFE7Pf0COTuBC7 XGatq76ArBT5j3oDdab96DP79J6TX4sV++5cQluOMj+W5A8DJWHg+EDdDfiODw54ZjvaUp TnOtGKdYNl4q2GmcU3oeZbjfIwVCdb6BVPqZ6UxM0UCydmt+fPpTDxgHzpSXbVdh+55/LM 9J/nUdZ8Q75OcrMqj4oXz85dahAMxMBLlOp62emSNOH7bROZT7C+zfLHQpz2wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv02K2YsfzTmG for ; Sun, 12 Apr 2026 18:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a122 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 18:49:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 1ed68542b1f7 - stable/15 - lockf.1: Organize and provide error 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1ed68542b1f7fcf56caa820064bdfb61a6b14f36 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 18:49:29 +0000 Message-Id: <69dbe939.3a122.ed15483@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed68542b1f7fcf56caa820064bdfb61a6b14f36 commit 1ed68542b1f7fcf56caa820064bdfb61a6b14f36 Author: Alexander Ziaee AuthorDate: 2026-04-08 20:08:43 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-12 18:49:00 +0000 lockf.1: Organize and provide error numbers Add error numbers to the exit codes so that readers can decode them without having to use a separate utility. Organize exits by error code. Mark up the error constants with the error constant macro, even though this is really not very helpful because people will search for the error code, the macro is explicitly for the constants and not the codes. While where, align and alphabetize the options list as well, fix misaligned padding in an example, and a one-sentance-per-line error. MFC after: 3 days Reported by: Antranig Vartanian Differential Revision: https://reviews.freebsd.org/D48470 (cherry picked from commit dd201e407e48ba59bdfa1f71d41acfdac1a9c562) --- usr.bin/lockf/lockf.1 | 57 +++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1 index 40b4497bc80c..406ccd4caa39 100644 --- a/usr.bin/lockf/lockf.1 +++ b/usr.bin/lockf/lockf.1 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (C) 1998 John D. Polstra. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 24, 2025 +.Dd February 26, 2026 .Dt LOCKF 1 .Os .Sh NAME @@ -104,15 +106,10 @@ that if the option is not used, then no guarantees around lock ordering can be made. .Pp The following options are supported: -.Bl -tag -width ".Fl t Ar seconds" +.Bl -tag -width "-t seconds" .It Fl k Causes the lock file to be kept (not removed) after the command completes. -.It Fl s -Causes -.Nm -to operate silently. -Failure to acquire the lock is indicated only in the exit status. .It Fl n Causes .Nm @@ -136,6 +133,11 @@ This option will cause to open .Ar file for writing rather than reading. +.It Fl s +Causes +.Nm +to operate silently. +Failure to acquire the lock is indicated only in the exit status. .It Fl T Upon receipt of a .Dv SIGTERM , @@ -191,32 +193,32 @@ successfully acquires the lock, it returns the exit status produced by Otherwise, it returns one of the exit codes defined in .Xr sysexits 3 , as follows: -.Bl -tag -width ".Dv EX_CANTCREAT" -.It Dv EX_TEMPFAIL -The specified lock file was already locked by another process. -.It Dv EX_CANTCREAT -The +.Bl -tag -width "EX_UNAVAILABLE (69)" +.It Er EX_OSERR Pq 61 +A system call, e.g., +.Xr fork 2 , +failed unexpectedly. +.It Er EX_USAGE Pq 64 +There was an error on the .Nm -utility -was unable to create the lock file, e.g., because of insufficient access -privileges. -.It Dv EX_UNAVAILABLE +command line. +.It Er EX_UNAVAILABLE Pq 69 The .Fl n option is specified and the specified lock file does not exist. -.It Dv EX_USAGE -There was an error on the -.Nm -command line. -.It Dv EX_OSERR -A system call (e.g., -.Xr fork 2 ) -failed unexpectedly. -.It Dv EX_SOFTWARE +.It Er EX_SOFTWARE Pq 70 The .Ar command did not exit normally, but may have been signaled or stopped. +.It Er EX_CANTCREAT Pq 73 +The +.Nm +utility +was unable to create the lock file, e.g., because of insufficient access +privileges. +.It Er EX_TEMPFAIL Pq 75 +The specified lock file was already locked by another process. .El .Sh EXAMPLES The first job takes a lock and sleeps for 5 seconds in the background. @@ -237,9 +239,10 @@ $ lockf mylock sleep 1 & lockf -t 5 mylock echo "Success" Success [1]+ Done lockf mylock sleep 1 .Ed +.Pp Lock a file and run a script, return immediately if the lock is not -available. Do not delete the file afterward so lock order is -guaranteed. +available. +Do not delete the file afterward so lock order is guaranteed. .Pp .Dl $ lockf -t 0 -k /tmp/my.lock myscript .Pp From nobody Sun Apr 12 18:49:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv02Q0brJz6YWxX for ; Sun, 12 Apr 2026 18:49: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv02P4MP3z3hcv for ; Sun, 12 Apr 2026 18:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776019773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qi+hQVkYq/CyKeQjBsUddNwiKT7YZDcXB+TQ6kL09kQ=; b=Z0yaNQL6W/vS4AuLyJTso+yNEH7VJaL25dGYsyI+toHCuAmhfjFlfDT9y5tveS3f58FNhG RORWbMquRXmal+YHWjpFZBObG5bOWL68tWgpVjeNOw/HUSRxefbPg+x2L/XaMnuiEXTGAM GFBbm60zGM/6hCZzMfRRyeLubSp//6ld2ysQGKP4SpW4yYrgYvtKgGRvBXGtMH/h/AglWh B+hwMLAQ2HElCXO5ekiQOcgp57n2TUIoK+JHfNvNybaokaFdVTqbVifFttH4NTBCCVqBcN BGcD6xh9uBu3wfGTyfY6uok4DM+5EN8xKU5xtzmShm2X7peotQ+0gabGjslmAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776019773; a=rsa-sha256; cv=none; b=ikNpvaKI/8+OaZxKVG5HzWpy4rt/XbFRp/ownlrS+CJ+GVzVQWQjHhe5+hvpQRea86AXRO 45EZKMN3isv324IE+6KNcgjyzVVUBmAO7HYwH+p7g4bNRoMZoE1mwlRtCZc3Tv+idA2LzA WpaFx4sYl44u1KLRKsEK9+3vj59qEVZni7WLmFBpKVv7xJ3jRvs83n3Mj9DP/zdw1RjMBn W6ndULMsWcCkYSPPxz/H2WM1e1lxZMukg0VNTdqJcz98JRjP8XqqWaRYMB3ZOJ44/8OA69 /T8m2lO9PRUBb+hHmGm0sCs4BuD6TnlX0Dr4NxH6QgHs6XMaedngtejwGOUpqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776019773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qi+hQVkYq/CyKeQjBsUddNwiKT7YZDcXB+TQ6kL09kQ=; b=rIcriCcsV0h9qUaAXhIN63wOYbp8dZePZNQuLKq4DJXws4QohxxACa0GTDmqCt/tLPtSR6 JEkEYzlp9eA8YyjKsLs2j96SWm+W/sjmrYRUnYWtzCB8pRitAqoqsj1GKXCcti+Ugfrei+ dmTm1ueKtpIZn3kRAOmK4TsChxqHgTsx7o8vc9lRkiZ6WsYfgGgkA/u/a/S4+ITZDX9xni uKfDO9QknUGh6/Z63DnERaGZM8N9K1iTOoOHEBm0u+I7NkcrgFyu7Sbzy5J2dry0vRtIFx cHoZZa6d8lwIMzgDzXMCzWcdSHJf6WMnfqogX6zjE6NRz/djIC4eGy8pMDotkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv02P1yypzTZc for ; Sun, 12 Apr 2026 18:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b924 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 18:49:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 46bd227fbf5d - stable/15 - mfiutil.8: Fix typo - missing macro for dev node List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 46bd227fbf5d5961f5b0cd28c1e5ae7c42c57ece Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 18:49:28 +0000 Message-Id: <69dbe938.3b924.b1bc0f@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=46bd227fbf5d5961f5b0cd28c1e5ae7c42c57ece commit 46bd227fbf5d5961f5b0cd28c1e5ae7c42c57ece Author: Alexander Ziaee AuthorDate: 2026-04-02 03:20:45 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-12 18:48:56 +0000 mfiutil.8: Fix typo - missing macro for dev node MFC after: 3 days (cherry picked from commit 2bcdab574598e729273f7ddc7d898ffdb43b63b9) --- usr.sbin/mfiutil/mfiutil.8 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mfiutil/mfiutil.8 b/usr.sbin/mfiutil/mfiutil.8 index 9f8cacf7f16d..5d0e425872be 100644 --- a/usr.sbin/mfiutil/mfiutil.8 +++ b/usr.sbin/mfiutil/mfiutil.8 @@ -480,7 +480,8 @@ The firmware should kick off an array rebuild on its own if a failed drive is marked as a rebuild drive. .It Cm syspd Ar drive Present the drive to the host operating system as a disk SYSPD block device in -the format /dev/mfisyspdX. +the format +.Pa /dev/mfisyspdX . Clear this flag with .Cm good .Ar drive From nobody Sun Apr 12 22:17:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv4f00dCsz6Z35r for ; Sun, 12 Apr 2026 22:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv4dz71x3z3Cx2 for ; Sun, 12 Apr 2026 22:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776032232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IyaVIyrkvt4YlkGxi0ZocX/ejondicPg+IQKkG0vh4=; b=VO9gkKJwikrwmvabqqALYCNIJDD3axEdZqfemOMe2yM2vvk9OW5FE9DCKN+YXvwCyBGvyJ rbrqbg3gFJ5mVI+wIOhABmsGGa4REBrZBGLC3sP6p6dAm6MO4Sy3XachLLRPKJVDhTdcvL pSj4o+N+ps9EfUiuTN0r/S/GwhDEybOe7jQyuFmE+sg/TDNO8aDja8gRoH0JP7NkwXGSpo He7SGQG2dMsnFoqENsYrSZAQHKHLmF2smFHR8uHo4Svx3bKh+xAHe0KAejSynVakq1QVKJ vtH5JAo/SPFVrmFYKjNLsbBMjkUQfpDkVjMCnKfTvLwhYlNfks4EEi69NKVxWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776032232; a=rsa-sha256; cv=none; b=P7WnU2GwTkm+xNzNFx1mQrlaQ1TJxyHDcNjETz4684hno9PbyiCG7MZxPegYOPrNbAIdRS GxLty4bPCCxAOOv1M0BAuZq2FIQKR/mAc51A5+l/+T6U3bl4poqcEjxiaIa+MhMB74qDsn EWtdVWpTzACkzs8Mz4bXwerrRyLzanaqXw9aV+YB+gFPErHapbdtj3zs/EQBKp68teLMcT 1R5TVXH8MIphiFmSGyDR0vL/PhVpWrrznDRoZtG+c6F9GkRG3+IiPuTkyX0Ki4ovoXnvah jXOVi5VhKuolBgJ1d7OnbiEVkMevACYhb2ldkFThwg/1r8RGXn8+T9frnxiDpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776032232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IyaVIyrkvt4YlkGxi0ZocX/ejondicPg+IQKkG0vh4=; b=uKzGSmj7UXGrnqJDLxcdPGATUlbCgTRM6Ly73UhzmAuLM8Ur5NG0OQ/+mdV4UJVOS4b8QO siFy28tG7a9KZe68SfzltHcOq6Y1JvOVrEPXXWDlwA5KApnWAhvGAptp3BZpHxKILOXyhV aCSOGQUUAd4HCE0azkNwfChRynTnUfe9dT7xIL7bfQBvC0wXmRJ6M/3QR7Ixo8Fm3pPt6b 7wNjr2z+r+bRyC6uhwq8F8rVY5id+Rk6AaxVquQ6CRnyB7b8e5dKGk428YdNhj0d1CQV2j SIKJIqoCjVY77FbBsRFWF7A2iKywgY7Tw/dEpVWCm15rYZeuwbx5YEXFs9xHiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv4dz6KyfzcZh for ; Sun, 12 Apr 2026 22:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21398 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 22:17:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 890adccde076 - stable/14 - gpart: More nuance for GPT 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 890adccde0763536189cc1995e49f753e8d00497 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 22:17:11 +0000 Message-Id: <69dc19e7.21398.512d0c97@gitrepo.freebsd.org> The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=890adccde0763536189cc1995e49f753e8d00497 commit 890adccde0763536189cc1995e49f753e8d00497 Author: Warner Losh AuthorDate: 2024-10-15 23:15:17 +0000 Commit: Warner Losh CommitDate: 2026-04-12 22:08:16 +0000 gpart: More nuance for GPT support A careful reading of the GPT standard shows that one may have fewer than 128 entries in your GPT table. While the standard requires that we reserve enough space (32 512-byte-LBAs or 4 4096-byte-LBAs), it also explicitly allows one to specify fewer actual partitions (since that controls what is in the CRC). It requires that the first LBA to be 32 (512 sectors) or 6 (4k sectors) or larger. That requirement is not enforced (it's not listed as one of validation criteria for the GPT). We should likely do so in the future. To that end, allow a default number of entries to use (defent) on creation to be different (larger) than the minimum number of legal entries. For gpt, these numbers work out to 128 and 1 respectively. For all the others, make minent == defent so this is a nop for those partitioning schemes. Sponsored by: Netflix Reviewed by: zlei, emaste Differential Revision: https://reviews.freebsd.org/D42246 (cherry picked from commit 09c999b1557a8031d2b60435d71a0a5ed4f0f016) --- sys/geom/part/g_part.c | 2 +- sys/geom/part/g_part.h | 5 +++-- sys/geom/part/g_part_apm.c | 1 + sys/geom/part/g_part_bsd.c | 1 + sys/geom/part/g_part_bsd64.c | 1 + sys/geom/part/g_part_ebr.c | 1 + sys/geom/part/g_part_gpt.c | 3 ++- sys/geom/part/g_part_mbr.c | 1 + 8 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 10305ee940fe..02c550d74620 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -1006,7 +1006,7 @@ g_part_ctl_create(struct gctl_req *req, struct g_part_parms *gpp) table->gpt_gp = gp; table->gpt_scheme = gpp->gpp_scheme; table->gpt_entries = (gpp->gpp_parms & G_PART_PARM_ENTRIES) ? - gpp->gpp_entries : scheme->gps_minent; + gpp->gpp_entries : scheme->gps_defent; LIST_INIT(&table->gpt_entry); if (null == NULL) { cp = g_new_consumer(gp); diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h index 13bbb1e4126a..575d97623e9b 100644 --- a/sys/geom/part/g_part.h +++ b/sys/geom/part/g_part.h @@ -118,8 +118,9 @@ const char *g_part_alias_name(enum g_part_alias); struct g_part_scheme { KOBJ_CLASS_FIELDS; size_t gps_entrysz; - int gps_minent; - int gps_maxent; + int gps_minent; /* Minimum number of entries possible */ + int gps_defent; /* Default number of entries to create */ + int gps_maxent; /* Maximum number of entries possible */ int gps_bootcodesz; TAILQ_ENTRY(g_part_scheme) scheme_list; }; diff --git a/sys/geom/part/g_part_apm.c b/sys/geom/part/g_part_apm.c index 9ee48168b1e8..5f9cb64eab02 100644 --- a/sys/geom/part/g_part_apm.c +++ b/sys/geom/part/g_part_apm.c @@ -102,6 +102,7 @@ static struct g_part_scheme g_part_apm_scheme = { sizeof(struct g_part_apm_table), .gps_entrysz = sizeof(struct g_part_apm_entry), .gps_minent = 16, + .gps_defent = 16, .gps_maxent = 4096, }; G_PART_SCHEME_DECLARE(g_part_apm); diff --git a/sys/geom/part/g_part_bsd.c b/sys/geom/part/g_part_bsd.c index 625cdb4c727e..d1bee3f6c5e9 100644 --- a/sys/geom/part/g_part_bsd.c +++ b/sys/geom/part/g_part_bsd.c @@ -107,6 +107,7 @@ static struct g_part_scheme g_part_bsd_scheme = { sizeof(struct g_part_bsd_table), .gps_entrysz = sizeof(struct g_part_bsd_entry), .gps_minent = 8, + .gps_defent = 8, .gps_maxent = 20, /* Only 22 entries fit in 512 byte sectors */ .gps_bootcodesz = BBSIZE, }; diff --git a/sys/geom/part/g_part_bsd64.c b/sys/geom/part/g_part_bsd64.c index 4a1481f97c3e..14f8d0cde476 100644 --- a/sys/geom/part/g_part_bsd64.c +++ b/sys/geom/part/g_part_bsd64.c @@ -161,6 +161,7 @@ static struct g_part_scheme g_part_bsd64_scheme = { sizeof(struct g_part_bsd64_table), .gps_entrysz = sizeof(struct g_part_bsd64_entry), .gps_minent = MAXPARTITIONS64, + .gps_defent = MAXPARTITIONS64, .gps_maxent = MAXPARTITIONS64 }; G_PART_SCHEME_DECLARE(g_part_bsd64); diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c index 6be64f58287c..9c1a46111b16 100644 --- a/sys/geom/part/g_part_ebr.c +++ b/sys/geom/part/g_part_ebr.c @@ -125,6 +125,7 @@ static struct g_part_scheme g_part_ebr_scheme = { sizeof(struct g_part_ebr_table), .gps_entrysz = sizeof(struct g_part_ebr_entry), .gps_minent = 1, + .gps_defent = 1, .gps_maxent = INT_MAX, }; G_PART_SCHEME_DECLARE(g_part_ebr); diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index d795ccf4332b..de22d385af41 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -155,7 +155,8 @@ static struct g_part_scheme g_part_gpt_scheme = { g_part_gpt_methods, sizeof(struct g_part_gpt_table), .gps_entrysz = sizeof(struct g_part_gpt_entry), - .gps_minent = 128, + .gps_minent = 1, + .gps_defent = 128, .gps_maxent = 4096, .gps_bootcodesz = MBRSIZE, }; diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c index 36862c8ff018..e0e764bbaae9 100644 --- a/sys/geom/part/g_part_mbr.c +++ b/sys/geom/part/g_part_mbr.c @@ -116,6 +116,7 @@ static struct g_part_scheme g_part_mbr_scheme = { sizeof(struct g_part_mbr_table), .gps_entrysz = sizeof(struct g_part_mbr_entry), .gps_minent = NDOSPART, + .gps_defent = NDOSPART, .gps_maxent = NDOSPART, .gps_bootcodesz = MBRSIZE, }; From nobody Sun Apr 12 22:17:12 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv4f12sPsz6Z2jF for ; Sun, 12 Apr 2026 22:17: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv4f10zMmz3D0X for ; Sun, 12 Apr 2026 22:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776032233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TQUzqRSAr9Nr3qO8l5nTo4kJz8dzYyLTGbmjcs5sd4A=; b=gyHe5yakfZIqsI2q9AqtH1ZcZD9wE23Tn2wxvdD6hmJmSyTfO9+XbAufqP33bbFA4MNYq4 DdX9SCRcZkELrhMY9CvsvFwNMLGkHCm2q+Yz6c6Sy7JR3BKIVdv5PPYeC6J6pD/azLvbm7 x15pV+MKHp1lno5QOZVEPmPtrX4bBNKo8My2HTmvMqoJIC7ikmO4eJUzi7dCYXrMKJWTUb rzFK6ZfBtVPOngUL0mQ1r2PoNnNnfTer0KmqVZZ6KoxuD9daXOAbsfbLZYPfIlQNVHv+h6 n6ZYvtI+oh8szTF337a6jBaYOqcMMNqpKZtrEvHeJsZrVTQM16zNeL+jdAlJUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776032233; a=rsa-sha256; cv=none; b=vgVthCYLSWh1WMBAVKmlNv+ZcXCFR1AQ8Orm19uZ+TxgkgrSltzZ14WPbfbRdFLCrMSHea p5Wr88grrxd/+2qZ9UR8Ir0c2eq0ZTS/wTGiUS3Ijbq0aiQoavxAINVMavZ7xHHNBwsdvw zeujj+B249MVgEXp9nn0MhBjxqGKjqIK8C+FZJsPYSQFmMeWwienj1wZRUTdFed9fOV1Pf Ao3Mpjn4ufLrfNPfwHUUD60NnApL7OjHVwQt8y/neUurD3+PGsfDM6ySG1speFu5ma/9di OkbI6m4hTz1BnjodUfVPmhDUEtX1yzp+vDU7wVupHlcFYa0sBoILsKX9hQeMsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776032233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TQUzqRSAr9Nr3qO8l5nTo4kJz8dzYyLTGbmjcs5sd4A=; b=VEkW/eMHE/qXs0l2AN8MLV+gGf7feQlfzh5GQH2++cwOjO0xb+EmRogqLlBTG7yNqEhXd6 FJGFuhs51NCAFQHt/b8bCDA6k581weXKI6jONRyWnZqTxMbAAoUvNxadlmMopkaOeqHWRI O9+zQ67rZQ1MAdWkxfZ4zMqJVerB+GgFYsVifBudjtimh9t4Riu5RFsJAH7umIl+ostyUg KCzkKL/+6mXd+02IVHDlU+cMRwZ6a0ezUa5FX84NAB4jCSetJcyM3zWZ2j2SL4RcI28p7W /pOCuURlMEHUMaFCuacBhG6X0nj3pzQTOsG1Y640UhLRhwTr1/dSI++29lfVvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv4f06jHnzcjh for ; Sun, 12 Apr 2026 22:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21aab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 22:17:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 90c4aec77ca2 - stable/14 - gpart: Add warning when the start sector is too low. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 90c4aec77ca2ead1975be9d0ba0cea29f55e9632 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 22:17:12 +0000 Message-Id: <69dc19e8.21aab.2fa9197c@gitrepo.freebsd.org> The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=90c4aec77ca2ead1975be9d0ba0cea29f55e9632 commit 90c4aec77ca2ead1975be9d0ba0cea29f55e9632 Author: Warner Losh AuthorDate: 2024-10-16 00:03:03 +0000 Commit: Warner Losh CommitDate: 2026-04-12 22:08:16 +0000 gpart: Add warning when the start sector is too low. Add a warning if the starting sector is too low. The standard requires that at least 16k is reserved for the GPT Partition Array, but some tools produce GPT images with fewer than the required number of reserved sectors. PR: 274312 Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42247 (cherry picked from commit 2cbda736cea8f82cfc5caab0f6099f0fbfe28537) --- sys/geom/part/g_part_gpt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index de22d385af41..3e1f8dbde6dc 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -1046,6 +1046,20 @@ g_part_gpt_read(struct g_part_table *basetable, struct g_consumer *cp) g_free(sectbl); } + /* + * The reserved area preceeds the valid area for partitions. Warn when + * the lba_start doesn't meet the standard's minimum size for the gpt + * entry array. UEFI 2.10 section 5.3 specifies that the LBA must be 32 + * (for 512 byte sectors) or 6 (4k sectors) or larger. This is different + * than the number of valid entries in the GPT entry array, which can be + * smaller. + */ + if (table->hdr->hdr_lba_start < GPT_MIN_RESERVED / pp->sectorsize + 2) { + printf("GEOM: warning: %s lba_start %llu < required min %d\n", + pp->name, (unsigned long long)table->hdr->hdr_lba_start, + GPT_MIN_RESERVED / pp->sectorsize + 2); + } + basetable->gpt_first = table->hdr->hdr_lba_start; basetable->gpt_last = table->hdr->hdr_lba_end; basetable->gpt_entries = table->hdr->hdr_entries; From nobody Sun Apr 12 23:15:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wl6SqKz6Z6NK for ; Sun, 12 Apr 2026 23:15: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv5wl2yF7z3NNx for ; Sun, 12 Apr 2026 23:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I6v5Ddo7O3yq1p+6n7Ypa8LJj2OPGHhpZ8pXYu0Y/wI=; b=lDgT2MRgjlKXnMBJpI71VMzLeYn/AXosz3xGmOol82jmh/UHnNePGu2ZEt/e9VSTtCvM7q FppFcDUvGP8+67Lt7ANDhtFtY1QmhlTPOCiszgIR6yCPzxaoYqQJwaitaAxfx/B+eH/vxw WO5vnJT2wL7Z9/Urue86oF/a4RwvxcAaKTn+Pu3TdC8hKK8ipd6Q5V66wbUxiqAaziXq/w f5/bmcGnTcqd3E2791sQBIrOqvTsJ0w0Fi7CoIbVgQPLADFc3uQ8elG8a7nCIqBpQT2FGD tyU60IvXhOBK4w5eEFX9Irvm96fl8sgdJ/+ns6GHw5GCYxBC9bOWEmOynCc4yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776035703; a=rsa-sha256; cv=none; b=Ptyko4EvvdHPmGx20GL/7YMSCLKFio6AGPY8P86QxrCOfwsQ07pFzWexSXvcrN55DeeYWO cMrTAW2oxBwY0ICxI2UIKE8onGZELBzVcmmGS7e7T0e5xzR4UjXFN403esV4yHeCnodMgz H5Rvh0bAh9d16oQrt1QPZlyr9CCHNcrpk+jmbJRjuZDq1f1SLIeJq2AEjuGH6W1aDRscj2 G1X/vjyXWTeaqEaFDsiLT5wVvDVJDy/T+e7pru0xLo4mpBX5jCE6QMgEFAFy4eSB3Xn9MN ploW1GJ6Gg/H5czcVegt6KnWY5oZMlvyzlIOY+fxPaqU+DezrxUUBXA0O4Y6JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I6v5Ddo7O3yq1p+6n7Ypa8LJj2OPGHhpZ8pXYu0Y/wI=; b=ZQXUOjUfiA0I2hF7odX1kowhcrGZ5xqAkdmt2YuwC7d4NYqFY1ycsuhXRM3UULyQXVDcOx Cu1VLgRtkhcCjOPZIQsY8zaKWQqju0Pgmc+Sx8Qrsbqyv+tSVn3Av5QEq/NwyDfF8hgOk1 +bRi/slYe6h0cDGmu/KGZ7dkSb89X5NJgqBQqzHIiRlUgbnjhuvj5g8QdKlPApIqsu94/B BTrEahG0wVhusSYiyR+2ObdokY3b21ktsza8icWeUgtq3vRvhMyVAewW6Z7Vuh8IDwoJuF 95w0kXb71JKjpDcPJctg3F/oMF9qCTkpW+SsMoimTwdf2/1jQIT/py4bKcPPsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wl21qVzfCp for ; Sun, 12 Apr 2026 23:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26864 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 23:15:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: a42f229f4c1e - stable/15 - flua: Always build as a bootstrap tool List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: a42f229f4c1e28b91a6648ccc747de33733f819d Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 23:15:03 +0000 Message-Id: <69dc2777.26864.ef09e1@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a42f229f4c1e28b91a6648ccc747de33733f819d commit a42f229f4c1e28b91a6648ccc747de33733f819d Author: Lexi Winter AuthorDate: 2026-04-07 10:41:53 +0000 Commit: Lexi Winter CommitDate: 2026-04-12 19:12:16 +0000 flua: Always build as a bootstrap tool We want to use flua from the source tree (not the host) during package build, firstly to protect us from breaking changes in lua or libucl, and secondly to allow (in future) cross-building of packages from Linux or macOS. Since we don't know if the user will be building packages during the bootstrap phase, and because flua is fairly small and generally useful, build it as a bootstrap tool unconditionally. MFC after: 2 weeks Reviewed by: kevans, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56270 (cherry picked from commit 50de0bf50512aa98d18f21ac1347941396596944) --- Makefile.inc1 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d8890822d6ad..04aaf28ae19c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2610,17 +2610,11 @@ _bt_libkldelf_depend=${_bt}-lib/libkldelf _kldxref= usr.sbin/kldxref ${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} ${_bt_libkldelf_depend} -# flua is required to regenerate syscall files. It first appeared during the -# 13.0-CURRENT cycle, thus needs to be built on -older releases and stable -# branches. -.if ${BOOTSTRAPPING} < 1300059 +# flua is required to regenerate syscall files, and for the pkgbase build. +# To protect us from changes in newer versions of flua or lua libraries +# that might be installed on the host, always bootstrap it. ${_bt}-libexec/flua: ${_bt}-lib/liblua -_flua= lib/liblua libexec/flua -.if ${BOOTSTRAPPING} == 0 -_flua+= lib/libmd lib/libucl lib/libyaml ${_bt}-libexec/flua: ${_bt}-lib/libmd ${_bt}-lib/libucl ${_bt}-lib/libyaml -.endif # BOOTSTRAPPING == 0 -.endif # r245440 mtree -N support added # r313404 requires sha384.h for libnetbsd, added to libmd in r292782 @@ -2906,7 +2900,11 @@ bootstrap-tools: ${_bt}-links .PHONY ${_elftoolchain_libs} \ ${_libkldelf} \ ${_kldxref} \ + lib/liblua \ + lib/libmd \ lib/libopenbsd \ + lib/libucl \ + lib/libyaml \ usr.bin/mandoc \ usr.bin/rpcgen \ ${_yacc} \ @@ -2916,7 +2914,7 @@ bootstrap-tools: ${_bt}-links .PHONY usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_flua} \ + libexec/flua \ ${_crunchide} \ ${_crunchgen} \ ${_etdump} \ From nobody Sun Apr 12 23:15:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wm4fj5z6Z6NN for ; Sun, 12 Apr 2026 23:15: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv5wm3TRnz3NT5 for ; Sun, 12 Apr 2026 23:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31vyJViGThkW5o66nnzGCloLJXmZGSOM+qz3qjUhG3Q=; b=tjFwms4mpGVCgByvovSDaIGmkxdoHtnMbDstG3fLjmVZfctbMis0lBME5C2Czh6szoT/5S Dm6nya1Chy/CyLAtUGg2YEYsOTdc0CODs+vfel7C+E/rZIzukTz72it3grS82zYZuCCc+W sa755wwpqNQVIWZ/enFyqD9Unw1CEqDj/thPk/kwUTr4bAJy1kJkEuSvL1ZLjk/n64QRqC X+Yh/4ZGG9CRu2q3JsQmCf0F99577V0MT4jgnu4UgJ74mWPGriQlCUVvjsX9inWgw7qAD0 igUsyUI2eLrQjpU/tPuzVEPWQS1J1zYLxjuT0RpRcmQ3SUYr2fgqWLyaHA83vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776035704; a=rsa-sha256; cv=none; b=oF5SizUEN+Afv4HLvHPja9cGcSVLV+yxOZLev0DgY3erL7ON4RikcT258O8XixSsG34pH6 Et0y3oI73OlEjyilHezfCfXFqK9e5tlJt1hnn2Eg2Zt5Rbkt+bgSNoZR+rjrz6mgA+5swP k8SCB6QnCrQccaWWVpTVGGyRaHT0M8oaRUt/rzu7mdEo4uPO912o+bmwYM5l6Z7wS/fR8L q1e7hLYqSkKe/9s2OxLQmHN/kxkrrMcjwYlDJJCE88jPEkbU8NtKdd5ArD7OKa3XNKNbEM SnBX0q3gkW8WP0ThV5256c7q+RtB42o4QDxPjUPYPcZB8w5Zsz4kSDUA99JQWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31vyJViGThkW5o66nnzGCloLJXmZGSOM+qz3qjUhG3Q=; b=gyQabmKq3WVV1syhNgdbdYFd4jh00cvj7aJBNC9Ci2I2dlzi1baxwBg93OTijB6kbujAYJ dp2sopdTio3HfENS/7ebhoaQBKuqu+U3FTrM5OPG4ZPb1KTdCXpLAG/rOU02azDDjJkBtX ITJIwpYwARiqa3+R6ms1Ud+4gnPEuP1Aj173VAh0tMxAGYG+6l3jmM5h9H52HANGTAZFZf r5rNHNiGA/lvhYNBswvazd5Ld+AUbNVIIM+Hdo8Pml1So8nBASf7rZFkkcNJMkCwQn1qmf w7RS2WmCILmReiNru1Kez85gIxGy5X8gPppDbpIJQcecoIjRNBPF5QgBZfjbaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wm2qMPzf8x for ; Sun, 12 Apr 2026 23:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27a5a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 23:15:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 75aedac0a6cd - stable/15 - tools/build/Makefile: Always add md4.h to SYSINCS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 75aedac0a6cd85c1e356078b3bf4699eb3d0b4ee Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 23:15:04 +0000 Message-Id: <69dc2778.27a5a.7097bafb@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=75aedac0a6cd85c1e356078b3bf4699eb3d0b4ee commit 75aedac0a6cd85c1e356078b3bf4699eb3d0b4ee Author: Lexi Winter AuthorDate: 2026-04-09 14:30:20 +0000 Commit: Lexi Winter CommitDate: 2026-04-12 19:12:16 +0000 tools/build/Makefile: Always add md4.h to SYSINCS Since libmd was added to the bootstrap, building main on stable/14 fails because of an incompatibility in its old md4.h. Fix this by always including md4.h in the bootstrap headers, instead of only doing so when building on a non-FreeBSD host. Fixes: 50de0bf50512 ("flua: Always build as a bootstrap tool") Reported by: olce Reviewed by: olce, kevans Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56327 (cherry picked from commit 0dd9c4abf0e56b9d4f6f7204a68b1475f2bbf1fc) --- tools/build/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index fed4f06c290c..e1ccfa21d356 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -388,10 +388,8 @@ SYSINCS+= ${SRCTOP}/sys/sys/ctf.h SYSINCS+= ${SRCTOP}/sys/sys/kbio.h # for kldxref: SYSINCS+= ${SRCTOP}/sys/sys/module.h -.if ${.MAKE.OS} != "FreeBSD" # for libmd: SYSINCS+= ${SRCTOP}/sys/sys/md4.h -.endif # We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't # accidentally run tools that are incompatible but happen to be in $PATH. From nobody Sun Apr 12 23:15:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wp0fs8z6Z6kN for ; Sun, 12 Apr 2026 23:15: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv5wn4LrLz3NTC for ; Sun, 12 Apr 2026 23:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OilSMOW2H6SlirHnJhKeA7S7t4Y4YkEACwVeVtepumY=; b=StZWeJxTNO5mNyTfu01vW4U0ceuXqbX91L8QufS3v2uNBMe03o71WFDQTfk/UvjcXlm2I7 m48sboRM4ju69T5Ozw+x3oC6ZPcNqu/Gj6lN0gIO7fTzvOOfTZE9ItPTOfrmzJaOcATjee Lb9QgDQ7F3qITvoRr55A+ubnUyAB9RkhsLJ2GZ28GCkgfH7bw8Dv0LZ++PN3iT1zmLKJ5c Ostlmpgdt2aPdVyf62aiCoZnW565hxz8FIypJJc08+KcfrFvkhXN2BqHqLP8DHe3gObnhy 5FKdC5IEwPG08XX3mtYTjX0kZpgr0NF9XzvqyiBdQmQ019faFD24Ukw6NWXNkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776035705; a=rsa-sha256; cv=none; b=QKB1ZVhO9PzrjLEt/fhx+RWc2MQpiY9NXkWi4mA8x3gUcHxXb4USLoq66zU7/yiWpo2gw5 GRNt/kr7gLaLRA4tOhieROTc1xU116G3BAF5Kw0nQDLYzi7h+14miqfXx5MD0YOX3S41GX 9CVdNeaxfauL2mfjxnEQ5Yz8wqL9UP5s82Gg87/qALGM+Dd6ZoFxuM6tuNjP89IuPLOl1d 6iaWgJ4txTRgcdS08nKzd24ZuCGWRqZxE3Cj6DsZ6XG7QdYBMIVlHAJS6rHkhVD19qvNAX 9lW5v4mnE3/XXkCZfgk+M2vP/K1ate/efFjswH73lfe9hUBcomQ8QQNGVlKGsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OilSMOW2H6SlirHnJhKeA7S7t4Y4YkEACwVeVtepumY=; b=RbDWwHJXkp/icb2tMIlfnSUbiocEJH51V/PXFW13osnmchK/Ugmo6h1HXLw7YvqTaAWfJb WFUI6XMNatscznM0TXrhTCMGoM38A2DL5yZCm60gCOwGjiONFl7OaxHGOaPTJXDIz+GedT yc5ymes79zYR4PetNwUKzKGtHx3Y52GnUTTM4nzOJBlV1wH5Lq8esmuKI1KfyBqL5WD2+i 3n04664Dcn7Bi8jKOrAq1hcsy3z/fObQMtKxaish6X/rYc5rg2wi/kK7quS7t2lztLIihr 36qS0xXoyJkcYo9Z45ewqwazWuUfw04aycXSGkzOAmkih23+b2MsyT993IOEuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wn3dSYzdm8 for ; Sun, 12 Apr 2026 23:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25477 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 23:15:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 1ff7f5562d64 - stable/15 - packages: Always use the bootstrap flua List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches 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: 1ff7f5562d64b45bcf9b726dccc9249ab7ccce25 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 23:15:05 +0000 Message-Id: <69dc2779.25477.1bc8062d@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff7f5562d64b45bcf9b726dccc9249ab7ccce25 commit 1ff7f5562d64b45bcf9b726dccc9249ab7ccce25 Author: Lexi Winter AuthorDate: 2026-04-07 10:42:44 +0000 Commit: Lexi Winter CommitDate: 2026-04-12 19:12:16 +0000 packages: Always use the bootstrap flua To avoid breaking the build due to incompatible changes in flua or lua libraries on the host, use the bootstrap flua for the package build. MFC after: 2 weeks Reviewed by: kevans, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56271 (cherry picked from commit 359d6e31afe3d28addedf9a8f550b382a5faa478) --- Makefile.inc1 | 21 +++++++++++---------- release/packages/create-sets.sh | 2 +- release/packages/generate-ucl.sh | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 04aaf28ae19c..79eaf94fc9ff 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2161,7 +2161,7 @@ _repodir: .PHONY create-packages-world: _pkgbootstrap _repodir .PHONY ${_+_}@cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 \ + PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \ DESTDIR=${WSTAGEDIR} \ PKG_VERSION=${PKG_VERSION} create-world-packages @@ -2170,13 +2170,13 @@ create-packages-world: _pkgbootstrap _repodir .PHONY .ORDER: create-packages-source create-packages-sets create-packages-sets: _pkgbootstrap _repodir .PHONY ${_+_}@cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 \ + PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \ DESTDIR=${WSTAGEDIR} \ PKG_VERSION=${PKG_VERSION} create-sets-packages create-packages-kernel: _pkgbootstrap _repodir .PHONY ${_+_}@cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 \ + PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \ DESTDIR=${KSTAGEDIR} \ PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \ SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ @@ -2190,7 +2190,7 @@ create-packages-sets-repo: .PHONY create-packages-sets sign-packages create-packages-source: _pkgbootstrap _repodir .PHONY ${_+_}@cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 \ + PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \ DESTDIR=${SSTAGEDIR} \ PKG_VERSION=${PKG_VERSION} \ SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ @@ -2205,7 +2205,7 @@ create-source-src-package: _pkgbootstrap .PHONY ( echo "@override_prefix /usr/src" ; \ ${GIT_CMD} ls-files --recurse-submodules ":!:sys/" ) \ > ${SSTAGEDIR}/src.plist - ${SRCDIR}/release/packages/generate-ucl.lua \ + flua ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "src" \ PKGGENNAME "src" \ VERSION "${PKG_VERSION}" \ @@ -2231,7 +2231,7 @@ create-source-src-sys-package: _pkgbootstrap .PHONY ( echo "@override_prefix /usr/src" ; \ ${GIT_CMD} ls-files --recurse-submodules "sys/" ) \ > ${SSTAGEDIR}/src-sys.plist - ${SRCDIR}/release/packages/generate-ucl.lua \ + flua ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "src-sys" \ PKGGENNAME "src-sys" \ VERSION "${PKG_VERSION}" \ @@ -2263,7 +2263,8 @@ create-world-packages: _pkgbootstrap .PHONY echo "_PKGS+= $${pkgname}" ; \ done > ${WSTAGEDIR}/packages.mk ${_+_}@cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 create-world-packages-jobs \ + PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \ + create-world-packages-jobs \ SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ .MAKE.JOB.PREFIX= @@ -2323,7 +2324,7 @@ _debug=-dbg create-dtb-package: .PHONY @if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \ - ${SRCDIR}/release/packages/generate-ucl.lua \ + flua ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "dtb" \ PKGGENNAME "dtb" \ VERSION "${PKG_VERSION}" \ @@ -2357,7 +2358,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \ - ${SRCDIR}/release/packages/generate-ucl.lua \ + flua ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "kernel-${INSTALLKERNEL:tl}${flavor}" \ PKGGENNAME "kernel" \ VERSION "${PKG_VERSION}" \ @@ -2396,7 +2397,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.${_kernel}.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${_kernel} ; \ - ${SRCDIR}/release/packages/generate-ucl.lua \ + flua ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "kernel-${_kernel:tl}${flavor}" \ PKGGENNAME "kernel" \ FORCEINCLUDE "kernel${flavor}" \ diff --git a/release/packages/create-sets.sh b/release/packages/create-sets.sh index 3780e8ee46c6..46dfd543619c 100755 --- a/release/packages/create-sets.sh +++ b/release/packages/create-sets.sh @@ -57,7 +57,7 @@ for set in $(echo $SETS | tr ' ' '\n' | sort | uniq); do setvar="$(echo "$set" | tr - _)" eval deps=\"\$PKGS_${setvar}\" - "${srcdir}/release/packages/generate-set-ucl.lua" \ + flua "${srcdir}/release/packages/generate-set-ucl.lua" \ "${srcdir}/release/packages/set-template.ucl" \ PKGNAME "$set" \ SET_DEPENDS "$deps" \ diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index a08840d5b321..de6bc7a70eb3 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -82,7 +82,7 @@ main() { fi cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )" - ${srctree}/release/packages/generate-ucl.lua \ + flua ${srctree}/release/packages/generate-ucl.lua \ VERSION "${PKG_VERSION}" \ PKGNAME "${origname}" \ PKGGENNAME "${outname}" \